git.iko.soy/typeable/nixpkgs
on master help sign in
Merge master into staging-next
commit5f554279ec31e8d42266a3f4477035fa8e43a5c7 authorFrederik Rietdijk <fridh@fridh.nl> dateFri 7 Dec 2018, 15:22 (8 years ago) parent13ee780cb2a447
224 files changed+5365−4074
doc/languages-frameworks/texlive.xml+6−6 maintainers/maintainer-list.nix+10 nixos/doc/manual/configuration/modularity.xml+3−5 nixos/lib/make-ext4-fs.nix+19 nixos/modules/services/continuous-integration/jenkins/job-builder.nix+34−2 nixos/modules/services/databases/cockroachdb.nix+23−28 nixos/modules/services/monitoring/prometheus/exporters.nix+1−1 nixos/modules/services/monitoring/prometheus/exporters/tor.nix+5 nixos/modules/services/networking/wireguard.nix+1−1 nixos/modules/services/web-servers/apache-httpd/mediawiki.nix+4−4 nixos/modules/virtualisation/containers.nix+19−5 nixos/tests/docker-tools.nix+4 nixos/tests/gitlab.nix+1−1 nixos/tests/home-assistant.nix+3 nixos/tests/kafka.nix+3−1 nixos/tests/run-in-machine.nix+11−8 pkgs/applications/altcoins/aeon/default.nix+2−2 pkgs/applications/altcoins/go-ethereum.nix+3−3 pkgs/applications/audio/luppp/build-install.patch+16 pkgs/applications/audio/luppp/default.nix+40 pkgs/applications/audio/spotify/default.nix+3−3 pkgs/applications/backup/crashplan/crashplan-small-business.nix+1−1 pkgs/applications/editors/android-studio/default.nix+6−6 pkgs/applications/editors/atom/default.nix+1−2 pkgs/applications/editors/sublime/3/common.nix+24−5 pkgs/applications/editors/sublime/3/packages.nix+3−3 pkgs/applications/editors/vscode/default.nix+19−13 pkgs/applications/editors/vscode/with-extensions.nix+7−20 pkgs/applications/graphics/gimp/default.nix+9−4 pkgs/applications/graphics/jpeginfo/default.nix+21 pkgs/applications/graphics/yed/default.nix+6−7 pkgs/applications/misc/dmrconfig/default.nix+7−4 pkgs/applications/misc/hivemind/default.nix+21 pkgs/applications/misc/octoprint/default.nix+51−98 pkgs/applications/misc/octoprint/plugins.nix+27−3 pkgs/applications/misc/polar-bookshelf/default.nix+2−2 pkgs/applications/misc/qlcplus/default.nix+1−1 pkgs/applications/misc/soapyrtlsdr/default.nix+30 pkgs/applications/networking/browsers/chromium/plugins.nix+2−2 pkgs/applications/networking/browsers/chromium/upstream-info.nix+9−9 pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix+397−397 pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix+397−397 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix+6−6 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix+5−5 pkgs/applications/networking/browsers/vivaldi/default.nix+1−1 pkgs/applications/networking/cluster/kube-router/default.nix+32 pkgs/applications/networking/cluster/kubernetes/default.nix+2−2 pkgs/applications/networking/cluster/terraform-docs/default.nix+26 pkgs/applications/networking/cluster/terraform-providers/data.nix+36−22 pkgs/applications/networking/cluster/terraform-providers/providers.txt+4−1 pkgs/applications/networking/instant-messengers/dino/default.nix+5−3 pkgs/applications/networking/instant-messengers/rambox/bare.nix+3−3 pkgs/applications/networking/instant-messengers/slack/default.nix+16−1 pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix+2−2 pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix+13−2 pkgs/applications/networking/instant-messengers/zoom-us/default.nix+2−2 pkgs/applications/networking/irc/weechat/default.nix+2−73 pkgs/applications/networking/irc/weechat/wrapper.nix+80 pkgs/applications/networking/mailreaders/balsa/default.nix+4−3 pkgs/applications/networking/remote/x2goclient/default.nix+9−10 pkgs/applications/networking/remote/x2goclient/qt511.patch−15 pkgs/applications/networking/seafile-client/default.nix+2−2 pkgs/applications/version-management/gitea/default.nix+2−2 pkgs/applications/version-management/gitlab/data.json+14−14 pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch+1−1 pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix+2−2 pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile+10−18 pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock+23−59 pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix+38−116 pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile+10−18 pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock+23−59 pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix+38−116 pkgs/applications/video/plex-media-player/default.nix+11−11 pkgs/build-support/docker/default.nix+31−15 pkgs/build-support/docker/examples.nix+19 pkgs/build-support/rust/build-rust-crate/configure-crate.nix+3 pkgs/build-support/rust/build-rust-crate/helpers.nix+7−4 pkgs/build-support/rust/build-rust-crate/install-crate.nix+5−3 pkgs/build-support/rust/carnix.nix+3−24 pkgs/build-support/rust/crates-io.nix+280−352 pkgs/build-support/writers/default.nix+86−63 pkgs/build-support/writers/test.nix+20−1 pkgs/data/fonts/noto-fonts/default.nix+7−4 pkgs/data/fonts/open-sans/default.nix+33 pkgs/data/fonts/opensans-ttf/default.nix−27 pkgs/data/icons/zafiro-icons/default.nix+5−5 pkgs/data/misc/hackage/default.nix+2−2 pkgs/misc/themes/materia-theme/default.nix → pkgs/data/themes/materia-theme/default.nix+2−2 pkgs/data/themes/nordic-polar/default.nix+35 pkgs/development/compilers/scala/default.nix+2−2 pkgs/development/compilers/solc/default.nix+5−10 pkgs/development/compilers/solc/patches/shared-libs-install.patch+23−3 pkgs/development/haskell-modules/configuration-common.nix+21−11 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix+2−4 pkgs/development/haskell-modules/configuration-hackage2nix.yaml+14−14 pkgs/development/haskell-modules/hackage-packages.nix+1249−605 pkgs/development/haskell-modules/lib.nix+3 pkgs/development/libraries/c-ares/default.nix−2 pkgs/development/libraries/git2/default.nix+2−2 pkgs/development/libraries/libffi/default.nix+1−1 pkgs/development/libraries/libgpg-error/default.nix+4−1 pkgs/development/libraries/libgpiod/default.nix+38 pkgs/development/libraries/libopusenc/default.nix+28 pkgs/development/libraries/libpqxx/default.nix+1−1 pkgs/development/libraries/libtorrent-rasterbar/default.nix+3−3 pkgs/development/libraries/mythes/default.nix+2−2 pkgs/development/libraries/ncurses/default.nix+2−1 pkgs/development/libraries/qmltermwidget/default.nix+4−3 pkgs/development/libraries/zlib/default.nix+8−5 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix+25 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix+27 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix+28 pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt+3 pkgs/development/lisp-modules/quicklisp-to-nix.nix+38−8 pkgs/development/ocaml-modules/camlimages/default.nix+4−4 pkgs/development/ocaml-modules/frontc/default.nix+24−23 pkgs/development/ocaml-modules/javalib/default.nix+6−13 pkgs/development/ocaml-modules/sawja/default.nix+3−3 pkgs/development/ocaml-modules/zmq/default.nix+18−5 pkgs/development/python-modules/arelle/default.nix+22−13 pkgs/development/python-modules/arelle/tests.patch+1−19 pkgs/development/python-modules/astroid/default.nix+2−2 pkgs/development/python-modules/cairosvg/default.nix+13−3 pkgs/development/python-modules/curtsies/default.nix+12−3 pkgs/development/python-modules/fedpkg-buildfix.diff−14 pkgs/development/python-modules/fedpkg/default.nix−26 pkgs/development/python-modules/flake8-future-import/default.nix+9−1 pkgs/development/python-modules/flask-login/default.nix+4−6 pkgs/development/python-modules/parsimonious/default.nix+7−8 pkgs/development/python-modules/pygraphviz/default.nix+12−2 pkgs/development/python-modules/pygraphviz/graphviz-path.patch+13 pkgs/development/python-modules/pylint/default.nix+2−2 pkgs/development/python-modules/python-fontconfig/default.nix+6−1 pkgs/development/python-modules/pywbem/default.nix+40−33 pkgs/development/python-modules/pywbem/make_cimdatetime_timezone_aware.patch−491 pkgs/development/python-modules/qasm2image/default.nix+2 pkgs/development/python-modules/svgwrite/default.nix+10−3 pkgs/development/python-modules/whisper/default.nix+2−1 pkgs/development/r-modules/default.nix+12 pkgs/development/r-modules/wrapper-rstudio.nix+17−21 pkgs/development/r-modules/wrapper.nix+16−20 pkgs/development/tools/analysis/flow/default.nix+2−2 pkgs/development/tools/analysis/radare/default.nix−38 pkgs/development/tools/analysis/radare/ired.nix−22 pkgs/development/tools/analysis/radare2/default.nix+7−7 pkgs/development/tools/build-managers/bloop/default.nix+3−3 pkgs/development/tools/build-managers/leiningen/default.nix+6−3 pkgs/development/tools/continuous-integration/jenkins/default.nix+2−2 pkgs/development/tools/fedpkg/default.nix+35 pkgs/development/tools/fedpkg/fix-paths.patch+16 pkgs/development/tools/govers/default.nix+3−3 pkgs/development/tools/gox/default.nix+3−3 pkgs/development/tools/profiling/pyflame/default.nix+65 pkgs/development/tools/tradcpp/aarch64.patch+12 pkgs/development/tools/tradcpp/default.nix+4−1 pkgs/games/anki/default.nix+13−2 pkgs/games/assaultcube/default.nix+1−2 pkgs/games/leela-zero/default.nix+29 pkgs/misc/scrcpy/default.nix+19−5 pkgs/misc/seafile-shared/default.nix+2−2 pkgs/misc/vim-plugins/generated.nix+237−237 pkgs/misc/vscode-extensions/python/default.nix+2−2 pkgs/misc/vscode-extensions/wakatime/default.nix+2−2 pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix+1−1 pkgs/os-specific/darwin/skhd/default.nix+2−2 pkgs/os-specific/linux/iwd/default.nix+7−4 pkgs/os-specific/linux/kernel/linux-4.14.nix+2−2 pkgs/os-specific/linux/kernel/linux-4.19.nix+2−2 pkgs/os-specific/linux/kernel/linux-4.9.nix+2−2 pkgs/os-specific/linux/kernel/linux-libre.nix+3 pkgs/os-specific/linux/kernel/linux-testing.nix+3−3 pkgs/os-specific/linux/nvidia-x11/default.nix+1−1 pkgs/os-specific/linux/reptyr/default.nix+12−11 pkgs/servers/apache-kafka/default.nix+7−2 pkgs/servers/foundationdb/default.nix+3−3 pkgs/servers/home-assistant/component-packages.nix+48−5 pkgs/servers/home-assistant/default.nix+6−6 pkgs/servers/home-assistant/frontend.nix+2−2 pkgs/servers/http/nginx/stable.nix+2−2 pkgs/servers/nextcloud/default.nix+2−2 pkgs/shells/bash/nix-bash-completions/default.nix+2−2 pkgs/shells/zsh/nix-zsh-completions/default.nix+2−2 pkgs/stdenv/adapters.nix+5−3 pkgs/stdenv/cross/default.nix+9−4 pkgs/stdenv/custom/default.nix+1−1 pkgs/stdenv/darwin/default.nix+2−2 pkgs/stdenv/darwin/portable-libsystem.sh+12 pkgs/stdenv/default.nix+2−2 pkgs/stdenv/freebsd/default.nix+1−1 pkgs/stdenv/linux/default.nix+2−2 pkgs/stdenv/native/default.nix+1−1 pkgs/stdenv/nix/default.nix+2−2 pkgs/tools/filesystems/btrfs-progs/default.nix+2−2 pkgs/tools/misc/cowsay/default.nix+11−1 pkgs/tools/misc/kodi-cli/default.nix+31 pkgs/tools/misc/loop/default.nix+21 pkgs/tools/misc/rig/default.nix+31 pkgs/tools/misc/rig/rig_1.11-1.diff+39 pkgs/tools/misc/termtosvg/default.nix+3−7 pkgs/tools/networking/amass/default.nix+13−7 pkgs/tools/networking/amass/deps.nix+2−2 pkgs/tools/networking/dhcpcd/default.nix+5−1 pkgs/tools/networking/dsniff/default.nix+82 pkgs/tools/networking/libnids/default.nix+31 pkgs/tools/networking/qr-filetransfer/default.nix+30 pkgs/tools/networking/qr-filetransfer/deps.nix+66 pkgs/tools/package-management/appimage-run/default.nix+1 pkgs/tools/package-management/nix-index/default.nix+5−3 pkgs/tools/package-management/nix-review/default.nix+2−2 pkgs/tools/security/chrome-token-signing/default.nix+4−1 pkgs/tools/security/nsjail/default.nix+8−1 pkgs/tools/security/pass/extensions/default.nix+1 pkgs/tools/security/pass/extensions/genphrase.nix+32 pkgs/tools/security/vault/default.nix+4−13 pkgs/tools/system/proot/default.nix+2−7 pkgs/tools/typesetting/tectonic/default.nix+3−3 pkgs/tools/virtualization/google-compute-engine/default.nix+2−1 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix+130−82 pkgs/top-level/default.nix+8−5 pkgs/top-level/perl-packages.nix+13 pkgs/top-level/python-packages.nix+4−17 pkgs/top-level/stage.nix+17−1 pkgs/top-level/static.nix+150
doc/languages-frameworks/texlive.xml+6−6
@@ -49,12 +49,12 @@ texlive.combine {
4949 </listitem>
5050 <listitem>
5151 <para>
52− You can list packages e.g. by <command>nix-repl</command>.
53−<programlisting>
54−$ nix-repl
55−nix-repl> :l &lt;nixpkgs>
56−nix-repl> texlive.collection-&lt;TAB>
57− </programlisting>
52+ You can list packages e.g. by <command>nix repl</command>.
53+<programlisting><![CDATA[
54+$ nix repl
55+nix-repl> :l <nixpkgs>
56+nix-repl> texlive.collection-<TAB>
57+]]></programlisting>
5858 </para>
5959 </listitem>
6060 <listitem>
maintainers/maintainer-list.nix+10
@@ -2464,6 +2464,11 @@
24642464 github = "listx";
24652465 name = "Linus Arver";
24662466 };
2467+ lionello = {
2468+ email = "lio@lunesu.com";
2469+ github = "lionello";
2470+ name = "Lionello Lunesu";
2471+ };
24672472 lluchs = {
24682473 email = "lukas.werling@gmail.com";
24692474 github = "lluchs";
@@ -3935,6 +3940,11 @@
39353940 github = "seppeljordan";
39363941 name = "Sebastian Jordan";
39373942 };
3943+ seqizz = {
3944+ email = "seqizz@gmail.com";
3945+ github = "seqizz";
3946+ name = "Gurkan Gur";
3947+ };
39383948 sfrijters = {
39393949 email = "sfrijters@gmail.com";
39403950 github = "sfrijters";
nixos/doc/manual/configuration/modularity.xml+3−5
@@ -113,12 +113,10 @@ $ nixos-option <xref linkend="opt-boot.kernelModules"/>
113113[ "tun" "ipv6" "loop" <replaceable>...</replaceable> ]
114114</screen>
115115 Interactive exploration of the configuration is possible using
116− <command
117−xlink:href="https://github.com/edolstra/nix-repl">nix-repl</command>,
118− a read-eval-print loop for Nix expressions. It’s not installed by default;
119− run <literal>nix-env -i nix-repl</literal> to get it. A typical use:
116+ <command>nix repl</command>, a read-eval-print loop for Nix expressions.
117+ A typical use:
120118<screen>
121−$ nix-repl '&lt;nixpkgs/nixos>'
119+$ nix repl '&lt;nixpkgs/nixos>'
122120
123121nix-repl> config.<xref linkend="opt-networking.hostName"/>
124122"mandark"
nixos/lib/make-ext4-fs.nix+19
@@ -94,5 +94,24 @@ pkgs.stdenv.mkDerivation {
9494 cat errorlog
9595 return 1
9696 fi
97+
98+ (
99+ # Resizes **snugly** to its actual limits (or closer to)
100+ free=$(dumpe2fs $out | grep '^Free blocks:')
101+ blocksize=$(dumpe2fs $out | grep '^Block size:')
102+ blocks=$(dumpe2fs $out | grep '^Block count:')
103+ blocks=$((''${blocks##*:})) # format the number.
104+ blocksize=$((''${blocksize##*:})) # format the number.
105+ # System can't boot with 0 blocks free.
106+ # Add 16MiB of free space
107+ fudge=$(( 16 * 1024 * 1024 / blocksize ))
108+ size=$(( blocks - ''${free##*:} + fudge ))
109+
110+ echo "Resizing from $blocks blocks to $size blocks. (~ $((size*blocksize/1024/1024))MiB)"
111+ EXT2FS_NO_MTAB_OK=yes resize2fs $out -f $size
112+ )
113+
114+ # And a final fsck, because of the previous truncating.
115+ fsck.ext4 -n -f $out
97116 '';
98117}
nixos/modules/services/continuous-integration/jenkins/job-builder.nix+34−2
@@ -42,6 +42,18 @@ in {
4242 type = types.str;
4343 description = ''
4444 User token in Jenkins used to reload config.
45+ WARNING: This token will be world readable in the Nix store. To keep
46+ it secret, use the <option>accessTokenFile</option> option instead.
47+ '';
48+ };
49+
50+ accessTokenFile = mkOption {
51+ default = "";
52+ type = types.str;
53+ example = "/run/keys/jenkins-job-builder-access-token";
54+ description = ''
55+ File containing the API token for the <option>accessUser</option>
56+ user.
4557 '';
4658 };
4759
@@ -103,6 +115,21 @@ in {
103115 };
104116
105117 config = mkIf (jenkinsCfg.enable && cfg.enable) {
118+ assertions = [
119+ { assertion =
120+ if cfg.accessUser != ""
121+ then (cfg.accessToken != "" && cfg.accessTokenFile == "") ||
122+ (cfg.accessToken == "" && cfg.accessTokenFile != "")
123+ else true;
124+ message = ''
125+ One of accessToken and accessTokenFile options must be non-empty
126+ strings, but not both. Current values:
127+ services.jenkins.jobBuilder.accessToken = "${cfg.accessToken}"
128+ services.jenkins.jobBuilder.accessTokenFile = "${cfg.accessTokenFile}"
129+ '';
130+ }
131+ ];
132+
106133 systemd.services.jenkins-job-builder = {
107134 description = "Jenkins Job Builder Service";
108135 # JJB can run either before or after jenkins. We chose after, so we can
@@ -128,8 +155,13 @@ in {
128155 ownerStamp = ".config-xml-managed-by-nixos-jenkins-job-builder";
129156 reloadScript = ''
130157 echo "Asking Jenkins to reload config"
131− CRUMB=$(curl -s 'http://${cfg.accessUser}:${cfg.accessToken}@${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}/crumbIssuer/api/xml?xpath=concat(//crumbRequestField,":",//crumb)')
132− curl --silent -X POST -H "$CRUMB" http://${cfg.accessUser}:${cfg.accessToken}@${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}/reload
158+ curl_opts="--silent --fail --show-error"
159+ access_token=${if cfg.accessTokenFile != ""
160+ then "$(cat '${cfg.accessTokenFile}')"
161+ else cfg.accessToken}
162+ jenkins_url="http://${cfg.accessUser}:$access_token@${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}"
163+ crumb=$(curl $curl_opts "$jenkins_url"'/crumbIssuer/api/xml?xpath=concat(//crumbRequestField,":",//crumb)')
164+ curl $curl_opts -X POST -H "$crumb" "$jenkins_url"/reload
133165 '';
134166 in
135167 ''
nixos/modules/services/databases/cockroachdb.nix+23−28
@@ -13,7 +13,7 @@ let
1313 [ # Basic startup
1414 "${crdb}/bin/cockroach start"
1515 "--logtostderr"
16− "--store=${cfg.dataDir}"
16+ "--store=/var/lib/cockroachdb"
1717 (ifNotNull cfg.locality "--locality='${cfg.locality}'")
1818
1919 # WebUI settings
@@ -41,7 +41,7 @@ let
4141 };
4242
4343 port = mkOption {
44− type = types.int;
44+ type = types.port;
4545 default = defaultPort;
4646 description = "Port to bind to for ${descr}";
4747 };
@@ -70,10 +70,12 @@ in
7070 like datacenter. The tiers and order must be the same on all nodes.
7171 Including more tiers is better than including fewer. For example:
7272
73+ <literal>
7374 country=us,region=us-west,datacenter=us-west-1b,rack=12
7475 country=ca,region=ca-east,datacenter=ca-east-2,rack=4
7576
7677 planet=earth,province=manitoba,colo=secondary,power=3
78+ </literal>
7779 '';
7880 };
7981
@@ -83,12 +85,6 @@ in
8385 description = "The addresses for connecting the node to a cluster.";
8486 };
8587
86− dataDir = mkOption {
87− type = types.path;
88− default = "/var/lib/cockroachdb";
89− description = "Location where CockroachDB stores its table files";
90− };
91−
9288 insecure = mkOption {
9389 type = types.bool;
9490 default = false;
@@ -126,9 +122,12 @@ in
126122 The total size for caches.
127123
128124 This can be a percentage, expressed with a fraction sign or as a
129− decimal-point number, or any bytes-based unit. For example, "25%",
130− "0.25" both represent 25% of the available system memory. The values
131− "1000000000" and "1GB" both represent 1 gigabyte of memory.
125+ decimal-point number, or any bytes-based unit. For example,
126+ <literal>"25%"</literal>, <literal>"0.25"</literal> both represent
127+ 25% of the available system memory. The values
128+ <literal>"1000000000"</literal> and <literal>"1GB"</literal> both
129+ represent 1 gigabyte of memory.
130+
132131 '';
133132 };
134133
@@ -140,9 +139,11 @@ in
140139 data for SQL queries.
141140
142141 This can be a percentage, expressed with a fraction sign or as a
143− decimal-point number, or any bytes-based unit. For example, "25%",
144− "0.25" both represent 25% of the available system memory. The values
145− "1000000000" and "1GB" both represent 1 gigabyte of memory.
142+ decimal-point number, or any bytes-based unit. For example,
143+ <literal>"25%"</literal>, <literal>"0.25"</literal> both represent
144+ 25% of the available system memory. The values
145+ <literal>"1000000000"</literal> and <literal>"1GB"</literal> both
146+ represent 1 gigabyte of memory.
146147 '';
147148 };
148149
@@ -193,27 +194,21 @@ in
193194 requires = [ "time-sync.target" ];
194195 wantedBy = [ "multi-user.target" ];
195196
196− unitConfig.RequiresMountsFor = "${cfg.dataDir}";
197−
198− preStart = ''
199− if ! test -e ${cfg.dataDir}; then
200− mkdir -m 0700 -p ${cfg.dataDir}
201− chown -R ${cfg.user} ${cfg.dataDir}
202− fi
203− '';
197+ unitConfig.RequiresMountsFor = "/var/lib/cockroachdb";
204198
205199 serviceConfig =
206200 { ExecStart = startupCommand;
207201 Type = "notify";
208202 User = cfg.user;
209− PermissionsStartOnly = true;
203+ StateDirectory = "cockroachdb";
204+ StateDirectoryMode = "0700";
210205
211206 Restart = "always";
212− TimeoutStopSec="60";
213− RestartSec="10";
214− StandardOutput="syslog";
215− StandardError="syslog";
216− SyslogIdentifier="cockroach";
207+
208+ # A conservative-ish timeout is alright here, because for Type=notify
209+ # cockroach will send systemd pings during startup to keep it alive
210+ TimeoutStopSec = 60;
211+ RestartSec = 10;
217212 };
218213 };
219214 };
nixos/modules/services/monitoring/prometheus/exporters.nix+1−1
@@ -127,7 +127,7 @@ let
127127 serviceConfig.Restart = mkDefault "always";
128128 serviceConfig.PrivateTmp = mkDefault true;
129129 serviceConfig.WorkingDirectory = mkDefault /tmp;
130− } serviceOpts ] ++ optional (serviceOpts.serviceConfig.DynamicUser or false) {
130+ } serviceOpts ] ++ optional (!(serviceOpts.serviceConfig.DynamicUser or false)) {
131131 serviceConfig.User = conf.user;
132132 serviceConfig.Group = conf.group;
133133 });
nixos/modules/services/monitoring/prometheus/exporters/tor.nix+5
@@ -36,5 +36,10 @@ in
3636 ${concatStringsSep " \\\n " cfg.extraFlags}
3737 '';
3838 };
39+
40+ # CPython requires a process to either have $HOME defined or run as a UID
41+ # defined in /etc/passwd. The latter is false with DynamicUser, so define a
42+ # dummy $HOME. https://bugs.python.org/issue10496
43+ environment = { HOME = "/var/empty"; };
3944 };
4045}
nixos/modules/services/networking/wireguard.nix+1−1
@@ -202,7 +202,7 @@ let
202202 };
203203
204204 script = ''
205− modprobe wireguard
205+ ${optionalString (!config.boot.isContainer) "modprobe wireguard"}
206206
207207 ${values.preSetup}
208208
nixos/modules/services/web-servers/apache-httpd/mediawiki.nix+4−4
@@ -83,11 +83,11 @@ let
8383
8484 # Unpack Mediawiki and put the config file in its root directory.
8585 mediawikiRoot = pkgs.stdenv.mkDerivation rec {
86− name= "mediawiki-1.29.1";
86+ name= "mediawiki-1.31.1";
8787
8888 src = pkgs.fetchurl {
89− url = "https://releases.wikimedia.org/mediawiki/1.29/${name}.tar.gz";
90− sha256 = "03mpazbxvb011s2nmlw5p6dc43yjgl5yrsilmj1imyykm57bwb3m";
89+ url = "https://releases.wikimedia.org/mediawiki/1.31/${name}.tar.gz";
90+ sha256 = "13x48clij21cmysjkpnx68vggchrdasqp7b290j87xlfgjhdhnnf";
9191 };
9292
9393 skins = config.skins;
@@ -111,7 +111,7 @@ let
111111 sed -i \
112112 -e 's|/bin/bash|${pkgs.bash}/bin/bash|g' \
113113 -e 's|/usr/bin/timeout|${pkgs.coreutils}/bin/timeout|g' \
114− $out/includes/limit.sh \
114+ $out/includes/shell/limit.sh \
115115 $out/includes/GlobalFunctions.php
116116 '';
117117 };
nixos/modules/virtualisation/containers.nix+19−5
@@ -36,7 +36,7 @@ let
3636 #! ${pkgs.runtimeShell} -e
3737
3838 # Initialise the container side of the veth pair.
39− if [ "$PRIVATE_NETWORK" = 1 ]; then
39+ if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ]; then
4040
4141 ip link set host0 name eth0
4242 ip link set dev eth0 up
@@ -85,6 +85,10 @@ let
8585 cp --remove-destination /etc/resolv.conf "$root/etc/resolv.conf"
8686
8787 if [ "$PRIVATE_NETWORK" = 1 ]; then
88+ extraFlags+=" --private-network"
89+ fi
90+
91+ if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ]; then
8892 extraFlags+=" --network-veth"
8993 if [ -n "$HOST_BRIDGE" ]; then
9094 extraFlags+=" --network-bridge=$HOST_BRIDGE"
@@ -153,7 +157,7 @@ let
153157 # Clean up existing machined registration and interfaces.
154158 machinectl terminate "$INSTANCE" 2> /dev/null || true
155159
156− if [ "$PRIVATE_NETWORK" = 1 ]; then
160+ if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ]; then
157161 ip link del dev "ve-$INSTANCE" 2> /dev/null || true
158162 ip link del dev "vb-$INSTANCE" 2> /dev/null || true
159163 fi
@@ -200,7 +204,7 @@ let
200204 '';
201205 in
202206 ''
203− if [ "$PRIVATE_NETWORK" = 1 ]; then
207+ if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ]; then
204208 if [ -z "$HOST_BRIDGE" ]; then
205209 ifaceHost=ve-$INSTANCE
206210 ip link set dev $ifaceHost up
@@ -352,7 +356,7 @@ let
352356 List of forwarded ports from host to container. Each forwarded port
353357 is specified by protocol, hostPort and containerPort. By default,
354358 protocol is tcp and hostPort and containerPort are assumed to be
355− the same if containerPort is not explicitly given.
359+ the same if containerPort is not explicitly given.
356360 '';
357361 };
358362
@@ -457,6 +461,16 @@ in
457461 { boot.isContainer = true;
458462 networking.hostName = mkDefault name;
459463 networking.useDHCP = false;
464+ assertions = [
465+ {
466+ assertion = config.privateNetwork -> stringLength name < 12;
467+ message = ''
468+ Container name `${name}` is too long: When `privateNetwork` is enabled, container names can
469+ not be longer than 11 characters, because the container's interface name is derived from it.
470+ This might be fixed in the future. See https://github.com/NixOS/nixpkgs/issues/38509
471+ '';
472+ }
473+ ];
460474 };
461475 in [ extraConfig ] ++ (map (x: x.value) defs);
462476 prefix = [ "containers" name ];
@@ -699,7 +713,7 @@ in
699713 # container so that container@.target can get the container
700714 # configuration.
701715 environment.etc =
702− let mkPortStr = p: p.protocol + ":" + (toString p.hostPort) + ":" + (if p.containerPort == null then toString p.hostPort else toString p.containerPort);
716+ let mkPortStr = p: p.protocol + ":" + (toString p.hostPort) + ":" + (if p.containerPort == null then toString p.hostPort else toString p.containerPort);
703717 in mapAttrs' (name: cfg: nameValuePair "containers/${name}.conf"
704718 { text =
705719 ''
nixos/tests/docker-tools.nix+4
@@ -62,5 +62,9 @@ import ./make-test.nix ({ pkgs, ... }: {
6262 # Ensure Layered Docker images work
6363 $docker->succeed("docker load --input='${pkgs.dockerTools.examples.layered-image}'");
6464 $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.layered-image.imageName}");
65+
66+ # Ensure building an image on top of a layered Docker images work
67+ $docker->succeed("docker load --input='${pkgs.dockerTools.examples.layered-on-top}'");
68+ $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.layered-on-top.imageName}");
6569 '';
6670})
nixos/tests/gitlab.nix+1−1
@@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, lib, ...} : with lib; {
88
99 nodes = {
1010 gitlab = { ... }: {
11− virtualisation.memorySize = 4096;
11+ virtualisation.memorySize = 2047;
1212 systemd.services.gitlab.serviceConfig.Restart = mkForce "no";
1313 systemd.services.gitlab-workhorse.serviceConfig.Restart = mkForce "no";
1414 systemd.services.gitaly.serviceConfig.Restart = mkForce "no";
nixos/tests/home-assistant.nix+3
@@ -31,6 +31,9 @@ in {
3131 latitude = "0.0";
3232 longitude = "0.0";
3333 elevation = 0;
34+ auth_providers = [
35+ { type = "legacy_api_password"; }
36+ ];
3437 };
3538 frontend = { };
3639 http.api_password = apiPassword;
nixos/tests/kafka.nix+3−1
@@ -40,7 +40,7 @@ let
4040
4141 networking.firewall.allowedTCPPorts = [ 9092 ];
4242 # i686 tests: qemu-system-i386 can simulate max 2047MB RAM (not 2048)
43− virtualisation.memorySize = 2047;
43+ virtualisation.memorySize = 2047;
4444 };
4545 };
4646
@@ -70,4 +70,6 @@ in with pkgs; {
7070 kafka_0_11 = makeKafkaTest "kafka_0_11" apacheKafka_0_11;
7171 kafka_1_0 = makeKafkaTest "kafka_1_0" apacheKafka_1_0;
7272 kafka_1_1 = makeKafkaTest "kafka_1_1" apacheKafka_1_1;
73+ kafka_2_0 = makeKafkaTest "kafka_2_0" apacheKafka_2_0;
74+ kafka_2_1 = makeKafkaTest "kafka_2_1" apacheKafka_2_1;
7375}
nixos/tests/run-in-machine.nix+11−8
@@ -10,11 +10,14 @@ let
1010 drv = pkgs.hello;
1111 machine = { ... }: { /* services.sshd.enable = true; */ };
1212 };
13−in pkgs.runCommand "verify-output" { inherit output; } ''
14− if [ ! -e "$output/bin/hello" ]; then
15− echo "Derivation built using runInMachine produced incorrect output:" >&2
16− ls -laR "$output" >&2
17− exit 1
18− fi
19− "$output/bin/hello" > "$out"
20−''
13+
14+ test = pkgs.runCommand "verify-output" { inherit output; } ''
15+ if [ ! -e "$output/bin/hello" ]; then
16+ echo "Derivation built using runInMachine produced incorrect output:" >&2
17+ ls -laR "$output" >&2
18+ exit 1
19+ fi
20+ "$output/bin/hello" > "$out"
21+ '';
22+
23+in test // { inherit test; } # To emulate behaviour of makeTest
pkgs/applications/altcoins/aeon/default.nix+2−2
@@ -4,7 +4,7 @@
44}:
55
66let
7− version = "0.12.6.0";
7+ version = "0.12.8.0";
88in
99stdenv.mkDerivation {
1010 name = "aeon-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
1414 repo = "aeon";
1515 rev = "v${version}-aeon";
1616 fetchSubmodules = true;
17− sha256 = "19r1snqwixccl27jwv6i0s86qck036pdlhyhl891bbiyvi55h14n";
17+ sha256 = "1qmlz820mjs0b60d7i90lxcwwxmsdy6swq67v6n8mbb79zmcx8ii";
1818 };
1919
2020 nativeBuildInputs = [ cmake pkgconfig git doxygen graphviz ];
pkgs/applications/altcoins/go-ethereum.nix+3−3
@@ -2,7 +2,7 @@
22
33buildGoPackage rec {
44 name = "go-ethereum-${version}";
5− version = "1.8.17";
5+ version = "1.8.19";
66 goPackagePath = "github.com/ethereum/go-ethereum";
77
88 # Fix for usb-related segmentation faults on darwin
@@ -16,13 +16,13 @@ buildGoPackage rec {
1616 owner = "ethereum";
1717 repo = "go-ethereum";
1818 rev = "v${version}";
19− sha256 = "0vm526gbyi8bygqwwki9hx7gf5g3xk2s1biyvwjidrydzj9i46zd";
19+ sha256 = "0shp8ak44v52ynlyawfh53wczd3zch7ydf6bmbrhm5rpbribirwr";
2020 };
2121
2222 meta = with stdenv.lib; {
2323 homepage = https://ethereum.github.io/go-ethereum/;
2424 description = "Official golang implementation of the Ethereum protocol";
2525 license = with licenses; [ lgpl3 gpl3 ];
26− maintainers = [ maintainers.adisbladis ];
26+ maintainers = [ maintainers.adisbladis maintainers.lionello ];
2727 };
2828}
pkgs/applications/audio/luppp/build-install.patchnew file+16
@@ -0,0 +1,16 @@
1+commit 4ec09e6f6e00e40622a5207ed24dc657da9a9090
2+Author: Pavol Rusnak <stick@gk2.sk>
3+Date: Tue Dec 4 12:06:22 2018 +0100
4+
5+ build: add install: true to executable in meson.build
6+
7+diff --git a/meson.build b/meson.build
8+index 050e1b1..9224ed5 100644
9+--- a/meson.build
10++++ b/meson.build
11+@@ -39,4 +39,5 @@ endforeach
12+
13+ # compile the main project
14+ executable('luppp', luppp_src + [version_hxx],
15++ install: true,
16+ dependencies: deps)
pkgs/applications/audio/luppp/default.nixnew file+40
@@ -0,0 +1,40 @@
1+{ stdenv, fetchFromGitHub
2+, meson
3+, ninja
4+, pkgconfig
5+, jack2
6+, cairo
7+, liblo
8+, libsndfile
9+, libsamplerate
10+, ntk
11+}:
12+
13+stdenv.mkDerivation rec {
14+ pname = "luppp";
15+ version = "1.2.0";
16+ patches = [ ./build-install.patch ];
17+
18+ src = fetchFromGitHub {
19+ owner = "openAVproductions";
20+ repo = "openAV-Luppp";
21+ rev = "release-${version}";
22+ sha256 = "194yq0lqc2psq9vyxmzif40ccawcvd9jndcn18mkz4f8h5w5rc1a";
23+ };
24+
25+ nativeBuildInputs = [
26+ meson ninja pkgconfig
27+ ];
28+
29+ buildInputs = [
30+ jack2 cairo liblo libsndfile libsamplerate ntk
31+ ];
32+
33+ meta = with stdenv.lib; {
34+ homepage = http://openavproductions.com/luppp/;
35+ description = "A music creation tool, intended for live use";
36+ license = licenses.gpl3Plus;
37+ maintainers = with maintainers; [ prusnak ];
38+ platforms = platforms.linux;
39+ };
40+}
pkgs/applications/audio/spotify/default.nix+3−3
@@ -5,14 +5,14 @@
55let
66 # TO UPDATE: just execute the ./update.sh script (won't do anything if there is no update)
77 # "rev" decides what is actually being downloaded
8− version = "1.0.93.242.gc2341a27-15";
8+ version = "1.0.94.262.g3d5c231c-9";
99 # To get the latest stable revision:
1010 # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
1111 # To get general information:
1212 # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
1313 # More examples of api usage:
1414 # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
15− rev = "24";
15+ rev = "28";
1616
1717
1818 deps = [
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
6565 # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
6666 src = fetchurl {
6767 url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
68− sha512 = "920d55b3dcad4ac6acd9bc73c8ad8eb1668327a175da465ce3d8bba2430da47aaefa5218659315fab43b5182611eb03047d4e2679c1345c57380b7def7a1212d";
68+ sha512 = "ca8e2eb45ea7ef6396382298822969994aca86cca8ba122ec1521c593e621161267943fe5515bb8747037ecbbfbd05cffbbca017f8f4b1c9fbd216e1d6a9e8cb";
6969 };
7070
7171 buildInputs = [ squashfsTools makeWrapper ];
pkgs/applications/backup/crashplan/crashplan-small-business.nix+1−1
@@ -98,6 +98,6 @@ stdenv.mkDerivation rec {
9898 license = licenses.unfree;
9999 platforms = [ "x86_64-linux" ];
100100 maintainers = with maintainers; [ xvapx ];
101+ broken = true; # 2018-12-06
101102 };
102−
103103}
pkgs/applications/editors/android-studio/default.nix+6−6
@@ -13,14 +13,14 @@ let
1313 sha256Hash = "117skqjax1xz9plarhdnrw2rwprjpybdc7mx7wggxapyy920vv5r";
1414 };
1515 betaVersion = {
16− version = "3.3.0.17"; # "Android Studio 3.3 RC 1"
17− build = "182.5138683";
18− sha256Hash = "0apc566l4gwkwvfgj50d4qxm2gw26rxdlyr8kj3kfcra9a33c2b7";
16+ version = "3.3.0.18"; # "Android Studio 3.3 RC 2"
17+ build = "182.5160847";
18+ sha256Hash = "05rjwvcph0wx0p0hai5z6n9lnyhk3i5yvbvhr51jc8s3k3b6jyi5";
1919 };
2020 latestVersion = { # canary & dev
21− version = "3.4.0.5"; # "Android Studio 3.4 Canary 6"
22− build = "183.5146016";
23− sha256Hash = "1z2asimpsw15iild7c4aqicph6v327qx3ffjgvl2n8vr5rspsns1";
21+ version = "3.4.0.6"; # "Android Studio 3.4 Canary 7"
22+ build = "183.5159543";
23+ sha256Hash = "0r685qqx4w1hwbd8jgrh7ks8bw9m7823ffhd3x6pl7j4b9hpc858";
2424 };
2525in rec {
2626 # Old alias
pkgs/applications/editors/atom/default.nix+1−2
@@ -44,8 +44,7 @@ let
4444 buildCommand = ''
4545 mkdir -p $out/usr/
4646 ar p $src data.tar.xz | tar -C $out -xJ ./usr
47− substituteInPlace $out/usr/share/applications/${pname}.desktop \
48− --replace /usr/share/${pname} $out/bin
47+ sed -i -e "s|Exec=.*$|Exec=$out/bin/${pname}|" $out/usr/share/applications/${pname}.desktop
4948 mv $out/usr/* $out/
5049 rm -r $out/share/lintian
5150 rm -r $out/usr/
pkgs/applications/editors/sublime/3/common.nix+24−5
@@ -1,14 +1,14 @@
11{buildVersion, x32sha256, x64sha256}:
22
3−{ fetchurl, stdenv, glib, xorg, cairo, gtk2, pango, makeWrapper, openssl, bzip2,
3+{ fetchurl, stdenv, glib, xorg, cairo, gtk2, gtk3, pango, makeWrapper, wrapGAppsHook, openssl, bzip2,
44 pkexecPath ? "/run/wrappers/bin/pkexec", libredirect,
55 gksuSupport ? false, gksu, unzip, zip, bash}:
66
77assert gksuSupport -> gksu != null;
88
99let
10−
11− libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo pango];
10+ legacy = stdenv.lib.versionOlder buildVersion "3181";
11+ libPath = stdenv.lib.makeLibraryPath [ glib xorg.libX11 (if legacy then gtk2 else gtk3) cairo pango ];
1212 redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]
1313 ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo";
1414in let
@@ -36,11 +36,14 @@ in let
3636
3737 dontStrip = true;
3838 dontPatchELF = true;
39− buildInputs = [ makeWrapper zip unzip ];
39+ buildInputs = stdenv.lib.optionals (!legacy) [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH
40+ nativeBuildInputs = [ makeWrapper zip unzip ] ++ stdenv.lib.optional (!legacy) wrapGAppsHook;
4041
4142 # make exec.py in Default.sublime-package use own bash with
4243 # an LD_PRELOAD instead of "/bin/bash"
4344 patchPhase = ''
45+ runHook prePatch
46+
4447 mkdir Default.sublime-package-fix
4548 ( cd Default.sublime-package-fix
4649 unzip -q ../Packages/Default.sublime-package
@@ -50,9 +53,13 @@ in let
5053 zip -q ../Packages/Default.sublime-package **/*
5154 )
5255 rm -r Default.sublime-package-fix
56+
57+ runHook postPatch
5358 '';
5459
5560 buildPhase = ''
61+ runHook preBuild
62+
5663 for i in sublime_text plugin_host crash_reporter; do
5764 patchelf \
5865 --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
@@ -62,9 +69,13 @@ in let
6269
6370 # Rewrite pkexec|gksudo argument. Note that we can't delete bytes in binary.
6471 sed -i -e 's,/bin/cp\x00,cp\x00\x00\x00\x00\x00\x00,g' sublime_text
72+
73+ runHook postBuild
6574 '';
6675
6776 installPhase = ''
77+ runHook preInstall
78+
6879 # Correct sublime_text.desktop to exec `sublime' instead of /opt/sublime_text
6980 sed -e "s,/opt/sublime_text/sublime_text,$out/sublime_text," -i sublime_text.desktop
7081
@@ -74,12 +85,20 @@ in let
7485 # We can't just call /usr/bin/env bash because a relocation error occurs
7586 # when trying to run a build from within Sublime Text
7687 ln -s ${bash}/bin/bash $out/sublime_bash
88+
89+ runHook postInstall
90+ '';
91+
92+ dontWrapGApps = true; # non-standard location, need to wrap the executables manually
93+
94+ postFixup = ''
7795 wrapProgram $out/sublime_bash \
7896 --set LD_PRELOAD "${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1"
7997
8098 wrapProgram $out/sublime_text \
8199 --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
82− --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects}
100+ --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} \
101+ ${stdenv.lib.optionalString (!legacy) ''"''${gappsWrapperArgs[@]}"''}
83102
84103 # Without this, plugin_host crashes, even though it has the rpath
85104 wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl.out}/lib/libssl.so:${bzip2.out}/lib/libbz2.so
pkgs/applications/editors/sublime/3/packages.nix+3−3
@@ -5,9 +5,9 @@ let
55in
66 rec {
77 sublime3-dev = common {
8− buildVersion = "3176";
9− x32sha256 = "08asz13888d4ddsz81cfk7k3319dabzz1kgbnshw0756pvyrvr23";
10− x64sha256 = "0cppkh5jx2g8f6jyy1bs81fpb90l0kn5m7y3skackpjdxhd7rwbl";
8+ buildVersion = "3183";
9+ x32sha256 = "0rgah7iq9y3afbawcb723d2b7m56lz0ji5l8klxvkp59c9rphqxh";
10+ x64sha256 = "1n3zarkhs22p2vi32fswb0fvcn9fzivmziw6zcvjy02c0rmxmdkz";
1111 } {};
1212
1313 sublime3 = common {
pkgs/applications/editors/vscode/default.nix+19−13
@@ -1,9 +1,9 @@
11{ stdenv, lib, fetchurl, unzip, atomEnv, makeDesktopItem,
2− gtk2, wrapGAppsHook, libXScrnSaver, libxkbfile, libsecret }:
2+ gtk2, wrapGAppsHook, libXScrnSaver, libxkbfile, libsecret,
3+ isInsiders ? false }:
34
45let
5− version = "1.29.1";
6− channel = "stable";
6+ executableName = "code" + lib.optionalString isInsiders "-insiders";
77
88 plat = {
99 "i686-linux" = "linux-ia32";
@@ -31,19 +31,24 @@ let
3131in
3232 stdenv.mkDerivation rec {
3333 name = "vscode-${version}";
34+ version = "1.29.1";
3435
3536 src = fetchurl {
3637 name = "VSCode_${version}_${plat}.${archive_fmt}";
37− url = "https://vscode-update.azurewebsites.net/${version}/${plat}/${channel}";
38+ url = "https://vscode-update.azurewebsites.net/${version}/${plat}/stable";
3839 inherit sha256;
3940 };
4041
42+ passthru = {
43+ inherit executableName;
44+ };
45+
4146 desktopItem = makeDesktopItem {
42− name = "code";
43− exec = "code";
44− icon = "code";
47+ name = executableName;
48+ exec = executableName;
49+ icon = "@out@/share/pixmaps/code.png";
4550 comment = "Code editor redefined and optimized for building and debugging modern web and cloud applications";
46− desktopName = "Visual Studio Code";
51+ desktopName = "Visual Studio Code" + lib.optionalString isInsiders " Insiders";
4752 genericName = "Text Editor";
4853 categories = "GNOME;GTK;Utility;TextEditor;Development;";
4954 };
@@ -56,17 +61,18 @@ in
5661 if stdenv.hostPlatform.system == "x86_64-darwin" then ''
5762 mkdir -p $out/lib/vscode $out/bin
5863 cp -r ./* $out/lib/vscode
59− ln -s $out/lib/vscode/Contents/Resources/app/bin/code $out/bin
64+ ln -s $out/lib/vscode/Contents/Resources/app/bin/${executableName} $out/bin
6065 '' else ''
6166 mkdir -p $out/lib/vscode $out/bin
6267 cp -r ./* $out/lib/vscode
6368
64− substituteInPlace $out/lib/vscode/bin/code --replace '"$CLI" "$@"' '"$CLI" "--skip-getting-started" "$@"'
69+ substituteInPlace $out/lib/vscode/bin/${executableName} --replace '"$CLI" "$@"' '"$CLI" "--skip-getting-started" "$@"'
6570
66− ln -s $out/lib/vscode/bin/code $out/bin
71+ ln -s $out/lib/vscode/bin/${executableName} $out/bin
6772
6873 mkdir -p $out/share/applications
69− cp $desktopItem/share/applications/* $out/share/applications
74+ substitute $desktopItem/share/applications/${executableName}.desktop $out/share/applications/${executableName}.desktop \
75+ --subst-var out
7076
7177 mkdir -p $out/share/pixmaps
7278 cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png
@@ -76,7 +82,7 @@ in
7682 patchelf \
7783 --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
7884 --set-rpath "${rpath}" \
79− $out/lib/vscode/code
85+ $out/lib/vscode/${executableName}
8086
8187 patchelf \
8288 --set-rpath "${rpath}" \
pkgs/applications/editors/vscode/with-extensions.nix+7−20
@@ -1,4 +1,4 @@
1−{ stdenv, lib, runCommand, buildEnv, vscode, which, writeScript
1+{ stdenv, lib, runCommand, buildEnv, vscode, makeWrapper
22, vscodeExtensions ? [] }:
33
44/*
@@ -43,6 +43,7 @@
4343
4444let
4545
46+ inherit (vscode) executableName;
4647 wrappedPkgVersion = lib.getVersion vscode;
4748 wrappedPkgName = lib.removeSuffix "-${wrappedPkgVersion}" vscode.name;
4849
@@ -51,22 +52,12 @@ let
5152 paths = vscodeExtensions;
5253 };
5354
54− wrappedExeName = "code";
55− exeName = wrappedExeName;
56−
57− wrapperExeFile = writeScript "${exeName}" ''
58− #!${stdenv.shell}
59− exec ${vscode}/bin/${wrappedExeName} \
60− --extensions-dir "${combinedExtensionsDrv}/share/${wrappedPkgName}/extensions" \
61− "$@"
62− '';
63−
6455in
6556
6657# When no extensions are requested, we simply redirect to the original
6758# non-wrapped vscode executable.
6859runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" {
69− buildInputs = [ vscode which ];
60+ buildInputs = [ vscode makeWrapper ];
7061 dontPatchELF = true;
7162 dontStrip = true;
7263 meta = vscode.meta;
@@ -75,13 +66,9 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" {
7566 mkdir -p "$out/share/applications"
7667 mkdir -p "$out/share/pixmaps"
7768
78− ln -sT "${vscode}/share/applications/code.desktop" "$out/share/applications/code.desktop"
7969 ln -sT "${vscode}/share/pixmaps/code.png" "$out/share/pixmaps/code.png"
80− ${if [] == vscodeExtensions
81− then ''
82− ln -sT "${vscode}/bin/${wrappedExeName}" "$out/bin/${exeName}"
83− ''
84− else ''
85− ln -sT "${wrapperExeFile}" "$out/bin/${exeName}"
86− ''}
70+ ln -sT "${vscode}/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop"
71+ makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" \
72+ --add-flags \
73+ "--extensions-dir ${combinedExtensionsDrv}/share/${wrappedPkgName}/extensions"
8774''
pkgs/applications/graphics/gimp/default.nix+9−4
@@ -3,7 +3,7 @@
33, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info
44, python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2
55, harfbuzz, mypaint-brushes, libwebp, libheif, libgudev, openexr
6−, AppKit, Cocoa, gtk-mac-integration }:
6+, AppKit, Cocoa, gtk-mac-integration-gtk2, cf-private }:
77
88let
99 inherit (python2Packages) pygtk wrapPython python;
@@ -23,8 +23,11 @@ in stdenv.mkDerivation rec {
2323 freetype fontconfig lcms libpng libjpeg poppler poppler_data libtiff openexr
2424 libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp libheif
2525 python pygtk libexif xorg.libXpm glib-networking libmypaint mypaint-brushes
26− ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ]
27− ++ stdenv.lib.optionals stdenv.isLinux [ libgudev ];
26+ ] ++ stdenv.lib.optionals stdenv.isDarwin [
27+ # cf-private is needed to get some things not in swift-corefoundation.
28+ # For instance _OBJC_CLASS_$_NSArray is missing.
29+ AppKit Cocoa gtk-mac-integration-gtk2 cf-private
30+ ] ++ stdenv.lib.optionals stdenv.isLinux [ libgudev ];
2831
2932 pythonPath = [ pygtk ];
3033
@@ -69,7 +72,9 @@ in stdenv.mkDerivation rec {
6972 "--with-icc-directory=/var/run/current-system/sw/share/color/icc"
7073 ];
7174
72− doCheck = true;
75+ # on Darwin,
76+ # test-eevl.c:64:36: error: initializer element is not a compile-time constant
77+ doCheck = !stdenv.isDarwin;
7378
7479 enableParallelBuilding = true;
7580
pkgs/applications/graphics/jpeginfo/default.nixnew file+21
@@ -0,0 +1,21 @@
1+{ stdenv, fetchurl, libjpeg }:
2+
3+stdenv.mkDerivation rec {
4+ name = "jpeginfo-${version}";
5+ version = "1.6.1";
6+
7+ src = fetchurl {
8+ url = "https://www.kokkonen.net/tjko/src/${name}.tar.gz";
9+ sha256 = "0lvn3pnylyj56158d3ix9w1gas1s29klribw9bz1xym03p7k37k2";
10+ };
11+
12+ buildInputs = [ libjpeg ];
13+
14+ meta = with stdenv.lib; {
15+ description = "Prints information and tests integrity of JPEG/JFIF files";
16+ homepage = "https://www.kokkonen.net/tjko/projects.html";
17+ license = licenses.gpl2Plus;
18+ maintainers = [ maintainers.bjornfor ];
19+ platforms = platforms.all;
20+ };
21+}
pkgs/applications/graphics/yed/default.nix+6−7
@@ -1,16 +1,15 @@
1−{ stdenv, requireFile, makeWrapper, unzip, jre }:
1+{ stdenv, fetchzip, makeWrapper, unzip, jre }:
22
33stdenv.mkDerivation rec {
44 name = "yEd-${version}";
5− version = "3.18.1.1";
5+ version = "3.18.2";
66
7− src = requireFile {
8− name = "${name}.zip";
9− url = "https://www.yworks.com/en/products/yfiles/yed/";
10− sha256 = "0jl0c18jkmy21ka5xgki8dqq2v8cy63qvmx3x01wrhiplmczn97y";
7+ src = fetchzip {
8+ url = "https://www.yworks.com/resources/yed/demo/${name}.zip";
9+ sha256 = "1csj19j9mfx4jfc949sz672h8lnfj217nn32d54cxj8llks82ycy";
1110 };
1211
13− nativeBuildInputs = [ unzip makeWrapper ];
12+ nativeBuildInputs = [ makeWrapper unzip ];
1413
1514 installPhase = ''
1615 mkdir -p $out/yed
pkgs/applications/misc/dmrconfig/default.nix+7−4
@@ -3,13 +3,13 @@
33
44stdenv.mkDerivation rec {
55 name = "dmrconfig-${version}";
6− version = "2018-11-07";
6+ version = "1.0";
77
88 src = fetchFromGitHub {
99 owner = "sergev";
1010 repo = "dmrconfig";
11− rev = "b58985d3c848b927e91699d97f96d9de014c3fc7";
12− sha256 = "083f21hz6vqjpndkn27nsjnhnc5a4bw0cr26ryfqcvz275rj4k18";
11+ rev = version;
12+ sha256 = "1bb3hahfdb5phxyzp1m5ibqwz3mcqplzaibb1aq7w273xcfrd9l9";
1313 };
1414
1515 buildInputs = [
@@ -17,7 +17,10 @@ stdenv.mkDerivation rec {
1717 ];
1818
1919 preConfigure = ''
20− substituteInPlace Makefile --replace /usr/local/bin/dmrconfig $out/bin/dmrconfig
20+ substituteInPlace Makefile \
21+ --replace /usr/local/bin/dmrconfig $out/bin/dmrconfig \
22+ --replace "\$(shell git describe --tags --abbrev=0)" ${version} \
23+ --replace "\$(shell git rev-list HEAD --count)" 0
2124 '';
2225
2326 installPhase = ''
pkgs/applications/misc/hivemind/default.nixnew file+21
@@ -0,0 +1,21 @@
1+{ stdenv, buildGoPackage, fetchFromGitHub }:
2+
3+buildGoPackage rec {
4+ name = "hivemind-${version}";
5+ version = "1.0.4";
6+ goPackagePath = "github.com/DarthSim/hivemind";
7+
8+ src = fetchFromGitHub {
9+ owner = "DarthSim";
10+ repo = "hivemind";
11+ rev = "v${version}";
12+ sha256 = "1z2izvyf0j3gi0cas5v22kkmkls03sg67182k8v3p6kwhzn0jw67";
13+ };
14+
15+ meta = with stdenv.lib; {
16+ homepage = https://github.com/DarthSim/;
17+ description = "Process manager for Procfile-based applications";
18+ license = with licenses; [ mit ];
19+ maintainers = [ maintainers.sveitser ];
20+ };
21+}
pkgs/applications/misc/octoprint/default.nix+51−98
@@ -1,91 +1,62 @@
1−{ stdenv, fetchFromGitHub, python2 }:
1+{ stdenv, lib, fetchFromGitHub, python2 }:
22
33let
4−
5− pythonPackages = python2.pkgs.override {
6− overrides = self: super: with self; {
7− backports_ssl_match_hostname = super.backports_ssl_match_hostname.overridePythonAttrs (oldAttrs: rec {
8− version = "3.4.0.2";
9− src = oldAttrs.src.override {
10− inherit version;
11− sha256 = "07410e7fb09aab7bdaf5e618de66c3dac84e2e3d628352814dc4c37de321d6ae";
12− };
13− });
14−
15− flask = super.flask.overridePythonAttrs (oldAttrs: rec {
16− version = "0.12.4";
17− src = oldAttrs.src.override {
18− inherit version;
19− sha256 = "2ea22336f6d388b4b242bc3abf8a01244a8aa3e236e7407469ef78c16ba355dd";
20− };
21− });
22−
23− tornado = buildPythonPackage rec {
24− pname = "tornado";
25− version = "4.0.2";
26−
27− propagatedBuildInputs = [ backports_ssl_match_hostname certifi ];
28−
29− src = fetchPypi {
30− inherit pname version;
31− sha256 = "1yhvn8i05lp3b1953majg48i8pqsyj45h34aiv59hrfvxcj5234h";
32− };
33− };
34−
35− flask_login = buildPythonPackage rec {
36− pname = "Flask-Login";
37− version = "0.2.2";
38−
39− src = fetchPypi {
40− inherit pname version;
41− sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p";
42− };
43−
44− propagatedBuildInputs = [ flask ];
45− checkInputs = [ nose ];
46−
47− # No tests included
48− doCheck = false;
49− };
50−
51− jinja2 = buildPythonPackage rec {
52− pname = "Jinja2";
53− version = "2.8.1";
54−
55− src = fetchPypi {
56− inherit pname version;
57− sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m";
58− };
59−
60− propagatedBuildInputs = [ markupsafe ];
61−
62− # No tests included
63− doCheck = false;
64− };
65−
66− pylru = super.pylru.overridePythonAttrs (oldAttrs: rec {
67− version = "1.0.9";
4+ mkOverride = attrname: version: sha256:
5+ self: super: {
6+ ${attrname} = super.${attrname}.overridePythonAttrs (oldAttrs: {
7+ inherit version;
688 src = oldAttrs.src.override {
69− inherit version;
70− sha256 = "71376192671f0ad1690b2a7427d39a29b1df994c8469a9b46b03ed7e28c0172c";
9+ inherit version sha256;
7110 };
7211 });
7312 };
13+
14+ py = python2.override {
15+ packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([
16+ (mkOverride "flask" "0.10.1" "0wrkavjdjndknhp8ya8j850jq7a1cli4g5a93mg8nh1xz2gq50sc")
17+ (mkOverride "flask_login" "0.2.11" "1rg3rsjs1gwi2pw6vr9jmhaqm9b3vc9c4hfcsvp4y8agbh7g3mc3")
18+ (mkOverride "jinja2" "2.8.1" "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m")
19+ (mkOverride "pylru" "1.0.9" "0b0pq0l7xv83dfsajsc49jcxzc99kb9jfx1a1dlx22hzcy962dvi")
20+ (mkOverride "sarge" "0.1.4" "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar")
21+ (mkOverride "tornado" "4.5.3" "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d")
22+ ]);
7423 };
7524
76−in pythonPackages.buildPythonApplication rec {
25+ ignoreVersionConstraints = [
26+ "Click"
27+ "Flask-Assets"
28+ "Flask-Babel"
29+ "Flask-Principal"
30+ "PyYAML"
31+ "emoji"
32+ "flask"
33+ "future"
34+ "futures"
35+ "pkginfo"
36+ "psutil"
37+ "pyserial"
38+ "python-dateutil"
39+ "requests"
40+ "rsa"
41+ "scandir"
42+ "semantic_version"
43+ "websocket-client"
44+ "werkzeug"
45+ "wrapt"
46+ ];
47+
48+in py.pkgs.buildPythonApplication rec {
7749 pname = "OctoPrint";
78− version = "1.3.8";
50+ version = "1.3.9";
7951
8052 src = fetchFromGitHub {
81− owner = "foosel";
82− repo = "OctoPrint";
83− rev = version;
84− sha256 = "00zd5yrlihwfd3ly0mxibr77ffa8r8vkm6jhml2ml43dqb99caa3";
53+ owner = "foosel";
54+ repo = "OctoPrint";
55+ rev = version;
56+ sha256 = "1yqbsfmkx4wiykjrh66a05lhn15qhpc9ay67l37kv8bhdqf2xkj4";
8557 };
8658
87− # We need old Tornado
88− propagatedBuildInputs = with pythonPackages; [
59+ propagatedBuildInputs = with py.pkgs; [
8960 awesome-slugify flask_assets rsa requests pkginfo watchdog
9061 semantic-version flask_principal werkzeug flaskbabel tornado
9162 psutil pyserial flask_login netaddr markdown sockjs-tornado
@@ -94,31 +65,13 @@ in pythonPackages.buildPythonApplication rec {
9465 frozendict
9566 ];
9667
97− checkInputs = with pythonPackages; [ nose mock ddt ];
68+ checkInputs = with py.pkgs; [ nose mock ddt ];
9869
99− # Jailbreak dependencies.
10070 postPatch = ''
101− sed -i \
102− -e 's,pkginfo>=[^"]*,pkginfo,g' \
103− -e 's,Flask-Principal>=[^"]*,Flask-Principal,g' \
104− -e 's,websocket-client>=[^"]*,websocket-client,g' \
105− -e 's,Click>=[^"]*,Click,g' \
106− -e 's,rsa>=[^"]*,rsa,g' \
107− -e 's,flask>=[^"]*,flask,g' \
108− -e 's,Flask-Babel>=[^"]*,Flask-Babel,g' \
109− -e 's,Flask-Assets>=[^"]*,Flask-Assets,g' \
110− -e 's,PyYAML>=[^"]*,PyYAML,g' \
111− -e 's,scandir>=[^"]*,scandir,g' \
112− -e 's,werkzeug>=[^"]*,werkzeug,g' \
113− -e 's,psutil==[^"]*,psutil,g' \
114− -e 's,requests>=[^"]*,requests,g' \
115− -e 's,future>=[^"]*,future,g' \
116− -e 's,pyserial>=[^"]*,pyserial,g' \
117− -e 's,semantic_version>=[^"]*,semantic_version,g' \
118− -e 's,wrapt>=[^"]*,wrapt,g' \
119− -e 's,python-dateutil>=[^"]*,python-dateutil,g' \
120− -e 's,emoji>=[^"]*,emoji,g' \
121− -e 's,futures>=[^"]*,futures,g' \
71+ sed -r -i \
72+ ${lib.concatStringsSep "\n" (map (e:
73+ ''-e 's@${e}[<>=]+.*@${e}",@g' \''
74+ ) ignoreVersionConstraints)}
12275 setup.py
12376 '';
12477
pkgs/applications/misc/octoprint/plugins.nix+27−3
@@ -1,8 +1,10 @@
1−{ stdenv, fetchFromGitHub, octoprint, pythonPackages }:
1+{ stdenv, fetchFromGitHub, octoprint, python2Packages }:
22
33let
4− buildPlugin = args: pythonPackages.buildPythonApplication (args // {
5− buildInputs = (args.buildInputs or []) ++ [ octoprint ];
4+ buildPlugin = args: python2Packages.buildPythonPackage (args // {
5+ propagatedBuildInputs = (args.propagatedBuildInputs or []) ++ [ octoprint ];
6+ # none of the following have tests
7+ doCheck = false;
68 });
79
810 self = {
@@ -42,6 +44,28 @@ let
4244 };
4345 };
4446
47+ mqtt = buildPlugin rec {
48+ name = "OctoPrint-MQTT-${version}";
49+ version = "0.8.0";
50+
51+ src = fetchFromGitHub {
52+ owner = "OctoPrint";
53+ repo = "OctoPrint-MQTT";
54+ rev = version;
55+ sha256 = "1318pgwy39gkdqgll3q5lwm7avslgdwyiwb5v8m23cgyh5w8cjq7";
56+ };
57+
58+ propagatedBuildInputs = with python2Packages; [ paho-mqtt ];
59+
60+ meta = with stdenv.lib; {
61+ homepage = https://github.com/OctoPrint/OctoPrint-MQTT;
62+ description = "Publish printer status MQTT";
63+ platforms = platforms.all;
64+ license = licenses.agpl3;
65+ maintainers = with maintainers; [ peterhoeg ];
66+ };
67+ };
68+
4569 titlestatus = buildPlugin rec {
4670 name = "OctoPrint-TitleStatus-${version}";
4771 version = "0.0.4";
pkgs/applications/misc/polar-bookshelf/default.nix+2−2
@@ -10,12 +10,12 @@
1010
1111stdenv.mkDerivation rec {
1212 name = "polar-bookshelf-${version}";
13− version = "1.0.13";
13+ version = "1.1.0";
1414
1515 # fetching a .deb because there's no easy way to package this Electron app
1616 src = fetchurl {
1717 url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-bookshelf-${version}-amd64.deb";
18− sha256 = "0dh7pw8ncm8kr9anb6jqw7rr4lxgmq8a40c9zlrhzyswdpvnp1g7";
18+ sha256 = "13h6c9sqbc7c5p1rc1wm7wza249sh0j04aq67n6gnqg5p22a7pmw";
1919 };
2020
2121 buildInputs = [
pkgs/applications/misc/qlcplus/default.nix+1−1
@@ -25,7 +25,7 @@ mkDerivation rec {
2525 patchShebangs .
2626 sed -i -e '/unix:!macx:INSTALLROOT += \/usr/d' \
2727 -e "s@\$\$LIBSDIR/qt4/plugins@''${qtPluginPrefix}@" \
28− -e "s@/etc/udev/rules.d@''${out}/lib/udev@" \
28+ -e "s@/etc/udev/rules.d@''${out}/lib/udev/rules.d@" \
2929 variables.pri
3030 '';
3131
pkgs/applications/misc/soapyrtlsdr/default.nixnew file+30
@@ -0,0 +1,30 @@
1+{ stdenv, fetchFromGitHub, cmake, pkgconfig
2+, rtl-sdr, soapysdr
3+} :
4+
5+let
6+ version = "0.2.5";
7+
8+in stdenv.mkDerivation {
9+ name = "soapyrtlsdr-${version}";
10+
11+ src = fetchFromGitHub {
12+ owner = "pothosware";
13+ repo = "SoapyRTLSDR";
14+ rev = "soapy-rtlsdr-${version}";
15+ sha256 = "1wyghfqq3vcbjn5w06h5ik62m6555inrlkyrsnk2r78865xilkv3";
16+ };
17+
18+ nativeBuildInputs = [ cmake pkgconfig ];
19+ buildInputs = [ rtl-sdr soapysdr ];
20+
21+ cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];
22+
23+ meta = with stdenv.lib; {
24+ homepage = https://github.com/pothosware/SoapyRTLSDR;
25+ description = "SoapySDR plugin for RTL-SDR devices";
26+ license = licenses.mit;
27+ maintainers = with maintainers; [ ragge ];
28+ platforms = platforms.linux;
29+ };
30+}
pkgs/applications/networking/browsers/chromium/plugins.nix+2−2
@@ -100,11 +100,11 @@ let
100100
101101 flash = stdenv.mkDerivation rec {
102102 name = "flashplayer-ppapi-${version}";
103− version = "31.0.0.153";
103+ version = "32.0.0.101";
104104
105105 src = fetchzip {
106106 url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
107− sha256 = "0c7vh1h9lzx09njf7w1acvj2v91girlzflqxzli8nxza7pd1zb2v";
107+ sha256 = "1bmmjraqzdz03jzbgs1l932gka1zhiyiis06r4yi4f93mdy31w72";
108108 stripRoot = false;
109109 };
110110
pkgs/applications/networking/browsers/chromium/upstream-info.nix+9−9
@@ -1,18 +1,18 @@
11# This file is autogenerated from update.sh in the same directory.
22{
33 beta = {
4− sha256 = "0nxxqfncw9ci3rhg8fiqaxy6zvh9x3j10lw8yw7c0cg2yni10qsp";
5− sha256bin64 = "0frcaplyzhkxzzcfcf0vigqpzixar4jg9hhrh4i8z8vx2gnxkwwy";
6− version = "71.0.3578.53";
4+ sha256 = "03ddfxxzh8pxil9n28y8nkzl8x0kb5bzzjy4mihg448dflh3anq2";
5+ sha256bin64 = "147lh1way8db0j0m6wbpfzmfsvvlsjb29cjgf7s9hljb00wqv6ay";
6+ version = "71.0.3578.80";
77 };
88 dev = {
9− sha256 = "11bsn77kvjqdwpiwjf4gaindfj0sx932wp6g7cald0638wdz7pqv";
10− sha256bin64 = "1j5pd8imc35ch7l3jmnmjm2yda2xzdwha5im34240wm6rrdr2v2j";
11− version = "72.0.3610.2";
9+ sha256 = "0whw1kq5gd07k061ycfdn7bygahbl6zqa54wkz2lqh73yknbbnj4";
10+ sha256bin64 = "0hlfzzf7kx90jw0zin685c4haiv262hf9a4sj6fmb2yhj21hbp87";
11+ version = "72.0.3622.0";
1212 };
1313 stable = {
14− sha256 = "0bwlq5xii26b3yngwkwb7l2mx03c30ffpym4xg0hcci8ry7zhpj4";
15− sha256bin64 = "1gnhjbpkp2gn3y5pingwv153bakidq60pr4fj2iq1kniyllsmmpg";
16− version = "70.0.3538.110";
14+ sha256 = "03ddfxxzh8pxil9n28y8nkzl8x0kb5bzzjy4mihg448dflh3anq2";
15+ sha256bin64 = "1rnw3whn2aaxxb4w3s2nf0wb91qjrq099550j42wig7xa71j6rz4";
16+ version = "71.0.3578.80";
1717 };
1818}
pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix+397−397
@@ -1,995 +1,995 @@
11{
2− version = "64.0b10";
2+ version = "64.0b14";
33 sources = [
4− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ach/firefox-64.0b10.tar.bz2";
4+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ach/firefox-64.0b14.tar.bz2";
55 locale = "ach";
66 arch = "linux-x86_64";
7− sha512 = "e63de6a872ec67b80cc488be329f4a89b56544de02da871904cdbef47cbf65b9aff2f83974ad3b8e661b2361c6cd836279dd006aef95e16c0f85af21dff7bd69";
7+ sha512 = "a2a467acf4d76b09d7f04760dda0ed2e49f31e96166c26bee8efea0cde4dce914deec16a7b6bc3cc8e06b2acc70a250c7db980b180c5ad7b363e8e0334afbfab";
88 }
9− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/af/firefox-64.0b10.tar.bz2";
9+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/af/firefox-64.0b14.tar.bz2";
1010 locale = "af";
1111 arch = "linux-x86_64";
12− sha512 = "7e745d102fbee703e4c065a597a26f225aa8259e5544465b6f131c5f6edc878f652c2f3529f74366d3aa7181c47f4b448287021696168e8c9873b8183300e937";
12+ sha512 = "7a271ec7e0600299fd73101ca2148a5057149deefe5ac5747213791f5cf6a2fecd54e04ee7b3b0bd8d3a5cc3ff8ed852724b602b797d6a8e43128ff2ebc83af8";
1313 }
14− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/an/firefox-64.0b10.tar.bz2";
14+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/an/firefox-64.0b14.tar.bz2";
1515 locale = "an";
1616 arch = "linux-x86_64";
17− sha512 = "8507a65610f8fa2c23c086094ca71936e0249adcde13105ce0ab9879b32434aae38534b90098e40e031dc406de49390824bbbecf17f3a6903dbc065fb5fbe0aa";
17+ sha512 = "418f50d3b71d265d7669a7ab3d4027164dbac85a7970c6fe690fa592c08a33ffdf8feaa6a58e13b28566e8218f2988f134219608d4a1804fe7aef8a154c16f96";
1818 }
19− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ar/firefox-64.0b10.tar.bz2";
19+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ar/firefox-64.0b14.tar.bz2";
2020 locale = "ar";
2121 arch = "linux-x86_64";
22− sha512 = "f5c49d943b0ccaed81389b161ec744dda771adf93c90c5ab09325b7de57744c1814bcb7caa88ea9269e8754ec44bdad5fc948a5a903a77dc0657dd6fc03510cb";
22+ sha512 = "61439fc182462d27a03ad8d9472d96a50336a864915632f8e0c8ac3b0c5e2f7aa6a346ffedc1f0712fcfd6417063b0894e2d8b4f015f85ee1ec4d9ab0ed48c01";
2323 }
24− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/as/firefox-64.0b10.tar.bz2";
24+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/as/firefox-64.0b14.tar.bz2";
2525 locale = "as";
2626 arch = "linux-x86_64";
27− sha512 = "cc5b14798da8a759be04518f97b7ee4995138893ad08c2e0d721212f69de63088e1a08237f9bf4e725d154806441d1a89b1514d4c789bd1381d6caa9737abb94";
27+ sha512 = "64f83e85f4ef5c169f4683e92224134cc260e052f2e837e2e272d052cbddb106ab6a14a985dcad7e9928a7ac17e28b9f847a22df681fc4600183606330012e16";
2828 }
29− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ast/firefox-64.0b10.tar.bz2";
29+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ast/firefox-64.0b14.tar.bz2";
3030 locale = "ast";
3131 arch = "linux-x86_64";
32− sha512 = "8256d617d336d08a6effcad9e445ab0a4a80a747bdd2a85c50eedf3dd2495d41280db0d52bb6563f96c2041320a411b519f0978efd2f7f059ecf40a3fb164ab8";
32+ sha512 = "9a7cff9892fa4fd89bff4b4be462a949d70c6c07eaf4c2373946f8f991e1eb6656d2a7af6ba55a7a4fafeb54988add6a779c01b42861aad37a58b81adbb487fa";
3333 }
34− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/az/firefox-64.0b10.tar.bz2";
34+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/az/firefox-64.0b14.tar.bz2";
3535 locale = "az";
3636 arch = "linux-x86_64";
37− sha512 = "d11f0e0c8967c1562ca9455a23905b4b3a057f7819d2093fe7e60e785aeda718215e636b42e9b60bdcbe1ac89a326d47da5d6559d01c3583865996df4b42fda0";
37+ sha512 = "1b635a7599459e3f270bdec64cf6d9b984fb0b2470c49a3fd3566e1da3ebd4302ae0f0b575f739f9c175a4630f45f31ec39feefc8ce2decfcd84383582171b8d";
3838 }
39− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/be/firefox-64.0b10.tar.bz2";
39+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/be/firefox-64.0b14.tar.bz2";
4040 locale = "be";
4141 arch = "linux-x86_64";
42− sha512 = "335ad773e97afacedb62cb3a4dfbd583732e2bd8408b253143cd99922b116498cc5c55c39c9e2431dd3db39d7cd05f2aa2d769ba334d683bd975fcd4e6395f42";
42+ sha512 = "f9935dd0f3a9ae11812acb03bfb0166e6030872b847cf3cfc29e9b56eea5050cc1e75a898a404deff6b01d8131c112c3dd2df754c197a69fc9f0e0093bf2c128";
4343 }
44− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/bg/firefox-64.0b10.tar.bz2";
44+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/bg/firefox-64.0b14.tar.bz2";
4545 locale = "bg";
4646 arch = "linux-x86_64";
47− sha512 = "5d002e9993f0e1a63742e5a34f96161b43ef58146c28cde4563079bb073f7299551cdf0a9f35a6e961f2dbdbb87c29a7326676ef927ef4737eb9103157f2a7ab";
47+ sha512 = "13b3618c401fd41f8f199444e84eb5bbdd3b50605b30fefbc15819ca54f92c8bb8e542396c2a32d856453e1a01df98d4755fe6c840360ab16a308af1cfe0eef6";
4848 }
49− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/bn-BD/firefox-64.0b10.tar.bz2";
49+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/bn-BD/firefox-64.0b14.tar.bz2";
5050 locale = "bn-BD";
5151 arch = "linux-x86_64";
52− sha512 = "c54af20089bd32eaeb17d8e574b674ffa193842e809eeccb4fe6694c4b3b674371b60ef06f1abde2012465c458a36a624fb9146470cadf2596c3369c3ab05ca0";
52+ sha512 = "ed5492d0f16d45d5e22f9fc5691b1672fa46b7b71389ff80d35b16de9b02320acfd416d44e6186e7fc2ee54099fcfe8a356f302bc049092d9c955f2f0e2b29f2";
5353 }
54− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/bn-IN/firefox-64.0b10.tar.bz2";
54+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/bn-IN/firefox-64.0b14.tar.bz2";
5555 locale = "bn-IN";
5656 arch = "linux-x86_64";
57− sha512 = "fac070b57346188b9aac15257fe1bc30a0b4feec05d80a93fa5f4f0104891ee4ffafd81f8ecd1e55939cce4a10b728b10db0fb1d0be5ba14533e515b798b2d45";
57+ sha512 = "df84b6688aed1dcf4de5ff8eb8d8bf802d5062989259c2255684d329d172c1fc509c1fffbc6fbf7f045f8aeb0b4955a3c12da85140899e0a5d6e6193f2bc4170";
5858 }
59− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/br/firefox-64.0b10.tar.bz2";
59+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/br/firefox-64.0b14.tar.bz2";
6060 locale = "br";
6161 arch = "linux-x86_64";
62− sha512 = "4549764420a4c7b6b6583e5770aa246ac1dd24e57f792c03e98d2311d5bfb47869e228c54d4a7fd296101e9a1881b1ac0cbc66dd60bdd63f7149f8d3b175289d";
62+ sha512 = "f8b148f8a86774a0ab8b2f7590b6d76feb9d2cef99629e76b6fb86fd1195de86aa6693c03655ec4dcc9d062978c542d13d55c2ba7573242d2793f8f71bc9b34a";
6363 }
64− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/bs/firefox-64.0b10.tar.bz2";
64+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/bs/firefox-64.0b14.tar.bz2";
6565 locale = "bs";
6666 arch = "linux-x86_64";
67− sha512 = "fa8e664ecbef781ef5ecbee5ad692e37640c2537c35ece772fadddc2e4d79391f756f28891f0c22c16964f247aa787a096e28a662fc08c3f6b8a971a43dc1876";
67+ sha512 = "150783ad5f748514f46743b7d1bfddd63175cd8b17eedc6b4f1049ac9fdd4d4b06288411fa894f09e18c0b66c2d03dfabe769bd77f909062a36ca78af9b1b60c";
6868 }
69− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ca/firefox-64.0b10.tar.bz2";
69+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ca/firefox-64.0b14.tar.bz2";
7070 locale = "ca";
7171 arch = "linux-x86_64";
72− sha512 = "fd7072341f3451481f4e50e986bf02f45541730db7320bace3d3a343014e01a28595cf0ace6bad1a099504fd9943a5cece2833e4d156122db8bbbf88b7ff3193";
72+ sha512 = "3d4b5ba4f9efb0960a2e7556cb08331f4ae78cd193f065c1c2d8c9d6fdacccc1de5418bc7e9a71ba19d9de7ea78f2ef154a4a95ac58489a8f9990a3ff27c1395";
7373 }
74− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/cak/firefox-64.0b10.tar.bz2";
74+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/cak/firefox-64.0b14.tar.bz2";
7575 locale = "cak";
7676 arch = "linux-x86_64";
77− sha512 = "a9920a8d8ca455b85accc51e4337d6813de263b432decd5b2d275b0c272ede7351c187299cbd7c0745e6cfe356b793f37335bb2840b23b8ff4ddaeca4e8a9332";
77+ sha512 = "a21f14531c8e77695f49cfd8ba035dee340cec05764dd009000614eb3b1e5ea73c6c677dda6d13bce7805e1a17669749a37fe4cca9e6c10db555b6dd0f057af7";
7878 }
79− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/cs/firefox-64.0b10.tar.bz2";
79+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/cs/firefox-64.0b14.tar.bz2";
8080 locale = "cs";
8181 arch = "linux-x86_64";
82− sha512 = "d622c8c1dd679bf90ba7150381a04f70ac0479b261584cd18e17b44261529a8dc023f7a4b2ad8d495cd1f292a0ddc053e4e4daf70cbcf7ab02d10c6aa072a502";
82+ sha512 = "70421e5d7c0ae97a941b9b008afdacbc883b4d9c2672610bc08a1b9b31f90c9414aac791c4bf63443dcd8155f90777b1aa29ab8e9d56284b9da7a872d0055f0a";
8383 }
84− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/cy/firefox-64.0b10.tar.bz2";
84+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/cy/firefox-64.0b14.tar.bz2";
8585 locale = "cy";
8686 arch = "linux-x86_64";
87− sha512 = "2812212393f826387206adc0968b0efafb62176b11e55a126ddbccdedb13d8a8656ef1400d262d9120dc50b59a0028c43d97ca45a3da5b167485a9c5378bed9b";
87+ sha512 = "d4b903a0e7391080be7c3dde5d714466550d55c82354d5ce87195ea40e1bc026dd43e5529ec2749761d0578ba76254bd12bcbd127b364202dbd6dac3ec474b89";
8888 }
89− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/da/firefox-64.0b10.tar.bz2";
89+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/da/firefox-64.0b14.tar.bz2";
9090 locale = "da";
9191 arch = "linux-x86_64";
92− sha512 = "52d690a5c4406ee9a0fe69a598a8d4d7b24ff3475676d79de67d45658058a139629ca0c1080fbd849d52dec119691e19a3c79e2a0994f5e96ed057da322b4578";
92+ sha512 = "ac3b7b0957c48b34b2266e46144dc20e8d24e131f86c227ccecc07fb232e02dc4e11b7019df3f0319a90ed58c837bc1f4ab520e91a6279e4e37b7fe6a02f57f0";
9393 }
94− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/de/firefox-64.0b10.tar.bz2";
94+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/de/firefox-64.0b14.tar.bz2";
9595 locale = "de";
9696 arch = "linux-x86_64";
97− sha512 = "e1cf5a56bca2d62e56b2cc9c32da15b3add35ce06dbcd648a241f1d36047c86c13ee5cc0619a2aee22d2652698bf83e5974e330b18b65e00391e913f9975e8b7";
97+ sha512 = "4187a9813c2a948d135f1f8e70d31dc8ee1b8ecdd3a07905e7265533e6df77fa68b5ec09ca7525a9a642758c99e91d3118d02cab23468c9e383e2bdc9389d457";
9898 }
99− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/dsb/firefox-64.0b10.tar.bz2";
99+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/dsb/firefox-64.0b14.tar.bz2";
100100 locale = "dsb";
101101 arch = "linux-x86_64";
102− sha512 = "d0a07800b6a25683effe02c4222215e6af478b0582d0fa53e25e74f337966edc33add3dd907b9831038e4d1349a6828148f61e4e4413cece20bc5d160e0269ae";
102+ sha512 = "8aee6ad9200054c3124bbc227fb3c64e4a2665ce68616c145c7ea7eb71d35aae3846068616ec39d8b80fc29adee954c4ea31fbe5491169e39a70988866e16133";
103103 }
104− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/el/firefox-64.0b10.tar.bz2";
104+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/el/firefox-64.0b14.tar.bz2";
105105 locale = "el";
106106 arch = "linux-x86_64";
107− sha512 = "3c5b88c1bb6028735e7594d64dbc5fff9a9fb28ee02abe912c18c1d9e4f8266a78f0c0636e9dc058063fb79982a7b13666b2287e9bf89953df9511c2ea8ea855";
107+ sha512 = "85e9efc9615d6b1cc12af25e8a4051ef885e2f1b535ce9d2f9aee16162aee91672e6230774343991896f993dc93ff10ccc2e24d7c3ff13ed1acc93c7537dad26";
108108 }
109− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/en-CA/firefox-64.0b10.tar.bz2";
109+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/en-CA/firefox-64.0b14.tar.bz2";
110110 locale = "en-CA";
111111 arch = "linux-x86_64";
112− sha512 = "9fdd11055d0ee06f27b080f813d2eda68637c8028c20b2a7b4122e4b3b4398c22d5339f54d25ab4d221c76765e490b83ba30368a7641869d660060c60a18afe7";
112+ sha512 = "8776b5d1286d90522b133ec1923b5f510981d9a9a59f502a421a2e12f0e6fc46af66cb887db37326802e18dfa99ffba823143ffa60ffb03a95f62772af132126";
113113 }
114− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/en-GB/firefox-64.0b10.tar.bz2";
114+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/en-GB/firefox-64.0b14.tar.bz2";
115115 locale = "en-GB";
116116 arch = "linux-x86_64";
117− sha512 = "15a07fd9cee551320e808dbe538519c18caadfe50da7711b576feca337385b623eb958f0d97f04c23a266daf19355e1e2a69a2f24ec3482a2d2d8938e38afd27";
117+ sha512 = "477d56e4f5b7c2c26ecde42388fac36ab1045cb52eb5d0ed5a316dcb148efa8be8eb5deaf37eccd8ea906ef702441af476c43cac795278e6a0071d46c5830861";
118118 }
119− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/en-US/firefox-64.0b10.tar.bz2";
119+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/en-US/firefox-64.0b14.tar.bz2";
120120 locale = "en-US";
121121 arch = "linux-x86_64";
122− sha512 = "e113244031727118e50d5f44515e64e4c8b576e260877d5c9009397b36732095b98a701858a82ac421e56fbc40c2a7b3a2d39e391bddaf49f74f9818e0ab48dd";
122+ sha512 = "e6de3cee9298362fe3a93ccc23ab3ec1a4e8597224c44e2c3f31e1cecacf05270563f988156107c4d4b009a5a8e7f50ba849a94e38518fc30f986f6a73bd06aa";
123123 }
124− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/en-ZA/firefox-64.0b10.tar.bz2";
124+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/en-ZA/firefox-64.0b14.tar.bz2";
125125 locale = "en-ZA";
126126 arch = "linux-x86_64";
127− sha512 = "583d871b48a41e2f21f468f6702484e5875c02f2df9c9eeab4b1faf99fa977d84e4878e673c915f907d131b655f6dcd1875ebc126093589baec2f5091d98e05f";
127+ sha512 = "03944b015f1ed1521dd79c9f3948ba280d6b52cc9655f6e884310e4032a44e4fa38b4ee7ecf8cf50c48f4bb325986835a7002cd7e7e21ae6c1c8d63764478cec";
128128 }
129− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/eo/firefox-64.0b10.tar.bz2";
129+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/eo/firefox-64.0b14.tar.bz2";
130130 locale = "eo";
131131 arch = "linux-x86_64";
132− sha512 = "bdadfe17850e57163ebcd66a3c0ce3e20fc69453df09029d7f31d541d98bc6c3a0a5c98e6902a659e3b54e2669beb6133ef45373221a21eaa3f3f26bea0b892a";
132+ sha512 = "fbc1bd9143f9450c0c42356c20696890a64b333e0506ed959d3531cc4fea7b50fe379178c7fb51ef5e8449838d2749ed7f3343a3a2617afdb994784192fa8c2d";
133133 }
134− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/es-AR/firefox-64.0b10.tar.bz2";
134+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/es-AR/firefox-64.0b14.tar.bz2";
135135 locale = "es-AR";
136136 arch = "linux-x86_64";
137− sha512 = "61453a1e4141e7a19fd7d31fb8872574b5e3750058675f1b00c6a78e2212f69210f00b15288b68af2de8a56b3d09a63be4650e280a5385a86e0003721126a35c";
137+ sha512 = "3f64bb89d8311b82e93c121256232cf7420d1d8aecf2cbad62b823904f4d0cdcb6192a276e97a2004614294f7893885292736f7e3bbcef9217554f680c0fb509";
138138 }
139− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/es-CL/firefox-64.0b10.tar.bz2";
139+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/es-CL/firefox-64.0b14.tar.bz2";
140140 locale = "es-CL";
141141 arch = "linux-x86_64";
142− sha512 = "98e9e06267e7a6f700acbdb6c1f35a557d7a67e9ad294ff391b0464796f5eb16a41c1c755c3a890e7e82dd94e62af302fd3392b4d553e2490c28c5f15eda0b7c";
142+ sha512 = "705b55e42f4a1982712c1c76f758293e6fa8785938c5270c95285b0e31a7caca1552adeb69ecbbf5e5b5d714ef2e282d00762b147c42a0ffd50c01d56cf9cf6e";
143143 }
144− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/es-ES/firefox-64.0b10.tar.bz2";
144+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/es-ES/firefox-64.0b14.tar.bz2";
145145 locale = "es-ES";
146146 arch = "linux-x86_64";
147− sha512 = "cb37d107d742289f88f6e88afdbda3d18d41c3d37cb6209c5991d20c36a3ccf780376f3ec6cb3c0fddd08c33f35f98c22b71236987a537410abc72a6d46ea7bf";
147+ sha512 = "583337f9a52132f2265337892071bb88557c4bb5a8e827ff2c37c99ad45a51b516ce16a145e7e32c98bba3deadbc79fda03f0dd0f2438b8573774ba60ff61e50";
148148 }
149− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/es-MX/firefox-64.0b10.tar.bz2";
149+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/es-MX/firefox-64.0b14.tar.bz2";
150150 locale = "es-MX";
151151 arch = "linux-x86_64";
152− sha512 = "2969ee93e447c8e9bfd5702f43f32c46bff39a073dec5137d72c5cdce64054c7067b385622a24375966ec13770173317bdb1037237e2de980ae755c9a072a6e8";
152+ sha512 = "2178c0f13035d9050550101a090818b4c3fce5577a13389e93353db2d33b025ab8f5904660f2b1516c2356af4aabef9cd6f403fd5e70560e3f4392db7c873c22";
153153 }
154− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/et/firefox-64.0b10.tar.bz2";
154+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/et/firefox-64.0b14.tar.bz2";
155155 locale = "et";
156156 arch = "linux-x86_64";
157− sha512 = "21a75474dd5ce519ecbd78fc803ee3a80041a0f1eb2daac15c8fc861856a15e365909b40eb250689d5aab4dac9121a9acba6f0805533c71c2a9ef034d566bae6";
157+ sha512 = "405a1592c91e51fedcb68e526f75e9db7cc28e333fc75effa4963d4313216080d863a071b0f881e2d79c990d721503e6f2794d4a374f108aaa65a63ecd9c3346";
158158 }
159− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/eu/firefox-64.0b10.tar.bz2";
159+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/eu/firefox-64.0b14.tar.bz2";
160160 locale = "eu";
161161 arch = "linux-x86_64";
162− sha512 = "5d332bff9b85956b1a1b0c83a27a1c5211d4700f53b1a38f34ec7072c3d000bc6af7cce48a51084ba3a295c9d025730313747ef8e759c5fbf662879bd14aac61";
162+ sha512 = "ad8f627889b4c801dec0e73e4ace1e62f3d7a9e561629b2c7907554740bc74d67e9ea69bebc85d7f79e671c3bf95a3c3bad8585afe590a9d1da28acbe2bd71d5";
163163 }
164− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/fa/firefox-64.0b10.tar.bz2";
164+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/fa/firefox-64.0b14.tar.bz2";
165165 locale = "fa";
166166 arch = "linux-x86_64";
167− sha512 = "1bb42cc21b65dab7b950a877e21a3ee9cff78ba4eae034da4e322930120d8cf5076598801ea609b77cdfa41d084fe62f8322d42da773336597c30102bb61eb10";
167+ sha512 = "91dfbdf6caf769bb45e168630dc028dde338fdaeb25e72a5f1fc98787a877d4c95504f4a0152fc6c7f7b347a4629aa8250c3a328607ddc6340c61f867e7d274f";
168168 }
169− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ff/firefox-64.0b10.tar.bz2";
169+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ff/firefox-64.0b14.tar.bz2";
170170 locale = "ff";
171171 arch = "linux-x86_64";
172− sha512 = "9ced85f9ae63885b49953a733f2081fee55dfc14e12bccc3f3531ff605181c7c04156e272c100ccafe7d88169df1f128efbcf6bee0737afaa28c5ca22a77d286";
172+ sha512 = "5271040348c6fb046e04df8e0181b045a1bdd8ec46979324f8ce98eec6ecde148dbbcd7eb84d7b3102dd10ddabc14360487cc8735c3c3fd84a25aea79b304492";
173173 }
174− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/fi/firefox-64.0b10.tar.bz2";
174+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/fi/firefox-64.0b14.tar.bz2";
175175 locale = "fi";
176176 arch = "linux-x86_64";
177− sha512 = "3624699d5945964f16035a87fd666efa202de1b25a29f742131131f23dfa4b8e38a17c061e3ce95b40bbbd45026c60139b961062a7c5a9d6c01ea3399d56ebf2";
177+ sha512 = "09386d83a26a8dfba3da620460026ce4bf92032dc8e35db28ad0bf9501b11b4c8108350e3823135567df03194573c69483de967d9632e4b22904fa7b2a1450b8";
178178 }
179− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/fr/firefox-64.0b10.tar.bz2";
179+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/fr/firefox-64.0b14.tar.bz2";
180180 locale = "fr";
181181 arch = "linux-x86_64";
182− sha512 = "56c304d07c4f357170620e13c2f986b2c87f39c7dee3a8d0c0ec12bc54dab02ac12d0c9c281a011bace55e36327d64a0710d8fbdc345ea0bc4f9b6f19ff42514";
182+ sha512 = "b14931c9146a5784dca231e9eafbee32845af405baffe2cbabd70fb2369294d797fea8a719a2679945c375f2355773cd4a54b287a823bc7e9896f41e56a2ceaf";
183183 }
184− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/fy-NL/firefox-64.0b10.tar.bz2";
184+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/fy-NL/firefox-64.0b14.tar.bz2";
185185 locale = "fy-NL";
186186 arch = "linux-x86_64";
187− sha512 = "0b75d75abb56ba70b421ca819fc80aff409ccc98b373d91102ad84ca7967aec5e8f01f93f9019c6b223bf9063456d2891a1e04dc43ce34643d6bf9ef162f508f";
187+ sha512 = "7d8f480a075692d93cd03fa9aa1b1359e41782925e91cf670100101edd8e4136e52e004a80cc3f8f36332b16885e97394871fd9b0c553a6868f91a30742fe599";
188188 }
189− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ga-IE/firefox-64.0b10.tar.bz2";
189+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ga-IE/firefox-64.0b14.tar.bz2";
190190 locale = "ga-IE";
191191 arch = "linux-x86_64";
192− sha512 = "0a6a39c1c93cdb67fb413719f32dfc583bfff1a8d98cd330de126f9f1189f594c9b85b51ea210bfe07439a9ebf5b5266edfe0621d6b544fdb25098107435a418";
192+ sha512 = "787a5ec8470f0a06a0b16c1bc3bf11f46e26dc375d0fc0d413d6bd663baa014a313b9fcd511463eb587e39dee1657a534511033d0d92842911334ad9005abe55";
193193 }
194− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/gd/firefox-64.0b10.tar.bz2";
194+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/gd/firefox-64.0b14.tar.bz2";
195195 locale = "gd";
196196 arch = "linux-x86_64";
197− sha512 = "5406d839461cefa0741a89b4b5bf95b6bb09c4096694db7a58540a31ceb0ae63c83d9d23f983056ad7515d17d152777b0851f21149454f5ce67ffd4951e07070";
197+ sha512 = "22ba14425e3a08660562e03a89a4f7edc7e8759378f549b284bc69275f0660fc52ed87f6ca028ed361b619d33446fa7c397843095d4ca4eebdfc4edadef4651e";
198198 }
199− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/gl/firefox-64.0b10.tar.bz2";
199+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/gl/firefox-64.0b14.tar.bz2";
200200 locale = "gl";
201201 arch = "linux-x86_64";
202− sha512 = "f1a383801edd077b57bffcc3ed2ac2f2616be9cbb56d21b842490c40f9aa59796e6301b0b1c51ed4178a9ddb21ecd5daa4ef9155b633d0d1886373519222ce91";
202+ sha512 = "d36f2bf1b3be13d64dfc36f853d67defc8a6d08d93afe41beb7f8b63854baff198fdfee13c65a4e6f9e907f91753844dd41a5503313a1e8c364c8dc3f2de97d1";
203203 }
204− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/gn/firefox-64.0b10.tar.bz2";
204+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/gn/firefox-64.0b14.tar.bz2";
205205 locale = "gn";
206206 arch = "linux-x86_64";
207− sha512 = "37c4eef718dd9e76e87d4ac08f86cffb843aa0a90894e3da46bfaf2b6e89282fa7aedeaec061439f5e61ec57d299966df3185cd266fa1451b57f53788817c1b3";
207+ sha512 = "cef46c079c13fa606a4c5b072ae14f6ab2b578c8b6a43532b38b65547b4fd0618237e84a89d4fe3ea8bfefd8a28984af783b9beaa7478cd42b5cc42784c2f70a";
208208 }
209− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/gu-IN/firefox-64.0b10.tar.bz2";
209+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/gu-IN/firefox-64.0b14.tar.bz2";
210210 locale = "gu-IN";
211211 arch = "linux-x86_64";
212− sha512 = "8a6fc54b0a203b5b03c3cbcbed26f5908af361958cbfe0b2ecdccaa28f7db7b5488b3f9aa47b94da19be0f41bc2ddbef782bfeb6c3a3516f9c41090e45dcad0d";
212+ sha512 = "2bbc4c4af3f927b51c57afdb780bb1ab55357f40f7934b43468933db4ffda115b19fc95a95bbb292ac68c083b6c7ea0ea2feb3a072779fd5416bb41f7938b89a";
213213 }
214− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/he/firefox-64.0b10.tar.bz2";
214+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/he/firefox-64.0b14.tar.bz2";
215215 locale = "he";
216216 arch = "linux-x86_64";
217− sha512 = "00553c2131873c7c0353129e402193b8c285738d2553067233e8919eb617f6cea5344b2b1076629d33b036cff9bda4cb923a89e6a1a38841ea42c5bd3ac7a5a1";
217+ sha512 = "897577cf30f2b6c31f779ffeb74b221513fcea262af77e2ff8beecc53e5c1140b478b530ca1c2b88f98f5b3070509c6e06a7cdf9a1b512c455e2676cd4345c25";
218218 }
219− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/hi-IN/firefox-64.0b10.tar.bz2";
219+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/hi-IN/firefox-64.0b14.tar.bz2";
220220 locale = "hi-IN";
221221 arch = "linux-x86_64";
222− sha512 = "6ddab934e6e6157955d9e2eb8209e2107c6e451f3731ef141eb07757fc60e59b76251a61d8d6b3b918f300588add2413d119005a16d420cb879f279a134c11dd";
222+ sha512 = "998cd2d0b00d372023c223541c4980ce22cff87724c57135de801aa89841db3f348f183e69d6743d3aa19a0ca0e3676a6443ec8263d7a00806f537895256623b";
223223 }
224− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/hr/firefox-64.0b10.tar.bz2";
224+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/hr/firefox-64.0b14.tar.bz2";
225225 locale = "hr";
226226 arch = "linux-x86_64";
227− sha512 = "94d13d40681176087279bbf0e2cf21d4cd1ae442270317174519375b9bf9f9731e98ead581e17a734bf992ce3f71183232b8af3156aea0abf8e07845de56d8bf";
227+ sha512 = "18c4a3483b1561a71dee3408ad8a26a4f16207216af25b48abc892bd5298f8cc43b03005e4f06543985c5ff3fb3b3811176cbfe349ba59b5578675ee1c7ed698";
228228 }
229− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/hsb/firefox-64.0b10.tar.bz2";
229+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/hsb/firefox-64.0b14.tar.bz2";
230230 locale = "hsb";
231231 arch = "linux-x86_64";
232− sha512 = "26cd09691d013306507e4f6166fdeea9f2978cfd12bd9fa40f5a5dfb8b09e6444ea5cd062c09271effed3c3319b197c71cc055fdc8b8fe556de195b0cec0e7ad";
232+ sha512 = "ef1c6a4eb5afdaeb06a6bf98ff411a3b92f86fd0143df3a8473a71a434734c688c1145f150da1db6f9d2ec943f2f6cc906de43a68853a6b0dcdd126638855946";
233233 }
234− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/hu/firefox-64.0b10.tar.bz2";
234+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/hu/firefox-64.0b14.tar.bz2";
235235 locale = "hu";
236236 arch = "linux-x86_64";
237− sha512 = "05a3189384bd7a83b736b826a21241434d88e1e67699c9b3add789a3ae2ccbc715cdf4addfab32fba0c844c238d15f72cb8545a5ab0507054f69e5f8701ff98b";
237+ sha512 = "8b8bf3d8d763135e766360847163541897c44d0039b7929b24bc4c4c70187866ab2a91dcc37e1755048611f15c957bc9801734b289dc0de98aaa712f9efb1170";
238238 }
239− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/hy-AM/firefox-64.0b10.tar.bz2";
239+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/hy-AM/firefox-64.0b14.tar.bz2";
240240 locale = "hy-AM";
241241 arch = "linux-x86_64";
242− sha512 = "9bea0ec38b5a0178c573edb5ccb5d23290b6a04a79d182473dbf60bfa4c98ecf6cf097cb00488462b329bd828df15ad40a2029cd4d81850c0ed30124cd0ac192";
242+ sha512 = "91691bdff5334bf1bf51fca19bf558045b6fda537f4d4094a572c015b486def65591ce2bd6f988a3b5daca357482df3a0ba90cacd3454886d4f747d4b8fc8e8d";
243243 }
244− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ia/firefox-64.0b10.tar.bz2";
244+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ia/firefox-64.0b14.tar.bz2";
245245 locale = "ia";
246246 arch = "linux-x86_64";
247− sha512 = "4603670c8aa74cc722840b6329cd111f954e926359a6e9f483b8a40d73767a9d24760d2bf517e02bb180c462440b8fd871a46e15333f29103ecaf62aa28f3004";
247+ sha512 = "a8b41cfb69f44bcf37c3ea84710a4df5cf183804afc8882e3929ebcd50de23d212f53051716445c42d9eb78d13930cbfdbc46cb1c1b9df20c57815a0433b38b4";
248248 }
249− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/id/firefox-64.0b10.tar.bz2";
249+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/id/firefox-64.0b14.tar.bz2";
250250 locale = "id";
251251 arch = "linux-x86_64";
252− sha512 = "edecd1dd815b93cefbf433c369f4cc02fb2c3c11993c8f66d155acbe90a7068e9208e46dee2324b5ce223b5c2e7593a13a773ab3ba3cffc89ccb312d15ddee5a";
252+ sha512 = "a93348f890565262294d0e45c8189b80075519bc631184de4eb5258945fe5542a9412dfc2a1eb4eef97802efce995ed53a3c3b13c5d0784e74ebe5a4aa040695";
253253 }
254− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/is/firefox-64.0b10.tar.bz2";
254+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/is/firefox-64.0b14.tar.bz2";
255255 locale = "is";
256256 arch = "linux-x86_64";
257− sha512 = "d528fefe33aa41d36339441ff036d86dfb19405881011aa51731149414797c8206a112f824fe3f7a0578955e8a4d462d9c9e79f08dd478170fa3f5029cf12dda";
257+ sha512 = "6d9a6561f898689e20105da5ddbc4740e6af53d7f0b3df9c7a91fae241c56e3babdf6c82733249ba4433ede312792643d9da5e291b8c9fb884f3178a2670ffb9";
258258 }
259− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/it/firefox-64.0b10.tar.bz2";
259+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/it/firefox-64.0b14.tar.bz2";
260260 locale = "it";
261261 arch = "linux-x86_64";
262− sha512 = "a2226c02ee56897a5fb47222f03c7f72f6606321b7b82909eea206c37c9842931ecfd203088416bcf0e2b0d2bac7dae5fce2179408225f6ecd9d213635a5f0c6";
262+ sha512 = "b1c404d585c245d0df17531587bccdecc8e6d548de149bfc9755539e66a8d74769e12b2af95ccbc0ac062923ee6abb259e9bac5a556c40341e2c64dcb710228d";
263263 }
264− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ja/firefox-64.0b10.tar.bz2";
264+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ja/firefox-64.0b14.tar.bz2";
265265 locale = "ja";
266266 arch = "linux-x86_64";
267− sha512 = "3c22833f791b47422fbf6fe937ab4c557b60e1101582b05fd469a350b81cba9f56c0f88a4dc7aebd4a13aeadddcf7f69b001cd8c0c3c9845b2e9207ae118709f";
267+ sha512 = "4fc1d401c0ac6e991d038107b73693407f91106ac79cf67926144efbd3921aceba2eaedbf5f7aea395cdefd46c8c275fde651d1f84ef2fec607d23823a1bb271";
268268 }
269− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ka/firefox-64.0b10.tar.bz2";
269+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ka/firefox-64.0b14.tar.bz2";
270270 locale = "ka";
271271 arch = "linux-x86_64";
272− sha512 = "fb6c44387c76cca30dc03c07a50612287cd24f812b8b864998323d8751e65c7db3bcb409c3b399b742980f0dc86311e4b7df88854e471dbda69120b582d60c95";
272+ sha512 = "ae14719f16db6c8f247e47cb56ece7a099321566c192b1481f5ed24256bbb2e04c6e944e9754dc9251cc70e41766d88bb25d61ea484afa1dac8992ecfc766d6e";
273273 }
274− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/kab/firefox-64.0b10.tar.bz2";
274+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/kab/firefox-64.0b14.tar.bz2";
275275 locale = "kab";
276276 arch = "linux-x86_64";
277− sha512 = "c8b0ff8ab93496627b2b6ea284699fd436d6afdd26d136e7ec9ad8c5e456d87aea78754ed767b07999e54829668cc47da43319ee37e36366944176dcb5ca8ea4";
277+ sha512 = "78c533f5b0ee07b3e984367bb0703ecbdef5218e697ef8a1f03c37e30dd54ed4222479b450e760f0cf079da76cbe58d4784b5dd057e035d29bd56b554d442992";
278278 }
279− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/kk/firefox-64.0b10.tar.bz2";
279+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/kk/firefox-64.0b14.tar.bz2";
280280 locale = "kk";
281281 arch = "linux-x86_64";
282− sha512 = "ce93679ce4886662481f556fa438bb4ae988f4c2179686753be2ed1c176a7066414d3cf034093ce5ba46ba2f2ec68a9ef7e5cdf585c4dcb40ec89a48cdce7b57";
282+ sha512 = "b59c5d709944696aee587cd72ea4b38c79ad45ff89e0c0e0fbaa305adc5a47ef4a9556696ff74e833ec73d74b184efd775f21306af5313df3c0473b9a196f6a6";
283283 }
284− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/km/firefox-64.0b10.tar.bz2";
284+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/km/firefox-64.0b14.tar.bz2";
285285 locale = "km";
286286 arch = "linux-x86_64";
287− sha512 = "4dc669e5795a9a426690397773b5146c9424fabfaaff9bc3bcb880c9e862c3eca7856ad7e6d642975cac476fb7645b4613df6a7a5b1431e669c89cc78a05a791";
287+ sha512 = "238ef7dadf712f13037f478427fee757a28ab0b3d570d936f416a49b192ec8620275e5a5a5254e8330dea242de6e6ed2e13044f098a03d64706f4600db4a695b";
288288 }
289− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/kn/firefox-64.0b10.tar.bz2";
289+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/kn/firefox-64.0b14.tar.bz2";
290290 locale = "kn";
291291 arch = "linux-x86_64";
292− sha512 = "f65033d3050e27b62db028f95476f8637d8c7ed7437c2da1bb383e32dffd2c4be9bd82e76a3a26572bcedc6379fb4a3c3bb2b977ca690142f7046ca7e95f906f";
292+ sha512 = "3a965a435fd652cfb73b7b002561b2ec8e47159c7a239ffa9b316595907c54ca61fe978f57556f35775aab613f134078865b25546cea251708001f30b1d09bc3";
293293 }
294− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ko/firefox-64.0b10.tar.bz2";
294+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ko/firefox-64.0b14.tar.bz2";
295295 locale = "ko";
296296 arch = "linux-x86_64";
297− sha512 = "e0bfa42023ef0562f5b4ca7116687f33f403bd2130e0e3deed402f3dd0772da0f8cc15b2f4dfed43fdb9adc0bafd776f920f4bebd9463dfa0ca477ddf5d0f234";
297+ sha512 = "5fbb7f5611b2a335c194fa1790eb34cd56c4adfd82f298468853796b485a36c610562b7d883ad953910c80db6d771a21cc1c49c8c723de0f3109be1f0b2c66d3";
298298 }
299− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/lij/firefox-64.0b10.tar.bz2";
299+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/lij/firefox-64.0b14.tar.bz2";
300300 locale = "lij";
301301 arch = "linux-x86_64";
302− sha512 = "36719e381e743eeb034c89cf8361a8bc89c567c726939a6ba0cac29f818e5d0565de1505133ac7a5822859d60a5be53c569bb861b2091c208bfd1602918b5cd2";
302+ sha512 = "f957ecb83a0e47538264ec4960c120e6e71aa4d83276e6927605f224074825d4aeaa79fd5086a5f2c0d7cfc822eeed35aa177f565868f7e710a5eeea11f3d4d7";
303303 }
304− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/lt/firefox-64.0b10.tar.bz2";
304+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/lt/firefox-64.0b14.tar.bz2";
305305 locale = "lt";
306306 arch = "linux-x86_64";
307− sha512 = "c40c524bab02c3220c703d3122c37f2748253b059d55427ff88a3a0548efe91af161efd220bbc20bae343ef577f8c97bc9b6257ca19e895bfe014c6cd0edd1d9";
307+ sha512 = "2ae0eaf4ef059bda2ecee65327410aa1f0ddd1a825879ca34821c4738fb53b2a9cdccd619aa66ba535965ac10315deadebd8d70f08026138f367751179b328d7";
308308 }
309− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/lv/firefox-64.0b10.tar.bz2";
309+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/lv/firefox-64.0b14.tar.bz2";
310310 locale = "lv";
311311 arch = "linux-x86_64";
312− sha512 = "da660dd435b4b821d3468d6bea3e0d514864e131e91dd5f7fe4a5723e2520c4014dbd52fe5d5f160cdebea2a5f4c6e3c99704fed7b606b929dbb5a6ebaecaa25";
312+ sha512 = "ba0e7d68728ba12b435e87cf55b1435dee7a61df4ad114f1b609dfa7aa38b506725c8c492bb1e6b48069102bfc2a6211d996c76c122a7b90f58f67a738c66633";
313313 }
314− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/mai/firefox-64.0b10.tar.bz2";
314+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/mai/firefox-64.0b14.tar.bz2";
315315 locale = "mai";
316316 arch = "linux-x86_64";
317− sha512 = "f03ecb9a811ba3027d15d849de620668946d7309bbc5ea61df26688afb0a93319c03fc0b04eb91ba97536731f000c40ca2eb5e8aeca95acaee09749e8d61c51b";
317+ sha512 = "9ddd2dd8b0d0b109bdd0d552e613a74b1e1716b8ce74951b66c74968c23a679679562f4f06fae90efeb36ac7066b1da7cec2f9937f4bba476b80d412ecf91b3e";
318318 }
319− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/mk/firefox-64.0b10.tar.bz2";
319+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/mk/firefox-64.0b14.tar.bz2";
320320 locale = "mk";
321321 arch = "linux-x86_64";
322− sha512 = "f5addba550f781ed310b87ba8cba6ee2528f655f0c688ebb471e0a5cfa7341670d85df0c0e2885ac0c8d9d71b4ff21ae01cbd36db9c3538199e73a0cc3e697ff";
322+ sha512 = "0b1d34e3f27d79f3d46db0698f025d0da5e6f961ab1933b211ba8e468df766339a47d9d8e4a6c643896987078fac5c6b3aad5a605db4c7faea2b3da1c0a84232";
323323 }
324− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ml/firefox-64.0b10.tar.bz2";
324+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ml/firefox-64.0b14.tar.bz2";
325325 locale = "ml";
326326 arch = "linux-x86_64";
327− sha512 = "6114ef12f355d862b9f8530ee2b49d266ab07801be3d09846ab6c412465ad11d767490a867d8ce4ca66ff36f94d580375dd5b69ccfda6f68bb60dd85ce1986dd";
327+ sha512 = "afa01233b121d94b3695c1fef488a70e55216ebb4c69238905bdf20d5fe594f98cf1a331afaac56514c1a75631fb75781aaece1a77570db9c384b8bcf7a08710";
328328 }
329− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/mr/firefox-64.0b10.tar.bz2";
329+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/mr/firefox-64.0b14.tar.bz2";
330330 locale = "mr";
331331 arch = "linux-x86_64";
332− sha512 = "05d320b82a4eab53752d63b461d324882e392b8f2a95c2ef64e149b3ecc03f1f6e7b151f96ec2105f92c45fc92e7f329d5a750ce35f71c5660c78c21a9c03f47";
332+ sha512 = "faa143b4a04f0c86d6281ca6ef7fffc99fa468c4a6e14ee39d552fca910c0133682d5ef79a13e82aa2829d5f1cb17afec16582618631c0ec57656d330e2a5596";
333333 }
334− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ms/firefox-64.0b10.tar.bz2";
334+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ms/firefox-64.0b14.tar.bz2";
335335 locale = "ms";
336336 arch = "linux-x86_64";
337− sha512 = "ec6d0251fdc0732f75911694eaafff1b57bd986caf83513b0dda9adc4409d583d2053a99d655daffb3ee8eed1cb6080c743d1ddabe49c133ed55f1a6c9ea58cf";
337+ sha512 = "0be2311c606cc2031d63d2eacff2d6a30022e1d65206091dde08f4adcc7fd51cd8d82c2a532db3debe32aa0fcf8355d6ec8b16822b286b3fb81faff44a98d452";
338338 }
339− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/my/firefox-64.0b10.tar.bz2";
339+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/my/firefox-64.0b14.tar.bz2";
340340 locale = "my";
341341 arch = "linux-x86_64";
342− sha512 = "e37d41dafc186fe94856542b6640364f48af9e22f04b21d81e0b36013a879049ddf69e3e43e31b7a44661c56afe5306ee93b215d9c93357bb4c13c86852d583e";
342+ sha512 = "079fb4cc46e0e89f4b5cf645617f5ca1a6b6f8b5d6dfab305de07870593181cae996472dde9c92be66cd6be06f74ce1f1d2ce8e57cec2ea331de608e83ba33a9";
343343 }
344− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/nb-NO/firefox-64.0b10.tar.bz2";
344+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/nb-NO/firefox-64.0b14.tar.bz2";
345345 locale = "nb-NO";
346346 arch = "linux-x86_64";
347− sha512 = "67c12df46d949b16a496267feba440960fa02305afe3b2b147c8715adec432b9e75c5b93df7e3605c1f9b5f0c24cd6f863445874f7d269a1cb20bfcf12028ee2";
347+ sha512 = "f76089d3bf28e96b0c99eec8533119d43beffe697f85c8ce0d70779390ac24ffe1b5d190f58bfc6dcf7cda268e5c4feec825cdab8c72cdd1d8b93853eba23d89";
348348 }
349− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ne-NP/firefox-64.0b10.tar.bz2";
349+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ne-NP/firefox-64.0b14.tar.bz2";
350350 locale = "ne-NP";
351351 arch = "linux-x86_64";
352− sha512 = "c0d76f22b1aaeac6055a9b8954c6ac77b106b7086a67f763f95e036e973b4d2754d78fc1d4d0fbbb9659d881cce0c04d8de5e529c62d5c0b128f2aa696fed791";
352+ sha512 = "3ea45dd8243eac66b08e892d2cccafa4e1e6b39f7cb11c04a2af6c77b150d0e0315d16dcc298376208df1526953e1490efae31460ca8a2f77edaef45b12a0dc1";
353353 }
354− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/nl/firefox-64.0b10.tar.bz2";
354+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/nl/firefox-64.0b14.tar.bz2";
355355 locale = "nl";
356356 arch = "linux-x86_64";
357− sha512 = "09d303724b5adc4a7cd1760dbaafc55f32d81ad31ac1e9b91ec4818ff7199a3204f7962fa09c6d4350773610f06d337e201646c04847030592ffd9be2a55e265";
357+ sha512 = "cb6c6b3539bcb8e78d2e9d6ced29513c7394c7dc9b66481cde01d54afacdf16f035b5eed3a247cd70104561a429f6dd76925b4a84ed74b8e23e27393631d2629";
358358 }
359− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/nn-NO/firefox-64.0b10.tar.bz2";
359+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/nn-NO/firefox-64.0b14.tar.bz2";
360360 locale = "nn-NO";
361361 arch = "linux-x86_64";
362− sha512 = "97126166aba2ec50a12f9e9f5383d8f72a90005ec038bc77150252cb8899bee0976e26f8b7a12d38d5a51518b7dd274880a39e8e98a054765bda98f33acb1096";
362+ sha512 = "a8fdeab729b27235f11327e217c77568502805961b7999c239f93fa721557cdb61e5a97cd38b2d397cc248c8b93b6aa1fc547a86dba5bc7ed096391e0482ad8a";
363363 }
364− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/oc/firefox-64.0b10.tar.bz2";
364+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/oc/firefox-64.0b14.tar.bz2";
365365 locale = "oc";
366366 arch = "linux-x86_64";
367− sha512 = "042d63d26a19a6f0796aaf1c16ea14c65d75a99175def2f3fb89b659c358b1dee1250d1495a85d0a0b41d5fd6040e995a55bdc32d0abeeecabb6dc18a16127c8";
367+ sha512 = "e1c6951b62508bc9533b485785edaa23dfd5c2dbeba6847ae12b7fab91a46ee49ad348a6aa6a79923f6689c149c203284ee210a97fdbac4c8aed4bf55c932140";
368368 }
369− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/or/firefox-64.0b10.tar.bz2";
369+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/or/firefox-64.0b14.tar.bz2";
370370 locale = "or";
371371 arch = "linux-x86_64";
372− sha512 = "029e8313015d35833dcbb7c79937fedde78596fa8257e7bf411bc104692a3b659849cb974810d27d3abd88d674d3cde978bfddeca9cabc567f4a91207afa760b";
372+ sha512 = "9bc58b76ff74e3e05ea9fd525670fb3126cd01d84217b2eccfde2c5e6f8e079c9466a1dc121ec39b4b849361b033d122c78ca7babae6ec968b939c2eab0ddbc0";
373373 }
374− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/pa-IN/firefox-64.0b10.tar.bz2";
374+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/pa-IN/firefox-64.0b14.tar.bz2";
375375 locale = "pa-IN";
376376 arch = "linux-x86_64";
377− sha512 = "c805bca742259579fab0c04b3d692d809723acbaab83c092668212ef584254157ec9522ead6891fd2b69687c7ac95c39374194160e81a11872e3f76acb65b5b0";
377+ sha512 = "7a4d6b8937d266463b81694e7e68c332fe443649c8c11ca24d329d95d1dc5b0c3bf4af1f430a953a274ba1e5b008096d7462e502949f8dd2238b3b2a0ec70a38";
378378 }
379− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/pl/firefox-64.0b10.tar.bz2";
379+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/pl/firefox-64.0b14.tar.bz2";
380380 locale = "pl";
381381 arch = "linux-x86_64";
382− sha512 = "91bbb80fcb8f5b7537bc9353db38f54521948a13da4829e973837be29f0710db5f31a55fa075c58f7938ca0f78402e77eed67a96314b5ebb3e5d54a697ef2067";
382+ sha512 = "3e20e6322afd239402bc8ed9adc9301f24d9fe58ddc7d5ce98c4a8909af4c0fd5d3af6de9d5a66006a75aff80e1107d016efdfd0a9765dbb32cb2a9dfaa5e8a1";
383383 }
384− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/pt-BR/firefox-64.0b10.tar.bz2";
384+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/pt-BR/firefox-64.0b14.tar.bz2";
385385 locale = "pt-BR";
386386 arch = "linux-x86_64";
387− sha512 = "fb14e2c177b7bba82e2fa5f9aa3039a60b8342c9ea2f74f24af5698b5a1d95c31342d8f3911d89995e9c606ebd4335e36736c470b4563c9c089ea38ef1636db4";
387+ sha512 = "5c437f8473a6cd0f195c2c6bf9061fd1805b26f2f41af69b3bf3a49de3c78e4927966ae3a319dff2508b97681c388a44f2d7e07fca316debed978db678c79ccc";
388388 }
389− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/pt-PT/firefox-64.0b10.tar.bz2";
389+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/pt-PT/firefox-64.0b14.tar.bz2";
390390 locale = "pt-PT";
391391 arch = "linux-x86_64";
392− sha512 = "582e2e7c1f85cc827405f1207da4bb000b239d278a33c397af3f4fe5a17dc0d4201ebfb98738b1802aa8c02b6f44b2e6ddd82ca9ab5fe3c08eee99759ee8eae1";
392+ sha512 = "fded195a4bec193e7cd0ddb3b75c40cad78bb518b87349d59f8efe548e1b22118bda1a078e2501a06996c981f2576604369d08a1a6457055670a7d3b44e97db0";
393393 }
394− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/rm/firefox-64.0b10.tar.bz2";
394+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/rm/firefox-64.0b14.tar.bz2";
395395 locale = "rm";
396396 arch = "linux-x86_64";
397− sha512 = "8f4452458e39b8f9415541130b8e0ea739f7f60c4c6781d98b3ff2f937563ffb0511428990dcc1db2e70832c54b35394e4380bf8b13e5a4c653a920c46cc4e35";
397+ sha512 = "694e50bd6007cb7a7f857e146e266217e94dc447f1ec72ff279e045f7133621dce77a67bbe126d805842bdf47021e43c1e3faa26af930690b7e2309e6449e758";
398398 }
399− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ro/firefox-64.0b10.tar.bz2";
399+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ro/firefox-64.0b14.tar.bz2";
400400 locale = "ro";
401401 arch = "linux-x86_64";
402− sha512 = "db746c0350ddd99c2c30094cb76675a06e648958144b08d31002fd9204541b6522ac06b6954410277c4191d06ea4f8595c8e33b151b25de52f805c16c12c5365";
402+ sha512 = "23f4cb17987f66b0bcbd07bb75896c3bf29ace882294b30ad8b6ef61548ea271ed55f005c6ead3d6836e3ce4024d4f77ab1de0627afefcababef0bee94bd7fdf";
403403 }
404− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ru/firefox-64.0b10.tar.bz2";
404+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ru/firefox-64.0b14.tar.bz2";
405405 locale = "ru";
406406 arch = "linux-x86_64";
407− sha512 = "772cba5c3beb070a579e765216693bf193eca4ed66a9ae6eabd452f6e8b3b3254a12642111bc2eacb7b65b15df81b61584e3c91220d35000d1c1985ce5e147b5";
407+ sha512 = "36b68d824ac8fc64a207ac13801612dab3bd3e2efc364c6dc54381e359edd8e022c79e1b96cbe49937ed71cdf7beccf106942cf55ba311a943be9220914c2a41";
408408 }
409− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/si/firefox-64.0b10.tar.bz2";
409+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/si/firefox-64.0b14.tar.bz2";
410410 locale = "si";
411411 arch = "linux-x86_64";
412− sha512 = "31514d4c77608e88d1ce0a0505d8cf9774c834724a14feb17377c50c0eb517d4cadf101c25f1ed2a9edeac620d5fb6de1717b37e35322202eb3af2aa37c4672d";
412+ sha512 = "e1f486def762c77868c6e2bfe38a3e83919f4a59e0b198f4d8ea04baaedfcfd8e3e87a70c593fd4cec587f15f57379a6ebf99fb80458a7e857c5ad19a58d5f8c";
413413 }
414− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/sk/firefox-64.0b10.tar.bz2";
414+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/sk/firefox-64.0b14.tar.bz2";
415415 locale = "sk";
416416 arch = "linux-x86_64";
417− sha512 = "34c7f9dcb8de54621707f0da0b4e1e3d4fab2792d971fdde4b67e13ad05e458d5aa91249a58c87ae9d9772f8c83d9ebc8a6faa2cb94554c48ab8f4daeef222bc";
417+ sha512 = "a8cd34e876cfb491259a7ca1419a51a7ff2929defc94d16d6d582c3938be83fa30b46ec482bdea6e4589143cd7889da3b85550c2872e5fa0ce09f909ae8c62d8";
418418 }
419− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/sl/firefox-64.0b10.tar.bz2";
419+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/sl/firefox-64.0b14.tar.bz2";
420420 locale = "sl";
421421 arch = "linux-x86_64";
422− sha512 = "e8c4edeccd8fd9aa61e148b430d882aa30d560995b65500e03e5be64fa24f008fb8a0b65c271161326127f1ce748da155cba54a507692877ec4035036c183fe3";
422+ sha512 = "558d671ab59316383760919ab673475e578e8a8a3ae0bc4c37282b3064371b8a048f5c631e64589f24f360eeca49a6a326274b45f55947ae2972e01f330efc30";
423423 }
424− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/son/firefox-64.0b10.tar.bz2";
424+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/son/firefox-64.0b14.tar.bz2";
425425 locale = "son";
426426 arch = "linux-x86_64";
427− sha512 = "2f9ec511eaf8ab90de5ab2e945f0dc798c51297b9f8fd766c73860e74d7d18f1e6d6cefb2e01e060bbc103c59adb38c6af8d0ab34806fc5ceafd5907c09af322";
427+ sha512 = "8983fcf775fb1d7c975a56eccc7f821c0c9e2f4d689c601b21a748e898baaeeb46166561e368676d966f9bf8d78d89a896040ed0d5914248fdfafd1c64bc09de";
428428 }
429− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/sq/firefox-64.0b10.tar.bz2";
429+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/sq/firefox-64.0b14.tar.bz2";
430430 locale = "sq";
431431 arch = "linux-x86_64";
432− sha512 = "4b967cb914f450bd48349100e925248d39b7fc9f86b6ba339805e1707cee0d5b181ddfd40089f6ef64a8e3619bd47605b07b96178037bd12f0f43e447f979df4";
432+ sha512 = "db12d81b9ec8f7f412496d1995acf28295d8d49069d2a7f982fc6a82de39550d9cdaaa005431a8ca5608df2c530d6596341567793435a0efb5854038b0532d93";
433433 }
434− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/sr/firefox-64.0b10.tar.bz2";
434+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/sr/firefox-64.0b14.tar.bz2";
435435 locale = "sr";
436436 arch = "linux-x86_64";
437− sha512 = "0aa75350e7b7356e0bfbf70547cb177175bdded6f56d8eb1313474f8e2888f5c16b29fcd74ccd03f14158f21f1f9d1acf48df4b9a206bba1ed511a0a872cfb05";
437+ sha512 = "c6e2b768d08623232740fe8bfc77a2bba47e415450020e0367be83629308aeb85fe9235b5e32716721b91153ba527d03d3592df9da91d6b386ff808758631244";
438438 }
439− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/sv-SE/firefox-64.0b10.tar.bz2";
439+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/sv-SE/firefox-64.0b14.tar.bz2";
440440 locale = "sv-SE";
441441 arch = "linux-x86_64";
442− sha512 = "d1d6105972409f9dd3cc1ee126c592684dac0eaffe5ce15f34252608dd940aee37734717d25801df2c9b8c9fc979075619349c3399a5cf96618f6144928a154d";
442+ sha512 = "202d503eeefc8e8026607fd2079c7231c4a7eaf097acac6bc1066262f05557c002a2e0da191e6bd92832baed6ae1095e04407395e9dcbb7c7b51fd204680d653";
443443 }
444− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ta/firefox-64.0b10.tar.bz2";
444+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ta/firefox-64.0b14.tar.bz2";
445445 locale = "ta";
446446 arch = "linux-x86_64";
447− sha512 = "8e8487396ebd36ac42cf773544869379bf510eff530f893737cbffe248eebf132d7782904ec7ac02a1b65379c14f886d953a031f6f6e1b0728e4c5e37cdd9e84";
447+ sha512 = "bc6d40ec162b760b527795aa3ed79937abecdae0cb9489b886c184a3fde732afe2ff743cf56db5d70d2d87fa7038065583811a2e6d7ff7e2de884b7d4adb463e";
448448 }
449− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/te/firefox-64.0b10.tar.bz2";
449+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/te/firefox-64.0b14.tar.bz2";
450450 locale = "te";
451451 arch = "linux-x86_64";
452− sha512 = "f33333903d4fe5d49ba26b67f06edfcd2faf533b833d68b3488cefefe6045304400f905e7167a153b072f624f8ff36cf4627a4fd8e76a5cebe6772f819081d1d";
452+ sha512 = "f03e0e987effc10ca3fae20fa0be07ec21a8d3ad0feff77c4d2ff0a44cd048cde44e27f33fafc28fffe771c3a0582162bf7cb9704099ff3738922210e6066ade";
453453 }
454− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/th/firefox-64.0b10.tar.bz2";
454+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/th/firefox-64.0b14.tar.bz2";
455455 locale = "th";
456456 arch = "linux-x86_64";
457− sha512 = "ab05599f0426eea4a86c8998f884073a835d81a85c4cb68847714c463ea5dfe68942e4a4086cdbc1140d02b3f3801784bce05f319721df1c79079e85eb7ab4e4";
457+ sha512 = "8fe21c9e494dc1f5ae38ca950b178d005a8adbb0fce84b80d0d427d544513b15bc41cd901fd7cdbfd816a3b716c261d81f034516bb354402ab8fe03adc963aff";
458458 }
459− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/tr/firefox-64.0b10.tar.bz2";
459+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/tr/firefox-64.0b14.tar.bz2";
460460 locale = "tr";
461461 arch = "linux-x86_64";
462− sha512 = "27adf56f2306125bf5d1fee5759066668f87766dbab9c64cf882427aeae2d7294aa42f72c456177f4c5fc5fdcce8854ea386d60014bf2e32c65a84150672318e";
462+ sha512 = "3d1bf804ac3bd65d8ab36817a03e0d51f6a439e7ec37e18a6e4bbb8f690b44c3c3c6acc88d0a2bfea5586ccf78bbec89811d7d38bed381b272546b12f2442838";
463463 }
464− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/uk/firefox-64.0b10.tar.bz2";
464+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/uk/firefox-64.0b14.tar.bz2";
465465 locale = "uk";
466466 arch = "linux-x86_64";
467− sha512 = "b224cc1c6edcf61ba52e3ee3cc87b8a069e7a2761ae0f0157b97db7db0486114ddf994f55e6548da81ff35533f66fd91ef117d1f2edd8460190274966178f886";
467+ sha512 = "b0c14a7e9ab36a5428e842370ce04c3856c7845924e42e604bba4d426b5b8ec2bbbd8ccb88f96030cd1971eafa1c40666f424122250d05f88026f2336b8f8f04";
468468 }
469− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ur/firefox-64.0b10.tar.bz2";
469+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ur/firefox-64.0b14.tar.bz2";
470470 locale = "ur";
471471 arch = "linux-x86_64";
472− sha512 = "86df507c3ff62a3912c037ffc45729cf7836e6735e30568f55f0f7d00c1c1a0cdfd41536705a74bfd8cd06c9cf9f3d2fbd8cc2019f0204d1f7e04015392d4016";
472+ sha512 = "cc7a5cc3ad79dd76a50a5373dad37209f8c574bd459eadbafadb327037c6335e1b6bf28fb9aed93d29a76a00f12e5d22747c45091eca5a9ebd451c8d24d6c16a";
473473 }
474− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/uz/firefox-64.0b10.tar.bz2";
474+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/uz/firefox-64.0b14.tar.bz2";
475475 locale = "uz";
476476 arch = "linux-x86_64";
477− sha512 = "d8a1195868fe5ad8c73304b92b854ead1dd51621a618abb4c42391fd4ae0cf7205d5caa490279e7dd86f5c2f8802eefd79aa2373b47fd16ed06f797bb8e4fda4";
477+ sha512 = "9f263397c4bd072935d4d484d238082f3779cc83a59bd01d2810c635d994749ff55722dafa718286456af2fd2b4b1f02622c9ded919b850aa6c6bf46913371cf";
478478 }
479− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/vi/firefox-64.0b10.tar.bz2";
479+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/vi/firefox-64.0b14.tar.bz2";
480480 locale = "vi";
481481 arch = "linux-x86_64";
482− sha512 = "c5e4f110d96386edc7cdc2252c10f3f24826763fae7a35d0ff0d803033c7e2384ed6fd3b1c3dab722c22927f1869e7fb87d82cd60abe920a1e9212a43a64f2ae";
482+ sha512 = "149422236d100f5ffe064070047cfb4a6716630d75d72d31a420970002194ba883581b9793d5b16699d0e2dee1105ea849d76f0dce5b086ac606068feeaed0a7";
483483 }
484− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/xh/firefox-64.0b10.tar.bz2";
484+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/xh/firefox-64.0b14.tar.bz2";
485485 locale = "xh";
486486 arch = "linux-x86_64";
487− sha512 = "908741b67bfef70bcaec20b76cb393e8497ecd6bb82f8302919df99cadc189fb665bff31388f81aa876927161dc753c63abfb63613e79a10065913e6762f3e97";
487+ sha512 = "cb96bf8137975343245e00662590b558d66f01aad33522932c18306ef339ddd4dc2334be9a57f14331fe6dadb9a5ae06473ac3875f515163bead1b69bd03b6ee";
488488 }
489− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/zh-CN/firefox-64.0b10.tar.bz2";
489+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/zh-CN/firefox-64.0b14.tar.bz2";
490490 locale = "zh-CN";
491491 arch = "linux-x86_64";
492− sha512 = "7ce0fb5fd6622c1a03ae2faf3f84fd56abc65beda43cef0d8d5d4889cda831ec3dd54566f383705625637b7d93b1684b6e6b6fbf345467fa44e3d690d118299d";
492+ sha512 = "33e4c94fefb32dde1b80740bb7304a4da916964466f23de19a32f447be02300f9c97b6dd5709bc469773bc7680c3a8e88f39553ccef838b439b6e5b25850e0d9";
493493 }
494− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/zh-TW/firefox-64.0b10.tar.bz2";
494+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/zh-TW/firefox-64.0b14.tar.bz2";
495495 locale = "zh-TW";
496496 arch = "linux-x86_64";
497− sha512 = "3308bd7a442a84392bad111c3c8903b110b901075991774a9593d5a6a37e4fd805406e27a3bd5e39686fe348bd079a17aa063894f55912033ed75bdd64316ab8";
497+ sha512 = "6d8deca1cc1f542d5de5137bcd6c10f7d1e70adfc67be286744224bcce3f0c1f76a9e6310c94c23842d952568293746888945c0fa89552b0550a3527b1d4067c";
498498 }
499− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ach/firefox-64.0b10.tar.bz2";
499+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ach/firefox-64.0b14.tar.bz2";
500500 locale = "ach";
501501 arch = "linux-i686";
502− sha512 = "18ac2cd8ca4c630aa80fa3b4c473fd2c7d20e9002cb40bdabc29a73fce7e5da6c4b5c5c3912efa067780b46e264a23aa39da466296741a942c1cc74fc3758fe9";
502+ sha512 = "217d749356819fb06ca2208af220e176b0cd9552e9c3b540939df7f39e429121e4b3f48617fda16b9ddd4f8bfd48d88f215fc9556ed95d5191bed0b681d1cf23";
503503 }
504− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/af/firefox-64.0b10.tar.bz2";
504+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/af/firefox-64.0b14.tar.bz2";
505505 locale = "af";
506506 arch = "linux-i686";
507− sha512 = "2befe913a134bad225ab7dad76cc6202ee8184b271434636176ab3ed057db17481ed7ac925e48aa24509ae57e7fcdd176c187d55e4949ab5bd038e502f32e9ab";
507+ sha512 = "a2032bf0c3eed7d6525a0e3b3cda01797334b345732f69c4689a3e39261a53c83512d822fd55086e6df88f216e158603842f6cd7225485a993d8645d780bf10a";
508508 }
509− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/an/firefox-64.0b10.tar.bz2";
509+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/an/firefox-64.0b14.tar.bz2";
510510 locale = "an";
511511 arch = "linux-i686";
512− sha512 = "31af4d6a84c601fbf31f0e52d9eb7f68ab666de129f3a8c1b2d3a54e7061b159cdae09e6da54942fcded87abd2f5c41ea003563d0d657761cb9078446e138c36";
512+ sha512 = "c25b2d0ced9bb95453581027f478d928ec343561a4c16f49d0f95e8e3194034c4e220f4c418f23f1e107e3f271314753b92d133073310c5c95586aec61c81850";
513513 }
514− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ar/firefox-64.0b10.tar.bz2";
514+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ar/firefox-64.0b14.tar.bz2";
515515 locale = "ar";
516516 arch = "linux-i686";
517− sha512 = "3a62ec619dd5a8e041a443665188edeade532a2ecb0b5d78cfead8c4a0a4609de241701cea184453fdb58d295a0460b55009e94b6e01eb0f4d538da15bde8ba5";
517+ sha512 = "955146bea4ecde03b4b27290c54f5a633de09ec882bb2a2ffd8fb675a31b51b5a448be66d170f4f3795896f1eb3ec9e54ebdf6f5872aec7170f57c4210b58871";
518518 }
519− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/as/firefox-64.0b10.tar.bz2";
519+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/as/firefox-64.0b14.tar.bz2";
520520 locale = "as";
521521 arch = "linux-i686";
522− sha512 = "801beb19f6df2528996bd399607ae86ea3b31e8b11584d33cc7437857b5f77caa442c4ef26834839d4b99a0ee2b7ad1f33d43561f71879cf501823e5f0f6a9fa";
522+ sha512 = "85b77a481fc7a82bb1b192176928e4095db19e03c19bbe64da4e07f1498620a6e31db44074b39dfa4f77641f7a74fa98669421f82c2c6bec053878c17c8390f5";
523523 }
524− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ast/firefox-64.0b10.tar.bz2";
524+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ast/firefox-64.0b14.tar.bz2";
525525 locale = "ast";
526526 arch = "linux-i686";
527− sha512 = "29f3dd7b31f647e9b4ea4ca32b8c2a263816f929675e71ff995c8fb979fd079b5b42e71bebfc66e6470e0f5d029b90aee0c78c7a86d8825f411330624acf87b5";
527+ sha512 = "48f56f503a0b036c4575a166a4c181d61d70d88ba6c2bfd984b0f5e392df175bf95d9eac93fde657ef1157a0ae0e727dfefc446a38a577a395c7a685e1aa09b1";
528528 }
529− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/az/firefox-64.0b10.tar.bz2";
529+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/az/firefox-64.0b14.tar.bz2";
530530 locale = "az";
531531 arch = "linux-i686";
532− sha512 = "97228f40fb86942a9870ff1c705dd70921f847a9b72db2f8c44738221dda1cade35d5fadc5f826169eba35c062e78dd7fe1aef02c9ae620c60a1366f6948b990";
532+ sha512 = "07bce90b9ae3bbb45a93aff4cf9b645d4a700eec311463aa84cb0b08cffd2ae7b293f94b57c8f098ace91a5a949b1fabdd048d68829db16ea69f6e23b027eeed";
533533 }
534− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/be/firefox-64.0b10.tar.bz2";
534+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/be/firefox-64.0b14.tar.bz2";
535535 locale = "be";
536536 arch = "linux-i686";
537− sha512 = "84ce6814ed7286bc616d6a225f3818584dd6a021c741bf3ee93b319b1367389ff893ebfb9f19d06c59131403fc6ce33e546257f0023ae3265189d984b5774c17";
537+ sha512 = "800de070b9e722ba07831d86aab41c9fb3ed9377e796770887b71cdfb9eda9165ac752525bfdc5b7af28cd6b316863268820773741662dbc6287e5a3727e2407";
538538 }
539− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/bg/firefox-64.0b10.tar.bz2";
539+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/bg/firefox-64.0b14.tar.bz2";
540540 locale = "bg";
541541 arch = "linux-i686";
542− sha512 = "fd075c08eccf7847a1d9b00a3d721e13a75b5387c5be8582a222c72bc7eeafe3b5972534c0ce15f14f5fd5158dcb7c22835b310d8ba64a69954ecba64dca3802";
542+ sha512 = "804b72fa923fcdb6dbd5c4ce819557d71469ee797bef48fb6d51df150fe79b6d4f20612b7c2d69277facbb4164592028cbd514fa9e63ba00bbf4be4a3fe733a9";
543543 }
544− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/bn-BD/firefox-64.0b10.tar.bz2";
544+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/bn-BD/firefox-64.0b14.tar.bz2";
545545 locale = "bn-BD";
546546 arch = "linux-i686";
547− sha512 = "fcdb381d2b6d175f250144db7a13a682bf3589825a5157693f929801414b6e0e932d94caff9492e34da029b8589703913ae3a6e65175d5e1f0bab143663c72ae";
547+ sha512 = "8ad135f5b98d792b7250c2dbb9d8616a3e2454f6cffa5850ba8ab7f8b1f1d2041fcce39e45333e8e6d08371da39dde3a8221cad6217e3264e1d32bdb7a7ce73f";
548548 }
549− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/bn-IN/firefox-64.0b10.tar.bz2";
549+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/bn-IN/firefox-64.0b14.tar.bz2";
550550 locale = "bn-IN";
551551 arch = "linux-i686";
552− sha512 = "c7379dd8549a83ff3cf67c2493ee7386aa90858f2169ce58727c6276ea113e7df9c9cc499bdb56b381e193f8fadbd23eb35f786153db0ff89f9bbf8f4408fe29";
552+ sha512 = "c9cf90d40dc319df43f681bd7583681548924aa04e963c1c4d6f6128db7c9402810d3747e223ec4f6e3589e2ea6cb913329b238d15d4d9771b8efec6635cefc3";
553553 }
554− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/br/firefox-64.0b10.tar.bz2";
554+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/br/firefox-64.0b14.tar.bz2";
555555 locale = "br";
556556 arch = "linux-i686";
557− sha512 = "66a04d15ef3a77fabe4ba0e51c601315057377517b1428dace9036f0f7e4691bdf7e9ff7784065bcd6f5508bccc03eaa9181069f5b8f726e3d4937d1812d3eb0";
557+ sha512 = "9ad73b35d93aa81732f35478da526be05e6c9f66773010b718f88cfa80817f0f3ff8d537a864a9c01cb197c2c780d604d82458ed982e1089febd85042a11ebc7";
558558 }
559− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/bs/firefox-64.0b10.tar.bz2";
559+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/bs/firefox-64.0b14.tar.bz2";
560560 locale = "bs";
561561 arch = "linux-i686";
562− sha512 = "d7f0d44131ef2dba579067ead466b43b50ec3ed627c4d6fcadca1d9de93f754ee1bfc838bc7eaec90b2e4a9d08a4a057257e676e9de3699b4b6b8999b1fa375c";
562+ sha512 = "10cb7314d0a56fc4c2b0bc7197c71c99f1693adabea53da6a1d1bc7abd17ab6d91a983030017a8cc09c759eb5d678efa4ca0dc8388b2c4c8e84ea52a0b849c80";
563563 }
564− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ca/firefox-64.0b10.tar.bz2";
564+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ca/firefox-64.0b14.tar.bz2";
565565 locale = "ca";
566566 arch = "linux-i686";
567− sha512 = "43e52f7581535f86df2730e1aa4c3489a0842addf1c40c8f168913c1f5e6fae7713d24aea0a1d8dc7aa5afa7eeb9e5ae8701744861d715ad002ffc76c26c07df";
567+ sha512 = "efcd45c51970dc198e1019410601b8788f0071f0b98d5d341fd6e9bf2733c2ddd84e9f29cb3d3239acc691e0f7d549f0714ab9fcf4dbba8d0f5a288075d65bb5";
568568 }
569− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/cak/firefox-64.0b10.tar.bz2";
569+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/cak/firefox-64.0b14.tar.bz2";
570570 locale = "cak";
571571 arch = "linux-i686";
572− sha512 = "efa9b4744c1a3507e528d8a960d807df7c14b7cf7ed79e6d237897d7bb2d72305c0f147bdb5690468ff7ddda1cf56ee25d0aaf07b5cc7432e0e6d079f18e164b";
572+ sha512 = "d33062aab7ecd8975539c1188c796f23ff045a27e3f357ccd747dfc6bbec50e79bc94f5c9bd2660e86d083259f69268397b405262e106b16956f9eedd73db106";
573573 }
574− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/cs/firefox-64.0b10.tar.bz2";
574+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/cs/firefox-64.0b14.tar.bz2";
575575 locale = "cs";
576576 arch = "linux-i686";
577− sha512 = "0539e29a711894942d2732e5ec667101ac66f4a847cbcdd0155de776614882a0e41ac94df73ee8b85bc9b57dc6aa98650537d57115fbce7f95ebd4a6965e990c";
577+ sha512 = "e3e5ebeba62b199c667b99abc3c06073603addd7ab76e0dbe1822d8b9c55aae69bf1f6dd6971190b52073cfbbaf66bcf01dfe5b9dcd13feaf96e5d0681aa240c";
578578 }
579− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/cy/firefox-64.0b10.tar.bz2";
579+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/cy/firefox-64.0b14.tar.bz2";
580580 locale = "cy";
581581 arch = "linux-i686";
582− sha512 = "72b69630ff274ede07fe09ea6bf09b85fbb5cc93dc3dcaa891cf9436d665f98634036397a67f7448aedfa1053018536e706c74ccdd35c523fbac8d47c16edfcf";
582+ sha512 = "b1f9d3b0e9c004d8612fb3c852151c3384631f439432a766c01c1ea595095b154429ee6bb7881d3fdad0faf99674d81127be57ebb17bae1922b2d4de9f0dc699";
583583 }
584− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/da/firefox-64.0b10.tar.bz2";
584+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/da/firefox-64.0b14.tar.bz2";
585585 locale = "da";
586586 arch = "linux-i686";
587− sha512 = "e70f4d9dbf404638a83e1e07aa5fd815b54577291bee161093cff772c6227e54afa76e031711aa1c36dd7b13052c976d3ee69785c84084d00e2f9f9558b3199b";
587+ sha512 = "8f56d6653eb56d3f32f74c04d58014126899d3a5349f7a6c56d015aab71cac523f4f3261fc21ae0a7645a99a83e9b55198391d2606c7b8a70e2b0d3fe58d1e08";
588588 }
589− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/de/firefox-64.0b10.tar.bz2";
589+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/de/firefox-64.0b14.tar.bz2";
590590 locale = "de";
591591 arch = "linux-i686";
592− sha512 = "9ea87bad16b995f3e262df85d5fa321cf5f00484eea66dd92e77b79c6872ed2d496fca277be5afb937e35f98d72e71452f43cd7c27f28b27fe427b48ba014cc4";
592+ sha512 = "c0b472e2080a24c5c35efff86adbb91dc5bdc89fc2c93804ec9ba35846d3d18d85022c7c2a0a0e405a14561fb635063149a4195928d1486ed8880a29c05e9904";
593593 }
594− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/dsb/firefox-64.0b10.tar.bz2";
594+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/dsb/firefox-64.0b14.tar.bz2";
595595 locale = "dsb";
596596 arch = "linux-i686";
597− sha512 = "e30ab23fcd411ebeb62a86de32055d24ff683a3c5f4977ae4d23e312ab9a2f1b7f339e0f23732688674dbacb49c498f6a75352a4bed74ce677c55c1e495ed0d5";
597+ sha512 = "fe5a95eb0c311c3131126ee92c4fc8f4e547b87871b6cf736c986a366bca60a85e5b6f593931725761417fa13d9edc275430ae1e73add67eee23fe0ff2750933";
598598 }
599− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/el/firefox-64.0b10.tar.bz2";
599+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/el/firefox-64.0b14.tar.bz2";
600600 locale = "el";
601601 arch = "linux-i686";
602− sha512 = "a06fcc2bc07fb904a4a18e393001b0f204fc1a6a254def69eedd96b68ddab0f2a51863c78468e69dc534ac4948620ea8d643d14b2ca88ad68f0f367113a5b447";
602+ sha512 = "c2d34ca92cd36fe745ca66d803569a26752e4f834dea0d07b0fea24365286a2f215c25fff6833be4f0fbe6fd89313693080fece2a1490d99b08ac85f76407e53";
603603 }
604− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/en-CA/firefox-64.0b10.tar.bz2";
604+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/en-CA/firefox-64.0b14.tar.bz2";
605605 locale = "en-CA";
606606 arch = "linux-i686";
607− sha512 = "e1b1abd09668bd0865b5c802f748867a8fb26e0789710a636167731b97fcdc9b5490ceff11ce1968672abbfe315da473f7bea187799fb6c4e627d4a39fd1b7e4";
607+ sha512 = "85b3d450ba292c2cc669af1d9f27821b96f0d13ad9d59fec2bd685bfc5bbf02489970337b51653108f64aa164182fdc670624a36eb07e55e8a7eafa6f16e1071";
608608 }
609− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/en-GB/firefox-64.0b10.tar.bz2";
609+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/en-GB/firefox-64.0b14.tar.bz2";
610610 locale = "en-GB";
611611 arch = "linux-i686";
612− sha512 = "b5dbc47b11fe634a5a53610fa0d45b975bcf3f7fcf8d7d7a739a1fb432647ee3da7b3b2d31c6eb1129e95ba6f5c7a42043c269405002b8507a8ff21743224db4";
612+ sha512 = "bcd36733e157ae4e5c8580fd9deeb4e5d37084db4e7a4539ff2cdc7532bce95dfd26b4810c098d22ba89ae107f62272625a9702399ac2678c461efd7825142ae";
613613 }
614− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/en-US/firefox-64.0b10.tar.bz2";
614+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/en-US/firefox-64.0b14.tar.bz2";
615615 locale = "en-US";
616616 arch = "linux-i686";
617− sha512 = "df29871a2b3d44680781c8fd1436f92fe983e57d63c3952aa2ef67946165ae2ec55862c16678fa80e3edffffd604a9aa56c318deb9ab758d5d396802b762ca76";
617+ sha512 = "5bf5c1cdd79d6bffd7137bc19ed0fd4ed91d4c9263e1d50c128fc06def9021cf9df67fa2f3b591a512189d7a0af98e85078b69382928417dc17881edddb11985";
618618 }
619− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/en-ZA/firefox-64.0b10.tar.bz2";
619+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/en-ZA/firefox-64.0b14.tar.bz2";
620620 locale = "en-ZA";
621621 arch = "linux-i686";
622− sha512 = "a7e97961d8900024fc546329e328cb01187407362186ca7b0285aa45ed8c201ead6bafcd3eb4576f2afdb97ab8204786723823830b3d889a889a377fd89f0e4c";
622+ sha512 = "b39a6b3b404997a2379cabe03ce8c62ad0ab85dc48bb6ef76541fe3b91b0e51996ef02ec0c84d0f418814bf216344283cdb0a5f5ff7a6b554a69fb36bff02b69";
623623 }
624− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/eo/firefox-64.0b10.tar.bz2";
624+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/eo/firefox-64.0b14.tar.bz2";
625625 locale = "eo";
626626 arch = "linux-i686";
627− sha512 = "4a9b84fdc1962dd7de8878d6fe69f7eb541e61ce19522735f7a9cfaa07682d9ce4e85d7afc21258164b6687b2f99b232a6c8aeb4eb801cd136d49702458fc263";
627+ sha512 = "50a61fe7e83bd540233773f9ba2684f4a9da9dd5ebd8a34dd05f1f56df7b442494263d83ac8114dfcf0d169548c02dfad9c3df5e05082718eb9ecd645fcd5e2d";
628628 }
629− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/es-AR/firefox-64.0b10.tar.bz2";
629+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/es-AR/firefox-64.0b14.tar.bz2";
630630 locale = "es-AR";
631631 arch = "linux-i686";
632− sha512 = "0e5d63725b14fa54fdc3303d94e23ad22fa0b705bd76a625652aac62e51038b4e0e24374b619c85d9b22ebede4a21bb42ad8085641dbb2a0bffbe58f62891a86";
632+ sha512 = "352493a6c32f7108239f56cb6ff49e21d06a2c9dabace1ac11032023822b6b6ef7b38c1d9b1c7cd4832d2b120b60020608b51c286ee8d12757153fcc134aea0f";
633633 }
634− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/es-CL/firefox-64.0b10.tar.bz2";
634+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/es-CL/firefox-64.0b14.tar.bz2";
635635 locale = "es-CL";
636636 arch = "linux-i686";
637− sha512 = "7973b9defe83a8af0b34085edb76ca4fbfcf82c22180aacbecede0fc6c19ad78cf45ae85f2621204b95cc5040240a287812001f22d3d3d199abb5759baebf65f";
637+ sha512 = "093e218a562c96b54eed599dbed1aa41c2c396f5bba58e87888dfffae5a11084eaa6d8fdcb58c8f128346234d1df78241c0f6ae741b93e3f91a4c27481227b8a";
638638 }
639− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/es-ES/firefox-64.0b10.tar.bz2";
639+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/es-ES/firefox-64.0b14.tar.bz2";
640640 locale = "es-ES";
641641 arch = "linux-i686";
642− sha512 = "8be4155ee76c366b8505133117dd3fc6c1cd19441d336b2541d9e118adb555d75dc63192f03f24ece93e007239b4a367199af1fd239dffa092637971817b4533";
642+ sha512 = "60f46eb602026ed148e3b9d7728c9ed750e1e650e7d048b8dd4b4310ea1dcdf5d5b9b497d0a6719cfbbc8e390107d10836919ddd09cf4ee1fa156a841cc17424";
643643 }
644− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/es-MX/firefox-64.0b10.tar.bz2";
644+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/es-MX/firefox-64.0b14.tar.bz2";
645645 locale = "es-MX";
646646 arch = "linux-i686";
647− sha512 = "b24773ebf3a61ccd304936269bf5e0ff84a0e3730d72f30efc068709c5282b3eb5a5405b0e690ad08f113433a32dac45cd0a2867f818225c99d69270e9fd036c";
647+ sha512 = "05880045040e12908f563fc7b6e0b093ebd0452ad780e166f897a36caf38438d45844d784291720d6cb341adb7c983d2077f9327b433e05f1bb737d200fdad32";
648648 }
649− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/et/firefox-64.0b10.tar.bz2";
649+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/et/firefox-64.0b14.tar.bz2";
650650 locale = "et";
651651 arch = "linux-i686";
652− sha512 = "3767557a7e7e7452ed9703a9916d568a01e6e540b85e698dce5c7c8bdd238f495ce3001f9b81bfa7587f1ea35e4631de238c9153687cc9f745a6676d72e7a6b8";
652+ sha512 = "4013943318b6d50be6a2f0f77bc5843915ac2d45ebf230fd69d005df4360b3e6e15b99212d32b7f48f250f6294f48604c57b325107b9e39c4934af325c21c4cf";
653653 }
654− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/eu/firefox-64.0b10.tar.bz2";
654+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/eu/firefox-64.0b14.tar.bz2";
655655 locale = "eu";
656656 arch = "linux-i686";
657− sha512 = "55ea423b5127d1217c5b006f9e2f1e4b0cccf133c10be88d8058ce30bac1fe6fca49792924a0a3e0c0b601ac1c9c42d7c7cc0d73eca9624380cd733421572e24";
657+ sha512 = "05cb185b8de02664e16170686d59fe32c55415002c9c75631ea1d105cbe6e7a2d144aef5d185948a051ef1841f7dddb7ba093d559421a49e0b458659009d1495";
658658 }
659− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/fa/firefox-64.0b10.tar.bz2";
659+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/fa/firefox-64.0b14.tar.bz2";
660660 locale = "fa";
661661 arch = "linux-i686";
662− sha512 = "acc15a2dc4569a3d185a53fa70aa617320ff799a1f2dc9117d6c683385aac4d38232b3a6764cfe7af358095acd2c3392cab841b6c4d9df3e40a591de78b4523a";
662+ sha512 = "78dff03e7719da65e6b96deb2ef9890bca4d79f8937fd012805876dea8ff3f66d9613bd805587fb5057f0bc2bb310933748484a7bde28ff4d1fc7f8982f20867";
663663 }
664− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ff/firefox-64.0b10.tar.bz2";
664+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ff/firefox-64.0b14.tar.bz2";
665665 locale = "ff";
666666 arch = "linux-i686";
667− sha512 = "b4bd8fb4f6124a4d669044be697d54867e172f13f589fb93c3369f57827d1e3ac2c3e82ae943babccde27cac9781b3c7d17b2315f2485b269553aacb293c8b17";
667+ sha512 = "28b3e96c1ea34f3fe07c60442d3808698f9950ff818fea8a05a4b0298caf8195b602d6860837e91ec0a1129d389184ab0e2b577811b9c4e5d9b0c734c7cbe14e";
668668 }
669− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/fi/firefox-64.0b10.tar.bz2";
669+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/fi/firefox-64.0b14.tar.bz2";
670670 locale = "fi";
671671 arch = "linux-i686";
672− sha512 = "b7718b4ffe415b9ad394920dfb1f5fd63369aa77b94eba8d3e30ec15c38cf968869a84628aaebde70b3645fff387476ebb0b3ca1f55d304329b26256f4dea50f";
672+ sha512 = "98825f294ad8a3c1eb8488e5600c1fa2b6b471b7a305b434775c07b8fd267656c160fa7c8d5f73c847f48714d1d5ebf108fae57e14ecff10ed7cca5cb5825c8d";
673673 }
674− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/fr/firefox-64.0b10.tar.bz2";
674+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/fr/firefox-64.0b14.tar.bz2";
675675 locale = "fr";
676676 arch = "linux-i686";
677− sha512 = "2f8b421c7d8ad9d56bf95e433f7062ea8565f08c7eb573c8ffe55615a4de2ee405035c1eada3bb6d0ab104c80869bbddc74a9930d7a890d2942c8b6f792325e6";
677+ sha512 = "889f5fc32f9e547c602011d9d5d0af411b8ed6e98830293003d28bd397aacbc1f5d61ac30e171b379c311371a6dac1dc9df3ae27c671f303d15cbd52e5363498";
678678 }
679− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/fy-NL/firefox-64.0b10.tar.bz2";
679+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/fy-NL/firefox-64.0b14.tar.bz2";
680680 locale = "fy-NL";
681681 arch = "linux-i686";
682− sha512 = "b3afff8338fdc2a93b3c3a848ddcb8ae2daf69954c577014d90bdf59255cec51deded49337ec5f44dab7d727364b4b58a1dc6b42bc50b8105d19123702646abe";
682+ sha512 = "5d038c764a8eb3f07be729dc1adb5f84dd7a94d8f84521f42ee4192f5f432eb1e181871ef7be3acdbb9f158bb605eb3d99f2f788c876c6441811064672ca82eb";
683683 }
684− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ga-IE/firefox-64.0b10.tar.bz2";
684+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ga-IE/firefox-64.0b14.tar.bz2";
685685 locale = "ga-IE";
686686 arch = "linux-i686";
687− sha512 = "8a67d8e7fc0b1a5463f460858aae93b3837a8005f80c2bf63bc209e610d153dc4eaa849c1f41394a79334d38d9f028b4e1fc0b91780bab9b7552ea4a32bcbb36";
687+ sha512 = "01ab65cf6c3976aa305ade2ce5e04f5ff159289d2d808142e8dbbe537659de1d25a4da9cbafc6be839a50a63cffa6e8f3d2fd2d29feac8bfe5173ff42ddc8e9c";
688688 }
689− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/gd/firefox-64.0b10.tar.bz2";
689+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/gd/firefox-64.0b14.tar.bz2";
690690 locale = "gd";
691691 arch = "linux-i686";
692− sha512 = "dd5824ab3d5934c3dba7d9ac98e0b9142a13b11f78d6530250fa0556b6e2fa2c4cd8df8519b245c8b2e50e74b67c8e983864aca8510a665b331d352f2ac6e623";
692+ sha512 = "23f4dca508152ba7fd6b13dc20409d6b14c714fd8860ddeb66ed94b88ccd48f0b64d839a6ce852c974bbd3f142758fed42aaa817abac23bd58854e7f2c07c8bc";
693693 }
694− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/gl/firefox-64.0b10.tar.bz2";
694+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/gl/firefox-64.0b14.tar.bz2";
695695 locale = "gl";
696696 arch = "linux-i686";
697− sha512 = "765241eb0ae051adcfa6624c9a68f2546856c981125d6a3dd789b5fc391d55059af5b1e46b196cd7e536aee67878d63ed6a4afb86cdfa1d4d7352e901ba8f63c";
697+ sha512 = "ec7372f3fdd0e26f93d2251be0ded3b821dcf5927b6fc5a7a4b433d26f6900c775980b379a67a4414ba537443ce93523c2b6dec699401efcae0ab9c5d8e8bf90";
698698 }
699− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/gn/firefox-64.0b10.tar.bz2";
699+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/gn/firefox-64.0b14.tar.bz2";
700700 locale = "gn";
701701 arch = "linux-i686";
702− sha512 = "3b006caecfcafe9bfeafc2012b89326e219bf95a123aaaa4f3daeda2090754d6d33c8c7ff0f975042ac1ccd11737274e1f0582d4183bcb2ddc974355017ae1f4";
702+ sha512 = "4f3057757e35632ee9b108310df950b0279ca9f47562416e955112f484caf8314a80c8296c39dec71a6d7a10aac13160898b662b2528c08cee8e497803ca5bd4";
703703 }
704− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/gu-IN/firefox-64.0b10.tar.bz2";
704+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/gu-IN/firefox-64.0b14.tar.bz2";
705705 locale = "gu-IN";
706706 arch = "linux-i686";
707− sha512 = "fddeadb90c65301992851150e778ac57fa2c2466acd88ca6fbdd13f92c31eade24d4298dd19e75f7a381a435d4af77ab994ab3455f755f95dfc9ce6dcdfb478c";
707+ sha512 = "4e1cb8376b86e68ebcffc42bf8b30cd78803df0e041371820db59de7eaeff8f982ff1222db88dc6f8c70f0dd2ed3491a9879c10d89ee1e4b98e9a266da538ba1";
708708 }
709− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/he/firefox-64.0b10.tar.bz2";
709+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/he/firefox-64.0b14.tar.bz2";
710710 locale = "he";
711711 arch = "linux-i686";
712− sha512 = "88fbf1913ff9691593802d957b8b4477d66054f5c6e946f1384e7938d4e278c08a10a8b276e414a97fc95884667407528603424ac216242f59d55b3192541060";
712+ sha512 = "7b617bb361bc9eadb83ee7b86e256dc0168014dc59e425effb9a2bbb765690a7ba0a2e89341f1d80ab86cd167b9a6f983ea963f06002d138dc9789445abcd79d";
713713 }
714− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/hi-IN/firefox-64.0b10.tar.bz2";
714+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/hi-IN/firefox-64.0b14.tar.bz2";
715715 locale = "hi-IN";
716716 arch = "linux-i686";
717− sha512 = "c7468faebc10827e741427658b6bad7e362ce3db6870bf262c52e715b0bdd58f797dd4f7d445d4e6f01ded022e0b352de4d0c81393e561247e6e37c972e4b60e";
717+ sha512 = "b42be8e9b1a9271cd445cb7c939450ac92e7ce298e819d848c19af36c0fb0188aa86ccbd63acdd5499485ff543eee8c125515105f3ac46523112710aefc245b1";
718718 }
719− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/hr/firefox-64.0b10.tar.bz2";
719+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/hr/firefox-64.0b14.tar.bz2";
720720 locale = "hr";
721721 arch = "linux-i686";
722− sha512 = "58417ccdb0885b74be71734d4dfaafedb024f15d11533840b0a50222c31f0e3029be6e154ae652f12691e6e05784c7fcf423fd8c89bb2e43db8cfd17791c4f7e";
722+ sha512 = "51952b6eae0cb140653bac6130ad04f56d9e4325b872f3ae3bbe95fd7f151f58b3c67db294a1fb4919b8b184043c474bffd686208b7095ccfb7fa1574ab769c2";
723723 }
724− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/hsb/firefox-64.0b10.tar.bz2";
724+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/hsb/firefox-64.0b14.tar.bz2";
725725 locale = "hsb";
726726 arch = "linux-i686";
727− sha512 = "b1103601e66b63ba0ab01daae4f97fe8f5e69557f01728d0071802074b8eb2f91afba848139c0f8268bfc7fef627d3ef819b01900d377d7a7f1ae85e7d754bb1";
727+ sha512 = "a2d414c1a227b5958571857ccd63a1a4c4a9bdb7fe73416c5040af71add3d8241d6edaf4529789961d170803463ac24c10e80da75352f8a1df77a47cf538fa8b";
728728 }
729− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/hu/firefox-64.0b10.tar.bz2";
729+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/hu/firefox-64.0b14.tar.bz2";
730730 locale = "hu";
731731 arch = "linux-i686";
732− sha512 = "c1b30805a91e046cb606c5c51551f9b074b01fb03a822386d80c9c2dd5ffa468f755ca57baccb540e17125ae3a1d99e66d7dced48b739fdcc3626043876bb9fd";
732+ sha512 = "eea04e03d76172c840e1c41bef9a3052337e22e98077db17be869aa7f825acbff5851411ff83d38a16d2d44b445ed0ed708ee967cd1f33d2ebe45b4e50ba71a5";
733733 }
734− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/hy-AM/firefox-64.0b10.tar.bz2";
734+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/hy-AM/firefox-64.0b14.tar.bz2";
735735 locale = "hy-AM";
736736 arch = "linux-i686";
737− sha512 = "af29a30a9ac60fd744971e5a659b1fe9595b40be0f2427660ce9bcf6b504c11449410ed11c33eb750fc2397c1207d0b083cd0e448b0e068ebe9f5484c13415cb";
737+ sha512 = "de09a05251e51d66aed8855779977c9b1173bd69e43744af6e36c5a24042c063e0d9a46c80080e19c37027df9603767d21fed2da90363d029388f675f06a041b";
738738 }
739− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ia/firefox-64.0b10.tar.bz2";
739+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ia/firefox-64.0b14.tar.bz2";
740740 locale = "ia";
741741 arch = "linux-i686";
742− sha512 = "9fd96091f9eda42525842c324a8977ad7d5ad5c50e52503f50719db6e4120ac2054e316b700d3c4578ac2e86b5258e6c54c7ed97504dd481b8fe83595e78257c";
742+ sha512 = "0dcb346cfd2cbfa7f56e787eec952ed24e4621d0f265324c445423638239d954b60a82f7581f2f0afa913d7932577f16817795235efc9f8aac929e7c289e7ef6";
743743 }
744− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/id/firefox-64.0b10.tar.bz2";
744+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/id/firefox-64.0b14.tar.bz2";
745745 locale = "id";
746746 arch = "linux-i686";
747− sha512 = "2ccf109f956c82485b5dc3d93cbf11bbce8b4444c9c3cf823daa5510979c8ff10928d530422fa5e94f82903d464385ad1aeda67ccb675bc0234767d4cc4807e9";
747+ sha512 = "1ef2790d719d4ffd3bd9a7b8aa5202fdf3e380e7d040503890f74f29eda74405bd19c88e0440db399852330d168323ca94766b0409d33af25f6d42018531e072";
748748 }
749− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/is/firefox-64.0b10.tar.bz2";
749+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/is/firefox-64.0b14.tar.bz2";
750750 locale = "is";
751751 arch = "linux-i686";
752− sha512 = "2bf59ce3fc5cff4b4e8d20d8f7ae83f4f12b1fffe891a737a21c1cb705e4b29d6cfde667716b10d665f7cfe04c2dc579977098edce6a2f321ff1c083bf94148e";
752+ sha512 = "0e32f06993b335588ed8a27869b6b12daeaf79c2606d329ad8df94fa54abe425c694d7c7c48168123bf1bd561648654a26b8c308e50e882de328ba281d764acb";
753753 }
754− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/it/firefox-64.0b10.tar.bz2";
754+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/it/firefox-64.0b14.tar.bz2";
755755 locale = "it";
756756 arch = "linux-i686";
757− sha512 = "52ee298ac6fd29ee68b0aa809253b7f35a583b305ba0effd03e4eb0e8087aff9614ccaf050b664bb0c136c196b7373b8f9507317c70df412bf9324bfd3845e1d";
757+ sha512 = "632a2de491d1d791498c0ff1282151d42259bfa808c6fb3c05fbb8454e8e256a6b42cc4bbc4d9999b8d2303880110168be2adb872cc9c4dffd95445288b98d6a";
758758 }
759− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ja/firefox-64.0b10.tar.bz2";
759+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ja/firefox-64.0b14.tar.bz2";
760760 locale = "ja";
761761 arch = "linux-i686";
762− sha512 = "84a343da647255f25dec77be6225a47e5b129875e108a9ec41ac14fe4a006c6e1653114454595c5327f3c088073f44abb761b27abbb744bfc4163fd3208c827f";
762+ sha512 = "c23a99e8f1b8b895402100c00409f5ee0ea602f69c998d0d05a8358223303d9f20e33e7894b54de30ee9395ce1e484526cbbdc1e9ddc99e23902833abbe91a22";
763763 }
764− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ka/firefox-64.0b10.tar.bz2";
764+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ka/firefox-64.0b14.tar.bz2";
765765 locale = "ka";
766766 arch = "linux-i686";
767− sha512 = "9d110814322e9fc20026af9c9954ce76c9a2d782d64874f63ea46034660cc86fc5ec0789e4c2508fb729704623043e0a0c05e755faa9c62f7bad2ae3501936fc";
767+ sha512 = "e6d6b1b9e5e44b002ffa7cf55cccf47cfe79d3056305443e891dec87e471b6be8f2bc4cb5c13d739f40ec9284588e62347c4c4a2e5b49839a4547aca2faf8a56";
768768 }
769− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/kab/firefox-64.0b10.tar.bz2";
769+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/kab/firefox-64.0b14.tar.bz2";
770770 locale = "kab";
771771 arch = "linux-i686";
772− sha512 = "ec9d23bf953f1f3c0bcec9fa1059aa7d08ed51a781c1983fe71811a4b56e4727248941675745e7b83eef6a84de36d93068f0c574ff1d3e42d39a02b3415b5699";
772+ sha512 = "b84b2505624f5356a6544ddd8279b6a77483a8d0574406b1e0f17b136895674b311fb57fd7025a0e1b2ee53577d57bb45b0f02ffb94ec1cedd3c93298589e7d2";
773773 }
774− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/kk/firefox-64.0b10.tar.bz2";
774+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/kk/firefox-64.0b14.tar.bz2";
775775 locale = "kk";
776776 arch = "linux-i686";
777− sha512 = "c284fd70d033383e77faeb03afa658c0bc1be03e56b5b5d29db1bac6ec95c48d5150b17124cfefcd7a5ec04c016e68571c7d5624b89a58b185cab5c8cab9c1bf";
777+ sha512 = "82732dbfc100ffc987fba5a721d7ba2c04bde1a750e1966bf6579fb9e1e9d23f00ba5ec239b6af3198fa8f8f1dc8b7cd6fb80598b24e54ec2aee1ba488858077";
778778 }
779− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/km/firefox-64.0b10.tar.bz2";
779+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/km/firefox-64.0b14.tar.bz2";
780780 locale = "km";
781781 arch = "linux-i686";
782− sha512 = "fb838bf6f694ed93bdaef8a55f905daeec4ebdd7bbb57c133641ec017ed155b53452b6045dce7961283022605345a26f76e5e48f3b75bd056c2a69cf3662d741";
782+ sha512 = "8deddc2f4559506870bcf4e5c26b7de898b48cc2544469df92ca3f617f5d8ddf86e9f9e7a77fdb9727fe5e5e166ef2257dd70c7d10105bce59734a4289b927c4";
783783 }
784− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/kn/firefox-64.0b10.tar.bz2";
784+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/kn/firefox-64.0b14.tar.bz2";
785785 locale = "kn";
786786 arch = "linux-i686";
787− sha512 = "a14ddd39b083eff5530badfb709dc32c9b5690372ccf88f333ccf9e0f67c1e73fe5182d580423e4f6d8a10356221ca34888605b0445ab494e2933dc259a4580f";
787+ sha512 = "4d0e809945c3b5a874b72343be82484b99a10aaba0d70b85dffb3e6d7e3ebf6b8304b6b4dab648bf48c5c11722138e2275744295b86e4e1c2af07fad05b6960a";
788788 }
789− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ko/firefox-64.0b10.tar.bz2";
789+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ko/firefox-64.0b14.tar.bz2";
790790 locale = "ko";
791791 arch = "linux-i686";
792− sha512 = "b87aa42c208a3c71f874a0ab9e67e5b65b75749246f474efd9e5ed0f44873055810dec07c7674c69d197c5cd98c01ccf9af1d20c79563abb7415fd0e62b86d04";
792+ sha512 = "eea6b2534ed9a368abd8dad636ea3b0d4298a9262795d694bc20c27136b325653113d077b57d361213395e916c29522daa5c8e0e8c9d151ef2243215ef97fd88";
793793 }
794− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/lij/firefox-64.0b10.tar.bz2";
794+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/lij/firefox-64.0b14.tar.bz2";
795795 locale = "lij";
796796 arch = "linux-i686";
797− sha512 = "0ca6688930361db90025a32b197f1f243bfd9c5e2231ac899f2ffd24278d6254fa498af67d4fcd11caf3422af814f5cf71897ff7bca885722e74bf2ffbaedb88";
797+ sha512 = "bd941e32b3517a599c7f5bac36f8a9feffbdbf93bcfcaf776d84ea9d5f0408a3973431e1b9b6feded677b48ac4af26e6b888800e5acface9da7c6cd37fd250bc";
798798 }
799− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/lt/firefox-64.0b10.tar.bz2";
799+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/lt/firefox-64.0b14.tar.bz2";
800800 locale = "lt";
801801 arch = "linux-i686";
802− sha512 = "ce71aa99ba12d9ed490e7241b4350cb7a4f0e6ae9275306f5362fab4ac51a2fb1d7cf42feff1a2c682f6ed8b1845fbcaee5194f487b4912720c27e43546e7c1f";
802+ sha512 = "efc4cdc50cda00b35d1f69033f76f1a9c0d4c530a08675c041423a8d0b4d5d24f3185a9d63cad594a5df6b7bde750cfa2fc13b9f7847944aa5243cc7b55f6d11";
803803 }
804− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/lv/firefox-64.0b10.tar.bz2";
804+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/lv/firefox-64.0b14.tar.bz2";
805805 locale = "lv";
806806 arch = "linux-i686";
807− sha512 = "bb5988a33aff18e4e050be8113b143158390b28e4bb7cbabc4b9e806644bf42bc7a5f0f5174bb9aaa6c46756fe04ee0a2aa402f33e2403fcc3e6601cf31d0abb";
807+ sha512 = "8ad8ac07fa756b649a334f06f9795c3577e3e9128ca66b00541bc440711027d4ec8572eda71a0eaad38696e59031d3f23714f6372fe22e8ad38fb4029b322b28";
808808 }
809− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/mai/firefox-64.0b10.tar.bz2";
809+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/mai/firefox-64.0b14.tar.bz2";
810810 locale = "mai";
811811 arch = "linux-i686";
812− sha512 = "0541f86fce20e6bf565b84acd5bed5d954d1de412f0f584cf40ac2ba84b827fef95f7f055b3cb1a7cce824f5eeac3a905368c3c1f1d33202e091e7edb3537b14";
812+ sha512 = "8627f3afd45555cd254c571070bf5100a25770c306f63f091fe61501fa0eb6e37e7ccb5bd3b9378bc494ae6025d39c45ab6dbd20cf5f7d744eff8b3ac02e724d";
813813 }
814− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/mk/firefox-64.0b10.tar.bz2";
814+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/mk/firefox-64.0b14.tar.bz2";
815815 locale = "mk";
816816 arch = "linux-i686";
817− sha512 = "6138dcf84a21235861750e0d615862581e205bbea71d61861dbb17fd74c0e61d6bd9f223acfcb8eb623864cbfa800062293cae68748a320db143e1f509f54b41";
817+ sha512 = "800cef931052b49ffe875464ec8756e96785d9d122aaf3b2dcc9397fcf524ed0375cd9cdc67681b99439e23556b0150b14bb02a5e9d7cbb6f3a806674b904030";
818818 }
819− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ml/firefox-64.0b10.tar.bz2";
819+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ml/firefox-64.0b14.tar.bz2";
820820 locale = "ml";
821821 arch = "linux-i686";
822− sha512 = "4befe6de671de14fbac4ebee28018cea0402a0931bc3140f89b2dfccfb23de0d106f6236670730df9460ced8056cdd234c401b7a8a37d6fe6e70c9c61eb4094c";
822+ sha512 = "ce8f90f83923cdfd0ed7cfcb63f4a225c7b5505f73671acdfeffe4dfd5d96dfd4b8746a6e956df22623b57f0ca2ef873f6508cd09c3335f460f8f87e5d0e4a94";
823823 }
824− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/mr/firefox-64.0b10.tar.bz2";
824+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/mr/firefox-64.0b14.tar.bz2";
825825 locale = "mr";
826826 arch = "linux-i686";
827− sha512 = "24f85d8cfb190770b3feeb78f46779e303a8e3037db75515bf7b2c99e1c836591913ff0a0c4f882c0c17d077bfd29a9762b92692c99dd77727e1bea4439a1a49";
827+ sha512 = "df86766636cdec2dbf094f9a48e6b613df4a18371bb85862623a99a5cf095281f926c5bec51bba089183db363b14abd82ba771522dd4367ccca7ddafd532ea21";
828828 }
829− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ms/firefox-64.0b10.tar.bz2";
829+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ms/firefox-64.0b14.tar.bz2";
830830 locale = "ms";
831831 arch = "linux-i686";
832− sha512 = "90b81a464db5b992eccaeb08f7acaa383872f7d8e037eb53016b2db337658fb97a8afcb7a9fed9e39a9d6bb44bac0766656ce065e38a4485f5723ca6cc242cf6";
832+ sha512 = "9e20aa9964c2036beeb4b5598f57d8f066062fc514229bff088a36bbffb46a9b6131b4ab7af77d785b98e6544a5e102e84cafae581ce7a2ac0ae8e5223dc8aee";
833833 }
834− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/my/firefox-64.0b10.tar.bz2";
834+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/my/firefox-64.0b14.tar.bz2";
835835 locale = "my";
836836 arch = "linux-i686";
837− sha512 = "afe60863fd0443e3a9069e0ca28025df53eef9b822be6b0a35144cc8ed3af1982bfce1c6e40c4aa17159f02836efceda6dfedb1a7bd7aa96d3de0eb348a60c38";
837+ sha512 = "65c94ffa537b72cc89c09342ddeb8915a7e3cc0164bc3191e3e289e8c5217b175190465e49afbf5adf0f21864c787ccbbfd8b5eb2975ce4917e8d5cd5aefbc08";
838838 }
839− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/nb-NO/firefox-64.0b10.tar.bz2";
839+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/nb-NO/firefox-64.0b14.tar.bz2";
840840 locale = "nb-NO";
841841 arch = "linux-i686";
842− sha512 = "4007d3e7623488754b3f2f80c6590727d0595e240374c67a057da1fbd64f106553c1fc2f5a8a4cc6ffea753790e522de188dcf0ea4bb6eb40df05b4b822da86e";
842+ sha512 = "1ea09c94a276f6ea18b4f759d46197af94bbfcf313ddc3d60bf9b0b6c406fe4bca248ce13f6c54f9f0d01f54804ce13792be998b2bdf35db1fa39d0a1a4ce688";
843843 }
844− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ne-NP/firefox-64.0b10.tar.bz2";
844+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ne-NP/firefox-64.0b14.tar.bz2";
845845 locale = "ne-NP";
846846 arch = "linux-i686";
847− sha512 = "3b0edf144a57e656a44e8d7ebf2c4967280557be024a844ec230dd4d2a184966463ba6b39828653df67c2a6715d6f02873f5c5349705446ad487c6640806cd43";
847+ sha512 = "b35addebf27849b8c9b7d486d73d8273b58f706e8bb23599628b973f558aa486c793446e3a4c05389fef1664b6a261460a47b2abc482ae5c7d8cca26963fa6b1";
848848 }
849− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/nl/firefox-64.0b10.tar.bz2";
849+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/nl/firefox-64.0b14.tar.bz2";
850850 locale = "nl";
851851 arch = "linux-i686";
852− sha512 = "8527ea936e66a182720ffa439d2893318c7af343ae5acf758f44d2293a3857dbc28f13d7147cc43e9644f4b174f73e8e4426c43c58038a582dc379a1e5e0f5ec";
852+ sha512 = "e5b514b4582ee116910875887f8cd47573c6b8d63b451ce0471bc02c2f93bae7f52ad8e03eff732005eb40f4807cd2d9e5dd088045f1c3c7a0644629b9fb6968";
853853 }
854− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/nn-NO/firefox-64.0b10.tar.bz2";
854+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/nn-NO/firefox-64.0b14.tar.bz2";
855855 locale = "nn-NO";
856856 arch = "linux-i686";
857− sha512 = "4a15662aa9aa8ca6b7a3f46868d4b7e3114fc644da9c4f141af0ee50fe4502ea1f37b7b007551460efb26cac9d788491615103cf442078ca678d4407b53d199a";
857+ sha512 = "caed8e08167575fd143679f72c4d48eac7238f168e335f56b813c2f6e55f31c781ba423cac018ccc6cb69b4b73ae5d3bf6a9af48e7e087af42286b436ec95b85";
858858 }
859− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/oc/firefox-64.0b10.tar.bz2";
859+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/oc/firefox-64.0b14.tar.bz2";
860860 locale = "oc";
861861 arch = "linux-i686";
862− sha512 = "77436ff6c82f3356a0b092274fb26543da73ae7ecc4f4d8ec8dd1ba6d282114ad01c557f5be9b541b5d41059a40699d5da5f15178ac6f9cf65b110812925ddf0";
862+ sha512 = "6635eaa118bbc7f8f7945456c2fb8470f2398d68ae7a00266194e23d5a56c3c28dc4accfe0cd354c0d468229669c38547bd8cf0219db61ab21083163db3688bc";
863863 }
864− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/or/firefox-64.0b10.tar.bz2";
864+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/or/firefox-64.0b14.tar.bz2";
865865 locale = "or";
866866 arch = "linux-i686";
867− sha512 = "efe9b2b6237d2fa7ee679a535295ba3143ab00d226b611cd09bcf96934f55632b7f5498c03be50034c925c69a4fc25632b40c9ec5302dcdf43648542fddf4b5a";
867+ sha512 = "360b38e0c605a332cb0fbd66d6c61fd419dbedd2589655e019e62fc40bff6d6fbe8e40a59812f44b3cae1ca21dd5c69971b7e9501744d75392bc377e3d3e36a9";
868868 }
869− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/pa-IN/firefox-64.0b10.tar.bz2";
869+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/pa-IN/firefox-64.0b14.tar.bz2";
870870 locale = "pa-IN";
871871 arch = "linux-i686";
872− sha512 = "e6879a8ad1d379a0562d9c5ab5cf521fbc3d195d5aae54bc5713f3f4fe4dedb42bd2d0b3c434ca77cb357f8665f03a32d5772a466f9ce802d0c1f123287e2557";
872+ sha512 = "5368aee673272ca741ce4589bb191f654df557d9a929091bd430d47179e8007590233cd671184efa7bdde57f4d9db20700b5828c7d39a562d421280047bf4a08";
873873 }
874− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/pl/firefox-64.0b10.tar.bz2";
874+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/pl/firefox-64.0b14.tar.bz2";
875875 locale = "pl";
876876 arch = "linux-i686";
877− sha512 = "ae362910b20f6c9dcc1ab56a9f14532d1bce343f009ecb1d71d1907e15c11e78d532e9a1dc477c3070f63e1d6d9b322b8b3c629b5d11d18207ddf61fecd257dd";
877+ sha512 = "557199b4c193d1bc6dbd09b84aad4a7c7a863725790c05ac3978bb393fdefa6dbb088a0c7a41415ec2e16bd8e355142b9956075f60d049db7a713b4d138053b7";
878878 }
879− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/pt-BR/firefox-64.0b10.tar.bz2";
879+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/pt-BR/firefox-64.0b14.tar.bz2";
880880 locale = "pt-BR";
881881 arch = "linux-i686";
882− sha512 = "c6224a6a582ec2ba09de0c4f570a63ea79f03d34fcbc37adddded768758a5936ea9ac9661d429a0e500381ad7a9879d5afe222a6981fb45f5e23d15d5680271a";
882+ sha512 = "f5db4fe1ccb3ef02bbb32b180a59af92fcf124b6bfd2a8e9e95452a61fc5740ee6a1084b842383d38bd59620ee1a542df79344640e7ee5e776c58b83830f4be9";
883883 }
884− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/pt-PT/firefox-64.0b10.tar.bz2";
884+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/pt-PT/firefox-64.0b14.tar.bz2";
885885 locale = "pt-PT";
886886 arch = "linux-i686";
887− sha512 = "b275a56a93f5332b9ae1aab11c896c0b971d9fb4aa9f574668e0d43edf0fa19d013afca12cf2b82cb493dea47caf262b2a0c504d9d1906de203622334d55eb7f";
887+ sha512 = "f38d13ec454db404f40b2dbbebfc38c56e30f57ab586739e346d5a69da7fffb942ec2e9e1b76bf483f64c40dbd6641323fea3da3714926ca95d00b87847a5564";
888888 }
889− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/rm/firefox-64.0b10.tar.bz2";
889+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/rm/firefox-64.0b14.tar.bz2";
890890 locale = "rm";
891891 arch = "linux-i686";
892− sha512 = "76443d9234bf38a04820a25997a46fffcef58c3ed2593d50c7ab28280fae5c518dc353611a9b8b3070c337ca3815cf63b41826547ef673e6fbbd4037951e3c4a";
892+ sha512 = "668790acf5664b71df38ff060a6e830cf646b685a7dcb5452eb21fd545bebac5a9533d6b424fadae7f3cb875955e7213b034d5ad0ef078a8a9ebe3372a4130a7";
893893 }
894− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ro/firefox-64.0b10.tar.bz2";
894+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ro/firefox-64.0b14.tar.bz2";
895895 locale = "ro";
896896 arch = "linux-i686";
897− sha512 = "bc7b68dc5d6a05c66cb7aa6d39ab56c3f28174539caf5e27dbd2b3fae500fe439b51084d0ecd16d7cd9ea52dad5bdadcd5ebaaaf7e03256d30bd2229e0c7f89c";
897+ sha512 = "bbf67517b93a28f6b5cb6ade1d0df2b6e89930ed172e56d76fff0b5d1ac0a8d30a2be46b4a7dc9300e3acb1fd69d79c2b757c79bb8746d25281970812e6bf70f";
898898 }
899− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ru/firefox-64.0b10.tar.bz2";
899+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ru/firefox-64.0b14.tar.bz2";
900900 locale = "ru";
901901 arch = "linux-i686";
902− sha512 = "6daf35184d294395de7f4b203b38b0ef4071956fde1839f75265cf45b1f887640067e2eb17d5e5bfdb4f7cc0d4874579ea691ca8d5301f76ec2052c824d8331d";
902+ sha512 = "ecf73f6633b502c6b5fde6b8dcd22a1688edd881360f87c7f399d7594474c753c7b6df2d1fde652ae9ab9938c16dff44f01c47b33a5988c00ee636291cddcbbe";
903903 }
904− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/si/firefox-64.0b10.tar.bz2";
904+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/si/firefox-64.0b14.tar.bz2";
905905 locale = "si";
906906 arch = "linux-i686";
907− sha512 = "db7f827ed173044811b994a89b8625f37f0a92994e0bf748f18082e5ab842dc147184b6b552c5b7bdb888d9c3ef4e6ed8555074936263c49f0517686213dec21";
907+ sha512 = "7f3ed166ba6e8a9d223b881a26753fe255c441034b61f8ec06b0b67d83c20c08aadd28b86befe362a475f77ccbe26e9828eb81e116831d1e1251662163eb0d70";
908908 }
909− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/sk/firefox-64.0b10.tar.bz2";
909+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/sk/firefox-64.0b14.tar.bz2";
910910 locale = "sk";
911911 arch = "linux-i686";
912− sha512 = "e7dfb26f8f8d763d66b7d9f924fa30f55e55728cd9178602646504759c8d83864107f759983b95c5706d0438bcc534ee3020875ba2b06e161d669b7be2e38f0e";
912+ sha512 = "e1e08ca8a53395abbc26b428d82cdc763db39dbb45fda351f3815d770f696e6629969bbc2a15053d87a589ad3755ffea29fe897004aeedfeeb166cf206f75ac6";
913913 }
914− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/sl/firefox-64.0b10.tar.bz2";
914+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/sl/firefox-64.0b14.tar.bz2";
915915 locale = "sl";
916916 arch = "linux-i686";
917− sha512 = "c6a36cdbc579cef430ef91064c8c1fa6c1b63831701f5f0a416e0d41742f0e827e90cac66ad5684fca32e7bd69c8c40703b5a22055e84f83fde51ae1af3d60e7";
917+ sha512 = "5fb47da8d75472bcb36b958cdc604f8d9c5ee92ebad423c3adcfe362c7f0e2e9f2bdb08aa2bc5e8e93fc3c8a619e2ec1796fa40d0a6634fb2cc22b163d978758";
918918 }
919− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/son/firefox-64.0b10.tar.bz2";
919+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/son/firefox-64.0b14.tar.bz2";
920920 locale = "son";
921921 arch = "linux-i686";
922− sha512 = "1cf6b1c9ffdb1862258e0e0f54543c36d90f1dee02507ac4cf6d8c8c4a1be18902403870642231a721398dc757267e41e411bdc221303b0fd081845b474b22fc";
922+ sha512 = "1020c0d63535096fe0c90907f5fc24753fc32d20fe53123c43ea58b4666f20486e4e1383a96f499e4b8abfa941a18d69f74d7f6fbf52f7b77201f19317bd8f2c";
923923 }
924− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/sq/firefox-64.0b10.tar.bz2";
924+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/sq/firefox-64.0b14.tar.bz2";
925925 locale = "sq";
926926 arch = "linux-i686";
927− sha512 = "4e628b5cf477fd18c4ce325ae356e35eab9b40a40a653428864b2e1e2ba80cbbfded05ce6e280aedee76eb92a113486a460f77b70cc52ede270c7d04bb7987b3";
927+ sha512 = "cbc20da6a33130b02683b8f5e3ee128f162f15728cfb40655c92ea94291dd614129e409a08d2a9d0def9557b48e8c548288ddf2d2b529855064ea17af3757844";
928928 }
929− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/sr/firefox-64.0b10.tar.bz2";
929+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/sr/firefox-64.0b14.tar.bz2";
930930 locale = "sr";
931931 arch = "linux-i686";
932− sha512 = "1b659513229e2f37bf797a703041c249d187ddf7bb3e239b67a49ffc42ecdf9d3affee300e3e3885c5961d1e57eb7590450f5bdf822503c8889cb782bd070457";
932+ sha512 = "7c27e12229cd86a74917f6eda2c6a43711e7e1a20610c169c0da65e4eb6b646236e5dd31be22d679d74391387aa3b375863c2f0d8875d8d9abd701fc14ed011a";
933933 }
934− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/sv-SE/firefox-64.0b10.tar.bz2";
934+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/sv-SE/firefox-64.0b14.tar.bz2";
935935 locale = "sv-SE";
936936 arch = "linux-i686";
937− sha512 = "96317452a323db8fe04c4c83a40bb5112074f82f6a074e3b3a901bdd7d0e67f6bc3efaf230440e20d0f39fe27a6d2d2b14e6c5a34384b0c1aab11836af44432e";
937+ sha512 = "c564b2af8421990b0efb90f81f226aa63224275bc0b9ca614bcdbd0a95c3f85970b783d301b122d5198478ae8e7dc3ebe5f29fed417c0d5ea63e6a9e8b62a087";
938938 }
939− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ta/firefox-64.0b10.tar.bz2";
939+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ta/firefox-64.0b14.tar.bz2";
940940 locale = "ta";
941941 arch = "linux-i686";
942− sha512 = "5c87b548553e34586a8f3bcec429735c4e7ac89027888b60be89e68710a79bdc2000787cc5000cbda771d0cb704c8e3edd404d4b4148f1aec87a9b5cf7e82754";
942+ sha512 = "9f7a8321bf8333992bb3888005646cc0af4362ad447ed3024196426c43289669ae791f24c09553e275ad184625f910de8e09345ccf28d231741b5dd2ff1b280e";
943943 }
944− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/te/firefox-64.0b10.tar.bz2";
944+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/te/firefox-64.0b14.tar.bz2";
945945 locale = "te";
946946 arch = "linux-i686";
947− sha512 = "b75bd0e03305cff00d4ab904545b1d5b075abba9d1e27e4cbfb158c109506c72494242be9b3e5728c47d5f93a302efca3c8c9661c9e7fdec3dff3b6424009796";
947+ sha512 = "d53f9bcde30f9c884a67abe5d1d83f6fa9a33757b73fb026cc32535563a3fb4f97ad98f924054016e7102962eab3a858dd9004b171396b10b01535bc62771d4a";
948948 }
949− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/th/firefox-64.0b10.tar.bz2";
949+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/th/firefox-64.0b14.tar.bz2";
950950 locale = "th";
951951 arch = "linux-i686";
952− sha512 = "6df43a8e11ccef31995e7fc3ad47e8666c08a3663be3b3c055900896c9f0379e85066fc6387e35546a4ba73781cec631a73cc92a4e648cc0b31efec16c652ccf";
952+ sha512 = "0d122ecbd5c22cb3c1d05156fc446ec4bceebf63675bd7d2789972bfa9acef83fb247080172f04f7341be0c59d478606bfae73a1c73f55139788b40b7851a58e";
953953 }
954− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/tr/firefox-64.0b10.tar.bz2";
954+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/tr/firefox-64.0b14.tar.bz2";
955955 locale = "tr";
956956 arch = "linux-i686";
957− sha512 = "9cbf8d659be4a7e32da95bc9d76b435b22e1e83e10a93771f247540eb313e0d476f231c436d1e39bba4ebb7264a1be4e5f1a677bee5b0af3fd83c42887cf173d";
957+ sha512 = "ff2165f42c5916cabe416804af8e0bf8c24f4da91ff5c30731e0c05c84aec3099e15abd02c9d4d37bb42b7d749b9bb50374c24d51b2fc83c3b22476dd2eff47c";
958958 }
959− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/uk/firefox-64.0b10.tar.bz2";
959+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/uk/firefox-64.0b14.tar.bz2";
960960 locale = "uk";
961961 arch = "linux-i686";
962− sha512 = "bf79b845f6ac4eccbeca2de07bc0f9668541ecf62f109919c15b6348428dab7b748de330861f2c77de6bec4609608a9927ccf7743446c879d8c7cd99ec021ee9";
962+ sha512 = "1dedde0a990ca3e32b2110d13a3c270bb615ce6609632ad6a2d014cc96a950690c795e8336b75b0c492f0577d0d4d43876d285ce1f2292fd8591d5d648a442a1";
963963 }
964− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ur/firefox-64.0b10.tar.bz2";
964+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ur/firefox-64.0b14.tar.bz2";
965965 locale = "ur";
966966 arch = "linux-i686";
967− sha512 = "7609d8c93d71f20898d77d08066ff51a418d9cd7fe616c42669bb5879856dae2c1b40cf6a74ccd65d6360857369a96b5eb7e03ecc1babaef95d6baf9b52b85e6";
967+ sha512 = "1d2d39cd8db329b7f717cee5cab6e56be05e93091752a1ae02e4a3fe36bbfe9391cd6117775b63821540f0de708ddaae4dd1a1b998d755269568c7810c07fe86";
968968 }
969− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/uz/firefox-64.0b10.tar.bz2";
969+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/uz/firefox-64.0b14.tar.bz2";
970970 locale = "uz";
971971 arch = "linux-i686";
972− sha512 = "342aac005ea6aaab04988133d27154c6a2c1d8404b9865413d07febc42325b3c63c2b85ab11cacb4120e74693c3a8e447b396b8fdff93ab913041b73ccb91372";
972+ sha512 = "83b17251083ac9790ce57a7d6ed62e7df86c97770b6ed4b6b3eb4d583f1edbba9ce06c3c3b10596e237f79b4afc11483cf926225a5834f7e1c4ab7ab27abdffe";
973973 }
974− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/vi/firefox-64.0b10.tar.bz2";
974+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/vi/firefox-64.0b14.tar.bz2";
975975 locale = "vi";
976976 arch = "linux-i686";
977− sha512 = "5c44ce438816a7ebfee3e3eaac121845a53750439387b4d01c9a846bcc344a85cc95705d1bbe514de11297909be425f0d5134863be4f0901b963c7dfa552957e";
977+ sha512 = "3ee2013dc094b0b77533d88548fb5906f1a7ca1440a50a1585e04f09d1aa62c853f0837a6b218e1818ae93f0e838cbda1915f40b2030e10386a2642820fa9729";
978978 }
979− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/xh/firefox-64.0b10.tar.bz2";
979+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/xh/firefox-64.0b14.tar.bz2";
980980 locale = "xh";
981981 arch = "linux-i686";
982− sha512 = "21b9ac22d9167cf830f6594cce7b3b1deef155c6c7baf60ed74769bff792f57a58e3f2db351a1df41a479963cdc3dc81e120ff4d47d7aefeeb330994a98326cd";
982+ sha512 = "2bc8af3262deb7c3ee5087921f721066ebaef6cc9c93a36b1dfe8fb2b43afcb276a78a32d959d52cafc33b0a869860c0963d6f1389cd0f3860bc0c95963a916e";
983983 }
984− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/zh-CN/firefox-64.0b10.tar.bz2";
984+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/zh-CN/firefox-64.0b14.tar.bz2";
985985 locale = "zh-CN";
986986 arch = "linux-i686";
987− sha512 = "7b1a10588bb981006e0e28c8725e69c9acb9a029d8cc8e587fe47b59eb9021a3718bc4a2dee658b5cedf426051d23d55c4d6c4dfc0df0867fabc2a0fdd0fa874";
987+ sha512 = "b51a683f3a8f52c41d9ef0e8aada1007fcd3db95cff4c36b353698de3f406f232e78134e4095f3fe3f8b8b2445d095141fa2ac3a5186943db5d35027e63319a6";
988988 }
989− { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/zh-TW/firefox-64.0b10.tar.bz2";
989+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/zh-TW/firefox-64.0b14.tar.bz2";
990990 locale = "zh-TW";
991991 arch = "linux-i686";
992− sha512 = "8a30a6cf262adf1a65dd4964c5970ef2d3641561ec1f085f8606b5492570f43e7e5a0e2562f4e873056c3a9a3b4b8377b2e85f952c2d382ca800576b64a3d866";
992+ sha512 = "811498331ce6e2c9b7297069f4b5990f092b7330ffd4ef296612bc542bbad0839180753d09cfbfefde965b6ccc6a8783ec1eee891817e665675f08bb4e8e3b0a";
993993 }
994994 ];
995995}
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix+397−397
@@ -1,995 +1,995 @@
11{
2− version = "64.0b10";
2+ version = "65.0b1";
33 sources = [
4− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ach/firefox-64.0b10.tar.bz2";
4+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ach/firefox-65.0b1.tar.bz2";
55 locale = "ach";
66 arch = "linux-x86_64";
7− sha512 = "3c3cef4660704180ee6a64266f476624db76887eec8b76fe38ee35d18305a19a3f73b4800fb02bf769f766edf28e86813a49a5190fac035dd20f996de39469e2";
7+ sha512 = "cda7c4c170db4b718493259e67b266851211754de4edda61957b1fd8d5491e3a0e2c17728d101e13ca03a999d2794f65b62798840103675a7e1e1ca76885f6e9";
88 }
9− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/af/firefox-64.0b10.tar.bz2";
9+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/af/firefox-65.0b1.tar.bz2";
1010 locale = "af";
1111 arch = "linux-x86_64";
12− sha512 = "afe36e12ad85d036d98051d9a978770ca9a31e362c85a269a2e6ff9f69d0700084aa316200f15755811d0f80bc2182a7e56cbb208575805622ba9e3e4f775c69";
12+ sha512 = "695a5ccfb932bbd6a2d2257969076ad458e21b62ca3222b6614d63543bd71459bb133e53b88366915e2f874ae7490b80efec7682ff174a3e19d4827e3b73de3e";
1313 }
14− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/an/firefox-64.0b10.tar.bz2";
14+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/an/firefox-65.0b1.tar.bz2";
1515 locale = "an";
1616 arch = "linux-x86_64";
17− sha512 = "13fe8f2f15502429177e5f214ef80a4b7d696d3b5e67e1e0c4fe86d42ea99e462513a3058086533ceda0df6aa2a8e291021e3b1f669bf091e7a7fda1bf00d176";
17+ sha512 = "457ed14f27a2a502baea9d46a7b4b7e0fbdae13d90a84549d238a4fce62486f120ca61ebb137b33fa5df72d1b86d38bc27882a2055f6fd7c2d6d48976f476153";
1818 }
19− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ar/firefox-64.0b10.tar.bz2";
19+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ar/firefox-65.0b1.tar.bz2";
2020 locale = "ar";
2121 arch = "linux-x86_64";
22− sha512 = "9a8365b82a1d40333354774e562d7f67dd2992c6435f33c74a7aa4a119516bda257e70090805e17bdbb142901c213e50f6b964f3ee91473c480a9d1f89fbea4a";
22+ sha512 = "b859161c50a0e038912c7428cd8a0996d85dad299149caa1f97d8f9380e93395358c71f900b9dbde3061dc30f5a5dc1071e34981ea9678eb53a84a9498c5e7c6";
2323 }
24− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/as/firefox-64.0b10.tar.bz2";
24+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/as/firefox-65.0b1.tar.bz2";
2525 locale = "as";
2626 arch = "linux-x86_64";
27− sha512 = "1fcd7356cd69b408bab3c6aafb581b011ea4e0057571965df0d07e6a4a014c9c388f601fb071afe1247e8b2a060509a158a82fb3c454510fada1a0112e1f0c13";
27+ sha512 = "576f0ade4da85f351937cc71bd87020a917b1d6eaf82a406a5b657872e08d4b3120e42941a40b8625e248860888a2c197b0bf0a0ac97f07ea2ec7b26c302f7a1";
2828 }
29− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ast/firefox-64.0b10.tar.bz2";
29+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ast/firefox-65.0b1.tar.bz2";
3030 locale = "ast";
3131 arch = "linux-x86_64";
32− sha512 = "e739b3fc62c05e87a9af900d2a62b12c591a382aa6029d70d09db3a2e9fa426ac424c3ce7a9e770a147fcb94e041484b334d4f1e9a912f329d2002bb8cca8fda";
32+ sha512 = "75504d6c5c990db69e10ddc99f8b5d464eddf45adde7607d7957b3c85979cb8f30a5476eb7a5ce1cd6d13d71c77c4951dbcb047492af5c2774f303787a872006";
3333 }
34− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/az/firefox-64.0b10.tar.bz2";
34+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/az/firefox-65.0b1.tar.bz2";
3535 locale = "az";
3636 arch = "linux-x86_64";
37− sha512 = "d7087037755b1dbdb347d397f0db9c4efb93c2ea858365dd5fc6598689890b62d5e8a969484d0d746be23598a5152d463893a49c89efc84ff4a870f41899bd0e";
37+ sha512 = "d89073193e0a4ac3d34313acea7debd4a4fef6947c0f8aac2f6f27518465ea7700c9cfe4b2f8d5873e22cc8e474e3f14267863aaf005b42313ecb5e7e7bae306";
3838 }
39− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/be/firefox-64.0b10.tar.bz2";
39+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/be/firefox-65.0b1.tar.bz2";
4040 locale = "be";
4141 arch = "linux-x86_64";
42− sha512 = "9e50627425631d7c3f93cf176a157b45f23ce36c82f11139a4959f9d6b467d30ffe75b3aa62984be67d202fce9afe90685b76e2acf1a8300d82cc14654ad783c";
42+ sha512 = "cec23816cb37ba0a61a82c2667bd78fc546268e1cce79a81c311676ef2c5afed56021775bb93980abbe3f2af7509320d24618dccc5fedeb6afe05966f2a5da31";
4343 }
44− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/bg/firefox-64.0b10.tar.bz2";
44+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/bg/firefox-65.0b1.tar.bz2";
4545 locale = "bg";
4646 arch = "linux-x86_64";
47− sha512 = "da8a76df26d0f4a252316e493f2fff8b3739b8c058628a9a9b0a618cb2e1d0b335df8a69fcc6a871d4ff570f9729359ee5172cbdffb21fb1c02d7ebca1846b14";
47+ sha512 = "3e791bfe134304a1dd25fffa6c4fae90bf3e8132e9a09eb15560b5a98d490cb7338c2edff625a1710339df1899122a18ab9f5154c3b9b387acae22dd4c864b86";
4848 }
49− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/bn-BD/firefox-64.0b10.tar.bz2";
49+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/bn-BD/firefox-65.0b1.tar.bz2";
5050 locale = "bn-BD";
5151 arch = "linux-x86_64";
52− sha512 = "0f92c035bd9faa18f33abe421f4e2fc839a7e26b879bb1d9816f20551a186e2dfe362519049a52799908118c42c051a2a317a3aa38695e491df2a08562d58009";
52+ sha512 = "6305b0774042bd1b5e06e2aa261fe9fad21d484c79ef157d9e95b655301f4f847247006e933c090602f1bc5a5228178998f8f59fec598b44f12ff64c1689f763";
5353 }
54− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/bn-IN/firefox-64.0b10.tar.bz2";
54+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/bn-IN/firefox-65.0b1.tar.bz2";
5555 locale = "bn-IN";
5656 arch = "linux-x86_64";
57− sha512 = "6f7bc819220cff36b267c8c9a16565c732ff6507e08559d154657ff6ada926d6fcdbbc85bec11592bc039a9cc668ec6771427fd1d9dea49d88d630adc20c6f63";
57+ sha512 = "ba3d09a95797ea28a13366ef743eff2fc55686d507ee9f8bc73f451efc4cae00e7d53c52b1d24e83b44a7d025a9c4222bd7935143f5b47d3f7ed909775fc719b";
5858 }
59− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/br/firefox-64.0b10.tar.bz2";
59+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/br/firefox-65.0b1.tar.bz2";
6060 locale = "br";
6161 arch = "linux-x86_64";
62− sha512 = "701b4086ef0162555c7837179d398367e782b51a414ca8895cfe3c652c7dd021b0258249883c0219dad7398d875974a6f3567df48ffe2b54b84416c6a7297cbf";
62+ sha512 = "7e4f20e12e014a842eaa9f77e701466e00af93015c27be529e69673a87df2cd0f8b22dab0e006038ddf32f2cb4bcd2f7f6c64709c252580dba22ba538db1c744";
6363 }
64− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/bs/firefox-64.0b10.tar.bz2";
64+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/bs/firefox-65.0b1.tar.bz2";
6565 locale = "bs";
6666 arch = "linux-x86_64";
67− sha512 = "f4669fdc026f7e348b086fff93d67be4c42dfc144d353c0673c9f72164db4857f61ff0a3eefd358f5459149378847dd761574f187861651261c76734d97145c0";
67+ sha512 = "106e874f0127ec73a92fce3733b200bd052c4205c6698044b82d60e42a042b1c5e5b71e9352e8ce0b470cc8c9bc39c28b2166654bb0729c966e1f44b5daf7207";
6868 }
69− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ca/firefox-64.0b10.tar.bz2";
69+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ca/firefox-65.0b1.tar.bz2";
7070 locale = "ca";
7171 arch = "linux-x86_64";
72− sha512 = "17d6ef735aa464dc3fc77dda76d79fcc843f853be062824b431069609e4b0f86258533a14e995d5b98c77d09c4dc0d0627093df0f8cfd2f2f6f9de443bba1870";
72+ sha512 = "4615f72786085295e131437972c39382bffa4584e3829253795d9bc961df97cf87edc8e9ea1218914f444d1041819f8235b36e116abb2aa5867fd65c3284d76e";
7373 }
74− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/cak/firefox-64.0b10.tar.bz2";
74+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/cak/firefox-65.0b1.tar.bz2";
7575 locale = "cak";
7676 arch = "linux-x86_64";
77− sha512 = "f6c75d0e67fe581360d1e32eab18fc2f5beb51581a9fc70cb926d972744c58d6e2b49f23a05ba2b8beb03b89a5553d96ab4c1774ef7568c9819f8a8837949cd6";
77+ sha512 = "acfbd95d08214f103dab546cf5087194d004e24a4163d41c82bb127d0c94375fbffc8c8ade0757f3e624fd2aac8fc9fa6519a6cf1b355c203afd5270847192f6";
7878 }
79− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/cs/firefox-64.0b10.tar.bz2";
79+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/cs/firefox-65.0b1.tar.bz2";
8080 locale = "cs";
8181 arch = "linux-x86_64";
82− sha512 = "d51ac21807c945edd1e86b21bc06b0763687ba0573b0155e1c1f4c51767db36a17ed3f28223ed22b45ded1d1153bd8bb295e046598c7e1e54733e035d9630c72";
82+ sha512 = "c60bbeb2fb880eae5115f317dc30573adb6917eff8d49364b2ed34ef821b90f17d275b77cfeb2c081a80f4cdbeb1ac0e02c920cee1aaa45ddba855861f0955d9";
8383 }
84− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/cy/firefox-64.0b10.tar.bz2";
84+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/cy/firefox-65.0b1.tar.bz2";
8585 locale = "cy";
8686 arch = "linux-x86_64";
87− sha512 = "678951cdf8efffb874203fb72df7c935f43547233bb0dd6285e777bc682ef3c0dc1af11f55b01726a70fdabe906f70e4cb2b574ab01f848a02295b4e97e88b11";
87+ sha512 = "5e5e90de26b784d81f5b68674714e8d14ff347b039e9664137ba8d94523d3f0c0fb0e0112b5961a56874aa6bbf30b4d3e7884bc46c9ab5818cd6aaac36047243";
8888 }
89− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/da/firefox-64.0b10.tar.bz2";
89+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/da/firefox-65.0b1.tar.bz2";
9090 locale = "da";
9191 arch = "linux-x86_64";
92− sha512 = "e3183b137019761a30a32bddcb4842f8e6eeb55d9a32e58b7ecb1ee9048fe3ac983180ba2aa61bb53edf8d60bb56003cc536699747a9d00f77328ecf100a4ea6";
92+ sha512 = "66ae41f79975e00ad845b93f50fdd2d4eb8d11186ecc7dc786de856e47f44ab8fad6b5149a9ae8ca9ecc2b4020c92c07f7cae12ef0d9363184ac0e189c8650f5";
9393 }
94− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/de/firefox-64.0b10.tar.bz2";
94+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/de/firefox-65.0b1.tar.bz2";
9595 locale = "de";
9696 arch = "linux-x86_64";
97− sha512 = "189177c81f2fb31dc89aaf195c8b0d8dba1b14361b447a77f8da94d1d9f57a086779cb54282f9f37a50f230eda26ef8c07690c75abce03468f80c786f7a24013";
97+ sha512 = "37697c4868bd4b8e8becdc9ad8c6385a1b46bb9a09d35c2a56d99464de2def74ebb533a5914bf1689f778164e30be836ea0c88e1361f3f4028f02294f8248e28";
9898 }
99− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/dsb/firefox-64.0b10.tar.bz2";
99+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/dsb/firefox-65.0b1.tar.bz2";
100100 locale = "dsb";
101101 arch = "linux-x86_64";
102− sha512 = "9daf6db9091846f6c290d8dce3ac2f847e958305942d9c240bc81cff2c127e0d5be9c715fd13a30f7afb052f3c755705801eda8b3e0457cc2aeca3c687b257ad";
102+ sha512 = "e40cafc2e024af7265b6ffa6a8be0f16862b1f1eb7a001f3710b501fdd92dabdff78f1f0abff3d537bf9ab266a988c7892e87dae074d00430522fb64bccdc31a";
103103 }
104− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/el/firefox-64.0b10.tar.bz2";
104+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/el/firefox-65.0b1.tar.bz2";
105105 locale = "el";
106106 arch = "linux-x86_64";
107− sha512 = "717de9d12655e306e8e494dca88901263d658556004b058948e008b66bac2cbf30f838ca26e90f0e65f7ede96d3d22931bbe36bcd33008236b3d9ca255d373d0";
107+ sha512 = "0f678f8a5a34072e0530c2086e749a696a88e23c0981b2ea0664865b3b127954a1121e026dcf403aef03e3d00ad76a0f95c98677cd5a89c95216e0659fdcbbd4";
108108 }
109− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/en-CA/firefox-64.0b10.tar.bz2";
109+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/en-CA/firefox-65.0b1.tar.bz2";
110110 locale = "en-CA";
111111 arch = "linux-x86_64";
112− sha512 = "a4f75e5501f63a7194e3d9a830d722baafe3fa1c0e592181e186cc810cc623ec1e7039e756d577fb7c82b7f6f8d0c8941a5ce36d07f291c8fa57c16e312d1b80";
112+ sha512 = "3c60f3542444c61846d94d0116b8478269fb347b57c1cb000274988c6adab1a19c22d7e8050d005a35df16943ad3efbcdd99bd9a7bf7b767886472f110bea20f";
113113 }
114− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/en-GB/firefox-64.0b10.tar.bz2";
114+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/en-GB/firefox-65.0b1.tar.bz2";
115115 locale = "en-GB";
116116 arch = "linux-x86_64";
117− sha512 = "a739f826dceeb48c248098e94617e72565a0603dfb02b6cd2efb104f1151a81dbb3021f3bf302a582f8e5257dee6246251f6c67c5539bcb4a6fc64d20f058d94";
117+ sha512 = "e623be71b1c54f833d6dce20ad2ec8a5c51d5222f67550a8e4e5811d432d710f74bb8e7e3c3b6fd7e5bc6830ceb7392b28923885b232b1d642277c06e41a3fd6";
118118 }
119− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/en-US/firefox-64.0b10.tar.bz2";
119+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/en-US/firefox-65.0b1.tar.bz2";
120120 locale = "en-US";
121121 arch = "linux-x86_64";
122− sha512 = "3caee27ebcfb58a62c27bc6625e260a0a3c8e9d8ee410ac44a91ef32e3c6da2c9df36f95775ea13e8e40a4b682934a6c1f0c93adabf4bfd7452bed66792a30b9";
122+ sha512 = "da2205be3e9d672bf34e1055ee9a5eac461fd5172d2cb2dc9ba9eecab94e7559b6399eb904b2cc3483758cf3658f7b2554484e328491951632d81dcbfd84821a";
123123 }
124− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/en-ZA/firefox-64.0b10.tar.bz2";
124+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/en-ZA/firefox-65.0b1.tar.bz2";
125125 locale = "en-ZA";
126126 arch = "linux-x86_64";
127− sha512 = "ce0830bf8fd3d16e02eac457c5e9f4832e40595d663d12c7d3f91a92b33c81ce0546881cb01f11381a6b7b548cbd1a64b87d884885cd0e641922e91491ca4b62";
127+ sha512 = "4aeccb63a94809737155f85a9e83c15b8df49b3c28dddd7db547079b46f15b7a5eedef75881ac32337097175193b38bd7de3e47f30dd18b56f1ff31bb6d33aa7";
128128 }
129− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/eo/firefox-64.0b10.tar.bz2";
129+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/eo/firefox-65.0b1.tar.bz2";
130130 locale = "eo";
131131 arch = "linux-x86_64";
132− sha512 = "9db1efc26b2ece68803f9286ac6410541dd54bbcd94776f289d7af4d2f2ca31e1124344fecb4af6e22051f692f77e0ef9c39a8ff0aa39eec445fbd8365430ba6";
132+ sha512 = "d7984116570d78194c6820342f591ec17eebe9ba6abc6e81f34d8810a24329b236cc37a705e3df8acda8eba4d1627d4a2970e794de6bd6ef76fbf9e57028230e";
133133 }
134− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/es-AR/firefox-64.0b10.tar.bz2";
134+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/es-AR/firefox-65.0b1.tar.bz2";
135135 locale = "es-AR";
136136 arch = "linux-x86_64";
137− sha512 = "b216931ebaf590b04cbac239b9613d6af24f33b60c75ee36f344eb93c34e9a2087e06cc249ea1315fcc0bfca1c1e465b788ef1a82a6c9cc17035cc70a94ef8b8";
137+ sha512 = "b4e9d60707d70e94f2e4f1ed5d6a0994e431793c01c7d492afe72f5674a14bfe1524df6cc0d2a4e20897a5baf76b51e037fa96554f460a375eb281634001e518";
138138 }
139− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/es-CL/firefox-64.0b10.tar.bz2";
139+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/es-CL/firefox-65.0b1.tar.bz2";
140140 locale = "es-CL";
141141 arch = "linux-x86_64";
142− sha512 = "d4ec8ac2d765d8267aeab062a21185fe6a31228c00f2bf35fe4ee653a4fceb0f96cdeeff83c4b122976f1487a9159ea40689130fa9a9467f2b4a926c6db52258";
142+ sha512 = "2b8bc684e2f45f44f293a891b11d4d9bc0b43c55c12e6186d045ae0a6c618d1f96109680320506e913ad5425b19e22ad3004afb3b11dcadd7fe44133f4a40cec";
143143 }
144− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/es-ES/firefox-64.0b10.tar.bz2";
144+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/es-ES/firefox-65.0b1.tar.bz2";
145145 locale = "es-ES";
146146 arch = "linux-x86_64";
147− sha512 = "06a5a80a67217efd9ddc3f78853ab6bacef69398fcba3a6fc354351f4d83287f026a5cef72955c9ecb7b55c61e6de2b5ae40136b422ec6549fe444a91b1745bb";
147+ sha512 = "20294f5f5f88b000ddb8c9d9016c85ab49956fa34132b85417356985f14c2e5abeea7d96bb3dc6f636ab2baf68ce55507a6b6444e5b2bf6272344c0664ecf2db";
148148 }
149− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/es-MX/firefox-64.0b10.tar.bz2";
149+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/es-MX/firefox-65.0b1.tar.bz2";
150150 locale = "es-MX";
151151 arch = "linux-x86_64";
152− sha512 = "dc996ee1f21be35cb2dc7e18740c0657a126984d58a4bde84b67a3c28baaa22a0395124f71e06eb352e0218335ba2872bf5ffdf35588245bea55daf82ad6cdae";
152+ sha512 = "c8b66a1198dd6975a372fc5667b2d9bf38313096dee2a5c34ccd2ce775cb09bb38f6ed6f28a9834d636745e23534f994380250ab594d6e1d366c75dc1cad1501";
153153 }
154− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/et/firefox-64.0b10.tar.bz2";
154+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/et/firefox-65.0b1.tar.bz2";
155155 locale = "et";
156156 arch = "linux-x86_64";
157− sha512 = "2c597a1802e45b3091396169c6f07404aeae7107d45188c8f3e8c214a316cd7e38c1b0cf06216b1882ca088222d1d00ecff84216ab3b545f644343049fd6868e";
157+ sha512 = "51bf60f606e202e641b1bd49b34412df1c3a33139b16771748aa9a8fb1cf6a8ceb2d09f2be9abd485cfdbdb6b6aafb01c762d9a05aab442eb5f86df936a731c2";
158158 }
159− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/eu/firefox-64.0b10.tar.bz2";
159+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/eu/firefox-65.0b1.tar.bz2";
160160 locale = "eu";
161161 arch = "linux-x86_64";
162− sha512 = "881d03053e21bf2024c8c0bc4737b5f9415c0cd5e07331c8aec0c958094d1b423f34c0abcf1a73ce794e0b5c3cbce343c7decbf4af812d90ec0dd7ea0f338a4a";
162+ sha512 = "92ac8a65623dbce8730627a2eb83104ecb91114db18813630aecd22144f79a3cff7e1a44910259d40006115150ccf0a64e2f300b9d7b5093c54af43fb4403953";
163163 }
164− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/fa/firefox-64.0b10.tar.bz2";
164+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/fa/firefox-65.0b1.tar.bz2";
165165 locale = "fa";
166166 arch = "linux-x86_64";
167− sha512 = "2c185e7622308de487fe2bbe20cf2ee4c923c00d7824d0d61050cf0cbf23d6fbaecb8ebab25fd978f6db89bc7c3f45eb91003088a4f827870d21303ba79d374d";
167+ sha512 = "49201d2a1788e8a8916a8caa95bd350b6b157f410735f3ae33c6a2d3648b47590d72b6ea5a49e6080f6593687a1531d7ec2aa0dee820960be52ec56d3517aacd";
168168 }
169− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ff/firefox-64.0b10.tar.bz2";
169+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ff/firefox-65.0b1.tar.bz2";
170170 locale = "ff";
171171 arch = "linux-x86_64";
172− sha512 = "b3f814dc04c57b15942ef08028111b19289ef77f48ff43a730c5840d3beca8ef1755185ffc54c8a0895ef7d734626162be73392899a2a08cec9cd6cbdebe78b3";
172+ sha512 = "ad097eb38f73cb79451a753ddbd2cf68a2871ecd37b16d2e2d2b58463631d6bceb5bb301c4a0cea85cd207a87e5447c3b8029e0fc8a0b0114186a562b7f4ceca";
173173 }
174− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/fi/firefox-64.0b10.tar.bz2";
174+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/fi/firefox-65.0b1.tar.bz2";
175175 locale = "fi";
176176 arch = "linux-x86_64";
177− sha512 = "1f728b5631fc2825f62f2af62c6dbd9e4bd5caf2079c476d6524c9033f2c397e734bd627e816cce25289565152221cb78ccd449650327c60ff9243096aee52f3";
177+ sha512 = "151d9f2bcda0e74a9a12eb27e5f550ae082a98092db4c7fd3537993783cc623149a5abcde16a9221b1c91fc968d6b84a0d0bcde1f170705cd5054a4bbe3dfb92";
178178 }
179− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/fr/firefox-64.0b10.tar.bz2";
179+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/fr/firefox-65.0b1.tar.bz2";
180180 locale = "fr";
181181 arch = "linux-x86_64";
182− sha512 = "038fc084b4f5e6c8817706a32ffbf9025555e4c37f530e8601ef4d72bd55f3f48f57f8b7efa5e1c825a89382a4e9fb15db54e24c88bd569e96d297855e4c339f";
182+ sha512 = "54ff2685bce6f1972b096c87e287ad3d612c0b7244e418344f0bedd72da2f69eceb0b913094e928668a3d750999213e2a5977a4362a6cbff7b78589cd5c9ca23";
183183 }
184− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/fy-NL/firefox-64.0b10.tar.bz2";
184+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/fy-NL/firefox-65.0b1.tar.bz2";
185185 locale = "fy-NL";
186186 arch = "linux-x86_64";
187− sha512 = "be74cbd160b366844e2fa955a4cd4beefb0d58ca4fd11fc40d8419df74653e29ee1e142f7e0d5bb970b90e0ef436b1bd4dc9e2b1d02db921bfc6f9f7d72242f8";
187+ sha512 = "c6d1e3f27a96486c0797eb1f5bf6936f6543456e31d56d0019879513e1c06511bca297ccfe76936ba0a550daca15521238c468aefe38e93a8f56d4e8f0fa049f";
188188 }
189− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ga-IE/firefox-64.0b10.tar.bz2";
189+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ga-IE/firefox-65.0b1.tar.bz2";
190190 locale = "ga-IE";
191191 arch = "linux-x86_64";
192− sha512 = "2e84652e80ea69b90aec87abeb14aa9d0188fc598b536c74c31c7d3dd63909a73a9395e221c51088b489465fc97139693e55a1a9f926f676d50caed4e7818878";
192+ sha512 = "22454e0f678e2905c55fd312e0d3a2be18e0ce9664bf6f6b3588bd63b9ca7452e532640a631f9721fb54aaa063975ac82b4b07caed139f44db9835c521ea38c2";
193193 }
194− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/gd/firefox-64.0b10.tar.bz2";
194+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/gd/firefox-65.0b1.tar.bz2";
195195 locale = "gd";
196196 arch = "linux-x86_64";
197− sha512 = "ed4799c7d68da7bfd663aa38c913f71bc3efcedd1f0363120d6fce1ceda0e3f0d9ffa8520681a563b6ded466c2fc80b695598be51316799752d528cbd0d6a174";
197+ sha512 = "7b11d439f5b8fa1bf5709d147abb3d1bb98a00a6573f4784a95ecc900b9a1a8942c9a06a227b9a3c11ef086b597ffd41314d07b7b3392a574c5d6043d1548d0d";
198198 }
199− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/gl/firefox-64.0b10.tar.bz2";
199+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/gl/firefox-65.0b1.tar.bz2";
200200 locale = "gl";
201201 arch = "linux-x86_64";
202− sha512 = "9500394c6b8e65a6dcdbe8aaf76293b182a05b12f9d40b72f7c04e1c202665a15e80fbf306ab1e78cd0f8db0d308f2ced89bc7c4e5951416d23e662296b23cce";
202+ sha512 = "dfba4673003970e16be3b9c3cd729969c780403955f4c16d73b3b7f1360f6b30d91e59e8f5ba5088cb557dabac3349a8a6d8dd67af50814b5968312a7b694946";
203203 }
204− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/gn/firefox-64.0b10.tar.bz2";
204+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/gn/firefox-65.0b1.tar.bz2";
205205 locale = "gn";
206206 arch = "linux-x86_64";
207− sha512 = "cd11501f541e0aef2e40b4162f388e283028b0a08cfb4a3eac4f4f6ba18093f857fb9df4258a4e6f3a687d9df7ac04981b863537c1ad8eae0a05c8aae99629fd";
207+ sha512 = "adc62b0f457a981d8bec415c3812f904bce32086289a344d6f1f66fd4d9820b7a05358c10e039a16ce7a85dbf18a437aca880b53e83380c5159c5d4339399792";
208208 }
209− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/gu-IN/firefox-64.0b10.tar.bz2";
209+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/gu-IN/firefox-65.0b1.tar.bz2";
210210 locale = "gu-IN";
211211 arch = "linux-x86_64";
212− sha512 = "ad5f1954ab5a6a64023cafc47b7606d5692c062ea280832637f2d127c8e8ff04238abadfa40cbedd11c432aa7291b0aa5118ec63e6a0f3da5084b268989cf2cb";
212+ sha512 = "92ef72ea19e9202d5712278ea4fcd24f1fa24fa8c9adbe7468e2205d9464fb39488c32c6ee90731cddde9fa581dbc79e31df734a05489abec0be5fc8b99f831e";
213213 }
214− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/he/firefox-64.0b10.tar.bz2";
214+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/he/firefox-65.0b1.tar.bz2";
215215 locale = "he";
216216 arch = "linux-x86_64";
217− sha512 = "c8c29b03246cd65ebc621468d728682e7a901554073ce3969ae26f404cd6c6ddbf31a1e5848a24141f4e0b2163bf21f03ef0b5fd6450b8fb87e9a9312bad45f3";
217+ sha512 = "1760e4810ee267ebb1105873b8a6b273cba7973537d59d82c1199a3a719c910e0b98e101bc4609dfd9b26856816ac7079d771403f51f01262672d534456e30d1";
218218 }
219− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/hi-IN/firefox-64.0b10.tar.bz2";
219+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/hi-IN/firefox-65.0b1.tar.bz2";
220220 locale = "hi-IN";
221221 arch = "linux-x86_64";
222− sha512 = "8a9932f2fab24222955fb8d203d5deab727cd90cdaaff0e6081fa9f8501db5e9f3476a108bd4a277e0cf3527385dafee9463ddc72ea1dae34a44a5523a3d7507";
222+ sha512 = "51c28e5c04fe4cecd9e9f8aee5debeccb3d85cee0dc0c495e5a114c677d7c9110cfdf601be947f25b127a33caba24094bdf80fa8bbc76c659ea56271f321ceb6";
223223 }
224− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/hr/firefox-64.0b10.tar.bz2";
224+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/hr/firefox-65.0b1.tar.bz2";
225225 locale = "hr";
226226 arch = "linux-x86_64";
227− sha512 = "03877fac5e6eb31257bed35dfd041d29879077b0a316bc9a0343e3d8981a2153e7287ab1edc31273c60a0fa04fb7725477ee0bad19cdaeea8cf36c7fdf64b291";
227+ sha512 = "0b270dfec2f9a7ef6a616f14929b230d8414239d00f690ab2e6966b6b8dd7aad2af9a70e2d764d70773dc7bc7591de7fef00bf07a44d9398ac65768c84269bf3";
228228 }
229− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/hsb/firefox-64.0b10.tar.bz2";
229+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/hsb/firefox-65.0b1.tar.bz2";
230230 locale = "hsb";
231231 arch = "linux-x86_64";
232− sha512 = "7fe05656c72ae73020e250c0b6f4a04987871d3711469efc592432d258fb12156d215b8a9837bbe3b34f82e0b8e514647e6da54d4c91af6400fe41515cf49512";
232+ sha512 = "0b51c0e6ebc7beb81a4fc57966e91f02accd5abe6b8ca4ab67b2d51798efb51797b26b17bcc28cd9200430c0415d9f9c506c35d2035497e4038f4ff97af7de5b";
233233 }
234− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/hu/firefox-64.0b10.tar.bz2";
234+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/hu/firefox-65.0b1.tar.bz2";
235235 locale = "hu";
236236 arch = "linux-x86_64";
237− sha512 = "20aadbaf391fa747261abf9f799bc466a99b0cd790cc79a31f4df901b1cc283d52389a5dbefb7c0f0cb46dac5536cb87ef1f510a11cd0ab40cc65998575457b9";
237+ sha512 = "193a5e7eb8065ce4c17cf18ef3a268b00a7d1a0394761c8c22fc88ccb20abfac20dfed8cf32c9e128cb6a67af54c5519a48b789674ee0e24f05fec50a7428b8a";
238238 }
239− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/hy-AM/firefox-64.0b10.tar.bz2";
239+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/hy-AM/firefox-65.0b1.tar.bz2";
240240 locale = "hy-AM";
241241 arch = "linux-x86_64";
242− sha512 = "25a50d09cb463a8d74753d0339bee2650d47730964a57e564ae658c2f2f393c05da368afffe2a1f9040d946b3aa57c973133c5c4e0de1d4685d0965e176a96bd";
242+ sha512 = "78d87eb8c49b5e2df1d09ca8a31bf07f8e8e0bf0004ea0dd8d185f3412489fe66d2501e1feef51f788ae4c5c77e53255cc7adb15f0f5e20d0eb55fdf4a762fc9";
243243 }
244− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ia/firefox-64.0b10.tar.bz2";
244+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ia/firefox-65.0b1.tar.bz2";
245245 locale = "ia";
246246 arch = "linux-x86_64";
247− sha512 = "b47ba7414bf0667beee177b7fb5de0bd950aba7ce567cfbec628279cf9ac208431869e2c517b0dae4ada1ee93ac78601588b82d66febf5ba27deede92f1cd478";
247+ sha512 = "8653cafcb6b64abc2c6ed62487ad75331b236c6610bff79934d44882407fa1abd4b85fc53667ea14db4099626088cfd798aca495ec89c8a5bf14768e13ea7f81";
248248 }
249− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/id/firefox-64.0b10.tar.bz2";
249+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/id/firefox-65.0b1.tar.bz2";
250250 locale = "id";
251251 arch = "linux-x86_64";
252− sha512 = "2450045d7289a0952a62092f2563ab7bc250d996b11e94c5f7df0abc4bc7bcf34817d504627f29e951282f065e94f468214c4fb691c263d9db6ec14280ac0131";
252+ sha512 = "eb601d0e7aae1e322db14b9e769ee67331c2df0dba34d92693e50b6e0978e2a65c1fac06c1a28e2375d18618c0f582c45e5d9a82335e9e1d603d4dfcc7abb1e6";
253253 }
254− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/is/firefox-64.0b10.tar.bz2";
254+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/is/firefox-65.0b1.tar.bz2";
255255 locale = "is";
256256 arch = "linux-x86_64";
257− sha512 = "320fdc1373cb4838471beed72cfb03dd0268d5d629ee0cf77ccfd1bc39572b32f572bfc82a3a4e3cf174577a307c13c334cb182ec311c5e33e9ec7db158f1650";
257+ sha512 = "7a30389aa58df903d804916e0915179e3f19923c8e1fa153c168eacf7ea80a0321222dca15f7b65f329ee247da5d13c2f320397e4cfdc74f694ff9e2f851c9cb";
258258 }
259− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/it/firefox-64.0b10.tar.bz2";
259+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/it/firefox-65.0b1.tar.bz2";
260260 locale = "it";
261261 arch = "linux-x86_64";
262− sha512 = "d57c06ca6454cdfd637ccb1f08b2da5635ff6879f4eb6c7d1780b7bd11109f1bf8408208b0f36754eb7809a480567126a356c8fae2b18b1b9856011ef3097cbd";
262+ sha512 = "07559c0d26c17a16a54dbd255e7c92ab4503baf618c101de66fc3b4dc98f6ac36910bec5bde6d875c2d7d11afb213a9e2a3952a612219ae7c2a2be2b81bae597";
263263 }
264− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ja/firefox-64.0b10.tar.bz2";
264+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ja/firefox-65.0b1.tar.bz2";
265265 locale = "ja";
266266 arch = "linux-x86_64";
267− sha512 = "ba93cfc2cad76d2c3c223c238b549ec9501c4e7387d756d3de5ecb35a6f03685cabb21ab31467270063c9ac74e905e5b08ea77f994451efde7590348de9fd959";
267+ sha512 = "ec626a9457822197c8cf01f0376990f2e27f8beb23d25d5667234a7c891642b9a7fabb5eae6add31856a1cd52dd1d71056a05ef8991bb4ed8f84ab41aca5a308";
268268 }
269− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ka/firefox-64.0b10.tar.bz2";
269+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ka/firefox-65.0b1.tar.bz2";
270270 locale = "ka";
271271 arch = "linux-x86_64";
272− sha512 = "f42243d7503c0d587638ff7008b81dd2fe4080be0b2aef6a9dbaceb3c49cbb13bcb6d5da1d5415371b38491dad81fa0ce48bdb624a2542927078284b9952d683";
272+ sha512 = "f1a8149f87b741597bc626e81ee4cab7780ad61675c967680f1826ea1bbb55609afccb337f05291544fe2b330dfdb67c3a6bc20dfe6caa32272270a646eda6a8";
273273 }
274− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/kab/firefox-64.0b10.tar.bz2";
274+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/kab/firefox-65.0b1.tar.bz2";
275275 locale = "kab";
276276 arch = "linux-x86_64";
277− sha512 = "92e0f22b3eb3c2e18f5f3a7eee6d9dc80da3851981b58db98a4fcee8693f7f4388159502e3a1497c2e8af4106284a09c7f074a1813219aac4c23a22520648300";
277+ sha512 = "82ac700a061935fc14a705b859d6f7fc985141f61b79ee41860a47396197f59b96b78e15340b376eebf61f3c7d47ab4293334e05c920b72f6aa8db63dc0cca85";
278278 }
279− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/kk/firefox-64.0b10.tar.bz2";
279+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/kk/firefox-65.0b1.tar.bz2";
280280 locale = "kk";
281281 arch = "linux-x86_64";
282− sha512 = "2ce861ba5c3cc7a6812cda64ecf6b6ce1c2108a5aeb640efb761f535bd2896826d87d93a39f10cddd088e53733f85d5302ac2e4694faffcd24bf9974b1f96a9d";
282+ sha512 = "b26864a7f6734ed518709b4818ecd33318ce7bf2725e593f0dbd6fa5d8e70c70aa6828b8444fd7ab4b622540cab8296d9d10da1a8a14826201c7e878519f4514";
283283 }
284− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/km/firefox-64.0b10.tar.bz2";
284+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/km/firefox-65.0b1.tar.bz2";
285285 locale = "km";
286286 arch = "linux-x86_64";
287− sha512 = "f56b968ce2e4cb6ce50f1caae0c2f9216585cd7ed1408cc87f477d76a3489938bc0875d3876f2eb67083db8e3d813a4f7601828a3d8ccd397c13e4f2bd21043c";
287+ sha512 = "a3777467d2f8962b598001e62ef9044bd3a1017da6a979fc5d616b8a3da0311cceea4a5d148b32fcf05d01e3d6df4489356291c84c54a97866fc69f8daec79e5";
288288 }
289− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/kn/firefox-64.0b10.tar.bz2";
289+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/kn/firefox-65.0b1.tar.bz2";
290290 locale = "kn";
291291 arch = "linux-x86_64";
292− sha512 = "151416a6d18d9270dd166746242a20c342aa999f3bb9886e171c529d5c1807aa9d11b73e1781ec23ab5c5ab2ba2e1ee5009d1c99f46a8d5a013d542d5f59d4b8";
292+ sha512 = "fa92ff8ca90be448c5c8cbde5539561079a78be30826fd5b29c322dea73e94d96acdd1b3e6eb2b13f4571450dc7492f663cbc85d7334db6e2d416a8f0aacedd6";
293293 }
294− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ko/firefox-64.0b10.tar.bz2";
294+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ko/firefox-65.0b1.tar.bz2";
295295 locale = "ko";
296296 arch = "linux-x86_64";
297− sha512 = "b5218b4e241703cbe8dd153fe0668b0342091f557eefc49e47bf0b492b9adf68aae5f8416ad2f95f2c378315e4fbfa96ed759c22676629a2ef91f2722835619a";
297+ sha512 = "6cd537b6f0eb3447bfb61a597e5e20756fb3477eeb21234262d933369e9bec15fa2198d23fe31479f62ab4ad0c458a50394b61da35c1c3d117925c7e449c733e";
298298 }
299− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/lij/firefox-64.0b10.tar.bz2";
299+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/lij/firefox-65.0b1.tar.bz2";
300300 locale = "lij";
301301 arch = "linux-x86_64";
302− sha512 = "4a68a37cff1cbb5cae25f0bc2c153fc6ecec25e99fb5c33242708ca3ffb59f2e5ce8a6c332d1e61a57cb6f1059c5e3e0233d572615a3c1a3d8fa8a2246754e3b";
302+ sha512 = "402eb28a107d8023ad2ce2c67e2481c246544d65f6f4a7fb83d19be35cb186e8cbd98d3a01045f74b9734488b72f8687bca5860d0f9b0d29958dcb51537a57ed";
303303 }
304− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/lt/firefox-64.0b10.tar.bz2";
304+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/lt/firefox-65.0b1.tar.bz2";
305305 locale = "lt";
306306 arch = "linux-x86_64";
307− sha512 = "2536ab847e7429e72924c0841447ce77ad46e597223c7f64805ded1398d0c9e780441cb29d7a27726af37da93fae98eb7f056e14da10e296239e2ed8f784a5c2";
307+ sha512 = "f7c0c9fbc3ad6c8f372ccee8f07e5e38e5d13829db76b502b0c373e89cce932766f6ed6efd89482b94db6e9298d2b58d31a758e0038d29a786397f593175abe3";
308308 }
309− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/lv/firefox-64.0b10.tar.bz2";
309+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/lv/firefox-65.0b1.tar.bz2";
310310 locale = "lv";
311311 arch = "linux-x86_64";
312− sha512 = "0e08f49334c0680e13fd0e654211b0cf314381b2cc20283210546f0415293d79e58f139ad2d68cd496598801c984b927a62dfef3da8d6763d122fbb0f7f24063";
312+ sha512 = "0bb31dda168b10f78e72c9a0a93ef75df4fd0a1bcb6e541a61b196eefe794016ebd823c299d4612c6a22eff1d269dce4f5f52eda85519d7a649991ec9ef83b5f";
313313 }
314− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/mai/firefox-64.0b10.tar.bz2";
314+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/mai/firefox-65.0b1.tar.bz2";
315315 locale = "mai";
316316 arch = "linux-x86_64";
317− sha512 = "a398f409bf271766e722f1ee08a114521c69a013c418bd9f66fc2c0f9cfa510d38aa9db3fd0451aa59cdeae77a88ff24a31b58d5e7da4f76148fae0670fc2450";
317+ sha512 = "a18f3dbf5165bb62c43d6d11796829e4b503dc33188e6e7e765eb06eb6c66d648f4048f0a0561b0bc4e765b63736ee3ec37eb77bc90ad6c2adc73fc5013ceaa2";
318318 }
319− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/mk/firefox-64.0b10.tar.bz2";
319+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/mk/firefox-65.0b1.tar.bz2";
320320 locale = "mk";
321321 arch = "linux-x86_64";
322− sha512 = "4108e9ac76734d5103bb280b290f15f33da8dff1236f94fb5eec56634f38c2db6316fd522a05b01e7cd4afc3472b6baf700e25bfee08c0cc220af98d2b4cad17";
322+ sha512 = "c3ff6950da399b4dab29cdf95fd9337a011cbf3da59ae5c131714c88992957aff5c7b49bbe0939b7b4c3dab342ca47573287f998d10a2f69c5174b8ce28575e2";
323323 }
324− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ml/firefox-64.0b10.tar.bz2";
324+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ml/firefox-65.0b1.tar.bz2";
325325 locale = "ml";
326326 arch = "linux-x86_64";
327− sha512 = "95e02f1e714eb3377b4c051e5f81add25b3850dec3c6b2f483ed3c5dbd95ca6e12096c3cdab466d988f29a132d6352a059866dfe1911ec5189fc157c9aa38a16";
327+ sha512 = "80df4ae299523a64ddbc92ef5cb551884eb34b60b6650abb127aec01780c14aa34c8687fb5061d7415a70a322e3ac4b2898061c42d7b658b216e226e2ded36a2";
328328 }
329− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/mr/firefox-64.0b10.tar.bz2";
329+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/mr/firefox-65.0b1.tar.bz2";
330330 locale = "mr";
331331 arch = "linux-x86_64";
332− sha512 = "9166a1ce2a937cf36cb6f045de32eb9d4866fc52606f457fb94364eb538b1d9dbb010e91d7888568cd99c71d6eef9f293842e7a5ae86f9967a83960ccf420ec9";
332+ sha512 = "194e9601e59652fb7150a6ed38abfe8aedd8255ce3c7619a8544ff0a8808955cb31353f2f07e5608364d5ff19ce02341dabfdf1e52ef5fdc13fecd7c47019faa";
333333 }
334− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ms/firefox-64.0b10.tar.bz2";
334+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ms/firefox-65.0b1.tar.bz2";
335335 locale = "ms";
336336 arch = "linux-x86_64";
337− sha512 = "8b5298b78e0ff4e62101b5d7487dab830da78cb7029a71807cf75c68e50ca0f2f377b6b57cd4f7d47d08c615aee8e204e98dec0e5e7c73947004d971750d7962";
337+ sha512 = "ec924c815278196fe447c92e149dfb6c7189da4eadae65396e5b7b7db05d0e097654383ae0d5e9e849796b828e677cf54419b1f40a65833bd2533c33cb0fb321";
338338 }
339− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/my/firefox-64.0b10.tar.bz2";
339+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/my/firefox-65.0b1.tar.bz2";
340340 locale = "my";
341341 arch = "linux-x86_64";
342− sha512 = "9f58f606bddd65ef5d55d0bc051be063c152b3bbedd26677863f7d977e0d6e0e2b0f479f75be9181472d49aa07be504e60bd088306578133597546444cb44c44";
342+ sha512 = "3449c107e15a518de1ba8effc31e5503ff9ba50099fc43c6d318119c4f98d8968a710dc8d66ad5e9627a52a45e2f0db24db1a1278eaecbd6bb2fed9c0e605a0b";
343343 }
344− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/nb-NO/firefox-64.0b10.tar.bz2";
344+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/nb-NO/firefox-65.0b1.tar.bz2";
345345 locale = "nb-NO";
346346 arch = "linux-x86_64";
347− sha512 = "525d1f440cdf342e9efa301894257ec0a5e9d13360e7e07b95c9e8e1bbbfe8597892a301c90b8bb4f839bc8fc323baec7ec3f561f6ce90c578936cba01059068";
347+ sha512 = "0d4b065236569a477a5d2fc18a910c0d6518adffa8c656a342eb1ef40a3c55dd9fed9fc42c21e955c457a9ad26592cc1795ad2bca055286d839e39de8a364912";
348348 }
349− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ne-NP/firefox-64.0b10.tar.bz2";
349+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ne-NP/firefox-65.0b1.tar.bz2";
350350 locale = "ne-NP";
351351 arch = "linux-x86_64";
352− sha512 = "58aa6a429698aed87132195a0387360096cf1c6d67c3eccc3d27868337f28d06480232dc4814a48c8015a8186bd3123c00f777cd1af16d1d9463d5d6dce91a6a";
352+ sha512 = "6f2f63519ce28e7046337d6d75ae6acefd2081834566d9f8f7c659e4dec3b5f83e61485d12deac40ca1057f4952c6d03a86eefa6be9ef7aaea6986407343757c";
353353 }
354− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/nl/firefox-64.0b10.tar.bz2";
354+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/nl/firefox-65.0b1.tar.bz2";
355355 locale = "nl";
356356 arch = "linux-x86_64";
357− sha512 = "7c9164d293660a19e85a4a830be97f0b4ee1bfc61103739bb222bde4842d50b5ea881b20e4f28182dc7f8212c370635360ad11c7d0345f2540e519a4e17ddfb3";
357+ sha512 = "1a837eca4c23885a997183df9d71652b0401e283ef177b6982810443eabf9d91e2d50f5b51844f2409a028aab8091cfe79c10d45f884b15ba4f79aefe01e856f";
358358 }
359− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/nn-NO/firefox-64.0b10.tar.bz2";
359+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/nn-NO/firefox-65.0b1.tar.bz2";
360360 locale = "nn-NO";
361361 arch = "linux-x86_64";
362− sha512 = "a2bc6f7396ff0aa813400ac2f3fc853857d1b5be02ab221d81ae8409360cad67b0b6bcd1b25a6e764e9557227ba93bff8cbca75334715713ad7c27acdaf82a22";
362+ sha512 = "1066f0ee39628d9a1dd0112300f8ea4a76d832b1a3acb74fa19a2a022d0e064e7da316ba7b236b353edd2929003c287cfd229ca7921a3bcee77a890771157af9";
363363 }
364− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/oc/firefox-64.0b10.tar.bz2";
364+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/oc/firefox-65.0b1.tar.bz2";
365365 locale = "oc";
366366 arch = "linux-x86_64";
367− sha512 = "dd52cb8db97e9b9f64b829b0cda319b572cfb98be8d317412e6f2cd2231402ff603517f9a9525dff5e5da7800d4d5380d8596987d9c46fbeed55b3a60625f33d";
367+ sha512 = "9f79b9ea86dd77bc4cf9caaa6571fab2cbe3688a25588fbcc2eecbf3857728dd7b787b8c27ced7b0df6a5750baf390f5ce0fdec7d52dc6cc51352493e8608116";
368368 }
369− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/or/firefox-64.0b10.tar.bz2";
369+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/or/firefox-65.0b1.tar.bz2";
370370 locale = "or";
371371 arch = "linux-x86_64";
372− sha512 = "afabd283000910637aa1fac59c3f57c033a50fad422d60f3266615b88b5a1c27f526d258516aebf8847e2a461da2447924321258a157f444a6c730f5b34d212c";
372+ sha512 = "a27ee9624c3c2997200d54e5ee51e156f654f71e802869f1063e47606d264773896b00890a882ac14481deb9558fe2f478f44cc54b333d820577b90d2a8c328c";
373373 }
374− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/pa-IN/firefox-64.0b10.tar.bz2";
374+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/pa-IN/firefox-65.0b1.tar.bz2";
375375 locale = "pa-IN";
376376 arch = "linux-x86_64";
377− sha512 = "b92bde0e3125cff1474a219af74b8cc48e45835c2d3196f348ba352073e593c2e6ce4ac872a710e62921e9a234b333bbba1da9e0feffd1ad85fa5a78828ae89e";
377+ sha512 = "156888812946409904a1b94d11c6cbf17a6a4d76b5b17ebdb70542008375c529d328e2db9a7e473ca724295717890bb88a6ceba00b717ac08d13ead53d37f58e";
378378 }
379− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/pl/firefox-64.0b10.tar.bz2";
379+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/pl/firefox-65.0b1.tar.bz2";
380380 locale = "pl";
381381 arch = "linux-x86_64";
382− sha512 = "f371c37b6ccb97c7e9a6328423788c7de4fd75fb4a94dfb2097fb7246bd7368b3a55418fa6dbede6ca30454b13dcdd8d611f51183e5f319ceb0552a832216597";
382+ sha512 = "d0143f6995b0f7500fa603724600777006ea32946b5a43eaea8264cb0cf6a98619cb1ace100ccaa202d600d0b42ad13e3fd698312d8fe2a53abd30b37462294a";
383383 }
384− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/pt-BR/firefox-64.0b10.tar.bz2";
384+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/pt-BR/firefox-65.0b1.tar.bz2";
385385 locale = "pt-BR";
386386 arch = "linux-x86_64";
387− sha512 = "f7b7296719eaf28b617d7489da2e035ae90db4e3d652c1f001c22e75755cfd2c2b17c362ec2178c1bdc96623cdf7faa0662db3f63bb2cde758d622940e62e1ff";
387+ sha512 = "c008136825a58b3af17567dc620454b95e432edace0e65bba11024eb3c6af1137dfd525cc9503aa798472d981d303c2c725c24471cd4b780c8d7db66e6917c4f";
388388 }
389− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/pt-PT/firefox-64.0b10.tar.bz2";
389+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/pt-PT/firefox-65.0b1.tar.bz2";
390390 locale = "pt-PT";
391391 arch = "linux-x86_64";
392− sha512 = "9833fb8596fab02aca7b884092f3e3834be1e1c3eba78abd51855fe532cb48d61238158286d3ee4fecffbb072b02964605d448a0b63c1cd8801978a7f2a23f79";
392+ sha512 = "37009c77c56dbf63ecb86cd96861494ec34a2c30aa4c73638699ee0484c55e9ecf5bcaed7559eb0e39424abaaa178d69932b9a25a50996389105f8defe6833c9";
393393 }
394− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/rm/firefox-64.0b10.tar.bz2";
394+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/rm/firefox-65.0b1.tar.bz2";
395395 locale = "rm";
396396 arch = "linux-x86_64";
397− sha512 = "cbef477873b088e084d550e11396682945d484247e9802aca2dc5f998aff9091a2e0bda26d91a37cfd866089e06555ec26198b0bd2cbe04e16de8672c39f3109";
397+ sha512 = "819ba5cd77f959769906d6a9e6af62db57607cb2f7ec8d1c51231e02f5ffceb82e2198b6c77f362f3a30eea15a5e3cfef6796263d3c997d4f84de1f817a230fc";
398398 }
399− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ro/firefox-64.0b10.tar.bz2";
399+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ro/firefox-65.0b1.tar.bz2";
400400 locale = "ro";
401401 arch = "linux-x86_64";
402− sha512 = "d32802332224688db99e42678fb777420fdb2f59bf676c40034e3ccbeb91967c4620acb03814835c5f538902d2aefc0d78f6152f62dfb574242511265baa196a";
402+ sha512 = "7092b0110429323a9dc8ad6a3f373267f70733d8dfe33f8f6a9e67baf4a6384d52271e5cc410948e9fce12f346eb182907cde5108f28608d8185380e867ad4de";
403403 }
404− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ru/firefox-64.0b10.tar.bz2";
404+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ru/firefox-65.0b1.tar.bz2";
405405 locale = "ru";
406406 arch = "linux-x86_64";
407− sha512 = "0c064afd0bb925eb49ea72287d50f979a90968bb43bd870740d01d9e3f9d7456a5043b07d6d850098f89eccea0985d79ef25f7e1d9b81cb33352c588f9dd03d8";
407+ sha512 = "7772ed2a4496dcde8039eb2dfe950690995d66fd6beb00733df5f2043d0e399d6078268f04da6397ddd4435cbd25438ef472dbdbc51f8310b2437638fff5907a";
408408 }
409− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/si/firefox-64.0b10.tar.bz2";
409+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/si/firefox-65.0b1.tar.bz2";
410410 locale = "si";
411411 arch = "linux-x86_64";
412− sha512 = "48707f9682f02d7e9223f9a616b2946811015680b6d303180ae466b5465f1900ee7679cf0e45b9f9c1fec680259dacbc38775f01f294039a973de76415702196";
412+ sha512 = "41b66c25bc405233e5f62749b2f2e41092735bed8776a4777a31363ee333d1ea6fae860c854648b775ac07385657bf712319368dbd00374dfcccbd612cd81485";
413413 }
414− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/sk/firefox-64.0b10.tar.bz2";
414+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/sk/firefox-65.0b1.tar.bz2";
415415 locale = "sk";
416416 arch = "linux-x86_64";
417− sha512 = "c3cf6de7e24fd2eda564a567f9eeb72eb913bf6d9bbcf2fac5ee5d22d550e75583f5ba530b40eb0474abd56799f0f97ce18f684d902bfb6cf906ab07094d81f2";
417+ sha512 = "208a550d3bd4695d9e90786cadacc7a268be00eb7ad5827693c6d14a7e755db44de5b07c1e925340a7786553972448a56ddd5f395778f86ad5784d62f9c7e48c";
418418 }
419− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/sl/firefox-64.0b10.tar.bz2";
419+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/sl/firefox-65.0b1.tar.bz2";
420420 locale = "sl";
421421 arch = "linux-x86_64";
422− sha512 = "1e7d596bd8afe38002b9d481ccc21a36e9b48b4b742ce7421097f56881502da5cd8f8a51a92a2d143aee196d6a495e01a782f624151b02878f8c6f9f081ebc52";
422+ sha512 = "d2834ffbd907372ab3d91d19a1377a3951501817c859a0cc4c7170ec0f9e51dc819f02f68a1e80c14cae70356957c36670df836bc9552aba15f6c3197b53067e";
423423 }
424− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/son/firefox-64.0b10.tar.bz2";
424+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/son/firefox-65.0b1.tar.bz2";
425425 locale = "son";
426426 arch = "linux-x86_64";
427− sha512 = "86ccf241981b218569bc6b8df5d9283d3a1f92e690265a4af0580994ec0d415aaa4ae804f4443d3956578ba3dd94a7c7797acdac0d47d805f6b839766a48f233";
427+ sha512 = "5b7f646f5a1028636326f0057be5b73a7a9eef69fbf442abc8c786f43e3b531e0d03a7abfb3939d963cd5a5e6f9c04eea763e390143796f45b9a365aed7ef62a";
428428 }
429− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/sq/firefox-64.0b10.tar.bz2";
429+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/sq/firefox-65.0b1.tar.bz2";
430430 locale = "sq";
431431 arch = "linux-x86_64";
432− sha512 = "81bcc1d4f35d9fd920e7eb1b50ad1f2f2403ddb78b8df1ba553fd02e1c515d78b6dece16c44fd23e95104820c32a841e26e98db53d6f34d03b4775e66832ac03";
432+ sha512 = "6ff106a402b0369a2142a71a89b32b9e8d61b8bd1a9b6f07ece984bdff413e5122a5aa013da1af2be450c2aa94ba37cb6b547dcfedc298822ec1c302e14faccf";
433433 }
434− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/sr/firefox-64.0b10.tar.bz2";
434+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/sr/firefox-65.0b1.tar.bz2";
435435 locale = "sr";
436436 arch = "linux-x86_64";
437− sha512 = "1f1f15ed62db5958cdd1c93b3eac914318ec57264351e288ba903bfbc6bd9aeebb2eed9dc1f34418b7ffdbc70b823f8ec75de28e06ae3c3ff43523571847238b";
437+ sha512 = "dbc1bb7ae7b82bfefbdf524339500f24afd79910374502cae586d020fec07dcfafe52859a7d117847fd05fe48d353f56eb415227708cd7b2be8ee19840a161ae";
438438 }
439− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/sv-SE/firefox-64.0b10.tar.bz2";
439+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/sv-SE/firefox-65.0b1.tar.bz2";
440440 locale = "sv-SE";
441441 arch = "linux-x86_64";
442− sha512 = "eafe982f5b0d624472b4aae2a64677d3bc6475e815c4ae7e89328381e2869214b14aa11a8cfe2786386bea0dc63f9621346cbdb4b740b90e61490e453ec19803";
442+ sha512 = "3092c863530d31119b3ef15f12aa978d7c5ef38b1d1f363a87297fc29368ac2c2cd87a5c19d08c7dc053338f96b69cc741e1fd30324734772c190382ae2a3a12";
443443 }
444− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ta/firefox-64.0b10.tar.bz2";
444+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ta/firefox-65.0b1.tar.bz2";
445445 locale = "ta";
446446 arch = "linux-x86_64";
447− sha512 = "eed9814300fa97d2e7953220af3cb630f46097fe2df65455d5a18341a3c19f316fe1de5fa8da7637a88978eaab2ae87b929f377d97e787e5da6c7daa548085f5";
447+ sha512 = "e62b1863e42c3eec15b50355d54cbb7d656f15652e3560406badc61204406fcccc4f965cd6def14730eb9d16695d1e1b58d0618ca1a2693021f6e84b51f221d2";
448448 }
449− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/te/firefox-64.0b10.tar.bz2";
449+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/te/firefox-65.0b1.tar.bz2";
450450 locale = "te";
451451 arch = "linux-x86_64";
452− sha512 = "c6806cb7031fabe3d481964d89fc148375e6572e009737735f08a71887f035b8c77e49ee0b0a28cc6f2e49720db74244fc67198fa3dae5448a1f0c2f6863aba0";
452+ sha512 = "9b420f2f422b172730b167ed88d29c91b91f551cddda72de538c7682d15c36742122ae2e995b489688b95deebb7f8d8ba64662c7f4529c845ba454b79097f97e";
453453 }
454− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/th/firefox-64.0b10.tar.bz2";
454+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/th/firefox-65.0b1.tar.bz2";
455455 locale = "th";
456456 arch = "linux-x86_64";
457− sha512 = "bcf9af67d3f95a99d921142edc3359968b2793e3cb8f6e55d2f8f446005e9cb7fa75789daa9570d2db8252064bf55a48f9714d54bb115c5bec9d0ba107670508";
457+ sha512 = "02349edaf181a2453832118d12764925f38db3837a06c212494a6da9d37f05efe5865a8d96f7a30ad1319a67f612ae0ee1113fd281380cab11c21be01218f13c";
458458 }
459− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/tr/firefox-64.0b10.tar.bz2";
459+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/tr/firefox-65.0b1.tar.bz2";
460460 locale = "tr";
461461 arch = "linux-x86_64";
462− sha512 = "f40677e2e43401cf5114986768dbff121774e040fb1d4f2db02139a59e9386c15cfef440aa9d7d9b104652e574adae228e738b31cd2d40d78987d78454ef1aff";
462+ sha512 = "fc041e81769acd28f4004cc767fcca4f917b529f802d83b93da6a5565dc6f4257deda049883e22534fd29981271521e998f79ab70a6fe88b7ecce4a0dd660708";
463463 }
464− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/uk/firefox-64.0b10.tar.bz2";
464+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/uk/firefox-65.0b1.tar.bz2";
465465 locale = "uk";
466466 arch = "linux-x86_64";
467− sha512 = "90f1746c50e6067de269326055c7d65c227ead04b1cff3168536c7071d9933f976d8b9c96e0319d6bfe790f80bc6506b6e554307d51285bc056fc80abcefd93d";
467+ sha512 = "fefb644cd87be568ccc161c99e974083241e31f42f6891f8db58a042115253c990070dd2bd12086beb2009bbd27805837126c09b72e7ad4ad2d2f1326bc70e52";
468468 }
469− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ur/firefox-64.0b10.tar.bz2";
469+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ur/firefox-65.0b1.tar.bz2";
470470 locale = "ur";
471471 arch = "linux-x86_64";
472− sha512 = "cd91b30e5f3ecbd7cb42637b1f0fa84013db48cb69449b386abec15d49f240b44a613b73f5ab816da781607f208a43355d1ecab3b0ea43d2b19b50925ccb1738";
472+ sha512 = "f426cf7dcb4a62b17d862f9929431bc37cf6de1eeda90547ecac1b989414d1b54f86c96a3a563d123af3d5a6d8647714a28b46398e1523c30fc590822d608e23";
473473 }
474− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/uz/firefox-64.0b10.tar.bz2";
474+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/uz/firefox-65.0b1.tar.bz2";
475475 locale = "uz";
476476 arch = "linux-x86_64";
477− sha512 = "fc6cc15b1989cee3fbf47acb0c3e81f9e5dc5bc5eadf81ab73fa91adc9729c80dfb82136d0c3caf31188d7f4ae437c837469a960adf18b5edeb918242895631d";
477+ sha512 = "2ca8011284ff7e46273ca7943213b4cd5687d7c949159e19ca373bd88b82a46cbb1681bd7834abe5b9dbe54f1b2ac13095109e4050a33e119795a6426af608fd";
478478 }
479− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/vi/firefox-64.0b10.tar.bz2";
479+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/vi/firefox-65.0b1.tar.bz2";
480480 locale = "vi";
481481 arch = "linux-x86_64";
482− sha512 = "9bf08bb17c5af72edc89cdda215bb22f891bb4014d29b06e40dcc4b18a1b91b03206c138d3259b23edef8a5e31e321b3bb20d440b67c2b536ff97768fdfdad9e";
482+ sha512 = "707d3a6872accfe300b067044a3972b56f8bf9fe71910b7e62ec51bddb19b1b6dc8f443fceb6209a09a605202a6dd170790cc3edc8f170ebbdad31e2ec193826";
483483 }
484− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/xh/firefox-64.0b10.tar.bz2";
484+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/xh/firefox-65.0b1.tar.bz2";
485485 locale = "xh";
486486 arch = "linux-x86_64";
487− sha512 = "a5328e25807a9046268c1f682ef606f5bdd3452014f7f1b037c874c270234b62144cb695f6f381d72e2658f9ff6c50bfad2d501d6d07e4113a3f3c8323bc7498";
487+ sha512 = "6fe5e7302094c87a1a3191a1fcff7c6a33c04371104e7f1bf9a2415ce4523865d70c4d134c649ef68e56e3f1a2bd6e2acecf5cc972e01068eddb01c74344b374";
488488 }
489− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/zh-CN/firefox-64.0b10.tar.bz2";
489+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/zh-CN/firefox-65.0b1.tar.bz2";
490490 locale = "zh-CN";
491491 arch = "linux-x86_64";
492− sha512 = "6d08fc1d2712ae44481648e7021aab1b8b56bf6b80915b98c0a577dbe537ec329c819e9fb83c8ece5a76b1cb33787fe8d93cf06229074f7c68c429a836bcfea0";
492+ sha512 = "388120ea1215c20166e54b5dc9c56f2ec5aaa5a00181381c66e9849f8bc750c6d201c46d2f5aafdcff3135cac67298ac092e06f2c2c245befefdd5a679d592ee";
493493 }
494− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/zh-TW/firefox-64.0b10.tar.bz2";
494+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/zh-TW/firefox-65.0b1.tar.bz2";
495495 locale = "zh-TW";
496496 arch = "linux-x86_64";
497− sha512 = "985017e2ed930e45fe7fb6db7df7c36d2f1deefb96f37ce8decdd04d031da9fc1484527ab3fbdd3eec3d47cc828c875223845b0a45552b1a8a12dec7a427b15f";
497+ sha512 = "566d1569ab0ba4d209be89b19f40fbdb589d465274d7187156344115f3eba279eee694df5f69ee2c04fcf2446e008d189dc9a0affe36e4e1ed990343d2ace5b9";
498498 }
499− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ach/firefox-64.0b10.tar.bz2";
499+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ach/firefox-65.0b1.tar.bz2";
500500 locale = "ach";
501501 arch = "linux-i686";
502− sha512 = "a7b359f01de7603af3c560b3bfaaf45d754865e0c5e792a5deb861a041dc555d5fe8285b5c50e4d2ac6e124f1922c684d49df00f2a97b622f97f4e50bb3cdccd";
502+ sha512 = "3cc0cbb120517187f2780b4845d43748c453804305b4c6e8b62fa0155c2c2d4ff158ad0758d21347ff031173e1830c08d948c0c9d41c14f9eee2985e0c59e881";
503503 }
504− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/af/firefox-64.0b10.tar.bz2";
504+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/af/firefox-65.0b1.tar.bz2";
505505 locale = "af";
506506 arch = "linux-i686";
507− sha512 = "116531c8814b03a23a524aa7612eaa7061453fc9beb7abc30f85b86dfed4150aa2bbb8bff25fbd759d9b869261619c0c002f2126a0f1cbf237a0c71b46d721b9";
507+ sha512 = "eac0829a50117d7c90af59939890ffbbe7cd11f2d67f5cc30787f911598bd83b56cf667c736ec8be69fcfdd5a8c7c282f17ca57c22e1a2b9be17fae25693696b";
508508 }
509− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/an/firefox-64.0b10.tar.bz2";
509+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/an/firefox-65.0b1.tar.bz2";
510510 locale = "an";
511511 arch = "linux-i686";
512− sha512 = "b89fed73ebd86a240a8078c402e738e099e4f7ddc6430455dc5035687ae601fe533a0eb3235266dcd3f36fb299456c24fd649321e1a63e417fd492b44b9bd7a5";
512+ sha512 = "8b6b20ba62e12b2ce6ab5beb70c01c381fe01711a27658a27ce925e759f308d4a43d1f1744fe8a5f21477d248e4d6e393c56f33e57d808456192693efe79dbb5";
513513 }
514− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ar/firefox-64.0b10.tar.bz2";
514+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ar/firefox-65.0b1.tar.bz2";
515515 locale = "ar";
516516 arch = "linux-i686";
517− sha512 = "c52098d0947f60d8ac47d8b2794ca7eba03d41fb4fc66a31688818d796521367520f0ff57ae567bd3937ceb66420b484a84b25a88a346fc775ffd26f372c88ba";
517+ sha512 = "92ea6e4e5e36e22ebed46e52827624de8ffb0bfe48f64509abb0ed7c0439c5e1b809cca97cde758d6e6d30eade6c42ba2c4c272858f816f9332ce2e05a2284d2";
518518 }
519− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/as/firefox-64.0b10.tar.bz2";
519+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/as/firefox-65.0b1.tar.bz2";
520520 locale = "as";
521521 arch = "linux-i686";
522− sha512 = "98e5cb7a5122a4c2f4b687dcfba88e130b43e827d5ddefaf7161dfa7e0f9a86e52654d35bba1c729424562d8a5c0c0c1635b30da5f3c88d0e8f15667a7bdca06";
522+ sha512 = "7c39f29e805aaeed4901170bd1df52eb3db51200f152a877f7b9e50f37c0b2135b643c61c467702abdb456491be38bd209c7e8f263fe1587101c0d0b2731a493";
523523 }
524− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ast/firefox-64.0b10.tar.bz2";
524+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ast/firefox-65.0b1.tar.bz2";
525525 locale = "ast";
526526 arch = "linux-i686";
527− sha512 = "91d6f617fc56b801dc4ddfeccd044bf1b4a89c9ad5d0f13ef185f9996b6fa41d08c092a4a9720f52f7f121aea1b6d5bd9ea99d15a9cd672b0f8534cb6f22c6da";
527+ sha512 = "9408c28407c7fb2946b43703dda3bf638f14bae6adf4cb215752e76497e8e01246095ac9989ef263152f366a9fa0c4cf7d79f7a4d86b6848331333f0e89e7ef8";
528528 }
529− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/az/firefox-64.0b10.tar.bz2";
529+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/az/firefox-65.0b1.tar.bz2";
530530 locale = "az";
531531 arch = "linux-i686";
532− sha512 = "63bdad659ff4ec803b1e0f3367e17b21e2bcf7589fa3b96901e6c3453bf7a8770f0345b212f8c90a326702ac9ca6d16d87a60436ddef863022b70eea92e83a5b";
532+ sha512 = "4409eac53e43fe2e2233f1e7eec8f5cb50b74e15c4057b0816d0c26d8f2dbc01c3d3a578a0bc4351d0858280038bd20dbdf9943b5e9f429ff77755d8e69b67ac";
533533 }
534− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/be/firefox-64.0b10.tar.bz2";
534+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/be/firefox-65.0b1.tar.bz2";
535535 locale = "be";
536536 arch = "linux-i686";
537− sha512 = "ae2b8a34157a541245288e13b551c765ef583684921cb290b76d96c2ed62e07bf016af1e11db344464a46242c4ecc6871b88a585634ada53ab6d315f5dd79d9f";
537+ sha512 = "53739c8bcedcad5e04cc53d66efc81b8446232a60e2a4d0a3020099ad29a5a6f4ce41ed478a7b18bd8f4dc6c321d75f55f6333dde467eba97cc812be977c5bcc";
538538 }
539− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/bg/firefox-64.0b10.tar.bz2";
539+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/bg/firefox-65.0b1.tar.bz2";
540540 locale = "bg";
541541 arch = "linux-i686";
542− sha512 = "b0cec246ef1268bf7feefb966b92c971da8df711acdf7f12342af75f4da09ca982db4f3e71ddee362b05ccb61dbff043cd41f2f0147637d589f0e380c55e71dc";
542+ sha512 = "c94ddd32cf349c3a8ca858ce2c44fcbb1edce97449956ff7a88cf696f0acde7b9b8ece49e2f5d97d9e0096d1cb320915d72188cb08a96947938ac92773d4dea5";
543543 }
544− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/bn-BD/firefox-64.0b10.tar.bz2";
544+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/bn-BD/firefox-65.0b1.tar.bz2";
545545 locale = "bn-BD";
546546 arch = "linux-i686";
547− sha512 = "ec449f40b88ca7479276c7f13eb42d5365c4358d39aa78d8c91185d516595a03b22839e143341236a712edbd35cc308fabc587bdfe2481a08abcb45d907ac1c7";
547+ sha512 = "afc2af989f5e645ccc021b450bf59c85e5a43797d149393c5e3405660ff2c788eac74376c6046e2eb5bdb4f95762743cb904c969c3ae8c96bea3887ad457c3ed";
548548 }
549− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/bn-IN/firefox-64.0b10.tar.bz2";
549+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/bn-IN/firefox-65.0b1.tar.bz2";
550550 locale = "bn-IN";
551551 arch = "linux-i686";
552− sha512 = "4dc25dbfde5dcb4bd178f8574e273ec1081f1c12f59c0167aaaac1d4aae859bbdcc512ed50c9f6a6b6d4de94a559a8f223c4acdc124d84b647d6d96d5569cbad";
552+ sha512 = "2c8632e3f4a4fe3ef067c2634467091b62bfb6273aa04c54bee8c390463b22403141f578bc6418249fcedcae0fe990b37afb24b04b3c453cbaed4687bb8f9266";
553553 }
554− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/br/firefox-64.0b10.tar.bz2";
554+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/br/firefox-65.0b1.tar.bz2";
555555 locale = "br";
556556 arch = "linux-i686";
557− sha512 = "4d0eada67a745a2dddfd6c961ea2afc45b8dd99247f04172b21e008111d698d3bed29ee078b2f38ef03518b712c9b7d91183ce543ace27e428d64588d3a97c4b";
557+ sha512 = "d0fc413bea97d4e012619be2cbefd4ad3fc357abefa365864301d2ba81a68e9bb940c55cd03127dc0ce50b4ee9556b570e96f40063ffaa8b53055d7b2be4b6a8";
558558 }
559− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/bs/firefox-64.0b10.tar.bz2";
559+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/bs/firefox-65.0b1.tar.bz2";
560560 locale = "bs";
561561 arch = "linux-i686";
562− sha512 = "b7b18935016966913504530c9dccda00ec1db5bcd21157308ff4312f9cc222b9622dc165335dbfeab1ac1ea60a6cc7d846414232394c9a398791a9c7ca2f9ee2";
562+ sha512 = "cd21a93cb26880c06d98c1ba5f4191825b45d63e4f432a99bcf956b1c144361889497d68d9e3102ede95f046926ea21e6649ab14906c183c147988914a64a705";
563563 }
564− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ca/firefox-64.0b10.tar.bz2";
564+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ca/firefox-65.0b1.tar.bz2";
565565 locale = "ca";
566566 arch = "linux-i686";
567− sha512 = "00da4706239c7d7014a68518a643b2c130e83fb0915c12008babc920a30c87db1a9b55e1245e39b63ddc366ed017f91c843d96ca4842c91083a32b629d3b0236";
567+ sha512 = "83fbc4f4880140c63c2f73900926083e97737d991e617d37335f4636eb9478547127a0a6e28d6f499cc5263a33f266a1608d2026630b66f59fd472e9c1f5b85c";
568568 }
569− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/cak/firefox-64.0b10.tar.bz2";
569+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/cak/firefox-65.0b1.tar.bz2";
570570 locale = "cak";
571571 arch = "linux-i686";
572− sha512 = "76ea69421e52b3d622d5f5b5d4d34df5defb4cc0c3f3c7c11f856e55287b591fbad642d3d30c255d655c4bc7db7869e2f639775c02fa1892e6ee4eb5f0a3cb6e";
572+ sha512 = "a2272d2f275b2481a12cc905e17f8602e2d2e8d2c11561fddc620dc35623f99687481e9d9ad7539644ff7de03a311a436234dcdbdd9f4c0dbc6cef4d466b9cdd";
573573 }
574− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/cs/firefox-64.0b10.tar.bz2";
574+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/cs/firefox-65.0b1.tar.bz2";
575575 locale = "cs";
576576 arch = "linux-i686";
577− sha512 = "e69f0867f57fa8992276f4f49a2ae73159d3697d075bcdd30688905dd35d19ac5c7b2edf8670bdffa66fabe191ec7e736a6cfbd9731054166663ad954f2c285f";
577+ sha512 = "3835a2d1f041ea50ce8fb3437589be968842496b2b1c13631a8cf697e7d5a01da3d97a7b45fd76d29c84c1affaec72555cf66f366c260df491cfd453d273995f";
578578 }
579− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/cy/firefox-64.0b10.tar.bz2";
579+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/cy/firefox-65.0b1.tar.bz2";
580580 locale = "cy";
581581 arch = "linux-i686";
582− sha512 = "933b7c24011fdce95934b2bffe5f83dc2e914bb34d00a429bc63018bc54fd86d50f24f7e96f897bfabce1be76ab5772e260c5c8c5ef9599c43e2598fd817f956";
582+ sha512 = "a280eb112fb65d5979c6a9f8ad04ab5c2ae7fa03edd29e9363009f42776f38da2f82523c71b680bb988a40e089c6f2d58a24552a73d01311e00020d9cb87e518";
583583 }
584− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/da/firefox-64.0b10.tar.bz2";
584+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/da/firefox-65.0b1.tar.bz2";
585585 locale = "da";
586586 arch = "linux-i686";
587− sha512 = "c1077013270973de929e6f5329701b44669fd0927f1b252c1858cdd20b8cee90e6d9986ce5ab2fa10a25eba19ddbb002fb205ec12c12dc91fc056675db2b057d";
587+ sha512 = "71e51583d018efcdf09f0472631ac2449fdfd748dd7d4467928fccd0d6e4bad6a2853b58a456ebd8e28997aa75c58bd22cf040bcab01e66d1635bc7948a93eef";
588588 }
589− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/de/firefox-64.0b10.tar.bz2";
589+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/de/firefox-65.0b1.tar.bz2";
590590 locale = "de";
591591 arch = "linux-i686";
592− sha512 = "1810d988548e4f1ab3949fdd22b0e83be08f187d937e03c89a8854657770a3ed598890c2143e2b6cf1c4ad19b22e365446d6a96df0aed3b424d2474694521e38";
592+ sha512 = "2b3204787d0423e7c967ea1c87e914719e1bf2106e8589119d9a50d447e6f0c8b1aa86e75b1ab92bc928fd4c90ea24600b4c8d2d44e5097296dcc5a494c369c5";
593593 }
594− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/dsb/firefox-64.0b10.tar.bz2";
594+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/dsb/firefox-65.0b1.tar.bz2";
595595 locale = "dsb";
596596 arch = "linux-i686";
597− sha512 = "61994d9c03695295cfee0f3e4749f58133651f14c77c61e14fb34b65055dca56ce598ff2a5b58e60e380423be6bd8d1c76a72ad6dfc2872e974de57dbe2fe120";
597+ sha512 = "36e0c839d63c974bd2659c3015c5608bb4781526a983519fb3920ec125476d07acd852ac674d8306a67afd194e100a10099191283e3a948ec58b08df20107c2d";
598598 }
599− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/el/firefox-64.0b10.tar.bz2";
599+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/el/firefox-65.0b1.tar.bz2";
600600 locale = "el";
601601 arch = "linux-i686";
602− sha512 = "176ca16c1982dacfbf0553dee54c4ba4f6d94b288469ed8426147786a63497837d02d5de3bd82e19e3d00362fae8c1eb7db75cd2f81c233bf8fc948afad93277";
602+ sha512 = "fe6277f05e013e8861bd9fa9b5e9d02f1224f0cca881159e1a5d0ac00bfa42887bcb3beda291845f716860ed9486e6ee58665895a160574772b76befb3177073";
603603 }
604− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/en-CA/firefox-64.0b10.tar.bz2";
604+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/en-CA/firefox-65.0b1.tar.bz2";
605605 locale = "en-CA";
606606 arch = "linux-i686";
607− sha512 = "f56cffce793283f25c617cd5ca59c17f33e63048a185c449340f4662a07f0c4194c334d149d3a3c5e0330441111a2127dd578d28cd0253ca06c901c295cf0e40";
607+ sha512 = "a10b55c655894d783b508f6b86c787e481e673f7b6c3df739f08ee815b89359c4101026cd2f7c063050a09e7f354cdfbaa7a450935ff0b03b7b629abeb074a98";
608608 }
609− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/en-GB/firefox-64.0b10.tar.bz2";
609+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/en-GB/firefox-65.0b1.tar.bz2";
610610 locale = "en-GB";
611611 arch = "linux-i686";
612− sha512 = "10cfa09292210c52b3a644245a2857958e629ebe98f7bcd3ca8d5b6a8770febd371f70a9395d192de969ff0aeef4f6592d247a860ec2325cbd50bfde1a927673";
612+ sha512 = "f148b9dbaf378f6a8fe5a2225128828fdc5a6a695a324cab83841665d5f93cb8d8dfd1289aed93f66ad9bad45803641102ba8ad4e9fddb063cdd36be92957f65";
613613 }
614− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/en-US/firefox-64.0b10.tar.bz2";
614+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/en-US/firefox-65.0b1.tar.bz2";
615615 locale = "en-US";
616616 arch = "linux-i686";
617− sha512 = "d8cdd41a807afc1fbeb9b200b6e5a94d9c5dd86eac99cce725173d349a392c12481d334289f86be4e0be4183d14a8bc13cd746c12931cd7d46a779e6260f5fae";
617+ sha512 = "b99326d15fcb6450f6af9d867959d71c68bda04a75d7d1fe1a7a0fb02593a2c418c27b8797c0eb50c56d482248b308834d0fa8bc136c7086edb9081708b9dfef";
618618 }
619− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/en-ZA/firefox-64.0b10.tar.bz2";
619+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/en-ZA/firefox-65.0b1.tar.bz2";
620620 locale = "en-ZA";
621621 arch = "linux-i686";
622− sha512 = "cf3ca56846794f25586537ca70be0bfad4a5b8c29beb3c919308f8b6db0e8dd1311a1e2c0fb1c012f5bddeb738426a89a0daabe69ad578c4b9c8a9f0ddfae3c1";
622+ sha512 = "bb42a0c7b782bff3195d6fc128231180611ec5ac8d9e4a402c9e796b9780f0f0d16454e457761a91f1b3bd11b554b3c61e5cf586d369809981309f1d49921078";
623623 }
624− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/eo/firefox-64.0b10.tar.bz2";
624+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/eo/firefox-65.0b1.tar.bz2";
625625 locale = "eo";
626626 arch = "linux-i686";
627− sha512 = "63fff38d293a7e2264f4dd5f4b7bd48dc8738deb9725dfabbd0b99af739b93ddef1559e977d64e8c480746e50fa3c070de6e10192405c6c1aff2fb7a28303c72";
627+ sha512 = "2d3e5babdcfd3b3b4f25e0a239103f6bbfe3da29d418eb8fa37e054cd9afd0425acf9239e05f8d1846461997fd20f56109f2f1f39b59a18f9be6cd494eba3a0a";
628628 }
629− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/es-AR/firefox-64.0b10.tar.bz2";
629+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/es-AR/firefox-65.0b1.tar.bz2";
630630 locale = "es-AR";
631631 arch = "linux-i686";
632− sha512 = "22d03829b66b5901b118745360040164fd1d34bd854154be96f2b4973498f3cb8a1c444c6fcdead536e60f266f7b047afaa27c37f00872e7ee9ccbd3a3e6d8b6";
632+ sha512 = "33d0aed1738cc8aa1768177cf6453afd8cba013024fad7b776a737ea1976d1319ad8b0cc76db7517230faea2367773446987fe7d1af0cde468f9ab35d37a2303";
633633 }
634− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/es-CL/firefox-64.0b10.tar.bz2";
634+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/es-CL/firefox-65.0b1.tar.bz2";
635635 locale = "es-CL";
636636 arch = "linux-i686";
637− sha512 = "52344a032ddc72413ecdcfffd5f9597b199acbb1d07b96f4850891a364a4ea34d28d250747eb85318a6a39aba670f57da8c4d328530def46ec1990baded90bd2";
637+ sha512 = "fe2b3e41e0da6e71a219eaec0024d19801f77113a10be2fd01c4b686395753cb31363b112fd1f8fbaaff756f2a5fefada53ff99fec4b8c09fcfba2a94ea2123d";
638638 }
639− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/es-ES/firefox-64.0b10.tar.bz2";
639+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/es-ES/firefox-65.0b1.tar.bz2";
640640 locale = "es-ES";
641641 arch = "linux-i686";
642− sha512 = "e1a10fc09ff5930777234777a2e2fa84011a9e734d271f425126d129d2b2fea5cd5cd6ab39c2527f175485be6d618db2c2ee21d3e2409bae806a986fe1bc0f82";
642+ sha512 = "7cabe427b241f383352bcb3cf723df921e8a7d955ccbe61f16a7b6fbff592623d8af08b00f2242fd96e58a8905159254a2252657ca0fceeb8f4619f027d4b461";
643643 }
644− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/es-MX/firefox-64.0b10.tar.bz2";
644+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/es-MX/firefox-65.0b1.tar.bz2";
645645 locale = "es-MX";
646646 arch = "linux-i686";
647− sha512 = "2527ee035fb02778f048793a613765105bf4bb196fd2fce33a544c3af26a9b8d4bd02a090313bf93849f95d48949a0bed97766e5101bfacce87517844c529895";
647+ sha512 = "eb27a3bfb6e38d2e03d0c51e511a7b95cb178ff41854692c561fd864db7ebdba2e6067cc3fdd9317df880b32691c0ac71377c5aa36a1b82322267e00db432b83";
648648 }
649− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/et/firefox-64.0b10.tar.bz2";
649+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/et/firefox-65.0b1.tar.bz2";
650650 locale = "et";
651651 arch = "linux-i686";
652− sha512 = "fc809cfe614006fa5a3b81ec9a662cd42359bef5d88a3575d13a1ea36c5a3d23d6a5893ccccd9442071ed7d144e48eb6ada694107bb3b76bf9e8ea88f1dfd679";
652+ sha512 = "119eac2350a278075586a12ecaa1438001625a65955a0746c9e789eedf6165c6697b3085dc47f346d7b992e675ebe5d7341ad7729d6ad396af6c4a7473b227d8";
653653 }
654− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/eu/firefox-64.0b10.tar.bz2";
654+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/eu/firefox-65.0b1.tar.bz2";
655655 locale = "eu";
656656 arch = "linux-i686";
657− sha512 = "b8a46549965de608549d7fcdc69062491fab0de097ce23ac9f7bea9ac0c38a25391f3dd0d4eafbbecea37d55e72d5808338cd09358e4568ce0284b799fbca3ef";
657+ sha512 = "cca07a6932810e7c19445cc3e7a30a0fdf1b68669a82f732ee608a6542f24776c6a9ec2f2cda74c047264649b3a533c038f7ab908873a0f379fff829b92d827f";
658658 }
659− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/fa/firefox-64.0b10.tar.bz2";
659+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/fa/firefox-65.0b1.tar.bz2";
660660 locale = "fa";
661661 arch = "linux-i686";
662− sha512 = "77ad08efa48264ba99395a4f3b1c4db58029a8397877a85ea885d18d2c36c259e5b2af4d5ac7934fefbf0a7c0d6ef33fd98a75a16fb0f72f13aa7615640c2b0a";
662+ sha512 = "36d515f7bfc73eb2c90c16546e3c0bd596ddfde56bef6d3962f0ab178f2f7c2b34ebe07e9e7fee79fc626ba10eab9d94275e6df8564446292f7eda6be713529a";
663663 }
664− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ff/firefox-64.0b10.tar.bz2";
664+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ff/firefox-65.0b1.tar.bz2";
665665 locale = "ff";
666666 arch = "linux-i686";
667− sha512 = "16d91d5617d0166ea091a0f42445d87484b304d9b4e4a8ceefe7bf0131b8cd59ef53fdbe68c0e6603ecdd06b07ac4cd2bf662e836d8fbfec119e455ccd462f1d";
667+ sha512 = "bc5f41da9ffbf41e5f9c377916572b5ece5bde37cd4416cb18c147779a9a03cbeb600961db2f3c4c43999ad3e1a12e5d7d4a54ade4f45d5c92ac1c9f1a410bac";
668668 }
669− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/fi/firefox-64.0b10.tar.bz2";
669+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/fi/firefox-65.0b1.tar.bz2";
670670 locale = "fi";
671671 arch = "linux-i686";
672− sha512 = "5612cedeb45cb3dca94c9234ed378bc3debf52028bdf73258ad8c16688a5ce7cc39a0a4215079361aa95ea85615d911ae863be9eb760e630d790ac8efc8be326";
672+ sha512 = "1e9a19f0bede01bf06e38fc58ede4c8c011a4548b62a131a203e0269c295cda32a4f7b225bbf95f51c43a8a78cef6497412d94e29a2a75a5fc7a5abc865d29f4";
673673 }
674− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/fr/firefox-64.0b10.tar.bz2";
674+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/fr/firefox-65.0b1.tar.bz2";
675675 locale = "fr";
676676 arch = "linux-i686";
677− sha512 = "2bd0ff7bdd0fbca3d8115c1682f68eed2db08c42918bf533d4bbe7a2f5a745caf6bc162249117feff75653142fb54a9d70b9d382277781e20e13c8fa3029398e";
677+ sha512 = "88fa160ff11e5b1e4910ec3c6d9534d5f48758820ef2f6944a4161670f7951b0a3219e292c47044c1192ae5d1955dda5886ad3031661c4cc810e72385529f33a";
678678 }
679− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/fy-NL/firefox-64.0b10.tar.bz2";
679+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/fy-NL/firefox-65.0b1.tar.bz2";
680680 locale = "fy-NL";
681681 arch = "linux-i686";
682− sha512 = "757bfb2edaa0a595d7fe5079ac411a8ac03533bf824979debb48e81385d123b34dfe56aaeb2fabd7217daa7ae80015d9b0c8c533a5115653dfc992f14b8a5d5d";
682+ sha512 = "40f208ec0ed722a097ac4e7d4abb185386ee92707e34473679bf9dbee4d7b582eeb2a46aaeaee37b0be85439a664d8f8dedd41e22aba76035d3f79695a4a092c";
683683 }
684− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ga-IE/firefox-64.0b10.tar.bz2";
684+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ga-IE/firefox-65.0b1.tar.bz2";
685685 locale = "ga-IE";
686686 arch = "linux-i686";
687− sha512 = "f42ae917024b7d477a216935f50da34d4743fc7a6172a1a83ef0d8a68ee7009d5a4a29168f8a19371df8486dfa33d6251397ad55ddfa98cc5974680ec2eec100";
687+ sha512 = "da9a2ddb27d3207be7efdd4090adc871cd7f406dd15f6762c0026d14ecc4a9cfc1a5c9b4b85b265ed9422ff6444c13639ba3b7f8fe5585c3b475eea9e6c955a9";
688688 }
689− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/gd/firefox-64.0b10.tar.bz2";
689+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/gd/firefox-65.0b1.tar.bz2";
690690 locale = "gd";
691691 arch = "linux-i686";
692− sha512 = "eef9f488b18bac4ba1f397d3b536dad457e7451c4e11d260889c91bc5de8ccf21293b95fd2c6a72c9b06a979af6f28aab4ad494f9c922a39ff9251a8f73b6e6e";
692+ sha512 = "205e331b4a037404311b8b1152ba2e8e0981d80a4b0bd3e82b725b6ddd5ce5672285959f550b3b116b34354c8fe770bf32d4dcf9e98c29764116160bbe140937";
693693 }
694− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/gl/firefox-64.0b10.tar.bz2";
694+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/gl/firefox-65.0b1.tar.bz2";
695695 locale = "gl";
696696 arch = "linux-i686";
697− sha512 = "36def20afd4f55be6aeeec85d60a8b222f238c5654a7e7be2d1a2bbcbd92512a1819234a167afca3c8b01c48df9e32de1c36658f9ae64992ff418934eb7e27f1";
697+ sha512 = "b1904cf32581b444e37a10a8dae6aa4f39834b47e97b5b6e62b3bbaefe561e20f06ee69b66ba3afbc03996056fc6f3bdc62d4cd38d37e0c8cb49a52c1405a59c";
698698 }
699− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/gn/firefox-64.0b10.tar.bz2";
699+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/gn/firefox-65.0b1.tar.bz2";
700700 locale = "gn";
701701 arch = "linux-i686";
702− sha512 = "dbefa20dc4438fc3168f67498502c98d362c4e9771e6abe6f3e8185f5eb765d9fcffe40282979c3acddf91cc56cd5b950f444a824e40d88c3ebe145372496483";
702+ sha512 = "17b6eb77a7e204a7e4c345004832ad1377331e7f744ec7ce463e2ef1f44dc576da8a8de20761612d51110c975779fb9fee0b87709a2b7541f124fb03cc4df060";
703703 }
704− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/gu-IN/firefox-64.0b10.tar.bz2";
704+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/gu-IN/firefox-65.0b1.tar.bz2";
705705 locale = "gu-IN";
706706 arch = "linux-i686";
707− sha512 = "24ff7f3c8a9d59d2e75d2fb68bf02ee3826807b5274dc0311e5dd1bfd747bee5ed0c38d7cd7de49fdc74ff2712b4bdbb431e4a3021ae5ecdf342c18aa2c43637";
707+ sha512 = "14fa5291fd952d03d4beda2e71184458ecd1737996133831aa6f8f15ea5e6feefcee3db753817b02e89f4747b2c879f818fd4a7781f277491d9977e1e519bfb4";
708708 }
709− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/he/firefox-64.0b10.tar.bz2";
709+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/he/firefox-65.0b1.tar.bz2";
710710 locale = "he";
711711 arch = "linux-i686";
712− sha512 = "9c7bdcfa99e36f1d89e2a93e4bfe9878d0baef82a8983cb3ebd12a12e411b0b0eb733c94cae9844e023ce2024fc4f792640db4f81fa3e7d29aaa8c80c1973336";
712+ sha512 = "1079037838057e9d85bc3cb54d29958a4e2d21767c7c93afc70433363ac7aed314f520a502d3542abd231a59b503de3b768a2ef87d3f3ca2d17ad7deb1611c74";
713713 }
714− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/hi-IN/firefox-64.0b10.tar.bz2";
714+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/hi-IN/firefox-65.0b1.tar.bz2";
715715 locale = "hi-IN";
716716 arch = "linux-i686";
717− sha512 = "e3398c0b14348dd90583e83c85918d260f110f40a0cb871bca90ed36722f8e5868fe99a1f2bc0ce5e3ed26c014c89f4cf07e16b9545c014869c9909167af0950";
717+ sha512 = "dd19fdf8f61fd2c4d804cb56158aca080c2faf4361585cbb93979401f024d9c1b23816c744eac3f6f788c39effe8a68f76e8d0891b97a14481bf1c68201e7a08";
718718 }
719− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/hr/firefox-64.0b10.tar.bz2";
719+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/hr/firefox-65.0b1.tar.bz2";
720720 locale = "hr";
721721 arch = "linux-i686";
722− sha512 = "e0c20e717c6ac8127c3ccff295c81d9dfaa61e863fe4510bd9fa3aa9e05d6ed42b7a5a765c40a85181a15629ec6df2586728fd56152c2330c4a159e5316d1a79";
722+ sha512 = "f1280b55ce78be18e79a7ae504b2004c7b29eeec627f36e57891c6d1b73415ff3b5645805c5b126cc005aba1d206da76e56ca09f6649dc0f95f514a294fbad1c";
723723 }
724− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/hsb/firefox-64.0b10.tar.bz2";
724+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/hsb/firefox-65.0b1.tar.bz2";
725725 locale = "hsb";
726726 arch = "linux-i686";
727− sha512 = "8057d0ac64a1515ec642359a781fc97b0cdc591aa406cb7b4f7b5e5b39d4870e3516e9d89796d15cd4295da892d96bf1b0e19132912c99e077498be92a2c7906";
727+ sha512 = "85923f4036af41b64e3af27035fb988c8dcffa122560d10a21b78430f7f6e6fe5e05d4ec3fafab816f42957a998418d71a7514d88f738823a33fd79a238bc935";
728728 }
729− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/hu/firefox-64.0b10.tar.bz2";
729+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/hu/firefox-65.0b1.tar.bz2";
730730 locale = "hu";
731731 arch = "linux-i686";
732− sha512 = "710a143c2c9f2e8ed9f36145c96cb014943149595e37619993de55a37b5a3df684221c6456dce57e73ee6747a2592656c5bb8ce00a77731f4b8d8e309d55e948";
732+ sha512 = "1016ef974fe2f5cedf56dd630fc495823d224e74d2de074beaa41648843a9627e572de5313d041d5df8175099b94c1936fb1b315c8c0f99bf2ce8059b452ef1c";
733733 }
734− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/hy-AM/firefox-64.0b10.tar.bz2";
734+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/hy-AM/firefox-65.0b1.tar.bz2";
735735 locale = "hy-AM";
736736 arch = "linux-i686";
737− sha512 = "02c9358ae18ee03433ac67a9b4222c0f26c9a99b71ba7d6f2ed5df3f035d81d6da38199c24cf9493b8942586e2d310bfa647d3d4d56c264fe8dc1075657f26b3";
737+ sha512 = "3dd288e5876ded4a57c1e95eb0967737734f65f713157a0dd56191b12e7223e2bd214547ef009400ea58aede455e01822a9e0c4ea9ad55601e04bc6712f71e7a";
738738 }
739− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ia/firefox-64.0b10.tar.bz2";
739+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ia/firefox-65.0b1.tar.bz2";
740740 locale = "ia";
741741 arch = "linux-i686";
742− sha512 = "f82848adf8105b788ba4005a3fbb9495a3c37fe188e250e4eb72dbd18cc34179a82eab2ca2c5974a19d60170f47ad7a3641d2114036954344cd184496a420d3d";
742+ sha512 = "bc3d4c93ba501e63004478ab924fe8ac6e069a231bfe5f5234bb3ec7b5eb288d1a214bd7180802927f3a3cce08c2bd5711fc6f6c053fdbbd1daca637d5d32f1e";
743743 }
744− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/id/firefox-64.0b10.tar.bz2";
744+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/id/firefox-65.0b1.tar.bz2";
745745 locale = "id";
746746 arch = "linux-i686";
747− sha512 = "cb8b3cb9ca112c741b65c0ab54265dfb86a4b940a72d1646affbad5767bced811c0bc0088a1eeb09a453a555b437660c9b519527671ce704758b8e9b607b1e70";
747+ sha512 = "e0f9ca54a40e01f9a7e1092e567503579b215a691907c10c7f96d2ace1524512af0abf4ff7362fa6c49dc1868dd4115a4514759707e04e5780b00dd16cbd3684";
748748 }
749− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/is/firefox-64.0b10.tar.bz2";
749+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/is/firefox-65.0b1.tar.bz2";
750750 locale = "is";
751751 arch = "linux-i686";
752− sha512 = "09b22d51f074ef2c821ebda310b59e60b02295583d737b7887b24d3b6d0617bb1efd9af835dfa75db8c2625020ac256504e7a1b446cdfad6fe4b59edafcf892c";
752+ sha512 = "6253ffd4a35abb04ecf1752e695278258e3450e7dd3dc335d43ae930fcc78b8ea9ff32927ff8dd8589eb491570ae050d5e36a366e95763a0421efc4703f9f2ea";
753753 }
754− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/it/firefox-64.0b10.tar.bz2";
754+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/it/firefox-65.0b1.tar.bz2";
755755 locale = "it";
756756 arch = "linux-i686";
757− sha512 = "2df43ee959f65c9ed8870afbfd81ed6810d6fd9d9693e20b05629891848843b4211022899cf80fc94df9af65118bfe0d33723b93dcb4c2fcd41bbbe90dccda8d";
757+ sha512 = "5ff3a302273929b7052c6c26f7007fb389867e375f104bafd0b808540b771befd3b1328bc577767ae7efd1aa58237ad86a841e07af04f298e0debb461b0fc12d";
758758 }
759− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ja/firefox-64.0b10.tar.bz2";
759+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ja/firefox-65.0b1.tar.bz2";
760760 locale = "ja";
761761 arch = "linux-i686";
762− sha512 = "1a8a79e7f08489674f8f2893a4c8c9356baadb0782576063c722458d8bda467b26afe3bae0d83a0bfbd7fda5355a6aad8873cc1d76471b3322671d65b73d4ea1";
762+ sha512 = "f66962e71798e4df4d222a384a2ec5051c6cc30e65c90e28296412f1908f6c5ba17057ea97875e871a984d27e6f2678f011afe5e5c067340f673d45b0ab37023";
763763 }
764− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ka/firefox-64.0b10.tar.bz2";
764+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ka/firefox-65.0b1.tar.bz2";
765765 locale = "ka";
766766 arch = "linux-i686";
767− sha512 = "4a2b8bb0afd02fcf033f298fbfaa3ac6c7ad9e34a402e0f526dc54a2387197df9a88b057a787ecc7cad99f69bc87611a704439bbf433406fe1d22d748e7cd308";
767+ sha512 = "78f1873a745fd6627a7e6435833f687abd587421b4b711103e504fe1179406920c6bdf847d6fce5fbcd47b485baa77555d3ad25f2ff7fa4837f48308f8144d57";
768768 }
769− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/kab/firefox-64.0b10.tar.bz2";
769+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/kab/firefox-65.0b1.tar.bz2";
770770 locale = "kab";
771771 arch = "linux-i686";
772− sha512 = "566062e5190676626a3d9e063740ce2a372e30bb8836d96b31434f2dd60595fe61ae20a3e51dbc24aa99fc136d9ed918f8ecbbdbac3a459ee0ab995cc555a97e";
772+ sha512 = "cee493500d868909d36744b53562a455ebc4542730f97e0011ab7fc52a320478201fa41a462f28ec1ebbd8b63a77784084f52b5439e48cea5935fe71b961bc47";
773773 }
774− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/kk/firefox-64.0b10.tar.bz2";
774+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/kk/firefox-65.0b1.tar.bz2";
775775 locale = "kk";
776776 arch = "linux-i686";
777− sha512 = "dd931453d5970d36f5b281c2aa61ce04aaa107a92309c9c276b5120d83dd900bf7e67875fab4d91230a6242872df59c2aa725ebb018253876a01b712b4731105";
777+ sha512 = "92d2a814bdd16f883ac46ae76a31d68fdf73bf8df409b6a54db9efa2b309d8c402be16593f314787a705d36d8a5b289d9fd4f2b950569bab4b5140711a1b6a90";
778778 }
779− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/km/firefox-64.0b10.tar.bz2";
779+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/km/firefox-65.0b1.tar.bz2";
780780 locale = "km";
781781 arch = "linux-i686";
782− sha512 = "839381f90c49fc4b392e8f503576a950051d113024df2b237d2cf34948164db741a9b1db9e13e9a7e79cbb3c5994ecf5801fa36fac5f2e541ef574c7c8c8496f";
782+ sha512 = "7ec953af4f564097c6586813db66c9a9d4adff946a3def098bd9ace1bb2ec5d765cbe34c5f2d4bb309283a3ea83c9a61b013257411dab2d1e6f0978761058ce7";
783783 }
784− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/kn/firefox-64.0b10.tar.bz2";
784+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/kn/firefox-65.0b1.tar.bz2";
785785 locale = "kn";
786786 arch = "linux-i686";
787− sha512 = "fc2ee47bcc2c6c8872d62327543ed4b54639aecb29d76ea211cc86933646bb8828c46d04ad71b639f7dc9dcb7d3ee30afd4025fae78d9bc4a865cfb2baaa8466";
787+ sha512 = "68d0ef81b194b16db975cc88af819a1021cb715a3ab9a24cb482e46e83219422f8db546be19667bd533835cc25caf0c8d13f7bf4cbed40cbff919bffc8b72066";
788788 }
789− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ko/firefox-64.0b10.tar.bz2";
789+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ko/firefox-65.0b1.tar.bz2";
790790 locale = "ko";
791791 arch = "linux-i686";
792− sha512 = "de6d2ffb87d86da19c23fd276679babc56056a3e253ba468f2d8561aaa5450e2b0cdae0115325158577508649cb58d0417cb16ce89e6beb9f3ceb229270c43dc";
792+ sha512 = "36f857ff7808f6a5023afd6ab8e1679c93e77dcf6a239d3ce4bd66548d22c2fdccdbefa648438a73a833d5f2683e334a6c4ae641a009330ddcdb651e2327ef2d";
793793 }
794− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/lij/firefox-64.0b10.tar.bz2";
794+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/lij/firefox-65.0b1.tar.bz2";
795795 locale = "lij";
796796 arch = "linux-i686";
797− sha512 = "c269db1b59e36cca2d61ddc1ec43efb4c41223680c035d69d76290a26cb18f0ff72b514fcb34895ed336ab576cd2a61d5fa953e0e2d615870a60546fec5de6b8";
797+ sha512 = "2a2bc5d3d1c5f74468b8109995838c9a40c738727cb3e9d69236eb741f68de1862bcac12c4607aa65b6cac423deccf07b9d5e3f0b97ff38cb6ce90111ebe4c6f";
798798 }
799− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/lt/firefox-64.0b10.tar.bz2";
799+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/lt/firefox-65.0b1.tar.bz2";
800800 locale = "lt";
801801 arch = "linux-i686";
802− sha512 = "b75be33bf611d53eee0cf2d6112e52d40149ed052a10c32f8f958c025726751066dd48893622de33c400ab642394f5c68db4319178bb0d8547830db46f90dd09";
802+ sha512 = "0f3a3788acf2289732485097531817680d292662a70a3d7f5c3def8526e9bff444d0a3a7d8f7263048659f6df8a80a24744296b2f306e8b44cdbeb23e2b0f92b";
803803 }
804− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/lv/firefox-64.0b10.tar.bz2";
804+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/lv/firefox-65.0b1.tar.bz2";
805805 locale = "lv";
806806 arch = "linux-i686";
807− sha512 = "6a10fde8d72f01ad6b2e1aad56f229f57694ec2cca110d12a77a68f2eb30b4e92fe7529a9ee4589160443393cc3af61d86086058e4accc9e1f9bbf581a280e25";
807+ sha512 = "856aefb6989bb97f5525e0b0e2acf14a448ae8d316c9dea98513f74098d36d254057c23421a40ade7bb42a522540232920d7bd0e648857a93a58cebbbcb5ac69";
808808 }
809− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/mai/firefox-64.0b10.tar.bz2";
809+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/mai/firefox-65.0b1.tar.bz2";
810810 locale = "mai";
811811 arch = "linux-i686";
812− sha512 = "7340d5b9f93c7b06a09164d003b5c1fe7489e8a2e18aa1c89d093bc35e921acdf4f0dfc3b247b9c8de640153e98c8f7c271aa16c3a2e25b3730ddf2d9eea7ab9";
812+ sha512 = "e427c73b0774026d8346476b581dc84f087e7989ee1ae7c28e0155b8debf4e55f7169caae7d2cab13b6d8b46d747734ca50a6fca39f256a381349634a9d4fd13";
813813 }
814− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/mk/firefox-64.0b10.tar.bz2";
814+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/mk/firefox-65.0b1.tar.bz2";
815815 locale = "mk";
816816 arch = "linux-i686";
817− sha512 = "c118ec46cd4da1af94a6e706c08f7c8d570b81b49545da8f255cdf922719c2a1158984293b18a2ea411615eef72e694dccf6474e7ec736a25cde5bd57e089f56";
817+ sha512 = "f715fbdc2619fa35391aab97245a96b8d60dc4f8db90fbde1336cdfe22f5dcd4e68b6e9d3c4e8a07e5aff4a8bbf92daab3ae1df454a5111a436831120b390cd3";
818818 }
819− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ml/firefox-64.0b10.tar.bz2";
819+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ml/firefox-65.0b1.tar.bz2";
820820 locale = "ml";
821821 arch = "linux-i686";
822− sha512 = "4ed6f9a71e515ed9eb2c9cfa71a10d9b3a3d827f635543d1638b81e9a67c38340dc9e4c910cc87d58bcd5ab551ce1b22ae8e7b7a1a82d8c68375a57234726df2";
822+ sha512 = "28e98cbdbb69eae96b78586e00ad8379d0140bd02a2e9ae64bcdd2648978c63393b0139cdbebff87d703e5211709dd500b5341ad25fa3a1d3f840b6dd8358029";
823823 }
824− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/mr/firefox-64.0b10.tar.bz2";
824+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/mr/firefox-65.0b1.tar.bz2";
825825 locale = "mr";
826826 arch = "linux-i686";
827− sha512 = "64300093406fa443bf8aec9c1125f2acb3a00843892ddc110c23bba4d78bac28d732848cce23c9bee7ad1ef03586fa02567bab7c9e423b09863256359e656698";
827+ sha512 = "64c008751c310ad50624563214f14a310accc9f3d68fdc740864b5df50891beb76e580e60789a0219e862ad66248d75268a981ba25f78d6218d3107c1c911186";
828828 }
829− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ms/firefox-64.0b10.tar.bz2";
829+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ms/firefox-65.0b1.tar.bz2";
830830 locale = "ms";
831831 arch = "linux-i686";
832− sha512 = "ea6641f148b7fc00e0b934181ce86735573978e7d13368673de25a88709c5b930aecebd3f4e5cd83ad40b9b0a11f3bc27b4e24d68d3dbe476344b23e1dcfe087";
832+ sha512 = "d5eb1472e90ac506cb518f8cd18d9142673ee4f1289db35e7cb23df895c71a48671d17a468289c21938329a89c1dab5e23a8c1292f0a5de41c51b57091a5ea01";
833833 }
834− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/my/firefox-64.0b10.tar.bz2";
834+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/my/firefox-65.0b1.tar.bz2";
835835 locale = "my";
836836 arch = "linux-i686";
837− sha512 = "c302c3c95303e6e9e8b2b13e997a99b6acf52364e2cd30f20ba27a48aeaa395268698b2aee043deb5464e4cdf123aefa8528833b5f3d5a52beda11a39f9a3e5a";
837+ sha512 = "79944df3288c8df2a105e53e36e253aec6990a48bda3169de579cd1b29176cf1b52b1ab8756a19ad06e1a028421f59a835fb69dde18394da0e10906a9c9d592d";
838838 }
839− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/nb-NO/firefox-64.0b10.tar.bz2";
839+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/nb-NO/firefox-65.0b1.tar.bz2";
840840 locale = "nb-NO";
841841 arch = "linux-i686";
842− sha512 = "d09a982c4301228178161d1c7a0b00b9bd8ff71125571f54b214a0de2ad10f5efe331baaee3d849f3b06a59e52aae4c52437216476808046087800c5014a9322";
842+ sha512 = "bae4bbe321b54ebf36d1c0e978c9d18ebd8ce1b4dc82711c2504fa638eb29ee03e84935dc6a458cbda0a6ca0cb5b07f08e696b9cc2f5c035665f8636ceade660";
843843 }
844− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ne-NP/firefox-64.0b10.tar.bz2";
844+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ne-NP/firefox-65.0b1.tar.bz2";
845845 locale = "ne-NP";
846846 arch = "linux-i686";
847− sha512 = "0a00a6078024fdd4c03d1044d9f72df00eb8da3de3746fa78a86ed568f72d8c83719179951ce18f7c0d1dd109773c487d5159d7b6a913bc1cc8c6b2c00603fac";
847+ sha512 = "cdf8bec99e46d07915d5c5082390f168617910f9b43f7b983741acdd7f09d9b1798a2b122e3e7fb9ba1beea7e43592d488264ef428461a4b90ba4dda42b0cd11";
848848 }
849− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/nl/firefox-64.0b10.tar.bz2";
849+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/nl/firefox-65.0b1.tar.bz2";
850850 locale = "nl";
851851 arch = "linux-i686";
852− sha512 = "f87a55f30c1b9fa14a8c0d4c7187a5e36faef688ac8a3082bcaa576db11457886f97405bd2ab1c5a02b4ac1c94643f143c332a68f90ec36f3acbf42c73876dc9";
852+ sha512 = "61c5d39dff518e923c5a81b4af1a1129c41bcf71d76fc8e4a4326adf8c8c486aacc6a7144e234c48b67adea7a03405848a19a65a086d12050ae1ff611a0200fb";
853853 }
854− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/nn-NO/firefox-64.0b10.tar.bz2";
854+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/nn-NO/firefox-65.0b1.tar.bz2";
855855 locale = "nn-NO";
856856 arch = "linux-i686";
857− sha512 = "aada464208cfa7c18b126114e323b1e047148891a568a8088661ec313e8c04eaff4c9f0121d9b9df95584e502e1dc5311680a209b67667f8c1f7706381208a0d";
857+ sha512 = "ed4f2598b3ee286671a7dcbcafb3ac4c1babfd58221ac1d6e17ae88346124e41353a73be1eb61c458cfcf20ac4a3ee26f16dc55b05a999ec9d83a28aea4cf87b";
858858 }
859− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/oc/firefox-64.0b10.tar.bz2";
859+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/oc/firefox-65.0b1.tar.bz2";
860860 locale = "oc";
861861 arch = "linux-i686";
862− sha512 = "fe9a5e94cbd328fe988e263b2036d3e3477ee792d01f5bf13df67d0d352489323ae4cdf76e2e559af7008fe36804461533efe96245870244ff653e2609d973cf";
862+ sha512 = "9bd6ad8359e8c7a4999e8f931b220e10dfdf3cf147cb683c5b3d2a8de775323df47117142d75612ca73c015f6b97cea271d0728225069da0f4c8359c5f5ebb82";
863863 }
864− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/or/firefox-64.0b10.tar.bz2";
864+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/or/firefox-65.0b1.tar.bz2";
865865 locale = "or";
866866 arch = "linux-i686";
867− sha512 = "0992659dcd653f29b7dff511a0742352b9c47d4db5fbeb1b3fd123ceeb3dc7fdd0326f7fb9dfdb52cef128b16af21fa457f4c732f6ef421845d6de17ad8ca446";
867+ sha512 = "926f128bd5b7fd6d6c74883517d3c54ce5f7d917785f45ee062610c3d0389371a48f971c247984ada2dd62a0e7249350b9b32349225b6cef80f2d2c10e1b35df";
868868 }
869− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/pa-IN/firefox-64.0b10.tar.bz2";
869+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/pa-IN/firefox-65.0b1.tar.bz2";
870870 locale = "pa-IN";
871871 arch = "linux-i686";
872− sha512 = "81ca4d42d4bb2674fc3e8e3d9c699b0d0106ba99831f7d06d747e254e8a61a6e9c197586293e83f7ea34564964b4d2a1da587caffa1dd1e7915ee5ff7ae4617d";
872+ sha512 = "91757cde47223590be15cd74e3ce8f0466eae141ccca68f38000bd59c711298222d9951df1765f68ca03d2b8d15730a8ed73d142c1086ab2cf579213429ee581";
873873 }
874− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/pl/firefox-64.0b10.tar.bz2";
874+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/pl/firefox-65.0b1.tar.bz2";
875875 locale = "pl";
876876 arch = "linux-i686";
877− sha512 = "d344dc5929671b193077429ce08a51f420a996b8fe84d2f85a27ef71da407ad063e8a5c07ff476b9c5a687bbce5c8882d8281ffaaa4f023ea8550a607fce504e";
877+ sha512 = "77cec103f6c2810f7cd3cdb036a590fb88007a86b1775178c64f81ed05ad92a8033bae5bcb753f3f9fbc39d10b32bf1d262599da0fd4a23f3a692c5941d23728";
878878 }
879− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/pt-BR/firefox-64.0b10.tar.bz2";
879+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/pt-BR/firefox-65.0b1.tar.bz2";
880880 locale = "pt-BR";
881881 arch = "linux-i686";
882− sha512 = "8073330318cadf83558b30914042b1ac2da6911f00e4aba3bda573a65f27c53301e1b926eda36465c6f5e484f2f6f5208a863f8b134442e29a5cc908885917c8";
882+ sha512 = "0078e18b65681ba521217f589bddd7b6c507a529e30fa524e83087e4d4837b8e771cd6db1e1cfb77e107ca28ba05c052b3b5b8c96c92b2eba63636b6a23c3999";
883883 }
884− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/pt-PT/firefox-64.0b10.tar.bz2";
884+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/pt-PT/firefox-65.0b1.tar.bz2";
885885 locale = "pt-PT";
886886 arch = "linux-i686";
887− sha512 = "0ec5b66761b10a6f9e33c9c4fb8551fb7fb8d33df560062c38e71e9e5f06c6d58a4ac954db650f0e9c3d12e39fe98d3bc3c9af2e67529892ac14a1b8e6187398";
887+ sha512 = "aa0b1f53bb6da5b64dc8ed0da0a46e4a28c0064c1ff03dc40afdf4e2daaaf9c7cf203bf6f66d3c5fcf0fdbf0c3aec3e71819d49ca901738be6e6d343bf44179f";
888888 }
889− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/rm/firefox-64.0b10.tar.bz2";
889+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/rm/firefox-65.0b1.tar.bz2";
890890 locale = "rm";
891891 arch = "linux-i686";
892− sha512 = "2fa38cc4b068358faccf1e6637864556158f1cc704111f0ceab3384ad6f80df6e04731e3147f952d592a44e05e2c39794d9b6fc8da2fa0497f60c3d0329f4c07";
892+ sha512 = "aa1ead0607661103ff8d58e84cc7b6b2fb80422cd25ed670b9403236d5a702255f56033cc9ffaf5746153f70973f9d8c711783fa2a16ae1ebb55e8ab9a669b01";
893893 }
894− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ro/firefox-64.0b10.tar.bz2";
894+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ro/firefox-65.0b1.tar.bz2";
895895 locale = "ro";
896896 arch = "linux-i686";
897− sha512 = "5ebc28061eede2b7e8fa82d7785af1d7ed573fa241f3bcd992973219827fe41d05fbf7e878e7fc4be0ca112389ece5088ce2da76b4ed81af25cbf77613ef1ae4";
897+ sha512 = "0bd2887af7ccb38d6ef931882c33c629443dbfc1204460bd41c4321bb36497083794fe7e7761484a400844194f39247b30f68c3d2d015141f472136dff3d2a53";
898898 }
899− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ru/firefox-64.0b10.tar.bz2";
899+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ru/firefox-65.0b1.tar.bz2";
900900 locale = "ru";
901901 arch = "linux-i686";
902− sha512 = "d48ce34160d0cc06931478822ed668b56c0dbabcc36533ed89325606c7114beed2275fa65be627320913cf899d18a0c91af60420b0028e19ae7baed31ca528e4";
902+ sha512 = "3603a4998739e7a561f8e642ab1c41346abf5a05eb27b67fdb79f6025fca1a9868570bc1f68db6e04eaa12ff81aee6522fb2aa1bbd74aeb33e08c69b9f67fd8d";
903903 }
904− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/si/firefox-64.0b10.tar.bz2";
904+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/si/firefox-65.0b1.tar.bz2";
905905 locale = "si";
906906 arch = "linux-i686";
907− sha512 = "b40f699b3832dd3fa31bcc70f237eed994f3ec2e7f405896595c7bf0a2bdfd935d483ea342f42c041f942613df5483aee93f47f154b999a032541a2a13e751cf";
907+ sha512 = "1664426cdadf570e4b1282f38015eff3436fe6c37f3aa0b9445f5099d3e4ea58d176364cf615c28f82cf37fe07134611ee405dd5dfe1df7d41f10b5aaf97251d";
908908 }
909− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/sk/firefox-64.0b10.tar.bz2";
909+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/sk/firefox-65.0b1.tar.bz2";
910910 locale = "sk";
911911 arch = "linux-i686";
912− sha512 = "ebad485939f64ef32016c7c410b09c80b55c40ff21f59caa3d5e73aa2c65581cf82cbadc2421be9e7f743ff7176f454908b2399b0c2d78ff1c81c4003bac84f3";
912+ sha512 = "d2144172be9383c32d2f66328f27ee5d9585959687efaa5bce1e7a9ed1726af58714a535aadf6dc42e31684f44f065775126e4ebd177c12610e40587c1094566";
913913 }
914− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/sl/firefox-64.0b10.tar.bz2";
914+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/sl/firefox-65.0b1.tar.bz2";
915915 locale = "sl";
916916 arch = "linux-i686";
917− sha512 = "dd7812bb6b579db9961bca9056add99e5aa10b3309c9562ac1a30a3613fa2afdf5a3fbf0943783660671b38b35016efb8ed3b1caaa0d67edaa07dca05b3a30b8";
917+ sha512 = "624becd246d58a11b1353a4838e78ed5ec8362f356279581ae1f4376da40712b6aa388d5cf02eae6040139e34995254e1ee0c08971d3666e8a867cef1be38354";
918918 }
919− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/son/firefox-64.0b10.tar.bz2";
919+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/son/firefox-65.0b1.tar.bz2";
920920 locale = "son";
921921 arch = "linux-i686";
922− sha512 = "e78c803672aae2f6a26f7e9173adf7d8151d9d54866114e805d8143e46b20f5a08d4b2b944fe3e2b87f8cf342777c925ceda94592b746e101b62234141512756";
922+ sha512 = "0d2842e6dc3187608265c70d1b0648d8b31e5b790b734d1e09c9621f8910f015ec7c245d4be1ece26f5df171bb134afabff8af1de373185d6186cc4bead293ee";
923923 }
924− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/sq/firefox-64.0b10.tar.bz2";
924+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/sq/firefox-65.0b1.tar.bz2";
925925 locale = "sq";
926926 arch = "linux-i686";
927− sha512 = "0bc01415b9701bc80f371fb4541bbad387caf74b25edb0b2d0ce91a840cf7a8bd012fc206486b724b5cdc694dde3d229ce8c074c5d4b8d6b2e9166354b5939b3";
927+ sha512 = "1539962902491f03cc0e5f5c730137a6c7649b02e3816042862a37f06982760d1119fd7721e5199b94f45a4c21f76797ffba6f84981f4ddf89f1791a06e55e3c";
928928 }
929− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/sr/firefox-64.0b10.tar.bz2";
929+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/sr/firefox-65.0b1.tar.bz2";
930930 locale = "sr";
931931 arch = "linux-i686";
932− sha512 = "f59a095a8ee815f48e5bead71af079453df702e56874c8017df4fdfde51c4db81a83a6ddd2feb2c8385f0c2bba5f0f985bb9abb38cd9777f7234796eb014e621";
932+ sha512 = "0cf6b4c2db8c5fcbafdc207f38de436a25c4bf467589c69d2ef1c82cd91b8ecd19a562af8bcfdf9e867b9da2c54d1bf492a395a0e6c00712f7143cbef4b598ee";
933933 }
934− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/sv-SE/firefox-64.0b10.tar.bz2";
934+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/sv-SE/firefox-65.0b1.tar.bz2";
935935 locale = "sv-SE";
936936 arch = "linux-i686";
937− sha512 = "e9884e0ae32d721b4d67069c63b573dde120ebc4de91b886644d07d00def8e341ff1a224c8645c2c2cb5539af2eaee74ee8c835bfe7a36e96ac7a4383b9344eb";
937+ sha512 = "ddc9bc5a3b260570c5df6995857cfae69e426b745d5577b88dd6b1cb56794e3176ade22ea78437afc5a0d2e493c8d9281266ec5691cd9cd10743e6650df48478";
938938 }
939− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ta/firefox-64.0b10.tar.bz2";
939+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ta/firefox-65.0b1.tar.bz2";
940940 locale = "ta";
941941 arch = "linux-i686";
942− sha512 = "36d3424027236c38f271a9eb12db55f978ee4e59d58b7addcd40f92f41aff015616a1b1b43183ad550b62f347b0d1ae85c4df91227ad65b1710176be8152c5b2";
942+ sha512 = "ab60ae9f72751526b26b7bcd062293cecc30ec02464797788efe9610a57baa0c1deb3ecf7af6d5f2d1059e971e04e119b497e4223853047f73a924304b16ad68";
943943 }
944− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/te/firefox-64.0b10.tar.bz2";
944+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/te/firefox-65.0b1.tar.bz2";
945945 locale = "te";
946946 arch = "linux-i686";
947− sha512 = "d49d0896e38f22de374e4b7b2a28cf63619f7c8980dbe17efaa2078333f84e0df20cc636aece5c58fad4a792095dc11ad08e75912e77a6d00c55c63fd2085800";
947+ sha512 = "c1c31923c57ff1484dd7992a380cb812a5954dca248bc2af69ebb104cfe9f543a16b8447694a748d427f727a87dd07474cbd17d9a1eacdf0c51af0ff48e79137";
948948 }
949− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/th/firefox-64.0b10.tar.bz2";
949+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/th/firefox-65.0b1.tar.bz2";
950950 locale = "th";
951951 arch = "linux-i686";
952− sha512 = "e74e806bcbaf3206c4a95846110ce13659fca80a63126496a9b2d7f26d00e1b8e781288144cd22e278938a37f316463f2179cc0642ab6e852875d85b16eb4aab";
952+ sha512 = "060058a99916d0b851ab41e0a1c38a3ab8f15241a8f46d4fafe50d6a9dcc436e697a1e6f7ced819bfaaabff8335555afe236807877400aca1eff9749210d8d9f";
953953 }
954− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/tr/firefox-64.0b10.tar.bz2";
954+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/tr/firefox-65.0b1.tar.bz2";
955955 locale = "tr";
956956 arch = "linux-i686";
957− sha512 = "3cb2de0f5a305de3ee8c4ba7b70db4dd882437e3030a1837b3e3cb1478d609616fc7e8c61c247bab0a03e6061fe8755191db0a2126b2d5b95576396e557a4457";
957+ sha512 = "a8e6d67cb49fee893600fda43ae4abe9ea3d49edea372db2ccf51589edc1cc4762eabf641ec51d1d5117ae0424122da08c0ca3cd339f7ea6e46ffb8f33fa254d";
958958 }
959− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/uk/firefox-64.0b10.tar.bz2";
959+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/uk/firefox-65.0b1.tar.bz2";
960960 locale = "uk";
961961 arch = "linux-i686";
962− sha512 = "c2cffd17e5704eb6dfc6e757f6e4f45440b9ce10baa410be779f02815b60017d5647df8d48cc183e6cae70e64de893f467e7edce8facc189bd50868e0824b56a";
962+ sha512 = "7000cb70414f2c7b0b3f4de5175584732acb5978aeaa77721f91016d31ec561986124a28cd8705abc57a562b1dee1b6ff0c270105ee0d1c6a3cf485b54c8184d";
963963 }
964− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ur/firefox-64.0b10.tar.bz2";
964+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ur/firefox-65.0b1.tar.bz2";
965965 locale = "ur";
966966 arch = "linux-i686";
967− sha512 = "55a3ba48586665ecc77223d44982ebc276f15f7ed2538a7917ea982968a888de8c4fded1a2239969f95b751f71a9e9c3d20a1d655ec80b8bc9f63de3b2f418b2";
967+ sha512 = "445ea8709ac7962cc9c2e5316453918d890fb3c6b453f97fba4a67dde6707bf509eeb3e8cff2d7789a4acbc9d138d1f7e8d4d493db55dd122c48deebb401e113";
968968 }
969− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/uz/firefox-64.0b10.tar.bz2";
969+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/uz/firefox-65.0b1.tar.bz2";
970970 locale = "uz";
971971 arch = "linux-i686";
972− sha512 = "9f94a8cf73af3f96c06a8aab1f31183d940fdf55ba864661513e9facc5c40adf6cc1fb42170a49d702f305906711df9e13bcf97bfdb22e31f8f177a8468f3bef";
972+ sha512 = "acb46a2d398da472fd85f8a8d8e6498570b395445e21d4bac250146e7b68f9ae01c98747a67faceedbef3cddfdf3f12a7ba10ffbd9c5a20ba9fb8542bc310944";
973973 }
974− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/vi/firefox-64.0b10.tar.bz2";
974+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/vi/firefox-65.0b1.tar.bz2";
975975 locale = "vi";
976976 arch = "linux-i686";
977− sha512 = "bdeca49540475316fb93326651f7c2ec54bda4d27ff16395f8ae8488855813bbe0b68f98d278d1e87724be4ee8c7c1ae5560900e9b1fd75ac861ecbc8c4e46bd";
977+ sha512 = "e3541f17bc38a48453e4a3b76e7b721b56dc8a3d41f16d23d7ce9698edbcac860c5956a1ba2db5050dd490eb8faef3c8d75ace0d878b77d0d54321712e9a2c80";
978978 }
979− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/xh/firefox-64.0b10.tar.bz2";
979+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/xh/firefox-65.0b1.tar.bz2";
980980 locale = "xh";
981981 arch = "linux-i686";
982− sha512 = "0dff6128be2a8493f8f93e91dcd9a74c1861739babe57bdf7c7505ccf657cd7b6d25461dbb8c478afdb1811ba4b5a1abe8ca7fb7947393b30923d47af37ecadc";
982+ sha512 = "958064d163f58f306f66de17f0b255cae1e315c707b70a1b19e0bd37c0ce8bf61c2b5cfa23cc605c76dc77061d17647f13a93577baff167bc9acd044d26f1232";
983983 }
984− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/zh-CN/firefox-64.0b10.tar.bz2";
984+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/zh-CN/firefox-65.0b1.tar.bz2";
985985 locale = "zh-CN";
986986 arch = "linux-i686";
987− sha512 = "4589a428a78b532f888a7bd82167af84d85d7557a099e6a38cddcbf01db546241f12420f6a926540c55ad7092e00aa1ac8b622b3638a74ee97ec58f0cb0e85ab";
987+ sha512 = "b74a598177fcab1dc721e854135cbca2769a478a908adbfffb18d5ed7dd4d1e984a8413d11fe5b11235423962bc0adfe00fc4e3c48512909dda0c12663d01564";
988988 }
989− { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/zh-TW/firefox-64.0b10.tar.bz2";
989+ { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/zh-TW/firefox-65.0b1.tar.bz2";
990990 locale = "zh-TW";
991991 arch = "linux-i686";
992− sha512 = "f9b8bfe7609b7dc511b52ea937fbdd3f40b32c5aebaa2d9a68766efef0aaad6d9e33c0d0fcdef55a4953973df2b2695d4179f9ada33893ae13ebc8fcc05e8442";
992+ sha512 = "c7bee751ce40b7110f0f32263dc6e928d52e5b065ce1e0ad2770a43c44dbc6f1bf372df7aaad909eeedb8e4e48f045365f181b25aa8baa5ad738025a293b7c8e";
993993 }
994994 ];
995995}
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix+6−6
@@ -74,25 +74,25 @@ let
7474in
7575stdenv.mkDerivation rec {
7676 name = "flashplayer-${version}";
77− version = "31.0.0.153";
77+ version = "32.0.0.101";
7878
7979 src = fetchurl {
8080 url =
8181 if debug then
82− "https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_npapi_linux_debug.${arch}.tar.gz"
82+ "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_npapi_linux_debug.${arch}.tar.gz"
8383 else
8484 "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz";
8585 sha256 =
8686 if debug then
8787 if arch == "x86_64" then
88− "0d3ch1ksxra8hvbqnzj5fmbvlz6hq42b3rncx4vpjlwrcjd9ggy9"
88+ "0383r5pl1jrspy06mpxq50kkip5q5v052kz9aymk4qylgy1dwpn2"
8989 else
90− "1qldcashv1x64cvpbx1741hz32rmc0dp7i3ayhpbi15rvf95qx8f"
90+ "1vx2map0wlj6bj8dqyxxaymmz9awjjfhi6097knpmqp6j8dj7l5g"
9191 else
9292 if arch == "x86_64" then
93− "114n3kvdyfmn2w6w6zbijx29fz10x3cbjyy3ci05n0y07lhq1grc"
93+ "003mr9mqkg0agj3zlmci5a1m3lnhj27mnvqswjaffdg5rlihvxyi"
9494 else
95− "0sxvjf3xylm4bmhianyfy54gzbm4gkq1i9q8gg4fn3nb3c0z7327";
95+ "1smmdsnnlsssakzqas5268svyv3rk717zr7kwpkj4rd5d1pqwcps";
9696 };
9797
9898 nativeBuildInputs = [ unzip ];
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix+5−5
@@ -50,19 +50,19 @@
5050
5151stdenv.mkDerivation rec {
5252 name = "flashplayer-standalone-${version}";
53− version = "31.0.0.153";
53+ version = "32.0.0.101";
5454
5555 src = fetchurl {
5656 url =
5757 if debug then
58− "https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_sa_linux_debug.x86_64.tar.gz"
58+ "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux_debug.x86_64.tar.gz"
5959 else
60− "https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_sa_linux.x86_64.tar.gz";
60+ "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
6161 sha256 =
6262 if debug then
63− "1k78nwrz5zbsj5jvn340n2y4dz1zxrcb7f7955d8dra15w0zax1k"
63+ "1i59vfhxrlksxwmr3kj3dfbasfjgnx9aimmv400z07fw3zmdrbpw"
6464 else
65− "0ajg3p4c36xzvvjl2hpbzn2g3xwjgf2xy6x4478aq7fxfgb0vf6s";
65+ "0fz9zhp0qn9xda5pg37dfnvx04n8d7156h1qayf2l3la94apsacq";
6666 };
6767
6868 nativeBuildInputs = [ unzip ];
pkgs/applications/networking/browsers/vivaldi/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717
1818 src = fetchurl {
1919 url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
20− sha256 = "08x6abyz65vx4ycj8ys8sib9z1adb8ybmnrqjck69b30kbz78rj2";
20+ sha256 = "00rxp6rardxjg17g2b28y2rj8szqlainp4ga6c58z981zkxvdlls";
2121 };
2222
2323 unpackPhase = ''
pkgs/applications/networking/cluster/kube-router/default.nixnew file+32
@@ -0,0 +1,32 @@
1+{ stdenv, buildGoPackage, fetchFromGitHub }:
2+
3+buildGoPackage rec {
4+ name = "kube-router-${version}";
5+ version = "0.2.3";
6+ rev = "v${version}";
7+
8+ goPackagePath = "github.com/cloudnativelabs/kube-router";
9+
10+ src = fetchFromGitHub {
11+ inherit rev;
12+ owner = "cloudnativelabs";
13+ repo = "kube-router";
14+ sha256 = "1dsr76dq6sycwgh75glrcb4scv52lrrd0aivskhc7mwq30plafcj";
15+ };
16+
17+ buildFlagsArray = ''
18+ -ldflags=
19+ -X
20+ ${goPackagePath}/pkg/cmd.version=${version}
21+ -X
22+ ${goPackagePath}/pkg/cmd.buildDate=Nix
23+ '';
24+
25+ meta = with stdenv.lib; {
26+ homepage = "https://www.kube-router.io/";
27+ description = "All-in-one router, firewall and service proxy for Kubernetes";
28+ license = licenses.asl20;
29+ maintainers = with maintainers; [ colemickens johanot ];
30+ platforms = platforms.linux;
31+ };
32+}
pkgs/applications/networking/cluster/kubernetes/default.nix+2−2
@@ -15,13 +15,13 @@ with lib;
1515
1616stdenv.mkDerivation rec {
1717 name = "kubernetes-${version}";
18− version = "1.12.2";
18+ version = "1.12.3";
1919
2020 src = fetchFromGitHub {
2121 owner = "kubernetes";
2222 repo = "kubernetes";
2323 rev = "v${version}";
24− sha256 = "14w77yw8pd2y5d764byh31vv9203y38zlvcr1a9wylrs00kgzwfw";
24+ sha256 = "0y227qzv7hsibf0sil5ylfdvkfsd43qlsyprc1dwgbj8igjl6q2d";
2525 };
2626
2727 buildInputs = [ removeReferencesTo makeWrapper which go_1_10 rsync go-bindata ];
pkgs/applications/networking/cluster/terraform-docs/default.nixnew file+26
@@ -0,0 +1,26 @@
1+{ lib, buildGoPackage, fetchFromGitHub }:
2+buildGoPackage rec {
3+ name = "${pname}-${version}";
4+ pname = "terraform-docs";
5+ version = "0.5.0";
6+
7+ goPackagePath = "github.com/segmentio/${pname}";
8+
9+ src = fetchFromGitHub {
10+ owner = "segmentio";
11+ repo = pname;
12+ rev = "v${version}";
13+ sha256 = "12w2yr669hk5kxdb9rrzsn8hwvx8rzrc1rmn8hs9l8z1bkfhr4gg";
14+ };
15+
16+ preBuild = ''
17+ buildFlagsArray+=("-ldflags" "-X main.version=${version}")
18+ '';
19+
20+ meta = with lib; {
21+ description = "A utility to generate documentation from Terraform modules in various output formats";
22+ homepage = "https://github.com/segmentio/terraform-docs/";
23+ license = licenses.mit;
24+ maintainers = with maintainers; [ zimbatm ];
25+ };
26+}
pkgs/applications/networking/cluster/terraform-providers/data.nix+36−22
@@ -11,8 +11,8 @@
1111 {
1212 owner = "terraform-providers";
1313 repo = "terraform-provider-alicloud";
14− version = "1.23.0";
15− sha256 = "14hs58lqlj9vkmr4bxbyga8yz4h6mrx6zla587sqwgj5bjrg5vld";
14+ version = "1.25.0";
15+ sha256 = "09f0vdzkifj2mk1qccacpnlqiihbhhb2sfd21rpxbqscmj6a7vj1";
1616 };
1717 archive =
1818 {
@@ -39,8 +39,8 @@
3939 {
4040 owner = "terraform-providers";
4141 repo = "terraform-provider-aws";
42− version = "1.46.0";
43− sha256 = "1xp02cwyl9sf8swl7x3wah3bg0ssm7y0svq8bkfki6632nfw9vzi";
42+ version = "1.51.0";
43+ sha256 = "1hx4zbmwcbaslq2pj01m3y8b44gipw9gg235jsv7454nrd3jhvhg";
4444 };
4545 azurerm =
4646 {
@@ -137,8 +137,8 @@
137137 {
138138 owner = "terraform-providers";
139139 repo = "terraform-provider-datadog";
140− version = "1.5.0";
141− sha256 = "0wr44rqmg0hffgb2g4h03lk4pg9i244c13kyrc3m89b3biwdcydz";
140+ version = "1.6.0";
141+ sha256 = "16rp6kqax7i8fnl4id3sg0jmhjswx7wrnn1mp4z29gca46ji1nfh";
142142 };
143143 digitalocean =
144144 {
@@ -235,8 +235,8 @@
235235 {
236236 owner = "terraform-providers";
237237 repo = "terraform-provider-hcloud";
238− version = "1.5.0";
239− sha256 = "135h811qh1l1kn66n371f00b422xi4zw15cgs3id866za5cavxf3";
238+ version = "1.6.0";
239+ sha256 = "19kax1l2l6vr8cwgy14ahhafnvlxgkw86xx2g9ajfg70d0q4zs3g";
240240 };
241241 helm =
242242 {
@@ -270,8 +270,8 @@
270270 {
271271 owner = "terraform-providers";
272272 repo = "terraform-provider-icinga2";
273− version = "0.1.1";
274− sha256 = "0z7lxrspm33j7bkkm2n7ac0jgyaz3y3lql3gd30p10nvpilrg07v";
273+ version = "0.2.0";
274+ sha256 = "02ladn2w75k35vn8llj3zh9hbpnnnvpm47c9f29zshfs04acwbq0";
275275 };
276276 ignition =
277277 {
@@ -291,8 +291,8 @@
291291 {
292292 owner = "terraform-providers";
293293 repo = "terraform-provider-kubernetes";
294− version = "1.3.0";
295− sha256 = "0fhh0r92whcxqz4z2kb6qx9dyygms5mz7ifhb9c7s2r22jnfz1j3";
294+ version = "1.4.0";
295+ sha256 = "14bhqrpx0z4qn51xwcklafva46ipx05q6myy7xh5wf6wpjz69j9p";
296296 };
297297 librato =
298298 {
@@ -305,8 +305,8 @@
305305 {
306306 owner = "terraform-providers";
307307 repo = "terraform-provider-linode";
308− version = "1.2.0";
309− sha256 = "1wnl48qi8lhrxnrdgnhw7cb7mqv6141g4i648wb7cni5vlqy3i5l";
308+ version = "1.3.0";
309+ sha256 = "1683nkpq7wnc67pphablcmaifq2l1pz3gc9y5y9jbslllphy92v5";
310310 };
311311 local =
312312 {
@@ -396,8 +396,8 @@
396396 {
397397 owner = "terraform-providers";
398398 repo = "terraform-provider-oci";
399− version = "3.7.0";
400− sha256 = "10d8hvcr019cr8fh54klnr9xhi0y3l5w4nb2h9bny84nv2rznk38";
399+ version = "3.9.0";
400+ sha256 = "1mm6q9crn2izx1il6fk3mhi9is1zrrsy7rnldcj05bzyywnq3r97";
401401 };
402402 oneandone =
403403 {
@@ -459,8 +459,8 @@
459459 {
460460 owner = "terraform-providers";
461461 repo = "terraform-provider-pagerduty";
462− version = "1.2.0";
463− sha256 = "037mdcvpcpjj0dpwg0nny862j631ajhv472a847p2ajgk02bq1wf";
462+ version = "1.2.1";
463+ sha256 = "1b0fbzqalcxngnxk51afxkhs82bj68sjakvb28p0im0x1lblxj0n";
464464 };
465465 panos =
466466 {
@@ -536,8 +536,15 @@
536536 {
537537 owner = "terraform-providers";
538538 repo = "terraform-provider-scaleway";
539− version = "1.7.0";
540− sha256 = "0gsjvpwfw2sc6ncy8v3j6gs0aanq3b08j3gid43687mfd782f4gk";
539+ version = "1.8.0";
540+ sha256 = "1vr3im5jas7m3yn5529m6ghhx4lxf2lksqbznpwyi351sbsn4ji2";
541+ };
542+ selvpc =
543+ {
544+ owner = "terraform-providers";
545+ repo = "terraform-provider-selvpc";
546+ version = "0.3.0";
547+ sha256 = "1s1p0qa9x007hq26i4h0gcqpyx54jnwvg8d6ya044gm7gghhviz4";
541548 };
542549 softlayer =
543550 {
@@ -592,8 +599,8 @@
592599 {
593600 owner = "terraform-providers";
594601 repo = "terraform-provider-tfe";
595− version = "0.3.0";
596− sha256 = "125k1hgpzwlsgslnz2nwz4mc5yl3hqyg48xdcn7bxvmvaf6kw9gd";
602+ version = "0.4.0";
603+ sha256 = "02qvxc4ljb6s8bkw521wdsxhp53pmk7sbk3dyjbrwpz9xdg8dscn";
597604 };
598605 tls =
599606 {
@@ -651,4 +658,11 @@
651658 version = "0.0.1";
652659 sha256 = "00vz6qjq1pk39iqg4356b8g3c6slla9jifkv2knk46gc9q93q0lf";
653660 };
661+ secret =
662+ {
663+ owner = "tweag";
664+ repo = "terraform-provider-secret";
665+ version = "0.0.1";
666+ sha256 = "1mqs1il8y97hf9havcmxdfwjcpkrxa1hpkifzzy4rjc88m2m4q9r";
667+ };
654668}
pkgs/applications/networking/cluster/terraform-providers/providers.txt+4−1
@@ -7,10 +7,13 @@
77# <organisation>/<repo> - include only the named repository.
88
99# include all terraform-providers
10−terraform-providers terraform-provider- terraform-provider-\\(azure-classic\\|scaffolding\\|google-beta\\)
10+terraform-providers terraform-provider- terraform-provider-\\(azure-classic\\|scaffolding\\|google-beta\\|skytap\\)
1111
1212# include terraform-provider-matchbox
1313coreos/terraform-provider-matchbox
1414
1515# include terraform-provider-nixos
1616tweag/terraform-provider-nixos
17+
18+# include terraform-provider-secret
19+tweag/terraform-provider-secret
pkgs/applications/networking/instant-messengers/dino/default.nix+5−3
@@ -14,13 +14,13 @@
1414 }:
1515
1616stdenv.mkDerivation rec {
17− name = "dino-unstable-2018-11-27";
17+ name = "dino-unstable-2018-11-29";
1818
1919 src = fetchFromGitHub {
2020 owner = "dino";
2121 repo = "dino";
22− rev = "141db9e40a3a81cfa3ad3587dc47f69c541d0fde";
23− sha256 = "006r1x7drlz39jjxlfdnxgrnambw9amhl9jcgf6p1dx71h1x8221";
22+ rev = "680d28360c781ff29e810821801cfaba0493c526";
23+ sha256 = "1w08xc842p2nggdxf0dwqw8izhwsrqah10w3s0v1i7dp33yhycln";
2424 fetchSubmodules = true;
2525 };
2626
@@ -57,6 +57,8 @@ stdenv.mkDerivation rec {
5757 gettext
5858 ];
5959
60+ enableParallelBuilding = true;
61+
6062 meta = with stdenv.lib; {
6163 description = "Modern Jabber/XMPP Client using GTK+/Vala";
6264 homepage = https://github.com/dino/dino;
pkgs/applications/networking/instant-messengers/rambox/bare.nix+3−3
@@ -3,13 +3,13 @@
33
44stdenv.mkDerivation rec {
55 name = "rambox-bare-${version}";
6− version = "0.6.2";
6+ version = "0.6.3";
77
88 src = fetchFromGitHub {
99 owner = "ramboxapp";
1010 repo = "community-edition";
1111 rev = version;
12− sha256 = "150vf62cp739l9dgpnksgpkffabs2wi15q217m3nai34irhwzk8m";
12+ sha256 = "1ghk29d0x6i3j8b1b4xxgyf961lp17qsvvhnilnkh1nhmvxpwmw5";
1313 };
1414
1515 nativeBuildInputs = [ nodejs-8_x ruby sencha ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 inherit src;
1919
2020 nodejs = nodejs-8_x;
21− sha256 = "0hbw47653wh159c34f0rlj3p7xy0lvsyp0wh2hl35kv3fnsfbbm0";
21+ sha256 = "03h1kfiaflwbrvcd8v0bsymn7n2dxi3yj4pxkwcigqg4jgcf56k6";
2222 };
2323
2424 patches = [ ./isDev.patch ];
pkgs/applications/networking/instant-messengers/slack/default.nix+16−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, dpkg, makeWrapper
1+{ darkMode ? false, stdenv, fetchurl, dpkg, makeWrapper
22, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
33, gnome2, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango
44, systemd, xorg }:
@@ -88,6 +88,21 @@ in stdenv.mkDerivation {
8888 substituteInPlace $out/share/applications/slack.desktop \
8989 --replace /usr/bin/ $out/bin/ \
9090 --replace /usr/share/ $out/share/
91+ '' + stdenv.lib.optionalString darkMode ''
92+ cat <<EOF >> $out/lib/slack/resources/app.asar.unpacked/src/static/ssb-interop.js
93+ document.addEventListener('DOMContentLoaded', function() {
94+ let tt__customCss = ".menu ul li a:not(.inline_menu_link) {color: #fff !important;}"
95+ $.ajax({
96+ url: 'https://cdn.rawgit.com/laCour/slack-night-mode/master/css/raw/black.css',
97+ success: function(css) {
98+ \$("<style></style>").appendTo('head').html(css + tt__customCss);
99+ \$("<style></style>").appendTo('head').html('#reply_container.upload_in_threads .inline_message_input_container {background: padding-box #545454}');
100+ \$("<style></style>").appendTo('head').html('.p-channel_sidebar {background: #363636 !important}');
101+ \$("<style></style>").appendTo('head').html('#client_body:not(.onboarding):not(.feature_global_nav_layout):before {background: inherit;}');
102+ }
103+ });
104+ });
105+ EOF
91106 '';
92107
93108 meta = with stdenv.lib; {
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix+2−2
@@ -13,8 +13,8 @@ let
1313in {
1414 stable = mkTelegram stableVersion;
1515 preview = mkTelegram (stableVersion // {
16− version = "1.4.7";
17− sha256Hash = "00kjirikywdbigm4zdnm50s3wxfn9bw1yx13xz4k4ppz6amq9nrp";
16+ version = "1.4.8";
17+ sha256Hash = "0jn7nyvx5kmva418hi1x1awbycmhgk82gazx49kmdxspdd4nsrgj";
1818 stable = false;
1919 });
2020}
pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix+13−2
@@ -8,7 +8,15 @@
88
99with lib;
1010
11−mkDerivation rec {
11+let
12+ # TODO: Not optimal (maybe we should only package the stable versions)
13+ previewPatches = fetchFromGitHub {
14+ owner = "primeos";
15+ repo = "nixpkgs-tdesktop-patches";
16+ rev = "b3c0cbce1b412443a8712c90069932bbcae87fb6";
17+ sha256 = "1bymrciaci6plghaz7a6qwsidjm8rg5fqdh158cdp70il4g7kmw9";
18+ };
19+in mkDerivation rec {
1220 name = "telegram-desktop-${version}";
1321 inherit version;
1422
@@ -29,7 +37,10 @@ mkDerivation rec {
2937 };
3038
3139 # TODO: libtgvoip.patch no-gtk2.patch
32− patches = [ "${archPatches}/tdesktop.patch" ]
40+ patches =
41+ (if stable
42+ then [ "${archPatches}/tdesktop.patch" ]
43+ else [ "${previewPatches}/tdesktop.patch" ])
3344 # TODO: Only required to work around a compiler bug.
3445 # This should be fixed in GCC 7.3.1 (or later?)
3546 ++ [ ./fix-internal-compiler-error.patch ];
pkgs/applications/networking/instant-messengers/zoom-us/default.nix+2−2
@@ -13,11 +13,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
1313let
1414 inherit (stdenv.lib) concatStringsSep makeBinPath optional;
1515
16− version = "2.4.129780.0915";
16+ version = "2.5.146186.1130";
1717 srcs = {
1818 x86_64-linux = fetchurl {
1919 url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
20− sha256 = "0s4014ymc92rwpagcwjhmwwfz0vq35wiq2nhh6nlxcrr6jl4wd78";
20+ sha256 = "1644xs7xg8a27xg7bgb7856hvlvfh2lin749alds782i52p9rsjr";
2121 };
2222 };
2323
pkgs/applications/networking/irc/weechat/default.nix+2−73
@@ -2,7 +2,6 @@
22, ncurses, openssl, aspell, gnutls
33, zlib, curl, pkgconfig, libgcrypt
44, cmake, makeWrapper, libobjc, libresolv, libiconv
5−, writeScriptBin # for withPlugins
65, asciidoctor # manpages
76, guileSupport ? true, guile
87, luaSupport ? true, lua5
@@ -11,8 +10,6 @@
1110, rubySupport ? true, ruby
1211, tclSupport ? true, tcl
1312, extraBuildInputs ? []
14−, configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; }
15−, runCommand, buildEnv
1613}:
1714
1815let
@@ -27,7 +24,7 @@ let
2724 ];
2825 enabledPlugins = builtins.filter (p: p.enabled) plugins;
2926
30− weechat =
27+ in
3128 assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
3229 stdenv.mkDerivation rec {
3330 version = "2.3";
@@ -82,72 +79,4 @@ let
8279 maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny lheckemann ma27 ];
8380 platforms = stdenv.lib.platforms.unix;
8481 };
85− };
86−in if configure == null then weechat else
87− let
88− perlInterpreter = perl;
89− availablePlugins = let
90− simplePlugin = name: {pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so";};
91− in rec {
92− python = {
93− pluginFile = "${weechat.python}/lib/weechat/plugins/python.so";
94− withPackages = pkgsFun: (python // {
95− extraEnv = ''
96− export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}"
97− '';
98− });
99− };
100− perl = (simplePlugin "perl") // {
101− extraEnv = ''
102− export PATH="${perlInterpreter}/bin:$PATH"
103− '';
104− withPackages = pkgsFun: (perl // {
105− extraEnv = ''
106− ${perl.extraEnv}
107− export PERL5LIB=${lib.makeFullPerlPath (pkgsFun perlPackages)}
108− '';
109− });
110− };
111− tcl = simplePlugin "tcl";
112− ruby = simplePlugin "ruby";
113− guile = simplePlugin "guile";
114− lua = simplePlugin "lua";
115− };
116−
117− config = configure { inherit availablePlugins; };
118−
119− plugins = config.plugins or (builtins.attrValues availablePlugins);
120−
121− pluginsDir = runCommand "weechat-plugins" {} ''
122− mkdir -p $out/plugins
123− for plugin in ${lib.concatMapStringsSep " " (p: p.pluginFile) plugins} ; do
124− ln -s $plugin $out/plugins
125− done
126− '';
127−
128− init = let
129− init = builtins.replaceStrings [ "\n" ] [ ";" ] (config.init or "");
130−
131− mkScript = drv: lib.flip map drv.scripts (script: "/script load ${drv}/share/${script}");
132−
133− scripts = builtins.concatStringsSep ";" (lib.foldl (scripts: drv: scripts ++ mkScript drv)
134− [ ] (config.scripts or []));
135− in "${scripts};${init}";
136−
137− mkWeechat = bin: (writeScriptBin bin ''
138− #!${stdenv.shell}
139− export WEECHAT_EXTRA_LIBDIR=${pluginsDir}
140− ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
141− exec ${weechat}/bin/${bin} "$@" --run-command ${lib.escapeShellArg init}
142− '') // {
143− inherit (weechat) name meta;
144− unwrapped = weechat;
145− };
146− in buildEnv {
147− name = "weechat-bin-env-${weechat.version}";
148− paths = [
149− (mkWeechat "weechat")
150− (mkWeechat "weechat-headless")
151− ];
152− meta = weechat.meta;
153− }
82+ }
pkgs/applications/networking/irc/weechat/wrapper.nixnew file+80
@@ -0,0 +1,80 @@
1+{ stdenv, lib, runCommand, writeScriptBin, buildEnv
2+, pythonPackages, perl, perlPackages
3+}:
4+
5+weechat:
6+
7+let
8+ wrapper = {
9+ configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; }
10+ }:
11+
12+ let
13+ perlInterpreter = perl;
14+ availablePlugins = let
15+ simplePlugin = name: {pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so";};
16+ in rec {
17+ python = {
18+ pluginFile = "${weechat.python}/lib/weechat/plugins/python.so";
19+ withPackages = pkgsFun: (python // {
20+ extraEnv = ''
21+ export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}"
22+ '';
23+ });
24+ };
25+ perl = (simplePlugin "perl") // {
26+ extraEnv = ''
27+ export PATH="${perlInterpreter}/bin:$PATH"
28+ '';
29+ withPackages = pkgsFun: (perl // {
30+ extraEnv = ''
31+ ${perl.extraEnv}
32+ export PERL5LIB=${lib.makeFullPerlPath (pkgsFun perlPackages)}
33+ '';
34+ });
35+ };
36+ tcl = simplePlugin "tcl";
37+ ruby = simplePlugin "ruby";
38+ guile = simplePlugin "guile";
39+ lua = simplePlugin "lua";
40+ };
41+
42+ config = configure { inherit availablePlugins; };
43+
44+ plugins = config.plugins or (builtins.attrValues availablePlugins);
45+
46+ pluginsDir = runCommand "weechat-plugins" {} ''
47+ mkdir -p $out/plugins
48+ for plugin in ${lib.concatMapStringsSep " " (p: p.pluginFile) plugins} ; do
49+ ln -s $plugin $out/plugins
50+ done
51+ '';
52+
53+ init = let
54+ init = builtins.replaceStrings [ "\n" ] [ ";" ] (config.init or "");
55+
56+ mkScript = drv: lib.flip map drv.scripts (script: "/script load ${drv}/share/${script}");
57+
58+ scripts = builtins.concatStringsSep ";" (lib.foldl (scripts: drv: scripts ++ mkScript drv)
59+ [ ] (config.scripts or []));
60+ in "${scripts};${init}";
61+
62+ mkWeechat = bin: (writeScriptBin bin ''
63+ #!${stdenv.shell}
64+ export WEECHAT_EXTRA_LIBDIR=${pluginsDir}
65+ ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
66+ exec ${weechat}/bin/${bin} "$@" --run-command ${lib.escapeShellArg init}
67+ '') // {
68+ inherit (weechat) name meta;
69+ unwrapped = weechat;
70+ };
71+ in buildEnv {
72+ name = "weechat-bin-env-${weechat.version}";
73+ paths = [
74+ (mkWeechat "weechat")
75+ (mkWeechat "weechat-headless")
76+ ];
77+ meta = weechat.meta;
78+ };
79+
80+in lib.makeOverridable wrapper
pkgs/applications/networking/mailreaders/balsa/default.nix+4−3
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk3, gmime, gnutls,
2− webkitgtk, libesmtp, openssl, libnotify, enchant, gpgme,
3− libcanberra-gtk3, libsecret, gtksourceview, gobject-introspection,
2+ webkitgtk, libesmtp, openssl, libnotify, gtkspell3, gpgme,
3+ libcanberra-gtk3, libsecret, gtksourceview, gobjectIntrospection,
44 hicolor-icon-theme, wrapGAppsHook
55}:
66
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 webkitgtk
3030 openssl
3131 libnotify
32− enchant
32+ gtkspell3
3333 gpgme
3434 libcanberra-gtk3
3535 gtksourceview
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
4545 "--with-ssl"
4646 "--with-unique"
4747 "--without-gnome"
48+ "--with-spell-checker=gtkspell"
4849 ];
4950
5051 NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
pkgs/applications/networking/remote/x2goclient/default.nix+9−10
@@ -1,21 +1,20 @@
1−{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, openssh,
2−makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon }:
1+{ stdenv, fetchgit, cups, libssh, libXpm, nxproxy, openldap, openssh
2+, makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon, pkgconfig }:
33
44stdenv.mkDerivation rec {
5− name = "x2goclient-${version}";
6− version = "4.1.2.1";
5+ pname = "x2goclient";
6+ version = "unstable-2018-11-30";
77
8− src = fetchurl {
9− url = "https://code.x2go.org/releases/source/x2goclient/${name}.tar.gz";
10− sha256 = "1bzjzz2m9bqqndnk1p9p522cfapsqgkb0wllvqj9d4ir18grh60w";
8+ src = fetchgit {
9+ url = "git://code.x2go.org/x2goclient.git";
10+ rev = "659655675f11ffd361ab9fb48fa77a01a1536fe8";
11+ sha256 = "05gfs11m259bchy3k0ihqpwg9wf8lp94rbca5dzla9fjzrb7pyy4";
1112 };
1213
1314 buildInputs = [ cups libssh libXpm nxproxy openldap openssh
14− qtbase qtsvg qtx11extras qttools phonon ];
15+ qtbase qtsvg qtx11extras qttools phonon pkgconfig ];
1516 nativeBuildInputs = [ makeWrapper ];
1617
17− patches = [ ./qt511.patch ];
18−
1918 postPatch = ''
2019 substituteInPlace Makefile \
2120 --replace "SHELL=/bin/bash" "SHELL=$SHELL" \
pkgs/applications/networking/remote/x2goclient/qt511.patchdeleted−15
@@ -1,15 +0,0 @@
1−diff --git a/src/printwidget.cpp b/src/printwidget.cpp
2−index 58a8af7..131d340 100644
3−--- a/src/printwidget.cpp
4−+++ b/src/printwidget.cpp
5−@@ -23,6 +23,7 @@
6− #include "x2gosettings.h"
7− #include "x2gologdebug.h"
8− #include <QDir>
9−+#include <QButtonGroup>
10− #ifdef Q_OS_WIN
11− #include "wapi.h"
12− #endif
13−--
14−2.17.1
15−
pkgs/applications/networking/seafile-client/default.nix+2−2
@@ -5,14 +5,14 @@
55with stdenv.lib;
66
77stdenv.mkDerivation rec {
8− version = "6.2.7";
8+ version = "6.2.8";
99 name = "seafile-client-${version}";
1010
1111 src = fetchFromGitHub {
1212 owner = "haiwen";
1313 repo = "seafile-client";
1414 rev = "v${version}";
15− sha256 = "16ikl6vkp9v16608bq2sfg48idn2p7ik3q8n6j866zxkmgdvkpsg";
15+ sha256 = "1y57cw789cmssgl39kj94q259kba08v5i1yc1cmx7qxyigrpwyv6";
1616 };
1717
1818 nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
pkgs/applications/version-management/gitea/default.nix+2−2
@@ -7,13 +7,13 @@ with stdenv.lib;
77
88buildGoPackage rec {
99 name = "gitea-${version}";
10− version = "1.5.3";
10+ version = "1.6.0";
1111
1212 src = fetchFromGitHub {
1313 owner = "go-gitea";
1414 repo = "gitea";
1515 rev = "v${version}";
16− sha256 = "1f8cbsd3kn4v2a6c57rwh9slgvss7gnxs96yhcy2ddwyycf6i04d";
16+ sha256 = "01nqf8pnpa0n72brqh499z15rys6f0ck7l2cnpbiqgg3kir8b21p";
1717 # Required to generate the same checksum on MacOS due to unicode encoding differences
1818 # More information: https://github.com/NixOS/nixpkgs/pull/48128
1919 extraPostFetch = ''
pkgs/applications/version-management/gitlab/data.json+14−14
@@ -1,32 +1,32 @@
11{
22 "ce": {
3− "version": "11.5.0",
4− "repo_hash": "0cjkkap3n9g9zahrxk99a330ahyb6cvx97dsnrxcdsn0cbrsxsrb",
5− "deb_hash": "0kn7mg1lk4gvc3x76z4rbh0j03b0wk6x1p5938wx8sc50k0bgrcp",
6− "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.5.0-ce.0_amd64.deb/download.deb",
3+ "version": "11.5.1",
4+ "repo_hash": "0drfan4yncvpcbmmb0lcr1zgk2bav2bzza70mwv3a65habhsy0x5",
5+ "deb_hash": "04v5xqimj985718csjzfx7rmnmbfbrm2bp05i4s3x7byrzkl8w9d",
6+ "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.5.1-ce.0_amd64.deb/download.deb",
77 "owner": "gitlab-org",
88 "repo": "gitlab-ce",
9− "rev": "v11.5.0",
9+ "rev": "v11.5.1",
1010 "passthru": {
1111 "GITALY_SERVER_VERSION": "0.129.0",
12− "GITLAB_PAGES_VERSION": "1.3.0",
12+ "GITLAB_PAGES_VERSION": "1.3.1",
1313 "GITLAB_SHELL_VERSION": "8.4.1",
14− "GITLAB_WORKHORSE_VERSION": "7.1.0"
14+ "GITLAB_WORKHORSE_VERSION": "7.1.3"
1515 }
1616 },
1717 "ee": {
18− "version": "11.5.0",
19− "repo_hash": "1s2jr7vhbpklpcfjxgxnmq0zq14hh2aa6akdsb7ld7fj5lmzp00z",
20− "deb_hash": "108mgmlf947h200qrwg71ilhq5ihr4awxns6lqs2wa90ph9yq25c",
21− "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.5.0-ee.0_amd64.deb/download.deb",
18+ "version": "11.5.1",
19+ "repo_hash": "150f7lnci88d821qxxla0dhwly3w59s3yzgvakzfc6p6iy07m9jp",
20+ "deb_hash": "0gg3p4r6xscilw6igjk6l9mcxj3d7npnzg872r5y44p0q8faafhg",
21+ "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.5.1-ee.0_amd64.deb/download.deb",
2222 "owner": "gitlab-org",
2323 "repo": "gitlab-ee",
24− "rev": "v11.5.0-ee",
24+ "rev": "v11.5.1-ee",
2525 "passthru": {
2626 "GITALY_SERVER_VERSION": "0.129.0",
27− "GITLAB_PAGES_VERSION": "1.3.0",
27+ "GITLAB_PAGES_VERSION": "1.3.1",
2828 "GITLAB_SHELL_VERSION": "8.4.1",
29− "GITLAB_WORKHORSE_VERSION": "7.1.0"
29+ "GITLAB_WORKHORSE_VERSION": "7.1.3"
3030 }
3131 }
3232}
pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch+1−1
@@ -25,7 +25,7 @@ index 435cb29..078c1df 100644
2525
2626 func NewFromDir(dir string) (*Config, error) {
2727- return newFromFile(path.Join(dir, configFile))
28−+ return newFromFile(path.Join(dir, "shell-config.yml"))
28++ return newFromFile("/run/gitlab/shell-config.yml")
2929 }
3030
3131 func newFromFile(filename string) (*Config, error) {
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix+2−2
@@ -3,13 +3,13 @@
33stdenv.mkDerivation rec {
44 name = "gitlab-workhorse-${version}";
55
6− version = "7.1.0";
6+ version = "7.1.3";
77
88 src = fetchFromGitLab {
99 owner = "gitlab-org";
1010 repo = "gitlab-workhorse";
1111 rev = "v${version}";
12− sha256 = "1jq28z2kf58wnbv8jkwfx2bm8ki22hpm9ssdy2ymza22gq0zx00g";
12+ sha256 = "1r75jj0xb4jv5fq2ihxk0vlv43gsk523zx86076mwph1g75gi1nz";
1313 };
1414
1515 buildInputs = [ git go ];
pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile+10−18
@@ -79,13 +79,6 @@ gem 'gpgme'
7979gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
8080gem 'net-ldap'
8181
82−# Git Wiki
83−# Only used to compute wiki page slugs
84−gem 'gitlab-gollum-lib', '~> 4.2', require: false
85−
86−# Language detection
87−gem 'github-linguist', '~> 5.3.3', require: 'linguist'
88−
8982# API
9083gem 'grape', '~> 1.1'
9184gem 'grape-entity', '~> 0.7.1'
@@ -146,6 +139,7 @@ gem 'rouge', '~> 3.1'
146139gem 'truncato', '~> 0.7.9'
147140gem 'bootstrap_form', '~> 2.7.0'
148141gem 'nokogiri', '~> 1.8.2'
142+gem 'escape_utils', '~> 1.1'
149143
150144# Calendar rendering
151145gem 'icalendar'
@@ -159,6 +153,11 @@ group :unicorn do
159153 gem 'unicorn-worker-killer', '~> 0.4.4'
160154end
161155
156+group :puma do
157+ gem 'puma', '~> 3.12', require: false
158+ gem 'puma_worker_killer', require: false
159+end
160+
162161# State machine
163162gem 'state_machines-activerecord', '~> 0.5.1'
164163
@@ -212,7 +211,7 @@ gem 'hipchat', '~> 1.5.0'
212211gem 'jira-ruby', '~> 1.4'
213212
214213# Flowdock integration
215−gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
214+gem 'flowdock', '~> 0.7'
216215
217216# Slack integration
218217gem 'slack-notifier', '~> 1.5.1'
@@ -245,9 +244,6 @@ gem 'rack-attack', '~> 4.4.1'
245244# Ace editor
246245gem 'ace-rails-ap', '~> 4.1.0'
247246
248−# Keyboard shortcuts
249−gem 'mousetrap-rails', '~> 1.4.6'
250−
251247# Detect and convert string character encoding
252248gem 'charlock_holmes', '~> 0.7.5'
253249
@@ -420,11 +416,10 @@ group :ed25519 do
420416end
421417
422418# Gitaly GRPC client
423−gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly'
424−gem 'grpc', '~> 1.11.0'
419+gem 'gitaly-proto', '~> 0.123.0', require: 'gitaly'
420+gem 'grpc', '~> 1.15.0'
425421
426−# Locked until https://github.com/google/protobuf/issues/4210 is closed
427−gem 'google-protobuf', '= 3.5.1'
422+gem 'google-protobuf', '~> 3.6'
428423
429424gem 'toml-rb', '~> 1.0.0', require: false
430425
@@ -436,6 +431,3 @@ gem 'flipper-active_support_cache_store', '~> 0.13.0'
436431# Structured logging
437432gem 'lograge', '~> 0.5'
438433gem 'grape_logging', '~> 1.7'
439−
440−# Asset synchronization
441−gem 'asset_sync', '~> 2.4'
pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock+23−59
@@ -58,11 +58,6 @@ GEM
5858 asciidoctor (1.5.6.2)
5959 asciidoctor-plantuml (0.0.8)
6060 asciidoctor (~> 1.5)
61− asset_sync (2.4.0)
62− activemodel (>= 4.1.0)
63− fog-core
64− mime-types (>= 2.99)
65− unf
6661 ast (2.4.0)
6762 atomic (1.1.99)
6863 attr_encrypted (3.1.0)
@@ -274,32 +269,9 @@ GEM
274269 gettext_i18n_rails (>= 0.7.1)
275270 po_to_json (>= 1.0.0)
276271 rails (>= 3.2.0)
277− gitaly-proto (0.118.1)
278− google-protobuf (~> 3.1)
279− grpc (~> 1.10)
280− github-linguist (5.3.3)
281− charlock_holmes (~> 0.7.5)
282− escape_utils (~> 1.1.0)
283− mime-types (>= 1.19)
284− rugged (>= 0.25.1)
272+ gitaly-proto (0.123.0)
273+ grpc (~> 1.0)
285274 github-markup (1.7.0)
286− gitlab-flowdock-git-hook (1.0.1)
287− flowdock (~> 0.7)
288− gitlab-grit (>= 2.4.1)
289− multi_json
290− gitlab-gollum-lib (4.2.7.5)
291− gemojione (~> 3.2)
292− github-markup (~> 1.6)
293− gollum-grit_adapter (~> 1.0)
294− nokogiri (>= 1.6.1, < 2.0)
295− rouge (~> 3.1)
296− sanitize (~> 4.6.4)
297− stringex (~> 2.6)
298− gitlab-grit (2.8.2)
299− charlock_holmes (~> 0.6)
300− diff-lcs (~> 1.1)
301− mime-types (>= 1.16)
302− posix-spawn (~> 0.3)
303275 gitlab-markup (1.6.4)
304276 gitlab-sidekiq-fetcher (0.3.0)
305277 sidekiq (~> 5)
@@ -314,8 +286,6 @@ GEM
314286 rubyntlm (~> 0.5)
315287 globalid (0.4.1)
316288 activesupport (>= 4.2.0)
317− gollum-grit_adapter (1.0.1)
318− gitlab-grit (~> 2.7, >= 2.7.1)
319289 gon (6.2.0)
320290 actionpack (>= 3.0)
321291 multi_json
@@ -327,16 +297,15 @@ GEM
327297 mime-types (~> 3.0)
328298 representable (~> 3.0)
329299 retriable (>= 2.0, < 4.0)
330− google-protobuf (3.5.1)
331− googleapis-common-protos-types (1.0.1)
300+ google-protobuf (3.6.1)
301+ googleapis-common-protos-types (1.0.2)
332302 google-protobuf (~> 3.0)
333− googleauth (0.6.2)
303+ googleauth (0.6.6)
334304 faraday (~> 0.12)
335305 jwt (>= 1.4, < 3.0)
336− logging (~> 2.0)
337306 memoist (~> 0.12)
338307 multi_json (~> 1.11)
339− os (~> 0.9)
308+ os (>= 0.9, < 2.0)
340309 signet (~> 0.7)
341310 gpgme (2.0.13)
342311 mini_portile2 (~> 2.1)
@@ -360,10 +329,9 @@ GEM
360329 railties
361330 sprockets-rails
362331 graphql (1.8.1)
363− grpc (1.11.0)
332+ grpc (1.15.0)
364333 google-protobuf (~> 3.1)
365334 googleapis-common-protos-types (~> 1.0.0)
366− googleauth (>= 0.5.1, < 0.7)
367335 haml (5.0.4)
368336 temple (>= 0.8.0)
369337 tilt
@@ -465,11 +433,7 @@ GEM
465433 xml-simple
466434 licensee (8.9.2)
467435 rugged (~> 0.24)
468− little-plugger (1.1.4)
469436 locale (2.1.2)
470− logging (2.2.2)
471− little-plugger (~> 1.1)
472− multi_json (~> 1.10)
473437 lograge (0.10.0)
474438 actionpack (>= 4)
475439 activesupport (>= 4)
@@ -493,7 +457,6 @@ GEM
493457 mini_mime (1.0.1)
494458 mini_portile2 (2.3.0)
495459 minitest (5.7.0)
496− mousetrap-rails (1.4.6)
497460 msgpack (1.2.4)
498461 multi_json (1.13.1)
499462 multi_xml (0.6.0)
@@ -575,9 +538,9 @@ GEM
575538 org-ruby (0.9.12)
576539 rubypants (~> 0.2)
577540 orm_adapter (0.5.0)
578− os (0.9.6)
541+ os (1.0.0)
579542 parallel (1.12.1)
580− parser (2.5.1.0)
543+ parser (2.5.3.0)
581544 ast (~> 2.4.0)
582545 parslet (1.8.2)
583546 peek (1.0.1)
@@ -605,7 +568,6 @@ GEM
605568 pg (0.18.4)
606569 po_to_json (1.0.1)
607570 json (>= 1.6.0)
608− posix-spawn (0.3.13)
609571 powerpack (0.1.1)
610572 premailer (1.10.4)
611573 addressable
@@ -629,6 +591,10 @@ GEM
629591 pry-rails (0.3.6)
630592 pry (>= 0.10.4)
631593 public_suffix (3.0.3)
594+ puma (3.12.0)
595+ puma_worker_killer (0.1.0)
596+ get_process_mem (~> 0.2)
597+ puma (>= 2.7, < 4)
632598 pyu-ruby-sasl (0.0.3.3)
633599 rack (1.6.11)
634600 rack-accept (0.4.5)
@@ -797,7 +763,7 @@ GEM
797763 rubyzip (1.2.2)
798764 rufus-scheduler (3.4.0)
799765 et-orbi (~> 1.0)
800− rugged (0.27.4)
766+ rugged (0.27.5)
801767 safe_yaml (1.0.4)
802768 sanitize (4.6.6)
803769 crass (~> 1.0.2)
@@ -843,7 +809,7 @@ GEM
843809 sidekiq-cron (0.6.0)
844810 rufus-scheduler (>= 3.3.0)
845811 sidekiq (>= 4.2.1)
846− signet (0.8.1)
812+ signet (0.11.0)
847813 addressable (~> 2.3)
848814 faraday (~> 0.9)
849815 jwt (>= 1.5, < 3.0)
@@ -876,7 +842,6 @@ GEM
876842 state_machines-activerecord (0.5.1)
877843 activerecord (>= 4.1, < 6.0)
878844 state_machines-activemodel (>= 0.5.0)
879− stringex (2.8.4)
880845 sys-filesystem (1.1.6)
881846 ffi
882847 sysexits (1.2.0)
@@ -968,7 +933,6 @@ DEPENDENCIES
968933 asana (~> 0.6.0)
969934 asciidoctor (~> 1.5.6)
970935 asciidoctor-plantuml (= 0.0.8)
971− asset_sync (~> 2.4)
972936 attr_encrypted (~> 3.1.0)
973937 awesome_print
974938 babosa (~> 1.0.2)
@@ -1006,6 +970,7 @@ DEPENDENCIES
1006970 ed25519 (~> 1.2)
1007971 email_reply_trimmer (~> 0.1)
1008972 email_spec (~> 2.2.0)
973+ escape_utils (~> 1.1)
1009974 factory_bot_rails (~> 4.8.2)
1010975 faraday (~> 0.12)
1011976 fast_blank
@@ -1013,6 +978,7 @@ DEPENDENCIES
1013978 flipper (~> 0.13.0)
1014979 flipper-active_record (~> 0.13.0)
1015980 flipper-active_support_cache_store (~> 0.13.0)
981+ flowdock (~> 0.7)
1016982 fog-aliyun (~> 0.2.0)
1017983 fog-aws (~> 2.0.1)
1018984 fog-core (~> 1.44)
@@ -1027,18 +993,15 @@ DEPENDENCIES
1027993 gettext (~> 3.2.2)
1028994 gettext_i18n_rails (~> 1.8.0)
1029995 gettext_i18n_rails_js (~> 1.3)
1030− gitaly-proto (~> 0.118.1)
1031− github-linguist (~> 5.3.3)
996+ gitaly-proto (~> 0.123.0)
1032997 github-markup (~> 1.7.0)
1033− gitlab-flowdock-git-hook (~> 1.0.1)
1034− gitlab-gollum-lib (~> 4.2)
1035998 gitlab-markup (~> 1.6.4)
1036999 gitlab-sidekiq-fetcher
10371000 gitlab-styles (~> 2.4)
10381001 gitlab_omniauth-ldap (~> 2.0.4)
10391002 gon (~> 6.2)
10401003 google-api-client (~> 0.23)
1041− google-protobuf (= 3.5.1)
1004+ google-protobuf (~> 3.6)
10421005 gpgme
10431006 grape (~> 1.1)
10441007 grape-entity (~> 0.7.1)
@@ -1046,7 +1009,7 @@ DEPENDENCIES
10461009 grape_logging (~> 1.7)
10471010 graphiql-rails (~> 1.4.10)
10481011 graphql (~> 1.8.0)
1049− grpc (~> 1.11.0)
1012+ grpc (~> 1.15.0)
10501013 haml_lint (~> 0.26.0)
10511014 hamlit (~> 2.8.8)
10521015 hangouts-chat (~> 0.0.5)
@@ -1075,7 +1038,6 @@ DEPENDENCIES
10751038 method_source (~> 0.8)
10761039 mini_magick
10771040 minitest (~> 5.7.0)
1078− mousetrap-rails (~> 1.4.6)
10791041 mysql2 (~> 0.4.10)
10801042 net-ldap
10811043 net-ssh (~> 5.0)
@@ -1109,6 +1071,8 @@ DEPENDENCIES
11091071 prometheus-client-mmap (~> 0.9.4)
11101072 pry-byebug (~> 3.4.1)
11111073 pry-rails (~> 0.3.4)
1074+ puma (~> 3.12)
1075+ puma_worker_killer
11121076 rack-attack (~> 4.4.1)
11131077 rack-cors (~> 1.0.0)
11141078 rack-oauth2 (~> 1.2.1)
@@ -1187,4 +1151,4 @@ DEPENDENCIES
11871151 wikicloth (= 0.8.1)
11881152
11891153BUNDLED WITH
1190− 1.16.4
1154+ 1.17.1
pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix+38−116
@@ -164,15 +164,6 @@
164164 };
165165 version = "0.0.8";
166166 };
167− asset_sync = {
168− dependencies = ["activemodel" "fog-core" "mime-types" "unf"];
169− source = {
170− remotes = ["https://rubygems.org"];
171− sha256 = "0wjd662yyg72dwwc6cav7gk2bjv9nkhn056f03h8zmyank451hdf";
172− type = "gem";
173− };
174− version = "2.4.0";
175− };
176167 ast = {
177168 source = {
178169 remotes = ["https://rubygems.org"];
@@ -1066,22 +1057,13 @@
10661057 version = "1.3.0";
10671058 };
10681059 gitaly-proto = {
1069− dependencies = ["google-protobuf" "grpc"];
1070− source = {
1071− remotes = ["https://rubygems.org"];
1072− sha256 = "19nyx75xnb3lsap6rr3p1avqsw1dcrm8d3ggmmihd58a9s762fki";
1073− type = "gem";
1074− };
1075− version = "0.118.1";
1076− };
1077− github-linguist = {
1078− dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
1060+ dependencies = ["grpc"];
10791061 source = {
10801062 remotes = ["https://rubygems.org"];
1081− sha256 = "0kgashbqpypv329m63b85ri1dx0gppwd0832hvwh124lk5b19drk";
1063+ sha256 = "16b9sdaimhcda401z2s7apf0nz6y0lxs74xhkwlz4jzf6ms44mgg";
10821064 type = "gem";
10831065 };
1084− version = "5.3.3";
1066+ version = "0.123.0";
10851067 };
10861068 github-markup = {
10871069 source = {
@@ -1091,33 +1073,6 @@
10911073 };
10921074 version = "1.7.0";
10931075 };
1094− gitlab-flowdock-git-hook = {
1095− dependencies = ["flowdock" "gitlab-grit" "multi_json"];
1096− source = {
1097− remotes = ["https://rubygems.org"];
1098− sha256 = "1s3a10cdbh4xy732b92zcsm5zyc1lhi5v29d76j8mwbqmj11a2p8";
1099− type = "gem";
1100− };
1101− version = "1.0.1";
1102− };
1103− gitlab-gollum-lib = {
1104− dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
1105− source = {
1106− remotes = ["https://rubygems.org"];
1107− sha256 = "15h6a7lsfkm967d5dhjlbcm2lnl1l9akzvaq92qlxq40r5apw0kn";
1108− type = "gem";
1109− };
1110− version = "4.2.7.5";
1111− };
1112− gitlab-grit = {
1113− dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
1114− source = {
1115− remotes = ["https://rubygems.org"];
1116− sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4";
1117− type = "gem";
1118− };
1119− version = "2.8.2";
1120− };
11211076 gitlab-markup = {
11221077 source = {
11231078 remotes = ["https://rubygems.org"];
@@ -1162,15 +1117,6 @@
11621117 };
11631118 version = "0.4.1";
11641119 };
1165− gollum-grit_adapter = {
1166− dependencies = ["gitlab-grit"];
1167− source = {
1168− remotes = ["https://rubygems.org"];
1169− sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b";
1170− type = "gem";
1171− };
1172− version = "1.0.1";
1173− };
11741120 gon = {
11751121 dependencies = ["actionpack" "multi_json" "request_store"];
11761122 source = {
@@ -1192,28 +1138,28 @@
11921138 google-protobuf = {
11931139 source = {
11941140 remotes = ["https://rubygems.org"];
1195− sha256 = "0s8ijd9wdrkqwsb6nasrsv7f9i5im2nyax7f7jlb5y9vh8nl98qi";
1141+ sha256 = "134d3ini9ymdwxpz445m28ss9x0m6vcpijcdkzvgk4n538wdmppf";
11961142 type = "gem";
11971143 };
1198− version = "3.5.1";
1144+ version = "3.6.1";
11991145 };
12001146 googleapis-common-protos-types = {
12011147 dependencies = ["google-protobuf"];
12021148 source = {
12031149 remotes = ["https://rubygems.org"];
1204− sha256 = "0yf10s7w8wpa49hc86z7z2fkn9yz7j2njz0n8xmqb24ji090z4ck";
1150+ sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq";
12051151 type = "gem";
12061152 };
1207− version = "1.0.1";
1153+ version = "1.0.2";
12081154 };
12091155 googleauth = {
1210− dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"];
1156+ dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
12111157 source = {
12121158 remotes = ["https://rubygems.org"];
1213− sha256 = "08z4zfj9cwry13y8c2w5p4xylyslxxjq4wahd95bk1ddl5pknd4f";
1159+ sha256 = "1747p1dhpvz76i98xnjrvaj785y1232svm0nc8g9by6pz835gp2l";
12141160 type = "gem";
12151161 };
1216− version = "0.6.2";
1162+ version = "0.6.6";
12171163 };
12181164 gpgme = {
12191165 dependencies = ["mini_portile2"];
@@ -1278,13 +1224,13 @@
12781224 version = "1.8.1";
12791225 };
12801226 grpc = {
1281− dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"];
1227+ dependencies = ["google-protobuf" "googleapis-common-protos-types"];
12821228 source = {
12831229 remotes = ["https://rubygems.org"];
1284− sha256 = "1is4czi3i7y6zyxzyrpsma1z91axmc0jz2ngr6ckixqd3629npkz";
1230+ sha256 = "0m2wspnm1cfkmhlbp7yqv5bb4vsfh246cm0aavxra67aw4l8plhb";
12851231 type = "gem";
12861232 };
1287− version = "1.11.0";
1233+ version = "1.15.0";
12881234 };
12891235 haml = {
12901236 dependencies = ["temple" "tilt"];
@@ -1649,14 +1595,6 @@
16491595 };
16501596 version = "8.9.2";
16511597 };
1652− little-plugger = {
1653− source = {
1654− remotes = ["https://rubygems.org"];
1655− sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym";
1656− type = "gem";
1657− };
1658− version = "1.1.4";
1659− };
16601598 locale = {
16611599 source = {
16621600 remotes = ["https://rubygems.org"];
@@ -1665,15 +1603,6 @@
16651603 };
16661604 version = "2.1.2";
16671605 };
1668− logging = {
1669− dependencies = ["little-plugger" "multi_json"];
1670− source = {
1671− remotes = ["https://rubygems.org"];
1672− sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn";
1673− type = "gem";
1674− };
1675− version = "2.2.2";
1676− };
16771606 lograge = {
16781607 dependencies = ["actionpack" "activesupport" "railties" "request_store"];
16791608 source = {
@@ -1791,14 +1720,6 @@
17911720 };
17921721 version = "5.7.0";
17931722 };
1794− mousetrap-rails = {
1795− source = {
1796− remotes = ["https://rubygems.org"];
1797− sha256 = "00n13r5pwrk4vq018128vcfh021dw0fa2bk4pzsv0fslfm8ayp2m";
1798− type = "gem";
1799− };
1800− version = "1.4.6";
1801− };
18021723 msgpack = {
18031724 source = {
18041725 remotes = ["https://rubygems.org"];
@@ -2114,10 +2035,10 @@
21142035 os = {
21152036 source = {
21162037 remotes = ["https://rubygems.org"];
2117− sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz";
2038+ sha256 = "1s401gvhqgs2r8hh43ia205mxsy1wc0ib4k76wzkdpspfcnfr1rk";
21182039 type = "gem";
21192040 };
2120− version = "0.9.6";
2041+ version = "1.0.0";
21212042 };
21222043 parallel = {
21232044 source = {
@@ -2131,10 +2052,10 @@
21312052 dependencies = ["ast"];
21322053 source = {
21332054 remotes = ["https://rubygems.org"];
2134− sha256 = "1af7aa1c2npi8dkshgm3f8qyacabm94ckrdz7b8vd3f8zzswqzp9";
2055+ sha256 = "1zjk0w1kjj3xk8ymy1430aa4gg0k8ckphfj88br6il4pm83f0n1f";
21352056 type = "gem";
21362057 };
2137− version = "2.5.1.0";
2058+ version = "2.5.3.0";
21382059 };
21392060 parslet = {
21402061 source = {
@@ -2215,14 +2136,6 @@
22152136 };
22162137 version = "1.0.1";
22172138 };
2218− posix-spawn = {
2219− source = {
2220− remotes = ["https://rubygems.org"];
2221− sha256 = "1pmxmpins57qrbr31bs3bm7gidhaacmrp4md6i962gvpq4gyfcjw";
2222− type = "gem";
2223− };
2224− version = "0.3.13";
2225− };
22262139 powerpack = {
22272140 source = {
22282141 remotes = ["https://rubygems.org"];
@@ -2309,6 +2222,23 @@
23092222 };
23102223 version = "3.0.3";
23112224 };
2225+ puma = {
2226+ source = {
2227+ remotes = ["https://rubygems.org"];
2228+ sha256 = "1k7dqxnq0dnf5rxkgs9rknclkn3ah7lsdrk6nrqxla8qzy31wliq";
2229+ type = "gem";
2230+ };
2231+ version = "3.12.0";
2232+ };
2233+ puma_worker_killer = {
2234+ dependencies = ["get_process_mem" "puma"];
2235+ source = {
2236+ remotes = ["https://rubygems.org"];
2237+ sha256 = "1m08qi8mxpp20zqqjj9yzcrx0sn29n5fn5avlf1lnl0n7qa9c03i";
2238+ type = "gem";
2239+ };
2240+ version = "0.1.0";
2241+ };
23122242 pyu-ruby-sasl = {
23132243 source = {
23142244 remotes = ["https://rubygems.org"];
@@ -2916,10 +2846,10 @@
29162846 rugged = {
29172847 source = {
29182848 remotes = ["https://rubygems.org"];
2919− sha256 = "1y6k5yrfmhc1v4albbpa3xzl28vk5lric3si8ada28sp9mmk2x72";
2849+ sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6";
29202850 type = "gem";
29212851 };
2922− version = "0.27.4";
2852+ version = "0.27.5";
29232853 };
29242854 safe_yaml = {
29252855 source = {
@@ -3075,10 +3005,10 @@
30753005 dependencies = ["addressable" "faraday" "jwt" "multi_json"];
30763006 source = {
30773007 remotes = ["https://rubygems.org"];
3078− sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv";
3008+ sha256 = "1f5d3bz5bjc4b0r2jmqd15qf07lgsqkgd25f0h46jihrf9l5fsi4";
30793009 type = "gem";
30803010 };
3081− version = "0.8.1";
3011+ version = "0.11.0";
30823012 };
30833013 simple_po_parser = {
30843014 source = {
@@ -3199,14 +3129,6 @@
31993129 };
32003130 version = "0.5.1";
32013131 };
3202− stringex = {
3203− source = {
3204− remotes = ["https://rubygems.org"];
3205− sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1";
3206− type = "gem";
3207− };
3208− version = "2.8.4";
3209− };
32103132 sys-filesystem = {
32113133 dependencies = ["ffi"];
32123134 source = {
pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile+10−18
@@ -82,13 +82,6 @@ gem 'gpgme'
8282gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
8383gem 'net-ldap'
8484
85−# Git Wiki
86−# Only used to compute wiki page slugs
87−gem 'gitlab-gollum-lib', '~> 4.2', require: false
88−
89−# Language detection
90−gem 'github-linguist', '~> 5.3.3', require: 'linguist'
91−
9285# API
9386gem 'grape', '~> 1.1'
9487gem 'grape-entity', '~> 0.7.1'
@@ -156,6 +149,7 @@ gem 'rouge', '~> 3.1'
156149gem 'truncato', '~> 0.7.9'
157150gem 'bootstrap_form', '~> 2.7.0'
158151gem 'nokogiri', '~> 1.8.2'
152+gem 'escape_utils', '~> 1.1'
159153
160154# Calendar rendering
161155gem 'icalendar'
@@ -169,6 +163,11 @@ group :unicorn do
169163 gem 'unicorn-worker-killer', '~> 0.4.4'
170164end
171165
166+group :puma do
167+ gem 'puma', '~> 3.12', require: false
168+ gem 'puma_worker_killer', require: false
169+end
170+
172171# State machine
173172gem 'state_machines-activerecord', '~> 0.5.1'
174173
@@ -222,7 +221,7 @@ gem 'hipchat', '~> 1.5.0'
222221gem 'jira-ruby', '~> 1.4'
223222
224223# Flowdock integration
225−gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
224+gem 'flowdock', '~> 0.7'
226225
227226# Slack integration
228227gem 'slack-notifier', '~> 1.5.1'
@@ -255,9 +254,6 @@ gem 'rack-attack', '~> 4.4.1'
255254# Ace editor
256255gem 'ace-rails-ap', '~> 4.1.0'
257256
258−# Keyboard shortcuts
259−gem 'mousetrap-rails', '~> 1.4.6'
260−
261257# Detect and convert string character encoding
262258gem 'charlock_holmes', '~> 0.7.5'
263259
@@ -435,11 +431,10 @@ group :ed25519 do
435431end
436432
437433# Gitaly GRPC client
438−gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly'
439−gem 'grpc', '~> 1.11.0'
434+gem 'gitaly-proto', '~> 0.123.0', require: 'gitaly'
435+gem 'grpc', '~> 1.15.0'
440436
441−# Locked until https://github.com/google/protobuf/issues/4210 is closed
442−gem 'google-protobuf', '= 3.5.1'
437+gem 'google-protobuf', '~> 3.6'
443438
444439gem 'toml-rb', '~> 1.0.0', require: false
445440
@@ -451,6 +446,3 @@ gem 'flipper-active_support_cache_store', '~> 0.13.0'
451446# Structured logging
452447gem 'lograge', '~> 0.5'
453448gem 'grape_logging', '~> 1.7'
454−
455−# Asset synchronization
456−gem 'asset_sync', '~> 2.4'
pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock+23−59
@@ -58,11 +58,6 @@ GEM
5858 asciidoctor (1.5.6.2)
5959 asciidoctor-plantuml (0.0.8)
6060 asciidoctor (~> 1.5)
61− asset_sync (2.4.0)
62− activemodel (>= 4.1.0)
63− fog-core
64− mime-types (>= 2.99)
65− unf
6661 ast (2.4.0)
6762 atomic (1.1.99)
6863 attr_encrypted (3.1.0)
@@ -298,32 +293,9 @@ GEM
298293 gettext_i18n_rails (>= 0.7.1)
299294 po_to_json (>= 1.0.0)
300295 rails (>= 3.2.0)
301− gitaly-proto (0.118.1)
302− google-protobuf (~> 3.1)
303− grpc (~> 1.10)
304− github-linguist (5.3.3)
305− charlock_holmes (~> 0.7.5)
306− escape_utils (~> 1.1.0)
307− mime-types (>= 1.19)
308− rugged (>= 0.25.1)
296+ gitaly-proto (0.123.0)
297+ grpc (~> 1.0)
309298 github-markup (1.7.0)
310− gitlab-flowdock-git-hook (1.0.1)
311− flowdock (~> 0.7)
312− gitlab-grit (>= 2.4.1)
313− multi_json
314− gitlab-gollum-lib (4.2.7.5)
315− gemojione (~> 3.2)
316− github-markup (~> 1.6)
317− gollum-grit_adapter (~> 1.0)
318− nokogiri (>= 1.6.1, < 2.0)
319− rouge (~> 3.1)
320− sanitize (~> 4.6.4)
321− stringex (~> 2.6)
322− gitlab-grit (2.8.2)
323− charlock_holmes (~> 0.6)
324− diff-lcs (~> 1.1)
325− mime-types (>= 1.16)
326− posix-spawn (~> 0.3)
327299 gitlab-license (1.0.0)
328300 gitlab-markup (1.6.4)
329301 gitlab-sidekiq-fetcher (0.3.0)
@@ -339,8 +311,6 @@ GEM
339311 rubyntlm (~> 0.5)
340312 globalid (0.4.1)
341313 activesupport (>= 4.2.0)
342− gollum-grit_adapter (1.0.1)
343− gitlab-grit (~> 2.7, >= 2.7.1)
344314 gon (6.2.0)
345315 actionpack (>= 3.0)
346316 multi_json
@@ -352,16 +322,15 @@ GEM
352322 mime-types (~> 3.0)
353323 representable (~> 3.0)
354324 retriable (>= 2.0, < 4.0)
355− google-protobuf (3.5.1)
356− googleapis-common-protos-types (1.0.1)
325+ google-protobuf (3.6.1)
326+ googleapis-common-protos-types (1.0.2)
357327 google-protobuf (~> 3.0)
358− googleauth (0.6.2)
328+ googleauth (0.6.6)
359329 faraday (~> 0.12)
360330 jwt (>= 1.4, < 3.0)
361− logging (~> 2.0)
362331 memoist (~> 0.12)
363332 multi_json (~> 1.11)
364− os (~> 0.9)
333+ os (>= 0.9, < 2.0)
365334 signet (~> 0.7)
366335 gpgme (2.0.13)
367336 mini_portile2 (~> 2.1)
@@ -385,10 +354,9 @@ GEM
385354 railties
386355 sprockets-rails
387356 graphql (1.8.1)
388− grpc (1.11.0)
357+ grpc (1.15.0)
389358 google-protobuf (~> 3.1)
390359 googleapis-common-protos-types (~> 1.0.0)
391− googleauth (>= 0.5.1, < 0.7)
392360 gssapi (1.2.0)
393361 ffi (>= 1.0.1)
394362 haml (5.0.4)
@@ -493,11 +461,7 @@ GEM
493461 xml-simple
494462 licensee (8.9.2)
495463 rugged (~> 0.24)
496− little-plugger (1.1.4)
497464 locale (2.1.2)
498− logging (2.2.2)
499− little-plugger (~> 1.1)
500− multi_json (~> 1.10)
501465 lograge (0.10.0)
502466 actionpack (>= 4)
503467 activesupport (>= 4)
@@ -521,7 +485,6 @@ GEM
521485 mini_mime (1.0.1)
522486 mini_portile2 (2.3.0)
523487 minitest (5.7.0)
524− mousetrap-rails (1.4.6)
525488 msgpack (1.2.4)
526489 multi_json (1.13.1)
527490 multi_xml (0.6.0)
@@ -604,9 +567,9 @@ GEM
604567 org-ruby (0.9.12)
605568 rubypants (~> 0.2)
606569 orm_adapter (0.5.0)
607− os (0.9.6)
570+ os (1.0.0)
608571 parallel (1.12.1)
609− parser (2.5.1.0)
572+ parser (2.5.3.0)
610573 ast (~> 2.4.0)
611574 parslet (1.8.2)
612575 peek (1.0.1)
@@ -634,7 +597,6 @@ GEM
634597 pg (0.18.4)
635598 po_to_json (1.0.1)
636599 json (>= 1.6.0)
637− posix-spawn (0.3.13)
638600 powerpack (0.1.1)
639601 premailer (1.10.4)
640602 addressable
@@ -658,6 +620,10 @@ GEM
658620 pry-rails (0.3.6)
659621 pry (>= 0.10.4)
660622 public_suffix (3.0.3)
623+ puma (3.12.0)
624+ puma_worker_killer (0.1.0)
625+ get_process_mem (~> 0.2)
626+ puma (>= 2.7, < 4)
661627 pyu-ruby-sasl (0.0.3.3)
662628 rack (1.6.11)
663629 rack-accept (0.4.5)
@@ -826,7 +792,7 @@ GEM
826792 rubyzip (1.2.2)
827793 rufus-scheduler (3.4.0)
828794 et-orbi (~> 1.0)
829− rugged (0.27.4)
795+ rugged (0.27.5)
830796 safe_yaml (1.0.4)
831797 sanitize (4.6.6)
832798 crass (~> 1.0.2)
@@ -872,7 +838,7 @@ GEM
872838 sidekiq-cron (0.6.0)
873839 rufus-scheduler (>= 3.3.0)
874840 sidekiq (>= 4.2.1)
875− signet (0.8.1)
841+ signet (0.11.0)
876842 addressable (~> 2.3)
877843 faraday (~> 0.9)
878844 jwt (>= 1.5, < 3.0)
@@ -905,7 +871,6 @@ GEM
905871 state_machines-activerecord (0.5.1)
906872 activerecord (>= 4.1, < 6.0)
907873 state_machines-activemodel (>= 0.5.0)
908− stringex (2.8.4)
909874 sys-filesystem (1.1.6)
910875 ffi
911876 sysexits (1.2.0)
@@ -997,7 +962,6 @@ DEPENDENCIES
997962 asana (~> 0.6.0)
998963 asciidoctor (~> 1.5.6)
999964 asciidoctor-plantuml (= 0.0.8)
1000− asset_sync (~> 2.4)
1001965 attr_encrypted (~> 3.1.0)
1002966 awesome_print
1003967 aws-sdk
@@ -1039,6 +1003,7 @@ DEPENDENCIES
10391003 elasticsearch-rails (~> 0.1.9)
10401004 email_reply_trimmer (~> 0.1)
10411005 email_spec (~> 2.2.0)
1006+ escape_utils (~> 1.1)
10421007 factory_bot_rails (~> 4.8.2)
10431008 faraday (~> 0.12)
10441009 faraday_middleware-aws-signers-v4
@@ -1047,6 +1012,7 @@ DEPENDENCIES
10471012 flipper (~> 0.13.0)
10481013 flipper-active_record (~> 0.13.0)
10491014 flipper-active_support_cache_store (~> 0.13.0)
1015+ flowdock (~> 0.7)
10501016 fog-aliyun (~> 0.2.0)
10511017 fog-aws (~> 2.0.1)
10521018 fog-core (~> 1.44)
@@ -1061,11 +1027,8 @@ DEPENDENCIES
10611027 gettext (~> 3.2.2)
10621028 gettext_i18n_rails (~> 1.8.0)
10631029 gettext_i18n_rails_js (~> 1.3)
1064− gitaly-proto (~> 0.118.1)
1065− github-linguist (~> 5.3.3)
1030+ gitaly-proto (~> 0.123.0)
10661031 github-markup (~> 1.7.0)
1067− gitlab-flowdock-git-hook (~> 1.0.1)
1068− gitlab-gollum-lib (~> 4.2)
10691032 gitlab-license (~> 1.0)
10701033 gitlab-markup (~> 1.6.4)
10711034 gitlab-sidekiq-fetcher
@@ -1073,7 +1036,7 @@ DEPENDENCIES
10731036 gitlab_omniauth-ldap (~> 2.0.4)
10741037 gon (~> 6.2)
10751038 google-api-client (~> 0.23)
1076− google-protobuf (= 3.5.1)
1039+ google-protobuf (~> 3.6)
10771040 gpgme
10781041 grape (~> 1.1)
10791042 grape-entity (~> 0.7.1)
@@ -1081,7 +1044,7 @@ DEPENDENCIES
10811044 grape_logging (~> 1.7)
10821045 graphiql-rails (~> 1.4.10)
10831046 graphql (~> 1.8.0)
1084− grpc (~> 1.11.0)
1047+ grpc (~> 1.15.0)
10851048 gssapi
10861049 haml_lint (~> 0.26.0)
10871050 hamlit (~> 2.8.8)
@@ -1111,7 +1074,6 @@ DEPENDENCIES
11111074 method_source (~> 0.8)
11121075 mini_magick
11131076 minitest (~> 5.7.0)
1114− mousetrap-rails (~> 1.4.6)
11151077 mysql2 (~> 0.4.10)
11161078 net-ldap
11171079 net-ntp
@@ -1146,6 +1108,8 @@ DEPENDENCIES
11461108 prometheus-client-mmap (~> 0.9.4)
11471109 pry-byebug (~> 3.4.1)
11481110 pry-rails (~> 0.3.4)
1111+ puma (~> 3.12)
1112+ puma_worker_killer
11491113 rack-attack (~> 4.4.1)
11501114 rack-cors (~> 1.0.0)
11511115 rack-oauth2 (~> 1.2.1)
@@ -1224,4 +1188,4 @@ DEPENDENCIES
12241188 wikicloth (= 0.8.1)
12251189
12261190BUNDLED WITH
1227− 1.16.4
1191+ 1.17.1
pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix+38−116
@@ -164,15 +164,6 @@
164164 };
165165 version = "0.0.8";
166166 };
167− asset_sync = {
168− dependencies = ["activemodel" "fog-core" "mime-types" "unf"];
169− source = {
170− remotes = ["https://rubygems.org"];
171− sha256 = "0wjd662yyg72dwwc6cav7gk2bjv9nkhn056f03h8zmyank451hdf";
172− type = "gem";
173− };
174− version = "2.4.0";
175− };
176167 ast = {
177168 source = {
178169 remotes = ["https://rubygems.org"];
@@ -1154,22 +1145,13 @@
11541145 version = "1.3.0";
11551146 };
11561147 gitaly-proto = {
1157− dependencies = ["google-protobuf" "grpc"];
1158− source = {
1159− remotes = ["https://rubygems.org"];
1160− sha256 = "19nyx75xnb3lsap6rr3p1avqsw1dcrm8d3ggmmihd58a9s762fki";
1161− type = "gem";
1162− };
1163− version = "0.118.1";
1164− };
1165− github-linguist = {
1166− dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
1148+ dependencies = ["grpc"];
11671149 source = {
11681150 remotes = ["https://rubygems.org"];
1169− sha256 = "0kgashbqpypv329m63b85ri1dx0gppwd0832hvwh124lk5b19drk";
1151+ sha256 = "16b9sdaimhcda401z2s7apf0nz6y0lxs74xhkwlz4jzf6ms44mgg";
11701152 type = "gem";
11711153 };
1172− version = "5.3.3";
1154+ version = "0.123.0";
11731155 };
11741156 github-markup = {
11751157 source = {
@@ -1179,33 +1161,6 @@
11791161 };
11801162 version = "1.7.0";
11811163 };
1182− gitlab-flowdock-git-hook = {
1183− dependencies = ["flowdock" "gitlab-grit" "multi_json"];
1184− source = {
1185− remotes = ["https://rubygems.org"];
1186− sha256 = "1s3a10cdbh4xy732b92zcsm5zyc1lhi5v29d76j8mwbqmj11a2p8";
1187− type = "gem";
1188− };
1189− version = "1.0.1";
1190− };
1191− gitlab-gollum-lib = {
1192− dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
1193− source = {
1194− remotes = ["https://rubygems.org"];
1195− sha256 = "15h6a7lsfkm967d5dhjlbcm2lnl1l9akzvaq92qlxq40r5apw0kn";
1196− type = "gem";
1197− };
1198− version = "4.2.7.5";
1199− };
1200− gitlab-grit = {
1201− dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
1202− source = {
1203− remotes = ["https://rubygems.org"];
1204− sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4";
1205− type = "gem";
1206− };
1207− version = "2.8.2";
1208− };
12091164 gitlab-license = {
12101165 source = {
12111166 remotes = ["https://rubygems.org"];
@@ -1258,15 +1213,6 @@
12581213 };
12591214 version = "0.4.1";
12601215 };
1261− gollum-grit_adapter = {
1262− dependencies = ["gitlab-grit"];
1263− source = {
1264− remotes = ["https://rubygems.org"];
1265− sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b";
1266− type = "gem";
1267− };
1268− version = "1.0.1";
1269− };
12701216 gon = {
12711217 dependencies = ["actionpack" "multi_json" "request_store"];
12721218 source = {
@@ -1288,28 +1234,28 @@
12881234 google-protobuf = {
12891235 source = {
12901236 remotes = ["https://rubygems.org"];
1291− sha256 = "0s8ijd9wdrkqwsb6nasrsv7f9i5im2nyax7f7jlb5y9vh8nl98qi";
1237+ sha256 = "134d3ini9ymdwxpz445m28ss9x0m6vcpijcdkzvgk4n538wdmppf";
12921238 type = "gem";
12931239 };
1294− version = "3.5.1";
1240+ version = "3.6.1";
12951241 };
12961242 googleapis-common-protos-types = {
12971243 dependencies = ["google-protobuf"];
12981244 source = {
12991245 remotes = ["https://rubygems.org"];
1300− sha256 = "0yf10s7w8wpa49hc86z7z2fkn9yz7j2njz0n8xmqb24ji090z4ck";
1246+ sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq";
13011247 type = "gem";
13021248 };
1303− version = "1.0.1";
1249+ version = "1.0.2";
13041250 };
13051251 googleauth = {
1306− dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"];
1252+ dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
13071253 source = {
13081254 remotes = ["https://rubygems.org"];
1309− sha256 = "08z4zfj9cwry13y8c2w5p4xylyslxxjq4wahd95bk1ddl5pknd4f";
1255+ sha256 = "1747p1dhpvz76i98xnjrvaj785y1232svm0nc8g9by6pz835gp2l";
13101256 type = "gem";
13111257 };
1312− version = "0.6.2";
1258+ version = "0.6.6";
13131259 };
13141260 gpgme = {
13151261 dependencies = ["mini_portile2"];
@@ -1374,13 +1320,13 @@
13741320 version = "1.8.1";
13751321 };
13761322 grpc = {
1377− dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"];
1323+ dependencies = ["google-protobuf" "googleapis-common-protos-types"];
13781324 source = {
13791325 remotes = ["https://rubygems.org"];
1380− sha256 = "1is4czi3i7y6zyxzyrpsma1z91axmc0jz2ngr6ckixqd3629npkz";
1326+ sha256 = "0m2wspnm1cfkmhlbp7yqv5bb4vsfh246cm0aavxra67aw4l8plhb";
13811327 type = "gem";
13821328 };
1383− version = "1.11.0";
1329+ version = "1.15.0";
13841330 };
13851331 gssapi = {
13861332 dependencies = ["ffi"];
@@ -1762,14 +1708,6 @@
17621708 };
17631709 version = "8.9.2";
17641710 };
1765− little-plugger = {
1766− source = {
1767− remotes = ["https://rubygems.org"];
1768− sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym";
1769− type = "gem";
1770− };
1771− version = "1.1.4";
1772− };
17731711 locale = {
17741712 source = {
17751713 remotes = ["https://rubygems.org"];
@@ -1778,15 +1716,6 @@
17781716 };
17791717 version = "2.1.2";
17801718 };
1781− logging = {
1782− dependencies = ["little-plugger" "multi_json"];
1783− source = {
1784− remotes = ["https://rubygems.org"];
1785− sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn";
1786− type = "gem";
1787− };
1788− version = "2.2.2";
1789− };
17901719 lograge = {
17911720 dependencies = ["actionpack" "activesupport" "railties" "request_store"];
17921721 source = {
@@ -1904,14 +1833,6 @@
19041833 };
19051834 version = "5.7.0";
19061835 };
1907− mousetrap-rails = {
1908− source = {
1909− remotes = ["https://rubygems.org"];
1910− sha256 = "00n13r5pwrk4vq018128vcfh021dw0fa2bk4pzsv0fslfm8ayp2m";
1911− type = "gem";
1912− };
1913− version = "1.4.6";
1914− };
19151836 msgpack = {
19161837 source = {
19171838 remotes = ["https://rubygems.org"];
@@ -2235,10 +2156,10 @@
22352156 os = {
22362157 source = {
22372158 remotes = ["https://rubygems.org"];
2238− sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz";
2159+ sha256 = "1s401gvhqgs2r8hh43ia205mxsy1wc0ib4k76wzkdpspfcnfr1rk";
22392160 type = "gem";
22402161 };
2241− version = "0.9.6";
2162+ version = "1.0.0";
22422163 };
22432164 parallel = {
22442165 source = {
@@ -2252,10 +2173,10 @@
22522173 dependencies = ["ast"];
22532174 source = {
22542175 remotes = ["https://rubygems.org"];
2255− sha256 = "1af7aa1c2npi8dkshgm3f8qyacabm94ckrdz7b8vd3f8zzswqzp9";
2176+ sha256 = "1zjk0w1kjj3xk8ymy1430aa4gg0k8ckphfj88br6il4pm83f0n1f";
22562177 type = "gem";
22572178 };
2258− version = "2.5.1.0";
2179+ version = "2.5.3.0";
22592180 };
22602181 parslet = {
22612182 source = {
@@ -2336,14 +2257,6 @@
23362257 };
23372258 version = "1.0.1";
23382259 };
2339− posix-spawn = {
2340− source = {
2341− remotes = ["https://rubygems.org"];
2342− sha256 = "1pmxmpins57qrbr31bs3bm7gidhaacmrp4md6i962gvpq4gyfcjw";
2343− type = "gem";
2344− };
2345− version = "0.3.13";
2346− };
23472260 powerpack = {
23482261 source = {
23492262 remotes = ["https://rubygems.org"];
@@ -2430,6 +2343,23 @@
24302343 };
24312344 version = "3.0.3";
24322345 };
2346+ puma = {
2347+ source = {
2348+ remotes = ["https://rubygems.org"];
2349+ sha256 = "1k7dqxnq0dnf5rxkgs9rknclkn3ah7lsdrk6nrqxla8qzy31wliq";
2350+ type = "gem";
2351+ };
2352+ version = "3.12.0";
2353+ };
2354+ puma_worker_killer = {
2355+ dependencies = ["get_process_mem" "puma"];
2356+ source = {
2357+ remotes = ["https://rubygems.org"];
2358+ sha256 = "1m08qi8mxpp20zqqjj9yzcrx0sn29n5fn5avlf1lnl0n7qa9c03i";
2359+ type = "gem";
2360+ };
2361+ version = "0.1.0";
2362+ };
24332363 pyu-ruby-sasl = {
24342364 source = {
24352365 remotes = ["https://rubygems.org"];
@@ -3037,10 +2967,10 @@
30372967 rugged = {
30382968 source = {
30392969 remotes = ["https://rubygems.org"];
3040− sha256 = "1y6k5yrfmhc1v4albbpa3xzl28vk5lric3si8ada28sp9mmk2x72";
2970+ sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6";
30412971 type = "gem";
30422972 };
3043− version = "0.27.4";
2973+ version = "0.27.5";
30442974 };
30452975 safe_yaml = {
30462976 source = {
@@ -3196,10 +3126,10 @@
31963126 dependencies = ["addressable" "faraday" "jwt" "multi_json"];
31973127 source = {
31983128 remotes = ["https://rubygems.org"];
3199− sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv";
3129+ sha256 = "1f5d3bz5bjc4b0r2jmqd15qf07lgsqkgd25f0h46jihrf9l5fsi4";
32003130 type = "gem";
32013131 };
3202− version = "0.8.1";
3132+ version = "0.11.0";
32033133 };
32043134 simple_po_parser = {
32053135 source = {
@@ -3320,14 +3250,6 @@
33203250 };
33213251 version = "0.5.1";
33223252 };
3323− stringex = {
3324− source = {
3325− remotes = ["https://rubygems.org"];
3326− sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1";
3327− type = "gem";
3328− };
3329− version = "2.8.4";
3330− };
33313253 sys-filesystem = {
33323254 dependencies = ["ffi"];
33333255 source = {
pkgs/applications/video/plex-media-player/default.nix+11−11
@@ -9,41 +9,41 @@ let
99 # plex-media-player is updated, the versions for these files are changed,
1010 # so the build IDs (and SHAs) below will need to be updated!
1111 depSrcs = rec {
12− webClientBuildId = "56-23317d81e49651";
13− webClientDesktopBuildId = "3.57.1-1e49651";
14− webClientTvBuildId = "3.60.1-23317d8";
12+ webClientBuildId = "85-88b3ac67015f76";
13+ webClientDesktopBuildId = "3.77.2-7015f76";
14+ webClientTvBuildId = "3.78.0-88b3ac6";
1515
1616 webClient = fetchurl {
1717 url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake";
18− sha256 = "1a48a65zzdx347kfnxriwkb0yjlhvn2g8jkda5pz10r3lwja0gbi";
18+ sha256 = "0j7i4yr95ljw9cwyaygld41j7yvndj3dza3cbydv4x8mh2hn05v1";
1919 };
2020 webClientDesktopHash = fetchurl {
2121 url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1";
22− sha256 = "04wdgpsh33y8hyjhjrfw6ymf9g002jny7hvhld4xp33lwxhd2j5w";
22+ sha256 = "106kx9ahz7jgskpjraff2g235n1whwvf18yw0nmp5dwr9ys9h8jp";
2323 };
2424 webClientDesktop = fetchurl {
2525 url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz";
26− sha256 = "1asw9f84z9sm3w7ifnc7j631j84rgx23c6msmn2dnw48ckv3bj2z";
26+ sha256 = "0h23h3fd3w43glvnhrg9qiajs0ql490kb00g3i4cpi29hy1ky45r";
2727 };
2828 webClientTvHash = fetchurl {
2929 url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1";
30− sha256 = "0d1hsvmpwczwx442f8qdvfr8c3w84630j9qwpg2y4qm423sgdvja";
30+ sha256 = "05zk2zpmcdf276ys5zyirsmvhvyvz99fa6hlgymma8ql6w67133r";
3131 };
3232 webClientTv = fetchurl {
3333 url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz";
34− sha256 = "1ih3l5paf1jl68b1xq3iqqmvs3m07fybz57hcz4f78v0gwq2kryq";
34+ sha256 = "1cflpgaf4kyj6ccqa11j28rkp8s7zlbnid7s00m5n2c907dihmw2";
3535 };
3636 };
3737in stdenv.mkDerivation rec {
3838 name = "plex-media-player-${version}";
39− version = "2.14.1.880";
40− vsnHash = "301a4b6c";
39+ version = "2.23.0.920";
40+ vsnHash = "5bc1a2e5";
4141
4242 src = fetchFromGitHub {
4343 owner = "plexinc";
4444 repo = "plex-media-player";
4545 rev = "v${version}-${vsnHash}";
46− sha256 = "0xz41r697vl6s3qvy6jwriv3pb9cfy61j6sydvdq121x5a0jnh9a";
46+ sha256 = "1jzlyj32gr3ar89qnk8slazrbchqkjfx9dchzkzfvpi6742v9igm";
4747 };
4848
4949 nativeBuildInputs = [ pkgconfig cmake python3 ];
pkgs/build-support/docker/default.nix+31−15
@@ -188,22 +188,27 @@ rec {
188188 # Use the name and tag to get the parent ID field.
189189 parentID=$(jshon -e $fromImageName -e $fromImageTag -u \
190190 < image/repositories)
191+
192+ cat ./image/manifest.json | jq -r '.[0].Layers | .[]' > layer-list
193+ else
194+ touch layer-list
191195 fi
192196
193197 # Unpack all of the parent layers into the image.
194198 lowerdir=""
195− while [[ -n "$parentID" ]]; do
196− echo "Unpacking layer $parentID"
197− mkdir -p image/$parentID/layer
198− tar -C image/$parentID/layer -xpf image/$parentID/layer.tar
199− rm image/$parentID/layer.tar
199+ extractionID=0
200+ for layerTar in $(cat layer-list); do
201+ echo "Unpacking layer $layerTar"
202+ extractionID=$((extractionID + 1))
203+
204+ mkdir -p image/$extractionID/layer
205+ tar -C image/$extractionID/layer -xpf $layerTar
206+ rm $layerTar
200207
201− find image/$parentID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \;
208+ find image/$extractionID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \;
202209
203210 # Get the next lower directory and continue the loop.
204− lowerdir=$lowerdir''${lowerdir:+:}image/$parentID/layer
205− parentID=$(cat image/$parentID/json \
206− | (jshon -e parent -u 2>/dev/null || true))
211+ lowerdir=$lowerdir''${lowerdir:+:}image/$extractionID/layer
207212 done
208213
209214 mkdir work
@@ -673,6 +678,9 @@ rec {
673678 if [[ -n "$fromImage" ]]; then
674679 echo "Unpacking base image..."
675680 tar -C image -xpf "$fromImage"
681+
682+ cat ./image/manifest.json | jq -r '.[0].Layers | .[]' > layer-list
683+
676684 # Do not import the base image configuration and manifest
677685 chmod a+w image image/*.json
678686 rm -f image/*.json
@@ -690,6 +698,8 @@ rec {
690698 for l in image/*/layer.tar; do
691699 ls_tar $l >> baseFiles
692700 done
701+ else
702+ touch layer-list
693703 fi
694704
695705 chmod -R ug+rw image
@@ -742,17 +752,23 @@ rec {
742752 # Use the temp folder we've been working on to create a new image.
743753 mv temp image/$layerID
744754
755+ # Add the new layer ID to the beginning of the layer list
756+ (
757+ # originally this used `sed -i "1i$layerID" layer-list`, but
758+ # would fail if layer-list was completely empty.
759+ echo "$layerID/layer.tar"
760+ cat layer-list
761+ ) | ${pkgs.moreutils}/bin/sponge layer-list
762+
745763 # Create image json and image manifest
746764 imageJson=$(cat ${baseJson} | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}")
747765 manifestJson=$(jq -n "[{\"RepoTags\":[\"$imageName:$imageTag\"]}]")
748− currentID=$layerID
749− while [[ -n "$currentID" ]]; do
750− layerChecksum=$(sha256sum image/$currentID/layer.tar | cut -d ' ' -f1)
766+
767+ for layerTar in $(cat ./layer-list); do
768+ layerChecksum=$(sha256sum image/$layerTar | cut -d ' ' -f1)
751769 imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"$(jq -r .created ${baseJson})\"}] + .")
752770 imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .")
753− manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$currentID/layer.tar\"] + .")
754−
755− currentID=$(cat image/$currentID/json | (jshon -e parent -u 2>/dev/null || true))
771+ manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$layerTar\"] + .")
756772 done
757773
758774 imageJsonChecksum=$(echo "$imageJson" | sha256sum | cut -d ' ' -f1)
pkgs/build-support/docker/examples.nix+19
@@ -156,5 +156,24 @@ rec {
156156 name = "layered-image";
157157 tag = "latest";
158158 config.Cmd = [ "${pkgs.hello}/bin/hello" ];
159+ contents = [ pkgs.hello pkgs.bash pkgs.coreutils ];
160+ };
161+
162+ # 11. Create an image on top of a layered image
163+ layered-on-top = pkgs.dockerTools.buildImage {
164+ name = "layered-on-top";
165+ tag = "latest";
166+ fromImage = layered-image;
167+ extraCommands = ''
168+ mkdir ./example-output
169+ chmod 777 ./example-output
170+ '';
171+ config = {
172+ Env = [ "PATH=${pkgs.coreutils}/bin/" ];
173+ WorkingDir = "/example-output";
174+ Cmd = [
175+ "${pkgs.bash}/bin/bash" "-c" "echo hello > foo; cat foo"
176+ ];
177+ };
159178 };
160179}
pkgs/build-support/rust/build-rust-crate/configure-crate.nix+3
@@ -71,6 +71,9 @@ in ''
7171 export CARGO_PKG_VERSION_MAJOR=${builtins.elemAt version 0}
7272 export CARGO_PKG_VERSION_MINOR=${builtins.elemAt version 1}
7373 export CARGO_PKG_VERSION_PATCH=${builtins.elemAt version 2}
74+ export NUM_JOBS=1
75+ export RUSTC="rustc"
76+ export RUSTDOC="rustdoc"
7477 if [[ -n "${versionPre}" ]]; then
7578 export CARGO_PKG_VERSION_PRE="${versionPre}"
7679 fi
pkgs/build-support/rust/build-rust-crate/helpers.nix+7−4
@@ -2,6 +2,7 @@
22{
33 kernel = stdenv.hostPlatform.parsed.kernel.name;
44 abi = stdenv.hostPlatform.parsed.abi.name;
5+ cpu = stdenv.hostPlatform.parsed.cpu.name;
56 updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
67 mapFeatures = features: map (fun: fun { features = features; });
78 mkFeatures = feat: lib.lists.foldl (features: featureName:
@@ -11,10 +12,12 @@
1112 features
1213 ) [] (builtins.attrNames feat);
1314 include = includedFiles: src: builtins.filterSource (path: type:
14− lib.lists.any (f:
15− let p = toString (src + ("/" + f)); in
16− (path == p) || (type == "directory" && lib.strings.hasPrefix path p)
17− ) includedFiles
15+ lib.lists.any (f:
16+ let p = toString (src + ("/" + f));
17+ suff = lib.strings.removePrefix p path;
18+ in
19+ suff == "" || (lib.strings.hasPrefix "/" suff)
20+ ) includedFiles
1821 ) src;
1922 exclude = excludedFiles: src: builtins.filterSource (path: type:
2023 lib.lists.all (f:
pkgs/build-support/rust/build-rust-crate/install-crate.nix+5−3
@@ -20,9 +20,11 @@ crateName: metadata:
2020 mkdir -p $out/lib
2121 cp -r target/build/* $out/lib # */
2222 fi
23− if [[ "$(ls -A target/bin)" ]]; then
24− mkdir -p $out/bin
25− cp -P target/bin/* $out/bin # */
23+ if [[ -d target/bin ]]; then
24+ if [[ "$(ls -A target/bin)" ]]; then
25+ mkdir -p $out/bin
26+ cp -P target/bin/* $out/bin # */
27+ fi
2628 fi
2729 runHook postInstall
2830''
pkgs/build-support/rust/carnix.nix+3−24
@@ -1,4 +1,4 @@
1−# Generated by carnix 0.8.11: carnix generate-nix
1+# Generated by carnix 0.9.1: carnix generate-nix
22{ lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }:
33with buildRustCrateHelpers;
44let inherit (lib.lists) fold;
@@ -6,7 +6,7 @@ let inherit (lib.lists) fold;
66in
77let crates = cratesIO; in
88rec {
9− carnix = crates.crates.carnix."0.8.11" deps;
9+ carnix = crates.crates.carnix."0.9.2" deps;
1010 __all = [ (carnix {}) ];
1111 deps.aho_corasick."0.6.8" = {
1212 memchr = "2.1.0";
@@ -42,7 +42,7 @@ rec {
4242 arrayvec = "0.4.7";
4343 constant_time_eq = "0.1.3";
4444 };
45− deps.carnix."0.8.11" = {
45+ deps.carnix."0.9.2" = {
4646 clap = "2.32.0";
4747 dirs = "1.0.4";
4848 env_logger = "0.5.13";
@@ -51,7 +51,6 @@ rec {
5151 log = "0.4.5";
5252 nom = "3.2.1";
5353 regex = "1.0.5";
54− rusqlite = "0.14.0";
5554 serde = "1.0.80";
5655 serde_derive = "1.0.80";
5756 serde_json = "1.0.32";
@@ -112,16 +111,9 @@ rec {
112111 version_check = "0.1.5";
113112 };
114113 deps.libc."0.2.43" = {};
115− deps.libsqlite3_sys."0.9.3" = {
116− pkg_config = "0.3.14";
117− };
118− deps.linked_hash_map."0.4.2" = {};
119114 deps.log."0.4.5" = {
120115 cfg_if = "0.1.6";
121116 };
122− deps.lru_cache."0.1.1" = {
123− linked_hash_map = "0.4.2";
124− };
125117 deps.memchr."1.0.2" = {
126118 libc = "0.2.43";
127119 };
@@ -134,7 +126,6 @@ rec {
134126 deps.nom."3.2.1" = {
135127 memchr = "1.0.2";
136128 };
137− deps.pkg_config."0.3.14" = {};
138129 deps.proc_macro2."0.4.20" = {
139130 unicode_xid = "0.1.0";
140131 };
@@ -170,12 +161,6 @@ rec {
170161 deps.remove_dir_all."0.5.1" = {
171162 winapi = "0.3.6";
172163 };
173− deps.rusqlite."0.14.0" = {
174− bitflags = "1.0.4";
175− libsqlite3_sys = "0.9.3";
176− lru_cache = "0.1.1";
177− time = "0.1.40";
178− };
179164 deps.rustc_demangle."0.1.9" = {};
180165 deps.ryu."0.2.6" = {};
181166 deps.scoped_threadpool."0.1.9" = {};
@@ -220,11 +205,6 @@ rec {
220205 deps.thread_local."0.3.6" = {
221206 lazy_static = "1.1.0";
222207 };
223− deps.time."0.1.40" = {
224− libc = "0.2.43";
225− redox_syscall = "0.1.40";
226− winapi = "0.3.6";
227− };
228208 deps.toml."0.4.8" = {
229209 serde = "1.0.80";
230210 };
@@ -232,7 +212,6 @@ rec {
232212 deps.unicode_width."0.1.5" = {};
233213 deps.unicode_xid."0.1.0" = {};
234214 deps.utf8_ranges."1.0.1" = {};
235− deps.vcpkg."0.2.6" = {};
236215 deps.vec_map."0.8.1" = {};
237216 deps.version_check."0.1.5" = {};
238217 deps.winapi."0.3.6" = {
pkgs/build-support/rust/crates-io.nix+280−352
@@ -5,6 +5,8 @@ let inherit (lib.lists) fold;
55in
66rec {
77
8+# aho-corasick-0.6.8
9+
810 crates.aho_corasick."0.6.8" = deps: { features?(features_.aho_corasick."0.6.8" deps {}) }: buildRustCrate {
911 crateName = "aho-corasick";
1012 version = "0.6.8";
@@ -25,6 +27,9 @@ rec {
2527 ];
2628
2729
30+# end
31+# ansi_term-0.11.0
32+
2833 crates.ansi_term."0.11.0" = deps: { features?(features_.ansi_term."0.11.0" deps {}) }: buildRustCrate {
2934 crateName = "ansi_term";
3035 version = "0.11.0";
@@ -47,6 +52,9 @@ rec {
4752 ];
4853
4954
55+# end
56+# argon2rs-0.2.5
57+
5058 crates.argon2rs."0.2.5" = deps: { features?(features_.argon2rs."0.2.5" deps {}) }: buildRustCrate {
5159 crateName = "argon2rs";
5260 version = "0.2.5";
@@ -61,11 +69,11 @@ rec {
6169 features_.argon2rs."0.2.5" = deps: f: updateFeatures f (rec {
6270 argon2rs."0.2.5".default = (f.argon2rs."0.2.5".default or true);
6371 blake2_rfc = fold recursiveUpdate {} [
64− { "${deps.argon2rs."0.2.5".blake2_rfc}".default = true; }
65− { "0.2.18".simd_asm =
66− (f.blake2_rfc."0.2.18".simd_asm or false) ||
72+ { "${deps.argon2rs."0.2.5".blake2_rfc}"."simd_asm" =
73+ (f.blake2_rfc."${deps.argon2rs."0.2.5".blake2_rfc}"."simd_asm" or false) ||
6774 (argon2rs."0.2.5"."simd" or false) ||
6875 (f."argon2rs"."0.2.5"."simd" or false); }
76+ { "${deps.argon2rs."0.2.5".blake2_rfc}".default = true; }
6977 ];
7078 scoped_threadpool."${deps.argon2rs."0.2.5".scoped_threadpool}".default = true;
7179 }) [
@@ -74,6 +82,9 @@ rec {
7482 ];
7583
7684
85+# end
86+# arrayvec-0.4.7
87+
7788 crates.arrayvec."0.4.7" = deps: { features?(features_.arrayvec."0.4.7" deps {}) }: buildRustCrate {
7889 crateName = "arrayvec";
7990 version = "0.4.7";
@@ -102,6 +113,9 @@ rec {
102113 ];
103114
104115
116+# end
117+# atty-0.2.11
118+
105119 crates.atty."0.2.11" = deps: { features?(features_.atty."0.2.11" deps {}) }: buildRustCrate {
106120 crateName = "atty";
107121 version = "0.2.11";
@@ -136,6 +150,9 @@ rec {
136150 ];
137151
138152
153+# end
154+# backtrace-0.3.9
155+
139156 crates.backtrace."0.3.9" = deps: { features?(features_.backtrace."0.3.9" deps {}) }: buildRustCrate {
140157 crateName = "backtrace";
141158 version = "0.3.9";
@@ -147,13 +164,13 @@ rec {
147164 ])
148165 ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([
149166 ]
150− ++ (if features.backtrace."0.3.9".backtrace-sys or false then [ (crates.backtrace_sys."0.1.24" deps) ] else [])) else [])
167+ ++ (if features.backtrace."0.3.9".backtrace-sys or false then [ (crates.backtrace_sys."${deps."backtrace"."0.3.9".backtrace_sys}" deps) ] else [])) else [])
151168 ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([
152169 (crates."libc"."${deps."backtrace"."0.3.9"."libc"}" deps)
153170 ]) else [])
154171 ++ (if kernel == "windows" then mapFeatures features ([
155172 ]
156− ++ (if features.backtrace."0.3.9".winapi or false then [ (crates.winapi."0.3.6" deps) ] else [])) else []);
173+ ++ (if features.backtrace."0.3.9".winapi or false then [ (crates.winapi."${deps."backtrace"."0.3.9".winapi}" deps) ] else [])) else []);
157174 features = mkFeatures (features."backtrace"."0.3.9" or {});
158175 };
159176 features_.backtrace."0.3.9" = deps: f: updateFeatures f (rec {
@@ -241,6 +258,9 @@ rec {
241258 ];
242259
243260
261+# end
262+# backtrace-sys-0.1.24
263+
244264 crates.backtrace_sys."0.1.24" = deps: { features?(features_.backtrace_sys."0.1.24" deps {}) }: buildRustCrate {
245265 crateName = "backtrace-sys";
246266 version = "0.1.24";
@@ -265,6 +285,9 @@ rec {
265285 ];
266286
267287
288+# end
289+# bitflags-1.0.4
290+
268291 crates.bitflags."1.0.4" = deps: { features?(features_.bitflags."1.0.4" deps {}) }: buildRustCrate {
269292 crateName = "bitflags";
270293 version = "1.0.4";
@@ -277,6 +300,9 @@ rec {
277300 }) [];
278301
279302
303+# end
304+# blake2-rfc-0.2.18
305+
280306 crates.blake2_rfc."0.2.18" = deps: { features?(features_.blake2_rfc."0.2.18" deps {}) }: buildRustCrate {
281307 crateName = "blake2-rfc";
282308 version = "0.2.18";
@@ -312,65 +338,68 @@ rec {
312338 ];
313339
314340
315− crates.carnix."0.8.11" = deps: { features?(features_.carnix."0.8.11" deps {}) }: buildRustCrate {
341+# end
342+# carnix-0.9.2
343+
344+ crates.carnix."0.9.2" = deps: { features?(features_.carnix."0.9.2" deps {}) }: buildRustCrate {
316345 crateName = "carnix";
317− version = "0.8.11";
346+ version = "0.9.2";
318347 authors = [ "pe@pijul.org <pe@pijul.org>" ];
319− sha256 = "1i5iz51mradd3vishc19cd0nfh9r2clbmiq94f83npny65dnp6ch";
348+ sha256 = "1r668rjqcwsxjpz2hrr7j3k099c1xsb8vfq1w7y1ps9hap9af42z";
320349 crateBin =
321350 [{ name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; }] ++
322351 [{ name = "carnix"; path = "src/main.rs"; }];
323352 dependencies = mapFeatures features ([
324− (crates."clap"."${deps."carnix"."0.8.11"."clap"}" deps)
325− (crates."dirs"."${deps."carnix"."0.8.11"."dirs"}" deps)
326− (crates."env_logger"."${deps."carnix"."0.8.11"."env_logger"}" deps)
327− (crates."error_chain"."${deps."carnix"."0.8.11"."error_chain"}" deps)
328− (crates."itertools"."${deps."carnix"."0.8.11"."itertools"}" deps)
329− (crates."log"."${deps."carnix"."0.8.11"."log"}" deps)
330− (crates."nom"."${deps."carnix"."0.8.11"."nom"}" deps)
331− (crates."regex"."${deps."carnix"."0.8.11"."regex"}" deps)
332− (crates."rusqlite"."${deps."carnix"."0.8.11"."rusqlite"}" deps)
333− (crates."serde"."${deps."carnix"."0.8.11"."serde"}" deps)
334− (crates."serde_derive"."${deps."carnix"."0.8.11"."serde_derive"}" deps)
335− (crates."serde_json"."${deps."carnix"."0.8.11"."serde_json"}" deps)
336− (crates."tempdir"."${deps."carnix"."0.8.11"."tempdir"}" deps)
337− (crates."toml"."${deps."carnix"."0.8.11"."toml"}" deps)
353+ (crates."clap"."${deps."carnix"."0.9.2"."clap"}" deps)
354+ (crates."dirs"."${deps."carnix"."0.9.2"."dirs"}" deps)
355+ (crates."env_logger"."${deps."carnix"."0.9.2"."env_logger"}" deps)
356+ (crates."error_chain"."${deps."carnix"."0.9.2"."error_chain"}" deps)
357+ (crates."itertools"."${deps."carnix"."0.9.2"."itertools"}" deps)
358+ (crates."log"."${deps."carnix"."0.9.2"."log"}" deps)
359+ (crates."nom"."${deps."carnix"."0.9.2"."nom"}" deps)
360+ (crates."regex"."${deps."carnix"."0.9.2"."regex"}" deps)
361+ (crates."serde"."${deps."carnix"."0.9.2"."serde"}" deps)
362+ (crates."serde_derive"."${deps."carnix"."0.9.2"."serde_derive"}" deps)
363+ (crates."serde_json"."${deps."carnix"."0.9.2"."serde_json"}" deps)
364+ (crates."tempdir"."${deps."carnix"."0.9.2"."tempdir"}" deps)
365+ (crates."toml"."${deps."carnix"."0.9.2"."toml"}" deps)
338366 ]);
339367 };
340− features_.carnix."0.8.11" = deps: f: updateFeatures f (rec {
341− carnix."0.8.11".default = (f.carnix."0.8.11".default or true);
342− clap."${deps.carnix."0.8.11".clap}".default = true;
343− dirs."${deps.carnix."0.8.11".dirs}".default = true;
344− env_logger."${deps.carnix."0.8.11".env_logger}".default = true;
345− error_chain."${deps.carnix."0.8.11".error_chain}".default = true;
346− itertools."${deps.carnix."0.8.11".itertools}".default = true;
347− log."${deps.carnix."0.8.11".log}".default = true;
348− nom."${deps.carnix."0.8.11".nom}".default = true;
349− regex."${deps.carnix."0.8.11".regex}".default = true;
350− rusqlite."${deps.carnix."0.8.11".rusqlite}".default = true;
351− serde."${deps.carnix."0.8.11".serde}".default = true;
352− serde_derive."${deps.carnix."0.8.11".serde_derive}".default = true;
353− serde_json."${deps.carnix."0.8.11".serde_json}".default = true;
354− tempdir."${deps.carnix."0.8.11".tempdir}".default = true;
355− toml."${deps.carnix."0.8.11".toml}".default = true;
368+ features_.carnix."0.9.2" = deps: f: updateFeatures f (rec {
369+ carnix."0.9.2".default = (f.carnix."0.9.2".default or true);
370+ clap."${deps.carnix."0.9.2".clap}".default = true;
371+ dirs."${deps.carnix."0.9.2".dirs}".default = true;
372+ env_logger."${deps.carnix."0.9.2".env_logger}".default = true;
373+ error_chain."${deps.carnix."0.9.2".error_chain}".default = true;
374+ itertools."${deps.carnix."0.9.2".itertools}".default = true;
375+ log."${deps.carnix."0.9.2".log}".default = true;
376+ nom."${deps.carnix."0.9.2".nom}".default = true;
377+ regex."${deps.carnix."0.9.2".regex}".default = true;
378+ serde."${deps.carnix."0.9.2".serde}".default = true;
379+ serde_derive."${deps.carnix."0.9.2".serde_derive}".default = true;
380+ serde_json."${deps.carnix."0.9.2".serde_json}".default = true;
381+ tempdir."${deps.carnix."0.9.2".tempdir}".default = true;
382+ toml."${deps.carnix."0.9.2".toml}".default = true;
356383 }) [
357− (features_.clap."${deps."carnix"."0.8.11"."clap"}" deps)
358− (features_.dirs."${deps."carnix"."0.8.11"."dirs"}" deps)
359− (features_.env_logger."${deps."carnix"."0.8.11"."env_logger"}" deps)
360− (features_.error_chain."${deps."carnix"."0.8.11"."error_chain"}" deps)
361− (features_.itertools."${deps."carnix"."0.8.11"."itertools"}" deps)
362− (features_.log."${deps."carnix"."0.8.11"."log"}" deps)
363− (features_.nom."${deps."carnix"."0.8.11"."nom"}" deps)
364− (features_.regex."${deps."carnix"."0.8.11"."regex"}" deps)
365− (features_.rusqlite."${deps."carnix"."0.8.11"."rusqlite"}" deps)
366− (features_.serde."${deps."carnix"."0.8.11"."serde"}" deps)
367− (features_.serde_derive."${deps."carnix"."0.8.11"."serde_derive"}" deps)
368− (features_.serde_json."${deps."carnix"."0.8.11"."serde_json"}" deps)
369− (features_.tempdir."${deps."carnix"."0.8.11"."tempdir"}" deps)
370− (features_.toml."${deps."carnix"."0.8.11"."toml"}" deps)
384+ (features_.clap."${deps."carnix"."0.9.2"."clap"}" deps)
385+ (features_.dirs."${deps."carnix"."0.9.2"."dirs"}" deps)
386+ (features_.env_logger."${deps."carnix"."0.9.2"."env_logger"}" deps)
387+ (features_.error_chain."${deps."carnix"."0.9.2"."error_chain"}" deps)
388+ (features_.itertools."${deps."carnix"."0.9.2"."itertools"}" deps)
389+ (features_.log."${deps."carnix"."0.9.2"."log"}" deps)
390+ (features_.nom."${deps."carnix"."0.9.2"."nom"}" deps)
391+ (features_.regex."${deps."carnix"."0.9.2"."regex"}" deps)
392+ (features_.serde."${deps."carnix"."0.9.2"."serde"}" deps)
393+ (features_.serde_derive."${deps."carnix"."0.9.2"."serde_derive"}" deps)
394+ (features_.serde_json."${deps."carnix"."0.9.2"."serde_json"}" deps)
395+ (features_.tempdir."${deps."carnix"."0.9.2"."tempdir"}" deps)
396+ (features_.toml."${deps."carnix"."0.9.2"."toml"}" deps)
371397 ];
372398
373399
400+# end
401+# cc-1.0.25
402+
374403 crates.cc."1.0.25" = deps: { features?(features_.cc."1.0.25" deps {}) }: buildRustCrate {
375404 crateName = "cc";
376405 version = "1.0.25";
@@ -391,6 +420,9 @@ rec {
391420 }) [];
392421
393422
423+# end
424+# cfg-if-0.1.6
425+
394426 crates.cfg_if."0.1.6" = deps: { features?(features_.cfg_if."0.1.6" deps {}) }: buildRustCrate {
395427 crateName = "cfg-if";
396428 version = "0.1.6";
@@ -402,6 +434,9 @@ rec {
402434 }) [];
403435
404436
437+# end
438+# clap-2.32.0
439+
405440 crates.clap."2.32.0" = deps: { features?(features_.clap."2.32.0" deps {}) }: buildRustCrate {
406441 crateName = "clap";
407442 version = "2.32.0";
@@ -412,12 +447,12 @@ rec {
412447 (crates."textwrap"."${deps."clap"."2.32.0"."textwrap"}" deps)
413448 (crates."unicode_width"."${deps."clap"."2.32.0"."unicode_width"}" deps)
414449 ]
415− ++ (if features.clap."2.32.0".atty or false then [ (crates.atty."0.2.11" deps) ] else [])
416− ++ (if features.clap."2.32.0".strsim or false then [ (crates.strsim."0.7.0" deps) ] else [])
417− ++ (if features.clap."2.32.0".vec_map or false then [ (crates.vec_map."0.8.1" deps) ] else []))
450+ ++ (if features.clap."2.32.0".atty or false then [ (crates.atty."${deps."clap"."2.32.0".atty}" deps) ] else [])
451+ ++ (if features.clap."2.32.0".strsim or false then [ (crates.strsim."${deps."clap"."2.32.0".strsim}" deps) ] else [])
452+ ++ (if features.clap."2.32.0".vec_map or false then [ (crates.vec_map."${deps."clap"."2.32.0".vec_map}" deps) ] else []))
418453 ++ (if !(kernel == "windows") then mapFeatures features ([
419454 ]
420− ++ (if features.clap."2.32.0".ansi_term or false then [ (crates.ansi_term."0.11.0" deps) ] else [])) else []);
455+ ++ (if features.clap."2.32.0".ansi_term or false then [ (crates.ansi_term."${deps."clap"."2.32.0".ansi_term}" deps) ] else [])) else []);
421456 features = mkFeatures (features."clap"."2.32.0" or {});
422457 };
423458 features_.clap."2.32.0" = deps: f: updateFeatures f (rec {
@@ -469,11 +504,11 @@ rec {
469504 ];
470505 strsim."${deps.clap."2.32.0".strsim}".default = true;
471506 textwrap = fold recursiveUpdate {} [
472− { "${deps.clap."2.32.0".textwrap}".default = true; }
473− { "0.10.0".term_size =
474− (f.textwrap."0.10.0".term_size or false) ||
507+ { "${deps.clap."2.32.0".textwrap}"."term_size" =
508+ (f.textwrap."${deps.clap."2.32.0".textwrap}"."term_size" or false) ||
475509 (clap."2.32.0"."wrap_help" or false) ||
476510 (f."clap"."2.32.0"."wrap_help" or false); }
511+ { "${deps.clap."2.32.0".textwrap}".default = true; }
477512 ];
478513 unicode_width."${deps.clap."2.32.0".unicode_width}".default = true;
479514 vec_map."${deps.clap."2.32.0".vec_map}".default = true;
@@ -488,6 +523,9 @@ rec {
488523 ];
489524
490525
526+# end
527+# constant_time_eq-0.1.3
528+
491529 crates.constant_time_eq."0.1.3" = deps: { features?(features_.constant_time_eq."0.1.3" deps {}) }: buildRustCrate {
492530 crateName = "constant_time_eq";
493531 version = "0.1.3";
@@ -499,6 +537,9 @@ rec {
499537 }) [];
500538
501539
540+# end
541+# dirs-1.0.4
542+
502543 crates.dirs."1.0.4" = deps: { features?(features_.dirs."1.0.4" deps {}) }: buildRustCrate {
503544 crateName = "dirs";
504545 version = "1.0.4";
@@ -533,6 +574,9 @@ rec {
533574 ];
534575
535576
577+# end
578+# either-1.5.0
579+
536580 crates.either."1.5.0" = deps: { features?(features_.either."1.5.0" deps {}) }: buildRustCrate {
537581 crateName = "either";
538582 version = "1.5.0";
@@ -553,6 +597,9 @@ rec {
553597 }) [];
554598
555599
600+# end
601+# env_logger-0.5.13
602+
556603 crates.env_logger."0.5.13" = deps: { features?(features_.env_logger."0.5.13" deps {}) }: buildRustCrate {
557604 crateName = "env_logger";
558605 version = "0.5.13";
@@ -564,7 +611,7 @@ rec {
564611 (crates."log"."${deps."env_logger"."0.5.13"."log"}" deps)
565612 (crates."termcolor"."${deps."env_logger"."0.5.13"."termcolor"}" deps)
566613 ]
567− ++ (if features.env_logger."0.5.13".regex or false then [ (crates.regex."1.0.5" deps) ] else []));
614+ ++ (if features.env_logger."0.5.13".regex or false then [ (crates.regex."${deps."env_logger"."0.5.13".regex}" deps) ] else []));
568615 features = mkFeatures (features."env_logger"."0.5.13" or {});
569616 };
570617 features_.env_logger."0.5.13" = deps: f: updateFeatures f (rec {
@@ -592,6 +639,9 @@ rec {
592639 ];
593640
594641
642+# end
643+# error-chain-0.12.0
644+
595645 crates.error_chain."0.12.0" = deps: { features?(features_.error_chain."0.12.0" deps {}) }: buildRustCrate {
596646 crateName = "error-chain";
597647 version = "0.12.0";
@@ -599,7 +649,7 @@ rec {
599649 sha256 = "1m6wk1r6wqg1mn69bxxvk5k081cb4xy6bfhsxb99rv408x9wjcnl";
600650 dependencies = mapFeatures features ([
601651 ]
602− ++ (if features.error_chain."0.12.0".backtrace or false then [ (crates.backtrace."0.3.9" deps) ] else []));
652+ ++ (if features.error_chain."0.12.0".backtrace or false then [ (crates.backtrace."${deps."error_chain"."0.12.0".backtrace}" deps) ] else []));
603653 features = mkFeatures (features."error_chain"."0.12.0" or {});
604654 };
605655 features_.error_chain."0.12.0" = deps: f: updateFeatures f (rec {
@@ -620,6 +670,9 @@ rec {
620670 ];
621671
622672
673+# end
674+# failure-0.1.3
675+
623676 crates.failure."0.1.3" = deps: { features?(features_.failure."0.1.3" deps {}) }: buildRustCrate {
624677 crateName = "failure";
625678 version = "0.1.3";
@@ -627,8 +680,8 @@ rec {
627680 sha256 = "0cibp01z0clyxrvkl7v7kq6jszsgcg9vwv6d9l6d1drk9jqdss4s";
628681 dependencies = mapFeatures features ([
629682 ]
630− ++ (if features.failure."0.1.3".backtrace or false then [ (crates.backtrace."0.3.9" deps) ] else [])
631− ++ (if features.failure."0.1.3".failure_derive or false then [ (crates.failure_derive."0.1.3" deps) ] else []));
683+ ++ (if features.failure."0.1.3".backtrace or false then [ (crates.backtrace."${deps."failure"."0.1.3".backtrace}" deps) ] else [])
684+ ++ (if features.failure."0.1.3".failure_derive or false then [ (crates.failure_derive."${deps."failure"."0.1.3".failure_derive}" deps) ] else []));
632685 features = mkFeatures (features."failure"."0.1.3" or {});
633686 };
634687 features_.failure."0.1.3" = deps: f: updateFeatures f (rec {
@@ -659,6 +712,9 @@ rec {
659712 ];
660713
661714
715+# end
716+# failure_derive-0.1.3
717+
662718 crates.failure_derive."0.1.3" = deps: { features?(features_.failure_derive."0.1.3" deps {}) }: buildRustCrate {
663719 crateName = "failure_derive";
664720 version = "0.1.3";
@@ -688,6 +744,9 @@ rec {
688744 ];
689745
690746
747+# end
748+# fuchsia-zircon-0.3.3
749+
691750 crates.fuchsia_zircon."0.3.3" = deps: { features?(features_.fuchsia_zircon."0.3.3" deps {}) }: buildRustCrate {
692751 crateName = "fuchsia-zircon";
693752 version = "0.3.3";
@@ -708,6 +767,9 @@ rec {
708767 ];
709768
710769
770+# end
771+# fuchsia-zircon-sys-0.3.3
772+
711773 crates.fuchsia_zircon_sys."0.3.3" = deps: { features?(features_.fuchsia_zircon_sys."0.3.3" deps {}) }: buildRustCrate {
712774 crateName = "fuchsia-zircon-sys";
713775 version = "0.3.3";
@@ -719,6 +781,9 @@ rec {
719781 }) [];
720782
721783
784+# end
785+# humantime-1.1.1
786+
722787 crates.humantime."1.1.1" = deps: { features?(features_.humantime."1.1.1" deps {}) }: buildRustCrate {
723788 crateName = "humantime";
724789 version = "1.1.1";
@@ -737,6 +802,9 @@ rec {
737802 ];
738803
739804
805+# end
806+# itertools-0.7.8
807+
740808 crates.itertools."0.7.8" = deps: { features?(features_.itertools."0.7.8" deps {}) }: buildRustCrate {
741809 crateName = "itertools";
742810 version = "0.7.8";
@@ -761,6 +829,9 @@ rec {
761829 ];
762830
763831
832+# end
833+# itoa-0.4.3
834+
764835 crates.itoa."0.4.3" = deps: { features?(features_.itoa."0.4.3" deps {}) }: buildRustCrate {
765836 crateName = "itoa";
766837 version = "0.4.3";
@@ -779,6 +850,9 @@ rec {
779850 }) [];
780851
781852
853+# end
854+# lazy_static-1.1.0
855+
782856 crates.lazy_static."1.1.0" = deps: { features?(features_.lazy_static."1.1.0" deps {}) }: buildRustCrate {
783857 crateName = "lazy_static";
784858 version = "1.1.0";
@@ -811,6 +885,9 @@ rec {
811885 ];
812886
813887
888+# end
889+# libc-0.2.43
890+
814891 crates.libc."0.2.43" = deps: { features?(features_.libc."0.2.43" deps {}) }: buildRustCrate {
815892 crateName = "libc";
816893 version = "0.2.43";
@@ -829,105 +906,8 @@ rec {
829906 }) [];
830907
831908
832− crates.libsqlite3_sys."0.9.3" = deps: { features?(features_.libsqlite3_sys."0.9.3" deps {}) }: buildRustCrate {
833− crateName = "libsqlite3-sys";
834− version = "0.9.3";
835− authors = [ "John Gallagher <jgallagher@bignerdranch.com>" ];
836− sha256 = "128bv2y342iksv693bffvybr3zzi04vd8p0307zi9wixbdxyp021";
837− build = "build.rs";
838− dependencies = (if abi == "msvc" then mapFeatures features ([
839−]) else []);
840−
841− buildDependencies = mapFeatures features ([
842− ]
843− ++ (if features.libsqlite3_sys."0.9.3".pkg-config or false then [ (crates.pkg_config."0.3.14" deps) ] else []));
844− features = mkFeatures (features."libsqlite3_sys"."0.9.3" or {});
845− };
846− features_.libsqlite3_sys."0.9.3" = deps: f: updateFeatures f (rec {
847− libsqlite3_sys = fold recursiveUpdate {} [
848− { "0.9.3".bindgen =
849− (f.libsqlite3_sys."0.9.3".bindgen or false) ||
850− (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) ||
851− (libsqlite3_sys."0.9.3"."buildtime_bindgen" or false); }
852− { "0.9.3".cc =
853− (f.libsqlite3_sys."0.9.3".cc or false) ||
854− (f.libsqlite3_sys."0.9.3".bundled or false) ||
855− (libsqlite3_sys."0.9.3"."bundled" or false); }
856− { "0.9.3".default = (f.libsqlite3_sys."0.9.3".default or true); }
857− { "0.9.3".min_sqlite_version_3_6_8 =
858− (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_8 or false) ||
859− (f.libsqlite3_sys."0.9.3".default or false) ||
860− (libsqlite3_sys."0.9.3"."default" or false); }
861− { "0.9.3".pkg-config =
862− (f.libsqlite3_sys."0.9.3".pkg-config or false) ||
863− (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) ||
864− (libsqlite3_sys."0.9.3"."buildtime_bindgen" or false) ||
865− (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_11 or false) ||
866− (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_11" or false) ||
867− (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_23 or false) ||
868− (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_23" or false) ||
869− (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_8 or false) ||
870− (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_8" or false) ||
871− (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_16 or false) ||
872− (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_16" or false) ||
873− (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_3 or false) ||
874− (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_3" or false) ||
875− (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_4 or false) ||
876− (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_4" or false) ||
877− (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_7 or false) ||
878− (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_7" or false); }
879− { "0.9.3".vcpkg =
880− (f.libsqlite3_sys."0.9.3".vcpkg or false) ||
881− (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) ||
882− (libsqlite3_sys."0.9.3"."buildtime_bindgen" or false) ||
883− (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_11 or false) ||
884− (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_11" or false) ||
885− (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_23 or false) ||
886− (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_23" or false) ||
887− (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_8 or false) ||
888− (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_8" or false) ||
889− (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_16 or false) ||
890− (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_16" or false) ||
891− (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_3 or false) ||
892− (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_3" or false) ||
893− (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_4 or false) ||
894− (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_4" or false) ||
895− (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_7 or false) ||
896− (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_7" or false); }
897− ];
898− pkg_config."${deps.libsqlite3_sys."0.9.3".pkg_config}".default = true;
899− }) [
900− (features_.pkg_config."${deps."libsqlite3_sys"."0.9.3"."pkg_config"}" deps)
901− ];
902−
903−
904− crates.linked_hash_map."0.4.2" = deps: { features?(features_.linked_hash_map."0.4.2" deps {}) }: buildRustCrate {
905− crateName = "linked-hash-map";
906− version = "0.4.2";
907− authors = [ "Stepan Koltsov <stepan.koltsov@gmail.com>" "Andrew Paseltiner <apaseltiner@gmail.com>" ];
908− sha256 = "04da208h6jb69f46j37jnvsw2i1wqplglp4d61csqcrhh83avbgl";
909− dependencies = mapFeatures features ([
910−]);
911− features = mkFeatures (features."linked_hash_map"."0.4.2" or {});
912− };
913− features_.linked_hash_map."0.4.2" = deps: f: updateFeatures f (rec {
914− linked_hash_map = fold recursiveUpdate {} [
915− { "0.4.2".default = (f.linked_hash_map."0.4.2".default or true); }
916− { "0.4.2".heapsize =
917− (f.linked_hash_map."0.4.2".heapsize or false) ||
918− (f.linked_hash_map."0.4.2".heapsize_impl or false) ||
919− (linked_hash_map."0.4.2"."heapsize_impl" or false); }
920− { "0.4.2".serde =
921− (f.linked_hash_map."0.4.2".serde or false) ||
922− (f.linked_hash_map."0.4.2".serde_impl or false) ||
923− (linked_hash_map."0.4.2"."serde_impl" or false); }
924− { "0.4.2".serde_test =
925− (f.linked_hash_map."0.4.2".serde_test or false) ||
926− (f.linked_hash_map."0.4.2".serde_impl or false) ||
927− (linked_hash_map."0.4.2"."serde_impl" or false); }
928− ];
929− }) [];
930−
909+# end
910+# log-0.4.5
931911
932912 crates.log."0.4.5" = deps: { features?(features_.log."0.4.5" deps {}) }: buildRustCrate {
933913 crateName = "log";
@@ -947,35 +927,8 @@ rec {
947927 ];
948928
949929
950− crates.lru_cache."0.1.1" = deps: { features?(features_.lru_cache."0.1.1" deps {}) }: buildRustCrate {
951− crateName = "lru-cache";
952− version = "0.1.1";
953− authors = [ "Stepan Koltsov <stepan.koltsov@gmail.com>" ];
954− sha256 = "1hl6kii1g54sq649gnscv858mmw7a02xj081l4vcgvrswdi2z8fw";
955− dependencies = mapFeatures features ([
956− (crates."linked_hash_map"."${deps."lru_cache"."0.1.1"."linked_hash_map"}" deps)
957− ]);
958− features = mkFeatures (features."lru_cache"."0.1.1" or {});
959− };
960− features_.lru_cache."0.1.1" = deps: f: updateFeatures f (rec {
961− linked_hash_map = fold recursiveUpdate {} [
962− { "${deps.lru_cache."0.1.1".linked_hash_map}".default = true; }
963− { "0.4.2".heapsize_impl =
964− (f.linked_hash_map."0.4.2".heapsize_impl or false) ||
965− (lru_cache."0.1.1"."heapsize_impl" or false) ||
966− (f."lru_cache"."0.1.1"."heapsize_impl" or false); }
967− ];
968− lru_cache = fold recursiveUpdate {} [
969− { "0.1.1".default = (f.lru_cache."0.1.1".default or true); }
970− { "0.1.1".heapsize =
971− (f.lru_cache."0.1.1".heapsize or false) ||
972− (f.lru_cache."0.1.1".heapsize_impl or false) ||
973− (lru_cache."0.1.1"."heapsize_impl" or false); }
974− ];
975− }) [
976− (features_.linked_hash_map."${deps."lru_cache"."0.1.1"."linked_hash_map"}" deps)
977− ];
978−
930+# end
931+# memchr-1.0.2
979932
980933 crates.memchr."1.0.2" = deps: { features?(features_.memchr."1.0.2" deps {}) }: buildRustCrate {
981934 crateName = "memchr";
@@ -984,16 +937,16 @@ rec {
984937 sha256 = "0dfb8ifl9nrc9kzgd5z91q6qg87sh285q1ih7xgrsglmqfav9lg7";
985938 dependencies = mapFeatures features ([
986939 ]
987− ++ (if features.memchr."1.0.2".libc or false then [ (crates.libc."0.2.43" deps) ] else []));
940+ ++ (if features.memchr."1.0.2".libc or false then [ (crates.libc."${deps."memchr"."1.0.2".libc}" deps) ] else []));
988941 features = mkFeatures (features."memchr"."1.0.2" or {});
989942 };
990943 features_.memchr."1.0.2" = deps: f: updateFeatures f (rec {
991944 libc = fold recursiveUpdate {} [
992− { "${deps.memchr."1.0.2".libc}".default = (f.libc."${deps.memchr."1.0.2".libc}".default or false); }
993− { "0.2.43".use_std =
994− (f.libc."0.2.43".use_std or false) ||
945+ { "${deps.memchr."1.0.2".libc}"."use_std" =
946+ (f.libc."${deps.memchr."1.0.2".libc}"."use_std" or false) ||
995947 (memchr."1.0.2"."use_std" or false) ||
996948 (f."memchr"."1.0.2"."use_std" or false); }
949+ { "${deps.memchr."1.0.2".libc}".default = (f.libc."${deps.memchr."1.0.2".libc}".default or false); }
997950 ];
998951 memchr = fold recursiveUpdate {} [
999952 { "1.0.2".default = (f.memchr."1.0.2".default or true); }
@@ -1013,6 +966,9 @@ rec {
1013966 ];
1014967
1015968
969+# end
970+# memchr-2.1.0
971+
1016972 crates.memchr."2.1.0" = deps: { features?(features_.memchr."2.1.0" deps {}) }: buildRustCrate {
1017973 crateName = "memchr";
1018974 version = "2.1.0";
@@ -1021,7 +977,7 @@ rec {
1021977 dependencies = mapFeatures features ([
1022978 (crates."cfg_if"."${deps."memchr"."2.1.0"."cfg_if"}" deps)
1023979 ]
1024− ++ (if features.memchr."2.1.0".libc or false then [ (crates.libc."0.2.43" deps) ] else []));
980+ ++ (if features.memchr."2.1.0".libc or false then [ (crates.libc."${deps."memchr"."2.1.0".libc}" deps) ] else []));
1025981
1026982 buildDependencies = mapFeatures features ([
1027983 (crates."version_check"."${deps."memchr"."2.1.0"."version_check"}" deps)
@@ -1031,11 +987,11 @@ rec {
1031987 features_.memchr."2.1.0" = deps: f: updateFeatures f (rec {
1032988 cfg_if."${deps.memchr."2.1.0".cfg_if}".default = true;
1033989 libc = fold recursiveUpdate {} [
1034− { "${deps.memchr."2.1.0".libc}".default = (f.libc."${deps.memchr."2.1.0".libc}".default or false); }
1035− { "0.2.43".use_std =
1036− (f.libc."0.2.43".use_std or false) ||
990+ { "${deps.memchr."2.1.0".libc}"."use_std" =
991+ (f.libc."${deps.memchr."2.1.0".libc}"."use_std" or false) ||
1037992 (memchr."2.1.0"."use_std" or false) ||
1038993 (f."memchr"."2.1.0"."use_std" or false); }
994+ { "${deps.memchr."2.1.0".libc}".default = (f.libc."${deps.memchr."2.1.0".libc}".default or false); }
1039995 ];
1040996 memchr = fold recursiveUpdate {} [
1041997 { "2.1.0".default = (f.memchr."2.1.0".default or true); }
@@ -1058,6 +1014,9 @@ rec {
10581014 ];
10591015
10601016
1017+# end
1018+# nodrop-0.1.12
1019+
10611020 crates.nodrop."0.1.12" = deps: { features?(features_.nodrop."0.1.12" deps {}) }: buildRustCrate {
10621021 crateName = "nodrop";
10631022 version = "0.1.12";
@@ -1082,6 +1041,9 @@ rec {
10821041 }) [];
10831042
10841043
1044+# end
1045+# nom-3.2.1
1046+
10851047 crates.nom."3.2.1" = deps: { features?(features_.nom."3.2.1" deps {}) }: buildRustCrate {
10861048 crateName = "nom";
10871049 version = "3.2.1";
@@ -1094,11 +1056,11 @@ rec {
10941056 };
10951057 features_.nom."3.2.1" = deps: f: updateFeatures f (rec {
10961058 memchr = fold recursiveUpdate {} [
1097− { "${deps.nom."3.2.1".memchr}".default = (f.memchr."${deps.nom."3.2.1".memchr}".default or false); }
1098− { "1.0.2".use_std =
1099− (f.memchr."1.0.2".use_std or false) ||
1059+ { "${deps.nom."3.2.1".memchr}"."use_std" =
1060+ (f.memchr."${deps.nom."3.2.1".memchr}"."use_std" or false) ||
11001061 (nom."3.2.1"."std" or false) ||
11011062 (f."nom"."3.2.1"."std" or false); }
1063+ { "${deps.nom."3.2.1".memchr}".default = (f.memchr."${deps.nom."3.2.1".memchr}".default or false); }
11021064 ];
11031065 nom = fold recursiveUpdate {} [
11041066 { "3.2.1".compiler_error =
@@ -1132,16 +1094,8 @@ rec {
11321094 ];
11331095
11341096
1135− crates.pkg_config."0.3.14" = deps: { features?(features_.pkg_config."0.3.14" deps {}) }: buildRustCrate {
1136− crateName = "pkg-config";
1137− version = "0.3.14";
1138− authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
1139− sha256 = "0207fsarrm412j0dh87lfcas72n8mxar7q3mgflsbsrqnb140sv6";
1140− };
1141− features_.pkg_config."0.3.14" = deps: f: updateFeatures f (rec {
1142− pkg_config."0.3.14".default = (f.pkg_config."0.3.14".default or true);
1143− }) [];
1144−
1097+# end
1098+# proc-macro2-0.4.20
11451099
11461100 crates.proc_macro2."0.4.20" = deps: { features?(features_.proc_macro2."0.4.20" deps {}) }: buildRustCrate {
11471101 crateName = "proc-macro2";
@@ -1170,6 +1124,9 @@ rec {
11701124 ];
11711125
11721126
1127+# end
1128+# quick-error-1.2.2
1129+
11731130 crates.quick_error."1.2.2" = deps: { features?(features_.quick_error."1.2.2" deps {}) }: buildRustCrate {
11741131 crateName = "quick-error";
11751132 version = "1.2.2";
@@ -1181,6 +1138,9 @@ rec {
11811138 }) [];
11821139
11831140
1141+# end
1142+# quote-0.6.8
1143+
11841144 crates.quote."0.6.8" = deps: { features?(features_.quote."0.6.8" deps {}) }: buildRustCrate {
11851145 crateName = "quote";
11861146 version = "0.6.8";
@@ -1193,11 +1153,11 @@ rec {
11931153 };
11941154 features_.quote."0.6.8" = deps: f: updateFeatures f (rec {
11951155 proc_macro2 = fold recursiveUpdate {} [
1196− { "${deps.quote."0.6.8".proc_macro2}".default = (f.proc_macro2."${deps.quote."0.6.8".proc_macro2}".default or false); }
1197− { "0.4.20".proc-macro =
1198− (f.proc_macro2."0.4.20".proc-macro or false) ||
1156+ { "${deps.quote."0.6.8".proc_macro2}"."proc-macro" =
1157+ (f.proc_macro2."${deps.quote."0.6.8".proc_macro2}"."proc-macro" or false) ||
11991158 (quote."0.6.8"."proc-macro" or false) ||
12001159 (f."quote"."0.6.8"."proc-macro" or false); }
1160+ { "${deps.quote."0.6.8".proc_macro2}".default = (f.proc_macro2."${deps.quote."0.6.8".proc_macro2}".default or false); }
12011161 ];
12021162 quote = fold recursiveUpdate {} [
12031163 { "0.6.8".default = (f.quote."0.6.8".default or true); }
@@ -1211,6 +1171,9 @@ rec {
12111171 ];
12121172
12131173
1174+# end
1175+# rand-0.4.3
1176+
12141177 crates.rand."0.4.3" = deps: { features?(features_.rand."0.4.3" deps {}) }: buildRustCrate {
12151178 crateName = "rand";
12161179 version = "0.4.3";
@@ -1221,7 +1184,7 @@ rec {
12211184 ]) else [])
12221185 ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([
12231186 ]
1224− ++ (if features.rand."0.4.3".libc or false then [ (crates.libc."0.2.43" deps) ] else [])) else [])
1187+ ++ (if features.rand."0.4.3".libc or false then [ (crates.libc."${deps."rand"."0.4.3".libc}" deps) ] else [])) else [])
12251188 ++ (if kernel == "windows" then mapFeatures features ([
12261189 (crates."winapi"."${deps."rand"."0.4.3"."winapi"}" deps)
12271190 ]) else []);
@@ -1259,6 +1222,9 @@ rec {
12591222 ];
12601223
12611224
1225+# end
1226+# redox_syscall-0.1.40
1227+
12621228 crates.redox_syscall."0.1.40" = deps: { features?(features_.redox_syscall."0.1.40" deps {}) }: buildRustCrate {
12631229 crateName = "redox_syscall";
12641230 version = "0.1.40";
@@ -1271,6 +1237,9 @@ rec {
12711237 }) [];
12721238
12731239
1240+# end
1241+# redox_termios-0.1.1
1242+
12741243 crates.redox_termios."0.1.1" = deps: { features?(features_.redox_termios."0.1.1" deps {}) }: buildRustCrate {
12751244 crateName = "redox_termios";
12761245 version = "0.1.1";
@@ -1289,6 +1258,9 @@ rec {
12891258 ];
12901259
12911260
1261+# end
1262+# redox_users-0.2.0
1263+
12921264 crates.redox_users."0.2.0" = deps: { features?(features_.redox_users."0.2.0" deps {}) }: buildRustCrate {
12931265 crateName = "redox_users";
12941266 version = "0.2.0";
@@ -1315,6 +1287,9 @@ rec {
13151287 ];
13161288
13171289
1290+# end
1291+# regex-1.0.5
1292+
13181293 crates.regex."1.0.5" = deps: { features?(features_.regex."1.0.5" deps {}) }: buildRustCrate {
13191294 crateName = "regex";
13201295 version = "1.0.5";
@@ -1355,6 +1330,9 @@ rec {
13551330 ];
13561331
13571332
1333+# end
1334+# regex-syntax-0.6.2
1335+
13581336 crates.regex_syntax."0.6.2" = deps: { features?(features_.regex_syntax."0.6.2" deps {}) }: buildRustCrate {
13591337 crateName = "regex-syntax";
13601338 version = "0.6.2";
@@ -1372,6 +1350,9 @@ rec {
13721350 ];
13731351
13741352
1353+# end
1354+# remove_dir_all-0.5.1
1355+
13751356 crates.remove_dir_all."0.5.1" = deps: { features?(features_.remove_dir_all."0.5.1" deps {}) }: buildRustCrate {
13761357 crateName = "remove_dir_all";
13771358 version = "0.5.1";
@@ -1396,90 +1377,8 @@ rec {
13961377 ];
13971378
13981379
1399− crates.rusqlite."0.14.0" = deps: { features?(features_.rusqlite."0.14.0" deps {}) }: buildRustCrate {
1400− crateName = "rusqlite";
1401− version = "0.14.0";
1402− authors = [ "John Gallagher <jgallagher@bignerdranch.com>" ];
1403− sha256 = "06j1z8yicn6jg8irxclsvgp0575gz5k24jgnbk0d807i5gvsg9jq";
1404− dependencies = mapFeatures features ([
1405− (crates."bitflags"."${deps."rusqlite"."0.14.0"."bitflags"}" deps)
1406− (crates."libsqlite3_sys"."${deps."rusqlite"."0.14.0"."libsqlite3_sys"}" deps)
1407− (crates."lru_cache"."${deps."rusqlite"."0.14.0"."lru_cache"}" deps)
1408− (crates."time"."${deps."rusqlite"."0.14.0"."time"}" deps)
1409− ]);
1410− features = mkFeatures (features."rusqlite"."0.14.0" or {});
1411− };
1412− features_.rusqlite."0.14.0" = deps: f: updateFeatures f (rec {
1413− bitflags."${deps.rusqlite."0.14.0".bitflags}".default = true;
1414− libsqlite3_sys = fold recursiveUpdate {} [
1415− { "${deps.rusqlite."0.14.0".libsqlite3_sys}".default = true; }
1416− { "0.9.3".buildtime_bindgen =
1417− (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) ||
1418− (rusqlite."0.14.0"."buildtime_bindgen" or false) ||
1419− (f."rusqlite"."0.14.0"."buildtime_bindgen" or false); }
1420− { "0.9.3".bundled =
1421− (f.libsqlite3_sys."0.9.3".bundled or false) ||
1422− (rusqlite."0.14.0"."bundled" or false) ||
1423− (f."rusqlite"."0.14.0"."bundled" or false); }
1424− { "0.9.3".min_sqlite_version_3_6_11 =
1425− (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_11 or false) ||
1426− (rusqlite."0.14.0"."backup" or false) ||
1427− (f."rusqlite"."0.14.0"."backup" or false); }
1428− { "0.9.3".min_sqlite_version_3_6_23 =
1429− (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_23 or false) ||
1430− (rusqlite."0.14.0"."trace" or false) ||
1431− (f."rusqlite"."0.14.0"."trace" or false); }
1432− { "0.9.3".min_sqlite_version_3_7_3 =
1433− (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_3 or false) ||
1434− (rusqlite."0.14.0"."functions" or false) ||
1435− (f."rusqlite"."0.14.0"."functions" or false); }
1436− { "0.9.3".min_sqlite_version_3_7_4 =
1437− (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_4 or false) ||
1438− (rusqlite."0.14.0"."blob" or false) ||
1439− (f."rusqlite"."0.14.0"."blob" or false); }
1440− { "0.9.3".min_sqlite_version_3_7_7 =
1441− (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_7 or false) ||
1442− (rusqlite."0.14.0"."vtab" or false) ||
1443− (f."rusqlite"."0.14.0"."vtab" or false); }
1444− { "0.9.3".sqlcipher =
1445− (f.libsqlite3_sys."0.9.3".sqlcipher or false) ||
1446− (rusqlite."0.14.0"."sqlcipher" or false) ||
1447− (f."rusqlite"."0.14.0"."sqlcipher" or false); }
1448− { "0.9.3".unlock_notify =
1449− (f.libsqlite3_sys."0.9.3".unlock_notify or false) ||
1450− (rusqlite."0.14.0"."unlock_notify" or false) ||
1451− (f."rusqlite"."0.14.0"."unlock_notify" or false); }
1452− ];
1453− lru_cache."${deps.rusqlite."0.14.0".lru_cache}".default = true;
1454− rusqlite = fold recursiveUpdate {} [
1455− { "0.14.0".bundled =
1456− (f.rusqlite."0.14.0".bundled or false) ||
1457− (f.rusqlite."0.14.0".array or false) ||
1458− (rusqlite."0.14.0"."array" or false); }
1459− { "0.14.0".csv =
1460− (f.rusqlite."0.14.0".csv or false) ||
1461− (f.rusqlite."0.14.0".csvtab or false) ||
1462− (rusqlite."0.14.0"."csvtab" or false); }
1463− { "0.14.0".default = (f.rusqlite."0.14.0".default or true); }
1464− { "0.14.0".lazy_static =
1465− (f.rusqlite."0.14.0".lazy_static or false) ||
1466− (f.rusqlite."0.14.0".vtab or false) ||
1467− (rusqlite."0.14.0"."vtab" or false); }
1468− { "0.14.0".vtab =
1469− (f.rusqlite."0.14.0".vtab or false) ||
1470− (f.rusqlite."0.14.0".array or false) ||
1471− (rusqlite."0.14.0"."array" or false) ||
1472− (f.rusqlite."0.14.0".csvtab or false) ||
1473− (rusqlite."0.14.0"."csvtab" or false); }
1474− ];
1475− time."${deps.rusqlite."0.14.0".time}".default = true;
1476− }) [
1477− (features_.bitflags."${deps."rusqlite"."0.14.0"."bitflags"}" deps)
1478− (features_.libsqlite3_sys."${deps."rusqlite"."0.14.0"."libsqlite3_sys"}" deps)
1479− (features_.lru_cache."${deps."rusqlite"."0.14.0"."lru_cache"}" deps)
1480− (features_.time."${deps."rusqlite"."0.14.0"."time"}" deps)
1481− ];
1482−
1380+# end
1381+# rustc-demangle-0.1.9
14831382
14841383 crates.rustc_demangle."0.1.9" = deps: { features?(features_.rustc_demangle."0.1.9" deps {}) }: buildRustCrate {
14851384 crateName = "rustc-demangle";
@@ -1492,6 +1391,9 @@ rec {
14921391 }) [];
14931392
14941393
1394+# end
1395+# ryu-0.2.6
1396+
14951397 crates.ryu."0.2.6" = deps: { features?(features_.ryu."0.2.6" deps {}) }: buildRustCrate {
14961398 crateName = "ryu";
14971399 version = "0.2.6";
@@ -1507,6 +1409,9 @@ rec {
15071409 }) [];
15081410
15091411
1412+# end
1413+# scoped_threadpool-0.1.9
1414+
15101415 crates.scoped_threadpool."0.1.9" = deps: { features?(features_.scoped_threadpool."0.1.9" deps {}) }: buildRustCrate {
15111416 crateName = "scoped_threadpool";
15121417 version = "0.1.9";
@@ -1519,6 +1424,9 @@ rec {
15191424 }) [];
15201425
15211426
1427+# end
1428+# serde-1.0.80
1429+
15221430 crates.serde."1.0.80" = deps: { features?(features_.serde."1.0.80" deps {}) }: buildRustCrate {
15231431 crateName = "serde";
15241432 version = "1.0.80";
@@ -1548,6 +1456,9 @@ rec {
15481456 }) [];
15491457
15501458
1459+# end
1460+# serde_derive-1.0.80
1461+
15511462 crates.serde_derive."1.0.80" = deps: { features?(features_.serde_derive."1.0.80" deps {}) }: buildRustCrate {
15521463 crateName = "serde_derive";
15531464 version = "1.0.80";
@@ -1576,6 +1487,9 @@ rec {
15761487 ];
15771488
15781489
1490+# end
1491+# serde_json-1.0.32
1492+
15791493 crates.serde_json."1.0.32" = deps: { features?(features_.serde_json."1.0.32" deps {}) }: buildRustCrate {
15801494 crateName = "serde_json";
15811495 version = "1.0.32";
@@ -1606,6 +1520,9 @@ rec {
16061520 ];
16071521
16081522
1523+# end
1524+# strsim-0.7.0
1525+
16091526 crates.strsim."0.7.0" = deps: { features?(features_.strsim."0.7.0" deps {}) }: buildRustCrate {
16101527 crateName = "strsim";
16111528 version = "0.7.0";
@@ -1617,6 +1534,9 @@ rec {
16171534 }) [];
16181535
16191536
1537+# end
1538+# syn-0.15.13
1539+
16201540 crates.syn."0.15.13" = deps: { features?(features_.syn."0.15.13" deps {}) }: buildRustCrate {
16211541 crateName = "syn";
16221542 version = "0.15.13";
@@ -1626,23 +1546,23 @@ rec {
16261546 (crates."proc_macro2"."${deps."syn"."0.15.13"."proc_macro2"}" deps)
16271547 (crates."unicode_xid"."${deps."syn"."0.15.13"."unicode_xid"}" deps)
16281548 ]
1629− ++ (if features.syn."0.15.13".quote or false then [ (crates.quote."0.6.8" deps) ] else []));
1549+ ++ (if features.syn."0.15.13".quote or false then [ (crates.quote."${deps."syn"."0.15.13".quote}" deps) ] else []));
16301550 features = mkFeatures (features."syn"."0.15.13" or {});
16311551 };
16321552 features_.syn."0.15.13" = deps: f: updateFeatures f (rec {
16331553 proc_macro2 = fold recursiveUpdate {} [
1634− { "${deps.syn."0.15.13".proc_macro2}".default = (f.proc_macro2."${deps.syn."0.15.13".proc_macro2}".default or false); }
1635− { "0.4.20".proc-macro =
1636− (f.proc_macro2."0.4.20".proc-macro or false) ||
1554+ { "${deps.syn."0.15.13".proc_macro2}"."proc-macro" =
1555+ (f.proc_macro2."${deps.syn."0.15.13".proc_macro2}"."proc-macro" or false) ||
16371556 (syn."0.15.13"."proc-macro" or false) ||
16381557 (f."syn"."0.15.13"."proc-macro" or false); }
1558+ { "${deps.syn."0.15.13".proc_macro2}".default = (f.proc_macro2."${deps.syn."0.15.13".proc_macro2}".default or false); }
16391559 ];
16401560 quote = fold recursiveUpdate {} [
1641− { "${deps.syn."0.15.13".quote}".default = (f.quote."${deps.syn."0.15.13".quote}".default or false); }
1642− { "0.6.8".proc-macro =
1643− (f.quote."0.6.8".proc-macro or false) ||
1561+ { "${deps.syn."0.15.13".quote}"."proc-macro" =
1562+ (f.quote."${deps.syn."0.15.13".quote}"."proc-macro" or false) ||
16441563 (syn."0.15.13"."proc-macro" or false) ||
16451564 (f."syn"."0.15.13"."proc-macro" or false); }
1565+ { "${deps.syn."0.15.13".quote}".default = (f.quote."${deps.syn."0.15.13".quote}".default or false); }
16461566 ];
16471567 syn = fold recursiveUpdate {} [
16481568 { "0.15.13".clone-impls =
@@ -1679,6 +1599,9 @@ rec {
16791599 ];
16801600
16811601
1602+# end
1603+# synstructure-0.10.0
1604+
16821605 crates.synstructure."0.10.0" = deps: { features?(features_.synstructure."0.10.0" deps {}) }: buildRustCrate {
16831606 crateName = "synstructure";
16841607 version = "0.10.0";
@@ -1710,6 +1633,9 @@ rec {
17101633 ];
17111634
17121635
1636+# end
1637+# tempdir-0.3.7
1638+
17131639 crates.tempdir."0.3.7" = deps: { features?(features_.tempdir."0.3.7" deps {}) }: buildRustCrate {
17141640 crateName = "tempdir";
17151641 version = "0.3.7";
@@ -1730,6 +1656,9 @@ rec {
17301656 ];
17311657
17321658
1659+# end
1660+# termcolor-1.0.4
1661+
17331662 crates.termcolor."1.0.4" = deps: { features?(features_.termcolor."1.0.4" deps {}) }: buildRustCrate {
17341663 crateName = "termcolor";
17351664 version = "1.0.4";
@@ -1747,6 +1676,9 @@ rec {
17471676 ];
17481677
17491678
1679+# end
1680+# termion-1.5.1
1681+
17501682 crates.termion."1.5.1" = deps: { features?(features_.termion."1.5.1" deps {}) }: buildRustCrate {
17511683 crateName = "termion";
17521684 version = "1.5.1";
@@ -1772,6 +1704,9 @@ rec {
17721704 ];
17731705
17741706
1707+# end
1708+# textwrap-0.10.0
1709+
17751710 crates.textwrap."0.10.0" = deps: { features?(features_.textwrap."0.10.0" deps {}) }: buildRustCrate {
17761711 crateName = "textwrap";
17771712 version = "0.10.0";
@@ -1789,6 +1724,9 @@ rec {
17891724 ];
17901725
17911726
1727+# end
1728+# thread_local-0.3.6
1729+
17921730 crates.thread_local."0.3.6" = deps: { features?(features_.thread_local."0.3.6" deps {}) }: buildRustCrate {
17931731 crateName = "thread_local";
17941732 version = "0.3.6";
@@ -1806,41 +1744,8 @@ rec {
18061744 ];
18071745
18081746
1809− crates.time."0.1.40" = deps: { features?(features_.time."0.1.40" deps {}) }: buildRustCrate {
1810− crateName = "time";
1811− version = "0.1.40";
1812− authors = [ "The Rust Project Developers" ];
1813− sha256 = "0wgnbjamljz6bqxsd5axc4p2mmhkqfrryj4gf2yswjaxiw5dd01m";
1814− dependencies = mapFeatures features ([
1815− (crates."libc"."${deps."time"."0.1.40"."libc"}" deps)
1816− ])
1817− ++ (if kernel == "redox" then mapFeatures features ([
1818− (crates."redox_syscall"."${deps."time"."0.1.40"."redox_syscall"}" deps)
1819− ]) else [])
1820− ++ (if kernel == "windows" then mapFeatures features ([
1821− (crates."winapi"."${deps."time"."0.1.40"."winapi"}" deps)
1822− ]) else []);
1823− };
1824− features_.time."0.1.40" = deps: f: updateFeatures f (rec {
1825− libc."${deps.time."0.1.40".libc}".default = true;
1826− redox_syscall."${deps.time."0.1.40".redox_syscall}".default = true;
1827− time."0.1.40".default = (f.time."0.1.40".default or true);
1828− winapi = fold recursiveUpdate {} [
1829− { "${deps.time."0.1.40".winapi}"."minwinbase" = true; }
1830− { "${deps.time."0.1.40".winapi}"."minwindef" = true; }
1831− { "${deps.time."0.1.40".winapi}"."ntdef" = true; }
1832− { "${deps.time."0.1.40".winapi}"."profileapi" = true; }
1833− { "${deps.time."0.1.40".winapi}"."std" = true; }
1834− { "${deps.time."0.1.40".winapi}"."sysinfoapi" = true; }
1835− { "${deps.time."0.1.40".winapi}"."timezoneapi" = true; }
1836− { "${deps.time."0.1.40".winapi}".default = true; }
1837− ];
1838− }) [
1839− (features_.libc."${deps."time"."0.1.40"."libc"}" deps)
1840− (features_.redox_syscall."${deps."time"."0.1.40"."redox_syscall"}" deps)
1841− (features_.winapi."${deps."time"."0.1.40"."winapi"}" deps)
1842− ];
1843−
1747+# end
1748+# toml-0.4.8
18441749
18451750 crates.toml."0.4.8" = deps: { features?(features_.toml."0.4.8" deps {}) }: buildRustCrate {
18461751 crateName = "toml";
@@ -1859,6 +1764,9 @@ rec {
18591764 ];
18601765
18611766
1767+# end
1768+# ucd-util-0.1.1
1769+
18621770 crates.ucd_util."0.1.1" = deps: { features?(features_.ucd_util."0.1.1" deps {}) }: buildRustCrate {
18631771 crateName = "ucd-util";
18641772 version = "0.1.1";
@@ -1870,6 +1778,9 @@ rec {
18701778 }) [];
18711779
18721780
1781+# end
1782+# unicode-width-0.1.5
1783+
18731784 crates.unicode_width."0.1.5" = deps: { features?(features_.unicode_width."0.1.5" deps {}) }: buildRustCrate {
18741785 crateName = "unicode-width";
18751786 version = "0.1.5";
@@ -1882,6 +1793,9 @@ rec {
18821793 }) [];
18831794
18841795
1796+# end
1797+# unicode-xid-0.1.0
1798+
18851799 crates.unicode_xid."0.1.0" = deps: { features?(features_.unicode_xid."0.1.0" deps {}) }: buildRustCrate {
18861800 crateName = "unicode-xid";
18871801 version = "0.1.0";
@@ -1894,6 +1808,9 @@ rec {
18941808 }) [];
18951809
18961810
1811+# end
1812+# utf8-ranges-1.0.1
1813+
18971814 crates.utf8_ranges."1.0.1" = deps: { features?(features_.utf8_ranges."1.0.1" deps {}) }: buildRustCrate {
18981815 crateName = "utf8-ranges";
18991816 version = "1.0.1";
@@ -1905,16 +1822,8 @@ rec {
19051822 }) [];
19061823
19071824
1908− crates.vcpkg."0.2.6" = deps: { features?(features_.vcpkg."0.2.6" deps {}) }: buildRustCrate {
1909− crateName = "vcpkg";
1910− version = "0.2.6";
1911− authors = [ "Jim McGrath <jimmc2@gmail.com>" ];
1912− sha256 = "1ig6jqpzzl1z9vk4qywgpfr4hfbd8ny8frqsgm3r449wkc4n1i5x";
1913− };
1914− features_.vcpkg."0.2.6" = deps: f: updateFeatures f (rec {
1915− vcpkg."0.2.6".default = (f.vcpkg."0.2.6".default or true);
1916− }) [];
1917−
1825+# end
1826+# vec_map-0.8.1
19181827
19191828 crates.vec_map."0.8.1" = deps: { features?(features_.vec_map."0.8.1" deps {}) }: buildRustCrate {
19201829 crateName = "vec_map";
@@ -1936,6 +1845,9 @@ rec {
19361845 }) [];
19371846
19381847
1848+# end
1849+# version_check-0.1.5
1850+
19391851 crates.version_check."0.1.5" = deps: { features?(features_.version_check."0.1.5" deps {}) }: buildRustCrate {
19401852 crateName = "version_check";
19411853 version = "0.1.5";
@@ -1947,6 +1859,9 @@ rec {
19471859 }) [];
19481860
19491861
1862+# end
1863+# winapi-0.3.6
1864+
19501865 crates.winapi."0.3.6" = deps: { features?(features_.winapi."0.3.6" deps {}) }: buildRustCrate {
19511866 crateName = "winapi";
19521867 version = "0.3.6";
@@ -1971,6 +1886,9 @@ rec {
19711886 ];
19721887
19731888
1889+# end
1890+# winapi-i686-pc-windows-gnu-0.4.0
1891+
19741892 crates.winapi_i686_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_i686_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate {
19751893 crateName = "winapi-i686-pc-windows-gnu";
19761894 version = "0.4.0";
@@ -1983,6 +1901,9 @@ rec {
19831901 }) [];
19841902
19851903
1904+# end
1905+# winapi-util-0.1.1
1906+
19861907 crates.winapi_util."0.1.1" = deps: { features?(features_.winapi_util."0.1.1" deps {}) }: buildRustCrate {
19871908 crateName = "winapi-util";
19881909 version = "0.1.1";
@@ -2011,6 +1932,9 @@ rec {
20111932 ];
20121933
20131934
1935+# end
1936+# winapi-x86_64-pc-windows-gnu-0.4.0
1937+
20141938 crates.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_x86_64_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate {
20151939 crateName = "winapi-x86_64-pc-windows-gnu";
20161940 version = "0.4.0";
@@ -2023,6 +1947,9 @@ rec {
20231947 }) [];
20241948
20251949
1950+# end
1951+# wincolor-1.0.1
1952+
20261953 crates.wincolor."1.0.1" = deps: { features?(features_.wincolor."1.0.1" deps {}) }: buildRustCrate {
20271954 crateName = "wincolor";
20281955 version = "1.0.1";
@@ -2047,4 +1974,5 @@ rec {
20471974 ];
20481975
20491976
1977+# end
20501978}
pkgs/build-support/writers/default.nix+86−63
@@ -8,19 +8,54 @@ rec {
88 # Examples:
99 # writeBash = makeScriptWriter { interpreter = "${pkgs.bash}/bin/bash"; }
1010 # makeScriptWriter { interpreter = "${pkgs.dash}/bin/dash"; } "hello" "echo hello world"
11− makeScriptWriter = { interpreter, check ? "" }: name: text:
12− assert lib.or (types.path.check name) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" name != null);
13−
14− pkgs.writeTextFile {
15− name = last (builtins.split "/" name);
16− executable = true;
17− destination = if types.path.check name then name else "";
18− text = ''
19− #! ${interpreter}
20− ${text}
21− '';
22− checkPhase = check;
23− };
11+ makeScriptWriter = { interpreter, check ? "" }: nameOrPath: content:
12+ assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null);
13+ assert lib.or (types.path.check content) (types.string.check content);
14+ let
15+ name = last (builtins.split "/" nameOrPath);
16+ in
17+
18+ pkgs.runCommand name (if (types.string.check content) then {
19+ inherit content interpreter;
20+ passAsFile = [ "content" ];
21+ } else {
22+ inherit interpreter;
23+ contentPath = content;
24+ }) ''
25+ echo "#! $interpreter" > $out
26+ cat "$contentPath" >> $out
27+ chmod +x $out
28+ ${optionalString (types.path.check nameOrPath) ''
29+ mv $out tmp
30+ mkdir -p $out/$(dirname "${nameOrPath}")
31+ mv tmp $out/${nameOrPath}
32+ ''}
33+ '';
34+
35+ # Base implementation for compiled executables.
36+ # Takes a compile script, which in turn takes the name as an argument.
37+ #
38+ # Examples:
39+ # writeSimpleC = makeBinWriter { compileScript = name: "gcc -o $out $contentPath"; }
40+ makeBinWriter = { compileScript }: nameOrPath: content:
41+ assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null);
42+ assert lib.or (types.path.check content) (types.string.check content);
43+ let
44+ name = last (builtins.split "/" nameOrPath);
45+ in
46+ pkgs.runCommand name (if (types.string.check content) then {
47+ inherit content;
48+ passAsFile = [ "content" ];
49+ } else {
50+ contentPath = content;
51+ }) ''
52+ ${compileScript}
53+ ${optionalString (types.path.check nameOrPath) ''
54+ mv $out tmp
55+ mkdir -p $out/$(dirname "${nameOrPath}")
56+ mv tmp $out/${nameOrPath}
57+ ''}
58+ '';
2459
2560 # Like writeScript but the first line is a shebang to bash
2661 #
@@ -48,41 +83,33 @@ rec {
4883 # return 0;
4984 # }
5085 # ''
51− writeC = name: {
52− libraries ? [],
53− }: text: pkgs.runCommand name {
54− inherit text;
55− buildInputs = [ pkgs.pkgconfig ] ++ libraries;
56− passAsFile = [ "text" ];
57− } ''
58− PATH=${makeBinPath [
59− pkgs.binutils-unwrapped
60− pkgs.coreutils
61− pkgs.gcc
62− pkgs.pkgconfig
63− ]}
64− mkdir -p "$(dirname "$out")"
65− gcc \
66− ${optionalString (libraries != [])
67− "$(pkg-config --cflags --libs ${
68− concatMapStringsSep " " (lib: escapeShellArg (builtins.parseDrvName lib.name).name) (libraries)
69− })"
70− } \
71− -O \
72− -o "$out" \
73− -Wall \
74− -x c \
75− "$textPath"
76− strip --strip-unneeded "$out"
77− '';
86+ writeC = name: { libraries ? [] }:
87+ makeBinWriter {
88+ compileScript = ''
89+ PATH=${makeBinPath [
90+ pkgs.binutils-unwrapped
91+ pkgs.coreutils
92+ pkgs.gcc
93+ pkgs.pkgconfig
94+ ]}
95+ gcc \
96+ ${optionalString (libraries != [])
97+ "$(pkgs.pkgconfig}/bin/pkg-config --cflags --libs ${
98+ concatMapStringsSep " " (lib: escapeShellArg (builtins.parseDrvName lib.name).name) (libraries)
99+ })"
100+ } \
101+ -O \
102+ -o "$out" \
103+ -Wall \
104+ -x c \
105+ "$contentPath"
106+ strip --strip-unneeded "$out"
107+ '';
108+ } name;
78109
79110 # writeCBin takes the same arguments as writeC but outputs a directory (like writeScriptBin)
80− writeCBin = name: spec: text:
81− pkgs.runCommand name {
82− } ''
83− mkdir -p $out/bin
84− ln -s ${writeC name spec text} $out/bin/${name}
85− '';
111+ writeCBin = name:
112+ writeC "/bin/${name}";
86113
87114 # Like writeScript but the first line is a shebang to dash
88115 #
@@ -103,29 +130,25 @@ rec {
103130 #
104131 # Example:
105132 # writeHaskell "missiles" { libraries = [ pkgs.haskellPackages.acme-missiles ]; } ''
106− # Import Acme.Missiles
133+ # import Acme.Missiles
107134 #
108135 # main = launchMissiles
109136 # '';
110137 writeHaskell = name: {
111138 libraries ? [],
112139 ghc ? pkgs.ghc
113− }: text: pkgs.runCommand name {
114− inherit text;
115− passAsFile = [ "text" ];
116− } ''
117− cp $textPath ${name}.hs
118− ${ghc.withPackages (_: libraries )}/bin/ghc ${name}.hs
119− cp ${name} $out
120− '';
140+ }:
141+ makeBinWriter {
142+ compileScript = ''
143+ cp $contentPath tmp.hs
144+ ${ghc.withPackages (_: libraries )}/bin/ghc tmp.hs
145+ mv tmp $out
146+ '';
147+ } name;
121148
122149 # writeHaskellBin takes the same arguments as writeHaskell but outputs a directory (like writeScriptBin)
123− writeHaskellBin = name: spec: text:
124− pkgs.runCommand name {
125− } ''
126− mkdir -p $out/bin
127− ln -s ${writeHaskell name spec text} $out/bin/${name}
128− '';
150+ writeHaskellBin = name:
151+ writeHaskell "/bin/${name}";
129152
130153 # writeJS takes a name an attributeset with libraries and some JavaScript sourcecode and
131154 # returns an executable
@@ -137,7 +160,7 @@ rec {
137160 # var result = UglifyJS.minify(code);
138161 # console.log(result.code);
139162 # ''
140− writeJS = name: { libraries ? [] }: text:
163+ writeJS = name: { libraries ? [] }: content:
141164 let
142165 node-env = pkgs.buildEnv {
143166 name = "node";
@@ -148,7 +171,7 @@ rec {
148171 };
149172 in writeDash name ''
150173 export NODE_PATH=${node-env}/lib/node_modules
151− exec ${pkgs.nodejs}/bin/node ${pkgs.writeText "js" text}
174+ exec ${pkgs.nodejs}/bin/node ${pkgs.writeText "js" content}
152175 '';
153176
154177 # writeJSBin takes the same arguments as writeJS but outputs a directory (like writeScriptBin)
pkgs/build-support/writers/test.nix+20−1
@@ -1,4 +1,4 @@
1−{ stdenv, lib, runCommand, haskellPackages, nodePackages, perlPackages, python2Packages, python3Packages, writers}:
1+{ stdenv, lib, runCommand, haskellPackages, nodePackages, perlPackages, python2Packages, python3Packages, writers, writeText }:
22with writers;
33let
44
@@ -128,6 +128,24 @@ let
128128 '';
129129 };
130130
131+
132+ path = {
133+ bash = writeBash "test_bash" (writeText "test" ''
134+ if [[ "test" == "test" ]]; then echo "success"; fi
135+ '');
136+ haskell = writeHaskell "test_haskell" { libraries = [ haskellPackages.acme-default ]; } (writeText "test" ''
137+ import Data.Default
138+
139+ int :: Int
140+ int = def
141+
142+ main :: IO ()
143+ main = case int of
144+ 18871 -> putStrLn $ id "success"
145+ _ -> print "fail"
146+ '');
147+ };
148+
131149 writeTest = expectedValue: test:
132150 writeDash "test-writers" ''
133151 if test "$(${test})" != "${expectedValue}"; then
@@ -142,6 +160,7 @@ in runCommand "test-writers" {
142160} ''
143161 ${lib.concatMapStringsSep "\n" (test: writeTest "success" "${test}/bin/test_writers") (lib.attrValues bin)}
144162 ${lib.concatMapStringsSep "\n" (test: writeTest "success" "${test}") (lib.attrValues simple)}
163+ ${lib.concatMapStringsSep "\n" (test: writeTest "success" "${test}") (lib.attrValues path)}
145164
146165 echo 'nix-writers successfully tested' >&2
147166 touch $out
pkgs/data/fonts/noto-fonts/default.nix+7−4
@@ -2,11 +2,14 @@
22
33let
44 mkNoto = { name, weights, sha256, }:
5− let version = "2017-10-24-phase3-second-cleanup"; in
5+ let
6+ version = "2018-11-30";
7+ ref = "85e78f831469323c85847e23f95026c894159135";
8+ in
69 fetchzip {
710 name = "${name}-${version}";
811 inherit sha256;
9− url = "https://github.com/googlei18n/noto-fonts/archive/v${version}.zip";
12+ url = "https://github.com/googlei18n/noto-fonts/archive/${ref}.zip";
1013 postFetch = ''
1114 unzip $downloadedFile
1215 mkdir -p $out/share/fonts/noto
@@ -47,12 +50,12 @@ rec {
4750 noto-fonts = mkNoto {
4851 name = "noto-fonts";
4952 weights = "{Regular,Bold,Light,Italic,BoldItalic,LightItalic}";
50− sha256 = "1dmarbsfank6xzzx31h5jdv6n99rzblqyb1iqjkpll6dl3627pnb";
53+ sha256 = "0kvq5ldip2ra2njlxg9fxj46nfqzq5l3n359d3kwfbsld7hixm2d";
5154 };
5255 noto-fonts-extra = mkNoto {
5356 name = "noto-fonts-extra";
5457 weights = "{Black,Condensed,Extra,Medium,Semi,Thin}*";
55− sha256 = "1lih49bqmsmblczvbl7qb1bhn0bq8v5xkr991b3gjghpdkx584bc";
58+ sha256 = "0l94aiy1b3qirg2mmbagbr0014vqk32za79pzck1acy2hgy716kq";
5659 };
5760 noto-fonts-cjk = let version = "1.004"; in fetchzip {
5861 name = "noto-fonts-cjk-${version}";
pkgs/data/fonts/open-sans/default.nixnew file+33
@@ -0,0 +1,33 @@
1+{ stdenv, fetchFromGitLab }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "open-sans";
5+ version = "1.11";
6+
7+ src = fetchFromGitLab {
8+ domain = "salsa.debian.org";
9+ owner = "fonts-team";
10+ repo = "fonts-open-sans";
11+ rev = "debian%2F1.11-1"; # URL-encoded form of "debian/1.11-1" tag
12+ sha256 = "077hkvpmk3ghbqyb901w43b2m2a27lh8ddasyx1x7pdwyr2bjjl2";
13+ };
14+
15+ dontBuild = true;
16+
17+ installPhase = ''
18+ mkdir -p $out/share/fonts/truetype
19+ cp *.ttf $out/share/fonts/truetype
20+ '';
21+
22+ meta = with stdenv.lib; {
23+ description = "Open Sans fonts";
24+ longDescription = ''
25+ Open Sans is a humanist sans serif typeface designed by Steve Matteson,
26+ Type Director of Ascender Corp.
27+ '';
28+ homepage = https://www.opensans.com;
29+ license = licenses.asl20;
30+ platforms = platforms.all;
31+ maintainers = [ maintainers.worldofpeace ];
32+ };
33+}
pkgs/data/fonts/opensans-ttf/default.nixdeleted−27
@@ -1,27 +0,0 @@
1−{stdenv, fetchzip}:
2−
3−fetchzip {
4− name = "opensans-ttf-20140617";
5−
6− url = "http://web.archive.org/web/20150801161609/https://hexchain.org/pub/archlinux/ttf-opensans/opensans.tar.gz";
7−
8− postFetch = ''
9− tar -xzf $downloadedFile
10− mkdir -p $out/share/fonts/truetype
11− cp *.ttf $out/share/fonts/truetype
12− '';
13−
14− sha256 = "0zpzqw5y9g5jk7xjcxa12ds60ckvxmpw8p7bnkkmad53s94yr5wf";
15−
16− meta = {
17− description = "Open Sans fonts";
18− longDescription = ''
19− Open Sans is a humanist sans serif typeface designed by Steve Matteson,
20− Type Director of Ascender Corp.
21− '';
22− homepage = https://en.wikipedia.org/wiki/Open_Sans;
23− license = stdenv.lib.licenses.asl20;
24− platforms = stdenv.lib.platforms.all;
25− maintainers = [ ];
26− };
27−}
pkgs/data/icons/zafiro-icons/default.nix+5−5
@@ -3,21 +3,21 @@
33stdenv.mkDerivation rec {
44 name = "${pname}-${version}";
55 pname = "zafiro-icons";
6− version = "0.7.2";
6+ version = "0.7.3";
77
88 src = fetchFromGitHub {
99 owner = "zayronxio";
1010 repo = pname;
1111 rev = "v${version}";
12− sha256 = "1rs3wazmvidlkig5q7x1n9nz7jhfq18wps3wsplax9zcdy0hv248";
12+ sha256 = "02q3wcklmqdy4ycyly7477q98y3mkgnpr7c78jqxvy2yr486wwyx";
1313 };
1414
1515 nativeBuildInputs = [ gtk3 ];
1616
1717 installPhase = ''
18− mkdir -p $out/share/icons/Zafiro
19− cp -a * $out/share/icons/Zafiro
20− gtk-update-icon-cache "$out"/share/icons/Zafiro
18+ mkdir -p $out/share/icons/Zafiro-icons
19+ cp -a * $out/share/icons/Zafiro-icons
20+ gtk-update-icon-cache "$out"/share/icons/Zafiro-icons
2121 '';
2222
2323 meta = with stdenv.lib; {
pkgs/data/misc/hackage/default.nix+2−2
@@ -1,6 +1,6 @@
11{ fetchurl }:
22
33fetchurl {
4− url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/95366a34cd5c9b47444ac819562fff2f23d7d753.tar.gz";
5− sha256 = "184qrgb7jl1s79v4z1jz9ywihilf60jh93xhwf0n75vnxb4ibnfd";
4+ url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/56099dd4eb61f963da8edefdd19fd6a2e4371d95.tar.gz";
5+ sha256 = "1byz5rp1n682bcm7wcdm6jxabgq1nx660bf51g11fyni1b5fr9ax";
66}
pkgs/misc/themes/materia-theme/default.nix → pkgs/data/themes/materia-theme/default.nixrenamed+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "materia-theme-${version}";
5− version = "20181115";
5+ version = "20181125";
66
77 src = fetchFromGitHub {
88 owner = "nana-4";
99 repo = "materia-theme";
1010 rev = "v${version}";
11− sha256 = "1vfwzvzbs4336vjg6y4asm21p64xc5f7cfsld5l159174ikcz5fp";
11+ sha256 = "17gsgll2m534lwvpffqisdmhhmn0da419wnpq39wv5cjnmk0q3by";
1212 };
1313
1414 nativeBuildInputs = [ gnome3.glib libxml2 bc ];
pkgs/data/themes/nordic-polar/default.nixnew file+35
@@ -0,0 +1,35 @@
1+{ stdenv, fetchurl, gtk-engine-murrine }:
2+
3+stdenv.mkDerivation rec {
4+ name = "nordic-polar-${version}";
5+ version = "1.3.0";
6+
7+ srcs = [
8+ (fetchurl {
9+ url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar.tar.xz";
10+ sha256 = "1c5zgymkwd89fr680c49siwbkhfbay56iq9vlyqkj1dp0xnc528s";
11+ })
12+ (fetchurl {
13+ url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar-standard-buttons.tar.xz";
14+ sha256 = "0nxzcgqzc42qvnhafranz6rwanqb4wzf9ychm5m4yrlp3ngw38p4";
15+ })
16+ ];
17+
18+ sourceRoot = ".";
19+
20+ propagatedUserEnvPkgs = [ gtk-engine-murrine ];
21+
22+ installPhase = ''
23+ mkdir -p $out/share/themes
24+ cp -a Nordic-Polar* $out/share/themes
25+ rm $out/share/themes/*/{LICENSE,README.md}
26+ '';
27+
28+ meta = with stdenv.lib; {
29+ description = "Gtk theme created using the awesome Nord color pallete";
30+ homepage = https://github.com/EliverLara/Nordic-Polar;
31+ license = licenses.gpl3;
32+ platforms = platforms.all;
33+ maintainers = [ maintainers.romildo ];
34+ };
35+}
pkgs/development/compilers/scala/default.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
22
33stdenv.mkDerivation rec {
4− name = "scala-2.12.7";
4+ name = "scala-2.12.8";
55
66 src = fetchurl {
77 url = "https://www.scala-lang.org/files/archive/${name}.tgz";
8− sha256 = "116i6sviziynbm7yffakkcnzb2jmrhvjrnbqbbnhyyi806shsnyn";
8+ sha256 = "18w0vdbsp0q5rxglgalwlgkggld926bqi1fxc598rn4gh46a03j4";
99 };
1010
1111 propagatedBuildInputs = [ jre ] ;
pkgs/development/compilers/solc/default.nix+5−10
@@ -1,9 +1,9 @@
11{ stdenv, fetchzip, fetchFromGitHub, boost, cmake, z3 }:
22
33let
4− version = "0.5.0";
5− rev = "1d4f565a64988a3400847d2655ca24f73f234bc6";
6− sha256 = "0phzk2whvgrrf8xpl5pz886glhd5s40y1hbbvq9q3fxf6vc3lisy";
4+ version = "0.5.1";
5+ rev = "c8a2cb62832afb2dc09ccee6fd42c1516dfdb981";
6+ sha256 = "0d6mfnixlr9m5yr3r4p6cv6vwrrivcamyar5d0f9rvir9w9ypzrr";
77 jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz;
88 jsoncpp = fetchzip {
99 url = jsoncppURL;
@@ -28,11 +28,6 @@ stdenv.mkDerivation {
2828 echo >commit_hash.txt "${rev}"
2929 substituteInPlace cmake/jsoncpp.cmake \
3030 --replace "${jsoncppURL}" ${jsoncpp}
31−
32− # To allow non-standard CMAKE_INSTALL_LIBDIR (fixed in upstream, not yet released)
33− substituteInPlace cmake/jsoncpp.cmake \
34− --replace "\''${CMAKE_INSTALL_LIBDIR}" "lib" \
35− --replace "# Build static lib but suitable to be included in a shared lib." "-DCMAKE_INSTALL_LIBDIR=lib"
3631 '';
3732
3833 cmakeFlags = [
@@ -42,7 +37,7 @@ stdenv.mkDerivation {
4237 ];
4338
4439 doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform;
45− checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./liblll:./libevmasm:./libdevcore:$LD_LIBRARY_PATH " +
40+ checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./liblll:./libevmasm:./libdevcore:./libyul:./liblangutil:$LD_LIBRARY_PATH " +
4641 "./test/soltest -p -- --no-ipc --no-smt --testpath ../test";
4742
4843 nativeBuildInputs = [ cmake ];
@@ -56,7 +51,7 @@ stdenv.mkDerivation {
5651 homepage = https://github.com/ethereum/solidity;
5752 license = licenses.gpl3;
5853 platforms = with platforms; linux ++ darwin;
59− maintainers = with maintainers; [ dbrock akru ];
54+ maintainers = with maintainers; [ dbrock akru lionello ];
6055 inherit version;
6156 };
6257}
pkgs/development/compilers/solc/patches/shared-libs-install.patch+23−3
@@ -2,11 +2,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
22index 0c05208f..8893648e 100644
33--- a/CMakeLists.txt
44+++ b/CMakeLists.txt
5−@@ -48,6 +48,20 @@ add_subdirectory(libevmasm)
5+@@ -48,6 +48,25 @@ add_subdirectory(libevmasm)
66 add_subdirectory(libsolidity)
77 add_subdirectory(libsolc)
88
9−+
109+install(DIRECTORY libdevcore/
1110+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libdevcore
1211+ FILES_MATCHING PATTERN "*.h")
@@ -16,6 +15,12 @@ index 0c05208f..8893648e 100644
1615+install(DIRECTORY libsolidity/
1716+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libsolidity
1817+ FILES_MATCHING PATTERN "*.h")
18++install(DIRECTORY libyul/
19++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libyul
20++ FILES_MATCHING PATTERN "*.h")
21++install(DIRECTORY liblangutil/
22++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liblangutil
23++ FILES_MATCHING PATTERN "*.h")
1924+install(DIRECTORY liblll/
2025+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liblll
2126+ FILES_MATCHING PATTERN "*.h")
@@ -57,8 +62,23 @@ index 0bdec4b4..e876177e 100644
5762@@ -29,6 +29,7 @@ endif()
5863
5964 add_library(solidity ${sources} ${headers})
60− target_link_libraries(solidity PUBLIC evmasm devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})
65+ target_link_libraries(solidity PUBLIC yul evmasm langutil devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})
6166+install(TARGETS solidity LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
6267
6368 if (${Z3_FOUND})
6469 target_link_libraries(solidity PUBLIC ${Z3_LIBRARY})
70+--- a/libyul/CMakeLists.txt
71++++ b/libyul/CMakeLists.txt
72+@@ -42,3 +42,4 @@ endif()
73+ optimiser/VarDeclPropagator.cpp
74+ )
75+-target_link_libraries(yul PUBLIC devcore)
76++target_link_libraries(yul PUBLIC evmasm devcore langutil)
77++install(TARGETS yul LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
78+--- a/liblangutil/CMakeLists.txt
79++++ b/liblangutil/CMakeLists.txt
80+@@ -11,3 +11,4 @@ endif()
81+
82+ add_library(langutil ${sources})
83+ target_link_libraries(langutil PUBLIC devcore)
84++install(TARGETS langutil LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
pkgs/development/haskell-modules/configuration-common.nix+21−11
@@ -93,14 +93,9 @@ self: super: {
9393 fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
9494 hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
9595 };
96− esqueleto = overrideSrc (addBuildDepend (dontCheck (dontHaddock super.esqueleto)) self.unliftio) {
97− src = pkgs.fetchFromGitHub {
98− owner = "bitemyapp";
99− repo = "esqueleto";
100− rev = "b81e0d951e510ebffca03c5a58658ad884cc6fbd";
101− sha256 = "0lz1qxms7cfg5p3j37inlych0r2fwhm8xbarcys3df9m7jy9nixa";
102− };
103− };
96+
97+ # https://github.com/bitemyapp/esqueleto/issues/105
98+ esqueleto = markBrokenVersion "2.5.3" super.esqueleto;
10499
105100 # Fix test trying to access /home directory
106101 shell-conduit = overrideCabal super.shell-conduit (drv: {
@@ -948,8 +943,12 @@ self: super: {
948943 # Tries to read a file it is not allowed to in the test suite
949944 load-env = dontCheck super.load-env;
950945
951− # https://github.com/yesodweb/Shelly.hs/issues/162
952− shelly = dontCheck super.shelly;
946+ # hledger needs a newer megaparsec version than we have in LTS 12.x.
947+ hledger-lib = super.hledger-lib.overrideScope (self: super: {
948+ cassava-megaparsec = self.cassava-megaparsec_2_0_0;
949+ hspec-megaparsec = self.hspec-megaparsec_2_0_0;
950+ megaparsec = self.megaparsec_7_0_4;
951+ });
953952
954953 # Copy hledger man pages from data directory into the proper place. This code
955954 # should be moved into the cabal2nix generator.
@@ -976,7 +975,12 @@ self: super: {
976975 mkdir -p $out/share/info
977976 cp -v *.info* $out/share/info/
978977 '';
979− }));
978+ })).overrideScope (self: super: {
979+ cassava-megaparsec = self.cassava-megaparsec_2_0_0;
980+ config-ini = self.config-ini_0_2_4_0;
981+ hspec-megaparsec = self.hspec-megaparsec_2_0_0;
982+ megaparsec = self.megaparsec_7_0_4;
983+ });
980984 hledger-web = overrideCabal super.hledger-web (drv: {
981985 postInstall = ''
982986 for i in $(seq 1 9); do
@@ -1188,4 +1192,10 @@ self: super: {
11881192 # https://github.com/jmillikin/chell/issues/1
11891193 chell = super.chell.override { patience = self.patience_0_1_1; };
11901194
1195+ # The test suite tries to mess with ALSA, which doesn't work in the build sandbox.
1196+ xmobar = dontCheck super.xmobar;
1197+
1198+ # https://github.com/mgajda/json-autotype/issues/25
1199+ json-autotype = dontCheck super.json-autotype;
1200+
11911201} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix+2−4
@@ -46,7 +46,7 @@ self: super: {
4646
4747 # LTS-12.x versions do not compile.
4848 base-orphans = self.base-orphans_0_8;
49− brick = self.brick_0_41_5;
49+ brick = self.brick_0_42_1;
5050 cassava-megaparsec = doJailbreak super.cassava-megaparsec;
5151 config-ini = doJailbreak super.config-ini; # https://github.com/aisamanra/config-ini/issues/18
5252 contravariant = self.contravariant_1_5;
@@ -54,13 +54,11 @@ self: super: {
5454 free = self.free_5_1;
5555 haddock-library = dontCheck super.haddock-library_1_7_0;
5656 HaTeX = doJailbreak super.HaTeX;
57− hledger = doJailbreak super.hledger;
58− hledger-lib = doJailbreak super.hledger-lib;
59− hledger-ui = doJailbreak super.hledger-ui;
6057 hpack = self.hpack_0_31_1;
6158 hslua = self.hslua_1_0_1;
6259 hslua-module-text = self.hslua-module-text_0_2_0;
6360 hspec = self.hspec_2_6_0;
61+ hspec-contrib = self.hspec-contrib_0_5_1;
6462 hspec-core = self.hspec-core_2_6_0;
6563 hspec-discover = self.hspec-discover_2_6_0;
6664 hspec-megaparsec = doJailbreak super.hspec-megaparsec; # newer versions need megaparsec 7.x
pkgs/development/haskell-modules/configuration-hackage2nix.yaml+14−14
@@ -45,7 +45,7 @@ default-package-overrides:
4545 - base-compat-batteries ==0.10.1
4646 # Newer versions don't work in LTS-12.x
4747 - cassava-megaparsec < 2
48− # LTS Haskell 12.20
48+ # LTS Haskell 12.21
4949 - abstract-deque ==0.3
5050 - abstract-deque-tests ==0.3
5151 - abstract-par ==0.3.3
@@ -337,8 +337,8 @@ default-package-overrides:
337337 - cabal-doctest ==1.0.6
338338 - cabal-rpm ==0.12.6
339339 - cache ==0.1.1.1
340− - cachix ==0.1.2
341− - cachix-api ==0.1.0.2
340+ - cachix ==0.1.3
341+ - cachix-api ==0.1.0.3
342342 - cairo ==0.13.5.0
343343 - calendar-recycling ==0.0.0.1
344344 - call-stack ==0.1.0
@@ -361,7 +361,7 @@ default-package-overrides:
361361 - cereal-time ==0.1.0.0
362362 - cereal-vector ==0.2.0.1
363363 - cfenv ==0.1.0.0
364− - chan ==0.0.3
364+ - chan ==0.0.4
365365 - ChannelT ==0.0.0.7
366366 - charset ==0.3.7.1
367367 - charsetdetect-ae ==1.1.0.4
@@ -433,7 +433,7 @@ default-package-overrides:
433433 - composition-prelude ==1.5.3.1
434434 - compressed ==3.11
435435 - concise ==0.1.0.1
436− - concurrency ==1.6.1.0
436+ - concurrency ==1.6.2.0
437437 - concurrent-extra ==0.7.0.12
438438 - concurrent-output ==1.10.9
439439 - concurrent-split ==0.0.1.1
@@ -535,7 +535,7 @@ default-package-overrides:
535535 - data-default-instances-old-locale ==0.0.1
536536 - data-diverse ==4.6.0.0
537537 - data-diverse-lens ==4.3.0.0
538− - datadog ==0.2.2.0
538+ - datadog ==0.2.3.0
539539 - data-dword ==0.3.1.2
540540 - data-endian ==0.1.1
541541 - data-fix ==0.2.0
@@ -732,8 +732,8 @@ default-package-overrides:
732732 - fileplow ==0.1.0.0
733733 - filter-logger ==0.6.0.0
734734 - filtrable ==0.1.1.0
735− - fin ==0.0.1
736735 - Fin ==0.2.6.0
736+ - fin ==0.0.1
737737 - FindBin ==0.0.5
738738 - find-clumpiness ==0.2.3.1
739739 - fingertree ==0.1.4.1
@@ -982,7 +982,7 @@ default-package-overrides:
982982 - histogram-fill ==0.9.1.0
983983 - hjsmin ==0.2.0.2
984984 - hlibgit2 ==0.18.0.16
985− - hlibsass ==0.1.7.0
985+ - hlibsass ==0.1.8.0
986986 - hmatrix ==0.19.0.0
987987 - hmatrix-backprop ==0.1.2.3
988988 - hmatrix-gsl ==0.19.0.1
@@ -1097,7 +1097,7 @@ default-package-overrides:
10971097 - hw-mquery ==0.1.0.1
10981098 - hworker ==0.1.0.1
10991099 - hw-parser ==0.0.0.3
1100− - hw-prim ==0.6.2.20
1100+ - hw-prim ==0.6.2.22
11011101 - hw-rankselect ==0.10.0.3
11021102 - hw-rankselect-base ==0.3.2.1
11031103 - hw-string-parse ==0.0.0.4
@@ -1198,7 +1198,7 @@ default-package-overrides:
11981198 - json-rpc-server ==0.2.6.0
11991199 - json-schema ==0.7.4.2
12001200 - JuicyPixels ==3.2.9.5
1201− - JuicyPixels-blp ==0.1.0.1
1201+ - JuicyPixels-blp ==0.1.1.0
12021202 - JuicyPixels-extra ==0.3.0
12031203 - JuicyPixels-scale-dct ==0.1.2
12041204 - justified-containers ==0.3.0.0
@@ -1294,7 +1294,7 @@ default-package-overrides:
12941294 - log-postgres ==0.7.0.2
12951295 - long-double ==0.1
12961296 - loop ==0.3.0
1297− - lrucache ==1.2.0.0
1297+ - lrucache ==1.2.0.1
12981298 - lrucaching ==0.3.3
12991299 - lucid ==2.9.11
13001300 - lucid-extras ==0.1.0.1
@@ -1785,7 +1785,7 @@ default-package-overrides:
17851785 - rvar ==0.2.0.3
17861786 - s3-signer ==0.5.0.0
17871787 - safe ==0.3.17
1788− - safecopy ==0.9.4.1
1788+ - safecopy ==0.9.4.2
17891789 - safe-exceptions ==0.1.7.0
17901790 - safe-exceptions-checked ==0.1.0
17911791 - safe-foldable ==0.1.0.0
@@ -2130,7 +2130,7 @@ default-package-overrides:
21302130 - transformers-fix ==1.0
21312131 - transformers-lift ==0.2.0.1
21322132 - traverse-with-class ==1.0.0.0
2133− - tree-diff ==0.0.1
2133+ - tree-diff ==0.0.2
21342134 - tree-fun ==0.8.1.0
21352135 - trifecta ==2
21362136 - triplesec ==0.1.2.0
@@ -2323,7 +2323,7 @@ default-package-overrides:
23232323 - x509-validation ==1.6.11
23242324 - Xauth ==0.1
23252325 - xdg-basedir ==0.2.2
2326− - xeno ==0.3.4
2326+ - xeno ==0.3.5.1
23272327 - xenstore ==0.1.1
23282328 - xhtml ==3000.2.2.1
23292329 - xls ==0.1.1
pkgs/development/haskell-modules/hackage-packages.nix+1249−605
@@ -4624,6 +4624,28 @@ self: {
46244624 license = stdenv.lib.licenses.bsd3;
46254625 }) {};
46264626
4627+ "Earley_0_13_0_0" = callPackage
4628+ ({ mkDerivation, base, criterion, deepseq, ListLike, parsec
4629+ , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
4630+ }:
4631+ mkDerivation {
4632+ pname = "Earley";
4633+ version = "0.13.0.0";
4634+ sha256 = "0pyj9c5d6xvz4mdpg0nfrl0100rh34442ix73l6ys4pnsadyql0g";
4635+ isLibrary = true;
4636+ isExecutable = true;
4637+ libraryHaskellDepends = [ base ListLike ];
4638+ testHaskellDepends = [
4639+ base QuickCheck tasty tasty-hunit tasty-quickcheck
4640+ ];
4641+ benchmarkHaskellDepends = [
4642+ base criterion deepseq ListLike parsec
4643+ ];
4644+ description = "Parsing all context-free grammars using Earley's algorithm";
4645+ license = stdenv.lib.licenses.bsd3;
4646+ hydraPlatforms = stdenv.lib.platforms.none;
4647+ }) {};
4648+
46274649 "Ebnf2ps" = callPackage
46284650 ({ mkDerivation, array, base, containers, directory, happy
46294651 , old-time, unix
@@ -7214,11 +7236,12 @@ self: {
72147236 }) {};
72157237
72167238 "HCL" = callPackage
7217− ({ mkDerivation, base, containers, mtl, QuickCheck, random }:
7239+ ({ mkDerivation, base, containers, HUnit, mtl, QuickCheck, random
7240+ }:
72187241 mkDerivation {
72197242 pname = "HCL";
7220− version = "1.5.1";
7221− sha256 = "1l9ychhml91zvr6zdrzyd8pvlbycyrdjvn95vgdyal0p5r7b3plf";
7243+ version = "1.7.1";
7244+ sha256 = "1rwg7sqm16rszv7grw2d7cnhllnrifnd9jjxn0p8n5qznv8m8vkp";
72227245 isLibrary = true;
72237246 isExecutable = true;
72247247 enableSeparateDataOutput = true;
@@ -7226,6 +7249,9 @@ self: {
72267249 executableHaskellDepends = [
72277250 base containers mtl QuickCheck random
72287251 ];
7252+ testHaskellDepends = [
7253+ base containers HUnit mtl QuickCheck random
7254+ ];
72297255 description = "High-level library for building command line interfaces";
72307256 license = stdenv.lib.licenses.bsd3;
72317257 hydraPlatforms = stdenv.lib.platforms.none;
@@ -10706,29 +10732,6 @@ self: {
1070610732 }) {};
1070710733
1070810734 "JuicyPixels-blp" = callPackage
10709− ({ mkDerivation, attoparsec, base, binary, bytestring, directory
10710− , filepath, hashable, JuicyPixels, optparse-simple, text-show
10711− , unordered-containers, vector
10712− }:
10713− mkDerivation {
10714− pname = "JuicyPixels-blp";
10715− version = "0.1.0.1";
10716− sha256 = "16fcrd8g4pgwhbvp34mqqvmszlkhjs1qryrn1bll3f0zwirhg3ic";
10717− isLibrary = true;
10718− isExecutable = true;
10719− libraryHaskellDepends = [
10720− attoparsec base binary bytestring hashable JuicyPixels text-show
10721− vector
10722− ];
10723− executableHaskellDepends = [
10724− base bytestring directory filepath JuicyPixels optparse-simple
10725− text-show unordered-containers
10726− ];
10727− description = "BLP format decoder/encoder over JuicyPixels library";
10728− license = stdenv.lib.licenses.bsd3;
10729− }) {};
10730−
10731− "JuicyPixels-blp_0_1_1_0" = callPackage
1073210735 ({ mkDerivation, attoparsec, base, binary, bytestring, directory
1073310736 , filepath, hashable, JuicyPixels, optparse-simple, text-show
1073410737 , unordered-containers, vector
@@ -10749,7 +10752,6 @@ self: {
1074910752 ];
1075010753 description = "BLP format decoder/encoder over JuicyPixels library";
1075110754 license = stdenv.lib.licenses.bsd3;
10752− hydraPlatforms = stdenv.lib.platforms.none;
1075310755 }) {};
1075410756
1075510757 "JuicyPixels-canvas" = callPackage
@@ -15283,6 +15285,18 @@ self: {
1528315285 hydraPlatforms = stdenv.lib.platforms.none;
1528415286 }) {};
1528515287
15288+ "RLP" = callPackage
15289+ ({ mkDerivation, base, binary, bytestring, hspec }:
15290+ mkDerivation {
15291+ pname = "RLP";
15292+ version = "1.0.1";
15293+ sha256 = "0xxhd2whz8q3zxrk37pwbhjayfhq9dv89068q0qlfwwg6aby0k6s";
15294+ libraryHaskellDepends = [ base binary bytestring ];
15295+ testHaskellDepends = [ base binary bytestring hspec ];
15296+ description = "RLP serialization as defined in Ethereum Yellow Paper";
15297+ license = stdenv.lib.licenses.lgpl3;
15298+ }) {};
15299+
1528615300 "RMP" = callPackage
1528715301 ({ mkDerivation, allocated-processor, base, canlib, cv-combinators
1528815302 , ftd2xx, HOpenCV, vector-space
@@ -16481,6 +16495,17 @@ self: {
1648116495 hydraPlatforms = stdenv.lib.platforms.none;
1648216496 }) {};
1648316497
16498+ "SecureHash-SHA3" = callPackage
16499+ ({ mkDerivation, base, bytestring }:
16500+ mkDerivation {
16501+ pname = "SecureHash-SHA3";
16502+ version = "0.1.0.2";
16503+ sha256 = "0h0mya8bk7zkq92plihzzqd7svfqdk2dphnivfb0r80iw3678nv9";
16504+ libraryHaskellDepends = [ base bytestring ];
16505+ description = "simple static linked SHA3 using private symbols and the ref impl";
16506+ license = stdenv.lib.licenses.bsd2;
16507+ }) {};
16508+
1648416509 "SegmentTree" = callPackage
1648516510 ({ mkDerivation, base }:
1648616511 mkDerivation {
@@ -16584,8 +16609,8 @@ self: {
1658416609 }:
1658516610 mkDerivation {
1658616611 pname = "ShellCheck";
16587− version = "0.5.0";
16588− sha256 = "0z1hscbr11hwkq8k1v0vaa947hb9m6k4cm831jk1gpj8dxrk151b";
16612+ version = "0.6.0";
16613+ sha256 = "1xkxrn1j5qvh2pxm0cnjpqqqsvwr7xy8pk31cwbh8r879nrrzrzn";
1658916614 isLibrary = true;
1659016615 isExecutable = true;
1659116616 setupHaskellDepends = [ base Cabal process ];
@@ -21594,6 +21619,22 @@ self: {
2159421619 hydraPlatforms = stdenv.lib.platforms.none;
2159521620 }) {};
2159621621
21622+ "advent-of-code-api" = callPackage
21623+ ({ mkDerivation, base, containers, curl, deepseq, directory
21624+ , filepath, finite-typelits, mtl, taggy, text, time, uri-encode
21625+ }:
21626+ mkDerivation {
21627+ pname = "advent-of-code-api";
21628+ version = "0.1.0.0";
21629+ sha256 = "15dn78scm0hj1dqcd4xm4gmdvbmjd7afkrh64pnwfbldy74smfxy";
21630+ libraryHaskellDepends = [
21631+ base containers curl deepseq directory filepath finite-typelits mtl
21632+ taggy text time uri-encode
21633+ ];
21634+ description = "Advent of Code REST API bindings";
21635+ license = stdenv.lib.licenses.bsd3;
21636+ }) {};
21637+
2159721638 "aern2-mp" = callPackage
2159821639 ({ mkDerivation, base, convertible, hspec, integer-logarithms, lens
2159921640 , mixed-types-num, QuickCheck, regex-tdfa, rounded
@@ -23333,6 +23374,26 @@ self: {
2333323374 hydraPlatforms = stdenv.lib.platforms.none;
2333423375 }) {};
2333523376
23377+ "algebraic-graphs_0_3" = callPackage
23378+ ({ mkDerivation, array, base, base-compat, base-orphans, containers
23379+ , deepseq, extra, inspection-testing, mtl, QuickCheck
23380+ }:
23381+ mkDerivation {
23382+ pname = "algebraic-graphs";
23383+ version = "0.3";
23384+ sha256 = "1q4xlyg3xjm7q2x11s4lbffywp096y3s3b72b8amfdyi27har4hl";
23385+ libraryHaskellDepends = [
23386+ array base base-compat containers deepseq mtl
23387+ ];
23388+ testHaskellDepends = [
23389+ array base base-compat base-orphans containers extra
23390+ inspection-testing QuickCheck
23391+ ];
23392+ description = "A library for algebraic graph construction and transformation";
23393+ license = stdenv.lib.licenses.mit;
23394+ hydraPlatforms = stdenv.lib.platforms.none;
23395+ }) {};
23396+
2333623397 "algebraic-prelude" = callPackage
2333723398 ({ mkDerivation, algebra, base, basic-prelude, lens, semigroups }:
2333823399 mkDerivation {
@@ -27507,8 +27568,8 @@ self: {
2750727568 }:
2750827569 mkDerivation {
2750927570 pname = "apecs";
27510− version = "0.6.0.0";
27511− sha256 = "03k752lws5whcr2kiiljhfvz9y7xiqp9a1y2hnhgh5sjwckpjyn9";
27571+ version = "0.7.0";
27572+ sha256 = "1yah3yn4z6nxm8gdlkmzlbi8h7nd4zb4905dvzb9b66njhff06l2";
2751227573 libraryHaskellDepends = [
2751327574 base containers mtl template-haskell vector
2751427575 ];
@@ -27520,14 +27581,29 @@ self: {
2752027581 license = stdenv.lib.licenses.bsd3;
2752127582 }) {};
2752227583
27584+ "apecs-gloss" = callPackage
27585+ ({ mkDerivation, apecs, apecs-physics, base, containers, gloss
27586+ , linear
27587+ }:
27588+ mkDerivation {
27589+ pname = "apecs-gloss";
27590+ version = "0.1.1";
27591+ sha256 = "0s5vhxgfgj4v51dnrhzfbids0a873113rqb76xr8f5azq6kr9g3p";
27592+ libraryHaskellDepends = [
27593+ apecs apecs-physics base containers gloss linear
27594+ ];
27595+ description = "Simple gloss renderer for apecs";
27596+ license = stdenv.lib.licenses.bsd3;
27597+ }) {};
27598+
2752327599 "apecs-physics" = callPackage
2752427600 ({ mkDerivation, apecs, base, Cabal, containers, inline-c, linear
2752527601 , template-haskell, vector
2752627602 }:
2752727603 mkDerivation {
2752827604 pname = "apecs-physics";
27529− version = "0.2.0.0";
27530− sha256 = "17mbf06785mdn8pmy90hw92240zq889rh2dlv1sh45p44grr2h5c";
27605+ version = "0.3.1";
27606+ sha256 = "0ij8wv9vrard7nfh8hhzrs9j7w5jlw3353w396alwnbb40hvk7gj";
2753127607 setupHaskellDepends = [ base Cabal ];
2753227608 libraryHaskellDepends = [
2753327609 apecs base containers inline-c linear template-haskell vector
@@ -28466,6 +28542,50 @@ self: {
2846628542 license = stdenv.lib.licenses.mit;
2846728543 }) {};
2846828544
28545+ "arbor-monad-metric" = callPackage
28546+ ({ mkDerivation, arbor-datadog, base, bytestring, containers
28547+ , generic-lens, hedgehog, hspec, hw-hspec-hedgehog, lens, mtl
28548+ , network, resourcet, stm, transformers
28549+ }:
28550+ mkDerivation {
28551+ pname = "arbor-monad-metric";
28552+ version = "0.0.4";
28553+ sha256 = "1g5d5a0lcx255002a02i0zc987pyimhm34h0vrbqaibapbp98yi0";
28554+ libraryHaskellDepends = [
28555+ base containers generic-lens lens mtl resourcet stm transformers
28556+ ];
28557+ testHaskellDepends = [
28558+ arbor-datadog base bytestring containers generic-lens hedgehog
28559+ hspec hw-hspec-hedgehog lens mtl network resourcet stm transformers
28560+ ];
28561+ description = "Core metric library for publishing metrics";
28562+ license = stdenv.lib.licenses.mit;
28563+ }) {};
28564+
28565+ "arbor-monad-metric-datadog" = callPackage
28566+ ({ mkDerivation, arbor-datadog, arbor-monad-metric, base
28567+ , bytestring, containers, exceptions, fast-logger, generic-lens
28568+ , hedgehog, hspec, hw-hspec-hedgehog, lens, monad-logger, mtl
28569+ , network, resourcet, stm, text, transformers
28570+ }:
28571+ mkDerivation {
28572+ pname = "arbor-monad-metric-datadog";
28573+ version = "0.0.3";
28574+ sha256 = "0dqidvn3nblnnnsiq0zqhg3d9b09bv1ksnrfyyibyi75mhvx3d3r";
28575+ libraryHaskellDepends = [
28576+ arbor-datadog arbor-monad-metric base bytestring containers
28577+ generic-lens lens mtl network resourcet stm text transformers
28578+ ];
28579+ testHaskellDepends = [
28580+ arbor-datadog arbor-monad-metric base bytestring containers
28581+ exceptions fast-logger generic-lens hedgehog hspec
28582+ hw-hspec-hedgehog lens monad-logger mtl network resourcet stm text
28583+ transformers
28584+ ];
28585+ description = "Metric library backend for datadog";
28586+ license = stdenv.lib.licenses.mit;
28587+ }) {};
28588+
2846928589 "arbor-postgres" = callPackage
2847028590 ({ mkDerivation, base, bytestring, generic-lens, lens, network-uri
2847128591 , optparse-applicative, postgresql-simple, text
@@ -28925,8 +29045,8 @@ self: {
2892529045 pname = "arithmoi";
2892629046 version = "0.8.0.0";
2892729047 sha256 = "17nk0n89fb0qh6w8535ll45mq4msir32w6fhqzpzhlpbily3mlw2";
28928− revision = "1";
28929− editedCabalFile = "00s941gdf4y04sf0jxl329mnpcpa6cydmsa6l4mja8sdv6akzq52";
29048+ revision = "2";
29049+ editedCabalFile = "1jv5ch28pjiq3a83hyvknzfwmsbwgqs6g9618z79ss3385k0cwl9";
2893029050 configureFlags = [ "-f-llvm" ];
2893129051 libraryHaskellDepends = [
2893229052 array base containers deepseq exact-pi ghc-prim integer-gmp
@@ -30519,8 +30639,8 @@ self: {
3051930639 }:
3052030640 mkDerivation {
3052130641 pname = "ats-pkg";
30522− version = "3.2.4.2";
30523− sha256 = "168mgwx0m2kriz494r9isd27rflfh4np7pjm1hxzwc8pnyd3mdx9";
30642+ version = "3.2.4.4";
30643+ sha256 = "0qnhxx4xfh40g1gh108rqcxam3zdm6qwz4h3mh8kw9lq9bnman46";
3052430644 isLibrary = true;
3052530645 isExecutable = true;
3052630646 enableSeparateDataOutput = true;
@@ -32158,6 +32278,28 @@ self: {
3215832278 hydraPlatforms = stdenv.lib.platforms.none;
3215932279 }) {};
3216032280
32281+ "aws-lambda-runtime" = callPackage
32282+ ({ mkDerivation, aeson, async, base, base-compat, bytestring
32283+ , containers, deepseq, filepath, http-client, http-media
32284+ , http-types, lens, lens-aeson, parsec, process, text, time
32285+ , zip-archive
32286+ }:
32287+ mkDerivation {
32288+ pname = "aws-lambda-runtime";
32289+ version = "0";
32290+ sha256 = "1wnpck1cy7bc3g7g3z210n9sgiplsxqbli0xgpxi2wxmhcf5dpjq";
32291+ isLibrary = true;
32292+ isExecutable = true;
32293+ libraryHaskellDepends = [
32294+ aeson async base base-compat bytestring containers deepseq filepath
32295+ http-client http-media http-types parsec process text time
32296+ zip-archive
32297+ ];
32298+ executableHaskellDepends = [ aeson base lens lens-aeson text ];
32299+ description = "Haskell on AWS Lambda Runtime API";
32300+ license = stdenv.lib.licenses.asl20;
32301+ }) {};
32302+
3216132303 "aws-mfa-credentials" = callPackage
3216232304 ({ mkDerivation, amazonka, amazonka-core, amazonka-sts, base
3216332305 , exceptions, filelock, filepath, freer-effects, ini, lens
@@ -32607,8 +32749,8 @@ self: {
3260732749 }:
3260832750 mkDerivation {
3260932751 pname = "b9";
32610− version = "0.5.50";
32611− sha256 = "1wsspzkcydad9akqj6n8s9xpm7id49dll5h12vv3xbmgjgj0pdhr";
32752+ version = "0.5.51";
32753+ sha256 = "1mjylfxw7ivmxma7kskjs7plcd9wxknfd9slxb7zjgawzksdv3bq";
3261232754 isLibrary = true;
3261332755 isExecutable = true;
3261432756 libraryHaskellDepends = [
@@ -33466,6 +33608,28 @@ self: {
3346633608 license = stdenv.lib.licenses.bsd3;
3346733609 }) {};
3346833610
33611+ "base64-bytestring_1_0_0_2" = callPackage
33612+ ({ mkDerivation, base, bytestring, containers, criterion, deepseq
33613+ , HUnit, QuickCheck, split, test-framework, test-framework-hunit
33614+ , test-framework-quickcheck2
33615+ }:
33616+ mkDerivation {
33617+ pname = "base64-bytestring";
33618+ version = "1.0.0.2";
33619+ sha256 = "13305brzlac24pifiqd5a2z10c6k6amhpdy9cc0z5ryrkgnm8dhr";
33620+ libraryHaskellDepends = [ base bytestring ];
33621+ testHaskellDepends = [
33622+ base bytestring containers HUnit QuickCheck split test-framework
33623+ test-framework-hunit test-framework-quickcheck2
33624+ ];
33625+ benchmarkHaskellDepends = [
33626+ base bytestring containers criterion deepseq
33627+ ];
33628+ description = "Fast base64 encoding and decoding for ByteStrings";
33629+ license = stdenv.lib.licenses.bsd3;
33630+ hydraPlatforms = stdenv.lib.platforms.none;
33631+ }) {};
33632+
3346933633 "base64-bytestring-type" = callPackage
3347033634 ({ mkDerivation, aeson, base, base-compat, base64-bytestring
3347133635 , binary, bytestring, cereal, deepseq, hashable, QuickCheck, tasty
@@ -39439,22 +39603,23 @@ self: {
3943939603 license = stdenv.lib.licenses.bsd3;
3944039604 }) {};
3944139605
39442− "brick_0_41_5" = callPackage
39606+ "brick_0_42_1" = callPackage
3944339607 ({ mkDerivation, base, config-ini, containers, contravariant
39444− , data-clist, deepseq, dlist, microlens, microlens-mtl
39445− , microlens-th, QuickCheck, stm, template-haskell, text
39446− , text-zipper, transformers, vector, vty, word-wrap
39608+ , data-clist, deepseq, directory, dlist, filepath, microlens
39609+ , microlens-mtl, microlens-th, QuickCheck, stm, template-haskell
39610+ , text, text-zipper, transformers, unix, vector, vty, word-wrap
3944739611 }:
3944839612 mkDerivation {
3944939613 pname = "brick";
39450− version = "0.41.5";
39451− sha256 = "0r7r44h81jpv2h9wqwkh9i5hmdkr296cvmvyha6qr89298npz1cb";
39614+ version = "0.42.1";
39615+ sha256 = "1ckisdvq0n5j35abz8as36jhp872yp3vjyxq1wbpf4lc1bnplw8k";
3945239616 isLibrary = true;
3945339617 isExecutable = true;
3945439618 libraryHaskellDepends = [
39455− base config-ini containers contravariant data-clist deepseq dlist
39456− microlens microlens-mtl microlens-th stm template-haskell text
39457− text-zipper transformers vector vty word-wrap
39619+ base config-ini containers contravariant data-clist deepseq
39620+ directory dlist filepath microlens microlens-mtl microlens-th stm
39621+ template-haskell text text-zipper transformers unix vector vty
39622+ word-wrap
3945839623 ];
3945939624 testHaskellDepends = [ base containers QuickCheck ];
3946039625 description = "A declarative terminal user interface library";
@@ -40218,8 +40383,8 @@ self: {
4021840383 }:
4021940384 mkDerivation {
4022040385 pname = "bugsnag-haskell";
40221− version = "0.0.2.2";
40222− sha256 = "1fx9f0ddx8il141rhqxb81vms0nxkyckwx72cmjq2j0nwjhhh89l";
40386+ version = "0.0.3.0";
40387+ sha256 = "1g1wqs3vlgdyk8f0xwvrzb1hc77xmjm8ygaw1skrh64darj8y9cq";
4022340388 isLibrary = true;
4022440389 isExecutable = true;
4022540390 libraryHaskellDepends = [
@@ -40998,6 +41163,8 @@ self: {
4099841163 pname = "bytestring-handle";
4099941164 version = "0.1.0.6";
4100041165 sha256 = "18f17aja1ivhr3zyg2cccn2m03hdn5jf5410dndkhf12gvgiqs7y";
41166+ revision = "1";
41167+ editedCabalFile = "0x11aj6w1lijh84jcdq1qgyvdnc7i9ivbyq4wf9rxicg57viisz9";
4100141168 libraryHaskellDepends = [ base bytestring ];
4100241169 testHaskellDepends = [
4100341170 base bytestring HUnit QuickCheck test-framework
@@ -41882,6 +42049,8 @@ self: {
4188242049 pname = "cabal-install";
4188342050 version = "2.4.1.0";
4188442051 sha256 = "1b91rcs00wr5mf55c6xl8hrxmymlq72w71qm5r0q4j869asv5g39";
42052+ revision = "1";
42053+ editedCabalFile = "0bm11hd3s07s1vsxdbkn5bgm5fz5bh1xdg91yz1fzr9d3b3ypa8p";
4188542054 isLibrary = false;
4188642055 isExecutable = true;
4188742056 setupHaskellDepends = [ base Cabal filepath process ];
@@ -42669,59 +42838,6 @@ self: {
4266942838 }) {};
4267042839
4267142840 "cachix" = callPackage
42672− ({ mkDerivation, async, base, base16-bytestring, base64-bytestring
42673− , bifunctors, bytestring, cachix-api, conduit, conduit-extra
42674− , cookie, cryptonite, dhall, directory, ed25519, filepath, fsnotify
42675− , here, hspec, hspec-discover, http-client, http-client-tls
42676− , http-conduit, http-types, lzma-conduit, megaparsec, memory
42677− , mmorph, optparse-applicative, process, protolude, resourcet
42678− , safe-exceptions, servant, servant-auth, servant-auth-client
42679− , servant-client, servant-client-core, servant-streaming-client
42680− , streaming, text, unix, uri-bytestring, versions
42681− }:
42682− mkDerivation {
42683− pname = "cachix";
42684− version = "0.1.2";
42685− sha256 = "1pm2cjlllg1sq7vkig8lr9y1gsxa9w4h61rzq47w1mnhn476gv67";
42686− isLibrary = true;
42687− isExecutable = true;
42688− libraryHaskellDepends = [
42689− async base base16-bytestring base64-bytestring bifunctors
42690− bytestring cachix-api conduit conduit-extra cookie cryptonite dhall
42691− directory ed25519 filepath fsnotify here http-client
42692− http-client-tls http-conduit http-types lzma-conduit megaparsec
42693− memory mmorph optparse-applicative process protolude resourcet
42694− safe-exceptions servant servant-auth servant-auth-client
42695− servant-client servant-client-core servant-streaming-client
42696− streaming text unix uri-bytestring versions
42697− ];
42698− executableHaskellDepends = [
42699− async base base16-bytestring base64-bytestring bifunctors
42700− bytestring cachix-api conduit conduit-extra cookie cryptonite dhall
42701− directory ed25519 filepath fsnotify here http-client
42702− http-client-tls http-conduit http-types lzma-conduit megaparsec
42703− memory mmorph optparse-applicative process protolude resourcet
42704− safe-exceptions servant servant-auth servant-auth-client
42705− servant-client servant-client-core servant-streaming-client
42706− streaming text unix uri-bytestring versions
42707− ];
42708− executableToolDepends = [ hspec-discover ];
42709− testHaskellDepends = [
42710− async base base16-bytestring base64-bytestring bifunctors
42711− bytestring cachix-api conduit conduit-extra cookie cryptonite dhall
42712− directory ed25519 filepath fsnotify here hspec http-client
42713− http-client-tls http-conduit http-types lzma-conduit megaparsec
42714− memory mmorph optparse-applicative process protolude resourcet
42715− safe-exceptions servant servant-auth servant-auth-client
42716− servant-client servant-client-core servant-streaming-client
42717− streaming text unix uri-bytestring versions
42718− ];
42719− description = "Command line client for Nix binary cache hosting https://cachix.org";
42720− license = stdenv.lib.licenses.asl20;
42721− hydraPlatforms = stdenv.lib.platforms.none;
42722− }) {};
42723−
42724− "cachix_0_1_3" = callPackage
4272542841 ({ mkDerivation, async, base, base16-bytestring, base64-bytestring
4272642842 , bifunctors, bytestring, cachix-api, conduit, conduit-extra
4272742843 , cookie, cryptonite, data-default, dhall, directory, ed25519
@@ -42759,46 +42875,6 @@ self: {
4275942875 }) {};
4276042876
4276142877 "cachix-api" = callPackage
42762− ({ mkDerivation, aeson, amazonka, base, base16-bytestring
42763− , bytestring, conduit, cookie, cryptonite, hspec, hspec-discover
42764− , http-api-data, http-media, lens, memory, protolude, servant
42765− , servant-auth, servant-auth-server, servant-auth-swagger
42766− , servant-streaming, servant-swagger, servant-swagger-ui-core
42767− , string-conv, swagger2, text, transformers
42768− }:
42769− mkDerivation {
42770− pname = "cachix-api";
42771− version = "0.1.0.2";
42772− sha256 = "0jqak93ixqzr76lm0mgn9fqfsmkz1ik41j5l629d3hbl7sah15gn";
42773− isLibrary = true;
42774− isExecutable = true;
42775− libraryHaskellDepends = [
42776− aeson amazonka base base16-bytestring bytestring conduit cookie
42777− cryptonite http-api-data http-media lens memory servant
42778− servant-auth servant-auth-server servant-auth-swagger
42779− servant-streaming servant-swagger servant-swagger-ui-core
42780− string-conv swagger2 text transformers
42781− ];
42782− executableHaskellDepends = [
42783− aeson amazonka base base16-bytestring bytestring conduit cookie
42784− cryptonite http-api-data http-media lens memory servant
42785− servant-auth servant-auth-server servant-auth-swagger
42786− servant-streaming servant-swagger servant-swagger-ui-core
42787− string-conv swagger2 text transformers
42788− ];
42789− testHaskellDepends = [
42790− aeson amazonka base base16-bytestring bytestring conduit cookie
42791− cryptonite hspec http-api-data http-media lens memory protolude
42792− servant servant-auth servant-auth-server servant-auth-swagger
42793− servant-streaming servant-swagger servant-swagger-ui-core
42794− string-conv swagger2 text transformers
42795− ];
42796− testToolDepends = [ hspec-discover ];
42797− description = "Servant HTTP API specification for https://cachix.org";
42798− license = stdenv.lib.licenses.asl20;
42799− }) {};
42800−
42801− "cachix-api_0_1_0_3" = callPackage
4280242878 ({ mkDerivation, aeson, amazonka, base, base16-bytestring
4280342879 , bytestring, conduit, cookie, cryptonite, hspec, hspec-discover
4280442880 , http-api-data, http-media, lens, memory, protolude, servant
@@ -42830,7 +42906,6 @@ self: {
4283042906 testToolDepends = [ hspec-discover ];
4283142907 description = "Servant HTTP API specification for https://cachix.org";
4283242908 license = stdenv.lib.licenses.asl20;
42833− hydraPlatforms = stdenv.lib.platforms.none;
4283442909 }) {};
4283542910
4283642911 "cacophony" = callPackage
@@ -44275,6 +44350,27 @@ self: {
4427544350 license = stdenv.lib.licenses.bsd3;
4427644351 }) {};
4427744352
44353+ "cassava-conduit_0_5_1" = callPackage
44354+ ({ mkDerivation, array, base, bifunctors, bytestring, cassava
44355+ , conduit, containers, criterion, mtl, QuickCheck, text
44356+ }:
44357+ mkDerivation {
44358+ pname = "cassava-conduit";
44359+ version = "0.5.1";
44360+ sha256 = "1y3pjvc273vxb8lr3wckliw23n8vninl034wc0zlfh1asplp4nxm";
44361+ libraryHaskellDepends = [
44362+ array base bifunctors bytestring cassava conduit containers mtl
44363+ text
44364+ ];
44365+ testHaskellDepends = [
44366+ base bytestring cassava conduit QuickCheck text
44367+ ];
44368+ benchmarkHaskellDepends = [ base criterion ];
44369+ description = "Conduit interface for cassava package";
44370+ license = stdenv.lib.licenses.bsd3;
44371+ hydraPlatforms = stdenv.lib.platforms.none;
44372+ }) {};
44373+
4427844374 "cassava-embed" = callPackage
4427944375 ({ mkDerivation, base, bytestring, cassava, template-haskell
4428044376 , vector
@@ -44836,8 +44932,8 @@ self: {
4483644932 }:
4483744933 mkDerivation {
4483844934 pname = "cdeps";
44839− version = "0.1.2.2";
44840− sha256 = "1p2razfnqzg9ya421al80db3ag62gwx5l55l2hyw7ka617jpagyd";
44935+ version = "0.1.2.3";
44936+ sha256 = "16w16sysk0g9capl45v8pzyfg38mw2xnkj8dh5fghlc9vzfdgc53";
4484144937 isLibrary = true;
4484244938 isExecutable = true;
4484344939 libraryHaskellDepends = [
@@ -45507,12 +45603,25 @@ self: {
4550745603 ({ mkDerivation, async, base, stm }:
4550845604 mkDerivation {
4550945605 pname = "chan";
45510− version = "0.0.3";
45511− sha256 = "0ci20y0wd232qnh1mql3vjqml13mkrpm9dgv005wcgym7w18isgr";
45606+ version = "0.0.4";
45607+ sha256 = "07kykcgv4xdzby2s50wlqjjvcbgvda6prcz4jhg8qzfazngpn4g3";
45608+ libraryHaskellDepends = [ async base stm ];
45609+ testHaskellDepends = [ async base stm ];
45610+ description = "Some extra kit for Chans";
45611+ license = stdenv.lib.licenses.bsd3;
45612+ }) {};
45613+
45614+ "chan_0_0_4_1" = callPackage
45615+ ({ mkDerivation, async, base, stm }:
45616+ mkDerivation {
45617+ pname = "chan";
45618+ version = "0.0.4.1";
45619+ sha256 = "1ks74njh8fj9dh8qhydwjyqdx8lrdj5fif455cxfshvdbwhcnvwj";
4551245620 libraryHaskellDepends = [ async base stm ];
4551345621 testHaskellDepends = [ async base stm ];
4551445622 description = "Some extra kit for Chans";
4551545623 license = stdenv.lib.licenses.bsd3;
45624+ hydraPlatforms = stdenv.lib.platforms.none;
4551645625 }) {};
4551745626
4551845627 "chan-split" = callPackage
@@ -46041,6 +46150,26 @@ self: {
4604146150 hydraPlatforms = stdenv.lib.platforms.none;
4604246151 }) {};
4604346152
46153+ "chimera" = callPackage
46154+ ({ mkDerivation, base, gauge, ghc-prim, QuickCheck, tasty
46155+ , tasty-hunit, tasty-quickcheck, tasty-smallcheck, vector
46156+ }:
46157+ mkDerivation {
46158+ pname = "chimera";
46159+ version = "0.2.0.0";
46160+ sha256 = "1hrnvyp8d7qc1c3xl4mzfsycb554yn3b49yy8jjyvaqazmvrb4zi";
46161+ isLibrary = true;
46162+ isExecutable = true;
46163+ libraryHaskellDepends = [ base ghc-prim vector ];
46164+ testHaskellDepends = [
46165+ base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck
46166+ vector
46167+ ];
46168+ benchmarkHaskellDepends = [ base gauge ];
46169+ description = "Lazy, infinite streams with O(1) indexing";
46170+ license = stdenv.lib.licenses.bsd3;
46171+ }) {};
46172+
4604446173 "chiphunk" = callPackage
4604546174 ({ mkDerivation, base, c2hs, safe-exceptions, StateVar
4604646175 , vector-space
@@ -51401,8 +51530,8 @@ self: {
5140151530 }:
5140251531 mkDerivation {
5140351532 pname = "concurrency";
51404− version = "1.6.1.0";
51405− sha256 = "00cycrgs2zl2jsg1acc1glcw9ladmgqwxxdqq1ss6v36j8qhk920";
51533+ version = "1.6.2.0";
51534+ sha256 = "004h1wxdgqpxpk9vcvds759pn5qdp873b4bidakffxgh35nkxr68";
5140651535 libraryHaskellDepends = [
5140751536 array atomic-primops base exceptions monad-control mtl stm
5140851537 transformers
@@ -51840,8 +51969,8 @@ self: {
5184051969 pname = "conduit-audio";
5184151970 version = "0.2.0.3";
5184251971 sha256 = "089k7l197xbxva0h281hr3p4v8pww1im7r111q7jrq7aqfgifrb1";
51843− revision = "1";
51844− editedCabalFile = "0ab8qxh5b60m4dyrdbaak8xj7kxlp3kzbs5fpg3fjxkpcqhnm1mx";
51972+ revision = "2";
51973+ editedCabalFile = "0zldqx1r2wmvqwg8r6x7v65h2nqr7fjcxab74f0f5i1nqsd5b51a";
5184551974 libraryHaskellDepends = [ base conduit vector ];
5184651975 description = "Combinators to efficiently slice and dice audio streams";
5184751976 license = stdenv.lib.licenses.bsd3;
@@ -51855,8 +51984,8 @@ self: {
5185551984 pname = "conduit-audio-lame";
5185651985 version = "0.1.2.1";
5185751986 sha256 = "1zyq0m5lblphp892ljvg6ix75rxa1ds5ksfk3cvj7kf074jw66za";
51858− revision = "1";
51859− editedCabalFile = "0b4d8n0lbsivpc0j17xl0vm6gp0sm7jjiysyxwh0m2xncx9l57nr";
51987+ revision = "2";
51988+ editedCabalFile = "09cly6yly3vdlp8qbv6iyrk84aca7v6d160hwg9ai0dmjxk0jkl4";
5186051989 libraryHaskellDepends = [
5186151990 base bytestring conduit conduit-audio resourcet transformers vector
5186251991 ];
@@ -51875,8 +52004,8 @@ self: {
5187552004 pname = "conduit-audio-samplerate";
5187652005 version = "0.1.0.3";
5187752006 sha256 = "07hbqf7is7010ibp2k5fh4lx3s22vp6c4ihsid05ismk0sdpdypi";
51878− revision = "1";
51879− editedCabalFile = "03546czh1jn04kc7df3lrbpjf5pnssh555chjij8b6h25qrx8jrw";
52007+ revision = "2";
52008+ editedCabalFile = "1xp5mqd8svgdz9lwz2vw5mwkm98n834i2k83axwfwvpqr2jlkqa9";
5188052009 libraryHaskellDepends = [
5188152010 base conduit conduit-audio resourcet transformers vector
5188252011 ];
@@ -51895,8 +52024,8 @@ self: {
5189552024 pname = "conduit-audio-sndfile";
5189652025 version = "0.1.2.1";
5189752026 sha256 = "0b326pdvqpiawqnjkmwfgf5ghvg9jn1afini0ihw8cpc7znx846z";
51898− revision = "1";
51899− editedCabalFile = "1v0zcagmgr80wfqs328pd7m7z54q834yw0vn218jl6ld5fv581mg";
52027+ revision = "2";
52028+ editedCabalFile = "00c628bx1j8p342pc03p884illajqsgi47yplfxvdywxcijnwbn3";
5190052029 libraryHaskellDepends = [
5190152030 base conduit conduit-audio hsndfile hsndfile-vector resourcet
5190252031 transformers
@@ -55816,14 +55945,14 @@ self: {
5581655945 license = stdenv.lib.licenses.bsd3;
5581755946 }) {};
5581855947
55819− "crypto-enigma_0_1_1_1" = callPackage
55948+ "crypto-enigma_0_1_1_4" = callPackage
5582055949 ({ mkDerivation, ansi-terminal, base, containers, HUnit
5582155950 , optparse-applicative, QuickCheck, split, text
5582255951 }:
5582355952 mkDerivation {
5582455953 pname = "crypto-enigma";
55825− version = "0.1.1.1";
55826− sha256 = "0cfkzmgszvlwi4cylzxi2fpniw9a4ral4c6nyrdzjjdij55prafj";
55954+ version = "0.1.1.4";
55955+ sha256 = "17bggc1wz1qp0midriwwackm86w148r6y8ph3x0nsxblqzw8021z";
5582755956 isLibrary = true;
5582855957 isExecutable = true;
5582955958 libraryHaskellDepends = [ base containers split text ];
@@ -59849,25 +59978,26 @@ self: {
5984959978
5985059979 "datadog" = callPackage
5985159980 ({ mkDerivation, aeson, auto-update, base, buffer-builder
59852− , bytestring, Cabal, dlist, exceptions, hspec, http-client
59853− , http-client-tls, http-types, lens, lifted-base, monad-control
59854− , network, old-locale, random, text, time, transformers-base
59855− , unordered-containers, vector
59981+ , bytestring, Cabal, containers, dlist, exceptions, hspec
59982+ , http-client, http-client-tls, http-types, lens, lifted-base
59983+ , monad-control, network, old-locale, random, text, time
59984+ , transformers-base, unliftio, unordered-containers, vector
5985659985 }:
5985759986 mkDerivation {
5985859987 pname = "datadog";
59859− version = "0.2.2.0";
59860− sha256 = "0i399f5p9ch4bjmqchq890i6x5jd137pw5lz4v43k5qxlbxvc3s5";
59988+ version = "0.2.3.0";
59989+ sha256 = "0d0rbi269hc0bq4asww69pfw4gf0z3p9ji3iw1h129h4qyhyvdcv";
5986159990 libraryHaskellDepends = [
59862− aeson auto-update base buffer-builder bytestring dlist http-client
59863− http-client-tls http-types lens lifted-base monad-control network
59864− old-locale text time transformers-base unordered-containers vector
59991+ aeson auto-update base buffer-builder bytestring containers dlist
59992+ http-client http-client-tls http-types lens lifted-base
59993+ monad-control network old-locale text time transformers-base
59994+ unliftio unordered-containers vector
5986559995 ];
5986659996 testHaskellDepends = [
59867− aeson auto-update base buffer-builder bytestring Cabal dlist
59868− exceptions hspec http-client http-client-tls http-types lens
59997+ aeson auto-update base buffer-builder bytestring Cabal containers
59998+ dlist exceptions hspec http-client http-client-tls http-types lens
5986959999 lifted-base monad-control network old-locale random text time
59870− transformers-base unordered-containers vector
60000+ transformers-base unliftio unordered-containers vector
5987160001 ];
5987260002 description = "Datadog client for Haskell. Supports both the HTTP API and StatsD.";
5987360003 license = stdenv.lib.licenses.mit;
@@ -61582,6 +61712,23 @@ self: {
6158261712 license = stdenv.lib.licenses.mit;
6158361713 }) {};
6158461714
61715+ "dejafu_1_11_0_4" = callPackage
61716+ ({ mkDerivation, base, concurrency, containers, contravariant
61717+ , deepseq, exceptions, leancheck, profunctors, random, transformers
61718+ }:
61719+ mkDerivation {
61720+ pname = "dejafu";
61721+ version = "1.11.0.4";
61722+ sha256 = "0zks4mqdndlyg8mqa1gshwahcqn45zawksgp738crls3yafgh9dg";
61723+ libraryHaskellDepends = [
61724+ base concurrency containers contravariant deepseq exceptions
61725+ leancheck profunctors random transformers
61726+ ];
61727+ description = "A library for unit-testing concurrent programs";
61728+ license = stdenv.lib.licenses.mit;
61729+ hydraPlatforms = stdenv.lib.platforms.none;
61730+ }) {};
61731+
6158561732 "deka" = callPackage
6158661733 ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }:
6158761734 mkDerivation {
@@ -62035,13 +62182,19 @@ self: {
6203562182 license = stdenv.lib.licenses.mit;
6203662183 }) {};
6203762184
62038− "deque_0_2_4" = callPackage
62039− ({ mkDerivation, base, semigroups }:
62185+ "deque_0_2_6" = callPackage
62186+ ({ mkDerivation, base, QuickCheck, quickcheck-instances, rerebase
62187+ , tasty, tasty-hunit, tasty-quickcheck
62188+ }:
6204062189 mkDerivation {
6204162190 pname = "deque";
62042− version = "0.2.4";
62043− sha256 = "19bz1i8la16an158wwqqg6zjd93d1n6jx6kqb2zd7lm1sk1055l9";
62044− libraryHaskellDepends = [ base semigroups ];
62191+ version = "0.2.6";
62192+ sha256 = "1jpapfa5lza9vpdj64a55imr9gjm19b7bwx773hb9fky77wrxn52";
62193+ libraryHaskellDepends = [ base ];
62194+ testHaskellDepends = [
62195+ QuickCheck quickcheck-instances rerebase tasty tasty-hunit
62196+ tasty-quickcheck
62197+ ];
6204562198 description = "Double-ended queue";
6204662199 license = stdenv.lib.licenses.mit;
6204762200 hydraPlatforms = stdenv.lib.platforms.none;
@@ -62715,6 +62868,8 @@ self: {
6271562868 pname = "dhall";
6271662869 version = "1.19.1";
6271762870 sha256 = "14fjfwsirf8l7wirv590ix01liyd0xbhqy4h7pjblyy62m22mlzq";
62871+ revision = "1";
62872+ editedCabalFile = "193h4dmlz1asfr1ldy0saa9spgp64xh60xh3yywzn9lz0hxzbfpg";
6271862873 isLibrary = true;
6271962874 isExecutable = true;
6272062875 libraryHaskellDepends = [
@@ -62835,6 +62990,8 @@ self: {
6283562990 pname = "dhall-json";
6283662991 version = "1.2.5";
6283762992 sha256 = "0zdxv43kj8dp2w9hy4px9xf785ybs9jy5pzhzybiagq428k4kcbf";
62993+ revision = "1";
62994+ editedCabalFile = "0zgg3wlsvsshgcibn7xchqfw5z2qh3yxkf2lb4bkx220f4m0dvfg";
6283862995 isLibrary = true;
6283962996 isExecutable = true;
6284062997 libraryHaskellDepends = [
@@ -64856,6 +65013,8 @@ self: {
6485665013 pname = "discrimination";
6485765014 version = "0.3";
6485865015 sha256 = "18scvjb4vj1y9mwhanr8h73bs80h1d23m2vrixm48riyg22v5m6n";
65016+ revision = "1";
65017+ editedCabalFile = "1p39vcdmv9k9wxlkh49w1dr1isvn2hvhjjbs95qwljpxca74i23g";
6485965018 libraryHaskellDepends = [
6486065019 array base containers contravariant deepseq ghc-prim hashable
6486165020 primitive profunctors promises semigroups transformers
@@ -65366,8 +65525,8 @@ self: {
6536665525 }:
6536765526 mkDerivation {
6536865527 pname = "distributed-process-p2p";
65369− version = "0.1.4.0";
65370− sha256 = "0wl5cnh2swymj3h4hrvkkfl7d5hrmxl1ayiyv9yjbr6gm72i11vj";
65528+ version = "0.1.5.0";
65529+ sha256 = "0izlk0m0n0s8rdr31lfc05nbsqdwr2zfl2ai3j60r7hzq62i7rby";
6537165530 isLibrary = true;
6537265531 isExecutable = true;
6537365532 libraryHaskellDepends = [
@@ -67396,14 +67555,15 @@ self: {
6739667555 }) {};
6739767556
6739867557 "drmaa" = callPackage
67399− ({ mkDerivation, base, directory, drmaa, inline-c }:
67558+ ({ mkDerivation, base, c2hs, directory, drmaa, exceptions }:
6740067559 mkDerivation {
6740167560 pname = "drmaa";
67402− version = "0.2.0";
67403− sha256 = "0hmyzlwqdj3cjnhjc4bk35wzxzzknl0fapqz119yahc03jrpcpg6";
67404− libraryHaskellDepends = [ base directory inline-c ];
67561+ version = "0.3.0";
67562+ sha256 = "1x1r3m1gqikm6n5m006zy3c9z106qa4ykl7qa90pa29wg03475z5";
67563+ libraryHaskellDepends = [ base directory exceptions ];
6740567564 librarySystemDepends = [ drmaa ];
67406− description = "A minimal Haskell bindings to DRMAA C library";
67565+ libraryToolDepends = [ c2hs ];
67566+ description = "A Haskell bindings to the DRMAA C library";
6740767567 license = stdenv.lib.licenses.bsd3;
6740867568 hydraPlatforms = stdenv.lib.platforms.none;
6740967569 }) {drmaa = null;};
@@ -68432,8 +68592,8 @@ self: {
6843268592 }:
6843368593 mkDerivation {
6843468594 pname = "each";
68435− version = "1.1.0.0";
68436− sha256 = "0yh7q86kmz7ryl95hzm3qvi1l1qhsqf34b35mpkph41snda5g4xl";
68595+ version = "1.1.1.0";
68596+ sha256 = "078qlgdk256rcjh8k9lv7i14rqky952b2zzbnymswciqiiha5bvb";
6843768597 libraryHaskellDepends = [ base dlist template-haskell ];
6843868598 testHaskellDepends = [ base hspec QuickCheck ];
6843968599 description = "Template Haskell library for writing monadic expressions more easily";
@@ -69629,8 +69789,8 @@ self: {
6962969789 }:
6963069790 mkDerivation {
6963169791 pname = "ekg-prometheus-adapter";
69632− version = "0.1.0.3";
69633− sha256 = "0jkjbzb5ygd8q4641wdzw3v3cxvdqy2r6qhrrfi09iqn3ii9gjad";
69792+ version = "0.1.0.4";
69793+ sha256 = "1i9bqbn8zj7hbkc7iypmjji4sh8s2h9jix2ngp77mkmii6wblfx2";
6963469794 libraryHaskellDepends = [
6963569795 base containers ekg-core microlens-th prometheus text transformers
6963669796 unordered-containers
@@ -70825,19 +70985,20 @@ self: {
7082570985 }) {};
7082670986
7082770987 "entwine" = callPackage
70828− ({ mkDerivation, async, base, containers, criterion, directory
70829− , exceptions, monad-loops, process, QuickCheck
70988+ ({ mkDerivation, async, base, clock, containers, criterion
70989+ , directory, exceptions, monad-loops, process, QuickCheck
7083070990 , quickcheck-instances, quickcheck-properties, quickcheck-text
70831− , random, SafeSemaphore, stm, text, time, transformers
70832− , transformers-either
70991+ , random, retry, SafeSemaphore, semigroups, stm, text, time
70992+ , transformers, transformers-either
7083370993 }:
7083470994 mkDerivation {
7083570995 pname = "entwine";
70836− version = "0.0.2";
70837− sha256 = "08y5vxg6q5f7dakclap86i68if18srzl6q3a9hg7qyrrq6jlyv63";
70996+ version = "0.0.3";
70997+ sha256 = "0x4ghpskgpls028fp74mmxqb6hrhcfvdxbfny2bniclh9826fiij";
7083870998 libraryHaskellDepends = [
70839− async base containers exceptions monad-loops SafeSemaphore stm text
70840− time transformers transformers-either
70999+ async base clock containers exceptions monad-loops retry
71000+ SafeSemaphore semigroups stm text time transformers
71001+ transformers-either
7084171002 ];
7084271003 testHaskellDepends = [
7084371004 async base directory exceptions process QuickCheck
@@ -73961,12 +74122,13 @@ self: {
7396174122 }:
7396274123 mkDerivation {
7396374124 pname = "extensible-effects";
73964− version = "3.1.0.2";
73965− sha256 = "0g568pp3sxzzzcpbcrvx76msn58nn41g1r4wq8sfvvg1hb28xpf5";
74125+ version = "4.0.0.0";
74126+ sha256 = "0h83cn0767sk8di6ja5928v65mkcp90pjqhgijrvynssxxsvfsji";
7396674127 libraryHaskellDepends = [ base monad-control transformers-base ];
7396774128 testHaskellDepends = [
73968− base doctest HUnit monad-control QuickCheck silently test-framework
73969− test-framework-hunit test-framework-quickcheck2 test-framework-th
74129+ base doctest HUnit monad-control mtl QuickCheck silently
74130+ test-framework test-framework-hunit test-framework-quickcheck2
74131+ test-framework-th
7397074132 ];
7397174133 benchmarkHaskellDepends = [
7397274134 base criterion HUnit mtl test-framework test-framework-hunit
@@ -75045,6 +75207,18 @@ self: {
7504575207 hydraPlatforms = stdenv.lib.platforms.none;
7504675208 }) {};
7504775209
75210+ "fay-websockets" = callPackage
75211+ ({ mkDerivation, fay-base }:
75212+ mkDerivation {
75213+ pname = "fay-websockets";
75214+ version = "0.0.1.1";
75215+ sha256 = "1pax12d1rjmh3gdg1ylavk04f8rlldc6jnmm5sgghdq28z1mp6pb";
75216+ enableSeparateDataOutput = true;
75217+ libraryHaskellDepends = [ fay-base ];
75218+ description = "Websockets FFI library for Fay";
75219+ license = stdenv.lib.licenses.bsd3;
75220+ }) {};
75221+
7504875222 "fb" = callPackage
7504975223 ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
7505075224 , base64-bytestring, bytestring, cereal, conduit, conduit-extra
@@ -78380,6 +78554,33 @@ self: {
7838078554 license = stdenv.lib.licenses.bsd3;
7838178555 }) {};
7838278556
78557+ "focuslist_0_1_0_1" = callPackage
78558+ ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest
78559+ , genvalidity-containers, genvalidity-hspec, hedgehog, lens
78560+ , mono-traversable, QuickCheck, tasty, tasty-hedgehog, tasty-hspec
78561+ , template-haskell
78562+ }:
78563+ mkDerivation {
78564+ pname = "focuslist";
78565+ version = "0.1.0.1";
78566+ sha256 = "1qq5ixaxrwy2wn8xz8ckva9m50bkygj2gpw89fdry4wglvkrmvpx";
78567+ revision = "2";
78568+ editedCabalFile = "12x38kxhcjdqfwl8y8zdrwcpv6jdm7jaqc48ww3hg6fpv8rvvd49";
78569+ isLibrary = true;
78570+ isExecutable = true;
78571+ setupHaskellDepends = [ base Cabal cabal-doctest ];
78572+ libraryHaskellDepends = [
78573+ base containers lens mono-traversable QuickCheck
78574+ ];
78575+ testHaskellDepends = [
78576+ base doctest genvalidity-containers genvalidity-hspec hedgehog lens
78577+ QuickCheck tasty tasty-hedgehog tasty-hspec template-haskell
78578+ ];
78579+ description = "Lists with a focused element";
78580+ license = stdenv.lib.licenses.bsd3;
78581+ hydraPlatforms = stdenv.lib.platforms.none;
78582+ }) {};
78583+
7838378584 "fold-debounce" = callPackage
7838478585 ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
7838578586 , time
@@ -80741,8 +80942,8 @@ self: {
8074180942 }:
8074280943 mkDerivation {
8074380944 pname = "ftp-client";
80744− version = "0.5.1.0";
80745− sha256 = "1g48hkjvmiljjx2jmfb47ch0c4l3zz7vy8dpsg3wkqvzm9n78f1v";
80945+ version = "0.5.1.1";
80946+ sha256 = "01f8d32f2nkqrf21p38zgzwmvl2pkpl9rx0c8a8ch6h56flzhck4";
8074680947 libraryHaskellDepends = [
8074780948 attoparsec base bytestring connection containers exceptions network
8074880949 transformers
@@ -80758,8 +80959,8 @@ self: {
8075880959 }:
8075980960 mkDerivation {
8076080961 pname = "ftp-client-conduit";
80761− version = "0.5.0.3";
80762− sha256 = "148albjscl7c707c5r0xv7ki8wb26irfkjqdy46cmlmls2y5hvpv";
80962+ version = "0.5.0.4";
80963+ sha256 = "0w4sfa4qyclcfixxlam5djhv9hx0hzhfsvf2cabs6m8mgks8zidi";
8076380964 libraryHaskellDepends = [
8076480965 base bytestring conduit connection exceptions ftp-client resourcet
8076580966 ];
@@ -81381,14 +81582,15 @@ self: {
8138181582 }) {};
8138281583
8138381584 "fused-effects" = callPackage
81384− ({ mkDerivation, base, deepseq, doctest, hspec, MonadRandom, random
81585+ ({ mkDerivation, base, deepseq, doctest, hspec, MonadRandom
81586+ , QuickCheck, random
8138581587 }:
8138681588 mkDerivation {
8138781589 pname = "fused-effects";
81388− version = "0.1.1.0";
81389− sha256 = "1wcrixfpz0q93xskb90p8a2jypsghbpgwn4fjy6k1ad4ihxn19hl";
81590+ version = "0.1.2.1";
81591+ sha256 = "00lr52zfi1k52z0iqg8wb2a40x80kpwhbvmasp8c4s8c8jx4s9yn";
8139081592 libraryHaskellDepends = [ base deepseq MonadRandom random ];
81391− testHaskellDepends = [ base doctest hspec ];
81593+ testHaskellDepends = [ base doctest hspec QuickCheck ];
8139281594 description = "A fast, flexible, fused effect system";
8139381595 license = stdenv.lib.licenses.bsd3;
8139481596 }) {};
@@ -84078,28 +84280,25 @@ self: {
8407884280 "gf" = callPackage
8407984281 ({ mkDerivation, alex, array, base, bytestring, Cabal, cgi
8408084282 , containers, directory, exceptions, filepath, happy, haskeline
84081− , HTF, httpd-shed, HUnit, json, mtl, network, network-uri
84082− , old-locale, parallel, pretty, process, random, terminfo, time
84083− , time-compat, unix, utf8-string
84283+ , httpd-shed, json, mtl, network, network-uri, parallel, pretty
84284+ , process, random, terminfo, time, time-compat, unix, utf8-string
8408484285 }:
8408584286 mkDerivation {
8408684287 pname = "gf";
84087− version = "3.9";
84088− sha256 = "11g57vhb89s3wi6ny88la9mxwg5vivr9fjxsmm9i644pys7kg84i";
84288+ version = "3.10";
84289+ sha256 = "1f0wwrhid0iqk2lmf9aprkzml8xpc3vsvvfpqfywf8qk8i76wwkv";
8408984290 isLibrary = true;
8409084291 isExecutable = true;
8409184292 enableSeparateDataOutput = true;
84293+ setupHaskellDepends = [ base Cabal directory filepath process ];
8409284294 libraryHaskellDepends = [
8409384295 array base bytestring cgi containers directory exceptions filepath
84094− haskeline httpd-shed json mtl network network-uri old-locale
84095− parallel pretty process random terminfo time time-compat unix
84096− utf8-string
84296+ haskeline httpd-shed json mtl network network-uri parallel pretty
84297+ process random terminfo time time-compat unix utf8-string
8409784298 ];
8409884299 libraryToolDepends = [ alex happy ];
8409984300 executableHaskellDepends = [ base ];
84100− testHaskellDepends = [
84101− base Cabal directory filepath HTF HUnit process
84102− ];
84301+ testHaskellDepends = [ base Cabal directory filepath process ];
8410384302 doCheck = false;
8410484303 postPatch = ''
8410584304 sed -i "s|\"-s\"|\"\"|" ./Setup.hs
@@ -85509,8 +85708,8 @@ self: {
8550985708 ({ mkDerivation, base, transformers }:
8551085709 mkDerivation {
8551185710 pname = "ghcjs-perch";
85512− version = "0.3.3.2";
85513− sha256 = "1ng6wpx6kp8rxmxwf0ns0q0jas2gl2s2mv1dlq59xbsikdly3km7";
85711+ version = "0.3.3.3";
85712+ sha256 = "0b3hj0gm9gcgwpg8f7vxy87fasgpgn27ciyafhmy6b4fnnmn41kn";
8551485713 libraryHaskellDepends = [ base transformers ];
8551585714 description = "GHCJS version of Perch library";
8551685715 license = stdenv.lib.licenses.mit;
@@ -86511,19 +86710,23 @@ self: {
8651186710 }) {};
8651286711
8651386712 "gingersnap" = callPackage
86514− ({ mkDerivation, aeson, base, bytestring, deepseq, http-types
86515− , postgresql-simple, resource-pool, snap-core, text, transformers
86516− , unordered-containers
86713+ ({ mkDerivation, aeson, base, bytestring, containers, deepseq
86714+ , http-types, microspec, postgresql-simple, resource-pool
86715+ , snap-core, text, transformers, unordered-containers
8651786716 }:
8651886717 mkDerivation {
8651986718 pname = "gingersnap";
86520− version = "0.2.2.3";
86521− sha256 = "1w1ip80w9bc5gj0ws6cvk37648267b4fqmh81h2khn7qhdah74k7";
86719+ version = "0.3.1.0";
86720+ sha256 = "10lcs2p14rk1l280h3xkywbagy82cp2yy4zgs8l531hyqfzrsl01";
8652286721 libraryHaskellDepends = [
8652386722 aeson base bytestring deepseq http-types postgresql-simple
8652486723 resource-pool snap-core text transformers unordered-containers
8652586724 ];
86526− description = "Tools for consistent and safe JSON APIs with snap-core and postgresql-simple";
86725+ testHaskellDepends = [
86726+ base bytestring containers microspec postgresql-simple snap-core
86727+ transformers
86728+ ];
86729+ description = "Consistent and safe JSON APIs with snap-core and (by default) postgresql-simple";
8652786730 license = stdenv.lib.licenses.bsd3;
8652886731 }) {};
8652986732
@@ -86680,31 +86883,33 @@ self: {
8668086883 }) {};
8668186884
8668286885 "git-annex" = callPackage
86683− ({ mkDerivation, aeson, async, attoparsec, base, bloomfilter, bup
86684− , byteable, bytestring, Cabal, case-insensitive, concurrent-output
86685− , conduit, connection, containers, crypto-api, cryptonite, curl
86686− , data-default, DAV, dbus, directory, disk-free-space, dlist
86687− , edit-distance, exceptions, fdo-notify, feed, filepath, free, git
86688− , gnupg, hinotify, hslogger, http-client, http-client-tls
86689− , http-conduit, http-types, IfElse, lsof, magic, memory, microlens
86690− , monad-control, monad-logger, mountpoints, mtl, network
86691− , network-info, network-multicast, network-uri, old-locale, openssh
86692− , optparse-applicative, perl, persistent, persistent-sqlite
86693− , persistent-template, process, QuickCheck, random, regex-tdfa
86694− , resourcet, rsync, SafeSemaphore, sandi, securemem, socks, split
86695− , stm, stm-chans, tagsoup, tasty, tasty-hunit, tasty-quickcheck
86696− , tasty-rerun, text, time, torrent, transformers, unix, unix-compat
86697− , unordered-containers, utf8-string, uuid, vector, wget, which
86886+ ({ mkDerivation, aeson, async, attoparsec, aws, base, blaze-builder
86887+ , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive
86888+ , clientsession, concurrent-output, conduit, connection, containers
86889+ , crypto-api, cryptonite, curl, data-default, DAV, dbus, directory
86890+ , disk-free-space, dlist, edit-distance, exceptions, fdo-notify
86891+ , feed, filepath, free, git, gnupg, hinotify, hslogger, http-client
86892+ , http-client-tls, http-conduit, http-types, IfElse, lsof, magic
86893+ , memory, microlens, monad-control, monad-logger, mountpoints, mtl
86894+ , network, network-info, network-multicast, network-uri, old-locale
86895+ , openssh, optparse-applicative, path-pieces, perl, persistent
86896+ , persistent-sqlite, persistent-template, process, QuickCheck
86897+ , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi
86898+ , securemem, shakespeare, socks, split, stm, stm-chans, tagsoup
86899+ , tasty, tasty-hunit, tasty-quickcheck, tasty-rerun
86900+ , template-haskell, text, time, torrent, transformers, unix
86901+ , unix-compat, unordered-containers, utf8-string, uuid, vector, wai
86902+ , wai-extra, warp, warp-tls, wget, which, yesod, yesod-core
86903+ , yesod-form, yesod-static
8669886904 }:
8669986905 mkDerivation {
8670086906 pname = "git-annex";
8670186907 version = "7.20181121";
8670286908 sha256 = "07fbnz3rr9dq76zx6cpxdxppkgb7wwhbrm9y89jdcpn8giaz0i6h";
8670386909 configureFlags = [
86704− "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
86705− "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3"
86706− "-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-f-webapp"
86707− "-f-webapp-secure" "-fwebdav" "-fxmpp"
86910+ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
86911+ "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" "-fwebapp"
86912+ "-fwebdav"
8670886913 ];
8670986914 isLibrary = false;
8671086915 isExecutable = true;
@@ -86713,19 +86918,21 @@ self: {
8671386918 hslogger IfElse process split transformers unix-compat utf8-string
8671486919 ];
8671586920 executableHaskellDepends = [
86716− aeson async attoparsec base bloomfilter byteable bytestring
86717− case-insensitive concurrent-output conduit connection containers
86718− crypto-api cryptonite data-default DAV dbus directory
86719− disk-free-space dlist edit-distance exceptions fdo-notify feed
86720− filepath free hinotify hslogger http-client http-client-tls
86921+ aeson async attoparsec aws base blaze-builder bloomfilter byteable
86922+ bytestring case-insensitive clientsession concurrent-output conduit
86923+ connection containers crypto-api cryptonite data-default DAV dbus
86924+ directory disk-free-space dlist edit-distance exceptions fdo-notify
86925+ feed filepath free hinotify hslogger http-client http-client-tls
8672186926 http-conduit http-types IfElse magic memory microlens monad-control
8672286927 monad-logger mountpoints mtl network network-info network-multicast
86723− network-uri old-locale optparse-applicative persistent
86928+ network-uri old-locale optparse-applicative path-pieces persistent
8672486929 persistent-sqlite persistent-template process QuickCheck random
86725− regex-tdfa resourcet SafeSemaphore sandi securemem socks split stm
86726− stm-chans tagsoup tasty tasty-hunit tasty-quickcheck tasty-rerun
86727− text time torrent transformers unix unix-compat
86728− unordered-containers utf8-string uuid vector
86930+ regex-tdfa resourcet SafeSemaphore sandi securemem shakespeare
86931+ socks split stm stm-chans tagsoup tasty tasty-hunit
86932+ tasty-quickcheck tasty-rerun template-haskell text time torrent
86933+ transformers unix unix-compat unordered-containers utf8-string uuid
86934+ vector wai wai-extra warp warp-tls yesod yesod-core yesod-form
86935+ yesod-static
8672986936 ];
8673086937 executableSystemDepends = [
8673186938 bup curl git gnupg lsof openssh perl rsync wget which
@@ -101048,8 +101255,8 @@ self: {
101048101255 }:
101049101256 mkDerivation {
101050101257 pname = "haskoin-core";
101051− version = "0.8.2";
101052− sha256 = "1scd87ivzmrf8ar44wkijcgpr40c996dvq5rx1py2bxw0zdd1ibq";
101258+ version = "0.8.4";
101259+ sha256 = "0hpabz26wyxvpkvc2xv1xscmbvn0yfj2nnd41ysaf4xgfnh4c9sw";
101053101260 libraryHaskellDepends = [
101054101261 aeson array base base16-bytestring bytestring cereal conduit
101055101262 containers cryptonite entropy hashable memory mtl murmur3 network
@@ -101058,7 +101265,7 @@ self: {
101058101265 ];
101059101266 testHaskellDepends = [
101060101267 aeson base bytestring cereal containers hspec HUnit mtl QuickCheck
101061− safe split string-conversions text vector
101268+ safe split string-conversions text unordered-containers vector
101062101269 ];
101063101270 testToolDepends = [ hspec-discover ];
101064101271 description = "Bitcoin & Bitcoin Cash library for Haskell";
@@ -101170,8 +101377,8 @@ self: {
101170101377 }:
101171101378 mkDerivation {
101172101379 pname = "haskoin-store";
101173− version = "0.6.9";
101174− sha256 = "1353cr6bd814xa1d2jqqnh2h5jmlkdsfg1a4cmxwyl1wvprjx54i";
101380+ version = "0.9.1";
101381+ sha256 = "099fng9wy9qhcxn14m1mlpq004bl51xas3rk6jkspqv32d4rr6zs";
101175101382 isLibrary = true;
101176101383 isExecutable = true;
101177101384 libraryHaskellDepends = [
@@ -101887,6 +102094,8 @@ self: {
101887102094 pname = "hasmin";
101888102095 version = "1.0.2.1";
101889102096 sha256 = "0dwamjpqwikl8qh5zcxhrm7x80k35zw29xh83yfnwnsa41incylb";
102097+ revision = "1";
102098+ editedCabalFile = "05naxdaglbz8grzz399dkra9y3f1k75661397flbgrwbxkyadz2z";
101890102099 isLibrary = true;
101891102100 isExecutable = true;
101892102101 libraryHaskellDepends = [
@@ -104153,6 +104362,31 @@ self: {
104153104362 license = stdenv.lib.licenses.bsd3;
104154104363 }) {};
104155104364
104365+ "hedis_0_10_9" = callPackage
104366+ ({ mkDerivation, async, base, bytestring, bytestring-lexing
104367+ , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
104368+ , resource-pool, scanner, stm, test-framework, test-framework-hunit
104369+ , text, time, tls, unordered-containers, vector
104370+ }:
104371+ mkDerivation {
104372+ pname = "hedis";
104373+ version = "0.10.9";
104374+ sha256 = "0y64h61w78pn3yn2hi3q41bbp5zwjlycjz2w23x6sh2w5b2xphw3";
104375+ libraryHaskellDepends = [
104376+ async base bytestring bytestring-lexing deepseq errors HTTP mtl
104377+ network network-uri resource-pool scanner stm text time tls
104378+ unordered-containers vector
104379+ ];
104380+ testHaskellDepends = [
104381+ async base bytestring doctest HUnit mtl stm test-framework
104382+ test-framework-hunit text time
104383+ ];
104384+ benchmarkHaskellDepends = [ base mtl time ];
104385+ description = "Client library for the Redis datastore: supports full command set, pipelining";
104386+ license = stdenv.lib.licenses.bsd3;
104387+ hydraPlatforms = stdenv.lib.platforms.none;
104388+ }) {};
104389+
104156104390 "hedis-config" = callPackage
104157104391 ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text
104158104392 , time
@@ -104260,8 +104494,8 @@ self: {
104260104494 }:
104261104495 mkDerivation {
104262104496 pname = "hedn";
104263− version = "0.1.9.0";
104264− sha256 = "077wf446x0rrac3bdzmyhpacb54smx02msdz45cra3yzn3n0rq7l";
104497+ version = "0.1.9.1";
104498+ sha256 = "0ynajgg5kl37rv72408hg5jiypy6vmzazqxa58405knb49h0gvvz";
104265104499 libraryHaskellDepends = [
104266104500 attoparsec base base-compat bytestring containers deepseq mtl
104267104501 scientific stringsearch text time time-locale-compat utf8-string
@@ -107707,54 +107941,53 @@ self: {
107707107941 ({ mkDerivation, ansi-terminal, base, base-compat-batteries
107708107942 , bytestring, cmdargs, containers, criterion, data-default, Decimal
107709107943 , Diff, directory, easytest, file-embed, filepath, hashable
107710− , haskeline, here, hledger-lib, html, lucid, megaparsec, mtl
107711− , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa
107712− , safe, shakespeare, split, statistics, tabular, temporary
107944+ , haskeline, here, hledger-lib, html, lucid, math-functions
107945+ , megaparsec, mtl, mtl-compat, old-time, parsec, pretty-show
107946+ , process, regex-tdfa, safe, shakespeare, split, tabular, temporary
107713107947 , terminfo, test-framework, test-framework-hunit, text, time
107714107948 , timeit, transformers, unordered-containers, utf8-string
107715107949 , utility-ht, wizards
107716107950 }:
107717107951 mkDerivation {
107718107952 pname = "hledger";
107719− version = "1.11.1";
107720− sha256 = "0cy60ysmydg0ahx6gjmjm97skvjp5a3vgqxsn2l1dp7hk34ac5p9";
107721− revision = "1";
107722− editedCabalFile = "1g8jfjsfddpiifgv39gi985lsz8fsysf6qni34b0kb44wpd67pfn";
107953+ version = "1.12.1";
107954+ sha256 = "1b9zvlrhrzg0rvk90ac1z8n8sfhdx070l8hy3sg25nbcsqxzd51w";
107723107955 isLibrary = true;
107724107956 isExecutable = true;
107725107957 libraryHaskellDepends = [
107726107958 ansi-terminal base base-compat-batteries bytestring cmdargs
107727107959 containers data-default Decimal Diff directory easytest file-embed
107728− filepath hashable haskeline here hledger-lib lucid megaparsec mtl
107729− mtl-compat old-time parsec pretty-show process regex-tdfa safe
107730− shakespeare split statistics tabular temporary terminfo text time
107731− transformers unordered-containers utf8-string utility-ht wizards
107960+ filepath hashable haskeline here hledger-lib lucid math-functions
107961+ megaparsec mtl mtl-compat old-time parsec pretty-show process
107962+ regex-tdfa safe shakespeare split tabular temporary terminfo text
107963+ time transformers unordered-containers utf8-string utility-ht
107964+ wizards
107732107965 ];
107733107966 executableHaskellDepends = [
107734107967 ansi-terminal base base-compat-batteries bytestring cmdargs
107735107968 containers data-default Decimal directory easytest file-embed
107736− filepath haskeline here hledger-lib megaparsec mtl mtl-compat
107737− old-time parsec pretty-show process regex-tdfa safe shakespeare
107738− split statistics tabular temporary terminfo text time transformers
107969+ filepath haskeline here hledger-lib math-functions megaparsec mtl
107970+ mtl-compat old-time parsec pretty-show process regex-tdfa safe
107971+ shakespeare split tabular temporary terminfo text time transformers
107739107972 unordered-containers utf8-string utility-ht wizards
107740107973 ];
107741107974 testHaskellDepends = [
107742107975 ansi-terminal base base-compat-batteries bytestring cmdargs
107743107976 containers data-default Decimal directory easytest file-embed
107744− filepath haskeline here hledger-lib megaparsec mtl mtl-compat
107745− old-time parsec pretty-show process regex-tdfa safe shakespeare
107746− split statistics tabular temporary terminfo test-framework
107977+ filepath haskeline here hledger-lib math-functions megaparsec mtl
107978+ mtl-compat old-time parsec pretty-show process regex-tdfa safe
107979+ shakespeare split tabular temporary terminfo test-framework
107747107980 test-framework-hunit text time transformers unordered-containers
107748107981 utf8-string utility-ht wizards
107749107982 ];
107750107983 benchmarkHaskellDepends = [
107751107984 ansi-terminal base base-compat-batteries bytestring cmdargs
107752107985 containers criterion data-default Decimal directory easytest
107753− file-embed filepath haskeline here hledger-lib html megaparsec mtl
107754− mtl-compat old-time parsec pretty-show process regex-tdfa safe
107755− shakespeare split statistics tabular temporary terminfo text time
107756− timeit transformers unordered-containers utf8-string utility-ht
107757− wizards
107986+ file-embed filepath haskeline here hledger-lib html math-functions
107987+ megaparsec mtl mtl-compat old-time parsec pretty-show process
107988+ regex-tdfa safe shakespeare split tabular temporary terminfo text
107989+ time timeit transformers unordered-containers utf8-string
107990+ utility-ht wizards
107758107991 ];
107759107992 description = "Command-line interface for the hledger accounting tool";
107760107993 license = stdenv.lib.licenses.gpl3;
@@ -107769,8 +108002,8 @@ self: {
107769108002 }:
107770108003 mkDerivation {
107771108004 pname = "hledger-api";
107772− version = "1.11.1";
107773− sha256 = "1wsbjsdibdwf4bmhbwcql7yiprhz83zj8g7a1labykmdw8lldlqc";
108005+ version = "1.12";
108006+ sha256 = "0vl4ag5r58zag8djihmdlj9apqrvczjn51qfizs366wprdppdxax";
107774108007 isLibrary = false;
107775108008 isExecutable = true;
107776108009 executableHaskellDepends = [
@@ -107817,17 +108050,15 @@ self: {
107817108050
107818108051 "hledger-iadd" = callPackage
107819108052 ({ mkDerivation, base, brick, containers, directory, free
107820− , hledger-lib, hspec, megaparsec, microlens, microlens-th
107821− , optparse-applicative, QuickCheck, semigroups, text, text-zipper
107822− , time, transformers, unordered-containers, vector, vty
107823− , xdg-basedir
108053+ , hledger-lib, hspec, hspec-discover, megaparsec, microlens
108054+ , microlens-th, optparse-applicative, QuickCheck, semigroups, text
108055+ , text-zipper, time, transformers, unordered-containers, vector
108056+ , vty, xdg-basedir
107824108057 }:
107825108058 mkDerivation {
107826108059 pname = "hledger-iadd";
107827− version = "1.3.6";
107828− sha256 = "04gy5pvbcgkr3jg1a2dav3kcd7ih46knn0d39l8670bmwhx3y5br";
107829− revision = "3";
107830− editedCabalFile = "0knyxgscbhddizdnljjs2ih73kf2s8acyzhrvhwdmw4c14560x45";
108060+ version = "1.3.7";
108061+ sha256 = "1x80f427mvgak1jz8mc7zmx4fz801dwxvij9zy93jw2h4yf7a16b";
107831108062 isLibrary = true;
107832108063 isExecutable = true;
107833108064 libraryHaskellDepends = [
@@ -107845,6 +108076,7 @@ self: {
107845108076 base free hledger-lib hspec megaparsec QuickCheck text text-zipper
107846108077 time transformers vector
107847108078 ];
108079+ testToolDepends = [ hspec-discover ];
107848108080 description = "A terminal UI as drop-in replacement for hledger add";
107849108081 license = stdenv.lib.licenses.bsd3;
107850108082 hydraPlatforms = stdenv.lib.platforms.none;
@@ -107896,8 +108128,8 @@ self: {
107896108128 }:
107897108129 mkDerivation {
107898108130 pname = "hledger-lib";
107899− version = "1.11.1";
107900− sha256 = "0diz7ygl8zl4bjxq2c627fjvvjcdpkiqp42f5wjmz9pd1nd2da4f";
108131+ version = "1.12";
108132+ sha256 = "1m38r9z6ccdxhl54k8x9drbfmj1l9hy8mnb7cj4bwprpz4xx15bh";
107901108133 libraryHaskellDepends = [
107902108134 ansi-terminal array base base-compat-batteries blaze-markup
107903108135 bytestring call-stack cassava cassava-megaparsec cmdargs containers
@@ -107927,8 +108159,8 @@ self: {
107927108159 }:
107928108160 mkDerivation {
107929108161 pname = "hledger-ui";
107930− version = "1.11.1";
107931− sha256 = "03k62vsjyk2d7nq3lzas4qac2ck09xhk2x752xncls5rfzj8hjcj";
108162+ version = "1.12";
108163+ sha256 = "0cidm3kjlfnzfpsbzkbmfx36gm5msipkavw5267s67crzdcg8qwg";
107932108164 isLibrary = false;
107933108165 isExecutable = true;
107934108166 executableHaskellDepends = [
@@ -107971,8 +108203,8 @@ self: {
107971108203 }:
107972108204 mkDerivation {
107973108205 pname = "hledger-web";
107974− version = "1.11.1";
107975− sha256 = "1bvhiikz8hlgjvc7s2hk363gjva9izga167bpx074m560q7y77fs";
108206+ version = "1.12";
108207+ sha256 = "14n3qhdr95nfgczw05dki2wy26k86z1h0li8md1bglch4j9fjs36";
107976108208 isLibrary = true;
107977108209 isExecutable = true;
107978108210 libraryHaskellDepends = [
@@ -108045,21 +108277,6 @@ self: {
108045108277 }) {inherit (pkgs) git; inherit (pkgs) openssl;};
108046108278
108047108279 "hlibsass" = callPackage
108048− ({ mkDerivation, base, Cabal, directory, hspec, libsass }:
108049− mkDerivation {
108050− pname = "hlibsass";
108051− version = "0.1.7.0";
108052− sha256 = "0vcz3hndksfp9rmz07y67rvqinaz7cxzvrhjcwy30wc79m25r9v2";
108053− configureFlags = [ "-fexternalLibsass" ];
108054− setupHaskellDepends = [ base Cabal directory ];
108055− libraryHaskellDepends = [ base ];
108056− librarySystemDepends = [ libsass ];
108057− testHaskellDepends = [ base hspec ];
108058− description = "Low-level bindings to Libsass";
108059− license = stdenv.lib.licenses.mit;
108060− }) {inherit (pkgs) libsass;};
108061−
108062− "hlibsass_0_1_8_0" = callPackage
108063108280 ({ mkDerivation, base, Cabal, directory, hspec, libsass }:
108064108281 mkDerivation {
108065108282 pname = "hlibsass";
@@ -108072,7 +108289,6 @@ self: {
108072108289 testHaskellDepends = [ base hspec ];
108073108290 description = "Low-level bindings to Libsass";
108074108291 license = stdenv.lib.licenses.mit;
108075− hydraPlatforms = stdenv.lib.platforms.none;
108076108292 }) {inherit (pkgs) libsass;};
108077108293
108078108294 "hlint" = callPackage
@@ -108084,8 +108300,8 @@ self: {
108084108300 }:
108085108301 mkDerivation {
108086108302 pname = "hlint";
108087− version = "2.1.10";
108088− sha256 = "19as2m9g75cr6n1agzvsij0cvqhb0wbjlk31w4y5d5mns87dki0w";
108303+ version = "2.1.11";
108304+ sha256 = "0nv6627dacfsfjd3irmkff06hj1hr194zpm9xq6ng93dxhkhsnab";
108089108305 isLibrary = true;
108090108306 isExecutable = true;
108091108307 enableSeparateDataOutput = true;
@@ -110070,11 +110286,11 @@ self: {
110070110286 ({ mkDerivation, base, bytestring, HUnit, openssl }:
110071110287 mkDerivation {
110072110288 pname = "hopenssl";
110073− version = "2.2.2";
110074− sha256 = "0k589mi4sny88jaqxcqd0jgy6kmbzslxk6y1bk8xkvq73nvjxnjl";
110289+ version = "2.2.3";
110290+ sha256 = "0nihpm1zlb8y4bx5j429p0sybwnvz61pnd7ixcl90flwzlizr168";
110075110291 libraryHaskellDepends = [ base bytestring ];
110076110292 librarySystemDepends = [ openssl ];
110077− testHaskellDepends = [ base HUnit ];
110293+ testHaskellDepends = [ base bytestring HUnit ];
110078110294 description = "FFI Bindings to OpenSSL's EVP Digest Interface";
110079110295 license = stdenv.lib.licenses.bsd3;
110080110296 maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -111592,6 +111808,18 @@ self: {
111592111808 license = "GPL";
111593111809 }) {};
111594111810
111811+ "hs-bibutils_6_7_0_0" = callPackage
111812+ ({ mkDerivation, base, syb }:
111813+ mkDerivation {
111814+ pname = "hs-bibutils";
111815+ version = "6.7.0.0";
111816+ sha256 = "1qfyssl76lm4g09yxr3y10kmf8cnzls46g5h0ijk0wpk9wlhbln5";
111817+ libraryHaskellDepends = [ base syb ];
111818+ description = "Haskell bindings to bibutils, the bibliography conversion utilities";
111819+ license = "GPL";
111820+ hydraPlatforms = stdenv.lib.platforms.none;
111821+ }) {};
111822+
111595111823 "hs-blake2" = callPackage
111596111824 ({ mkDerivation, base, bytestring, bytestring-arbitrary, criterion
111597111825 , cryptohash, libb2, QuickCheck, tasty, tasty-quickcheck
@@ -118457,6 +118685,28 @@ self: {
118457118685 license = stdenv.lib.licenses.bsd3;
118458118686 }) {};
118459118687
118688+ "hw-bits_0_7_0_5" = callPackage
118689+ ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec
118690+ , hw-hspec-hedgehog, hw-int, hw-prim, hw-string-parse, QuickCheck
118691+ , safe, vector
118692+ }:
118693+ mkDerivation {
118694+ pname = "hw-bits";
118695+ version = "0.7.0.5";
118696+ sha256 = "1p3bqkzsmmz66chrwykj8pawgg7m5dvzsqmr9lrsdxldgqq62i8s";
118697+ libraryHaskellDepends = [
118698+ base bytestring hw-int hw-prim hw-string-parse safe vector
118699+ ];
118700+ testHaskellDepends = [
118701+ base bytestring hedgehog hspec hw-hspec-hedgehog hw-prim QuickCheck
118702+ vector
118703+ ];
118704+ benchmarkHaskellDepends = [ base criterion hw-prim vector ];
118705+ description = "Bit manipulation";
118706+ license = stdenv.lib.licenses.bsd3;
118707+ hydraPlatforms = stdenv.lib.platforms.none;
118708+ }) {};
118709+
118460118710 "hw-conduit" = callPackage
118461118711 ({ mkDerivation, array, base, bytestring, conduit
118462118712 , conduit-combinators, criterion, hspec, mmap, time, transformers
@@ -118825,8 +119075,8 @@ self: {
118825119075 }:
118826119076 mkDerivation {
118827119077 pname = "hw-kafka-avro";
118828− version = "2.1.0";
118829− sha256 = "06yz55g4hqv8lbx0ywkiwwww81dmk44zi37s7sq09vkvbk9hm9v2";
119078+ version = "4.0.0";
119079+ sha256 = "0khqvd1l44bx4mnrv7hbvr0qbak6n17l4qqk3lwga21qnchnlgak";
118830119080 isLibrary = true;
118831119081 isExecutable = true;
118832119082 libraryHaskellDepends = [
@@ -118951,29 +119201,6 @@ self: {
118951119201 }) {};
118952119202
118953119203 "hw-prim" = callPackage
118954− ({ mkDerivation, base, bytestring, criterion, directory, exceptions
118955− , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups
118956− , transformers, vector
118957− }:
118958− mkDerivation {
118959− pname = "hw-prim";
118960− version = "0.6.2.20";
118961− sha256 = "05azmns8nvdpfhd0fi71slsgn8irghyx25rynipc44ff407c1maa";
118962− libraryHaskellDepends = [
118963− base bytestring mmap semigroups transformers vector
118964− ];
118965− testHaskellDepends = [
118966− base bytestring directory exceptions hedgehog hspec
118967− hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector
118968− ];
118969− benchmarkHaskellDepends = [
118970− base bytestring criterion mmap semigroups transformers vector
118971− ];
118972− description = "Primitive functions and data types";
118973− license = stdenv.lib.licenses.bsd3;
118974− }) {};
118975−
118976− "hw-prim_0_6_2_22" = callPackage
118977119204 ({ mkDerivation, base, bytestring, criterion, directory, exceptions
118978119205 , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups
118979119206 , transformers, vector
@@ -118994,7 +119221,6 @@ self: {
118994119221 ];
118995119222 description = "Primitive functions and data types";
118996119223 license = stdenv.lib.licenses.bsd3;
118997− hydraPlatforms = stdenv.lib.platforms.none;
118998119224 }) {};
118999119225
119000119226 "hw-prim-bits" = callPackage
@@ -119293,8 +119519,8 @@ self: {
119293119519 }:
119294119520 mkDerivation {
119295119521 pname = "hwhile";
119296− version = "0.1.1.2";
119297− sha256 = "1zilz8fdy90dpq6rzj98d70jw5j668fqpx28jhkpj50k72xlrpkb";
119522+ version = "0.1.1.3";
119523+ sha256 = "1cd5a6szangr456dsw6j4zf8cgg30lw4dkhsjhw02lag9ips6v7s";
119298119524 isLibrary = true;
119299119525 isExecutable = true;
119300119526 libraryHaskellDepends = [
@@ -120357,8 +120583,8 @@ self: {
120357120583 pname = "hyraxAbif";
120358120584 version = "0.2.3.10";
120359120585 sha256 = "1x800gx7l3wj0xphip8fhzh9pbhc374p2pgjdvhw5qq5wbxc7r3b";
120360− revision = "1";
120361− editedCabalFile = "1iq9bw70rwp0lghxi188iidvp29cinyam78n5d30rqb4p807fb55";
120586+ revision = "2";
120587+ editedCabalFile = "1dwkqlkjg5hbjlwl7cjxmhg1camhlqpaqjrpmkwknscj76hfckvi";
120362120588 isLibrary = true;
120363120589 isExecutable = true;
120364120590 libraryHaskellDepends = [
@@ -121639,8 +121865,8 @@ self: {
121639121865 }:
121640121866 mkDerivation {
121641121867 pname = "imap";
121642− version = "0.3.0.8";
121643− sha256 = "1ha6cxfv77ip85vlg0y39jx92zb1mf35gy39lalhzm59a3cfj97b";
121868+ version = "0.3.0.9";
121869+ sha256 = "1lskisk4aacqiv1v6fr95zcc5mrn9l4ikxf7xpj568k2i3aqcnwk";
121644121870 libraryHaskellDepends = [
121645121871 attoparsec base bytestring connection containers either exceptions
121646121872 hslogger list-t network pipes random rolling-queue stm stm-delay
@@ -122285,6 +122511,26 @@ self: {
122285122511 hydraPlatforms = stdenv.lib.platforms.none;
122286122512 }) {};
122287122513
122514+ "incremental-parser_0_3_2_1" = callPackage
122515+ ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
122516+ , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text
122517+ }:
122518+ mkDerivation {
122519+ pname = "incremental-parser";
122520+ version = "0.3.2.1";
122521+ sha256 = "07banm2lnrhjvihs0iaij0kqgff198qcbah02s3cjyyl70cmllfr";
122522+ libraryHaskellDepends = [ base monoid-subclasses ];
122523+ testHaskellDepends = [
122524+ base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
122525+ ];
122526+ benchmarkHaskellDepends = [
122527+ base bytestring criterion deepseq monoid-subclasses text
122528+ ];
122529+ description = "Generic parser library capable of providing partial results from partial input";
122530+ license = stdenv.lib.licenses.gpl3;
122531+ hydraPlatforms = stdenv.lib.platforms.none;
122532+ }) {};
122533+
122288122534 "incremental-sat-solver" = callPackage
122289122535 ({ mkDerivation, base, containers, mtl }:
122290122536 mkDerivation {
@@ -123551,8 +123797,8 @@ self: {
123551123797 }:
123552123798 mkDerivation {
123553123799 pname = "interlude-l";
123554− version = "0.4.0.0";
123555− sha256 = "0dh3n0kx1i46k7v7y7i4i39raacjc6kf5yb8p410hlsk4wwijw1n";
123800+ version = "0.5.0.0";
123801+ sha256 = "1p3qv356lqw5m88wilj7mb2hyqhbcd67rcg9kdaqg3pibmyiq3bx";
123556123802 libraryHaskellDepends = [
123557123803 aeson base exceptions lens monad-control MonadRandom mtl protolude
123558123804 string-conv text transformers witherable
@@ -124440,6 +124686,17 @@ self: {
124440124686 hydraPlatforms = stdenv.lib.platforms.none;
124441124687 }) {};
124442124688
124689+ "ip2proxy" = callPackage
124690+ ({ mkDerivation, base, binary, bytestring, iproute }:
124691+ mkDerivation {
124692+ pname = "ip2proxy";
124693+ version = "1.0.0";
124694+ sha256 = "0f1plyy6hxkk7xz9m4fv7p56vqmvnna9frg21ms1n3f99wfimldx";
124695+ libraryHaskellDepends = [ base binary bytestring iproute ];
124696+ description = "IP2Proxy Haskell package for proxy detection";
124697+ license = stdenv.lib.licenses.mit;
124698+ }) {};
124699+
124443124700 "ip6addr" = callPackage
124444124701 ({ mkDerivation, base, cmdargs, IPv6Addr, text }:
124445124702 mkDerivation {
@@ -126039,10 +126296,8 @@ self: {
126039126296 }:
126040126297 mkDerivation {
126041126298 pname = "jammittools";
126042− version = "0.5.5";
126043− sha256 = "0x9khnf9ykhgi7aghc24nynfyrh6557mmf8s38597h4zdsd897xz";
126044− revision = "1";
126045− editedCabalFile = "0pznd9xkwadls2npdsaj69c5ssn3mdri82qxf1q7h7vyba34qibi";
126299+ version = "0.5.5.1";
126300+ sha256 = "1q660fvnvrj8cb9rzj7b5qmrbmqy8krq2w1bg824mf6pmvlw52z6";
126046126301 isLibrary = true;
126047126302 isExecutable = true;
126048126303 libraryHaskellDepends = [
@@ -127064,6 +127319,17 @@ self: {
127064127319 license = stdenv.lib.licenses.bsd3;
127065127320 }) {};
127066127321
127322+ "json-alt" = callPackage
127323+ ({ mkDerivation, aeson, base }:
127324+ mkDerivation {
127325+ pname = "json-alt";
127326+ version = "1.0.0";
127327+ sha256 = "1ivmbm5gw362vlss1w5s2z7byrzxdh8z1qdfsh0xmywkvwx56l5q";
127328+ libraryHaskellDepends = [ aeson base ];
127329+ description = "Union 'alternative' or Either that has untagged JSON encoding";
127330+ license = stdenv.lib.licenses.bsd3;
127331+ }) {};
127332+
127067127333 "json-api" = callPackage
127068127334 ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
127069127335 , data-default, hspec, lens, lens-aeson, text, unordered-containers
@@ -127150,31 +127416,32 @@ self: {
127150127416
127151127417 "json-autotype" = callPackage
127152127418 ({ mkDerivation, aeson, base, bytestring, containers, directory
127153− , filepath, GenericPretty, hashable, lens, mtl
127419+ , filepath, GenericPretty, hashable, json-alt, lens, mtl
127154127420 , optparse-applicative, pretty, process, QuickCheck, scientific
127155− , smallcheck, text, uniplate, unordered-containers, vector, yaml
127421+ , smallcheck, template-haskell, text, uniplate
127422+ , unordered-containers, vector, yaml
127156127423 }:
127157127424 mkDerivation {
127158127425 pname = "json-autotype";
127159− version = "2.0.0";
127160− sha256 = "0mip3k489321sqzzwbv0sbcscv2q9n4lbc63sx8lslsy95da9x68";
127161− revision = "1";
127162− editedCabalFile = "00wbcq9bx6sq6i5756ja6pf016xbpk2kflq20ncdv76zycxdkqnm";
127426+ version = "3.0.1";
127427+ sha256 = "0nir4nx4wchl10zs753a3ayg9lgixg2ap3liwz9xpz191c8rkbka";
127163127428 isLibrary = true;
127164127429 isExecutable = true;
127165127430 libraryHaskellDepends = [
127166− aeson base containers filepath GenericPretty hashable lens mtl
127167− pretty process scientific text uniplate unordered-containers vector
127431+ aeson base containers filepath GenericPretty hashable json-alt lens
127432+ mtl pretty process QuickCheck scientific smallcheck
127433+ template-haskell text uniplate unordered-containers vector
127168127434 ];
127169127435 executableHaskellDepends = [
127170127436 aeson base bytestring containers filepath GenericPretty hashable
127171− lens mtl optparse-applicative pretty process scientific text
127172− uniplate unordered-containers vector yaml
127437+ json-alt lens mtl optparse-applicative pretty process scientific
127438+ template-haskell text uniplate unordered-containers vector yaml
127173127439 ];
127174127440 testHaskellDepends = [
127175127441 aeson base bytestring containers directory filepath GenericPretty
127176− hashable lens mtl optparse-applicative pretty process QuickCheck
127177− scientific smallcheck text uniplate unordered-containers vector
127442+ hashable json-alt lens mtl optparse-applicative pretty process
127443+ QuickCheck scientific smallcheck template-haskell text uniplate
127444+ unordered-containers vector
127178127445 ];
127179127446 description = "Automatic type declaration for JSON input data";
127180127447 license = stdenv.lib.licenses.bsd3;
@@ -129811,8 +130078,8 @@ self: {
129811130078 ({ mkDerivation, base }:
129812130079 mkDerivation {
129813130080 pname = "kind-apply";
129814− version = "0.1.0.0";
129815− sha256 = "0n2picf38cxfgsi76372h6d25s5kvc32qw7514b2i4ald6qh8aip";
130081+ version = "0.2.0.0";
130082+ sha256 = "1c98537cinsv0pdp8alcvqmbijxz7ac0cn7xxyla3mnnv5awk7zf";
129816130083 libraryHaskellDepends = [ base ];
129817130084 description = "Utilities to work with lists of types";
129818130085 license = stdenv.lib.licenses.bsd3;
@@ -129823,8 +130090,8 @@ self: {
129823130090 ({ mkDerivation, base, kind-apply }:
129824130091 mkDerivation {
129825130092 pname = "kind-generics";
129826− version = "0.2.0";
129827− sha256 = "07bvdys7xlxds1q6hlqn299709k1fha81hap7jfn8snyjv3fdfal";
130093+ version = "0.2.1.0";
130094+ sha256 = "0j6r70gafcx3wg3rxhcm28gqlr7zpghl105imcqm2jgm5kb2189l";
129828130095 libraryHaskellDepends = [ base kind-apply ];
129829130096 description = "Generic programming in GHC style for arbitrary kinds and GADTs";
129830130097 license = stdenv.lib.licenses.bsd3;
@@ -130102,8 +130369,8 @@ self: {
130102130369 pname = "kqueue";
130103130370 version = "0.2";
130104130371 sha256 = "0sbkyq17i41kln7scrfc9kdzsbyb787z33kzpkdz2vrziapns33h";
130105− revision = "2";
130106− editedCabalFile = "1c7xskqgv45xsiwa2djfia0mq9f0p6gbb0dwlj5sd8swi3msbsfz";
130372+ revision = "3";
130373+ editedCabalFile = "17wanwn4pmh6z6v7ncg50q4sgg87lllld50wa5j5mmb07q4c3mj7";
130107130374 libraryHaskellDepends = [ base directory filepath mtl time unix ];
130108130375 libraryToolDepends = [ c2hs ];
130109130376 description = "A binding to the kqueue event library";
@@ -132159,7 +132426,7 @@ self: {
132159132426 hydraPlatforms = stdenv.lib.platforms.none;
132160132427 }) {};
132161132428
132162− "language-puppet_1_4_1" = callPackage
132429+ "language-puppet_1_4_2" = callPackage
132163132430 ({ mkDerivation, aeson, ansi-wl-pprint, async, attoparsec, base
132164132431 , base16-bytestring, bytestring, case-insensitive, containers
132165132432 , cryptonite, directory, filecache, filepath, formatting, Glob
@@ -132173,8 +132440,8 @@ self: {
132173132440 }:
132174132441 mkDerivation {
132175132442 pname = "language-puppet";
132176− version = "1.4.1";
132177− sha256 = "1az4lalx2qb9wf0n99zjd9agy20x8369f80411mhj11rcnnl1a66";
132443+ version = "1.4.2";
132444+ sha256 = "0bdi51cjl8m48clkqj6lb9vyxdagx2a4q6f48a1q4b50mpinx5qq";
132178132445 isLibrary = true;
132179132446 isExecutable = true;
132180132447 enableSeparateDataOutput = true;
@@ -133265,6 +133532,18 @@ self: {
133265133532 license = stdenv.lib.licenses.bsd3;
133266133533 }) {};
133267133534
133535+ "leancheck-instances" = callPackage
133536+ ({ mkDerivation, base, bytestring, leancheck, nats, text }:
133537+ mkDerivation {
133538+ pname = "leancheck-instances";
133539+ version = "0.0.1";
133540+ sha256 = "1p7d6z82s689l8vi1c0rq6cnzvzlcx17nmr3wzy4yj3h80g1hnlq";
133541+ libraryHaskellDepends = [ base bytestring leancheck nats text ];
133542+ testHaskellDepends = [ base bytestring leancheck nats text ];
133543+ description = "Common LeanCheck instances";
133544+ license = stdenv.lib.licenses.bsd3;
133545+ }) {};
133546+
133268133547 "leankit-api" = callPackage
133269133548 ({ mkDerivation, aeson, base, bytestring, colour, curl, split }:
133270133549 mkDerivation {
@@ -134811,6 +135090,44 @@ self: {
134811135090 hydraPlatforms = stdenv.lib.platforms.none;
134812135091 }) {inherit (pkgs) postgresql;};
134813135092
135093+ "libraft" = callPackage
135094+ ({ mkDerivation, attoparsec, base, bytestring, cereal, concurrency
135095+ , containers, dejafu, directory, exceptions, haskeline
135096+ , hunit-dejafu, mtl, network, network-simple, parsec, protolude
135097+ , QuickCheck, random, repline, stm, tasty, tasty-dejafu
135098+ , tasty-discover, tasty-expected-failure, tasty-hunit
135099+ , tasty-quickcheck, text, time, transformers, word8
135100+ }:
135101+ mkDerivation {
135102+ pname = "libraft";
135103+ version = "0.1.1.0";
135104+ sha256 = "1kjrrpgci6f1wsb75xrndp7xx50xgw8fgh4f6l345wyy2xxlpj8c";
135105+ revision = "1";
135106+ editedCabalFile = "0bzfkay18wphlqfm0i6rmr7rm1d6s16nxvrmc4wp0szim1k9k0gh";
135107+ isLibrary = true;
135108+ isExecutable = true;
135109+ libraryHaskellDepends = [
135110+ attoparsec base bytestring cereal concurrency containers directory
135111+ exceptions haskeline mtl network network-simple parsec protolude
135112+ random repline text time transformers word8
135113+ ];
135114+ executableHaskellDepends = [
135115+ attoparsec base bytestring cereal concurrency containers directory
135116+ exceptions haskeline mtl network network-simple parsec protolude
135117+ random repline stm text time transformers word8
135118+ ];
135119+ testHaskellDepends = [
135120+ attoparsec base bytestring cereal concurrency containers dejafu
135121+ directory exceptions haskeline hunit-dejafu mtl network
135122+ network-simple parsec protolude QuickCheck random repline tasty
135123+ tasty-dejafu tasty-discover tasty-expected-failure tasty-hunit
135124+ tasty-quickcheck text time transformers word8
135125+ ];
135126+ testToolDepends = [ tasty-discover ];
135127+ description = "Raft consensus algorithm";
135128+ license = stdenv.lib.licenses.bsd3;
135129+ }) {};
135130+
134814135131 "librandomorg" = callPackage
134815135132 ({ mkDerivation, base, bytestring, curl }:
134816135133 mkDerivation {
@@ -138896,8 +139213,8 @@ self: {
138896139213 ({ mkDerivation, base, containers, contravariant }:
138897139214 mkDerivation {
138898139215 pname = "lrucache";
138899− version = "1.2.0.0";
138900− sha256 = "05knlckzx261yxbz38rqq8vy86zj1np0w2l32cnib6714vhaj5sz";
139216+ version = "1.2.0.1";
139217+ sha256 = "11avhnjnb89rvn2s41jhh5r40zgp7r6kb5c0hcfiibpabqvv46pw";
138901139218 libraryHaskellDepends = [ base containers contravariant ];
138902139219 description = "a simple, pure LRU cache";
138903139220 license = stdenv.lib.licenses.bsd3;
@@ -138969,8 +139286,8 @@ self: {
138969139286 }:
138970139287 mkDerivation {
138971139288 pname = "lsp-test";
138972− version = "0.5.0.1";
138973− sha256 = "0rswd308ngrl2ii13j2pl09cddh6pycm7skiyilsk54j395wy2ky";
139289+ version = "0.5.0.2";
139290+ sha256 = "0g5kw8y59bdyzj7zzwif1810q7wk87d7q53idpw250g6s4dwycxa";
138974139291 libraryHaskellDepends = [
138975139292 aeson aeson-pretty ansi-terminal base bytestring conduit
138976139293 conduit-parse containers data-default Diff directory filepath
@@ -141592,6 +141909,28 @@ self: {
141592141909 license = stdenv.lib.licenses.bsd3;
141593141910 }) {};
141594141911
141912+ "massiv_0_2_5_0" = callPackage
141913+ ({ mkDerivation, base, bytestring, data-default, data-default-class
141914+ , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions
141915+ , vector
141916+ }:
141917+ mkDerivation {
141918+ pname = "massiv";
141919+ version = "0.2.5.0";
141920+ sha256 = "0r7556mxsqzxg1kp4hrbv3c07xzkf08sycaqbfyy2xrzzczgiy9z";
141921+ libraryHaskellDepends = [
141922+ base bytestring data-default-class deepseq ghc-prim primitive
141923+ vector
141924+ ];
141925+ testHaskellDepends = [
141926+ base bytestring data-default deepseq hspec QuickCheck
141927+ safe-exceptions vector
141928+ ];
141929+ description = "Massiv (Массив) is an Array Library";
141930+ license = stdenv.lib.licenses.bsd3;
141931+ hydraPlatforms = stdenv.lib.platforms.none;
141932+ }) {};
141933+
141595141934 "massiv-io" = callPackage
141596141935 ({ mkDerivation, base, bytestring, data-default, deepseq, directory
141597141936 , filepath, JuicyPixels, massiv, netpbm, process, vector
@@ -141646,6 +141985,25 @@ self: {
141646141985 license = stdenv.lib.licenses.bsd3;
141647141986 }) {};
141648141987
141988+ "matchable" = callPackage
141989+ ({ mkDerivation, base, containers, doctest, doctest-discover, Glob
141990+ , hashable, hspec, tagged, unordered-containers, vector
141991+ }:
141992+ mkDerivation {
141993+ pname = "matchable";
141994+ version = "0.1.1.1";
141995+ sha256 = "0sd661pp54hyg6igkr90cdjlnx8widl2yxkf0ggyqfna6ak5ml53";
141996+ libraryHaskellDepends = [
141997+ base containers hashable tagged unordered-containers vector
141998+ ];
141999+ testHaskellDepends = [
142000+ base containers doctest doctest-discover Glob hashable hspec tagged
142001+ unordered-containers vector
142002+ ];
142003+ description = "A type class for Matchable Functors";
142004+ license = stdenv.lib.licenses.bsd3;
142005+ }) {};
142006+
141649142007 "matcher" = callPackage
141650142008 ({ mkDerivation, base, base-prelude, profunctors, success, text
141651142009 , transformers
@@ -142005,30 +142363,31 @@ self: {
142005142363 "matterhorn" = callPackage
142006142364 ({ mkDerivation, aeson, aspell-pipe, async, base, base-compat
142007142365 , brick, brick-skylighting, bytestring, cheapskate, checkers
142008− , config-ini, connection, containers, directory, filepath, gitrev
142009− , hashable, Hclip, mattermost-api, mattermost-api-qc
142010− , microlens-platform, mtl, process, quickcheck-text, random
142011− , semigroups, skylighting-core, stm, stm-delay, strict
142012− , string-conversions, tasty, tasty-hunit, tasty-quickcheck
142013− , temporary, text, text-zipper, time, timezone-olson
142014− , timezone-series, transformers, Unique, unix, unordered-containers
142015− , utf8-string, uuid, vector, vty, word-wrap, xdg-basedir
142366+ , config-ini, connection, containers, data-clist, directory
142367+ , filepath, gitrev, hashable, Hclip, mattermost-api
142368+ , mattermost-api-qc, microlens-platform, mtl, process
142369+ , quickcheck-text, random, semigroups, skylighting-core, stm
142370+ , stm-delay, strict, string-conversions, tasty, tasty-hunit
142371+ , tasty-quickcheck, temporary, text, text-zipper, time
142372+ , timezone-olson, timezone-series, transformers, Unique, unix
142373+ , unordered-containers, utf8-string, uuid, vector, vty, word-wrap
142374+ , xdg-basedir
142016142375 }:
142017142376 mkDerivation {
142018142377 pname = "matterhorn";
142019− version = "50200.0.0";
142020− sha256 = "07zbkkbn5cn8rcbc0xznlldcflhfp4szx6phlh7xpgf2hrcyc3g6";
142378+ version = "50200.1.0";
142379+ sha256 = "02rwxq42my7347p1wb0jh50z1m6fqkifgxg2hd2vrxiwzblyz0qc";
142021142380 isLibrary = false;
142022142381 isExecutable = true;
142023142382 enableSeparateDataOutput = true;
142024142383 executableHaskellDepends = [
142025142384 aeson aspell-pipe async base base-compat brick brick-skylighting
142026− bytestring cheapskate config-ini connection containers directory
142027− filepath gitrev hashable Hclip mattermost-api microlens-platform
142028− mtl process random semigroups skylighting-core stm stm-delay strict
142029− temporary text text-zipper time timezone-olson timezone-series
142030− transformers unix unordered-containers utf8-string uuid vector vty
142031− word-wrap xdg-basedir
142385+ bytestring cheapskate config-ini connection containers data-clist
142386+ directory filepath gitrev hashable Hclip mattermost-api
142387+ microlens-platform mtl process random semigroups skylighting-core
142388+ stm stm-delay strict temporary text text-zipper time timezone-olson
142389+ timezone-series transformers unix unordered-containers utf8-string
142390+ uuid vector vty word-wrap xdg-basedir
142032142391 ];
142033142392 testHaskellDepends = [
142034142393 base base-compat brick bytestring cheapskate checkers config-ini
@@ -142053,8 +142412,8 @@ self: {
142053142412 }:
142054142413 mkDerivation {
142055142414 pname = "mattermost-api";
142056− version = "50200.0.1";
142057− sha256 = "1snb51nw71cqjxanaf443dixz8b8vk99a8a4b1yya1xvikvdxf7c";
142415+ version = "50200.1.0";
142416+ sha256 = "1adqh3s34zw74x4idjy1ln8qq9qlqq146kb9b4gd2lijrr8zrjn7";
142058142417 isLibrary = true;
142059142418 isExecutable = true;
142060142419 libraryHaskellDepends = [
@@ -142078,8 +142437,8 @@ self: {
142078142437 }:
142079142438 mkDerivation {
142080142439 pname = "mattermost-api-qc";
142081− version = "50200.0.1";
142082− sha256 = "02ashys70857a5s7zx26zx6vdlybsdk9bil2bqawfkf6xcjhwq13";
142440+ version = "50200.1.0";
142441+ sha256 = "1rlzq0dqpqqnwzz1sknf8zfnsbqpz1w51ik9k4hi8qydkpbf3sdz";
142083142442 libraryHaskellDepends = [
142084142443 base containers mattermost-api QuickCheck text time
142085142444 ];
@@ -144288,6 +144647,8 @@ self: {
144288144647 pname = "midi-util";
144289144648 version = "0.2.0.1";
144290144649 sha256 = "0s37csd1x039q0cb487pd811jz7h0i26chvvbmwffh11bc2icjzc";
144650+ revision = "1";
144651+ editedCabalFile = "0a3hasbhvd327m65yqqyjah7y8r48l65bqg1ymcrc0s2zff10gl5";
144291144652 libraryHaskellDepends = [
144292144653 base containers event-list midi non-negative
144293144654 ];
@@ -145100,8 +145461,8 @@ self: {
145100145461 }:
145101145462 mkDerivation {
145102145463 pname = "mixpanel-client";
145103− version = "0.1.0.0";
145104− sha256 = "0m3l68b3mvpzsxr61rfvn89i5lym9yd3akvmwn001zdzqxk4l9v7";
145464+ version = "0.1.1";
145465+ sha256 = "1dr7h8ss3msnabz6nisq3q4khi48b4ahmghil9sz4in4s1dvn9am";
145105145466 libraryHaskellDepends = [
145106145467 aeson base base64-bytestring bytestring http-client http-client-tls
145107145468 servant servant-client string-conv text time
@@ -151297,10 +151658,8 @@ self: {
151297151658 }:
151298151659 mkDerivation {
151299151660 pname = "natural";
151300− version = "0.3.0.2";
151301− sha256 = "1haabwh41lyfhdd4mkfj7slhrwxhsxa6plii8jaza5z4bnydr7bd";
151302− revision = "1";
151303− editedCabalFile = "0y8dg3iplxgk36zbgyf8glzm16gi9x837micw9rbwg4vpzg2a171";
151661+ version = "0.3.0.3";
151662+ sha256 = "18ycqn164kl203wmvrdyfbwfgbbyzyl38i86sllmkwpqq2ciarwi";
151304151663 libraryHaskellDepends = [ base lens semigroupoids ];
151305151664 testHaskellDepends = [
151306151665 base checkers hedgehog lens QuickCheck tasty tasty-hedgehog
@@ -151368,8 +151727,8 @@ self: {
151368151727 pname = "natural-transformation";
151369151728 version = "0.4";
151370151729 sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma";
151371− revision = "6";
151372− editedCabalFile = "0qdjf1756gmq6vjd1p7i4b398s7j1gqfiaz3yf894h5p6x1ym0zl";
151730+ revision = "7";
151731+ editedCabalFile = "03nkhdrwki9j81clgfck4yl7ylv6dwa7gi77kknzq3s3nqlp728v";
151373151732 libraryHaskellDepends = [ base ];
151374151733 testHaskellDepends = [
151375151734 base containers quickcheck-instances tasty tasty-quickcheck
@@ -152493,6 +152852,18 @@ self: {
152493152852 hydraPlatforms = stdenv.lib.platforms.none;
152494152853 }) {};
152495152854
152855+ "network-bsd" = callPackage
152856+ ({ mkDerivation, base, network }:
152857+ mkDerivation {
152858+ pname = "network-bsd";
152859+ version = "2.8.0.0";
152860+ sha256 = "0dfbwgrr28y6ypw7p1ppqg7v746qf14569q4xazj4ahdjw2xkpi5";
152861+ libraryHaskellDepends = [ base network ];
152862+ doHaddock = false;
152863+ description = "Network.BSD";
152864+ license = stdenv.lib.licenses.bsd3;
152865+ }) {};
152866+
152496152867 "network-builder" = callPackage
152497152868 ({ mkDerivation, aeson, base, bytestring, cabal-test-bin, hspec
152498152869 , hspec-server, optparse-applicative, process, shelly, text, yaml
@@ -153628,8 +153999,8 @@ self: {
153628153999 }:
153629154000 mkDerivation {
153630154001 pname = "ngx-export";
153631− version = "1.6.1";
153632− sha256 = "1nzhfarz42b6arqndynp4zp4sq87g8ya9xh3zpyhsw8a3wz5idr0";
154002+ version = "1.6.2";
154003+ sha256 = "1wvh33raci7s4hczcfn5sj2kk1g61ry6xwn3lg7g3yy5bn7azv73";
153633154004 libraryHaskellDepends = [
153634154005 async base binary bytestring deepseq monad-loops template-haskell
153635154006 unix
@@ -153644,8 +154015,8 @@ self: {
153644154015 }:
153645154016 mkDerivation {
153646154017 pname = "ngx-export-tools";
153647− version = "0.3.1.0";
153648− sha256 = "1rdlyznj61a392n6m8p7g2g96alxcmcrw9n6izrdb0lkw21cls89";
154018+ version = "0.3.3.0";
154019+ sha256 = "06bi9vzq8alb4wylmq9npisnnpsc0r96srbmq68hmy6pjrva6rlg";
153649154020 libraryHaskellDepends = [
153650154021 aeson base binary bytestring ngx-export safe template-haskell
153651154022 ];
@@ -154522,6 +154893,25 @@ self: {
154522154893 license = stdenv.lib.licenses.bsd3;
154523154894 }) {};
154524154895
154896+ "nonempty-containers" = callPackage
154897+ ({ mkDerivation, base, comonad, containers, deepseq, hedgehog
154898+ , hedgehog-fn, semigroupoids, tasty, tasty-hedgehog, text, these
154899+ }:
154900+ mkDerivation {
154901+ pname = "nonempty-containers";
154902+ version = "0.1.0.0";
154903+ sha256 = "15800rd4hix5iab0n5k484za494zs110gyga8wn5xaag1axr4alp";
154904+ libraryHaskellDepends = [
154905+ base comonad containers deepseq semigroupoids these
154906+ ];
154907+ testHaskellDepends = [
154908+ base comonad containers hedgehog hedgehog-fn semigroupoids tasty
154909+ tasty-hedgehog text these
154910+ ];
154911+ description = "Non-empty variants of containers data types, with full API";
154912+ license = stdenv.lib.licenses.bsd3;
154913+ }) {};
154914+
154525154915 "nonemptymap" = callPackage
154526154916 ({ mkDerivation, base, containers, semigroupoids }:
154527154917 mkDerivation {
@@ -155909,6 +156299,8 @@ self: {
155909156299 pname = "oblivious-transfer";
155910156300 version = "0.1.0";
155911156301 sha256 = "1kq5ppm151q1im14j6zm2w0pn60baj6gzxmfqfx8p0m7a7wwl7sz";
156302+ revision = "1";
156303+ editedCabalFile = "1v9js45kc94zirg530d0f3r9wwsx60xnz7diqzvfxlbvw01649yk";
155912156304 libraryHaskellDepends = [
155913156305 base bytestring cryptonite memory protolude random
155914156306 ];
@@ -156167,6 +156559,25 @@ self: {
156167156559 license = stdenv.lib.licenses.bsd3;
156168156560 }) {};
156169156561
156562+ "oeis2" = callPackage
156563+ ({ mkDerivation, aeson, base, containers, hspec, http-conduit, lens
156564+ , lens-aeson, QuickCheck, text, vector
156565+ }:
156566+ mkDerivation {
156567+ pname = "oeis2";
156568+ version = "0.1.0";
156569+ sha256 = "17wzcf4zq8jg6kqd0mfkhcf37mkhjys1vzwpylhzkfgxwvhi4fjj";
156570+ libraryHaskellDepends = [
156571+ aeson base containers http-conduit lens lens-aeson text vector
156572+ ];
156573+ testHaskellDepends = [
156574+ aeson base containers hspec http-conduit lens lens-aeson QuickCheck
156575+ text vector
156576+ ];
156577+ description = "Interface for Online Encyclopedia of Integer Sequences (OEIS)";
156578+ license = stdenv.lib.licenses.bsd3;
156579+ }) {};
156580+
156170156581 "off-simple" = callPackage
156171156582 ({ mkDerivation, base, parsec3, vector }:
156172156583 mkDerivation {
@@ -156537,17 +156948,22 @@ self: {
156537156948 license = stdenv.lib.licenses.gpl3;
156538156949 }) {};
156539156950
156540− "once_0_3" = callPackage
156541− ({ mkDerivation, base, containers, hashable, template-haskell
156542− , unordered-containers
156951+ "once_0_4" = callPackage
156952+ ({ mkDerivation, async, base, containers, hashable, hspec
156953+ , hspec-discover, HUnit, template-haskell, unordered-containers
156543156954 }:
156544156955 mkDerivation {
156545156956 pname = "once";
156546− version = "0.3";
156547− sha256 = "1i5yf5d6c33arbrvvyk2bcp9cz8aj62zhd6sgxqz684baidn5rbc";
156957+ version = "0.4";
156958+ sha256 = "0az973cg4mf1azvh3x1gvp395ism7300mlajj9pvqmawvfar3g9h";
156548156959 libraryHaskellDepends = [
156549156960 base containers hashable template-haskell unordered-containers
156550156961 ];
156962+ testHaskellDepends = [
156963+ async base containers hashable hspec HUnit template-haskell
156964+ unordered-containers
156965+ ];
156966+ testToolDepends = [ hspec-discover ];
156551156967 description = "memoization for IO actions and functions";
156552156968 license = stdenv.lib.licenses.gpl3;
156553156969 hydraPlatforms = stdenv.lib.platforms.none;
@@ -159098,8 +159514,8 @@ self: {
159098159514 }:
159099159515 mkDerivation {
159100159516 pname = "pairing";
159101− version = "0.1.1";
159102− sha256 = "15230s384z6hg29fc9l06qsk0657c1z00x0pijgxr9w8lbis56qg";
159517+ version = "0.1.4";
159518+ sha256 = "13g1waqb32by4qlrl2hy3mgrr3lmfwkixy0745xv33vvw8wmm36c";
159103159519 libraryHaskellDepends = [
159104159520 base bytestring cryptonite memory protolude QuickCheck random
159105159521 wl-pprint-text
@@ -159250,6 +159666,8 @@ self: {
159250159666 pname = "pandoc";
159251159667 version = "2.5";
159252159668 sha256 = "0bi26r2qljdfxq26gaxj1xnhrawrfndfavs3f3g098x0g3dwazfm";
159669+ revision = "1";
159670+ editedCabalFile = "15jzrlf1qnn3qkzy1zk5f300y7748qdz8yk0zg0zy7ygi36b403v";
159253159671 configureFlags = [ "-fhttps" "-f-trypandoc" ];
159254159672 isLibrary = true;
159255159673 isExecutable = true;
@@ -159411,8 +159829,8 @@ self: {
159411159829 ({ mkDerivation, base, csv, pandoc, pandoc-types, text }:
159412159830 mkDerivation {
159413159831 pname = "pandoc-csv2table";
159414− version = "1.0.5";
159415− sha256 = "12692c1lpp4pz08x1b9yxanpki5sxb5h9373vjp9af88rykqykl1";
159832+ version = "1.0.6";
159833+ sha256 = "0yv58p7l0cdk8xnn0nczmnff189dci04jr9psxzsj1yfkrvpc32h";
159416159834 isLibrary = true;
159417159835 isExecutable = true;
159418159836 enableSeparateDataOutput = true;
@@ -169795,6 +170213,22 @@ self: {
169795170213 hydraPlatforms = stdenv.lib.platforms.none;
169796170214 }) {};
169797170215
170216+ "pretty-show-ansi-wl" = callPackage
170217+ ({ mkDerivation, ansi-wl-pprint, array, base, ghc-prim, happy
170218+ , haskell-lexer
170219+ }:
170220+ mkDerivation {
170221+ pname = "pretty-show-ansi-wl";
170222+ version = "1.9.2.1";
170223+ sha256 = "00g6crhwshscvchf4321sig1p7dr82is5vfa2x8vmxm7kr6ciki6";
170224+ libraryHaskellDepends = [
170225+ ansi-wl-pprint array base ghc-prim haskell-lexer
170226+ ];
170227+ libraryToolDepends = [ happy ];
170228+ description = "Like pretty-show, but only for ansi-wl-pprint";
170229+ license = stdenv.lib.licenses.mit;
170230+ }) {};
170231+
169798170232 "pretty-simple" = callPackage
169799170233 ({ mkDerivation, ansi-terminal, base, containers, criterion
169800170234 , doctest, Glob, mtl, parsec, text, transformers
@@ -171692,8 +172126,8 @@ self: {
171692172126 ({ mkDerivation, base, bytestring, c2hs, libpulseaudio }:
171693172127 mkDerivation {
171694172128 pname = "proteaaudio";
171695− version = "0.7.0.1";
171696− sha256 = "1v56qmgwj5cd8xbk19qgjwwkc1nbya1vagai7kypf5aj8c07gjrq";
172129+ version = "0.7.1.0";
172130+ sha256 = "1mmfcy7wwyniv5cpakcd73fapzy6z9n1yz66zsnk15ds2jclmqip";
171697172131 isLibrary = true;
171698172132 isExecutable = true;
171699172133 libraryHaskellDepends = [ base bytestring ];
@@ -173145,24 +173579,24 @@ self: {
173145173579 , attoparsec, attoparsec-uri, base, bytestring, containers, deepseq
173146173580 , emailaddress, monad-control, mtl, QuickCheck
173147173581 , quickcheck-instances, scientific, stm, strict, tasty
173148− , tasty-quickcheck, text, time, utf8-string, uuid, zeromq4-haskell
173149− , zeromq4-simple
173582+ , tasty-quickcheck, text, time, utf8-string, uuid, vector
173583+ , zeromq4-haskell, zeromq4-simple
173150173584 }:
173151173585 mkDerivation {
173152173586 pname = "purescript-iso";
173153− version = "0.0.5";
173154− sha256 = "06dw9fqc2h8asc3gwr3m5xqxsfcc24qw2pjz4wi2f2pgb32sicls";
173587+ version = "0.0.6";
173588+ sha256 = "0zz71c8mv86ihqwcqsp0cjw9dlyd0xw394dz14mwg16frajn986k";
173155173589 libraryHaskellDepends = [
173156173590 aeson aeson-attoparsec aeson-diff async attoparsec attoparsec-uri
173157173591 base bytestring containers deepseq emailaddress monad-control mtl
173158173592 QuickCheck quickcheck-instances scientific stm strict text time
173159− utf8-string uuid zeromq4-haskell zeromq4-simple
173593+ utf8-string uuid vector zeromq4-haskell zeromq4-simple
173160173594 ];
173161173595 testHaskellDepends = [
173162173596 aeson aeson-attoparsec aeson-diff async attoparsec attoparsec-uri
173163173597 base bytestring containers deepseq emailaddress monad-control mtl
173164173598 QuickCheck quickcheck-instances scientific stm strict tasty
173165− tasty-quickcheck text time utf8-string uuid zeromq4-haskell
173599+ tasty-quickcheck text time utf8-string uuid vector zeromq4-haskell
173166173600 zeromq4-simple
173167173601 ];
173168173602 description = "Isomorphic trivial data type definitions over JSON";
@@ -174022,6 +174456,8 @@ self: {
174022174456 pname = "quadratic-irrational";
174023174457 version = "0.0.6";
174024174458 sha256 = "02hdxi9kjp7dccmb7ix3a0yqr7fvl2vpc588ibxq6gjd5v3716r0";
174459+ revision = "1";
174460+ editedCabalFile = "0i7dsl7zm9r7sgfs2cwmic3qbk15lc7kbhjd53vin89p21fh8mzm";
174025174461 libraryHaskellDepends = [
174026174462 arithmoi base containers mtl transformers
174027174463 ];
@@ -180128,6 +180564,8 @@ self: {
180128180564 pname = "repa";
180129180565 version = "3.4.1.4";
180130180566 sha256 = "17m3wl4hvf04fxwm4fflhnv41yl9bm263hnbpxc8x6xqwifplq23";
180567+ revision = "1";
180568+ editedCabalFile = "1c5rf3ky5lw9q1ji2y37m721gs7m5liw3j84159ib0w0bb3ddzmi";
180131180569 libraryHaskellDepends = [
180132180570 base bytestring ghc-prim QuickCheck template-haskell vector
180133180571 ];
@@ -180226,6 +180664,8 @@ self: {
180226180664 pname = "repa-examples";
180227180665 version = "3.4.1.2";
180228180666 sha256 = "1lqqnk3prvw1pr2wi4rhymb8ij6mjp9mcsvjcllnxv567mz9gr4d";
180667+ revision = "1";
180668+ editedCabalFile = "00w3cyd3r2jp1z962fwchsg4ffqfhq99mnl4anwcylxdkp15jv0l";
180229180669 isLibrary = false;
180230180670 isExecutable = true;
180231180671 executableHaskellDepends = [
@@ -182543,8 +182983,8 @@ self: {
182543182983 }:
182544182984 mkDerivation {
182545182985 pname = "rncryptor";
182546− version = "0.3.0.0";
182547− sha256 = "0878dn69my16y6nvz7nagx7pxb5wk5hq6mzj9qyzf284bqb4zcgp";
182986+ version = "0.3.0.1";
182987+ sha256 = "0j8y2iqxsin4gcgl85si7gl4bjrmdw9psvc7j3maa91fyh40dx49";
182548182988 isLibrary = true;
182549182989 isExecutable = true;
182550182990 libraryHaskellDepends = [
@@ -182931,19 +183371,19 @@ self: {
182931183371 "ron" = callPackage
182932183372 ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
182933183373 , containers, criterion, data-default, deepseq, Diff, directory
182934− , errors, extra, filepath, hashable, mtl, network-info, safe
182935− , stringsearch, template-haskell, text, time, unordered-containers
183374+ , errors, extra, filepath, hashable, hedn, mtl, network-info, safe
183375+ , template-haskell, text, time, transformers, unordered-containers
182936183376 , vector
182937183377 }:
182938183378 mkDerivation {
182939183379 pname = "ron";
182940− version = "0.2";
182941− sha256 = "1dv1lfz9v31k817cby0252jy08sd9c01l1jrlhqf243w25a6zp41";
183380+ version = "0.3";
183381+ sha256 = "09mpv535rahaclj5yppzkg4n083d0rpqkr3r2zrmj1ywg5nw5h0i";
182942183382 libraryHaskellDepends = [
182943183383 aeson attoparsec base binary bytestring containers data-default
182944− deepseq Diff directory errors extra filepath hashable mtl
182945− network-info safe stringsearch template-haskell text time
182946− unordered-containers vector
183384+ Diff directory errors extra filepath hashable hedn mtl network-info
183385+ safe template-haskell text time transformers unordered-containers
183386+ vector
182947183387 ];
182948183388 benchmarkHaskellDepends = [ base criterion deepseq ];
182949183389 description = "RON, RON-RDT, and RON-Schema";
@@ -183703,8 +184143,8 @@ self: {
183703184143 }:
183704184144 mkDerivation {
183705184145 pname = "rtcm";
183706− version = "0.2.17";
183707− sha256 = "0g40krmbjy4irrxs3iabbr296l8hr98driz75j3s0dhqqzdxv4vm";
184146+ version = "0.2.36";
184147+ sha256 = "0gvkah51mnqpy20v2f3n1gvad1abmbkxljm4pz3yh3x9mkscnc2m";
183708184148 isLibrary = true;
183709184149 isExecutable = true;
183710184150 libraryHaskellDepends = [
@@ -184491,28 +184931,6 @@ self: {
184491184931 }) {};
184492184932
184493184933 "safecopy" = callPackage
184494− ({ mkDerivation, array, base, bytestring, cereal, containers, lens
184495− , lens-action, old-time, QuickCheck, quickcheck-instances, tasty
184496− , tasty-quickcheck, template-haskell, text, time, vector
184497− }:
184498− mkDerivation {
184499− pname = "safecopy";
184500− version = "0.9.4.1";
184501− sha256 = "110fa0x7dq4flaprwhzlwxa7j1465a6mnj9jl8xskb5s6p0whxhl";
184502− libraryHaskellDepends = [
184503− array base bytestring cereal containers old-time template-haskell
184504− text time vector
184505− ];
184506− testHaskellDepends = [
184507− array base cereal containers lens lens-action QuickCheck
184508− quickcheck-instances tasty tasty-quickcheck template-haskell time
184509− vector
184510− ];
184511− description = "Binary serialization with version control";
184512− license = stdenv.lib.licenses.publicDomain;
184513− }) {};
184514−
184515− "safecopy_0_9_4_2" = callPackage
184516184934 ({ mkDerivation, array, base, bytestring, cereal, containers, lens
184517184935 , lens-action, old-time, QuickCheck, quickcheck-instances, tasty
184518184936 , tasty-quickcheck, template-haskell, text, time, vector
@@ -184532,7 +184950,6 @@ self: {
184532184950 ];
184533184951 description = "Binary serialization with version control";
184534184952 license = stdenv.lib.licenses.publicDomain;
184535− hydraPlatforms = stdenv.lib.platforms.none;
184536184953 }) {};
184537184954
184538184955 "safecopy-migrate" = callPackage
@@ -189514,8 +189931,8 @@ self: {
189514189931 pname = "servant-iCalendar";
189515189932 version = "0.1.0.1";
189516189933 sha256 = "15gqlb60r8msn3k1j8wjxq89qg6d790lnb751wabg2lsxybmdzas";
189517− revision = "2";
189518− editedCabalFile = "0c4d69rm08hpzlagl22qnnq9y85bp3zwix5h2hazr1m4na09hj1l";
189934+ revision = "3";
189935+ editedCabalFile = "0bcab5xk354glypz15lnlzvr157pbvh4mjfd5ln59hr3ip84bzi9";
189519189936 libraryHaskellDepends = [
189520189937 base data-default http-media iCalendar servant
189521189938 ];
@@ -189600,8 +190017,8 @@ self: {
189600190017 }:
189601190018 mkDerivation {
189602190019 pname = "servant-kotlin";
189603− version = "0.1.1.4";
189604− sha256 = "09myrp3g8k60i3w7da8sdi6asrdz8nri8cwh7qszhmpyf0xa6vhk";
190020+ version = "0.1.1.5";
190021+ sha256 = "0wgx3yc6ay84mlwjw28dfrn633lcmpmr0968h4ncl99xa8vz1wnv";
189605190022 libraryHaskellDepends = [
189606190023 base containers directory formatting lens servant servant-foreign
189607190024 text time wl-pprint-text
@@ -189985,21 +190402,20 @@ self: {
189985190402
189986190403 "servant-py" = callPackage
189987190404 ({ mkDerivation, aeson, base, base-compat, bytestring, charset
189988− , hspec, hspec-expectations, lens, QuickCheck, servant
189989− , servant-foreign, text
190405+ , hspec, lens, QuickCheck, servant, servant-foreign, text
189990190406 }:
189991190407 mkDerivation {
189992190408 pname = "servant-py";
189993− version = "0.1.0.4";
189994− sha256 = "0cc4cwny1y0iwchasxl8ncg2ladndpxcdh7ydfr2z91y97m15yx6";
190409+ version = "0.1.1.0";
190410+ sha256 = "1s708lcib9956x0ww14kcrhn5chg0sz9jnzk456kyjmwar8qssmc";
189995190411 isLibrary = true;
189996190412 isExecutable = true;
189997190413 libraryHaskellDepends = [
189998190414 aeson base bytestring charset lens servant servant-foreign text
189999190415 ];
190000190416 testHaskellDepends = [
190001− aeson base base-compat bytestring hspec hspec-expectations lens
190002− QuickCheck servant servant-foreign text
190417+ aeson base base-compat bytestring hspec lens QuickCheck servant
190418+ servant-foreign text
190003190419 ];
190004190420 description = "Automatically derive python functions to query servant webservices";
190005190421 license = stdenv.lib.licenses.bsd3;
@@ -190111,6 +190527,21 @@ self: {
190111190527 license = stdenv.lib.licenses.bsd3;
190112190528 }) {};
190113190529
190530+ "servant-ruby_0_9_0_0" = callPackage
190531+ ({ mkDerivation, base, casing, doctest, QuickCheck, servant-foreign
190532+ , text
190533+ }:
190534+ mkDerivation {
190535+ pname = "servant-ruby";
190536+ version = "0.9.0.0";
190537+ sha256 = "1x1746k97i3y836mr5h29l70ldzrg8akhfmg2qicwbwz6qs7hy33";
190538+ libraryHaskellDepends = [ base casing servant-foreign text ];
190539+ testHaskellDepends = [ base doctest QuickCheck ];
190540+ description = "Generate a Ruby client from a Servant API with Net::HTTP";
190541+ license = stdenv.lib.licenses.bsd3;
190542+ hydraPlatforms = stdenv.lib.platforms.none;
190543+ }) {};
190544+
190114190545 "servant-scotty" = callPackage
190115190546 ({ mkDerivation, aeson, base, http-types, scotty, servant
190116190547 , servant-response, text, transformers
@@ -190324,8 +190755,8 @@ self: {
190324190755 pname = "servant-streaming";
190325190756 version = "0.3.0.0";
190326190757 sha256 = "0k2sgh7qhp54050k6xlz4zi5jf29xnar2iv02f4rg1k5fxjlh3cq";
190327− revision = "2";
190328− editedCabalFile = "0v435r9kzhn9jcws3kibxgr46ii6kbdniqk56qmx6hzfmkwvgwgk";
190758+ revision = "3";
190759+ editedCabalFile = "04mc3k97sk0r90m8ca34gqpb2bz8yljp3j613xx7xz90sffqc1hq";
190329190760 libraryHaskellDepends = [ base http-types servant ];
190330190761 testHaskellDepends = [ base hspec http-types QuickCheck servant ];
190331190762 description = "Servant combinators for the 'streaming' package";
@@ -191735,8 +192166,8 @@ self: {
191735192166 }:
191736192167 mkDerivation {
191737192168 pname = "shake";
191738− version = "0.17.1";
191739− sha256 = "1vm7wcyh0lxaq4qnmbywchkrm61rvf8iy43a44hwk48p3y7jdpz4";
192169+ version = "0.17.3";
192170+ sha256 = "0k0r44csgrlw9y80m88npvanw5ddqm634799qjiab39gvbd3p6kw";
191740192171 isLibrary = true;
191741192172 isExecutable = true;
191742192173 enableSeparateDataOutput = true;
@@ -194869,6 +195300,30 @@ self: {
194869195300 license = stdenv.lib.licenses.gpl2;
194870195301 }) {};
194871195302
195303+ "skylighting_0_7_5" = callPackage
195304+ ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
195305+ , base64-bytestring, binary, blaze-html, bytestring
195306+ , case-insensitive, colour, containers, directory, filepath, hxt
195307+ , mtl, regex-pcre-builtin, safe, skylighting-core, text
195308+ , utf8-string
195309+ }:
195310+ mkDerivation {
195311+ pname = "skylighting";
195312+ version = "0.7.5";
195313+ sha256 = "080kmpqaqh76qqjml34rfm7m6pchdmd2519g6y3kdb3x5vj01qbx";
195314+ isLibrary = true;
195315+ isExecutable = true;
195316+ libraryHaskellDepends = [
195317+ aeson ansi-terminal attoparsec base base64-bytestring binary
195318+ blaze-html bytestring case-insensitive colour containers directory
195319+ filepath hxt mtl regex-pcre-builtin safe skylighting-core text
195320+ utf8-string
195321+ ];
195322+ description = "syntax highlighting library";
195323+ license = stdenv.lib.licenses.gpl2;
195324+ hydraPlatforms = stdenv.lib.platforms.none;
195325+ }) {};
195326+
194872195327 "skylighting-core" = callPackage
194873195328 ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
194874195329 , base64-bytestring, binary, blaze-html, bytestring
@@ -194901,6 +195356,39 @@ self: {
194901195356 license = stdenv.lib.licenses.bsd3;
194902195357 }) {};
194903195358
195359+ "skylighting-core_0_7_5" = callPackage
195360+ ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
195361+ , base64-bytestring, binary, blaze-html, bytestring
195362+ , case-insensitive, colour, containers, criterion, Diff, directory
195363+ , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random
195364+ , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit
195365+ , tasty-quickcheck, text, transformers, utf8-string
195366+ }:
195367+ mkDerivation {
195368+ pname = "skylighting-core";
195369+ version = "0.7.5";
195370+ sha256 = "129q860xk59n8dxsxl7prk0jk3ddl96r9i6r4lsk5l9pbpms41pp";
195371+ isLibrary = true;
195372+ isExecutable = true;
195373+ libraryHaskellDepends = [
195374+ aeson ansi-terminal attoparsec base base64-bytestring binary
195375+ blaze-html bytestring case-insensitive colour containers directory
195376+ filepath hxt mtl regex-pcre-builtin safe text transformers
195377+ utf8-string
195378+ ];
195379+ testHaskellDepends = [
195380+ aeson base bytestring containers Diff directory filepath HUnit
195381+ pretty-show QuickCheck random tasty tasty-golden tasty-hunit
195382+ tasty-quickcheck text
195383+ ];
195384+ benchmarkHaskellDepends = [
195385+ base containers criterion directory filepath text
195386+ ];
195387+ description = "syntax highlighting library";
195388+ license = stdenv.lib.licenses.bsd3;
195389+ hydraPlatforms = stdenv.lib.platforms.none;
195390+ }) {};
195391+
194904195392 "skype4hs" = callPackage
194905195393 ({ mkDerivation, attoparsec, base, bytestring, lifted-base
194906195394 , monad-control, mtl, stm, text, time, transformers-base, word8
@@ -197734,8 +198222,8 @@ self: {
197734198222 ({ mkDerivation, base, containers, filepath, QuickCheck }:
197735198223 mkDerivation {
197736198224 pname = "solve";
197737− version = "1.2";
197738− sha256 = "03byni7iqv9wh35bc2g94ycsm1nl0ngfs4n1nkpprd1vw0d5g9h4";
198225+ version = "1.3";
198226+ sha256 = "1hd7vbbxcn9x3xzxnfscmbg8bjaqm7bkhjkrkdq2b0ys04sahxs8";
197739198227 isLibrary = true;
197740198228 isExecutable = true;
197741198229 libraryHaskellDepends = [ base containers filepath ];
@@ -200016,10 +200504,10 @@ self: {
200016200504 }:
200017200505 mkDerivation {
200018200506 pname = "stack";
200019− version = "1.9.1.1";
200020− sha256 = "103jq3jxhp26f8si72dmwb3vvdhsl1dw3d9j2an4yjkz9l9yjfx5";
200507+ version = "1.9.3";
200508+ sha256 = "01lbr9gp3djr5bzlchzb2rdw20855aganmczvq76fzzjyway64cf";
200021200509 revision = "1";
200022− editedCabalFile = "0ldwb5xvm1j2cdhafmrvkd2l64zq04wx3kwavkavvgpg1mln0ijl";
200510+ editedCabalFile = "1d6hf71l2i94xhx23jxl3qapidw7v73kig8m2as5kxdymnpfh48r";
200023200511 configureFlags = [
200024200512 "-fdisable-git-info" "-fhide-dependency-versions"
200025200513 "-fsupported-build"
@@ -202360,15 +202848,15 @@ self: {
202360202848 license = stdenv.lib.licenses.mit;
202361202849 }) {};
202362202850
202363− "stratosphere_0_28_0" = callPackage
202851+ "stratosphere_0_28_1" = callPackage
202364202852 ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
202365202853 , hashable, hspec, hspec-discover, lens, template-haskell, text
202366202854 , unordered-containers
202367202855 }:
202368202856 mkDerivation {
202369202857 pname = "stratosphere";
202370− version = "0.28.0";
202371− sha256 = "1rb138h9w34qvdjc3zddz4gm169ddiv690cwq0mpbfwv28v6j1fg";
202858+ version = "0.28.1";
202859+ sha256 = "1brypavqh8049adidzgsjsrfd2sxbv387cckwxl4kkm4s49zrx18";
202372202860 isLibrary = true;
202373202861 isExecutable = true;
202374202862 libraryHaskellDepends = [
@@ -202592,8 +203080,8 @@ self: {
202592203080 pname = "streaming-attoparsec";
202593203081 version = "1.0.0";
202594203082 sha256 = "00k1vwqr7ns7s4r6xvq59kpwimqd0f02jj0ay4zg167dd5994a7z";
202595− revision = "1";
202596− editedCabalFile = "0ssikp3ckvlgh9px4v6ppjlyi7ch319j0l3s9a5z07j6fg3j4wkp";
203083+ revision = "2";
203084+ editedCabalFile = "07hqs8nn1rhsqckqmw46yp19kd0vk35q139al6yq0k1dzpvsrcsx";
202597203085 libraryHaskellDepends = [
202598203086 attoparsec base bytestring streaming streaming-bytestring
202599203087 ];
@@ -204414,17 +204902,15 @@ self: {
204414204902 }) {};
204415204903
204416204904 "summoner" = callPackage
204417− ({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring
204418− , directory, filepath, generic-deriving, gitrev, hedgehog
204419− , neat-interpolation, optparse-applicative, process, relude, tasty
204420− , tasty-discover, tasty-hedgehog, text, time, tomland
204905+ ({ mkDerivation, aeson, ansi-terminal, base, base-noprelude
204906+ , bytestring, directory, filepath, generic-deriving, gitrev
204907+ , hedgehog, hspec, neat-interpolation, optparse-applicative
204908+ , process, relude, text, time, tomland
204421204909 }:
204422204910 mkDerivation {
204423204911 pname = "summoner";
204424− version = "1.1.0.1";
204425− sha256 = "0l9v85d9s5n6lz9k2k44pxx8yqqmrxnvz9q0pi5rhvwq53c50x83";
204426− revision = "1";
204427− editedCabalFile = "1r98ypwda43kb5rqzl4jgrbmmvw4wambpp6bmbximjv2glkz13x7";
204912+ version = "1.2.0";
204913+ sha256 = "04shi46j44g81zylmrm807rlinfx6sjpdwvxxyw9rhnpx56b8r34";
204428204914 isLibrary = true;
204429204915 isExecutable = true;
204430204916 libraryHaskellDepends = [
@@ -204432,12 +204918,12 @@ self: {
204432204918 generic-deriving gitrev neat-interpolation optparse-applicative
204433204919 process relude text time tomland
204434204920 ];
204435− executableHaskellDepends = [ base-noprelude relude ];
204921+ executableHaskellDepends = [ base ];
204436204922 testHaskellDepends = [
204437− base-noprelude hedgehog relude tasty tasty-hedgehog tomland
204923+ base-noprelude filepath hedgehog hspec neat-interpolation relude
204924+ tomland
204438204925 ];
204439− testToolDepends = [ tasty-discover ];
204440− description = "Tool for creating completely configured production Haskell projects";
204926+ description = "Tool for scaffolding completely configured production Haskell projects";
204441204927 license = stdenv.lib.licenses.mpl20;
204442204928 hydraPlatforms = stdenv.lib.platforms.none;
204443204929 }) {};
@@ -204848,8 +205334,8 @@ self: {
204848205334 pname = "sv";
204849205335 version = "1.2";
204850205336 sha256 = "148d8jircfyrp0y2rqchs1k3kfmis3bdvc6rib39fkbj699pyw2s";
204851− revision = "2";
204852− editedCabalFile = "1aa4pxzqyk3xqqadi52aa257h7440jawws9mh9l02qswypn87jq4";
205337+ revision = "3";
205338+ editedCabalFile = "08fzw4v5w48d9x315hvl27pbg8c0dch9ihmw1f74g9pxnxmpfbxi";
204853205339 libraryHaskellDepends = [
204854205340 attoparsec base bifunctors bytestring contravariant hw-dsv
204855205341 semigroupoids sv-core transformers utf8-string validation
@@ -204899,6 +205385,8 @@ self: {
204899205385 pname = "sv-core";
204900205386 version = "0.3";
204901205387 sha256 = "12mjv13rgix4h064ch01hbmkxxz7dp69nazpksvj1fjx16m5dvw6";
205388+ revision = "1";
205389+ editedCabalFile = "06wj1r1f06a594y3h9dl11wb7ra9993s2kdfzlf74w4r14bp7j4a";
204902205390 libraryHaskellDepends = [
204903205391 attoparsec base bifunctors bytestring containers contravariant
204904205392 deepseq lens mtl parsec profunctors readable semigroupoids
@@ -205631,6 +206119,17 @@ self: {
205631206119 license = stdenv.lib.licenses.bsd3;
205632206120 }) {};
205633206121
206122+ "symbols" = callPackage
206123+ ({ mkDerivation, base }:
206124+ mkDerivation {
206125+ pname = "symbols";
206126+ version = "0.2.0.1";
206127+ sha256 = "00c28qy0g011acgf98981x7pw3d58dcsmb8iqfna5f6qmcya6393";
206128+ libraryHaskellDepends = [ base ];
206129+ description = "Symbol manipulation";
206130+ license = stdenv.lib.licenses.bsd3;
206131+ }) {};
206132+
205634206133 "symengine" = callPackage
205635206134 ({ mkDerivation, base, gmp, gmpxx, symengine, tasty, tasty-hunit
205636206135 , tasty-quickcheck
@@ -207820,6 +208319,24 @@ self: {
207820208319 license = stdenv.lib.licenses.mit;
207821208320 }) {};
207822208321
208322+ "tasty_1_2" = callPackage
208323+ ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
208324+ , optparse-applicative, stm, tagged, unbounded-delays, unix
208325+ , wcwidth
208326+ }:
208327+ mkDerivation {
208328+ pname = "tasty";
208329+ version = "1.2";
208330+ sha256 = "05w3bl5kah238pds818sxp9x58rp1nszbiicb1l21hf9k83mw66n";
208331+ libraryHaskellDepends = [
208332+ ansi-terminal async base clock containers mtl optparse-applicative
208333+ stm tagged unbounded-delays unix wcwidth
208334+ ];
208335+ description = "Modern and extensible testing framework";
208336+ license = stdenv.lib.licenses.mit;
208337+ hydraPlatforms = stdenv.lib.platforms.none;
208338+ }) {};
208339+
207823208340 "tasty-ant-xml" = callPackage
207824208341 ({ mkDerivation, base, containers, directory, filepath
207825208342 , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
@@ -207869,6 +208386,18 @@ self: {
207869208386 license = stdenv.lib.licenses.mit;
207870208387 }) {};
207871208388
208389+ "tasty-dejafu_1_2_0_8" = callPackage
208390+ ({ mkDerivation, base, dejafu, random, tagged, tasty }:
208391+ mkDerivation {
208392+ pname = "tasty-dejafu";
208393+ version = "1.2.0.8";
208394+ sha256 = "0v9939w2vppa3zfgmyzgb4880cx5z9hw5cssg25qg6ymr6rczdr4";
208395+ libraryHaskellDepends = [ base dejafu random tagged tasty ];
208396+ description = "Deja Fu support for the Tasty test framework";
208397+ license = stdenv.lib.licenses.mit;
208398+ hydraPlatforms = stdenv.lib.platforms.none;
208399+ }) {};
208400+
207872208401 "tasty-discover" = callPackage
207873208402 ({ mkDerivation, base, containers, directory, filepath, Glob
207874208403 , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit
@@ -207972,8 +208501,8 @@ self: {
207972208501 pname = "tasty-hedgehog";
207973208502 version = "0.2.0.0";
207974208503 sha256 = "10m1akbiblnjq9ljk469725k30b254d36d267rk51z2f171py42s";
207975− revision = "5";
207976− editedCabalFile = "1ykmjb00whqq1hap4l8d4187qflxi6xdnm86czxrzmz4l3lj33gr";
208504+ revision = "6";
208505+ editedCabalFile = "0d7s1474pvnyad6ilr5rvpama7s468ya9ns4ksbl0827z9vvga43";
207977208506 libraryHaskellDepends = [ base hedgehog tagged tasty ];
207978208507 testHaskellDepends = [
207979208508 base hedgehog tasty tasty-expected-failure
@@ -208012,6 +208541,8 @@ self: {
208012208541 pname = "tasty-hspec";
208013208542 version = "1.1.5.1";
208014208543 sha256 = "0i9kdzjpk750sa078jj3iyhp72k0177zk7vxl131r6dkyz09x27y";
208544+ revision = "1";
208545+ editedCabalFile = "18k4p273qnvfmk5cbm89rjqr0v03v0q22q7bbl7z3bxpwnnkmhqf";
208015208546 libraryHaskellDepends = [
208016208547 base hspec hspec-core QuickCheck tasty tasty-quickcheck
208017208548 tasty-smallcheck
@@ -208317,6 +208848,22 @@ self: {
208317208848 hydraPlatforms = stdenv.lib.platforms.none;
208318208849 }) {};
208319208850
208851+ "tasty-wai" = callPackage
208852+ ({ mkDerivation, base, bytestring, http-types, tasty, wai
208853+ , wai-extra
208854+ }:
208855+ mkDerivation {
208856+ pname = "tasty-wai";
208857+ version = "0.1.0.1";
208858+ sha256 = "0h2zqwj19vamn2rcqpq17wjcx3v8xfixgzh0b30k37vbqcgz62va";
208859+ libraryHaskellDepends = [
208860+ base bytestring http-types tasty wai wai-extra
208861+ ];
208862+ testHaskellDepends = [ base http-types tasty wai ];
208863+ description = "Test 'wai' endpoints via Test.Tasty";
208864+ license = stdenv.lib.licenses.bsd3;
208865+ }) {};
208866+
208320208867 "tateti-tateti" = callPackage
208321208868 ({ mkDerivation, array, base, lens-simple, mtl, ncurses, random }:
208322208869 mkDerivation {
@@ -208906,17 +209453,19 @@ self: {
208906209453 }) {};
208907209454
208908209455 "template-toolkit" = callPackage
208909− ({ mkDerivation, aeson, base, bytestring, containers, directory
208910− , mtl, parsec, pcre-utils, regex-pcre-builtin, scientific, text
208911− , unordered-containers, uri-encode
209456+ ({ mkDerivation, aeson, base, binary, bytestring, containers
209457+ , directory, hashtables, mtl, parsec, pcre-utils
209458+ , regex-pcre-builtin, scientific, text, time, unordered-containers
209459+ , uri-encode
208912209460 }:
208913209461 mkDerivation {
208914209462 pname = "template-toolkit";
208915− version = "0.1.0.1";
208916− sha256 = "1xbc4azsa7q90g2fpp16djy3zkfimsr31a9sjan3gygny0dx2mgg";
209463+ version = "0.1.1.0";
209464+ sha256 = "0nqsgfqj28d6qqc4639d8paqb8d9fw5kpijggbmxdnaqd64xc4p1";
208917209465 libraryHaskellDepends = [
208918− aeson base bytestring containers directory mtl parsec pcre-utils
208919− regex-pcre-builtin scientific text unordered-containers uri-encode
209466+ aeson base binary bytestring containers directory hashtables mtl
209467+ parsec pcre-utils regex-pcre-builtin scientific text time
209468+ unordered-containers uri-encode
208920209469 ];
208921209470 description = "Template Toolkit implementation for Haskell";
208922209471 license = stdenv.lib.licenses.gpl3;
@@ -214613,16 +215162,16 @@ self: {
214613215162
214614215163 "tomlcheck" = callPackage
214615215164 ({ mkDerivation, base, htoml-megaparsec, megaparsec
214616− , optparse-generic, text
215165+ , optparse-applicative, text
214617215166 }:
214618215167 mkDerivation {
214619215168 pname = "tomlcheck";
214620− version = "0.1.0.36";
214621− sha256 = "16a15449pfdlan93ynrv3gh42vjlv95160nr1lwvqh91m7fvpnc3";
215169+ version = "0.1.0.39";
215170+ sha256 = "1kz3bbrymh23b8iadq8baircqh11r3q3zv75390ymxiz3ns26vh8";
214622215171 isLibrary = false;
214623215172 isExecutable = true;
214624215173 executableHaskellDepends = [
214625− base htoml-megaparsec megaparsec optparse-generic text
215174+ base htoml-megaparsec megaparsec optparse-applicative text
214626215175 ];
214627215176 description = "Command-line tool to check syntax of TOML files";
214628215177 license = stdenv.lib.licenses.bsd3;
@@ -214636,8 +215185,8 @@ self: {
214636215185 }:
214637215186 mkDerivation {
214638215187 pname = "toodles";
214639− version = "1.0.0";
214640− sha256 = "1ycmf0id5vp0ax4rmvcma4yhdis9p51qkvd43afz84hf0r26gzr6";
215188+ version = "1.0.1";
215189+ sha256 = "0k94a6am7cmqhia543rmaw06xl0xq5lx22q1sb01x3l96sxh1aa8";
214641215190 isLibrary = true;
214642215191 isExecutable = true;
214643215192 enableSeparateDataOutput = true;
@@ -215849,33 +216398,6 @@ self: {
215849216398 }) {};
215850216399
215851216400 "tree-diff" = callPackage
215852− ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
215853− , base-compat, bytestring, containers, generics-sop, hashable
215854− , MemoTrie, parsec, parsers, pretty, QuickCheck, scientific, tagged
215855− , tasty, tasty-golden, tasty-quickcheck, text, time, trifecta
215856− , unordered-containers, uuid-types, vector
215857− }:
215858− mkDerivation {
215859− pname = "tree-diff";
215860− version = "0.0.1";
215861− sha256 = "049v44c520jy3icxlnrvbdblh3mjmvd7m6qmkzxbzkf02x63xqmz";
215862− revision = "6";
215863− editedCabalFile = "1wyhygrpqphxzzwlrk6nl4h5xbyx6zi0y34i1nxvsy726fl5idai";
215864− libraryHaskellDepends = [
215865− aeson ansi-terminal ansi-wl-pprint base base-compat bytestring
215866− containers generics-sop hashable MemoTrie parsec parsers pretty
215867− QuickCheck scientific tagged text time unordered-containers
215868− uuid-types vector
215869− ];
215870− testHaskellDepends = [
215871− ansi-terminal ansi-wl-pprint base base-compat parsec QuickCheck
215872− tasty tasty-golden tasty-quickcheck trifecta
215873− ];
215874− description = "Diffing of (expression) trees";
215875− license = stdenv.lib.licenses.bsd3;
215876− }) {};
215877−
215878− "tree-diff_0_0_2" = callPackage
215879216401 ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
215880216402 , base-compat, bytestring, containers, generics-sop, hashable
215881216403 , MemoTrie, parsec, parsers, pretty, QuickCheck, scientific, tagged
@@ -215898,7 +216420,6 @@ self: {
215898216420 ];
215899216421 description = "Diffing of (expression) trees";
215900216422 license = stdenv.lib.licenses.bsd3;
215901− hydraPlatforms = stdenv.lib.platforms.none;
215902216423 }) {};
215903216424
215904216425 "tree-fun" = callPackage
@@ -216099,6 +216620,23 @@ self: {
216099216620 hydraPlatforms = stdenv.lib.platforms.none;
216100216621 }) {};
216101216622
216623+ "trie-simple" = callPackage
216624+ ({ mkDerivation, base, containers, criterion, deepseq, hspec, mtl
216625+ , mwc-random, QuickCheck, vector
216626+ }:
216627+ mkDerivation {
216628+ pname = "trie-simple";
216629+ version = "0.4.1.1";
216630+ sha256 = "0h3wfq4fjakkwvrv35l25709xv528h1c08cr754gvk4l8vqnk6k7";
216631+ libraryHaskellDepends = [ base containers deepseq mtl ];
216632+ testHaskellDepends = [ base containers hspec QuickCheck vector ];
216633+ benchmarkHaskellDepends = [
216634+ base containers criterion deepseq mwc-random vector
216635+ ];
216636+ description = "Simple Map-based Trie";
216637+ license = stdenv.lib.licenses.bsd3;
216638+ }) {};
216639+
216102216640 "tries" = callPackage
216103216641 ({ mkDerivation, base, bytestring, composition, containers
216104216642 , criterion, deepseq, hashable, keys, mtl, QuickCheck
@@ -217309,8 +217847,8 @@ self: {
217309217847 }:
217310217848 mkDerivation {
217311217849 pname = "twilio";
217312− version = "0.2.0.1";
217313− sha256 = "0qj2v4m30ik0qk2m9wghkgbhklql4jnyb0cnyfpip4yn1lczp34s";
217850+ version = "0.3.0.0";
217851+ sha256 = "1qxbv6w482hjya6bypz8d6mizy9w03b1j43m0v1h4jwi7v71br9r";
217314217852 libraryHaskellDepends = [
217315217853 aeson base binary bytestring containers deepseq errors exceptions
217316217854 free hashable http-client http-client-tls http-types mtl
@@ -218016,10 +218554,8 @@ self: {
218016218554 ({ mkDerivation, base, ghc-prim }:
218017218555 mkDerivation {
218018218556 pname = "type-level-sets";
218019− version = "0.8.7.0";
218020− sha256 = "1i5yzjdfw6q868ihhqmpk4psbnqwmz8liwha7dzn1rbw4h357ky7";
218021− revision = "1";
218022− editedCabalFile = "0x03wqriksvdcvhlg3nxpnjgr5w22qkhny6aic6npjgnwjsamvxr";
218557+ version = "0.8.9.0";
218558+ sha256 = "1acsr7g9ssli9yil9kws47gc6h3csmk2afncyki41pipa1vsriv4";
218023218559 libraryHaskellDepends = [ base ghc-prim ];
218024218560 description = "Type-level sets and finite maps (with value-level counterparts)";
218025218561 license = stdenv.lib.licenses.bsd3;
@@ -218104,6 +218640,28 @@ self: {
218104218640 license = stdenv.lib.licenses.bsd3;
218105218641 }) {};
218106218642
218643+ "type-of-html_1_5_0_0" = callPackage
218644+ ({ mkDerivation, base, blaze-html, bytestring, containers
218645+ , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim
218646+ , hspec, QuickCheck, random, temporary, text, weigh
218647+ }:
218648+ mkDerivation {
218649+ pname = "type-of-html";
218650+ version = "1.5.0.0";
218651+ sha256 = "0bj05wmhsgn7x3437l6488mkalffn90c4g33njx6xy8p81ls26l9";
218652+ libraryHaskellDepends = [
218653+ base bytestring containers double-conversion ghc-prim text
218654+ ];
218655+ testHaskellDepends = [ base bytestring hspec QuickCheck ];
218656+ benchmarkHaskellDepends = [
218657+ base blaze-html bytestring criterion deepseq ghc ghc-paths random
218658+ temporary text weigh
218659+ ];
218660+ description = "High performance type driven html generation";
218661+ license = stdenv.lib.licenses.bsd3;
218662+ hydraPlatforms = stdenv.lib.platforms.none;
218663+ }) {};
218664+
218107218665 "type-of-html-static" = callPackage
218108218666 ({ mkDerivation, base, template-haskell, type-of-html }:
218109218667 mkDerivation {
@@ -218778,8 +219336,8 @@ self: {
218778219336 }:
218779219337 mkDerivation {
218780219338 pname = "u2f";
218781− version = "0.1.0.1";
218782− sha256 = "1gjpxdx4m74mwl7hili74asicvl8rm90k8q9bakx8mjki8akv15m";
219339+ version = "0.1.0.2";
219340+ sha256 = "0yn4r5pp84aqvkm1md722mkh7qqy7rnaw3fr99a2inwplqx6pzfr";
218783219341 libraryHaskellDepends = [
218784219342 aeson asn1-encoding asn1-types base base64-bytestring binary
218785219343 bytestring cryptohash cryptonite text
@@ -221955,8 +222513,10 @@ self: {
221955222513 pname = "uu-tc";
221956222514 version = "2015.1.1";
221957222515 sha256 = "03x7s7imcrqz1qdlwbgyw2gnrjhl7y5v8bz209kxswyldxz270lg";
222516+ revision = "1";
222517+ editedCabalFile = "1jz4w3fnhaz631yrlxrxj1vfl0i0vby038v70hmwhsg10wz7w764";
221958222518 libraryHaskellDepends = [ base ];
221959− description = "Haskell 98 parser combintors for INFOB3TC at Utrecht University";
222519+ description = "Haskell 98 parser combinators for INFOB3TC at Utrecht University";
221960222520 license = stdenv.lib.licenses.bsd3;
221961222521 }) {};
221962222522
@@ -223974,6 +224534,25 @@ self: {
223974224534 license = stdenv.lib.licenses.bsd3;
223975224535 }) {};
223976224536
224537+ "viewprof_0_0_0_25" = callPackage
224538+ ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens
224539+ , scientific, text, vector, vector-algorithms, vty
224540+ }:
224541+ mkDerivation {
224542+ pname = "viewprof";
224543+ version = "0.0.0.25";
224544+ sha256 = "0k3mlivbkir5jwqkpbka2fvihkw2ck4549kvl1hcqr1h48zjr5ws";
224545+ isLibrary = false;
224546+ isExecutable = true;
224547+ executableHaskellDepends = [
224548+ base brick containers directory ghc-prof lens scientific text
224549+ vector vector-algorithms vty
224550+ ];
224551+ description = "Text-based interactive GHC .prof viewer";
224552+ license = stdenv.lib.licenses.bsd3;
224553+ hydraPlatforms = stdenv.lib.platforms.none;
224554+ }) {};
224555+
223977224556 "views" = callPackage
223978224557 ({ mkDerivation, base, mtl }:
223979224558 mkDerivation {
@@ -224631,6 +225210,26 @@ self: {
224631225210 hydraPlatforms = stdenv.lib.platforms.none;
224632225211 }) {inherit (pkgs) vrpn;};
224633225212
225213+ "vt-utils" = callPackage
225214+ ({ mkDerivation, aeson, base, bytestring, directory, HUnit, parsec
225215+ , text, time, unordered-containers, vector
225216+ }:
225217+ mkDerivation {
225218+ pname = "vt-utils";
225219+ version = "1.0.0.0";
225220+ sha256 = "0mvf5y2mpcxccjsi0h3p0ljwlrhw080wm4j2n1rw2zxh5yvvhlxc";
225221+ libraryHaskellDepends = [
225222+ aeson base bytestring directory HUnit parsec text time
225223+ unordered-containers vector
225224+ ];
225225+ testHaskellDepends = [
225226+ aeson base bytestring directory HUnit parsec text time
225227+ unordered-containers vector
225228+ ];
225229+ description = "Vector and Text utilities";
225230+ license = stdenv.lib.licenses.mit;
225231+ }) {};
225232+
224634225233 "vte" = callPackage
224635225234 ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools, pango
224636225235 , vte
@@ -224841,8 +225440,8 @@ self: {
224841225440 }:
224842225441 mkDerivation {
224843225442 pname = "waargonaut";
224844− version = "0.4.1.0";
224845− sha256 = "018x0rb86ndshaqm0ns2cjwrqs2d2sq5sqypy1nbd8rh1g943cdn";
225443+ version = "0.4.2.0";
225444+ sha256 = "19zfzff6cp57xv220yyxfi0j36x1qic7v4sa93yclshyjmhm7vnm";
224846225445 setupHaskellDepends = [ base Cabal cabal-doctest ];
224847225446 libraryHaskellDepends = [
224848225447 base bifunctors bytestring containers contravariant digit
@@ -230688,28 +231287,8 @@ self: {
230688231287 }:
230689231288 mkDerivation {
230690231289 pname = "xeno";
230691− version = "0.3.4";
230692− sha256 = "1srlyg0wc2mwsa84isv0brcbwsrw6i7jbi0b2mjhnhd6d7cmcajs";
230693− libraryHaskellDepends = [
230694− array base bytestring deepseq hspec mtl mutable-containers vector
230695− ];
230696− testHaskellDepends = [ base bytestring hexml hspec ];
230697− benchmarkHaskellDepends = [
230698− base bytestring criterion deepseq ghc-prim hexml hexpat weigh xml
230699− ];
230700− description = "A fast event-based XML parser in pure Haskell";
230701− license = stdenv.lib.licenses.bsd3;
230702− }) {};
230703−
230704− "xeno_0_3_5" = callPackage
230705− ({ mkDerivation, array, base, bytestring, criterion, deepseq
230706− , ghc-prim, hexml, hexpat, hspec, mtl, mutable-containers, vector
230707− , weigh, xml
230708− }:
230709− mkDerivation {
230710− pname = "xeno";
230711− version = "0.3.5";
230712− sha256 = "0352xn6jlcbh1z4qlz679kybcvwz756xz21fzhv36vklzxclvgxn";
231290+ version = "0.3.5.1";
231291+ sha256 = "1bdvj5ql0q9i8vb3429d8kl3hyk45r37s23rm76mhwhazhqxcm60";
230713231292 libraryHaskellDepends = [
230714231293 array base bytestring deepseq hspec mtl mutable-containers vector
230715231294 ];
@@ -230719,7 +231298,6 @@ self: {
230719231298 ];
230720231299 description = "A fast event-based XML parser in pure Haskell";
230721231300 license = stdenv.lib.licenses.bsd3;
230722− hydraPlatforms = stdenv.lib.platforms.none;
230723231301 }) {};
230724231302
230725231303 "xenstore" = callPackage
@@ -231894,39 +232472,43 @@ self: {
231894232472 }) {};
231895232473
231896232474 "xmobar" = callPackage
231897− ({ mkDerivation, alsa-core, alsa-mixer, base, bytestring
231898− , containers, dbus, directory, filepath, hinotify, hspec, HTTP
231899− , http-conduit, http-types, iwlib, libmpd, libXpm, libXrandr
231900− , libXrender, mtl, old-locale, parsec, parsec-numbers, process
231901− , regex-compat, stm, time, timezone-olson, timezone-series
231902− , transformers, unix, utf8-string, wirelesstools, X11, X11-xft
232475+ ({ mkDerivation, alsa-core, alsa-mixer, async, base, bytestring
232476+ , containers, dbus, directory, extensible-exceptions, filepath
232477+ , hinotify, hspec, HTTP, http-conduit, http-types, iwlib, libmpd
232478+ , libXpm, libXrandr, libXrender, mtl, old-locale, parsec
232479+ , parsec-numbers, process, regex-compat, stm, temporary, time
232480+ , timezone-olson, timezone-series, transformers, unix, utf8-string
232481+ , wirelesstools, X11, X11-xft
231903232482 }:
231904232483 mkDerivation {
231905232484 pname = "xmobar";
231906− version = "0.28.1";
231907− sha256 = "1zrpvr1nr6a55sxmjbacacflrxvnw6aibsdal19wx404r74qjgz5";
232485+ version = "0.29.1";
232486+ sha256 = "0q8ssd51r1bdm6rr5frlq0v00c4af8xgc3zgs4sa23yy3yf9gzrm";
231908232487 configureFlags = [
231909232488 "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus"
231910232489 "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris"
231911232490 "-fwith_rtsopts" "-fwith_threaded" "-fwith_utf8" "-fwith_uvmeter"
231912232491 "-fwith_weather" "-fwith_xft" "-fwith_xpm"
231913232492 ];
231914− isLibrary = false;
232493+ isLibrary = true;
231915232494 isExecutable = true;
231916− executableHaskellDepends = [
231917− alsa-core alsa-mixer base bytestring containers dbus directory
231918− filepath hinotify HTTP http-conduit http-types iwlib libmpd mtl
231919− old-locale parsec parsec-numbers process regex-compat stm time
231920− timezone-olson timezone-series transformers unix utf8-string X11
231921− X11-xft
232495+ libraryHaskellDepends = [
232496+ alsa-core alsa-mixer async base bytestring containers dbus
232497+ directory extensible-exceptions filepath hinotify HTTP http-conduit
232498+ http-types iwlib libmpd mtl old-locale parsec parsec-numbers
232499+ process regex-compat stm time timezone-olson timezone-series
232500+ transformers unix utf8-string X11 X11-xft
231922232501 ];
231923− executableSystemDepends = [
232502+ librarySystemDepends = [
231924232503 libXpm libXrandr libXrender wirelesstools
231925232504 ];
232505+ executableHaskellDepends = [
232506+ async base containers directory filepath parsec unix X11
232507+ ];
231926232508 testHaskellDepends = [
231927− base bytestring containers directory filepath hspec mtl old-locale
231928− parsec parsec-numbers process regex-compat stm time transformers
231929− unix X11
232509+ alsa-core alsa-mixer async base bytestring containers directory
232510+ filepath hspec mtl old-locale parsec parsec-numbers process
232511+ regex-compat stm temporary time transformers unix X11
231930232512 ];
231931232513 description = "A Minimalistic Text Based Status Bar";
231932232514 license = stdenv.lib.licenses.bsd3;
@@ -234261,6 +234843,43 @@ self: {
234261234843 license = stdenv.lib.licenses.mit;
234262234844 }) {};
234263234845
234846+ "yesod-core_1_6_9" = callPackage
234847+ ({ mkDerivation, aeson, async, auto-update, base, blaze-html
234848+ , blaze-markup, byteable, bytestring, case-insensitive, cereal
234849+ , clientsession, conduit, conduit-extra, containers, cookie
234850+ , deepseq, fast-logger, gauge, hspec, hspec-expectations
234851+ , http-types, HUnit, monad-logger, mtl, network, parsec
234852+ , path-pieces, primitive, random, resourcet, rio, shakespeare
234853+ , streaming-commons, template-haskell, text, time, transformers
234854+ , unix-compat, unliftio, unordered-containers, vector, wai
234855+ , wai-extra, wai-logger, warp, word8
234856+ }:
234857+ mkDerivation {
234858+ pname = "yesod-core";
234859+ version = "1.6.9";
234860+ sha256 = "0jwfxcp0hdp1lw63gcqpqbvdrzifyds3x42wk0m5wxy7hj0x0r6a";
234861+ libraryHaskellDepends = [
234862+ aeson auto-update base blaze-html blaze-markup byteable bytestring
234863+ case-insensitive cereal clientsession conduit conduit-extra
234864+ containers cookie deepseq fast-logger http-types monad-logger mtl
234865+ parsec path-pieces primitive random resourcet rio shakespeare
234866+ template-haskell text time transformers unix-compat unliftio
234867+ unordered-containers vector wai wai-extra wai-logger warp word8
234868+ ];
234869+ testHaskellDepends = [
234870+ async base bytestring clientsession conduit conduit-extra
234871+ containers cookie hspec hspec-expectations http-types HUnit network
234872+ path-pieces random resourcet shakespeare streaming-commons
234873+ template-haskell text transformers unliftio wai wai-extra warp
234874+ ];
234875+ benchmarkHaskellDepends = [
234876+ base blaze-html bytestring gauge shakespeare text
234877+ ];
234878+ description = "Creation of type-safe, RESTful web applications";
234879+ license = stdenv.lib.licenses.mit;
234880+ hydraPlatforms = stdenv.lib.platforms.none;
234881+ }) {};
234882+
234264234883 "yesod-crud" = callPackage
234265234884 ({ mkDerivation, base, classy-prelude, containers, MissingH
234266234885 , monad-control, persistent, random, safe, stm, uuid, yesod-core
@@ -234772,8 +235391,8 @@ self: {
234772235391 }:
234773235392 mkDerivation {
234774235393 pname = "yesod-markdown";
234775− version = "0.12.5";
234776− sha256 = "12h3z7k83qfx2nyqciqg9z3mpbl14z5rpfl8q2768m5rp8gg9j84";
235394+ version = "0.12.6.0";
235395+ sha256 = "005brhqz52q6r03fx7ka2i1r2b1s2j7nis5a2ycdmr0mw5mb2scm";
234777235396 libraryHaskellDepends = [
234778235397 base blaze-html blaze-markup bytestring directory pandoc persistent
234779235398 shakespeare text xss-sanitize yesod-core yesod-form
@@ -237205,6 +237824,31 @@ self: {
237205237824 license = stdenv.lib.licenses.bsd3;
237206237825 }) {inherit (pkgs) unzip;};
237207237826
237827+ "zip-archive_0_4" = callPackage
237828+ ({ mkDerivation, array, base, binary, bytestring, containers
237829+ , digest, directory, filepath, HUnit, mtl, pretty, process
237830+ , temporary, text, time, unix, unzip, zlib
237831+ }:
237832+ mkDerivation {
237833+ pname = "zip-archive";
237834+ version = "0.4";
237835+ sha256 = "06fs9959w807iy4xmngpnv1rps5sr1kqr2pd7b3iw6xfjlfskgjz";
237836+ isLibrary = true;
237837+ isExecutable = true;
237838+ libraryHaskellDepends = [
237839+ array base binary bytestring containers digest directory filepath
237840+ mtl pretty text time unix zlib
237841+ ];
237842+ testHaskellDepends = [
237843+ base bytestring directory filepath HUnit process temporary time
237844+ unix
237845+ ];
237846+ testToolDepends = [ unzip ];
237847+ description = "Library for creating and modifying zip archives";
237848+ license = stdenv.lib.licenses.bsd3;
237849+ hydraPlatforms = stdenv.lib.platforms.none;
237850+ }) {inherit (pkgs) unzip;};
237851+
237208237852 "zip-conduit" = callPackage
237209237853 ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
237210237854 , criterion, digest, directory, filepath, hpc, HUnit, LibZip, mtl
pkgs/development/haskell-modules/lib.nix+3
@@ -259,6 +259,9 @@ rec {
259259 */
260260 buildStrictly = pkg: buildFromSdist (failOnAllWarnings pkg);
261261
262+ /* Disable core optimizations, significantly speeds up build time */
263+ disableOptimization = pkg: appendConfigureFlag pkg "--disable-optimization";
264+
262265 /* Turn on most of the compiler warnings and fail the build if any
263266 of them occur. */
264267 failOnAllWarnings = drv: appendConfigureFlag drv "--ghc-option=-Wall --ghc-option=-Werror";
pkgs/development/libraries/c-ares/default.nix−2
@@ -9,8 +9,6 @@ stdenv.mkDerivation rec {
99 sha256 = "0lk8knip4xk6qzksdkn7085mmgm4ixfczdyyjw656c193y3rgnvc";
1010 };
1111
12− configureFlags = stdenv.lib.optionals stdenv.hostPlatform.isWindows [ "--disable-shared" "--enable-static" ];
13−
1412 meta = with stdenv.lib; {
1513 description = "A C library for asynchronous DNS requests";
1614 homepage = https://c-ares.haxx.se;
pkgs/development/libraries/git2/default.nix+2−2
@@ -5,14 +5,14 @@
55
66stdenv.mkDerivation (rec {
77 name = "libgit2-${version}";
8− version = "0.26.8";
8+ version = "0.26.6";
99 # keep the version in sync with pythonPackages.pygit2 and gnome3.libgit2-glib
1010
1111 src = fetchFromGitHub {
1212 owner = "libgit2";
1313 repo = "libgit2";
1414 rev = "v${version}";
15− sha256 = "0wmjgvz8nrpk2dsn5bcc87nl0j5hb6pah2hzrj0b6jkk9mnin9fl";
15+ sha256 = "17pjvprmdrx4h6bb1hhc98w9qi6ki7yl57f090n9kbhswxqfs7s3";
1616 };
1717
1818 cmakeFlags = [ "-DTHREADSAFE=ON" ];
pkgs/development/libraries/libffi/default.nix+1−1
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 name = "libffi-3.2.1";
1111
1212 src = fetchurl {
13− url = "ftp://sourceware.org/pub/libffi/${name}.tar.gz";
13+ url = "https://sourceware.org/pub/libffi/${name}.tar.gz";
1414 sha256 = "0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh";
1515 };
1616
pkgs/development/libraries/libgpg-error/default.nix+4−1
@@ -28,8 +28,11 @@ in stdenv.mkDerivation (rec {
2828 sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure
2929 '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) ''
3030 ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabihf.h
31− '' + lib.optionalString stdenv.hostPlatform.isMusl ''
31+ '' + lib.optionalString (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isMusl) ''
3232 ln -s lock-obj-pub.x86_64-pc-linux-musl.h src/syscfg/lock-obj-pub.linux-musl.h
33+ '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isMusl) ''
34+ ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.arm-unknown-linux-musleabihf.h
35+ ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-musleabihf.h
3336 '';
3437
3538 outputs = [ "out" "dev" "info" ];
pkgs/development/libraries/libgpiod/default.nixnew file+38
@@ -0,0 +1,38 @@
1+{ stdenv, fetchgit, autoreconfHook, autoconf-archive, pkgconfig, kmod, enable-tools ? true }:
2+
3+stdenv.mkDerivation rec {
4+ name = "libgpiod-unstable-${version}";
5+ version = "2018-10-07";
6+
7+ src = fetchgit {
8+ url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git";
9+ rev = "4bf402d3a49336eacd33654441d575bd267780b8";
10+ sha256 = "01f3jzb133z189sxdiz9qiy65p0bjqhynfllidbpxdr0cxkyyc1d";
11+ };
12+
13+ buildInputs = [ kmod ];
14+ nativeBuildInputs = [
15+ autoconf-archive
16+ pkgconfig
17+ autoreconfHook
18+ ];
19+
20+ configureFlags = [
21+ "--enable-tools=${if enable-tools then "yes" else "no"}"
22+ "--enable-bindings-cxx"
23+ "--prefix=$(out)"
24+ ];
25+
26+ meta = with stdenv.lib; {
27+ description = "C library and tools for interacting with the linux GPIO character device";
28+ longDescription = ''
29+ Since linux 4.8 the GPIO sysfs interface is deprecated. User space should use
30+ the character device instead. This library encapsulates the ioctl calls and
31+ data structures behind a straightforward API.
32+ '';
33+ homepage = https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/;
34+ license = licenses.lgpl2;
35+ maintainers = [ maintainers.expipiplus1 ];
36+ platforms = platforms.linux;
37+ };
38+}
pkgs/development/libraries/libopusenc/default.nixnew file+28
@@ -0,0 +1,28 @@
1+{ stdenv, fetchurl, pkgconfig, libopus }:
2+
3+let
4+ version = "0.2.1";
5+in
6+stdenv.mkDerivation rec {
7+ name = "libopusenc-${version}";
8+
9+ src = fetchurl {
10+ url = "https://archive.mozilla.org/pub/opus/libopusenc-${version}.tar.gz";
11+ sha256 = "1ffb0vhlymlsq70pxsjj0ksz77yfm2x0a1x8q50kxmnkm1hxp642";
12+ };
13+
14+ outputs = [ "out" "dev" ];
15+
16+ doCheck = true;
17+
18+ nativeBuildInputs = [ pkgconfig ];
19+ buildInputs = [ libopus ];
20+
21+ meta = with stdenv.lib; {
22+ description = "Library for encoding .opus audio files and live streams";
23+ license = licenses.bsd3;
24+ homepage = http://www.opus-codec.org/;
25+ platforms = platforms.unix;
26+ maintainers = with maintainers; [ pmiddend ];
27+ };
28+}
pkgs/development/libraries/libpqxx/default.nix+1−1
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 meta = {
2424 description = "A C++ library to access PostgreSQL databases";
2525 homepage = http://pqxx.org/development/libpqxx/;
26− license = lib.licenses.postgresql;
26+ license = lib.licenses.bsd3;
2727 platforms = lib.platforms.linux;
2828 maintainers = [ lib.maintainers.eelco ];
2929 };
pkgs/development/libraries/libtorrent-rasterbar/default.nix+3−3
@@ -3,7 +3,7 @@
33}:
44
55let
6− version = "1.1.10";
6+ version = "1.1.11";
77 formattedVersion = lib.replaceChars ["."] ["_"] version;
88
99 # Make sure we override python, so the correct version is chosen
@@ -16,8 +16,8 @@ in stdenv.mkDerivation {
1616 src = fetchFromGitHub {
1717 owner = "arvidn";
1818 repo = "libtorrent";
19− rev = "libtorrent-${formattedVersion}";
20− sha256 = "0qj1rz52jk95m43cr7l3fi9jmf4pwxncp5mq4hi2vzacfnf79yms";
19+ rev = "libtorrent_${formattedVersion}";
20+ sha256 = "0nwdsv6d2gkdsh7l5a46g6cqx27xwh3msify5paf02l1qzjy4s5l";
2121 };
2222
2323 enableParallelBuilding = true;
pkgs/development/libraries/mythes/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, hunspell, pkgconfig, perl }:
1+{ stdenv, fetchurl, hunspell, ncurses, pkgconfig, perl }:
22
33stdenv.mkDerivation rec {
44 name = "mythes-1.2.4";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 };
1010
1111 buildInputs = [ hunspell ];
12− nativeBuildInputs = [ pkgconfig perl ];
12+ nativeBuildInputs = [ ncurses pkgconfig perl ];
1313
1414 meta = {
1515 homepage = http://hunspell.sourceforge.net/;
pkgs/development/libraries/ncurses/default.nix+2−1
@@ -4,6 +4,7 @@
44, mouseSupport ? false
55, unicode ? true
66, enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt
7+, enableShared ? !enableStatic
78, withCxx ? !stdenv.hostPlatform.useAndroidPrebuilt
89
910, gpm
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
2930 setOutputFlags = false; # some aren't supported
3031
3132 configureFlags = [
32− "--with-shared"
33+ (lib.withFeature enableShared "shared")
3334 "--without-debug"
3435 "--enable-pc-files"
3536 "--enable-symlinks"
pkgs/development/libraries/qmltermwidget/default.nix+4−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia }:
1+{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp }:
22
33stdenv.mkDerivation rec {
44 version = "0.1.0";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
1111 sha256 = "0ca500mzcqglkj0i6km0z512y3a025dbm24605xyv18l6y0l2ny3";
1212 };
1313
14− buildInputs = [ qtbase qtquick1 qtmultimedia ];
14+ buildInputs = [ qtbase qtquick1 qtmultimedia ]
15+ ++ stdenv.lib.optional stdenv.isDarwin utmp;
1516 nativeBuildInputs = [ qmake ];
1617
1718 patchPhase = ''
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
2728 description = "A QML port of qtermwidget";
2829 homepage = https://github.com/Swordfish90/qmltermwidget;
2930 license = stdenv.lib.licenses.gpl2;
30− platforms = stdenv.lib.platforms.linux;
31+ platforms = with stdenv.lib.platforms; linux ++ darwin;
3132 maintainers = with stdenv.lib.maintainers; [ skeidel ];
3233 };
3334}
pkgs/development/libraries/zlib/default.nix+8−5
@@ -1,6 +1,7 @@
11{ stdenv
22, fetchurl
3−, static ? false
3+, static ? true
4+, shared ? true
45}:
56
67stdenv.mkDerivation (rec {
@@ -24,13 +25,15 @@ stdenv.mkDerivation (rec {
2425 --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"'
2526 '';
2627
27− outputs = [ "out" "dev" "static" ];
28+ outputs = [ "out" "dev" ]
29+ ++ stdenv.lib.optional (shared && static) "static";
2830 setOutputFlags = false;
2931 outputDoc = "dev"; # single tiny man3 page
3032
31− configureFlags = stdenv.lib.optional (!static) "--shared";
33+ configureFlags = stdenv.lib.optional shared "--shared"
34+ ++ stdenv.lib.optional (static && !shared) "--static";
3235
33− postInstall = ''
36+ postInstall = stdenv.lib.optionalString (shared && static) ''
3437 moveToOutput lib/libz.a "$static"
3538 ''
3639 # jww (2015-01-06): Sometimes this library install as a .so, even on
@@ -64,7 +67,7 @@ stdenv.mkDerivation (rec {
6467 "PREFIX=${stdenv.cc.targetPrefix}"
6568 ] ++ stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [
6669 "-f" "win32/Makefile.gcc"
67− ] ++ stdenv.lib.optionals (!static) [
70+ ] ++ stdenv.lib.optionals shared [
6871 "SHARED_MODE=1"
6972 ];
7073
pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nixnew file+25
@@ -0,0 +1,25 @@
1+args @ { fetchurl, ... }:
2+rec {
3+ baseName = ''cl-jpeg'';
4+ version = ''20170630-git'';
5+
6+ description = ''A self-contained baseline JPEG codec implementation'';
7+
8+ deps = [ ];
9+
10+ src = fetchurl {
11+ url = ''http://beta.quicklisp.org/archive/cl-jpeg/2017-06-30/cl-jpeg-20170630-git.tgz'';
12+ sha256 = ''1wwzn2valhh5ka7qkmab59pb1ijagcj296553fp8z03migl0sil0'';
13+ };
14+
15+ packageName = "cl-jpeg";
16+
17+ asdFilesToKeep = ["cl-jpeg.asd"];
18+ overrides = x: x;
19+}
20+/* (SYSTEM cl-jpeg DESCRIPTION
21+ A self-contained baseline JPEG codec implementation SHA256
22+ 1wwzn2valhh5ka7qkmab59pb1ijagcj296553fp8z03migl0sil0 URL
23+ http://beta.quicklisp.org/archive/cl-jpeg/2017-06-30/cl-jpeg-20170630-git.tgz
24+ MD5 b6eb4ca5d893f428b5bbe46cd49f76ad NAME cl-jpeg FILENAME cl-jpeg DEPS NIL
25+ DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL PARASITES NIL) */
pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nixnew file+27
@@ -0,0 +1,27 @@
1+args @ { fetchurl, ... }:
2+rec {
3+ baseName = ''cl-pdf'';
4+ version = ''20170830-git'';
5+
6+ description = ''Common Lisp PDF Generation Library'';
7+
8+ deps = [ args."iterate" args."uiop" args."zpb-ttf" ];
9+
10+ src = fetchurl {
11+ url = ''http://beta.quicklisp.org/archive/cl-pdf/2017-08-30/cl-pdf-20170830-git.tgz'';
12+ sha256 = ''1x4zk6l635f121p1anfd7d807iglyrlhsnmygydw5l49m3h6n08s'';
13+ };
14+
15+ packageName = "cl-pdf";
16+
17+ asdFilesToKeep = ["cl-pdf.asd"];
18+ overrides = x: x;
19+}
20+/* (SYSTEM cl-pdf DESCRIPTION Common Lisp PDF Generation Library SHA256
21+ 1x4zk6l635f121p1anfd7d807iglyrlhsnmygydw5l49m3h6n08s URL
22+ http://beta.quicklisp.org/archive/cl-pdf/2017-08-30/cl-pdf-20170830-git.tgz
23+ MD5 f865503aff50c0a4732a7a4597bdcc25 NAME cl-pdf FILENAME cl-pdf DEPS
24+ ((NAME iterate FILENAME iterate) (NAME uiop FILENAME uiop)
25+ (NAME zpb-ttf FILENAME zpb-ttf))
26+ DEPENDENCIES (iterate uiop zpb-ttf) VERSION 20170830-git SIBLINGS
27+ (cl-pdf-parser) PARASITES NIL) */
pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nixnew file+28
@@ -0,0 +1,28 @@
1+args @ { fetchurl, ... }:
2+rec {
3+ baseName = ''cl-typesetting'';
4+ version = ''20170830-git'';
5+
6+ description = ''Common Lisp Typesetting system'';
7+
8+ deps = [ args."cl-pdf" args."iterate" args."zpb-ttf" ];
9+
10+ src = fetchurl {
11+ url = ''http://beta.quicklisp.org/archive/cl-typesetting/2017-08-30/cl-typesetting-20170830-git.tgz'';
12+ sha256 = ''1mkdr02qikzij3jiyrqy0dldzy8wsnvgcpznfha6x8p2xap586z3'';
13+ };
14+
15+ packageName = "cl-typesetting";
16+
17+ asdFilesToKeep = ["cl-typesetting.asd"];
18+ overrides = x: x;
19+}
20+/* (SYSTEM cl-typesetting DESCRIPTION Common Lisp Typesetting system SHA256
21+ 1mkdr02qikzij3jiyrqy0dldzy8wsnvgcpznfha6x8p2xap586z3 URL
22+ http://beta.quicklisp.org/archive/cl-typesetting/2017-08-30/cl-typesetting-20170830-git.tgz
23+ MD5 e12b9f249c60c220c5dc4a0939eb3343 NAME cl-typesetting FILENAME
24+ cl-typesetting DEPS
25+ ((NAME cl-pdf FILENAME cl-pdf) (NAME iterate FILENAME iterate)
26+ (NAME zpb-ttf FILENAME zpb-ttf))
27+ DEPENDENCIES (cl-pdf iterate zpb-ttf) VERSION 20170830-git SIBLINGS
28+ (xml-render cl-pdf-doc) PARASITES NIL) */
pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt+3
@@ -28,12 +28,14 @@ cl-fuse
2828cl-fuse-meta-fs
2929cl-html-parse
3030cl-html5-parser
31+cl-jpeg
3132cl-json
3233cl-l10n
3334cl-libuv
3435cl-mysql
3536closer-mop
3637closure-html
38+cl-pdf
3739cl-ppcre
3840cl-ppcre-template
3941cl-ppcre-unicode
@@ -50,6 +52,7 @@ cl-syntax-annot
5052cl-syntax-anonfun
5153cl-syntax-markup
5254cl-test-more
55+cl-typesetting
5356cl-unicode
5457cl-unification
5558cl-utilities
pkgs/development/lisp-modules/quicklisp-to-nix.nix+38−8
@@ -278,14 +278,6 @@ let quicklisp-to-nix-packages = rec {
278278 }));
279279
280280
281− "zpb-ttf" = buildLispPackage
282− ((f: x: (x // (f x)))
283− (qlOverrides."zpb-ttf" or (x: {}))
284− (import ./quicklisp-to-nix-output/zpb-ttf.nix {
285− inherit fetchurl;
286− }));
287−
288−
289281 "cl-store" = buildLispPackage
290282 ((f: x: (x // (f x)))
291283 (qlOverrides."cl-store" or (x: {}))
@@ -359,6 +351,14 @@ let quicklisp-to-nix-packages = rec {
359351 "cl-ppcre-test" = quicklisp-to-nix-packages."cl-ppcre";
360352
361353
354+ "zpb-ttf" = buildLispPackage
355+ ((f: x: (x // (f x)))
356+ (qlOverrides."zpb-ttf" or (x: {}))
357+ (import ./quicklisp-to-nix-output/zpb-ttf.nix {
358+ inherit fetchurl;
359+ }));
360+
361+
362362 "puri" = buildLispPackage
363363 ((f: x: (x // (f x)))
364364 (qlOverrides."puri" or (x: {}))
@@ -1907,6 +1907,17 @@ let quicklisp-to-nix-packages = rec {
19071907 }));
19081908
19091909
1910+ "cl-typesetting" = buildLispPackage
1911+ ((f: x: (x // (f x)))
1912+ (qlOverrides."cl-typesetting" or (x: {}))
1913+ (import ./quicklisp-to-nix-output/cl-typesetting.nix {
1914+ inherit fetchurl;
1915+ "cl-pdf" = quicklisp-to-nix-packages."cl-pdf";
1916+ "iterate" = quicklisp-to-nix-packages."iterate";
1917+ "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf";
1918+ }));
1919+
1920+
19101921 "cl-test-more" = buildLispPackage
19111922 ((f: x: (x // (f x)))
19121923 (qlOverrides."cl-test-more" or (x: {}))
@@ -2103,6 +2114,17 @@ let quicklisp-to-nix-packages = rec {
21032114 }));
21042115
21052116
2117+ "cl-pdf" = buildLispPackage
2118+ ((f: x: (x // (f x)))
2119+ (qlOverrides."cl-pdf" or (x: {}))
2120+ (import ./quicklisp-to-nix-output/cl-pdf.nix {
2121+ inherit fetchurl;
2122+ "iterate" = quicklisp-to-nix-packages."iterate";
2123+ "uiop" = quicklisp-to-nix-packages."uiop";
2124+ "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf";
2125+ }));
2126+
2127+
21062128 "closure-html" = buildLispPackage
21072129 ((f: x: (x // (f x)))
21082130 (qlOverrides."closure-html" or (x: {}))
@@ -2190,6 +2212,14 @@ let quicklisp-to-nix-packages = rec {
21902212 }));
21912213
21922214
2215+ "cl-jpeg" = buildLispPackage
2216+ ((f: x: (x // (f x)))
2217+ (qlOverrides."cl-jpeg" or (x: {}))
2218+ (import ./quicklisp-to-nix-output/cl-jpeg.nix {
2219+ inherit fetchurl;
2220+ }));
2221+
2222+
21932223 "cl-html5-parser" = buildLispPackage
21942224 ((f: x: (x // (f x)))
21952225 (qlOverrides."cl-html5-parser" or (x: {}))
pkgs/development/ocaml-modules/camlimages/default.nix+4−4
@@ -1,17 +1,17 @@
1−{ stdenv, fetchzip, buildDunePackage, configurator, cppo, lablgtk }:
1+{ lib, fetchzip, buildDunePackage, configurator, cppo, lablgtk }:
22
33buildDunePackage rec {
44 pname = "camlimages";
5− version = "5.0.0";
5+ version = "5.0.1";
66
77 src = fetchzip {
88 url = "https://bitbucket.org/camlspotter/${pname}/get/${version}.tar.gz";
9− sha256 = "00qvwxkfnhv93yi1iq7vy3p5lxyi9xigxcq464s4ii6bmp32d998";
9+ sha256 = "1figrgzsdrrxzfza0bhz0225g1rwawdf5x2m9lw2kzrdb815khs5";
1010 };
1111
1212 buildInputs = [ configurator cppo lablgtk ];
1313
14− meta = with stdenv.lib; {
14+ meta = with lib; {
1515 branch = "5.0";
1616 homepage = https://bitbucket.org/camlspotter/camlimages;
1717 description = "OCaml image processing library";
pkgs/development/ocaml-modules/frontc/default.nix+24−23
@@ -1,37 +1,38 @@
1−{ lib, buildOcaml, fetchurl, ocaml }:
1+{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, ocaml, findlib }:
22
3−if lib.versionAtLeast ocaml.version "4.06"
4−then throw "FrontC is not available for OCaml ${ocaml.version}"
5−else
3+let
4+ meta_file = fetchurl {
5+ url = https://raw.githubusercontent.com/ocaml/opam-repository/3c191ae9356ca7b3b628f2707cfcb863db42480f/packages/FrontC/FrontC.3.4.1/files/META;
6+ sha256 = "0s2wsinycldk8y5p09xd0hsgbhckhy7bkghzl63bph6mwv64kq2d";
7+ };
8+in
69
7−buildOcaml rec {
8− name = "FrontC";
9− version = "3.4";
10+stdenv.mkDerivation rec {
11+ name = "ocaml${ocaml.version}-FrontC-${version}";
12+ version = "3.4.1";
1013
11− src = fetchurl {
12− url = "http://www.irit.fr/recherches/ARCHI/MARCH/frontc/Frontc-${version}.tgz";
13− sha256 = "16dz153s92dgbw1rrfwbhscy73did87kfmjwyh3qpvs748h1sc4g";
14+ src = fetchFromGitHub {
15+ owner = "BinaryAnalysisPlatform";
16+ repo = "FrontC";
17+ rev = "V_3_4_1";
18+ sha256 = "1dq5nks0c9gsbr1m8k39m1bniawr5hqcy1r8x5px7naa95ch06ak";
1419 };
1520
21+ buildInputs = [ ocaml findlib ];
22+
1623 meta = with lib; {
17− homepage = https://www.irit.fr/recherches/ARCHI/MARCH/rubrique.php3?id_rubrique=61;
24+ inherit (src.meta) homepage;
25+ inherit (ocaml.meta) platforms;
1826 description = "C Parsing Library";
1927 license = licenses.lgpl21;
2028 maintainers = [ maintainers.maurer ];
2129 };
2230
23− meta_file = fetchurl {
24− url = https://raw.githubusercontent.com/ocaml/opam-repository/0f0e610f6499bdf0151e4170411b4f05e4d076d4/packages/FrontC/FrontC.3.4/files/META;
25− sha256 = "1flhvwr01crn7d094kby0418s1m4198np85ymjp3b4maz0n7m2mx";
26− };
27−
28− opam_patch = fetchurl {
29− url = https://raw.githubusercontent.com/ocaml/opam-repository/0f0e610f6499bdf0151e4170411b4f05e4d076d4/packages/FrontC/FrontC.3.4/files/opam.patch;
30− sha256 = "0xf83ixx0mf3mznwpwp2mjflii0njdzikhhfxpnms7vhnnmlfzy5";
31− };
32−
33− patches = [ opam_patch ];
34− patchFlags = "-p4";
31+ patches = [ (fetchpatch {
32+ url = https://raw.githubusercontent.com/ocaml/opam-repository/3c191ae9356ca7b3b628f2707cfcb863db42480f/packages/FrontC/FrontC.3.4.1/files/opam.patch;
33+ sha256 = "0v4f6740jbj1kxg1y03dzfa3x3gsrhv06wpzdj30gl4ki5fvj4hs";
34+ })
35+ ];
3536
3637 makeFlags = "PREFIX=$(out) OCAML_SITE=$(OCAMLFIND_DESTDIR)";
3738
pkgs/development/ocaml-modules/javalib/default.nix+6−13
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, which, ocaml, findlib, camlp4
1+{ stdenv, fetchzip, which, ocaml, findlib, camlp4
22, camlzip, camomile, extlib
33}:
44
@@ -8,15 +8,14 @@ else
88
99let
1010 pname = "javalib";
11− webpage = "http://sawja.inria.fr/";
1211in
1312stdenv.mkDerivation rec {
1413 name = "ocaml${ocaml.version}-${pname}-${version}";
15− version = "2.3.5";
14+ version = "3.0";
1615
17− src = fetchurl {
18− url = "https://gforge.inria.fr/frs/download.php/file/37655/javalib-2.3.5.tar.bz2";
19− sha256 = "1gks12ghcmv9lm8j4diw8bvjqxfl7xwk0sxbi227saxg9irpwwkd";
16+ src = fetchzip {
17+ url = "https://github.com/javalib-team/javalib/archive/v${version}.tar.gz";
18+ sha256 = "02zgn1z1wj3rbg9xqmbagys91bnsy27iwrngkivzhlykyaw9vf6n";
2019 };
2120
2221 buildInputs = [ which ocaml findlib camlp4 ];
@@ -30,17 +29,11 @@ stdenv.mkDerivation rec {
3029 configureScript = "./configure.sh";
3130 dontAddPrefix = "true";
3231
33− preBuild = ''
34− make ptrees;
35− make installptrees;
36− export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH;
37− '';
38−
3932 propagatedBuildInputs = [ camlzip camomile extlib ];
4033
4134 meta = with stdenv.lib; {
4235 description = "A library that parses Java .class files into OCaml data structures";
43− homepage = "${webpage}";
36+ homepage = https://javalib-team.github.io/javalib/;
4437 license = licenses.lgpl3;
4538 maintainers = [ maintainers.vbgl ];
4639 platforms = ocaml.meta.platforms or [];
pkgs/development/ocaml-modules/sawja/default.nix+3−3
@@ -4,7 +4,7 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
44
55let
66 pname = "sawja";
7− version = "1.5.3";
7+ version = "1.5.6";
88 webpage = "http://sawja.inria.fr/";
99in
1010stdenv.mkDerivation rec {
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
1212 name = "ocaml${ocaml.version}-${pname}-${version}";
1313
1414 src = fetchurl {
15− url = https://gforge.inria.fr/frs/download.php/file/37403/sawja-1.5.3.tar.bz2;
16− sha256 = "17vfknr126vfhpmr14j75sg8r47xz7pw7fba4nsdw3k7rq43vcn2";
15+ url = https://gforge.inria.fr/frs/download.php/file/37819/sawja-1.5.6.tar.bz2;
16+ sha256 = "0dkfdc8h94r7kj4p8q57fz7fssypgmjrix8xff0va7x1nya5sdp3";
1717 };
1818
1919 buildInputs = [ which perl ocaml findlib camlp4 ];
pkgs/development/ocaml-modules/zmq/default.nix+18−5
@@ -1,9 +1,16 @@
1−{ stdenv, fetchFromGitHub, buildDunePackage, czmq, stdint }:
1+{ stdenv, fetchFromGitHub, ocaml, findlib, dune, czmq, stdint }:
22
3−buildDunePackage rec {
4− pname = "zmq";
5− version = "20180726";
3+if !stdenv.lib.versionAtLeast ocaml.version "4.03"
4+then throw "zmq is not available for OCaml ${ocaml.version}"
5+else
6+
7+let __dune = dune; in
8+let dune = __dune.override { ocamlPackages = { inherit ocaml findlib; }; };
9+in
610
11+stdenv.mkDerivation rec {
12+ name = "ocaml${ocaml.version}-zmq-${version}";
13+ version = "20180726";
714 src = fetchFromGitHub {
815 owner = "issuu";
916 repo = "ocaml-zmq";
@@ -15,13 +22,19 @@ buildDunePackage rec {
1522 ./ocaml-zmq-issue43.patch
1623 ];
1724
18− buildInputs = [ czmq ];
25+ buildInputs = [ ocaml findlib dune czmq ];
26+
1927 propagatedBuildInputs = [ stdint ];
2028
29+ buildPhase = "dune build -p zmq";
30+
31+ inherit (dune) installPhase;
32+
2133 meta = with stdenv.lib; {
2234 description = "ZeroMQ bindings for OCaml";
2335 license = licenses.mit;
2436 maintainers = with maintainers; [ akavel ];
2537 inherit (src.meta) homepage;
38+ inherit (ocaml.meta) platforms;
2639 };
2740}
pkgs/development/python-modules/arelle/default.nix+22−13
@@ -1,13 +1,12 @@
11{ gui ? true,
22 buildPythonPackage, fetchFromGitHub, lib,
3− sphinx_1_2, lxml, isodate, numpy, pytest,
4− tkinter ? null, py3to2, isPy3k,
3+ sphinx, lxml, isodate, numpy, pytest, openpyxl,
4+ tkinter ? null, py3to2, isPy3k, python,
55 ... }:
66
77buildPythonPackage rec {
8− pname = "arelle-${version}${lib.optionalString (!gui) "-headless"}";
9− version = "2017-08-24";
10− name = pname + "-" + version;
8+ pname = "arelle${lib.optionalString (!gui) "-headless"}";
9+ version = "18.3";
1110
1211 disabled = !isPy3k;
1312
@@ -16,8 +15,8 @@ buildPythonPackage rec {
1615 src = fetchFromGitHub {
1716 owner = "Arelle";
1817 repo = "Arelle";
19− rev = "cb24e35d57b562a864ae3dd4542c4d9fcf3865fe";
20− sha256 = "1sbvhb3xlfnyvf1xj9dxwpcrfiaf7ikkdwvvap7aaxfxgiz85ip2";
18+ rev = "edgr${version}";
19+ sha256 = "12a94ipdp6xalqyds7rcp6cjwps6fbj3byigzfy403hlqc9n1g33";
2120 };
2221 outputs = ["out" "doc"];
2322 patches = [
@@ -25,7 +24,7 @@ buildPythonPackage rec {
2524 ];
2625 postPatch = "rm testParser2.py";
2726 buildInputs = [
28− sphinx_1_2
27+ sphinx
2928 pytest
3029 py3to2
3130 ];
@@ -33,6 +32,7 @@ buildPythonPackage rec {
3332 lxml
3433 isodate
3534 numpy
35+ openpyxl
3636 ] ++ lib.optional gui [
3737 tkinter
3838 ];
@@ -40,6 +40,12 @@ buildPythonPackage rec {
4040 # arelle-gui is useless without gui dependencies, so delete it when !gui.
4141 postInstall = lib.optionalString (!gui) ''
4242 find $out/bin -name "*arelle-gui*" -delete
43+ '' +
44+ # By default, not the entirety of the src dir is copied. This means we don't
45+ # copy the `images` dir, which is needed for the gui version.
46+ lib.optionalString (gui) ''
47+ targetDir=$out/${python.sitePackages}
48+ cp -vr $src/arelle $targetDir
4349 '';
4450
4551 # Documentation
@@ -49,11 +55,14 @@ buildPythonPackage rec {
4955
5056 doCheck = if gui then true else false;
5157
52− meta = {
53− description = "An open source facility for XBRL, the eXtensible Business Reporting Language supporting various standards, exposed through a python or REST API" + lib.optionalString gui " and a graphical user interface";
58+ meta = with lib; {
59+ description = ''
60+ An open source facility for XBRL, the eXtensible Business Reporting
61+ Language supporting various standards, exposed through a Python or
62+ REST API'' + lib.optionalString gui " and a graphical user interface";
5463 homepage = http://arelle.org/;
55− license = lib.licenses.asl20;
56− platforms = lib.platforms.all;
57− maintainers = with lib.maintainers; [ roberth ];
64+ license = licenses.asl20;
65+ platforms = platforms.all;
66+ maintainers = with maintainers; [ roberth ];
5867 };
5968}
pkgs/development/python-modules/arelle/tests.patch+1−19
@@ -3,7 +3,7 @@ index a64bb1b..dc0299d 100644
33--- c/arelle/CntlrProfiler.py
44+++ i/arelle/CntlrProfiler.py
55@@ -1,5 +1,6 @@
6−
6+
77-import Cntlr, ModelManager, FileSource, time
88+from arelle import Cntlr, ModelManager, FileSource
99+import time
@@ -12,21 +12,3 @@ index a64bb1b..dc0299d 100644
1212 import gettext
1313diff --git c/arelle/ValidateFilingText.py i/arelle/ValidateFilingText.py
1414index 12dbbbb..c0e98c3 100644
15−--- c/arelle/ValidateFilingText.py
16−+++ i/arelle/ValidateFilingText.py
17−@@ -16,7 +16,7 @@ XMLdeclaration = re.compile(r"<\?xml.*\?>", re.DOTALL)
18− XMLpattern = re.compile(r".*(<|&lt;|&#x3C;|&#60;)[A-Za-z_]+[A-Za-z0-9_:]*[^>]*(/>|>|&gt;|/&gt;).*", re.DOTALL)
19− CDATApattern = re.compile(r"<!\[CDATA\[(.+)\]\]")
20− #EFM table 5-1 and all &xxx; patterns
21−-docCheckPattern = re.compile(r"&\w+;|[^0-9A-Za-z`~!@#$%&\*\(\)\.\-+ \[\]\{\}\|\\:;\"'<>,_?/=\t\n\r\m\f]") # won't match &#nnn;
22−+docCheckPattern = re.compile(r"&\w+;|[^0-9A-Za-z`~!@#$%&\*\(\)\.\-+ \[\]\{\}\|\\:;\"'<>,_?/=\t\n\r\f]") # won't match &#nnn;
23− namedEntityPattern = re.compile("&[_A-Za-z\xC0-\xD6\xD8-\xF6\xF8-\xFF\u0100-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]"
24− r"[_\-\.:"
25− "\xB7A-Za-z0-9\xC0-\xD6\xD8-\xF6\xF8-\xFF\u0100-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\u0300-\u036F\u203F-\u2040]*;")
26−@@ -904,4 +904,4 @@ def referencedFiles(modelXbrl, localFilesOnly=True):
27− # footnote or other elements
28− for elt in modelXbrl.modelDocument.xmlRootElement.iter("{http://www.w3.org/1999/xhtml}a", "{http://www.w3.org/1999/xhtml}img"):
29− addReferencedFile(elt, elt)
30−- return referencedFiles
31−\ No newline at end of file
32−+ return referencedFiles
pkgs/development/python-modules/astroid/default.nix+2−2
@@ -5,13 +5,13 @@
55
66buildPythonPackage rec {
77 pname = "astroid";
8− version = "2.0.4";
8+ version = "2.1.0";
99
1010 disabled = pythonOlder "3.4";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "c7013d119ec95eb626f7a2011f0b63d0c9a095df9ad06d8507b37084eada1a8d";
14+ sha256 = "08hz675knh4294bancdapql392fmbjyimhbyrmfkz1ka7l035c1m";
1515 };
1616
1717 # From astroid/__pkginfo__.py
pkgs/development/python-modules/cairosvg/default.nix+13−3
@@ -1,18 +1,28 @@
1−{ stdenv, buildPythonPackage, fetchPypi, isPy3k
1+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, fetchpatch
22, cairocffi, cssselect2, defusedxml, pillow, tinycss2
33, pytestrunner, pytestcov, pytest-flake8, pytest-isort }:
44
55buildPythonPackage rec {
66 pname = "CairoSVG";
7− version = "2.1.3";
7+ version = "2.2.1";
88
99 disabled = !isPy3k;
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "e512f555f576b6462b04b585c4ba4c09a43f3a8fec907b60ead21d7d00c550e9";
13+ sha256 = "93c5b3204478c4e20c4baeb33807db5311b4420c21db2f21034a6deda998cb14";
1414 };
1515
16+ patches = [
17+ # Fix tests. Remove with the next release
18+ (fetchpatch {
19+ url = https://github.com/Kozea/CairoSVG/commit/1f403ad229f0e2782d6427a79f0fbeb6b76148b6.patch;
20+ sha256 = "1dxpj5zh8wmx9f8pj11hrixd5jlaqq5xlcdnbl462bh29zj18l26";
21+ })
22+ ];
23+
24+ LC_ALL="en_US.UTF-8";
25+
1626 propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ];
1727
1828 checkInputs = [ pytestrunner pytestcov pytest-flake8 pytest-isort ];
pkgs/development/python-modules/curtsies/default.nix+12−3
@@ -1,4 +1,4 @@
1−{ stdenv, buildPythonPackage, fetchPypi, blessings, mock, nose, pyte, wcwidth, typing }:
1+{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing }:
22
33buildPythonPackage rec {
44 pname = "curtsies";
@@ -8,7 +8,16 @@ buildPythonPackage rec {
88 sha256 = "89c802ec051d01dec6fc983e9856a3706e4ea8265d2940b1f6d504a9e26ed3a9";
99 };
1010
11− propagatedBuildInputs = [ blessings wcwidth typing ];
11+ patches = [
12+ # Fix dependency on typing. Remove with the next release
13+ (fetchpatch {
14+ url = https://github.com/bpython/curtsies/commit/217b4f83e954837f8adc4c549c1f2f9f2bb272a7.patch;
15+ sha256 = "1d3zwx9c7i0drb4nvydalm9mr83jrvdm75ffgisri89h337hiffs";
16+ })
17+ ];
18+
19+ propagatedBuildInputs = [ blessings wcwidth ]
20+ ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
1221
1322 checkInputs = [ mock pyte nose ];
1423
@@ -18,7 +27,7 @@ buildPythonPackage rec {
1827
1928 meta = with stdenv.lib; {
2029 description = "Curses-like terminal wrapper, with colored strings!";
21− homepage = https://pypi.python.org/pypi/curtsies;
30+ homepage = https://github.com/bpython/curtsies;
2231 license = licenses.mit;
2332 maintainers = with maintainers; [ flokli ];
2433 };
pkgs/development/python-modules/fedpkg-buildfix.diffdeleted−14
@@ -1,14 +0,0 @@
1−--- a/setup.py 2014-02-04 16:12:37.021993713 +0100
2−+++ b/setup.py 2014-02-04 16:11:42.653995607 +0100
3−@@ -13,8 +13,8 @@
4− package_dir = {'': 'src'},
5− packages = ['fedpkg'],
6− scripts = ['src/bin/fedpkg'],
7−- data_files = [('/etc/bash_completion.d', ['src/fedpkg.bash']),
8−- ('/etc/rpkg', ['src/fedpkg.conf']),
9−- ('/usr/libexec/', ['src/fedpkg-fixbranches.py']),
10−+ data_files = [('etc/bash_completion.d', ['src/fedpkg.bash']),
11−+ ('etc/rpkg', ['src/fedpkg.conf']),
12−+ ('libexec/', ['src/fedpkg-fixbranches.py']),
13− ]
14− )
pkgs/development/python-modules/fedpkg/default.nixdeleted−26
@@ -1,26 +0,0 @@
1−{ stdenv, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber }:
2−
3−buildPythonPackage rec {
4− pname = "fedpkg";
5− version = "1.29";
6− name = "${pname}-${version}";
7−
8− disabled = isPy3k;
9−
10− src = fetchurl {
11− url = "https://releases.pagure.org/fedpkg/${name}.tar.bz2";
12− sha256 = "1cpy5p1rp7w52ighz3ynvhyw04z86y8phq3n8563lj6ayr8pw631";
13− };
14−
15− #patches = [ ../development/python-modules/fedpkg-buildfix.diff ];
16− propagatedBuildInputs = [ rpkg offtrac urlgrabber ];
17−
18− doCheck = false; # requires fedora_cert which isn't used anymore
19−
20− meta = with stdenv.lib; {
21− description = "Subclass of the rpkg project for dealing with rpm packaging";
22− homepage = https://pagure.io/fedpkg;
23− license = licenses.gpl2;
24− maintainers = with maintainers; [ ];
25− };
26−}
pkgs/development/python-modules/flake8-future-import/default.nix+9−1
@@ -1,4 +1,4 @@
1−{ lib, fetchFromGitHub, buildPythonPackage, flake8, six }:
1+{ lib, fetchFromGitHub, buildPythonPackage, fetchpatch, flake8, six }:
22
33buildPythonPackage rec {
44 pname = "flake8-future-import";
@@ -12,6 +12,14 @@ buildPythonPackage rec {
1212 sha256 = "00fpxa6g8cabybnciwnpsbg60zhgydc966jgwyyggw1pcg0frdqr";
1313 };
1414
15+ patches = [
16+ # Add Python 3.7 support. Remove with the next release
17+ (fetchpatch {
18+ url = https://github.com/xZise/flake8-future-import/commit/cace194a44d3b95c9c1ed96640bae49183acca04.patch;
19+ sha256 = "17pkqnh035j5s5c53afs8bk49bq7lnmdwqp5k7izx7sw80z73p9r";
20+ })
21+ ];
22+
1523 propagatedBuildInputs = [ flake8 six ];
1624
1725 meta = {
pkgs/development/python-modules/flask-login/default.nix+4−6
@@ -1,15 +1,13 @@
1−{ stdenv, buildPythonPackage, fetchFromGitHub, pythonAtLeast
1+{ stdenv, buildPythonPackage, fetchPypi, pythonAtLeast
22, flask, blinker, nose, mock, semantic-version }:
33
44buildPythonPackage rec {
55 pname = "Flask-Login";
66 version = "0.4.1";
77
8− src = fetchFromGitHub {
9− owner = "maxcountryman";
10− repo = "flask-login";
11− rev = version;
12− sha256 = "1rj0qwyxapxnp84fi4lhmvh3d91fdiwz7hibw77x3d5i72knqaa9";
8+ src = fetchPypi {
9+ inherit pname version;
10+ sha256 = "1v2j8zd558xfmgn3rfbw0xz4vizjcnk8kqw52q4f4d9ygfnc25f8";
1311 };
1412
1513 checkInputs = [ nose mock semantic-version ];
pkgs/development/python-modules/parsimonious/default.nix+7−8
@@ -1,22 +1,21 @@
11{ stdenv
22, buildPythonPackage
3−, fetchFromGitHub
3+, fetchPypi
44, nose
55, six
66}:
77
88buildPythonPackage rec {
9− version = "0.7.0";
9+ version = "0.8.1";
1010 pname = "parsimonious";
1111
12− src = fetchFromGitHub {
13− repo = "parsimonious";
14− owner = "erikrose";
15− rev = version;
16− sha256 = "087npc8ccryrxabmqifcz56w4wd0hzmv0mc91wrbhc1sil196j0a";
12+ src = fetchPypi {
13+ inherit pname version;
14+ sha256 = "3add338892d580e0cb3b1a39e4a1b427ff9f687858fdd61097053742391a9f6b";
1715 };
1816
19− propagatedBuildInputs = [ nose six ];
17+ checkInputs = [ nose ];
18+ propagatedBuildInputs = [ six ];
2019
2120 meta = with stdenv.lib; {
2221 homepage = "https://github.com/erikrose/parsimonious";
pkgs/development/python-modules/pygraphviz/default.nix+12−2
@@ -13,8 +13,18 @@ buildPythonPackage rec {
1313 buildInputs = [ doctest-ignore-unicode mock nose ];
1414 propagatedBuildInputs = [ graphviz pkgconfig ];
1515
16− # the tests are currently failing:
17− # check status of pygraphviz/pygraphviz#129
16+ patches = [
17+ # pygraphviz depends on graphviz being in PATH. This patch always prepends
18+ # graphviz to PATH.
19+ ./graphviz-path.patch
20+ ];
21+ postPatch = ''
22+ substituteInPlace pygraphviz/agraph.py --subst-var-by graphvizPath '${graphviz}/bin'
23+ '';
24+
25+ # The tests are currently failing because of a bug in graphviz 2.40.1.
26+ # Upstream does not want to skip the relevant tests:
27+ # https://github.com/pygraphviz/pygraphviz/pull/129
1828 doCheck = false;
1929
2030 meta = with stdenv.lib; {
pkgs/development/python-modules/pygraphviz/graphviz-path.patchnew file+13
@@ -0,0 +1,13 @@
1+diff --git a/pygraphviz/agraph.py b/pygraphviz/agraph.py
2+index 8f72024..2d8358e 100644
3+--- a/pygraphviz/agraph.py
4++++ b/pygraphviz/agraph.py
5+@@ -1557,7 +1557,7 @@ class AGraph(object):
6+ import os
7+ import glob
8+
9+- paths = os.environ["PATH"]
10++ paths = '@graphvizPath@:' + os.environ["PATH"]
11+ if os.name == "nt":
12+ exe = ".exe"
13+ else:
pkgs/development/python-modules/pylint/default.nix+2−2
@@ -3,13 +3,13 @@
33
44buildPythonPackage rec {
55 pname = "pylint";
6− version = "2.1.1";
6+ version = "2.2.2";
77
88 disabled = pythonOlder "3.4";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "31142f764d2a7cd41df5196f9933b12b7ee55e73ef12204b648ad7e556c119fb";
12+ sha256 = "14klyan9lqanyi8qhrbn65k7bgv9p7i7ply662r2lr27wydf57b8";
1313 };
1414
1515 checkInputs = [ pytest pytestrunner pyenchant ];
pkgs/development/python-modules/python-fontconfig/default.nix+6−1
@@ -1,4 +1,4 @@
1−{ lib, buildPythonPackage, fetchPypi, fontconfig, python, freefont_ttf, makeFontsConf }:
1+{ lib, buildPythonPackage, fetchPypi, fontconfig, python, cython, freefont_ttf, makeFontsConf }:
22
33let
44 fontsConf = makeFontsConf {
@@ -14,6 +14,11 @@ in buildPythonPackage rec {
1414 };
1515
1616 buildInputs = [ fontconfig ];
17+ nativeBuildInputs = [ cython ];
18+
19+ preBuild = ''
20+ ${python.interpreter} setup.py build_ext -i
21+ '';
1722
1823 checkPhase = ''
1924 export FONTCONFIG_FILE=${fontsConf};
pkgs/development/python-modules/pywbem/default.nix+40−33
@@ -1,50 +1,57 @@
1−{ stdenv, buildPythonPackage, fetchFromGitHub, libxml2
2−, m2crypto, ply, pyyaml, six
3−, httpretty, lxml, mock, pytest, requests
1+{ lib, buildPythonPackage, fetchPypi, libxml2
2+, m2crypto, ply, pyyaml, six, pbr, pythonOlder, isPy37, python
3+, httpretty, lxml, mock, pytest, requests, decorator, unittest2
44}:
55
66buildPythonPackage rec {
77 pname = "pywbem";
8− version = "0.10.0";
8+ version = "0.12.6";
99
10− src = fetchFromGitHub {
11− owner = "pywbem";
12− repo = "pywbem";
13− rev = "v${version}";
14− sha256 = "0jcwklip03xcni0dvsk9va8ilqz21g4fxwqd5kzvv91slaadfcym";
10+ # Support added in master https://github.com/pywbem/pywbem/commit/b2f2f1a151a30355bbc6652dca69a7b30bfe941e awaiting release
11+ disabled = isPy37;
12+
13+ src = fetchPypi {
14+ inherit pname version;
15+ sha256 = "1dc6b745rrys600n05apdf6lb2vv5arlcwv7aiz9whgkbcd9qhki";
1516 };
1617
17− patches = [
18− # fix timezone handling so the tests pass again. Can go when 0.10.1 is released
19− # https://github.com/pywbem/pywbem/issues/755#issuecomment-327508681
20− ./make_cimdatetime_timezone_aware.patch
18+ propagatedBuildInputs = [
19+ mock
20+ pbr
21+ ply
22+ pyyaml
23+ six
24+ ] ++ lib.optionals (pythonOlder "3.0") [ m2crypto ];
25+
26+ checkInputs = [
27+ decorator
28+ httpretty
29+ libxml2
30+ lxml
31+ pytest
32+ requests
33+ unittest2
2134 ];
2235
23− propagatedBuildInputs = [ m2crypto ply pyyaml six ];
36+ postPatch = ''
37+ # Uses deprecated library yamlordereddictloader
38+ rm testsuite/test_client.py
2439
25− checkInputs = [ httpretty lxml mock pytest requests ];
40+ # Wants `wbemcli` in PATH
41+ rm testsuite/test_wbemcli.py
42+
43+ # Disables tests that use testfixtures which is currently broken by nonbuilding zope_component
44+ rm testsuite/{test_logging,test_recorder,test_wbemconnection_mock}.*
45+ '';
2646
27− # 1 test fails because it doesn't like running in our sandbox. Deleting the
28− # whole file is admittedly a little heavy-handed but at least the vast
29− # majority of tests are run.
3047 checkPhase = ''
31− rm testsuite/testclient/networkerror.yaml
32−
33− substituteInPlace makefile \
34− --replace "PYTHONPATH=." "" \
35− --replace '--cov $(package_name) --cov-config coveragerc' ""
36−
37− for f in testsuite/test_cim_xml.py testsuite/validate.py ; do
38− substituteInPlace $f --replace "'xmllint" "'${stdenv.lib.getBin libxml2}/bin/xmllint"
39− done
40−
41− make PATH=$PATH:${stdenv.lib.getBin libxml2}/bin test
48+ pytest testsuite/
4249 '';
4350
44− meta = with stdenv.lib; {
45− description = "Support for the WBEM standard for systems management.";
46− homepage = http://pywbem.github.io/pywbem/;
47− license = licenses.gpl2;
51+ meta = with lib; {
52+ description = "Support for the WBEM standard for systems management";
53+ homepage = https://pywbem.github.io;
54+ license = licenses.lgpl21Plus;
4855 maintainers = with maintainers; [ peterhoeg ];
4956 };
5057}
pkgs/development/python-modules/pywbem/make_cimdatetime_timezone_aware.patchdeleted−491
@@ -1,491 +0,0 @@
1−From bb7fa19d636d999bf844d80939e155b8f212ef3e Mon Sep 17 00:00:00 2001
2−From: Andreas Maier <maiera@de.ibm.com>
3−Date: Fri, 23 Jun 2017 19:13:51 +0200
4−Subject: [PATCH] Made CIMDateTime always timezone-aware, re-enabled
5− test_cim_types.py
6−
7−Details:
8−- Ensured that 'CIMDateTime' objects for point in time values are
9− timezone-aware when supplied with a timezone-naive 'datetime'
10− object. This does not change the behavior, but increases code
11− clarity.
12−- Clarified that in the documentation of 'CIMDateTime'.
13−- Added testcases for CIMDateTime.
14−- Re-enabled the testing of test_cim_types.py. Since its change
15− to using pytest it was not run because the test methods were
16− all static methods which apparently does not work. Not sure
17− this ever worked.
18−
19−Signed-off-by: Andreas Maier <maiera@de.ibm.com>
20−---
21− docs/changes.rst | 5 +
22− pywbem/cim_types.py | 22 +--
23− testsuite/test_cim_types.py | 369 +++++++++++++++++++++++---------------------
24− 3 files changed, 207 insertions(+), 189 deletions(-)
25−
26−diff --git a/docs/changes.rst b/docs/changes.rst
27−index 272ed30d..6fdfbcf4 100644
28−--- a/docs/changes.rst
29−+++ b/docs/changes.rst
30−@@ -72,6 +72,11 @@ Enhancements
31−
32− * Added unit test for recorder. See issue #676
33−
34−+* Ensured that `CIMDateTime` objects for point in time values are
35−+ timezone-aware when supplied with a timezone-naive `datetime` object.
36−+ This does not change the behavior, but increases code clarity.
37−+ Clarified that in the documentation of `CIMDateTime`. See issue #698.
38−+
39− Bug fixes
40− ^^^^^^^^^
41−
42−diff --git a/pywbem/cim_types.py b/pywbem/cim_types.py
43−index 6d1f140c..5ecc7707 100644
44−--- a/pywbem/cim_types.py
45−+++ b/pywbem/cim_types.py
46−@@ -74,6 +74,7 @@
47− import re
48− import warnings
49− import six
50−+import copy
51−
52− from . import config
53−
54−@@ -294,9 +295,11 @@ def __init__(self, dtarg):
55− * A :term:`string` object will be
56− interpreted as CIM datetime format (see :term:`DSP0004`) and
57− will result in a point in time or a time interval.
58−- * A :class:`py:datetime.datetime` object must be timezone-aware
59−- (see :class:`~pywbem.MinutesFromUTC`) and will result in a point
60−- in time.
61−+ * A :class:`py:datetime.datetime` object will result in a point
62−+ in time. If the :class:`py:datetime.datetime` object is
63−+ timezone-aware (see :class:`~pywbem.MinutesFromUTC`), the
64−+ specified timezone will be used. Otherwise, a default timezone
65−+ of UTC will be assumed.
66− * A :class:`py:datetime.timedelta` object will result in a time
67− interval.
68− * Another :class:`~pywbem.CIMDateTime` object will be copied.
69−@@ -342,14 +345,15 @@ def __init__(self, dtarg):
70− raise ValueError('dtarg argument "%s" has an invalid CIM '
71− 'datetime format' % dtarg)
72− elif isinstance(dtarg, datetime):
73−- self.__datetime = dtarg
74−+ if dtarg.tzinfo is None:
75−+ self.__datetime = dtarg.replace(tzinfo=MinutesFromUTC(0))
76−+ else:
77−+ self.__datetime = copy.copy(dtarg)
78− elif isinstance(dtarg, timedelta):
79−- self.__timedelta = dtarg
80−+ self.__timedelta = copy.copy(dtarg)
81− elif isinstance(dtarg, CIMDateTime):
82−- # pylint: disable=protected-access
83−- self.__datetime = dtarg.__datetime
84−- # pylint: disable=protected-access
85−- self.__timedelta = dtarg.__timedelta
86−+ self.__datetime = copy.copy(dtarg.datetime)
87−+ self.__timedelta = copy.copy(dtarg.timedelta)
88− else:
89− raise TypeError('dtarg argument "%s" has an invalid type: %s '
90− '(expected datetime, timedelta, string, or '
91−diff --git a/testsuite/test_cim_types.py b/testsuite/test_cim_types.py
92−index 4ae354d3..b1f54d06 100755
93−--- a/testsuite/test_cim_types.py
94−+++ b/testsuite/test_cim_types.py
95−@@ -43,105 +43,99 @@ def integer_tuple(request):
96− return request.param
97−
98−
99−-class TestIntegers:
100−- """
101−- Test CIM integer data type classes.
102−- """
103−-
104−- @staticmethod
105−- def test_class_attrs_class(integer_tuple):
106−- """Test class attrs via class level"""
107−- obj_type, exp_cimtype, exp_minvalue, exp_maxvalue = integer_tuple
108−- assert obj_type.cimtype == exp_cimtype
109−- assert obj_type.minvalue == exp_minvalue
110−- assert obj_type.maxvalue == exp_maxvalue
111−-
112−- @staticmethod
113−- def test_class_attrs_inst(integer_tuple):
114−- """Test class attrs via instance level"""
115−- obj_type, exp_cimtype, exp_minvalue, exp_maxvalue = integer_tuple
116−- obj = obj_type(42)
117−- assert obj.cimtype == exp_cimtype
118−- assert obj.minvalue == exp_minvalue
119−- assert obj.maxvalue == exp_maxvalue
120−-
121−- @staticmethod
122−- def test_inheritance(integer_tuple):
123−- """Test inheritance"""
124−- obj_type = integer_tuple[0]
125−- obj = obj_type(42)
126−- assert isinstance(obj, obj_type)
127−- assert isinstance(obj, CIMType)
128−- assert isinstance(obj, CIMInt)
129−- assert not isinstance(obj, CIMFloat)
130−-
131−- @staticmethod
132−- def test_init_int(integer_tuple):
133−- """Test initialization from integer value"""
134−- obj_type = integer_tuple[0]
135−- obj = obj_type(42)
136−- assert obj == 42
137−-
138−- @staticmethod
139−- def test_init_str(integer_tuple):
140−- """Test initialization from string value"""
141−- obj_type = integer_tuple[0]
142−- obj = obj_type('42')
143−- assert obj == 42
144−-
145−- @staticmethod
146−- def test_init_str_base10(integer_tuple):
147−- """Test initialization from string value with base 10"""
148−- obj_type = integer_tuple[0]
149−- obj = obj_type('42', 10)
150−- assert obj == 42
151−-
152−- @staticmethod
153−- def test_init_str_base16(integer_tuple):
154−- """Test initialization from string value with base 16"""
155−- obj_type = integer_tuple[0]
156−- obj = obj_type('2A', 16)
157−- assert obj == 42
158−-
159−- @staticmethod
160−- def test_init_minimum(integer_tuple):
161−- """Test initialization from integer value at minimum"""
162−- obj_type = integer_tuple[0]
163−- exp_minvalue = integer_tuple[2]
164−- obj = obj_type(exp_minvalue)
165−- assert obj == exp_minvalue
166−-
167−- @staticmethod
168−- def test_init_maximum(integer_tuple):
169−- """Test initialization from integer value at maximum"""
170−- obj_type = integer_tuple[0]
171−- exp_maxvalue = integer_tuple[3]
172−- obj = obj_type(exp_maxvalue)
173−- assert obj == exp_maxvalue
174−-
175−- @staticmethod
176−- def test_init_too_low(integer_tuple):
177−- """Test initialization from integer value below minimum"""
178−- obj_type = integer_tuple[0]
179−- exp_minvalue = integer_tuple[2]
180−- try:
181−- obj_type(exp_minvalue - 1)
182−- except ValueError:
183−- pass
184−- else:
185−- raise AssertionError("ValueError was not raised.")
186−-
187−- @staticmethod
188−- def test_init_too_high(integer_tuple):
189−- """Test initialization from integer value above maximum"""
190−- obj_type = integer_tuple[0]
191−- exp_maxvalue = integer_tuple[3]
192−- try:
193−- obj_type(exp_maxvalue + 1)
194−- except ValueError:
195−- pass
196−- else:
197−- raise AssertionError("ValueError was not raised.")
198−+def test_integer_class_attrs_class(integer_tuple):
199−+ """Test class attrs via class level"""
200−+ obj_type, exp_cimtype, exp_minvalue, exp_maxvalue = integer_tuple
201−+ assert obj_type.cimtype == exp_cimtype
202−+ assert obj_type.minvalue == exp_minvalue
203−+ assert obj_type.maxvalue == exp_maxvalue
204−+
205−+
206−+def test_integer_class_attrs_inst(integer_tuple):
207−+ """Test class attrs via instance level"""
208−+ obj_type, exp_cimtype, exp_minvalue, exp_maxvalue = integer_tuple
209−+ obj = obj_type(42)
210−+ assert obj.cimtype == exp_cimtype
211−+ assert obj.minvalue == exp_minvalue
212−+ assert obj.maxvalue == exp_maxvalue
213−+
214−+
215−+def test_integer_inheritance(integer_tuple):
216−+ """Test inheritance"""
217−+ obj_type = integer_tuple[0]
218−+ obj = obj_type(42)
219−+ assert isinstance(obj, obj_type)
220−+ assert isinstance(obj, CIMType)
221−+ assert isinstance(obj, CIMInt)
222−+ assert not isinstance(obj, CIMFloat)
223−+
224−+
225−+def test_integer_init_int(integer_tuple):
226−+ """Test initialization from integer value"""
227−+ obj_type = integer_tuple[0]
228−+ obj = obj_type(42)
229−+ assert obj == 42
230−+
231−+
232−+def test_integer_init_str(integer_tuple):
233−+ """Test initialization from string value"""
234−+ obj_type = integer_tuple[0]
235−+ obj = obj_type('42')
236−+ assert obj == 42
237−+
238−+
239−+def test_integer_init_str_base10(integer_tuple):
240−+ """Test initialization from string value with base 10"""
241−+ obj_type = integer_tuple[0]
242−+ obj = obj_type('42', 10)
243−+ assert obj == 42
244−+
245−+
246−+def test_integer_init_str_base16(integer_tuple):
247−+ """Test initialization from string value with base 16"""
248−+ obj_type = integer_tuple[0]
249−+ obj = obj_type('2A', 16)
250−+ assert obj == 42
251−+
252−+
253−+def test_integer_init_minimum(integer_tuple):
254−+ """Test initialization from integer value at minimum"""
255−+ obj_type = integer_tuple[0]
256−+ exp_minvalue = integer_tuple[2]
257−+ obj = obj_type(exp_minvalue)
258−+ assert obj == exp_minvalue
259−+
260−+
261−+def test_integer_init_maximum(integer_tuple):
262−+ """Test initialization from integer value at maximum"""
263−+ obj_type = integer_tuple[0]
264−+ exp_maxvalue = integer_tuple[3]
265−+ obj = obj_type(exp_maxvalue)
266−+ assert obj == exp_maxvalue
267−+
268−+
269−+def test_integer_init_too_low(integer_tuple):
270−+ """Test initialization from integer value below minimum"""
271−+ obj_type = integer_tuple[0]
272−+ exp_minvalue = integer_tuple[2]
273−+ try:
274−+ obj_type(exp_minvalue - 1)
275−+ except ValueError:
276−+ pass
277−+ else:
278−+ raise AssertionError("ValueError was not raised.")
279−+
280−+
281−+def test_integer_init_too_high(integer_tuple):
282−+ """Test initialization from integer value above maximum"""
283−+ obj_type = integer_tuple[0]
284−+ exp_maxvalue = integer_tuple[3]
285−+ try:
286−+ obj_type(exp_maxvalue + 1)
287−+ except ValueError:
288−+ pass
289−+ else:
290−+ raise AssertionError("ValueError was not raised.")
291−
292−
293− #
294−@@ -164,47 +158,41 @@ def real_tuple(request):
295− return request.param
296−
297−
298−-class TestReals:
299−- """
300−- Test CIM real data type classes.
301−- """
302−-
303−- @staticmethod
304−- def test_class_attrs_class(real_tuple):
305−- """Test class attrs via class level"""
306−- obj_type, exp_cimtype = real_tuple
307−- assert obj_type.cimtype == exp_cimtype
308−-
309−- @staticmethod
310−- def test_class_attrs_inst(real_tuple):
311−- """Test class attrs via instance level"""
312−- obj_type, exp_cimtype = real_tuple
313−- obj = obj_type(42)
314−- assert obj.cimtype == exp_cimtype
315−-
316−- @staticmethod
317−- def test_inheritance(real_tuple):
318−- """Test inheritance"""
319−- obj_type = real_tuple[0]
320−- obj = obj_type(42)
321−- assert isinstance(obj, obj_type)
322−- assert isinstance(obj, CIMType)
323−- assert isinstance(obj, CIMFloat)
324−- assert not isinstance(obj, CIMInt)
325−-
326−- @staticmethod
327−- def test_init_float(real_tuple):
328−- """Test initialization from floating point value"""
329−- obj_type = real_tuple[0]
330−- obj = obj_type(42.0)
331−- assert obj == 42.0
332−-
333−- @staticmethod
334−- def test_init_str(real_tuple):
335−- """Test initialization from string value"""
336−- obj_type = real_tuple[0]
337−- obj = obj_type('42.0')
338−- assert obj == 42.0
339−+def test_real_class_attrs_class(real_tuple):
340−+ """Test class attrs via class level"""
341−+ obj_type, exp_cimtype = real_tuple
342−+ assert obj_type.cimtype == exp_cimtype
343−+
344−+
345−+def test_real_class_attrs_inst(real_tuple):
346−+ """Test class attrs via instance level"""
347−+ obj_type, exp_cimtype = real_tuple
348−+ obj = obj_type(42)
349−+ assert obj.cimtype == exp_cimtype
350−+
351−+
352−+def test_real_inheritance(real_tuple):
353−+ """Test inheritance"""
354−+ obj_type = real_tuple[0]
355−+ obj = obj_type(42)
356−+ assert isinstance(obj, obj_type)
357−+ assert isinstance(obj, CIMType)
358−+ assert isinstance(obj, CIMFloat)
359−+ assert not isinstance(obj, CIMInt)
360−+
361−+
362−+def test_real_init_float(real_tuple):
363−+ """Test initialization from floating point value"""
364−+ obj_type = real_tuple[0]
365−+ obj = obj_type(42.0)
366−+ assert obj == 42.0
367−+
368−+
369−+def test_real_init_str(real_tuple):
370−+ """Test initialization from string value"""
371−+ obj_type = real_tuple[0]
372−+ obj = obj_type('42.0')
373−+ assert obj == 42.0
374−
375−
376− #
377−@@ -271,6 +259,26 @@ def test_init_str(real_tuple):
378− '20140924193040.654321+120'
379− ),
380− (
381−+ datetime(year=2014, month=9, day=24, hour=19, minute=30, second=40,
382−+ microsecond=654321, tzinfo=MinutesFromUTC(0)),
383−+ 'timestamp',
384−+ datetime(year=2014, month=9, day=24, hour=19, minute=30, second=40,
385−+ microsecond=654321, tzinfo=MinutesFromUTC(0)),
386−+ None,
387−+ 0,
388−+ '20140924193040.654321+000'
389−+ ),
390−+ (
391−+ datetime(year=2014, month=9, day=24, hour=19, minute=30, second=40,
392−+ microsecond=654321),
393−+ 'timestamp',
394−+ datetime(year=2014, month=9, day=24, hour=19, minute=30, second=40,
395−+ microsecond=654321, tzinfo=MinutesFromUTC(0)),
396−+ None,
397−+ 0,
398−+ '20140924193040.654321+000'
399−+ ),
400−+ (
401− '20140924193040.654321+120',
402− 'timestamp',
403− datetime(year=2014, month=9, day=24, hour=19, minute=30, second=40,
404−@@ -325,46 +333,47 @@ def datetime_init_tuple(request):
405− return request.param
406−
407−
408−-class TestDatetime:
409−- """
410−- Test CIM real data type classes.
411−- """
412−-
413−- @staticmethod
414−- def test_class_attrs_class():
415−- """Test class attrs via class level"""
416−- assert CIMDateTime.cimtype == 'datetime'
417−-
418−- @staticmethod
419−- def test_class_attrs_inst():
420−- """Test class attrs via instance level"""
421−- obj = CIMDateTime('00000000000000.000000:000')
422−- assert obj.cimtype == 'datetime'
423−-
424−- @staticmethod
425−- def test_inheritance():
426−- """Test inheritance"""
427−- obj = CIMDateTime('00000000000000.000000:000')
428−- assert isinstance(obj, CIMDateTime)
429−- assert isinstance(obj, CIMType)
430−- assert not isinstance(obj, CIMFloat)
431−- assert not isinstance(obj, CIMInt)
432−-
433−- @staticmethod
434−- def test_init(datetime_init_tuple):
435−- """Test initialization from all input types"""
436−- (dtarg, exp_kind, exp_datetime, exp_timedelta, exp_minutesfromutc,
437−- exp_str) = datetime_init_tuple
438−- try:
439−- obj = CIMDateTime(dtarg)
440−- except Exception as exc:
441−- assert isinstance(exc, exp_kind)
442−- else:
443−- assert obj.is_interval == (exp_kind == 'interval')
444−- assert obj.datetime == exp_datetime
445−- assert obj.timedelta == exp_timedelta
446−- assert obj.minutes_from_utc == exp_minutesfromutc
447−- assert str(obj) == exp_str
448−+def test_datetime_class_attrs_class():
449−+ """Test class attrs via class level"""
450−+ assert CIMDateTime.cimtype == 'datetime'
451−+
452−+
453−+def test_datetime_class_attrs_inst():
454−+ """Test class attrs via instance level"""
455−+ obj = CIMDateTime('00000000000000.000000:000')
456−+ assert obj.cimtype == 'datetime'
457−+
458−+
459−+def test_datetime_inheritance():
460−+ """Test inheritance"""
461−+ obj = CIMDateTime('00000000000000.000000:000')
462−+ assert isinstance(obj, CIMDateTime)
463−+ assert isinstance(obj, CIMType)
464−+ assert not isinstance(obj, CIMFloat)
465−+ assert not isinstance(obj, CIMInt)
466−+
467−+
468−+def test_datetime_init(datetime_init_tuple):
469−+ """Test initialization from all input types"""
470−+ (dtarg, exp_kind, exp_datetime, exp_timedelta, exp_minutesfromutc,
471−+ exp_str) = datetime_init_tuple
472−+ try:
473−+ obj = CIMDateTime(dtarg)
474−+ except Exception as exc:
475−+ assert isinstance(exc, exp_kind)
476−+ else:
477−+ assert obj.is_interval == (exp_kind == 'interval')
478−+ assert obj.datetime == exp_datetime
479−+ if obj.datetime is not None:
480−+ assert isinstance(obj.datetime, datetime)
481−+ # We ensure that the datetime is always timezone-aware:
482−+ assert obj.datetime.tzinfo is not None
483−+ assert obj.timedelta == exp_timedelta
484−+ if obj.timedelta is not None:
485−+ assert isinstance(obj.timedelta, timedelta)
486−+ assert obj.minutes_from_utc == exp_minutesfromutc
487−+ assert str(obj) == exp_str
488−+
489−
490− # TODO: Add testcases for get_local_utcoffset()
491− # TODO: Add testcases for now()
pkgs/development/python-modules/qasm2image/default.nix+2
@@ -36,6 +36,8 @@ buildPythonPackage rec {
3636 ${python.interpreter} tests/launch_tests.py
3737 '';
3838
39+ LC_ALL="en_US.UTF-8";
40+
3941 meta = {
4042 description = "A Python module to visualise quantum circuit";
4143 homepage = https://github.com/nelimeee/qasm2image;
pkgs/development/python-modules/svgwrite/default.nix+10−3
@@ -3,23 +3,30 @@
33, fetchPypi
44, setuptools
55, pyparsing
6+, pytest
67}:
78
89buildPythonPackage rec {
910 pname = "svgwrite";
10− version = "1.1.6";
11+ version = "1.2.1";
1112
1213 src = fetchPypi {
1314 inherit pname version;
14− sha256 = "1f018813072aa4d7e95e58f133acb3f68fa7de0a0d89ec9402cc38406a0ec5b8";
15+ extension = "zip";
16+ sha256 = "72ef66c9fe367989823cb237ab7f012ac809dd3ba76c1b5ebd9aa61580e2e75e";
1517 };
1618
1719 buildInputs = [ setuptools ];
1820 propagatedBuildInputs = [ pyparsing ];
21+ checkInputs = [ pytest ];
22+
23+ checkPhase = ''
24+ pytest
25+ '';
1926
2027 meta = with stdenv.lib; {
2128 description = "A Python library to create SVG drawings";
22− homepage = https://bitbucket.org/mozman/svgwrite;
29+ homepage = https://github.com/mozman/svgwrite;
2330 license = licenses.mit;
2431 };
2532
pkgs/development/python-modules/whisper/default.nix+2−1
@@ -1,4 +1,4 @@
1−{ stdenv, buildPythonPackage, fetchPypi, six }:
1+{ stdenv, buildPythonPackage, fetchPypi, mock, six }:
22
33buildPythonPackage rec {
44 pname = "whisper";
@@ -10,6 +10,7 @@ buildPythonPackage rec {
1010 };
1111
1212 propagatedBuildInputs = [ six ];
13+ checkInputs = [ mock ];
1314
1415 meta = with stdenv.lib; {
1516 homepage = http://graphite.wikidot.com/;
pkgs/development/r-modules/default.nix+12
@@ -950,6 +950,18 @@ let
950950 preConfigure = "patchShebangs configure";
951951 });
952952
953+ littler = old.littler.overrideAttrs (attrs: with pkgs; {
954+ buildInputs = [ pcre lzma zlib bzip2 icu which ] ++ attrs.buildInputs;
955+ postInstall = ''
956+ install -d $out/bin $out/share/man/man1
957+ ln -s ../library/littler/bin/r $out/bin/r
958+ ln -s ../library/littler/bin/r $out/bin/lr
959+ ln -s ../../../library/littler/man-page/r.1 $out/share/man/man1
960+ # these won't run without special provisions, so better remove them
961+ rm -r $out/library/littler/script-tests
962+ '';
963+ });
964+
953965 };
954966in
955967 self
pkgs/development/r-modules/wrapper-rstudio.nix+17−21
@@ -1,15 +1,15 @@
1−{ stdenv, R, rstudio, makeWrapper, recommendedPackages, packages, qtbase }:
1+{ lib, runCommand, R, rstudio, makeWrapper, recommendedPackages, packages, qtbase }:
22
33let
4− qtVersion = with stdenv.lib.versions; "${major qtbase.version}.${minor qtbase.version}";
4+ qtVersion = with lib.versions; "${major qtbase.version}.${minor qtbase.version}";
55in
6−stdenv.mkDerivation rec {
6+runCommand (rstudio.name + "-wrapper") {
7+ preferLocalBuild = true;
8+ allowSubstitutes = false;
79
8− name = rstudio.name + "-wrapper";
10+ nativeBuildInputs = [makeWrapper];
911
10− buildInputs = [makeWrapper R rstudio] ++ recommendedPackages ++ packages;
11−
12− unpackPhase = ":";
12+ buildInputs = [R rstudio] ++ recommendedPackages ++ packages;
1313
1414 # rWrapper points R to a specific set of packages by using a wrapper
1515 # (as in https://nixos.org/nixpkgs/manual/#r-packages) which sets
@@ -20,18 +20,14 @@ stdenv.mkDerivation rec {
2020 # into an R file (fixLibsR) which achieves the same effect, then
2121 # uses R_PROFILE_USER to load this code at startup in RStudio.
2222 fixLibsR = "fix_libs.R";
23− installPhase = ''
24− mkdir $out
25− echo "# Autogenerated by wrapper-rstudio.nix from R_LIBS_SITE" > $out/${fixLibsR}
26− echo -n ".libPaths(c(.libPaths(), \"" >> $out/${fixLibsR}
27− echo -n $R_LIBS_SITE | sed -e 's/:/", "/g' >> $out/${fixLibsR}
28− echo -n "\"))" >> $out/${fixLibsR}
29− echo >> $out/${fixLibsR}
30− makeWrapper ${rstudio}/bin/rstudio $out/bin/rstudio --set R_PROFILE_USER $out/${fixLibsR} \
31− --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins
32− '';
33−
34− meta = {
35− platforms = stdenv.lib.platforms.unix;
36− };
3723}
24+''
25+mkdir $out
26+echo "# Autogenerated by wrapper-rstudio.nix from R_LIBS_SITE" > $out/$fixLibsR
27+echo -n ".libPaths(c(.libPaths(), \"" >> $out/$fixLibsR
28+echo -n $R_LIBS_SITE | sed -e 's/:/", "/g' >> $out/$fixLibsR
29+echo -n "\"))" >> $out/$fixLibsR
30+echo >> $out/$fixLibsR
31+makeWrapper ${rstudio}/bin/rstudio $out/bin/rstudio --set R_PROFILE_USER $out/$fixLibsR \
32+ --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins
33+''
pkgs/development/r-modules/wrapper.nix+16−20
@@ -1,25 +1,21 @@
1−{ stdenv, R, makeWrapper, recommendedPackages, packages }:
1+{ runCommand, R, makeWrapper, recommendedPackages, packages }:
22
3−stdenv.mkDerivation {
4− name = R.name + "-wrapper";
3+runCommand (R.name + "-wrapper") {
4+ preferLocalBuild = true;
5+ allowSubstitutes = false;
56
6− buildInputs = [makeWrapper R] ++ recommendedPackages ++ packages;
7+ buildInputs = [R] ++ recommendedPackages ++ packages;
78
8− # Make the list of recommended R packages accessible to other packages such as rpy2
9− passthru.recommendedPackages = recommendedPackages;
10−
11− unpackPhase = ":";
9+ nativeBuildInputs = [makeWrapper];
1210
13− installPhase = ''
14− mkdir -p $out/bin
15− cd ${R}/bin
16− for exe in *; do
17− makeWrapper ${R}/bin/$exe $out/bin/$exe \
18− --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE"
19− done
20− '';
21−
22− meta = {
23− platforms = stdenv.lib.platforms.unix;
24− };
11+ # Make the list of recommended R packages accessible to other packages such as rpy2
12+ passthru = { inherit recommendedPackages; };
2513}
14+''
15+mkdir -p $out/bin
16+cd ${R}/bin
17+for exe in *; do
18+ makeWrapper ${R}/bin/$exe $out/bin/$exe \
19+ --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE"
20+done
21+''
pkgs/development/tools/analysis/flow/default.nix+2−2
@@ -1,14 +1,14 @@
11{ stdenv, fetchFromGitHub, ocamlPackages, cf-private, CoreServices }:
22
33stdenv.mkDerivation rec {
4− version = "0.86.0";
4+ version = "0.87.0";
55 name = "flow-${version}";
66
77 src = fetchFromGitHub {
88 owner = "facebook";
99 repo = "flow";
1010 rev = "refs/tags/v${version}";
11− sha256 = "0sxg066bfkgqyq2fcjkff4jbhpxrzsqgz53h2b4wscxr076r9bjp";
11+ sha256 = "10f7rwkgh40wl8z3wgcsvyzm65zsf3zd143q4nv6q6g3m9izh40k";
1212 };
1313
1414 installPhase = ''
pkgs/development/tools/analysis/radare/default.nixdeleted−38
@@ -1,38 +0,0 @@
1−{stdenv, fetchurl, pkgconfig, libusb, readline, lua, perl,
2−gtk2 ? null, vte ? null, gtkdialog ? null,
3−python ? null,
4−ruby ? null,
5−useX11, rubyBindings, pythonBindings, luaBindings}:
6−
7−assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null);
8−assert rubyBindings -> ruby != null;
9−assert pythonBindings -> python != null;
10−
11−let
12− inherit (stdenv.lib) optional;
13−in
14−stdenv.mkDerivation rec {
15− name = "radare-1.5.2";
16−
17− src = fetchurl {
18− url = "https://radare.org/get/${name}.tar.gz";
19− sha256 = "1qdrmcnzfvfvqb27c7pknwm8jl2hqa6c4l66wzyddwlb8yjm46hd";
20− };
21−
22− hardeningDisable = [ "format" ];
23−
24− nativeBuildInputs = [ pkgconfig ];
25− buildInputs = [ readline libusb perl]
26− ++ optional useX11 [gtkdialog vte gtk2]
27− ++ optional rubyBindings [ruby]
28− ++ optional pythonBindings [python]
29− ++ optional luaBindings [lua];
30−
31− meta = {
32− description = "Free advanced command line hexadecimal editor";
33− homepage = http://radare.org/;
34− license = stdenv.lib.licenses.gpl2Plus;
35− maintainers = with stdenv.lib.maintainers; [viric];
36− platforms = with stdenv.lib.platforms; linux;
37− };
38−}
pkgs/development/tools/analysis/radare/ired.nixdeleted−22
@@ -1,22 +0,0 @@
1−{stdenv, fetchurl}:
2−
3−stdenv.mkDerivation rec {
4− name = "ired-0.4";
5−
6− src = fetchurl {
7− url = "https://radare.org/get/${name}.tar.gz";
8− sha256 = "0wya1ylc6adqg4qw5fi8aspc5d1yr27x9r2vpy133qxzia9qv3mm";
9− };
10−
11− installPhase = ''
12− make install PREFIX=$out
13− '';
14−
15− meta = {
16− description = "Interactive Raw Editor";
17− homepage = http://radare.org/;
18− license = stdenv.lib.licenses.gpl2Plus;
19− maintainers = with stdenv.lib.maintainers; [viric];
20− platforms = with stdenv.lib.platforms; all;
21− };
22−}
pkgs/development/tools/analysis/radare2/default.nix+7−7
@@ -90,17 +90,17 @@ in {
9090 #<generated>
9191 # DO NOT EDIT! Automatically generated by ./update.py
9292 radare2 = generic {
93− version_commit = "20285";
94− gittap = "3.1.1";
95− gittip = "b143e1b1b5622ef2f41a90f4c0f7ed4c477caf40";
96− rev = "3.1.1";
97− version = "3.1.1";
98− sha256 = "09kn25ijqhk3x9f3k6mw1g0wvwym8ys6qz53ybx3qizy4fzln0hw";
93+ version_commit = "20315";
94+ gittap = "3.1.3";
95+ gittip = "57dd0b4e7ec70cc95f859651b1b63b076b8df7a7";
96+ rev = "3.1.3";
97+ version = "3.1.3";
98+ sha256 = "17bd7i9lbr0nxa3llw354mppx44xi7bjwif7g7wxw0zcjlfxnk5d";
9999 cs_tip = "f01c267f889e932b069a559ce0c604c1ae986c0a";
100100 cs_sha256 = "15ifnql2gi2f9g8j60hc4hbxbvi2qn1r110ry32qmlz55svxh67y";
101101 };
102102 r2-for-cutter = generic {
103− version_commit = "20285";
103+ version_commit = "20315";
104104 gittap = "2.9.0-310-gcb62c376b";
105105 gittip = "cb62c376bef6c7427019a7c28910c33c364436dd";
106106 rev = "cb62c376bef6c7427019a7c28910c33c364436dd";
pkgs/development/tools/build-managers/bloop/default.nix+3−3
@@ -2,7 +2,7 @@
22
33let
44 baseName = "bloop";
5− version = "1.0.0";
5+ version = "1.1.1";
66 deps = stdenv.mkDerivation {
77 name = "${baseName}-deps-${version}";
88 buildCommand = ''
@@ -16,12 +16,12 @@ let
1616 '';
1717 outputHashMode = "recursive";
1818 outputHashAlgo = "sha256";
19− outputHash = "0dgllwv9rjvpzvlbwwiynmfp15j2x48al7cb5rlmhq0an3q81hbh";
19+ outputHash = "0w2gk9ladkzm3mx3qsmjqjakj94g7s4s3xfzl6yny1h4dg1456n6";
2020 };
2121in
2222stdenv.mkDerivation rec {
2323 name = "${baseName}-${version}";
24− nailgunCommit = "0c8b937b";
24+ nailgunCommit = "6992a3bf";
2525
2626 buildInputs = [ jdk makeWrapper deps ];
2727
pkgs/development/tools/build-managers/leiningen/default.nix+6−3
@@ -24,11 +24,14 @@ stdenv.mkDerivation rec {
2424 buildInputs = [ makeWrapper ];
2525 propagatedBuildInputs = [ jdk ];
2626
27+ # the jar is not in share/java, because it's a standalone jar and should
28+ # never be picked up by set-java-classpath.sh
29+
2730 installPhase = ''
28− mkdir -p $out/bin $out/share/java
31+ mkdir -p $out/bin $out/share
2932
3033 cp -v $src $out/bin/lein
31− cp -v $jarsrc $out/share/java/$JARNAME
34+ cp -v $jarsrc $out/share/$JARNAME
3235 '';
3336
3437 fixupPhase = ''
@@ -36,7 +39,7 @@ stdenv.mkDerivation rec {
3639 patchShebangs $out/bin/lein
3740
3841 substituteInPlace $out/bin/lein \
39− --replace 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/java/$JARNAME"
42+ --replace 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/$JARNAME"
4043
4144 wrapProgram $out/bin/lein \
4245 --prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap coreutils ]}" \
pkgs/development/tools/continuous-integration/jenkins/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "jenkins-${version}";
5− version = "2.138.3";
5+ version = "2.150.1";
66
77 src = fetchurl {
88 url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
9− sha256 = "0z8yfnqg43vqhhnp27wb28686zq9kqkyicqn0162hr9h5pd4sglm";
9+ sha256 = "0sb6mzynw1vg6s43mpd7b0dz1clbf8akga09i14q66isb9nmhf3s";
1010 };
1111
1212 buildCommand = ''
pkgs/development/tools/fedpkg/default.nixnew file+35
@@ -0,0 +1,35 @@
1+{ stdenv, buildPythonApplication, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber, pyopenssl, python_fedora }:
2+
3+let
4+ fedora_cert = buildPythonPackage rec {
5+ name = "fedora-cert";
6+ version = "0.6.0.2";
7+ format = "other";
8+
9+ src = fetchurl {
10+ url = "https://releases.pagure.org/fedora-packager/fedora-packager-${version}.tar.bz2";
11+ sha256 = "02f22072wx1zg3rhyfw6gbxryzcbh66s92nb98mb9kdhxixv6p0z";
12+ };
13+ propagatedBuildInputs = [ python_fedora pyopenssl ];
14+ doCheck = false;
15+ };
16+in buildPythonApplication rec {
17+ pname = "fedpkg";
18+ version = "1.29";
19+
20+ disabled = isPy3k;
21+
22+ src = fetchurl {
23+ url = "https://releases.pagure.org/fedpkg/${pname}-${version}.tar.bz2";
24+ sha256 = "1cpy5p1rp7w52ighz3ynvhyw04z86y8phq3n8563lj6ayr8pw631";
25+ };
26+ patches = [ ./fix-paths.patch ];
27+ propagatedBuildInputs = [ rpkg offtrac urlgrabber fedora_cert ];
28+
29+ meta = with stdenv.lib; {
30+ description = "Subclass of the rpkg project for dealing with rpm packaging";
31+ homepage = https://pagure.io/fedpkg;
32+ license = licenses.gpl2;
33+ maintainers = with maintainers; [ ];
34+ };
35+}
pkgs/development/tools/fedpkg/fix-paths.patchnew file+16
@@ -0,0 +1,16 @@
1+--- orig/setup.py
2++++ new/setup.py
3+@@ -27,10 +27,10 @@
4+ 'bin/fedpkg',
5+ 'bin/fedpkg-stage',
6+ ],
7+- data_files=[(bash_completion_dir(), ['conf/bash-completion/fedpkg.bash']),
8+- ('/etc/rpkg', ['conf/etc/rpkg/fedpkg.conf',
9++ data_files=[('share/bash-completion/completions', ['conf/bash-completion/fedpkg.bash']),
10++ ('etc/rpkg', ['conf/etc/rpkg/fedpkg.conf',
11+ 'conf/etc/rpkg/fedpkg-stage.conf']),
12+- ('/usr/share/zsh/site-functions', ['conf/zsh-completion/_fedpkg']),
13++ ('share/zsh/site-functions', ['conf/zsh-completion/_fedpkg']),
14+ ],
15+
16+ tests_require=['nose', 'mock'],
pkgs/development/tools/govers/default.nix+3−3
@@ -2,15 +2,15 @@
22
33buildGoPackage rec {
44 name = "govers-${version}";
5− version = "20150109-${stdenv.lib.strings.substring 0 7 rev}";
6− rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9";
5+ version = "20160623-${stdenv.lib.strings.substring 0 7 rev}";
6+ rev = "77fd787551fc5e7ae30696e009e334d52d2d3a43";
77
88 goPackagePath = "github.com/rogpeppe/govers";
99
1010 src = fetchgit {
1111 inherit rev;
1212 url = "https://github.com/rogpeppe/govers";
13− sha256 = "0din5a7nff6hpc4wg0yad2nwbgy4q1qaazxl8ni49lkkr4hyp8pc";
13+ sha256 = "12w83vyi8mgn48fwdm2js693qcydimxapg8rk0yf01w0ab03r5wn";
1414 };
1515
1616 dontRenameImports = true;
pkgs/development/tools/gox/default.nix+3−3
@@ -2,15 +2,15 @@
22
33buildGoPackage rec {
44 name = "gox-${version}";
5− version = "0.4.0";
5+ version = "20181025";
66
77 goPackagePath = "github.com/mitchellh/gox";
88
99 src = fetchFromGitHub {
1010 owner = "mitchellh";
1111 repo = "gox";
12− rev = "v${version}";
13− sha256 = "1q4fdkw904mrmh1q5z8pfd3r0gcn5dm776kldqawddy93iiwnp8r";
12+ rev = "9cc487598128d0963ff9dcc51176e722788ec645";
13+ sha256 = "18indkdwq2m1wy95d71lgbf46jxxrfc5km1fys5laapz993h77v6";
1414 };
1515
1616 goDeps = ./deps.nix;
pkgs/development/tools/profiling/pyflame/default.nixnew file+65
@@ -0,0 +1,65 @@
1+{ stdenv, fetchFromGitHub, autoreconfHook, coreutils, pkgconfig
2+# pyflame needs one python version per ABI
3+# are currently supported
4+# * 2.6 or 2.7 for 2.x ABI
5+# * 3.4 or 3.5 for 3.{4,5} ABI
6+# * 3.6 for 3.6+ ABI
7+# if you want to disable support for some ABI, make the corresponding argument null
8+, python2, python35, python36, python3
9+}:
10+stdenv.mkDerivation rec {
11+ pname = "pyflame";
12+ version = "1.6.7";
13+ src = fetchFromGitHub {
14+ owner = "uber";
15+ repo = "pyflame";
16+ rev = "v${version}";
17+ sha256 = "0hz1ryimh0w8zyxx4y8chcn54d6b02spflj5k9rcg26an2chkg2w";
18+ };
19+
20+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
21+ buildInputs = [ python36 python2 python35 ];
22+
23+ postPatch = ''
24+ patchShebangs .
25+ # some tests will fail in the sandbox
26+ substituteInPlace tests/test_end_to_end.py \
27+ --replace 'skipif(IS_DOCKER' 'skipif(True'
28+
29+ # don't use patchShebangs here to be explicit about the python version
30+ substituteInPlace utils/flame-chart-json \
31+ --replace '#!usr/bin/env python' '#!${python3.interpreter}'
32+ '';
33+
34+ postInstall = ''
35+ install -D utils/flame-chart-json $out/bin/flame-chart-json
36+ '';
37+
38+ doCheck = true;
39+ # reproduces the logic of their test script, but without downloading pytest
40+ # from the internet with pip
41+ checkPhase = with stdenv.lib; concatMapStringsSep "\n" (python: ''
42+ set -x
43+ PYMAJORVERSION=${head (strings.stringToCharacters python.version)} \
44+ PATH=${makeBinPath [ coreutils ]}\
45+ PYTHONPATH= \
46+ ${python.pkgs.pytest}/bin/pytest tests/
47+ set +x
48+ '') (filter (x: x!=null) buildInputs);
49+
50+ meta = with stdenv.lib; {
51+ description = "A ptracing profiler for Python ";
52+ longDescription = ''
53+ Pyflame is a high performance profiling tool that generates flame graphs for
54+ Python. Pyflame uses the Linux ptrace(2) system call to collect profiling
55+ information. It can take snapshots of the Python call stack without
56+ explicit instrumentation, meaning you can profile a program without
57+ modifying its source code.
58+ '';
59+ homepage = https://github.com/uber/pyflame;
60+ license = licenses.asl20;
61+ maintainers = [ maintainers.symphorien ];
62+ # arm: https://github.com/uber/pyflame/issues/136
63+ platforms = [ "i686-linux" "x86_64-linux" ];
64+ };
65+}
pkgs/development/tools/tradcpp/aarch64.patchnew file+12
@@ -0,0 +1,12 @@
1+diff a/config.h b/config.h
2+--- a/config.h
3++++ b/config.h
4+@@ -124,6 +124,8 @@
5+ #define CONFIG_CPU "__ppc64__"
6+ #elif defined(__ARM__)
7+ #define CONFIG_CPU "__ARM__"
8++#elif defined(__aarch64__)
9++#define CONFIG_CPU "__aarch64__"
10+ #else
11+ /* let it go */
12+ #endif
pkgs/development/tools/tradcpp/default.nix+4−1
@@ -11,7 +11,10 @@ stdenv.mkDerivation {
1111 # tradcpp only comes with BSD-make Makefile; the patch adds configure support
1212 buildInputs = [ autoconf ];
1313 preConfigure = "autoconf";
14− patches = [ ./tradcpp-configure.patch ];
14+ patches = [
15+ ./tradcpp-configure.patch
16+ ./aarch64.patch
17+ ];
1518
1619 meta = with stdenv.lib; {
1720 description = "A traditional (K&R-style) C macro preprocessor";
pkgs/games/anki/default.nix+13−2
@@ -4,6 +4,7 @@
44, lib
55, python
66, fetchurl
7+, fetchpatch
78, lame
89, mplayer
910, libpulseaudio
@@ -25,7 +26,7 @@
2526}:
2627
2728buildPythonApplication rec {
28− version = "2.1.6-beta1";
29+ version = "2.1.6-beta2";
2930 name = "anki-${version}";
3031
3132 src = fetchurl {
@@ -35,7 +36,7 @@ buildPythonApplication rec {
3536 # "http://ankisrs.net/download/mirror/${name}.tgz"
3637 # "http://ankisrs.net/download/mirror/archive/${name}.tgz"
3738 ];
38− sha256 = "0yqn8qjx9dyf754jljhyyrk8mahii188nz0yifl1lr3py9sxzbsf";
39+ sha256 = "0h71s1j1269x0b8481z8xf019caqglcjs32xlpzk72087ps169fa";
3940 };
4041
4142 propagatedBuildInputs = [ pyqt5 sqlalchemy
@@ -53,6 +54,16 @@ buildPythonApplication rec {
5354 patches = [
5455 # Disable updated version check.
5556 ./no-version-check.patch
57+
58+ # This is needed to fix python 3.7 compatibilty, where the
59+ # behaviour of `re.escape()` was changed in a way that it no
60+ # longer escapes `%`. This patch detects this difference at
61+ # runtime and makes anki work with any python version.
62+ # Upstream PR: https://github.com/dae/anki/pull/266
63+ (fetchpatch {
64+ url = "https://github.com/dae/anki/commit/3d69aa9ce454a151ba75deafd7de117af2c7307d.patch";
65+ sha256 = "0kf9gajhy0wcajp24xfia71z6gn1mc4vl37svvq4sqbhj3gigd0h";
66+ })
5667 ];
5768
5869 buildPhase = ''
pkgs/games/assaultcube/default.nix+1−2
@@ -8,8 +8,7 @@ stdenv.mkDerivation rec {
88
99 # master branch has legacy (1.2.0.2) protocol 1201 and gcc 6 fix.
1010 pname = "assaultcube";
11− version = "01052017";
12− name = "${pname}-${version}";
11+ version = "unstable-2017-05-01";
1312
1413 meta = {
1514 description = "Fast and fun first-person-shooter based on the Cube fps";
pkgs/games/leela-zero/default.nixnew file+29
@@ -0,0 +1,29 @@
1+{ stdenv, fetchurl, fetchFromGitHub, cmake, boost, eigen
2+, opencl-headers, ocl-icd, qtbase , zlib }:
3+
4+stdenv.mkDerivation rec {
5+ name = "leela-zero-${version}";
6+ version = "0.16";
7+
8+ src = fetchFromGitHub {
9+ owner = "gcp";
10+ repo = "leela-zero";
11+ rev = "v${version}";
12+ sha256 = "1px7wqvlv414gklzgrmppp8wzc2mkskinm1p75j4snbqr8qpbn5s";
13+ fetchSubmodules = true;
14+ };
15+
16+ buildInputs = [ boost opencl-headers ocl-icd qtbase zlib ];
17+
18+ nativeBuildInputs = [ cmake ];
19+
20+ enableParallelBuilding = true;
21+
22+ meta = with stdenv.lib; {
23+ description = "Go engine modeled after AlphaGo Zero";
24+ homepage = https://github.com/gcp/leela-zero;
25+ license = licenses.gpl3;
26+ maintainers = [ maintainers.averelld ];
27+ platforms = platforms.linux;
28+ };
29+}
pkgs/misc/scrcpy/default.nix+19−5
@@ -9,10 +9,10 @@
99}:
1010
1111let
12− version = "1.3";
12+ version = "1.5";
1313 prebuilt_server = fetchurl {
14− url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}.jar";
15− sha256 = "1ha04wfmghblwr9ajfl96cswacfgrk0b7klq2ixfvw1kgwhmm6hg";
14+ url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}-fixversion/scrcpy-server-v${version}.jar";
15+ sha256 = "1pi47khfrs9pygs32l9rj8l927z0sdm8bhkrzzkk6ki9c1psnynr";
1616 };
1717in
1818stdenv.mkDerivation rec {
@@ -21,10 +21,23 @@ stdenv.mkDerivation rec {
2121 src = fetchFromGitHub {
2222 owner = "Genymobile";
2323 repo = "scrcpy";
24− rev = "v${version}";
25− sha256 = "02szi8w3w0lacyz42hlayxififi863qpm63yg9qir3jcl2vs7vdk";
24+ rev = "v${version}-fixversion";
25+ sha256 = "0magmc44pahw1f4jhzkhjlfc31mk3qq43hzn9513idcl4kh4sb8i";
2626 };
2727
28+ # postPatch:
29+ # screen.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly.
30+ # This can happen when running on non-NixOS because then scrcpy seems to have a hard time using the host OpenGL-supporting hardware.
31+ # It would be better to fix the OpenGL problem, but that seems much more intrusive.
32+ #
33+ # command.c: When copying over the prebuilt binary to mobile, it also copies the permissions of the nix store, and thus it cannot delete normally.
34+ postPatch = ''
35+ substituteInPlace app/src/screen.c \
36+ --replace "SDL_RENDERER_ACCELERATED" "SDL_RENDERER_ACCELERATED || SDL_RENDERER_SOFTWARE"
37+ substituteInPlace app/src/command.c \
38+ --replace 'const char *const adb_cmd[] = {"shell", "rm", path};' 'const char *const adb_cmd[] = {"shell", "rm", "-f", path};'
39+ '';
40+
2841 nativeBuildInputs = [ makeWrapper meson ninja pkgconfig ];
2942
3043 buildInputs = [ ffmpeg SDL2 ];
@@ -34,6 +47,7 @@ stdenv.mkDerivation rec {
3447 echo -n > server/meson.build
3548 '';
3649
50+ mesonFlags = ["-Doverride_server_path=${prebuilt_server}"];
3751 postInstall = ''
3852 mkdir -p "$out/share/scrcpy"
3953 ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server.jar"
pkgs/misc/seafile-shared/default.nix+2−2
@@ -1,14 +1,14 @@
11{stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}:
22
33stdenv.mkDerivation rec {
4− version = "6.2.7";
4+ version = "6.2.8";
55 name = "seafile-shared-${version}";
66
77 src = fetchFromGitHub {
88 owner = "haiwen";
99 repo = "seafile";
1010 rev = "v${version}";
11− sha256 = "0f8h7x6q830q4pw6f6bbykiyj3lkdlgvjzg2sdaqm4bhj2c4k1n0";
11+ sha256 = "1sgrsj60gy4pqxjz1rxn4nyzmc67x3kx16kd2vmwbzr44hasnp46";
1212 };
1313
1414 nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ];
pkgs/misc/vim-plugins/generated.nix+237−237
@@ -33,12 +33,12 @@
3333 };
3434
3535 agda-vim = buildVimPluginFrom2Nix {
36− name = "agda-vim-2018-10-29";
36+ name = "agda-vim-2018-11-10";
3737 src = fetchFromGitHub {
3838 owner = "derekelkins";
3939 repo = "agda-vim";
40− rev = "75853188f15175728e938e1e69da8916148d7f7a";
41− sha256 = "1xv3il21fl602hilb3hk1r2bsbnf8brjyv61hprxsj8xd2s36a4d";
40+ rev = "4fefe386a8a85161ace928e2f0e0ab4fe8581505";
41+ sha256 = "1i61wvrpn15qs206rnq9bbwgv6wxf76p5j79v2fabh06lyw4dn3q";
4242 };
4343 };
4444
@@ -53,12 +53,12 @@
5353 };
5454
5555 ale = buildVimPluginFrom2Nix {
56− name = "ale-2018-10-31";
56+ name = "ale-2018-11-30";
5757 src = fetchFromGitHub {
5858 owner = "w0rp";
5959 repo = "ale";
60− rev = "4b841b55869e3ec5b02806f9b2fe962ffdca2750";
61− sha256 = "0wa8phv4b6n1akaii8qy9c0lr17vm4bqgz5chjx28zs73jfxsf2i";
60+ rev = "1d4f98553852499e0f8ebd951db6ada2b1d973e3";
61+ sha256 = "112i5722364xi8vsipwi9wvrxnzzvisfwbzwqmk01ag0lnlj2qg4";
6262 };
6363 };
6464
@@ -113,12 +113,12 @@
113113 };
114114
115115 base16-vim = buildVimPluginFrom2Nix {
116− name = "base16-vim-2018-10-08";
116+ name = "base16-vim-2018-11-30";
117117 src = fetchFromGitHub {
118118 owner = "chriskempson";
119119 repo = "base16-vim";
120− rev = "7e9af12d680d81cc1277c07ef5acee8c83828f3f";
121− sha256 = "1al00wf0bf61r0bfsfbq8g2qq8sbzj6z8c85787d3qfinvniz0cl";
120+ rev = "2073e2dd9fa0172ccdba92b3f0df25642a69f7db";
121+ sha256 = "1d6d2aca73rvhz7gpi2d1g2il9qy45pfw1kbrrqgvmik016i6l1y";
122122 };
123123 };
124124
@@ -133,22 +133,22 @@
133133 };
134134
135135 calendar-vim = buildVimPluginFrom2Nix {
136− name = "calendar-vim-2018-10-23";
136+ name = "calendar-vim-2018-11-02";
137137 src = fetchFromGitHub {
138138 owner = "itchyny";
139139 repo = "calendar.vim";
140− rev = "3c6a7677543824aab0eb9946d376fe5d45a935c5";
141− sha256 = "0jnk2hi9n1p7fqclifiyckrcady6fbkag6z29v7n6bbzhvz0qzzs";
140+ rev = "8f6c29be2a20af974ff907876a4b6ba9581c346f";
141+ sha256 = "14rvav878ya0a0j5jic9zap5r5ccwdhg26rypjnn8rqnkra2f99a";
142142 };
143143 };
144144
145145 caw-vim = buildVimPluginFrom2Nix {
146− name = "caw-vim-2018-09-22";
146+ name = "caw-vim-2018-11-07";
147147 src = fetchFromGitHub {
148148 owner = "tyru";
149149 repo = "caw.vim";
150− rev = "2b88f9978b25892d918d8c7b564d3e05fc24656f";
151− sha256 = "1njbyg5l4k6f0fnpfwg058rwyffxj43jf4lsfai5gjl3dckk9yw4";
150+ rev = "e186d64b6f5f8c39c15eb07f0e2798ce05d25fe3";
151+ sha256 = "1wakgc5q2yj1gymn18ri660rwdwvrb1j5d6j8mr189gnhkr9isk4";
152152 };
153153 };
154154
@@ -314,12 +314,12 @@
314314 };
315315
316316 ctrlp-vim = buildVimPluginFrom2Nix {
317− name = "ctrlp-vim-2018-10-28";
317+ name = "ctrlp-vim-2018-11-22";
318318 src = fetchFromGitHub {
319319 owner = "ctrlpvim";
320320 repo = "ctrlp.vim";
321− rev = "5e40e555d31d9cce2188d9fa724d1debcad28aa6";
322− sha256 = "1skn8p527541w1kynk08dfpai2wlbmylw5sa4z2b7kmmnxa1lq47";
321+ rev = "e953ee7a80dc96cd00c20ed6fe82e0e817d977ff";
322+ sha256 = "1qnh4w9wb0r7lf5sw37kq29rq887hihga3cxw766mk8rwb2ad3kv";
323323 };
324324 };
325325
@@ -344,12 +344,12 @@
344344 };
345345
346346 denite-nvim = buildVimPluginFrom2Nix {
347− name = "denite-nvim-2018-10-28";
347+ name = "denite-nvim-2018-11-23";
348348 src = fetchFromGitHub {
349349 owner = "Shougo";
350350 repo = "denite.nvim";
351− rev = "0a089bb122eb88e182420334a4f1df0c22917856";
352− sha256 = "1virb8lr591jbzmb91dhki32jx9g15a89dsxbh0vy9lcawaikypj";
351+ rev = "db2d7c307e70a4575baea3097e0977b59696e855";
352+ sha256 = "1l1ny781c1glqwkkhny5d80z186l485ixkwlshcyrmd8p8wnfb6m";
353353 };
354354 };
355355
@@ -375,23 +375,23 @@
375375 };
376376
377377 deoplete-go = buildVimPluginFrom2Nix {
378− name = "deoplete-go-2018-10-20";
378+ name = "deoplete-go-2018-11-23";
379379 src = fetchFromGitHub {
380380 owner = "zchee";
381381 repo = "deoplete-go";
382− rev = "8bb6d5f51ca825ef88d474c8aa9231692d6c2961";
383− sha256 = "15qwhkx24m7drahksrsvvpdzj9wpm0k1722ry6sdwgd40q8d3jrh";
382+ rev = "75f3d42ef71a07c06778cab56e76b994a42a55c3";
383+ sha256 = "1b42mcflc5fzi0fhgr99cyrdapbd79gcwgb4qnqg6b8bbn488kyv";
384384 fetchSubmodules = true;
385385 };
386386 };
387387
388388 deoplete-jedi = buildVimPluginFrom2Nix {
389− name = "deoplete-jedi-2018-10-24";
389+ name = "deoplete-jedi-2018-11-21";
390390 src = fetchFromGitHub {
391391 owner = "zchee";
392392 repo = "deoplete-jedi";
393− rev = "4ffb3a5ace39143813d63c7f78137bf8478b91e9";
394− sha256 = "1fik8snm6f7f337qidlkkhgri756rgyaswk3ndfiqw5vj673r4dw";
393+ rev = "9d9796a53ae402e469fa5ea8766102ba40259230";
394+ sha256 = "1dpczpzwvjlmszaia5i90bj4q62va3dckw6rjgy1j3lzj7w2izaf";
395395 fetchSubmodules = true;
396396 };
397397 };
@@ -417,83 +417,83 @@
417417 };
418418
419419 deoplete-ternjs = buildVimPluginFrom2Nix {
420− name = "deoplete-ternjs-2018-06-05";
420+ name = "deoplete-ternjs-2018-11-29";
421421 src = fetchFromGitHub {
422422 owner = "carlitux";
423423 repo = "deoplete-ternjs";
424− rev = "4b6276019a1491cc5003a0b007ca1aaeab671f57";
425− sha256 = "0v5033r75qxnhgmm0czxgwps0khbx1sn2dc7nsrscp441h5sgz6i";
424+ rev = "ebdc48ecd29f8cae0659e5cdd2c30bd869839ca8";
425+ sha256 = "19zlgnavlqqq4rqwa1j1wglg921xdjhy8c71wfgh5492gmm1vr5x";
426426 };
427427 };
428428
429429 deoplete-nvim = buildVimPluginFrom2Nix {
430− name = "deoplete-nvim-2018-10-28";
430+ name = "deoplete-nvim-2018-11-28";
431431 src = fetchFromGitHub {
432432 owner = "Shougo";
433433 repo = "deoplete.nvim";
434− rev = "aa43a5f03b7b995841b416c40e8bbc8bcbf9b1a2";
435− sha256 = "1ixjrf1rrdznfprd9w5fx86k0ni67c9amgvwwbbzhqz3i1zgwc3g";
434+ rev = "acae3732524443ecb53af2f4c8078af47381a180";
435+ sha256 = "0qm0plgri6bf4bm6mvhqkpl075gdr03n5939vi99v4wy3iymh5w5";
436436 };
437437 };
438438
439439 dhall-vim = buildVimPluginFrom2Nix {
440− name = "dhall-vim-2018-10-25";
440+ name = "dhall-vim-2018-12-02";
441441 src = fetchFromGitHub {
442442 owner = "vmchale";
443443 repo = "dhall-vim";
444− rev = "aac9deeb695c810fee8a702fc5fca99a26f1d4bd";
445− sha256 = "17avn55dixv0rxhc3jzpnadkvldrbq7r81nwgnzi4xlr3fjxjwfc";
444+ rev = "caec6efbfc537f1a3a7bf6c5b0f6ab9cffa6911c";
445+ sha256 = "0r9jd6pq94sjrsppa1avm4x01y01m9vv64p89l32vrpkrczgxgfa";
446446 };
447447 };
448448
449449 direnv-vim = buildVimPluginFrom2Nix {
450− name = "direnv-vim-2017-12-29";
450+ name = "direnv-vim-2018-11-10";
451451 src = fetchFromGitHub {
452452 owner = "direnv";
453453 repo = "direnv.vim";
454− rev = "4d6271f0facd57a478c0d02895775dc01f577c5c";
455− sha256 = "1vfg4hrxbqc96w694cn9gzjvwkscd111fp6dqlh7wpd2z3ciw07h";
454+ rev = "f93eac061ce211d701e2269418d7e55dc6bab5ca";
455+ sha256 = "1nfizxzscyq8rqln3hfj648vzavlisgnjay2m6gnd29lnymqrr8l";
456456 };
457457 };
458458
459459 echodoc-vim = buildVimPluginFrom2Nix {
460− name = "echodoc-vim-2018-10-20";
460+ name = "echodoc-vim-2018-11-26";
461461 src = fetchFromGitHub {
462462 owner = "Shougo";
463463 repo = "echodoc.vim";
464− rev = "3fa121e0a0abee0762867a01b25f4e891594da6e";
465− sha256 = "17qckl9x1yd70zxgwvpkh5nwx8zs5f6d8xismd0rbpigd08qd06q";
464+ rev = "1cad58aed10e999b64008fed12401d5919552863";
465+ sha256 = "15ndcaypw10jrdmscgrh969lrhb6jhh43d6a4ymam16ljg5590z2";
466466 };
467467 };
468468
469469 editorconfig-vim = buildVimPluginFrom2Nix {
470− name = "editorconfig-vim-2018-10-14";
470+ name = "editorconfig-vim-2018-11-15";
471471 src = fetchFromGitHub {
472472 owner = "editorconfig";
473473 repo = "editorconfig-vim";
474− rev = "736451ae203c5e3bcce39f1be11d68009b783d82";
475− sha256 = "01j2y02z23ylydkm7yij2m9nimk54m06ik2hyldj99yz8qi5vp18";
474+ rev = "68f8136d2b018bfa9b23403e87d3d65bc942cbc3";
475+ sha256 = "1xnh4b1yf6vgqla4g8vbsvbfkvgx7wzffl5lq7jxwx8rsl0a8nza";
476476 fetchSubmodules = true;
477477 };
478478 };
479479
480480 elm-vim = buildVimPluginFrom2Nix {
481− name = "elm-vim-2018-06-18";
481+ name = "elm-vim-2018-11-13";
482482 src = fetchFromGitHub {
483483 owner = "elmcast";
484484 repo = "elm-vim";
485− rev = "e51e2e43ad617c26205a84453481d3ac152c8fec";
486− sha256 = "09bgfjnpa1s25x5wnxry9lmsly92s0mazn1sl0vg2wfgphf67m6b";
485+ rev = "d22c0ba13afb554257a8c176962e2216cc18edd1";
486+ sha256 = "03lmbv4zkjdnyzrna7g9pqdgf3jqhi9g59fzjnay4af59hijs1v3";
487487 };
488488 };
489489
490490 emmet-vim = buildVimPluginFrom2Nix {
491− name = "emmet-vim-2018-10-06";
491+ name = "emmet-vim-2018-11-29";
492492 src = fetchFromGitHub {
493493 owner = "mattn";
494494 repo = "emmet-vim";
495− rev = "7a4bf3463ef1e2c08393218fc67a8729c00948a5";
496− sha256 = "15y5h7b6ll7nngaq9i44xb88rw2jg5ahbvybdn7kdf0nq1m3z409";
495+ rev = "e6fb10d22a9bd2a02c386c81486a065e71c6a92d";
496+ sha256 = "0fadqgvirmdl1acb39v05q2sw24fc40w4bcj05f4maj4lqbxkwqv";
497497 fetchSubmodules = true;
498498 };
499499 };
@@ -509,12 +509,12 @@
509509 };
510510
511511 falcon = buildVimPluginFrom2Nix {
512− name = "falcon-2018-09-15";
512+ name = "falcon-2018-11-30";
513513 src = fetchFromGitHub {
514514 owner = "fenetikm";
515515 repo = "falcon";
516− rev = "0dbdbf568321bc29ac143370d1b75dc651fd083f";
517− sha256 = "0scds1fc433qcnghxplczama83w65iza9dhq3qnyhr085hyisck3";
516+ rev = "070f2132266d85059f36496ed277527d5b8f00a1";
517+ sha256 = "0jzibr1k0l4kbhlg7398fln6rmpwayjbj0hpy4v84gr51pa2di5r";
518518 };
519519 };
520520
@@ -580,12 +580,12 @@
580580 };
581581
582582 fzf-vim = buildVimPluginFrom2Nix {
583− name = "fzf-vim-2018-10-22";
583+ name = "fzf-vim-2018-11-27";
584584 src = fetchFromGitHub {
585585 owner = "junegunn";
586586 repo = "fzf.vim";
587− rev = "50707b089b1c61fcdb300ec1ecbc4249ead4af11";
588− sha256 = "1h0x701jcj2zwyzaxlzzfax3z8jxrn255wawxcjw9fskz9kldd68";
587+ rev = "95f025ef2dbc8fedf124521904a80c1879acd359";
588+ sha256 = "0g382ikl9vyxfrwx86nrk4chrn75kwpjx4gbxrjsbxxzxbplhnjc";
589589 };
590590 };
591591
@@ -600,22 +600,22 @@
600600 };
601601
602602 gist-vim = buildVimPluginFrom2Nix {
603− name = "gist-vim-2016-10-10";
603+ name = "gist-vim-2018-11-09";
604604 src = fetchFromGitHub {
605605 owner = "mattn";
606606 repo = "gist-vim";
607− rev = "f0d63579eab7548cf12f979dc52ef5a370ecbe63";
608− sha256 = "06nix49j4inxy3rkcv32f4ka89g4crqwfqnrm3b76iwwky8m2p17";
607+ rev = "3abf2444bb6a7744a64b4a2c2b02d6761a7de072";
608+ sha256 = "197j6bhyfggxka9mycyk3mr6sawf7rnaz74csk47d2qlkfs4zf0v";
609609 };
610610 };
611611
612612 gitv = buildVimPluginFrom2Nix {
613− name = "gitv-2018-06-10";
613+ name = "gitv-2018-11-24";
614614 src = fetchFromGitHub {
615615 owner = "gregsexton";
616616 repo = "gitv";
617− rev = "41e4ffdbdb02374412d03c5680906ebee84dd5a2";
618− sha256 = "1wfp3kkcvrccq0dqplg3ymyz9vdwn1c5wabh6mwfzbs2zx01vwcn";
617+ rev = "38daefcbb4375f79396c81860f077264fe9a3ae4";
618+ sha256 = "19v1v1wb1shh50if1jgiqy4bvja1lv6zy1fald3c48zl9303x8gq";
619619 };
620620 };
621621
@@ -750,33 +750,33 @@
750750 };
751751
752752 jedi-vim = buildVimPluginFrom2Nix {
753− name = "jedi-vim-2018-10-14";
753+ name = "jedi-vim-2018-11-08";
754754 src = fetchFromGitHub {
755755 owner = "davidhalter";
756756 repo = "jedi-vim";
757− rev = "b6dfc5fd49c26d4dbe9f54c814956567a7a9b3a8";
758− sha256 = "11wvynjl1m23vdp4wvirhmm7vnpji5affbyhwz67yjkvh6c42xqa";
757+ rev = "2f65c636f83139b9982b1c1c90cb7f34915ad815";
758+ sha256 = "02sdgczj7r19xvni1xd7kf3rhibxx36zsca42wjb605s6qgmkvph";
759759 fetchSubmodules = true;
760760 };
761761 };
762762
763763 Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix {
764− name = "Jenkinsfile-vim-syntax-2018-09-25";
764+ name = "Jenkinsfile-vim-syntax-2018-11-25";
765765 src = fetchFromGitHub {
766766 owner = "martinda";
767767 repo = "Jenkinsfile-vim-syntax";
768− rev = "030cd312f7de1786bb5a1f392fa59f7a105054df";
769− sha256 = "17lw8rd2fhybwkhrz8lg1p7b552ki669kr2wlpjb6agkgaiifj8q";
768+ rev = "57c50f21de4a710d7f1c1e50d7ecc7e8d5301cec";
769+ sha256 = "0my1zpw5g2bjyx0d027a8klys7kgqg51n9pi773bhk0smqwmfp2b";
770770 };
771771 };
772772
773773 julia-vim = buildVimPluginFrom2Nix {
774− name = "julia-vim-2018-10-21";
774+ name = "julia-vim-2018-11-23";
775775 src = fetchFromGitHub {
776776 owner = "JuliaEditorSupport";
777777 repo = "julia-vim";
778− rev = "934618a71bcf64ff0fb94780dc1aefa58e81470a";
779− sha256 = "1pw4snax7ibxhd8xff41lb86vk7a38yrcq85p89sis6nln6larq5";
778+ rev = "e6eca5e4ab8d7b716d768c2746b42bf1f15af82d";
779+ sha256 = "1wq5wnz5c0s6iqn34913xpk32d3n3cdh3xb01rws5psv6lri2kka";
780780 };
781781 };
782782
@@ -801,12 +801,12 @@
801801 };
802802
803803 lightline-vim = buildVimPluginFrom2Nix {
804− name = "lightline-vim-2018-09-17";
804+ name = "lightline-vim-2018-11-24";
805805 src = fetchFromGitHub {
806806 owner = "itchyny";
807807 repo = "lightline.vim";
808− rev = "47765c787ddc981c2eab6105ade84067d164893c";
809− sha256 = "1r5xpss99jfkvc5dngg877dhmirwnrwppql7ysbab50wfx4hv5c6";
808+ rev = "688240e0ef849cdc8457822658cedf10358c75d6";
809+ sha256 = "1rv8cj553h7w9y61vswq7s9hfmr5h2vxghqrkcsr6vvn7fy6smiv";
810810 };
811811 };
812812
@@ -861,12 +861,12 @@
861861 };
862862
863863 ncm2 = buildVimPluginFrom2Nix {
864− name = "ncm2-2018-10-15";
864+ name = "ncm2-2018-11-17";
865865 src = fetchFromGitHub {
866866 owner = "ncm2";
867867 repo = "ncm2";
868− rev = "4aaf9e1e313109d32fd2b64a5299416357d901b2";
869− sha256 = "09rg3pa0yirhsn1x558k3bzh6fyy4whnfqlm89wvmzxw6rm8xnpw";
868+ rev = "07aaaaa143a1dff32c2fbc967f4bc574cf40cb03";
869+ sha256 = "1vi6dprwzrknnmqxp47hacc9gaa9bafdzm5ihs09yg3rwi0drjbl";
870870 };
871871 };
872872
@@ -921,12 +921,12 @@
921921 };
922922
923923 neco-look = buildVimPluginFrom2Nix {
924− name = "neco-look-2018-01-21";
924+ name = "neco-look-2018-11-09";
925925 src = fetchFromGitHub {
926926 owner = "ujihisa";
927927 repo = "neco-look";
928− rev = "4ead88e70f359fb9cef6537ed9c336b7673c1b4c";
929− sha256 = "1lszbif7ymdjch1ypnr1nihs6gfbhb86sj6nz3dwrbgsl454nnrj";
928+ rev = "8c3951acb93b72dda4572859928ef7b372485596";
929+ sha256 = "1gd692yc1x3753rxg58hwc7nwmm4rjr03y1xaczy1qahq1bm9a40";
930930 };
931931 };
932932
@@ -951,12 +951,12 @@
951951 };
952952
953953 neocomplete-vim = buildVimPluginFrom2Nix {
954− name = "neocomplete-vim-2018-03-28";
954+ name = "neocomplete-vim-2018-11-19";
955955 src = fetchFromGitHub {
956956 owner = "Shougo";
957957 repo = "neocomplete.vim";
958− rev = "4be617947f3fcf2d725fab20b0e12f8b46c9e2f3";
959− sha256 = "00ns46gy726w74nmnzhqnyh10jnpr04453v3rclswxgcvgma82b8";
958+ rev = "d3b4d2860ec34648a2d6df4631718a6a7cfa5d40";
959+ sha256 = "0fqlnh2786wc9barmfz42z7qcp3cly82jhzrwhrx15z4sw4sbjsq";
960960 };
961961 };
962962
@@ -991,22 +991,22 @@
991991 };
992992
993993 neomake = buildVimPluginFrom2Nix {
994− name = "neomake-2018-10-29";
994+ name = "neomake-2018-12-02";
995995 src = fetchFromGitHub {
996996 owner = "benekastah";
997997 repo = "neomake";
998− rev = "c15d51ea9f622b8bce469a18833a6ac64f6a1193";
999− sha256 = "1l15y0di6k4v0vrwpd86lp2n5ljfjnzncgpxwmbhqb2xznr7caq7";
998+ rev = "bbdd0847ef06e3a1b7fe9ea2bec8dd9fbd9068f7";
999+ sha256 = "17l15i9zgwv7m802k4zpv53116zbg0fsl6kqy83aql2xn8yr1amy";
10001000 };
10011001 };
10021002
10031003 neomru-vim = buildVimPluginFrom2Nix {
1004− name = "neomru-vim-2017-10-01";
1004+ name = "neomru-vim-2018-11-29";
10051005 src = fetchFromGitHub {
10061006 owner = "Shougo";
10071007 repo = "neomru.vim";
1008− rev = "97540f54fa20b94daf306f0c1f3cce983bbf7a1d";
1009− sha256 = "15d5hmh5v3hnjnfb5736n45rh5nyq41vqjp1cz4ls2rxmmfi3xa7";
1008+ rev = "0126deb4d38b497e3c81e5226b275392c1dbce3a";
1009+ sha256 = "048avhjld8nwdvxcvxnwrbfyps4ialq8zbjmaj6qg06327wbwk89";
10101010 };
10111011 };
10121012
@@ -1021,22 +1021,22 @@
10211021 };
10221022
10231023 neosnippet-vim = buildVimPluginFrom2Nix {
1024− name = "neosnippet-vim-2018-10-23";
1024+ name = "neosnippet-vim-2018-11-10";
10251025 src = fetchFromGitHub {
10261026 owner = "Shougo";
10271027 repo = "neosnippet.vim";
1028− rev = "32583e605ebe96bba805bdf0d526b951345c8b3e";
1029− sha256 = "105jnnw35ffxwx6zqazh6rizwqdndqc3n656xhljfng33c0lr5mk";
1028+ rev = "9f87934708db75cfafd3ec957c11cfe190281c5f";
1029+ sha256 = "03frmqsxw047j4im2gacr8xiarck6dwpp32b0hza39bmsimc09m7";
10301030 };
10311031 };
10321032
10331033 neoyank-vim = buildVimPluginFrom2Nix {
1034− name = "neoyank-vim-2018-10-17";
1034+ name = "neoyank-vim-2018-11-08";
10351035 src = fetchFromGitHub {
10361036 owner = "Shougo";
10371037 repo = "neoyank.vim";
1038− rev = "ba337d80769c4f2f19c04df4349a196f52fe5094";
1039− sha256 = "0sq595xlijz6xsil2z21kf4662cvmzzm6bsvysfz43wgl16dd5s6";
1038+ rev = "ecce36986f02358bd4377c52a61bfebe0287fce0";
1039+ sha256 = "0pf82pb3mm2pgi6nc6s3a3jzlfgi7c80qr9x7bc6ddzkhw1v92jn";
10401040 };
10411041 };
10421042
@@ -1051,22 +1051,22 @@
10511051 };
10521052
10531053 nerdtree = buildVimPluginFrom2Nix {
1054− name = "nerdtree-2018-10-31";
1054+ name = "nerdtree-2018-11-29";
10551055 src = fetchFromGitHub {
10561056 owner = "scrooloose";
10571057 repo = "nerdtree";
1058− rev = "8d005db94f8d1a214d172aeb1008d016c3d201e2";
1059− sha256 = "0f8dljl45ph668kwjf0py0891i3aqfdijplarxnblbkp2zn5ij7g";
1058+ rev = "c905a5d7b87051e574c2e72fae57e56c456ba2f4";
1059+ sha256 = "178nv2jbxn7a8m1amy075m1iwif9bnj9cfz278rzj7i5fr50gqp8";
10601060 };
10611061 };
10621062
10631063 nerdtree-git-plugin = buildVimPluginFrom2Nix {
1064− name = "nerdtree-git-plugin-2017-03-12";
1064+ name = "nerdtree-git-plugin-2018-11-15";
10651065 src = fetchFromGitHub {
10661066 owner = "albfan";
10671067 repo = "nerdtree-git-plugin";
1068− rev = "d79a5d5a1b3bc5fab3ba94db44a8b2e5a211d61d";
1069− sha256 = "0i77wijbr021zfv096ja15f5l52phvsd5gziqn1m3k60qkmb9gkj";
1068+ rev = "8931d911fac1b5958ef084accee43c03a8c72485";
1069+ sha256 = "1yv465afdf9wm65q335mx816wxmg1zzwj4gls2hsbxqymzm3l6br";
10701070 };
10711071 };
10721072
@@ -1111,12 +1111,12 @@
11111111 };
11121112
11131113 nvimdev-nvim = buildVimPluginFrom2Nix {
1114− name = "nvimdev-nvim-2018-10-05";
1114+ name = "nvimdev-nvim-2018-11-07";
11151115 src = fetchFromGitHub {
11161116 owner = "neovim";
11171117 repo = "nvimdev.nvim";
1118− rev = "ef05db6817d8083f8daf9ddd99b79acc364d57a6";
1119− sha256 = "1c44pwsjllhcmlabz9pc9qb5p6lgilfzdsx4rcjc8q8ixijc7w99";
1118+ rev = "2acfca2a9a55fd66a235cf2e6f602ba1d46add25";
1119+ sha256 = "164pmlnqkrbffkcx5fha40w75dq1ydx5226shrghwp9ag9kwdvav";
11201120 };
11211121 };
11221122
@@ -1131,12 +1131,12 @@
11311131 };
11321132
11331133 open-browser-vim = buildVimPluginFrom2Nix {
1134− name = "open-browser-vim-2018-04-26";
1134+ name = "open-browser-vim-2018-11-29";
11351135 src = fetchFromGitHub {
11361136 owner = "tyru";
11371137 repo = "open-browser.vim";
1138− rev = "de4eeb085051e9b56dd5574eba7c7e72feb21246";
1139− sha256 = "1fgp4wwizpknfwscxraqqaxrhvwp9l1mnjwj3llk2x0n9qcqf1db";
1138+ rev = "b900ff9d39bb36891704bd0fe76737ee3a7ac2b9";
1139+ sha256 = "1sws0pzm13cgl7mf6938xjmh23hk02agf23zfx5rdb4d2lcn4ir3";
11401140 };
11411141 };
11421142
@@ -1261,12 +1261,12 @@
12611261 };
12621262
12631263 ranger-vim = buildVimPluginFrom2Nix {
1264− name = "ranger-vim-2018-09-13";
1264+ name = "ranger-vim-2018-11-30";
12651265 src = fetchFromGitHub {
12661266 owner = "rafaqz";
12671267 repo = "ranger.vim";
1268− rev = "63e22fd424107579aaf782f3b2c83d76a691fdeb";
1269− sha256 = "1337il7j45ydb432qnmaqcz8bigwny752nrl6c2vsc0qv3xd11ls";
1268+ rev = "9ba30ca2f219bc0eaa02102573de8f8ba33078f2";
1269+ sha256 = "0dccb5rsvazqlxiqcwxb8w4093j9c2klgd30d90nf7vaz40a4988";
12701270 };
12711271 };
12721272
@@ -1321,12 +1321,12 @@
13211321 };
13221322
13231323 rust-vim = buildVimPluginFrom2Nix {
1324− name = "rust-vim-2018-10-26";
1324+ name = "rust-vim-2018-11-29";
13251325 src = fetchFromGitHub {
13261326 owner = "rust-lang";
13271327 repo = "rust.vim";
1328− rev = "039b7c7c4f0b9fec9879027d6700229c33daae3e";
1329− sha256 = "09g9q91qvbrrb2hrybdw6p8jm3q3v9j9yffpm9q0nz6g8p6zi8xq";
1328+ rev = "fabad27559c5bde02e0f0a855d07d9dda9aef9a9";
1329+ sha256 = "0b05hn75ahhk2yz5mgjn2vr68391f53cdfdrav23zx0jfqibd4vf";
13301330 };
13311331 };
13321332
@@ -1421,12 +1421,12 @@
14211421 };
14221422
14231423 syntastic = buildVimPluginFrom2Nix {
1424− name = "syntastic-2018-10-18";
1424+ name = "syntastic-2018-11-24";
14251425 src = fetchFromGitHub {
14261426 owner = "scrooloose";
14271427 repo = "syntastic";
1428− rev = "89e485c7f8b1f285b43bb397394f22b79021aac1";
1429− sha256 = "0xy54pllpr2bn1wp2fhq5nwrjpcclp61mhzls99cbzzpxfiwirlz";
1428+ rev = "0d25f4fb4203e600a28e776847d4beca254d3f84";
1429+ sha256 = "1c3icnpbl7wrgqs67dc1pl7942za01mhsl7fwrcb0njwqkhmkamp";
14301430 };
14311431 };
14321432
@@ -1481,12 +1481,12 @@
14811481 };
14821482
14831483 targets-vim = buildVimPluginFrom2Nix {
1484− name = "targets-vim-2018-10-24";
1484+ name = "targets-vim-2018-11-01";
14851485 src = fetchFromGitHub {
14861486 owner = "wellle";
14871487 repo = "targets.vim";
1488− rev = "19586689fab6f1ff81743a675645f62adf745b0b";
1489− sha256 = "0bvx3dynbsralywkhsi9yjr188ayczp263di3y00dzwymxh7m1p5";
1488+ rev = "4a5e9c09ec2ba63c8cd16b433453e41c22efab22";
1489+ sha256 = "1fi1mrbqk23i6vrm9i0y9b7hdvg90fpk3gr36lr7mmpqf3p902aj";
14901490 };
14911491 };
14921492
@@ -1591,42 +1591,42 @@
15911591 };
15921592
15931593 unite-vim = buildVimPluginFrom2Nix {
1594− name = "unite-vim-2018-09-26";
1594+ name = "unite-vim-2018-12-03";
15951595 src = fetchFromGitHub {
15961596 owner = "Shougo";
15971597 repo = "unite.vim";
1598− rev = "e68ccde4192b3faa3717897e65dc7dd8ab87524a";
1599− sha256 = "1r22lwzs92ylzl0hs0ny36vr787jwkf65da9dv0zvz2p5ank5ykw";
1598+ rev = "77ae78f277896bc560a46a27a51c49f04b6d4ce1";
1599+ sha256 = "06asqf2hkszz4i9c676jvax6gbqzrcpqckjjb0dy175vifsiclnv";
16001600 };
16011601 };
16021602
16031603 verilog_systemverilog-vim = buildVimPluginFrom2Nix {
1604− name = "verilog_systemverilog-vim-2018-10-22";
1604+ name = "verilog_systemverilog-vim-2018-11-18";
16051605 src = fetchFromGitHub {
16061606 owner = "vhda";
16071607 repo = "verilog_systemverilog.vim";
1608− rev = "4809e36569363bc3b44c981cda842d5bb31e95ff";
1609− sha256 = "124ak7596b19rz4vk2f05z6wkfhfrlawlz0y4am8fm4y1mdxsprm";
1608+ rev = "c1d30130cdf3420fa9043e4b875a63eebb868f02";
1609+ sha256 = "1hrlzqmpyvjciczcijaag53ms1wn4i2f10irjlm0c3wynsxx9khp";
16101610 };
16111611 };
16121612
16131613 vim = buildVimPluginFrom2Nix {
1614− name = "vim-2018-10-30";
1614+ name = "vim-2018-11-25";
16151615 src = fetchFromGitHub {
16161616 owner = "dracula";
16171617 repo = "vim";
1618− rev = "66755a9cb9bdea62720812a1165132de6ff62468";
1619− sha256 = "0zca3spgnf00rxa0h5x79ydycz41b0xli7bgwpnbxannzxqswhiy";
1618+ rev = "f24e259073994b4f76d125332954d26748fcc581";
1619+ sha256 = "13xpw4b75ws5h2s5x2rahz39sl13pzz7h4yv3lq6azw9m2msy0v6";
16201620 };
16211621 };
16221622
16231623 vim-abolish = buildVimPluginFrom2Nix {
1624− name = "vim-abolish-2018-10-25";
1624+ name = "vim-abolish-2018-11-25";
16251625 src = fetchFromGitHub {
16261626 owner = "tpope";
16271627 repo = "vim-abolish";
1628− rev = "56a76a8c10ca91f3e8f0a2cd9afa2be32d262e24";
1629− sha256 = "087l7mvb0rzcdfmrmng82s0abli6w2i4cbyiwps9k588sfcj0w7h";
1628+ rev = "b95463a1cffd8fc9aff2a1ff0ae9327944948699";
1629+ sha256 = "1cvhylz6hgvl63zhlrxqrjqqp07pm29i436xv33dzzhdp8dcj1mp";
16301630 };
16311631 };
16321632
@@ -1821,22 +1821,22 @@
18211821 };
18221822
18231823 vim-airline = buildVimPluginFrom2Nix {
1824− name = "vim-airline-2018-11-01";
1824+ name = "vim-airline-2018-11-22";
18251825 src = fetchFromGitHub {
18261826 owner = "vim-airline";
18271827 repo = "vim-airline";
1828− rev = "6516b1b4dccef543d489177431050fe8a5c5c99c";
1829− sha256 = "0x4vdxz31vqyd3qy8vr4gcdc649nz72axris5fxj8ln5zphlr6ll";
1828+ rev = "bd468dacfe874fd669ec69522b550d3e1371cf56";
1829+ sha256 = "0a92a42xnx0rif7r85mrp7jhzmlnbaiqafpc8bn1848bbq9wg880";
18301830 };
18311831 };
18321832
18331833 vim-airline-themes = buildVimPluginFrom2Nix {
1834− name = "vim-airline-themes-2018-10-25";
1834+ name = "vim-airline-themes-2018-11-15";
18351835 src = fetchFromGitHub {
18361836 owner = "vim-airline";
18371837 repo = "vim-airline-themes";
1838− rev = "65217b41da31f05d305b819f2a42a803dd0db434";
1839− sha256 = "1pv9plmbmygcnkbkdjp7gr3rp42zdh4qkmv2cfbndhdfx4yd331g";
1838+ rev = "3bfe1d00d48f7c35b7c0dd7af86229c9e63e14a9";
1839+ sha256 = "1zwygmwa7gqppa49d2rsdwk5zv8rzj059bbclhs492bmbb5wyyz8";
18401840 };
18411841 };
18421842
@@ -1921,12 +1921,12 @@
19211921 };
19221922
19231923 vim-closetag = buildVimPluginFrom2Nix {
1924− name = "vim-closetag-2018-09-03";
1924+ name = "vim-closetag-2018-11-07";
19251925 src = fetchFromGitHub {
19261926 owner = "alvan";
19271927 repo = "vim-closetag";
1928− rev = "8c71d524d98be4f3c6c1e4ff6ddf6b9f422220bb";
1929− sha256 = "1w42qzcw33akycgqj8v60l2yfilhhy9j0zw6rifa66d58xaiv6jy";
1928+ rev = "6fe822a730d4a5774ce6ffbb3bd88062e18ada9a";
1929+ sha256 = "1pa0dpb6d20acvlkgpcjb358m658q23666m567lvs849bjzsdlwp";
19301930 };
19311931 };
19321932
@@ -1971,12 +1971,12 @@
19711971 };
19721972
19731973 vim-colorschemes = buildVimPluginFrom2Nix {
1974− name = "vim-colorschemes-2017-08-22";
1974+ name = "vim-colorschemes-2018-11-20";
19751975 src = fetchFromGitHub {
19761976 owner = "flazz";
19771977 repo = "vim-colorschemes";
1978− rev = "eab315701f4627967fd62582eefc4e37a3745786";
1979− sha256 = "12jfqfs6lqd6jijxrdx3k76bzxrh9517zwczb73qjaqbg286fh5k";
1978+ rev = "2f532d0564534accf09cecfa9a1e3639865367ee";
1979+ sha256 = "0d96slqnnn1vahzham3syd904rk2iwn9py4brzas9x09k1qw2gb3";
19801980 };
19811981 };
19821982
@@ -2001,12 +2001,12 @@
20012001 };
20022002
20032003 vim-css-color = buildVimPluginFrom2Nix {
2004− name = "vim-css-color-2018-10-20";
2004+ name = "vim-css-color-2018-11-20";
20052005 src = fetchFromGitHub {
20062006 owner = "ap";
20072007 repo = "vim-css-color";
2008− rev = "0ee02ec9753c74d356106f0a0c4ddb0dcf9705f0";
2009− sha256 = "1fqngj2a4ky4z96vjryjfkblnr50jw99cfzc7xsjjpdy8j7wvrfk";
2008+ rev = "8d640e4c5d89dde55ef79d43fee1c8ecd12495b9";
2009+ sha256 = "17lmdvxnp1y6wvzfzv9yk962ixc549jc80g0zc820734dp27x0l3";
20102010 };
20112011 };
20122012
@@ -2051,12 +2051,12 @@
20512051 };
20522052
20532053 vim-dirvish = buildVimPluginFrom2Nix {
2054− name = "vim-dirvish-2018-06-20";
2054+ name = "vim-dirvish-2018-11-15";
20552055 src = fetchFromGitHub {
20562056 owner = "justinmk";
20572057 repo = "vim-dirvish";
2058− rev = "c273c462d774ed2db5f6d382265cf5897e554de0";
2059− sha256 = "1fv1kk7y280kx8c0iy9rg43i8gr0h8308al8sm85qvmfx5fcbi9d";
2058+ rev = "ba3be081de598878edf9624f5c4cb06961b6e842";
2059+ sha256 = "1bcwj0w5v67mba4m4abmcxncawxz6dpflz34flpcn8869rsghbgv";
20602060 };
20612061 };
20622062
@@ -2211,22 +2211,22 @@
22112211 };
22122212
22132213 vim-fugitive = buildVimPluginFrom2Nix {
2214− name = "vim-fugitive-2018-10-28";
2214+ name = "vim-fugitive-2018-11-22";
22152215 src = fetchFromGitHub {
22162216 owner = "tpope";
22172217 repo = "vim-fugitive";
2218− rev = "6d497b0e63173f89cfabe12ea27a7a5a8b29ac8a";
2219− sha256 = "1ma9zxqf0ybl6y6qd9wjp97lgrwvgzpqy5zca0c6da29gm03kb02";
2218+ rev = "2564c37d0a2ade327d6381fef42d84d9fad1d057";
2219+ sha256 = "1bwqyl644wv26ys27hxj9wx57mfp1090cmp7acd7inbxypd0bgdb";
22202220 };
22212221 };
22222222
22232223 vim-ghost = buildVimPluginFrom2Nix {
2224− name = "vim-ghost-2018-10-05";
2224+ name = "vim-ghost-2018-11-28";
22252225 src = fetchFromGitHub {
22262226 owner = "raghur";
22272227 repo = "vim-ghost";
2228− rev = "8a3acdde943688d52407b5da08988dfc528ea10c";
2229− sha256 = "0x7mgziyx8gs5cc37c4rm0hrzgzpg4klnkfviyj2k3h4qqj9hkaj";
2228+ rev = "672d1052425cc9dd8f5f56ba31732f0637b95caa";
2229+ sha256 = "14948jyyhddjpx2szs6wbs9sjnxbxvsdnkyf33558by3gn5yc7nw";
22302230 };
22312231 };
22322232
@@ -2251,12 +2251,12 @@
22512251 };
22522252
22532253 vim-gitgutter = buildVimPluginFrom2Nix {
2254− name = "vim-gitgutter-2018-10-18";
2254+ name = "vim-gitgutter-2018-11-26";
22552255 src = fetchFromGitHub {
22562256 owner = "airblade";
22572257 repo = "vim-gitgutter";
2258− rev = "0597380f6b22f43a3ea6ff8364d5c239bb2504ea";
2259− sha256 = "18v4y616q29al2lx62gkcv5q9ka8042dk8y6i9b5jmyjfwps0q53";
2258+ rev = "c2651aefbd92dca05de1943619df965b848f9b4f";
2259+ sha256 = "1wsmmym3l3r57r8s972iflv1pcsidk8yjb9w4y2rh7dbgf6rkbqr";
22602260 };
22612261 };
22622262
@@ -2271,12 +2271,12 @@
22712271 };
22722272
22732273 vim-go = buildVimPluginFrom2Nix {
2274− name = "vim-go-2018-10-23";
2274+ name = "vim-go-2018-12-01";
22752275 src = fetchFromGitHub {
22762276 owner = "fatih";
22772277 repo = "vim-go";
2278− rev = "d5ce080c25806d68189be641e19996898138f1a4";
2279− sha256 = "09kq1zjq98vzy8gjgxiqkb7ibl3wpjz8lkzqjm110axxmx01b317";
2278+ rev = "3577e475ac6f1089e0a32d2921989a4279e9867b";
2279+ sha256 = "10i3jzwp0rgdyyzmkdvpxfxq2i1dk3hdcxanbi4gm0xh8zs1c0h2";
22802280 };
22812281 };
22822282
@@ -2291,22 +2291,22 @@
22912291 };
22922292
22932293 vim-grepper = buildVimPluginFrom2Nix {
2294− name = "vim-grepper-2018-10-30";
2294+ name = "vim-grepper-2018-11-08";
22952295 src = fetchFromGitHub {
22962296 owner = "mhinz";
22972297 repo = "vim-grepper";
2298− rev = "a55a14b97dc8ac848eeb95e71d095b75197ba665";
2299− sha256 = "08p5dp43z9bxllr5fvl3hgnyqyxlvpbfczw1ydncmzvrqqccrx08";
2298+ rev = "4a47e20c98eee758b905a2cd7ca29f433c08e7e7";
2299+ sha256 = "14lwf5fmpqd0d6gywld6jmvis1r73i9ib4zlxlb3xkzx6di8kp5a";
23002300 };
23012301 };
23022302
23032303 vim-gutentags = buildVimPluginFrom2Nix {
2304− name = "vim-gutentags-2018-06-13";
2304+ name = "vim-gutentags-2018-11-17";
23052305 src = fetchFromGitHub {
23062306 owner = "ludovicchabant";
23072307 repo = "vim-gutentags";
2308− rev = "b1eb744786ec3e55c1c8ed8ab3221157b426f62e";
2309− sha256 = "0bx690n6zn28bzw99sis1q177x3s4yzdh6avsv49qpwwdg73s3c4";
2308+ rev = "93616e4c0ccfafe52ae329c7dd220d7b5c7d5f80";
2309+ sha256 = "12qcf34fxgzsilx1wkh219avvkq7a5q9x3kdcqy3ai8g05fpx619";
23102310 };
23112311 };
23122312
@@ -2341,12 +2341,12 @@
23412341 };
23422342
23432343 vim-hdevtools = buildVimPluginFrom2Nix {
2344− name = "vim-hdevtools-2017-03-11";
2344+ name = "vim-hdevtools-2018-11-19";
23452345 src = fetchFromGitHub {
23462346 owner = "bitc";
23472347 repo = "vim-hdevtools";
2348− rev = "4ffdace7002915cb10d663a2c56386286c5b8e37";
2349− sha256 = "0s7qd72962sc56j8xzpzikjs9k5s89d5p0j541abl8zm0mavmyka";
2348+ rev = "ab33578bbdbcbd80050faf43e4adee1653fe34dc";
2349+ sha256 = "1xvjz6yidcywn1xmdqlxsz68lmkx6rmiqf6q2gfz56pzq1mfmski";
23502350 };
23512351 };
23522352
@@ -2471,12 +2471,12 @@
24712471 };
24722472
24732473 vim-javacomplete2 = buildVimPluginFrom2Nix {
2474− name = "vim-javacomplete2-2018-10-09";
2474+ name = "vim-javacomplete2-2018-11-14";
24752475 src = fetchFromGitHub {
24762476 owner = "artur-shaik";
24772477 repo = "vim-javacomplete2";
2478− rev = "a3af9721afcd3ce8972dd4ab0f40da947245c2fa";
2479− sha256 = "0pgfgf82dv0dys2d4dq48d0n4gnbmxbqpvsy3fwmqdrw9zn9bw79";
2478+ rev = "cc9eb84b43b455ed61e647eac577fd6b850f0e8b";
2479+ sha256 = "0xxashigb3jifhwcsbi8mdzhd049mi1naaaih69cmmvzwrs3ik1p";
24802480 };
24812481 };
24822482
@@ -2562,12 +2562,12 @@
25622562 };
25632563
25642564 vim-lawrencium = buildVimPluginFrom2Nix {
2565− name = "vim-lawrencium-2017-01-11";
2565+ name = "vim-lawrencium-2018-11-04";
25662566 src = fetchFromGitHub {
25672567 owner = "ludovicchabant";
25682568 repo = "vim-lawrencium";
2569− rev = "88077183e1f5a9a1f741aeab7a1374cfed9e917f";
2570− sha256 = "0z31v93wjycq4lqvbl1jzxi7i5i1vl919m4dyyzphybcqrjjpnab";
2569+ rev = "2e09de2ab8ac7a11387340647670ea6c1e4ef08c";
2570+ sha256 = "17j3wy15rkfx7xwgnmipmg7skmf57rw4xndkjgws6jqm9xgvj6jb";
25712571 };
25722572 };
25732573
@@ -2592,12 +2592,12 @@
25922592 };
25932593
25942594 vim-localvimrc = buildVimPluginFrom2Nix {
2595− name = "vim-localvimrc-2018-10-29";
2595+ name = "vim-localvimrc-2018-11-06";
25962596 src = fetchFromGitHub {
25972597 owner = "embear";
25982598 repo = "vim-localvimrc";
2599− rev = "109962b3b7359ee2978417264b168ac6842db9cf";
2600− sha256 = "13jpp5g91bynl91n8i8q8ldicii3ns42fq3hlnjcrhz5ml734wlf";
2599+ rev = "e84959d05472ce2000883b1f73ea34302894bdb9";
2600+ sha256 = "1w421wbshxic9yd5862i8c02a9xhnfidrkrj1xi7lxjh71r0kdlw";
26012601 };
26022602 };
26032603
@@ -2642,12 +2642,12 @@
26422642 };
26432643
26442644 vim-monokai-pro = buildVimPluginFrom2Nix {
2645− name = "vim-monokai-pro-2018-06-14";
2645+ name = "vim-monokai-pro-2018-12-03";
26462646 src = fetchFromGitHub {
26472647 owner = "phanviet";
26482648 repo = "vim-monokai-pro";
2649− rev = "75b2794a057f0ea6b2485ae622e92bb0687d4c9b";
2650− sha256 = "1l9cdsilpzyg9y0az7627gi10qyfyjxn9dvi571q7n1vrv6nhl2d";
2649+ rev = "6c96cbc25e48de53b2b984863ab8bb722ee52d3e";
2650+ sha256 = "1nsr3n0rz0rwsk92hwg9391plkpilcnv159q4ag4fdrjv1n2v16d";
26512651 };
26522652 };
26532653
@@ -2822,12 +2822,12 @@
28222822 };
28232823
28242824 vim-plug = buildVimPluginFrom2Nix {
2825− name = "vim-plug-2018-09-12";
2825+ name = "vim-plug-2018-11-03";
28262826 src = fetchFromGitHub {
28272827 owner = "junegunn";
28282828 repo = "vim-plug";
2829− rev = "b6050d6f03f3e2792589535249e3c997d3e94461";
2830− sha256 = "11x10l75q6k4z67yyk5ll25fqpgb2ma88vplrakw3k41g79xn9d9";
2829+ rev = "734d9a11b5a6354e6a66e152dee5d311233e033c";
2830+ sha256 = "07j8wyqvqamr2dr1vdk84913jihw7arm4drnd2zmy0d7g00ngyzn";
28312831 };
28322832 };
28332833
@@ -2882,12 +2882,12 @@
28822882 };
28832883
28842884 vim-puppet = buildVimPluginFrom2Nix {
2885− name = "vim-puppet-2018-09-24";
2885+ name = "vim-puppet-2018-11-15";
28862886 src = fetchFromGitHub {
28872887 owner = "rodjek";
28882888 repo = "vim-puppet";
2889− rev = "5680f0dca2d6b5e98687e091a544e4e0ae41d74b";
2890− sha256 = "134x4z88qrzfxyqa1kxmwwmhlcqa3n8qj7f71bn9w9h4ac2v650v";
2889+ rev = "4793b074ddbfc05ed0189e19de343870611e4bdc";
2890+ sha256 = "0q24dmbdsskz97xhdig9r9m7l8hyyzsmza1b0m7bc2y269fsiim0";
28912891 };
28922892 };
28932893
@@ -2902,12 +2902,12 @@
29022902 };
29032903
29042904 vim-quickrun = buildVimPluginFrom2Nix {
2905− name = "vim-quickrun-2018-10-16";
2905+ name = "vim-quickrun-2018-11-27";
29062906 src = fetchFromGitHub {
29072907 owner = "thinca";
29082908 repo = "vim-quickrun";
2909− rev = "9dbda9dcdc8ef3150c414b9b1ea347b04b942665";
2910− sha256 = "06ssvyk84097vqzyrnrmxsr63diy8mjy8mv8xkhq5cmvqhavz91s";
2909+ rev = "875253cf98415de2aef411a50f35e2d7cb94aeac";
2910+ sha256 = "0l6f2m840c74md0799gch6l6m6nax30q8blpg2xrqmm7v0lrl50q";
29112911 };
29122912 };
29132913
@@ -2932,12 +2932,12 @@
29322932 };
29332933
29342934 vim-rhubarb = buildVimPluginFrom2Nix {
2935− name = "vim-rhubarb-2018-10-31";
2935+ name = "vim-rhubarb-2018-11-16";
29362936 src = fetchFromGitHub {
29372937 owner = "tpope";
29382938 repo = "vim-rhubarb";
2939− rev = "42072cc349c46db79c0a4411d399a2fe31cfda7e";
2940− sha256 = "020fshfrwbycs4saci58k625330i2ndfh6lqnxz5h0pp2m5y6jp8";
2939+ rev = "e57ed3b6be2c4a49656f1a816919f0af22fae324";
2940+ sha256 = "0g60prwfjc3mn1vq69ki8qcqcny952zpm3idq9x9l45iddfpihcr";
29412941 };
29422942 };
29432943
@@ -2982,12 +2982,12 @@
29822982 };
29832983
29842984 vim-scriptease = buildVimPluginFrom2Nix {
2985− name = "vim-scriptease-2018-07-27";
2985+ name = "vim-scriptease-2018-11-03";
29862986 src = fetchFromGitHub {
29872987 owner = "tpope";
29882988 repo = "vim-scriptease";
2989− rev = "2619a1f5f63b670578ed0a504a6f844807804436";
2990− sha256 = "0mmrkbxi6gzv8q94cps010nbw95v9f3cc87l77klslg57hl515pl";
2989+ rev = "c443ccb2bc8a0e460753a45b9ed44d7722d1a070";
2990+ sha256 = "11r8nhjydjinqffqfdb6pn1pkh4yqckjazckn9m7j4r6r2hga10h";
29912991 };
29922992 };
29932993
@@ -3012,12 +3012,12 @@
30123012 };
30133013
30143014 vim-signify = buildVimPluginFrom2Nix {
3015− name = "vim-signify-2018-10-31";
3015+ name = "vim-signify-2018-11-16";
30163016 src = fetchFromGitHub {
30173017 owner = "mhinz";
30183018 repo = "vim-signify";
3019− rev = "4e7faba8d32d56d80090dedc5328849a7128b73a";
3020− sha256 = "0wm1kgklvd4b52lrqb9l7n511p8kaw8y9707962l4nrp8cbrbs31";
3019+ rev = "ea87e05e6fcbbaece63aac4e9c1c23adb881b86c";
3020+ sha256 = "11d2xlc8j2mqx8s6h1z1pgr5dq0k2xr010qg8viw34z0pnfkah25";
30213021 };
30223022 };
30233023
@@ -3052,12 +3052,12 @@
30523052 };
30533053
30543054 vim-snippets = buildVimPluginFrom2Nix {
3055− name = "vim-snippets-2018-10-27";
3055+ name = "vim-snippets-2018-11-27";
30563056 src = fetchFromGitHub {
30573057 owner = "honza";
30583058 repo = "vim-snippets";
3059− rev = "06161e65cd238d5f462f21e3f549c61860db85d1";
3060− sha256 = "10n94s90jjwsg58cm5lrcs553mwsdyvy34rmf6xsa2mq9ql21vy1";
3059+ rev = "97e4ae4fe8d4e8af8c7d1a1d0c41e34ac81cf636";
3060+ sha256 = "1spf9bvn0a5cx3nhgzj6i5aqrh47v27a8rjxi3im2n1is0gyar7r";
30613061 };
30623062 };
30633063
@@ -3092,12 +3092,12 @@
30923092 };
30933093
30943094 vim-startify = buildVimPluginFrom2Nix {
3095− name = "vim-startify-2018-10-31";
3095+ name = "vim-startify-2018-11-28";
30963096 src = fetchFromGitHub {
30973097 owner = "mhinz";
30983098 repo = "vim-startify";
3099− rev = "356562270684d8d1647daf0faaf76ac90740990c";
3100− sha256 = "0qc9ifq4blixda0kyc0zhmqi6cqz44xnk9x17p0p9qqidf1s1l1r";
3099+ rev = "e25fbe1c0d6f8cda83c0e300d70f9b8009e4134f";
3100+ sha256 = "0j3yr5g97s8lb9z68rx5clbg7af74r5y3rlgj5jx0mxlxx3yysyc";
31013101 };
31023102 };
31033103
@@ -3172,22 +3172,22 @@
31723172 };
31733173
31743174 vim-terraform = buildVimPluginFrom2Nix {
3175− name = "vim-terraform-2018-08-02";
3175+ name = "vim-terraform-2018-11-19";
31763176 src = fetchFromGitHub {
31773177 owner = "hashivim";
31783178 repo = "vim-terraform";
3179− rev = "7c11252da45c6508524e022d1f2588134902d8d1";
3180− sha256 = "1qnjjcin934i7yd2fd0xapraindrpavnik1fasv10x5dw8yzxyrs";
3179+ rev = "9e40fa4f0c38bd4b008a720b3e86c6726846378f";
3180+ sha256 = "0m5bcmilz6dn67gkka183vkqakpppwgpa8zbwg8qz03fs0mdb98r";
31813181 };
31823182 };
31833183
31843184 vim-test = buildVimPluginFrom2Nix {
3185− name = "vim-test-2018-10-24";
3185+ name = "vim-test-2018-11-22";
31863186 src = fetchFromGitHub {
31873187 owner = "janko-m";
31883188 repo = "vim-test";
3189− rev = "cecb28e55a29ecde7cea926852998c47027bd759";
3190− sha256 = "1av9fmva2ki180wikfik3yl83hzirj43rwhwwms65bk590cf4h95";
3189+ rev = "c4b732003d120d60a2fc009423e34d80fb212651";
3190+ sha256 = "1s3y44lgxfivhnjkm8xx6gnqs2xqf53p1l3hbs04z07v57xfg0ml";
31913191 };
31923192 };
31933193
@@ -3212,22 +3212,22 @@
32123212 };
32133213
32143214 vim-tmux-navigator = buildVimPluginFrom2Nix {
3215− name = "vim-tmux-navigator-2018-10-19";
3215+ name = "vim-tmux-navigator-2018-11-03";
32163216 src = fetchFromGitHub {
32173217 owner = "christoomey";
32183218 repo = "vim-tmux-navigator";
3219− rev = "7eb75a10e3ab0504673a0e7eb32af6e5521b80ec";
3220− sha256 = "0kafk2b8zxwx354p8inww0cyrw9w4arbiixbvvhrhxks7cccfxx6";
3219+ rev = "9f7d1588b04644d8a1671d2325fefbb4f772e466";
3220+ sha256 = "08nxa5v56zmsjbx0zld1i9nwydxmb3r6qmxb9hgnvzg4aylmbxlc";
32213221 };
32223222 };
32233223
32243224 vim-toml = buildVimPluginFrom2Nix {
3225− name = "vim-toml-2018-09-25";
3225+ name = "vim-toml-2018-11-27";
32263226 src = fetchFromGitHub {
32273227 owner = "cespare";
32283228 repo = "vim-toml";
3229− rev = "2069e7413d8eaab567fa320723c4af24bb437f3a";
3230− sha256 = "0ffngrry8ambv27wwzp0czgccdag1qcmbcvazjklm2i5b3ads39i";
3229+ rev = "06f6c1346be834c7c971d6d1d4f876e5699119bf";
3230+ sha256 = "12sp45p2ixkvrs9sdyx0m8bc6yn1c2qr0vqbr04c5ac94km1rdar";
32313231 };
32323232 };
32333233
@@ -3282,22 +3282,22 @@
32823282 };
32833283
32843284 vim-vue = buildVimPluginFrom2Nix {
3285− name = "vim-vue-2018-10-08";
3285+ name = "vim-vue-2018-11-11";
32863286 src = fetchFromGitHub {
32873287 owner = "posva";
32883288 repo = "vim-vue";
3289− rev = "720ca48e0207f2aca331b9d949ce9d4ff5702737";
3290− sha256 = "1cqny4vppyaw29g6bx1qlfdjb5fa0avpy41jkidazv76ym4ahi2x";
3289+ rev = "e306929b27bea08ab505de7a4617e642b56b6dcd";
3290+ sha256 = "1k48z8b6xmgqdcixx7yhbcf0jcyyfqv0zwijfq2j05559r9myx16";
32913291 };
32923292 };
32933293
32943294 vim-wakatime = buildVimPluginFrom2Nix {
3295− name = "vim-wakatime-2018-10-27";
3295+ name = "vim-wakatime-2018-11-25";
32963296 src = fetchFromGitHub {
32973297 owner = "wakatime";
32983298 repo = "vim-wakatime";
3299− rev = "656853504feb4aab3168e007aab5a1aee355bff5";
3300− sha256 = "1dpi6dc1gdwq4smsis9nxd2p3cq9jm88yj3kn12gfrsb5w1j9k7q";
3299+ rev = "fe33dfaf90d339ef54310c154e66970ef08c8611";
3300+ sha256 = "1wnsld5fy464s8wfz78d27hdlmk3bimyawmvvqg7h8drm3b24zbx";
33013301 };
33023302 };
33033303
@@ -3372,12 +3372,12 @@
33723372 };
33733373
33743374 vimpreviewpandoc = buildVimPluginFrom2Nix {
3375− name = "vimpreviewpandoc-2018-05-12";
3375+ name = "vimpreviewpandoc-2018-11-05";
33763376 src = fetchFromGitHub {
33773377 owner = "tex";
33783378 repo = "vimpreviewpandoc";
3379− rev = "266d14d362f6c069863b2d63edb683e802e7e3ee";
3380− sha256 = "1qhc5vyk7vxrgq11dh1iwkz2a3zd7wfjvyirhhlpx1zx12d6l0ly";
3379+ rev = "61d34f27b6d47da6523b682e32a155f65867d46e";
3380+ sha256 = "08hszn4mjp64b1qcfc868cyrrylil2257sjzs19w61p10l6j6skm";
33813381 };
33823382 };
33833383
@@ -3402,12 +3402,12 @@
34023402 };
34033403
34043404 vimtex = buildVimPluginFrom2Nix {
3405− name = "vimtex-2018-11-01";
3405+ name = "vimtex-2018-12-02";
34063406 src = fetchFromGitHub {
34073407 owner = "lervag";
34083408 repo = "vimtex";
3409− rev = "2aae07e67034f4806d45500a967bf5775ab22baf";
3410− sha256 = "1ng1ps5f2vh7xs5lfkid7zwvcjglynw53xvd301zpjbgln2gv3fz";
3409+ rev = "c3d40a9bc136bbe01739b193e188f3ad450edaa5";
3410+ sha256 = "1mgji6w1630npqps3mysapqg08zd7abvkr3vvdl4ns7f582rm2b6";
34113411 };
34123412 };
34133413
@@ -3523,12 +3523,12 @@
35233523 };
35243524
35253525 youcompleteme = buildVimPluginFrom2Nix {
3526− name = "youcompleteme-2018-10-14";
3526+ name = "youcompleteme-2018-11-27";
35273527 src = fetchFromGitHub {
35283528 owner = "valloric";
35293529 repo = "youcompleteme";
3530− rev = "f67e5ff27b048d8c55a10ba6a27c6c5b16d0f6ba";
3531− sha256 = "14v7kqv4d2013imc5qkh22lwl5d9x419jjfj5qinld04n56banmv";
3530+ rev = "75bf1738dcac502fa2d04e87116a3ce65249be8c";
3531+ sha256 = "19mdhpiqkn9zr23b55cpx66lwmm2a6kdss98dwzib3swr3dgcvcg";
35323532 fetchSubmodules = true;
35333533 };
35343534 };
@@ -3564,12 +3564,12 @@
35643564 };
35653565
35663566 zig-vim = buildVimPluginFrom2Nix {
3567− name = "zig-vim-2018-09-21";
3567+ name = "zig-vim-2018-11-17";
35683568 src = fetchFromGitHub {
35693569 owner = "zig-lang";
35703570 repo = "zig.vim";
3571− rev = "febf2fc8d7aa27809758fd90be29d3a9b501efc2";
3572− sha256 = "1zp1bz3fzcwvdw3qgiyvmd5imrzjh7rnpnjpxm8mma0kxi2bnl3g";
3571+ rev = "0479c0ade7c27210e3a7982d36bd2673d560ffa9";
3572+ sha256 = "1ndbrzvkiyy55avmk6z7x7qd5b9v4ylc7i8n9xlcas90q6cjw9ga";
35733573 };
35743574 };
35753575
pkgs/misc/vscode-extensions/python/default.nix+2−2
@@ -20,8 +20,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
2020 mktplcRef = {
2121 name = "python";
2222 publisher = "ms-python";
23− version = "2018.10.1";
24− sha256 = "1j9nf09v31lmrjkxf7p1d78d064x6afzh0dvssmk3sjm2c5r432k";
23+ version = "2018.11.0";
24+ sha256 = "0z9ca14qzy6zw0cfir7hdnhin01c1wsr6lbb2xp6rpq06vh7nivl";
2525 };
2626
2727 postPatch = ''
pkgs/misc/vscode-extensions/wakatime/default.nix+2−2
@@ -7,8 +7,8 @@ in
77 mktplcRef = {
88 name = "vscode-wakatime";
99 publisher = "WakaTime";
10− version = "1.2.3";
11− sha256 = "1n7bxkwgpip11k6d7zc3ifp9zb6p7f27f4x4g584wisrnfnqj1bp";
10+ version = "1.2.4";
11+ sha256 = "0qghn4kakv0jrjcl65p1v5r6j7608269zyhh75b15p12mdvi21vb";
1212 };
1313
1414 postPatch = ''
pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix+1−1
@@ -15,7 +15,7 @@ appleDerivation {
1515 (lib.enableFeature enableShared "shared")
1616 ];
1717
18− postInstall = lib.optionalString (!enableStatic) ''
18+ postInstall = lib.optionalString enableShared ''
1919 mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib
2020 ${stdenv.cc.bintools.targetPrefix}install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib
2121
pkgs/os-specific/darwin/skhd/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "skhd-${version}";
5− version = "0.2.2";
5+ version = "0.3.0";
66
77 src = fetchFromGitHub {
88 owner = "koekeishiya";
99 repo = "skhd";
1010 rev = "v${version}";
11− sha256 = "0mn6svz2mqbpwlx510r447vflfcxryykpin6h6429dlz0wjlipa8";
11+ sha256 = "13pqnassmzppy2ipv995rh8lzw9rraxvi0ph6zgy63cbsdfzbhgl";
1212 };
1313
1414 buildInputs = [ Carbon ];
pkgs/os-specific/linux/iwd/default.nix+7−4
@@ -3,17 +3,17 @@
33let
44 ell = fetchgit {
55 url = https://git.kernel.org/pub/scm/libs/ell/ell.git;
6− rev = "0.14";
7− sha256 = "13jlmdk47pscmfs3c12awfwr3m6ka4fh6fyr9cl1bmqdpwqmmmk6";
6+ rev = "0.15";
7+ sha256 = "1jwk5gxcs964ddca9asw6fvc4h9q8d2x1y3linfi11b5vf30bghn";
88 };
99in stdenv.mkDerivation rec {
1010 name = "iwd-${version}";
11− version = "0.11";
11+ version = "0.12";
1212
1313 src = fetchgit {
1414 url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
1515 rev = version;
16− sha256 = "0q79rdj3h16xdf0g2jdsvb2141z36z89vgzq0qn31pxzhgxdgf7j";
16+ sha256 = "156zq3zqa2vfmvy3yv9lng23mhrhlgwh0p2x3fcn10nkks9q89pn";
1717 };
1818
1919 nativeBuildInputs = [
@@ -40,6 +40,7 @@ in stdenv.mkDerivation rec {
4040 "--with-dbus-busdir=$(out)/usr/share/dbus-1/system-services/"
4141 "--with-systemd-unitdir=$(out)/lib/systemd/system/"
4242 "--localstatedir=/var/"
43+ "--enable-wired"
4344 ];
4445
4546 postUnpack = ''
@@ -59,6 +60,8 @@ in stdenv.mkDerivation rec {
5960 '';
6061
6162 postFixup = ''
63+ substituteInPlace $out/usr/share/dbus-1/system-services/net.connman.ead.service \
64+ --replace /bin/false ${coreutils}/bin/false
6265 substituteInPlace $out/usr/share/dbus-1/system-services/net.connman.iwd.service \
6366 --replace /bin/false ${coreutils}/bin/false
6467 '';
pkgs/os-specific/linux/kernel/linux-4.14.nix+2−2
@@ -3,7 +3,7 @@
33with stdenv.lib;
44
55buildLinux (args // rec {
6− version = "4.14.85";
6+ version = "4.14.86";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
16− sha256 = "1kpgdwf8rcw913dfgj9c6wcvc4z54m756s2fplczm86v2gs186g4";
16+ sha256 = "0a3f4rn9aixmx6ssqw0yqcr37js790qvb28v40rpg49b0aln14ns";
1717 };
1818} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.19.nix+2−2
@@ -3,7 +3,7 @@
33with stdenv.lib;
44
55buildLinux (args // rec {
6− version = "4.19.6";
6+ version = "4.19.7";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
16− sha256 = "1hq9iyx2k6ff6yxsgkd4xvk5al3jw5nxk49zq72w04b2nsz62kk4";
16+ sha256 = "1lm2s9yhzyqra1f16jrjwd66m3jl43n5k7av2r9hns8hdr1smmw4";
1717 };
1818} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.9.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
22
33buildLinux (args // rec {
4− version = "4.9.142";
4+ version = "4.9.143";
55 extraMeta.branch = "4.9";
66
77 src = fetchurl {
88 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
9− sha256 = "01n4v0gpf8xyz8hzc70mhjha7kanz9pv248ypsmab7zpzgd7wjil";
9+ sha256 = "1grcmh85n6ya8h2v0qx2pxryjxx3501kjbknz3a5yrwnlrj69dqf";
1010 };
1111} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-libre.nix+3
@@ -1,6 +1,9 @@
11{ stdenv, lib, fetchsvn, linux
22, scripts ? fetchsvn {
33 url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/";
4+
5+ # Update this if linux_latest-libre fails to build.
6+ # $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/ | grep -Eo 'Revision [0-9]+'
47 rev = "15715";
58 sha256 = "1mz1xv860ddxz7dfp4l6q25hlsh532aapvylq703jskgbzsfinxh";
69 }
pkgs/os-specific/linux/kernel/linux-testing.nix+3−3
@@ -1,13 +1,13 @@
11{ stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
22
33buildLinux (args // rec {
4− version = "4.20-rc4";
5− modDirVersion = "4.20.0-rc4";
4+ version = "4.20-rc5";
5+ modDirVersion = "4.20.0-rc5";
66 extraMeta.branch = "4.20";
77
88 src = fetchurl {
99 url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
10− sha256 = "0kni1l1gk9mva7ym091mrkn9f2bdbh80i7589ahk6j5blpj9m3ns";
10+ sha256 = "0dixig8vismk40x4a719psyi39nqcv7yrisjdnj3s2ym9rljyypz";
1111 };
1212
1313 # Should the testing kernels ever be built on Hydra?
pkgs/os-specific/linux/nvidia-x11/default.nix+1−1
@@ -47,7 +47,7 @@ rec {
4747 persistencedSha256 = "0nwv6kh4gxgy80x1zs6gcg5hy3amg25xhsfa2v4mwqa36sblxz6l";
4848 useGLVND = false;
4949
50− patches = maybePatch_drm_legacy ++ [ ./vm_operations_struct-fault.patch ];
50+ patches = [ ./vm_operations_struct-fault.patch ];
5151 };
5252
5353 legacy_304 = generic {
pkgs/os-specific/linux/reptyr/default.nix+12−11
@@ -1,31 +1,32 @@
1−{ stdenv, lib, fetchFromGitHub }:
1+{ stdenv, lib, fetchFromGitHub, python2 }:
22
33stdenv.mkDerivation rec {
4− version = "0.6.2";
4+ version = "0.7.0";
55 name = "reptyr-${version}";
6+
67 src = fetchFromGitHub {
78 owner = "nelhage";
89 repo = "reptyr";
910 rev = "reptyr-${version}";
10− sha256 = "0yfy1p0mz05xg5gzp52vilfz0yl1sjjsvwn0z073mnr4wyam7fg8";
11+ sha256 = "1hnijfz1ab34j2h2cxc3f43rmbclyihgn9x9wxa7jqqgb2xm71hj";
1112 };
1213
13− # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
14− postPatch = ''
15− sed 1i'#include <sys/sysmacros.h>' -i platform/linux/linux.c
16− '';
14+ makeFlags = [ "PREFIX=" "DESTDIR=$(out)" ];
1715
18− # Needed with GCC 7
19− NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation";
16+ checkInputs = [ (python2.withPackages (p: [ p.pexpect ])) ];
17+ doCheck = true;
2018
21− makeFlags = ["PREFIX=$(out)"];
2219 meta = {
2320 platforms = [
2421 "i686-linux"
2522 "x86_64-linux"
2623 "i686-freebsd"
2724 "x86_64-freebsd"
28− ] ++ lib.platforms.arm;
25+ "armv5tel-linux"
26+ "armv6l-linux"
27+ "armv7l-linux"
28+ "aarch64-linux"
29+ ];
2930 maintainers = with lib.maintainers; [raskin];
3031 license = lib.licenses.mit;
3132 description = "Reparent a running program to a new terminal";
pkgs/servers/apache-kafka/default.nix+7−2
@@ -29,9 +29,14 @@ let
2929 sha256 = "13vg0wm2fsd06pfw05m4bhcgbjmb2bmd4i31zfs48w0f7hjc8qf2";
3030 };
3131 "2.0" = {
32− kafkaVersion = "2.0.0";
32+ kafkaVersion = "2.0.1";
3333 scalaVersion = "2.12";
34− sha256 = "0mbrp8rafv1bra9nrdicpxy6w59ixanaj50c9pkgdrih82f57wdm";
34+ sha256 = "0i62q3542cznf711kiskaa30l06gq9ckszlxja4k1vs1flxz5khl";
35+ };
36+ "2.1" = {
37+ kafkaVersion = "2.1.0";
38+ scalaVersion = "2.12";
39+ sha256 = "11jgxyqxsw4hc85ba2czc8wdzlnywyb4ab8qd5f2y27mhak482x7";
3540 };
3641 };
3742in
pkgs/servers/foundationdb/default.nix+3−3
@@ -167,7 +167,7 @@ let
167167 description = "Open source, distributed, transactional key-value store";
168168 homepage = https://www.foundationdb.org;
169169 license = licenses.asl20;
170− platforms = platforms.linux;
170+ platforms = [ "x86_64-linux" ];
171171 maintainers = with maintainers; [ thoughtpolice ];
172172 };
173173 };
@@ -187,8 +187,8 @@ in with builtins; {
187187 };
188188
189189 foundationdb60 = makeFdb rec {
190− version = "6.0.15";
190+ version = "6.0.17";
191191 branch = "release-6.0";
192− sha256 = "1z8104nj1qn738bs1zjiq1mdn8dnj4vksb3fh503mf3ygl54mjbw";
192+ sha256 = "00m6dkv2nm51zhiq049fiivnz8hpc8w21y024lykhn16kyjdnfhs";
193193 };
194194}
pkgs/servers/home-assistant/component-packages.nix+48−5
@@ -2,7 +2,7 @@
22# Do not edit!
33
44{
5− version = "0.82.1";
5+ version = "0.83.3";
66 components = {
77 "abode" = ps: with ps; [ ];
88 "ads" = ps: with ps; [ ];
@@ -21,6 +21,7 @@
2121 "alarm_control_panel.homematicip_cloud" = ps: with ps; [ ];
2222 "alarm_control_panel.ialarm" = ps: with ps; [ ];
2323 "alarm_control_panel.ifttt" = ps: with ps; [ aiohttp-cors pyfttt ];
24+ "alarm_control_panel.lupusec" = ps: with ps; [ ];
2425 "alarm_control_panel.manual" = ps: with ps; [ ];
2526 "alarm_control_panel.manual_mqtt" = ps: with ps; [ paho-mqtt ];
2627 "alarm_control_panel.mqtt" = ps: with ps; [ paho-mqtt ];
@@ -48,6 +49,7 @@
4849 "arduino" = ps: with ps; [ ];
4950 "arlo" = ps: with ps; [ ];
5051 "asterisk_mbox" = ps: with ps; [ ];
52+ "asuswrt" = ps: with ps; [ ];
5153 "august" = ps: with ps; [ ];
5254 "auth" = ps: with ps; [ aiohttp-cors ];
5355 "auth.indieauth" = ps: with ps; [ ];
@@ -95,6 +97,7 @@
9597 "binary_sensor.envisalink" = ps: with ps; [ ];
9698 "binary_sensor.ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ];
9799 "binary_sensor.ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ];
100+ "binary_sensor.fibaro" = ps: with ps; [ ];
98101 "binary_sensor.flic" = ps: with ps; [ ];
99102 "binary_sensor.fritzbox" = ps: with ps; [ ];
100103 "binary_sensor.gc100" = ps: with ps; [ ];
@@ -110,6 +113,7 @@
110113 "binary_sensor.knx" = ps: with ps; [ ];
111114 "binary_sensor.konnected" = ps: with ps; [ aiohttp-cors netdisco ];
112115 "binary_sensor.linode" = ps: with ps; [ linode-api ];
116+ "binary_sensor.lupusec" = ps: with ps; [ ];
113117 "binary_sensor.maxcube" = ps: with ps; [ ];
114118 "binary_sensor.modbus" = ps: with ps; [ ];
115119 "binary_sensor.mqtt" = ps: with ps; [ paho-mqtt ];
@@ -124,6 +128,7 @@
124128 "binary_sensor.openuv" = ps: with ps; [ ];
125129 "binary_sensor.pilight" = ps: with ps; [ ];
126130 "binary_sensor.ping" = ps: with ps; [ ];
131+ "binary_sensor.point" = ps: with ps; [ ];
127132 "binary_sensor.qwikswitch" = ps: with ps; [ ];
128133 "binary_sensor.rachio" = ps: with ps; [ ];
129134 "binary_sensor.raincloud" = ps: with ps; [ ];
@@ -156,6 +161,7 @@
156161 "binary_sensor.verisure" = ps: with ps; [ ];
157162 "binary_sensor.volvooncall" = ps: with ps; [ ];
158163 "binary_sensor.vultr" = ps: with ps; [ vultr ];
164+ "binary_sensor.w800rf32" = ps: with ps; [ ];
159165 "binary_sensor.wemo" = ps: with ps; [ ];
160166 "binary_sensor.wink" = ps: with ps; [ ];
161167 "binary_sensor.wirelesstag" = ps: with ps; [ ];
@@ -250,6 +256,7 @@
250256 "climate.toon" = ps: with ps; [ ];
251257 "climate.touchline" = ps: with ps; [ ];
252258 "climate.tuya" = ps: with ps; [ ];
259+ "climate.velbus" = ps: with ps; [ ];
253260 "climate.venstar" = ps: with ps; [ ];
254261 "climate.vera" = ps: with ps; [ ];
255262 "climate.wink" = ps: with ps; [ ];
@@ -260,6 +267,7 @@
260267 "cloud.const" = ps: with ps; [ ];
261268 "cloud.http_api" = ps: with ps; [ ];
262269 "cloud.iot" = ps: with ps; [ ];
270+ "cloud.prefs" = ps: with ps; [ ];
263271 "cloudflare" = ps: with ps; [ ];
264272 "coinbase" = ps: with ps; [ ];
265273 "comfoconnect" = ps: with ps; [ ];
@@ -286,6 +294,7 @@
286294 "cover.command_line" = ps: with ps; [ ];
287295 "cover.deconz" = ps: with ps; [ ];
288296 "cover.demo" = ps: with ps; [ ];
297+ "cover.fibaro" = ps: with ps; [ ];
289298 "cover.garadget" = ps: with ps; [ ];
290299 "cover.gogogate2" = ps: with ps; [ ];
291300 "cover.group" = ps: with ps; [ ];
@@ -339,6 +348,7 @@
339348 "device_tracker.fritz" = ps: with ps; [ fritzconnection ];
340349 "device_tracker.geofency" = ps: with ps; [ aiohttp-cors ];
341350 "device_tracker.google_maps" = ps: with ps; [ ];
351+ "device_tracker.googlehome" = ps: with ps; [ ];
342352 "device_tracker.gpslogger" = ps: with ps; [ aiohttp-cors ];
343353 "device_tracker.hitron_coda" = ps: with ps; [ ];
344354 "device_tracker.huawei_lte" = ps: with ps; [ ];
@@ -356,8 +366,7 @@
356366 "device_tracker.mysensors" = ps: with ps; [ ];
357367 "device_tracker.netgear" = ps: with ps; [ ];
358368 "device_tracker.nmap_tracker" = ps: with ps; [ ];
359− "device_tracker.owntracks" = ps: with ps; [ libnacl paho-mqtt ];
360− "device_tracker.owntracks_http" = ps: with ps; [ aiohttp-cors libnacl ];
369+ "device_tracker.owntracks" = ps: with ps; [ aiohttp-cors libnacl ];
361370 "device_tracker.ping" = ps: with ps; [ ];
362371 "device_tracker.quantum_gateway" = ps: with ps; [ ];
363372 "device_tracker.ritassist" = ps: with ps; [ ];
@@ -370,6 +379,7 @@
370379 "device_tracker.tile" = ps: with ps; [ ];
371380 "device_tracker.tomato" = ps: with ps; [ ];
372381 "device_tracker.tplink" = ps: with ps; [ ];
382+ "device_tracker.traccar" = ps: with ps; [ ];
373383 "device_tracker.trackr" = ps: with ps; [ ];
374384 "device_tracker.ubus" = ps: with ps; [ ];
375385 "device_tracker.unifi" = ps: with ps; [ pyunifi ];
@@ -417,6 +427,7 @@
417427 "fan.zwave" = ps: with ps; [ ];
418428 "feedreader" = ps: with ps; [ feedparser ];
419429 "ffmpeg" = ps: with ps; [ ha-ffmpeg ];
430+ "fibaro" = ps: with ps; [ ];
420431 "folder_watcher" = ps: with ps; [ watchdog ];
421432 "foursquare" = ps: with ps; [ aiohttp-cors ];
422433 "freedns" = ps: with ps; [ ];
@@ -427,6 +438,7 @@
427438 "geo_location.demo" = ps: with ps; [ ];
428439 "geo_location.geo_json_events" = ps: with ps; [ ];
429440 "geo_location.nsw_rural_fire_service_feed" = ps: with ps; [ ];
441+ "geofency" = ps: with ps; [ aiohttp-cors ];
430442 "goalfeed" = ps: with ps; [ ];
431443 "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ];
432444 "google_assistant" = ps: with ps; [ aiohttp-cors ];
@@ -534,6 +546,7 @@
534546 "light.elkm1" = ps: with ps; [ ];
535547 "light.enocean" = ps: with ps; [ ];
536548 "light.eufy" = ps: with ps; [ ];
549+ "light.fibaro" = ps: with ps; [ ];
537550 "light.flux_led" = ps: with ps; [ ];
538551 "light.futurenow" = ps: with ps; [ ];
539552 "light.greenwave" = ps: with ps; [ ];
@@ -563,6 +576,7 @@
563576 "light.mysensors" = ps: with ps; [ ];
564577 "light.mystrom" = ps: with ps; [ ];
565578 "light.nanoleaf_aurora" = ps: with ps; [ nanoleaf ];
579+ "light.niko_home_control" = ps: with ps; [ ];
566580 "light.opple" = ps: with ps; [ ];
567581 "light.osramlightify" = ps: with ps; [ ];
568582 "light.piglow" = ps: with ps; [ ];
@@ -574,6 +588,7 @@
574588 "light.sensehat" = ps: with ps; [ ];
575589 "light.sisyphus" = ps: with ps; [ ];
576590 "light.skybell" = ps: with ps; [ ];
591+ "light.switch" = ps: with ps; [ ];
577592 "light.tellduslive" = ps: with ps; [ ];
578593 "light.tellstick" = ps: with ps; [ ];
579594 "light.template" = ps: with ps; [ ];
@@ -622,6 +637,10 @@
622637 "logger" = ps: with ps; [ ];
623638 "logi_circle" = ps: with ps; [ ];
624639 "lovelace" = ps: with ps; [ ];
640+ "luftdaten" = ps: with ps; [ luftdaten ];
641+ "luftdaten.config_flow" = ps: with ps; [ ];
642+ "luftdaten.const" = ps: with ps; [ ];
643+ "lupusec" = ps: with ps; [ ];
625644 "lutron" = ps: with ps; [ ];
626645 "lutron_caseta" = ps: with ps; [ ];
627646 "mailbox" = ps: with ps; [ aiohttp-cors ];
@@ -671,6 +690,7 @@
671690 "media_player.nadtcp" = ps: with ps; [ ];
672691 "media_player.onkyo" = ps: with ps; [ onkyo-eiscp ];
673692 "media_player.openhome" = ps: with ps; [ ];
693+ "media_player.panasonic_bluray" = ps: with ps; [ ];
674694 "media_player.panasonic_viera" = ps: with ps; [ wakeonlan ];
675695 "media_player.pandora" = ps: with ps; [ pexpect ];
676696 "media_player.philips_js" = ps: with ps; [ ];
@@ -707,6 +727,7 @@
707727 "mqtt.const" = ps: with ps; [ ];
708728 "mqtt.discovery" = ps: with ps; [ ];
709729 "mqtt.server" = ps: with ps; [ aiohttp-cors hbmqtt ];
730+ "mqtt.subscription" = ps: with ps; [ ];
710731 "mqtt_eventstream" = ps: with ps; [ paho-mqtt ];
711732 "mqtt_statestream" = ps: with ps; [ paho-mqtt ];
712733 "mychevy" = ps: with ps; [ ];
@@ -715,6 +736,8 @@
715736 "mysensors.const" = ps: with ps; [ ];
716737 "mysensors.device" = ps: with ps; [ ];
717738 "mysensors.gateway" = ps: with ps; [ ];
739+ "mysensors.handler" = ps: with ps; [ ];
740+ "mysensors.helpers" = ps: with ps; [ ];
718741 "namecheapdns" = ps: with ps; [ ];
719742 "neato" = ps: with ps; [ ];
720743 "nest" = ps: with ps; [ ];
@@ -779,6 +802,7 @@
779802 "notify.syslog" = ps: with ps; [ ];
780803 "notify.telegram" = ps: with ps; [ python-telegram-bot ];
781804 "notify.tibber" = ps: with ps; [ ];
805+ "notify.tplink_lte" = ps: with ps; [ ];
782806 "notify.twilio_call" = ps: with ps; [ aiohttp-cors twilio ];
783807 "notify.twilio_sms" = ps: with ps; [ aiohttp-cors twilio ];
784808 "notify.twitter" = ps: with ps; [ ];
@@ -795,11 +819,16 @@
795819 "openuv" = ps: with ps; [ ];
796820 "openuv.config_flow" = ps: with ps; [ ];
797821 "openuv.const" = ps: with ps; [ ];
822+ "owntracks" = ps: with ps; [ aiohttp-cors libnacl ];
823+ "owntracks.config_flow" = ps: with ps; [ ];
798824 "panel_custom" = ps: with ps; [ aiohttp-cors ];
799825 "panel_iframe" = ps: with ps; [ aiohttp-cors ];
800826 "persistent_notification" = ps: with ps; [ ];
801827 "pilight" = ps: with ps; [ ];
802828 "plant" = ps: with ps; [ ];
829+ "point" = ps: with ps; [ aiohttp-cors ];
830+ "point.config_flow" = ps: with ps; [ ];
831+ "point.const" = ps: with ps; [ ];
803832 "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ];
804833 "proximity" = ps: with ps; [ ];
805834 "python_script" = ps: with ps; [ ];
@@ -808,6 +837,8 @@
808837 "rainbird" = ps: with ps; [ ];
809838 "raincloud" = ps: with ps; [ ];
810839 "rainmachine" = ps: with ps; [ ];
840+ "rainmachine.config_flow" = ps: with ps; [ ];
841+ "rainmachine.const" = ps: with ps; [ ];
811842 "raspihats" = ps: with ps; [ ];
812843 "recorder" = ps: with ps; [ sqlalchemy ];
813844 "recorder.const" = ps: with ps; [ ];
@@ -864,6 +895,7 @@
864895 "sensor.arest" = ps: with ps; [ ];
865896 "sensor.arlo" = ps: with ps; [ ];
866897 "sensor.arwn" = ps: with ps; [ paho-mqtt ];
898+ "sensor.asuswrt" = ps: with ps; [ ];
867899 "sensor.bbox" = ps: with ps; [ ];
868900 "sensor.bh1750" = ps: with ps; [ ];
869901 "sensor.bitcoin" = ps: with ps; [ ];
@@ -922,6 +954,7 @@
922954 "sensor.fail2ban" = ps: with ps; [ ];
923955 "sensor.fastdotcom" = ps: with ps; [ ];
924956 "sensor.fedex" = ps: with ps; [ ];
957+ "sensor.fibaro" = ps: with ps; [ ];
925958 "sensor.fido" = ps: with ps; [ ];
926959 "sensor.file" = ps: with ps; [ ];
927960 "sensor.filesize" = ps: with ps; [ ];
@@ -929,6 +962,7 @@
929962 "sensor.fints" = ps: with ps; [ ];
930963 "sensor.fitbit" = ps: with ps; [ aiohttp-cors ];
931964 "sensor.fixer" = ps: with ps; [ ];
965+ "sensor.flunearyou" = ps: with ps; [ ];
932966 "sensor.folder" = ps: with ps; [ ];
933967 "sensor.foobot" = ps: with ps; [ ];
934968 "sensor.fritzbox_callmonitor" = ps: with ps; [ fritzconnection ];
@@ -973,6 +1007,7 @@
9731007 "sensor.kwb" = ps: with ps; [ ];
9741008 "sensor.lacrosse" = ps: with ps; [ ];
9751009 "sensor.lastfm" = ps: with ps; [ pylast ];
1010+ "sensor.launch_library" = ps: with ps; [ ];
9761011 "sensor.linky" = ps: with ps; [ ];
9771012 "sensor.linux_battery" = ps: with ps; [ batinfo ];
9781013 "sensor.logi_circle" = ps: with ps; [ ];
@@ -982,7 +1017,6 @@
9821017 "sensor.luftdaten" = ps: with ps; [ luftdaten ];
9831018 "sensor.lyft" = ps: with ps; [ ];
9841019 "sensor.magicseaweed" = ps: with ps; [ ];
985− "sensor.melissa" = ps: with ps; [ ];
9861020 "sensor.meteo_france" = ps: with ps; [ ];
9871021 "sensor.metoffice" = ps: with ps; [ ];
9881022 "sensor.mfi" = ps: with ps; [ ];
@@ -1026,6 +1060,7 @@
10261060 "sensor.pilight" = ps: with ps; [ ];
10271061 "sensor.plex" = ps: with ps; [ ];
10281062 "sensor.pocketcasts" = ps: with ps; [ ];
1063+ "sensor.point" = ps: with ps; [ ];
10291064 "sensor.pollen" = ps: with ps; [ numpy ];
10301065 "sensor.postnl" = ps: with ps; [ ];
10311066 "sensor.pushbullet" = ps: with ps; [ pushbullet ];
@@ -1045,6 +1080,7 @@
10451080 "sensor.ripple" = ps: with ps; [ ];
10461081 "sensor.rmvtransport" = ps: with ps; [ ];
10471082 "sensor.rtorrent" = ps: with ps; [ ];
1083+ "sensor.ruter" = ps: with ps; [ ];
10481084 "sensor.sabnzbd" = ps: with ps; [ ];
10491085 "sensor.scrape" = ps: with ps; [ beautifulsoup4 ];
10501086 "sensor.season" = ps: with ps; [ ephem ];
@@ -1052,6 +1088,7 @@
10521088 "sensor.sensehat" = ps: with ps; [ ];
10531089 "sensor.serial" = ps: with ps; [ ];
10541090 "sensor.serial_pm" = ps: with ps; [ ];
1091+ "sensor.seventeentrack" = ps: with ps; [ ];
10551092 "sensor.shodan" = ps: with ps; [ ];
10561093 "sensor.sht31" = ps: with ps; [ ];
10571094 "sensor.sigfox" = ps: with ps; [ ];
@@ -1068,12 +1105,13 @@
10681105 "sensor.speedtest" = ps: with ps; [ speedtest-cli ];
10691106 "sensor.spotcrime" = ps: with ps; [ ];
10701107 "sensor.sql" = ps: with ps; [ sqlalchemy ];
1108+ "sensor.srp_energy" = ps: with ps; [ ];
10711109 "sensor.starlingbank" = ps: with ps; [ ];
10721110 "sensor.startca" = ps: with ps; [ xmltodict ];
10731111 "sensor.statistics" = ps: with ps; [ ];
10741112 "sensor.steam_online" = ps: with ps; [ ];
10751113 "sensor.supervisord" = ps: with ps; [ ];
1076− "sensor.swiss_hydrological_data" = ps: with ps; [ xmltodict ];
1114+ "sensor.swiss_hydrological_data" = ps: with ps; [ ];
10771115 "sensor.swiss_public_transport" = ps: with ps; [ ];
10781116 "sensor.syncthru" = ps: with ps; [ ];
10791117 "sensor.synologydsm" = ps: with ps; [ ];
@@ -1082,6 +1120,7 @@
10821120 "sensor.tado" = ps: with ps; [ ];
10831121 "sensor.tahoma" = ps: with ps; [ ];
10841122 "sensor.tank_utility" = ps: with ps; [ ];
1123+ "sensor.tautulli" = ps: with ps; [ ];
10851124 "sensor.tcp" = ps: with ps; [ ];
10861125 "sensor.ted5000" = ps: with ps; [ xmltodict ];
10871126 "sensor.teksavvy" = ps: with ps; [ ];
@@ -1188,6 +1227,7 @@
11881227 "switch.elkm1" = ps: with ps; [ ];
11891228 "switch.enocean" = ps: with ps; [ ];
11901229 "switch.eufy" = ps: with ps; [ ];
1230+ "switch.fibaro" = ps: with ps; [ ];
11911231 "switch.flux" = ps: with ps; [ ];
11921232 "switch.fritzbox" = ps: with ps; [ ];
11931233 "switch.fritzdect" = ps: with ps; [ ];
@@ -1208,6 +1248,7 @@
12081248 "switch.konnected" = ps: with ps; [ aiohttp-cors netdisco ];
12091249 "switch.linode" = ps: with ps; [ linode-api ];
12101250 "switch.litejet" = ps: with ps; [ ];
1251+ "switch.lupusec" = ps: with ps; [ ];
12111252 "switch.lutron_caseta" = ps: with ps; [ ];
12121253 "switch.mfi" = ps: with ps; [ ];
12131254 "switch.mochad" = ps: with ps; [ ];
@@ -1285,6 +1326,7 @@
12851326 "tibber" = ps: with ps; [ ];
12861327 "timer" = ps: with ps; [ ];
12871328 "toon" = ps: with ps; [ ];
1329+ "tplink_lte" = ps: with ps; [ ];
12881330 "tradfri" = ps: with ps; [ ];
12891331 "tradfri.config_flow" = ps: with ps; [ ];
12901332 "tradfri.const" = ps: with ps; [ ];
@@ -1325,6 +1367,7 @@
13251367 "verisure" = ps: with ps; [ ];
13261368 "volvooncall" = ps: with ps; [ ];
13271369 "vultr" = ps: with ps; [ vultr ];
1370+ "w800rf32" = ps: with ps; [ ];
13281371 "wake_on_lan" = ps: with ps; [ wakeonlan ];
13291372 "water_heater" = ps: with ps; [ ];
13301373 "water_heater.demo" = ps: with ps; [ ];
pkgs/servers/home-assistant/default.nix+6−6
@@ -34,10 +34,10 @@ let
3434 "8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6")
3535 (mkOverride "cryptography_vectors" "2.3.1" # required by cryptography==2.3.1
3636 "bf4d9b61dce69c49e830950aa36fad194706463b0b6dfe81425b9e0bc6644d46")
37− (mkOverride "requests" "2.20.0"
38− "99dcfdaaeb17caf6e526f32b6a7b780461512ab3f1d992187801694cba42770c")
39− (mkOverride "ruamel_yaml" "0.15.72"
40− "97652b9e3a76958cf6684d5d963674adf345d8cc192ddd95e2a21b22cda29f40")
37+ (mkOverride "requests" "2.20.1"
38+ "ea881206e59f41dbd0bd445437d792e43906703fff75ca8ff43ccdb11f33f263")
39+ (mkOverride "ruamel_yaml" "0.15.78"
40+ "85793c5fe321e9202eba521b0bb3e6303bcb61f6e56378f59e874ca36a7e9d5f")
4141 (mkOverride "voluptuous" "0.11.5"
4242 "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef")
4343 (mkOverride "voluptuous-serialize" "2.0.0"
@@ -85,7 +85,7 @@ let
8585 extraBuildInputs = extraPackages py.pkgs;
8686
8787 # Don't forget to run parse-requirements.py after updating
88− hassVersion = "0.82.1";
88+ hassVersion = "0.83.3";
8989
9090in with py.pkgs; buildPythonApplication rec {
9191 pname = "homeassistant";
@@ -100,7 +100,7 @@ in with py.pkgs; buildPythonApplication rec {
100100 owner = "home-assistant";
101101 repo = "home-assistant";
102102 rev = version;
103− sha256 = "0d53xp5miz1vm1b5qfznzx33qzxcxi65plp412dyk4r1ag7rh38v";
103+ sha256 = "1lv9ixv0qd97xpcpb9zzhn82jsgiq4kmcfnfraksq60xwzzqkwar";
104104 };
105105
106106 propagatedBuildInputs = [
pkgs/servers/home-assistant/frontend.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "home-assistant-frontend";
5− version = "20181103.3";
5+ version = "20181121.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "b1b598f637ffc4c37a3d35aa3b912216f0340cb43fa6c50f4617536669d19499";
9+ sha256 = "9cedc4dc4258823b084b9d7634995ab038be109fea4c087e38412b9ef1cb6433";
1010 };
1111
1212 propagatedBuildInputs = [ user-agents ];
pkgs/servers/http/nginx/stable.nix+2−2
@@ -1,6 +1,6 @@
11{ callPackage, ... } @ args:
22
33callPackage ./generic.nix (args // {
4− version = "1.14.1";
5− sha256 = "19542jxcjf4dvrqvgb5vr36mhbzcjrxc3v0xh451rm60610rf2dz";
4+ version = "1.14.2";
5+ sha256 = "15wppq12qmq8acjs35xfj61czhf9cdc0drnl5mm8hcg3aihryb80";
66})
pkgs/servers/nextcloud/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "nextcloud-${version}";
5− version = "14.0.3";
5+ version = "14.0.4";
66
77 src = fetchurl {
88 url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
9− sha256 = "1vykmvkqds1mjz9hl0xapi70s5s66xd8ysw0sczgavir7092gl6p";
9+ sha256 = "1s20dds4sci3g981ql8kp9d1ynss5sa2y3dsbzqx4jv9f5dd2pag";
1010 };
1111
1212 patches = [ (fetchpatch {
pkgs/shells/bash/nix-bash-completions/default.nix+2−2
@@ -1,14 +1,14 @@
11{ stdenv, fetchFromGitHub }:
22
33stdenv.mkDerivation rec {
4− version = "0.6.6";
4+ version = "0.6.7";
55 name = "nix-bash-completions-${version}";
66
77 src = fetchFromGitHub {
88 owner = "hedning";
99 repo = "nix-bash-completions";
1010 rev = "v${version}";
11− sha256 = "1lz9cgacyd4cphr7l90x4hn0ifhxwzz2d5829w1jcglasfacfpsw";
11+ sha256 = "067j1gavpm9zv3vzw9gq0bi3bi0rjrijwprc1j016g44kvpq49qi";
1212 };
1313
1414 # To enable lazy loading via. bash-completion we need a symlink to the script
pkgs/shells/zsh/nix-zsh-completions/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchFromGitHub }:
22
33let
4− version = "0.4.1";
4+ version = "0.4.2";
55in
66
77stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 owner = "spwhitt";
1212 repo = "nix-zsh-completions";
1313 rev = "${version}";
14− sha256 = "1p2y1sg6jghixv2j3fwxnkyl3idj44gcm71bbn25mnqfhm0z25hr";
14+ sha256 = "1pfyn8kd9fc9fyy77imzg6xj00nzddkjagwjs2594db8ynp6cfil";
1515 };
1616
1717 installPhase = ''
pkgs/stdenv/adapters.nix+5−3
@@ -32,13 +32,15 @@ rec {
3232 # Return a modified stdenv that tries to build statically linked
3333 # binaries.
3434 makeStaticBinaries = stdenv: stdenv //
35− { mkDerivation = args: stdenv.mkDerivation (args // {
36− NIX_CFLAGS_LINK = "-static";
35+ { mkDerivation = args:
36+ if stdenv.hostPlatform.isDarwin
37+ then throw "Cannot build fully static binaries on Darwin/macOS"
38+ else stdenv.mkDerivation (args // {
39+ NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + "-static";
3740 configureFlags = (args.configureFlags or []) ++ [
3841 "--disable-shared" # brrr...
3942 ];
4043 });
41− isStatic = true;
4244 };
4345
4446
pkgs/stdenv/cross/default.nix+9−4
@@ -1,11 +1,14 @@
11{ lib
2−, localSystem, crossSystem, config, overlays
2+, localSystem, crossSystem, config, overlays, crossOverlays ? []
33}:
44
55let
66 bootStages = import ../. {
77 inherit lib localSystem overlays;
8− crossSystem = null;
8+
9+ crossSystem = localSystem;
10+ crossOverlays = [];
11+
912 # Ignore custom stdenvs when cross compiling for compatability
1013 config = builtins.removeAttrs config [ "replaceStdenv" ];
1114 };
@@ -33,7 +36,8 @@ in lib.init bootStages ++ [
3336
3437 # Run Packages
3538 (buildPackages: {
36− inherit config overlays;
39+ inherit config;
40+ overlays = overlays ++ crossOverlays;
3741 selfBuild = false;
3842 stdenv = buildPackages.stdenv.override (old: rec {
3943 buildPlatform = localSystem;
@@ -48,7 +52,7 @@ in lib.init bootStages ++ [
4852
4953 cc = if crossSystem.useiOSPrebuilt or false
5054 then buildPackages.darwin.iosSdkPkgs.clang
51− else if crossSystem.useAndroidPrebuilt
55+ else if crossSystem.useAndroidPrebuilt or false
5256 then buildPackages.androidenv."androidndkPkgs_${crossSystem.ndkVer}".gcc
5357 else buildPackages.gcc;
5458
@@ -56,6 +60,7 @@ in lib.init bootStages ++ [
5660 ++ lib.optionals
5761 (hostPlatform.isLinux && !buildPlatform.isLinux)
5862 [ buildPackages.patchelf buildPackages.paxctl ]
63+ ++ lib.optional hostPlatform.isDarwin buildPackages.clang
5964 ++ lib.optional
6065 (let f = p: !p.isx86 || p.libc == "musl"; in f hostPlatform && !(f buildPlatform))
6166 buildPackages.updateAutotoolsGnuConfigScriptsHook
pkgs/stdenv/custom/default.nix+1−1
@@ -2,7 +2,7 @@
22, localSystem, crossSystem, config, overlays
33}:
44
5−assert crossSystem == null;
5+assert crossSystem == localSystem;
66
77let
88 bootStages = import ../. {
pkgs/stdenv/darwin/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib
2−, localSystem, crossSystem, config, overlays
2+, localSystem, crossSystem, config, overlays, crossOverlays ? []
33
44# Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
55, bootstrapFiles ? let
@@ -16,7 +16,7 @@
1616 }
1717}:
1818
19−assert crossSystem == null;
19+assert crossSystem == localSystem;
2020
2121let
2222 inherit (localSystem) system platform;
pkgs/stdenv/darwin/portable-libsystem.shnew file+12
@@ -0,0 +1,12 @@
1+# Make /nix/store/...-libSystem “portable” for static built binaries.
2+# This just rewrites everything in $1/bin to use the
3+# /usr/lib/libSystem.B.dylib that is provided on every macOS system.
4+
5+fixupOutputHooks+=('fixLibsystemRefs $prefix')
6+
7+fixLibsystemRefs() {
8+ if [ -d "$1/bin" ]; then
9+ find "$1/bin" -exec \
10+ install_name_tool -change @libsystem@ /usr/lib/libSystem.B.dylib {} \;
11+ fi
12+}
pkgs/stdenv/default.nix+2−2
@@ -7,7 +7,7 @@
77{ # Args just for stdenvs' usage
88 lib
99 # Args to pass on to the pkgset builder, too
10−, localSystem, crossSystem, config, overlays
10+, localSystem, crossSystem, config, overlays, crossOverlays ? []
1111} @ args:
1212
1313let
@@ -36,7 +36,7 @@ let
3636
3737 # Select the appropriate stages for the platform `system'.
3838in
39− if crossSystem != null then stagesCross
39+ if crossSystem != localSystem || crossOverlays != [] then stagesCross
4040 else if config ? replaceStdenv then stagesCustom
4141 else { # switch
4242 "i686-linux" = stagesLinux;
pkgs/stdenv/freebsd/default.nix+1−1
@@ -2,7 +2,7 @@
22, localSystem, crossSystem, config, overlays
33}:
44
5−assert crossSystem == null;
5+assert crossSystem == localSystem;
66let inherit (localSystem) system; in
77
88
pkgs/stdenv/linux/default.nix+2−2
@@ -4,7 +4,7 @@
44# compiler and linker that do not search in default locations,
55# ensuring purity of components produced by it.
66{ lib
7−, localSystem, crossSystem, config, overlays
7+, localSystem, crossSystem, config, overlays, crossOverlays ? []
88
99, bootstrapFiles ?
1010 let table = {
@@ -32,7 +32,7 @@
3232 in files
3333}:
3434
35−assert crossSystem == null;
35+assert crossSystem == localSystem;
3636
3737let
3838 inherit (localSystem) system platform;
pkgs/stdenv/native/default.nix+1−1
@@ -2,7 +2,7 @@
22, localSystem, crossSystem, config, overlays
33}:
44
5−assert crossSystem == null;
5+assert crossSystem == localSystem;
66
77let
88 inherit (localSystem) system;
pkgs/stdenv/nix/default.nix+2−2
@@ -1,10 +1,10 @@
11{ lib
2−, crossSystem, config, overlays
2+, crossSystem, localSystem, config, overlays
33, bootStages
44, ...
55}:
66
7−assert crossSystem == null;
7+assert crossSystem == localSystem;
88
99bootStages ++ [
1010 (prevStage: {
pkgs/tools/filesystems/btrfs-progs/default.nix+2−2
@@ -4,11 +4,11 @@
44
55stdenv.mkDerivation rec {
66 name = "btrfs-progs-${version}";
7− version = "4.19";
7+ version = "4.19.1";
88
99 src = fetchurl {
1010 url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
11− sha256 = "0jd3bsg3117ysr82n03w33sqw1g9z1ciixcxrwgp90yghvjzp4fm";
11+ sha256 = "1f7gpk9206ph081fr0af8k57i58zjb03xwd8k69177a7rzsjmn04";
1212 };
1313
1414 nativeBuildInputs = [
pkgs/tools/misc/cowsay/default.nix+11−1
@@ -11,8 +11,18 @@ stdenv.mkDerivation rec{
1111
1212 buildInputs = [ perl ];
1313
14+ postBuild = ''
15+ substituteInPlace cowsay --replace "%BANGPERL%" "!${perl}/bin/perl" \
16+ --replace "%PREFIX%" "$out"
17+ '';
18+
1419 installPhase = ''
15− bash ./install.sh $out
20+ mkdir -p $out/{bin,man/man1,share/cows}
21+ install -m755 cowsay $out/bin/cowsay
22+ ln -s cowsay $out/bin/cowthink
23+ install -m644 cowsay.1 $out/man/man1/cowsay.1
24+ ln -s cowsay.1 $out/man/man1/cowthink.1
25+ install -m644 cows/* -t $out/share/cows/
1626 '';
1727
1828 meta = with stdenv.lib; {
pkgs/tools/misc/kodi-cli/default.nixnew file+31
@@ -0,0 +1,31 @@
1+{ stdenv, fetchFromGitHub, makeWrapper, curl, bash, jq, youtube-dl, gnome3 }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "kodi-cli";
5+ version = "1.1.1";
6+
7+ src = fetchFromGitHub {
8+ owner = "nawar";
9+ repo = pname;
10+ rev = version;
11+ sha256 = "0f9wdq2fg8hlpk3qbjfkb3imprxkvdrhxfkcvr3dwfma0j2yfwam";
12+ };
13+
14+ nativeBuildInputs = [ makeWrapper ];
15+
16+ installPhase = ''
17+ mkdir -p $out/bin
18+ cp -a kodi-cli $out/bin
19+ wrapProgram $out/bin/kodi-cli --prefix PATH : ${stdenv.lib.makeBinPath [ curl bash ]}
20+ cp -a playlist_to_kodi $out/bin
21+ wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${stdenv.lib.makeBinPath [ curl bash gnome3.zenity jq youtube-dl ]}
22+ '';
23+
24+ meta = with stdenv.lib; {
25+ homepage = https://github.com/nawar/kodi-cli;
26+ description = "Kodi/XBMC bash script to send Kodi commands using JSON RPC. It also allows sending YouTube videos to Kodi";
27+ license = licenses.gpl2;
28+ platforms = platforms.unix;
29+ maintainers = [ maintainers.pstn ];
30+ };
31+}
pkgs/tools/misc/loop/default.nixnew file+21
@@ -0,0 +1,21 @@
1+{ stdenv, fetchFromGitHub, rustPlatform }:
2+
3+rustPlatform.buildRustPackage {
4+ name = "loop-unstable-2018-12-04";
5+
6+ src = fetchFromGitHub {
7+ owner = "Miserlou";
8+ repo = "Loop";
9+ rev = "598ccc8e52bb13b8aff78b61cfe5b10ff576cecf";
10+ sha256 = "0f33sc1slg97q1aisdrb465c3p7fgdh2swv8k3yphpnja37f5nl4";
11+ };
12+
13+ cargoSha256 = "1ccf8dkswwdbwf9diy0l4vc4i2g05ynhi3w1jg3b2ldrvj0j9m9s";
14+
15+ meta = with stdenv.lib; {
16+ description = "UNIX's missing `loop` command";
17+ homepage = https://github.com/Miserlou/Loop;
18+ maintainers = with maintainers; [ koral ];
19+ license = licenses.mit;
20+ };
21+}
pkgs/tools/misc/rig/default.nixnew file+31
@@ -0,0 +1,31 @@
1+{ stdenv, fetchurl } :
2+
3+stdenv.mkDerivation rec {
4+ version = "1.11";
5+ name = "rig-${version}";
6+
7+ src = fetchurl {
8+ url = "https://ayera.dl.sourceforge.net/project/rig/rig/${version}/rig-${version}.tar.gz";
9+ sha256 = "1f3snysjqqlpk2kgvm5p2icrj4lsdymccmn3igkc2f60smqckgq0";
10+ };
11+
12+ # Note: diff modified from Debian: Norbert Veber <nveber@debian.org>
13+ # http://deb.debian.org/debian/pool/main/r/rig/rig_1.11-1.diff.gz
14+ patches = [ ./rig_1.11-1.diff ];
15+
16+ meta = {
17+ homepage = http://rig.sourceforge.net/;
18+ description = "Random identity generator";
19+ longDescription = ''
20+ RIG (Random Identity Generator) is a free replacement for a shareware
21+ program out there called 'fake'. It generates random, yet real-looking,
22+ personal data. It is useful if you need to feed a name to a Web site,
23+ BBS, or real person, and are too lazy to think of one yourself. Also,
24+ if the Web site/BBS/person you are giving the information to tries to
25+ cross-check the city, state, zip, or area code, it will check out.
26+ '';
27+ license = stdenv.lib.licenses.gpl2;
28+ maintainers = with stdenv.lib.maintainers; [ tomberek ];
29+ platforms = with stdenv.lib.platforms; all;
30+ };
31+}
pkgs/tools/misc/rig/rig_1.11-1.diffnew file+39
@@ -0,0 +1,39 @@
1+--- rig-1.11.orig/Makefile
2++++ rig-1.11/Makefile
3+@@ -1,20 +1,21 @@
4+-PREFIX=/usr/local
5++PREFIX=${out}
6+ BINDIR=${PREFIX}/bin
7+ MANDIR=${PREFIX}/man
8+ DATADIR=${PREFIX}/share/rig
9++CXX=g++
10+
11+ all: rig rig.6
12+ rig: rig.cc
13+- g++ -g rig.cc -o rig -Wall -DDATADIR="\"$(DATADIR)\""
14++ ${CXX} -O2 -g rig.cc -o rig -Wall -DDATADIR="\"$(DATADIR)\""
15+
16+ rig.6: rig.6.in
17+ sed s@DATADIR@"$(DATADIR)"@g < rig.6.in > rig.6
18+
19+ install: rig rig.6
20+- install -g 0 -m 755 -o 0 -s rig $(BINDIR)
21+- install -g 0 -m 644 -o 0 rig.6 $(MANDIR)/man6/rig.6
22+- install -g 0 -m 755 -o 0 -d $(DATADIR)
23+- install -g 0 -m 644 -o 0 data/*.idx $(DATADIR)
24++ install -m 755 -d $(DESTDIR)$(DATADIR)
25++ install -m 755 -d $(DESTDIR)$(BINDIR)
26++ install -m 755 rig $(DESTDIR)$(BINDIR)/rig
27++ install -m 644 data/*.idx $(DESTDIR)$(DATADIR)
28+
29+ clean:
30+ rm -rf *~ *.rej *.orig *.o rig rig.6
31+--- rig-1.11.orig/rig.cc
32++++ rig-1.11/rig.cc
33+@@ -26,6 +26,7 @@
34+ #include <time.h>
35+ #include <errno.h>
36+ #include <assert.h>
37++#include <string.h>
38+
39+ using namespace std;
pkgs/tools/misc/termtosvg/default.nix+3−7
@@ -2,21 +2,17 @@
22
33python3.pkgs.buildPythonApplication rec {
44 pname = "termtosvg";
5− version = "0.3.0";
5+ version = "0.6.0";
66
77 # tests are not available when fetching from pypi
88 src = fetchFromGitHub {
99 owner = "nbedos";
1010 repo = pname;
1111 rev = version;
12− sha256 = "09hw0467pyfj5gwn3768b3rvs5ch3wb1kaax7zsqjd7mw2qh0cjw";
12+ sha256 = "07d9ashxph16phhawypm99wlx82975hqk08v1n56hxr0nr4f7nd2";
1313 };
1414
15− propagatedBuildInputs = with python3.pkgs; [ svgwrite pyte ];
16−
17− checkInputs = [ python3.pkgs.mock ];
18− preCheck = "export HOME=$(mktemp -d)";
19− postCheck = "unset HOME";
15+ propagatedBuildInputs = with python3.pkgs; [ lxml pyte ];
2016
2117 meta = with lib; {
2218 homepage = https://github.com/nbedos/termtosvg;
pkgs/tools/networking/amass/default.nix+13−7
@@ -1,11 +1,12 @@
11{ buildGoPackage
22, fetchFromGitHub
3+, fetchpatch
34, lib
45}:
56
67buildGoPackage rec {
78 name = "amass-${version}";
8− version = "2.8.3";
9+ version = "2.8.5";
910
1011 goPackagePath = "github.com/OWASP/Amass";
1112
@@ -13,17 +14,19 @@ buildGoPackage rec {
1314 owner = "OWASP";
1415 repo = "Amass";
1516 rev = version;
16− sha256 = "1pidi7bpg5z04l6ryfd7rqxshayvkqmgav0f6f1fxz4jwrmx9nnc";
17+ sha256 = "1nsqg1p7hcv369d53n13xps3ks6fgzkkp6v9q87l04yj32nbr5qy";
1718 };
1819
19− # NOTE: this must be removed once amass > 2.8.3 is released. This version has
20− # a broken import caused by the project migrating to a new home.
21− preBuild = ''
22− sed -e 's:github.com/caffix/amass/amass/core:github.com/OWASP/Amass/amass/core:g' -i "go/src/${goPackagePath}/cmd/amass.netdomains/main.go"
23− '';
20+ outputs = [ "bin" "out" "wordlists" ];
2421
2522 goDeps = ./deps.nix;
2623
24+ postInstall = ''
25+ mkdir -p $wordlists
26+ cp -R $src/wordlists/*.txt $wordlists
27+ gzip $wordlists/*.txt
28+ '';
29+
2730 meta = with lib; {
2831 description = "In-Depth DNS Enumeration and Network Mapping";
2932 longDescription = ''
@@ -33,6 +36,9 @@ buildGoPackage rec {
3336 uses the IP addresses obtained during resolution to discover associated
3437 netblocks and ASNs. All the information is then used to build maps of the
3538 target networks.
39+
40+ Amass ships with a set of wordlist (to be used with the amass -w flag)
41+ that are found under the wordlists output.
3642 '';
3743 homepage = https://www.owasp.org/index.php/OWASP_Amass_Project;
3844 license = licenses.asl20;
pkgs/tools/networking/amass/deps.nix+2−2
@@ -94,8 +94,8 @@
9494 fetch = {
9595 type = "git";
9696 url = "https://go.googlesource.com/sys";
97− rev = "93218def8b18e66adbdab3eca8ec334700329f1f";
98− sha256 = "0v0zdnsi0vw03dcfir7b228g02ag7jr7mgbgv6lnjwbbccxv07pz";
97+ rev = "ec83556a53fe16b65c452a104ea9d1e86a671852";
98+ sha256 = "1ijlbyn5gs8g6z2pjlj5h77lg7wrljqxdls4xlcfqxmghxiyci2f";
9999 };
100100 }
101101]
pkgs/tools/networking/dhcpcd/default.nix+5−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, udev, runtimeShellPackage }:
1+{ stdenv, fetchurl, pkgconfig, udev, runtimeShellPackage, runtimeShell }:
22
33stdenv.mkDerivation rec {
44 # when updating this to >=7, check, see previous reverts:
@@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
1616 runtimeShellPackage # So patchShebangs finds a bash suitable for the installed scripts
1717 ];
1818
19+ prePatch = ''
20+ substituteInPlace hooks/dhcpcd-run-hooks.in --replace /bin/sh ${runtimeShell}
21+ '';
22+
1923 preConfigure = "patchShebangs ./configure";
2024
2125 configureFlags = [
pkgs/tools/networking/dsniff/default.nixnew file+82
@@ -0,0 +1,82 @@
1+{ stdenv, fetchFromGitLab, autoreconfHook, libpcap, db, glib, libnet, libnids, symlinkJoin, openssl_1_1 }:
2+let
3+ /*
4+ dsniff's build system unconditionnaly wants static libraries and does not
5+ support multi output derivations. We do some overriding to give it
6+ satisfaction.
7+ */
8+ staticdb = symlinkJoin {
9+ inherit (db) name;
10+ paths = with db.overrideAttrs(old: { dontDisableStatic = true; }); [ out dev ];
11+ postBuild = ''
12+ rm $out/lib/*.so*
13+ '';
14+ };
15+ pcap = symlinkJoin {
16+ inherit (libpcap) name;
17+ paths = [ libpcap ];
18+ postBuild = ''
19+ cp -rs $out/include/pcap $out/include/net
20+ # prevent references to libpcap
21+ rm $out/lib/*.so*
22+ '';
23+ };
24+ net = symlinkJoin {
25+ inherit (libnet) name;
26+ paths = [ (libnet.overrideAttrs(old: { dontDisableStatic = true; })) ];
27+ postBuild = ''
28+ # prevent dynamic linking, now that we have a static library
29+ rm $out/lib/*.so*
30+ '';
31+ };
32+ nids = libnids.overrideAttrs(old: {
33+ dontDisableStatic = true;
34+ });
35+ ssl = symlinkJoin {
36+ inherit (openssl_1_1) name;
37+ paths = with openssl_1_1.override { static = true; }; [ out dev ];
38+ };
39+in stdenv.mkDerivation {
40+ pname = "dsniff";
41+ version = "2.4b1";
42+ # upstream is so old that nearly every distribution packages the beta version.
43+ # Also, upstream only serves the latest version, so we use debian's sources.
44+ # this way we can benefit the numerous debian patches to be able to build
45+ # dsniff with recent libraries.
46+ src = fetchFromGitLab {
47+ domain = "salsa.debian.org";
48+ owner = "pkg-security-team";
49+ repo = "dsniff";
50+ rev = "debian%2F2.4b1%2Bdebian-29"; # %2B = urlquote("+"), %2F = urlquote("/")
51+ sha256 = "10zz9krf65jsqvlcr72ycp5cd27xwr18jkc38zqp2i4j6x0caj2g";
52+ name = "dsniff.tar.gz";
53+ };
54+
55+ nativeBuildInputs = [ autoreconfHook ];
56+ buildInputs = [ glib pcap ];
57+ NIX_CFLAGS_LINK = "-lglib-2.0";
58+ postPatch = ''
59+ for patch in debian/patches/*.patch; do
60+ patch < $patch
61+ done;
62+ '';
63+ configureFlags = [
64+ "--with-db=${staticdb}"
65+ "--with-libpcap=${pcap}"
66+ "--with-libnet=${net}"
67+ "--with-libnids=${nids}"
68+ "--with-openssl=${ssl}"
69+ ];
70+
71+ meta = with stdenv.lib; {
72+ description = "collection of tools for network auditing and penetration testing";
73+ longDescription = ''
74+ dsniff, filesnarf, mailsnarf, msgsnarf, urlsnarf, and webspy passively monitor a network for interesting data (passwords, e-mail, files, etc.). arpspoof, dnsspoof, and macof facilitate the interception of network traffic normally unavailable to an attacker (e.g, due to layer-2 switching). sshmitm and webmitm implement active monkey-in-the-middle attacks against redirected SSH and HTTPS sessions by exploiting weak bindings in ad-hoc PKI.
75+ '';
76+ homepage = https://www.monkey.org/~dugsong/dsniff/;
77+ license = licenses.bsd3;
78+ maintainers = [ maintainers.symphorien ];
79+ # bsd and solaris should work as well
80+ platforms = platforms.linux;
81+ };
82+}
pkgs/tools/networking/libnids/default.nixnew file+31
@@ -0,0 +1,31 @@
1+{ stdenv, fetchzip, libpcap, glib, pkgconfig, libnet }:
2+stdenv.mkDerivation {
3+ pname = "libnids";
4+ version = "1.24";
5+ src = fetchzip {
6+ url = "mirror://sourceforge/libnids/libnids-1.24.tar.gz";
7+ sha256 = "1cblklfdfxcmy0an6xyyzx4l877xdawhjd28daqfsvrh81mb07k1";
8+ };
9+ nativeBuildInputs = [ pkgconfig ];
10+ buildInputs = [ libpcap glib libnet ];
11+
12+ /*
13+ Quoting the documentation of glib: g_thread_init has been deprecated since
14+ version 2.32 and should not be used in newly-written code. This function is
15+ no longer necessary. The GLib threading system is automatically initialized
16+ at the start of your program.
17+
18+ this is necessary for dsniff to compile; otherwise g_thread_init is a missing
19+ symbol when linking (?!?)
20+ */
21+ NIX_CFLAGS_COMPILE="-Dg_thread_init= ";
22+
23+ meta = with stdenv.lib; {
24+ description = "An E-component of Network Intrusion Detection System which emulates the IP stack of Linux 2.0.x";
25+ homepage = http://libnids.sourceforge.net/;
26+ license = licenses.gpl2;
27+ maintainers = [ maintainers.symphorien ];
28+ # probably also bsd and solaris
29+ platforms = platforms.linux;
30+ };
31+}
pkgs/tools/networking/qr-filetransfer/default.nixnew file+30
@@ -0,0 +1,30 @@
1+{ stdenv, buildGoPackage, fetchFromGitHub }:
2+
3+buildGoPackage rec {
4+ name = "qr-filetransfer-unstable-${version}";
5+ version = "2018-10-22";
6+
7+ goPackagePath = "github.com/claudiodangelis/qr-filetransfer";
8+
9+ src = fetchFromGitHub {
10+ rev = "b1e5b91aa2aa469f870c62074e879d46e353edae";
11+ owner = "claudiodangelis";
12+ repo = "qr-filetransfer";
13+ sha256 = "04cl3v6bzpaxp1scpsa42xxa1c1brbplq408bb7nixa98bacj4x1";
14+ };
15+
16+ goDeps = ./deps.nix;
17+
18+ meta = with stdenv.lib; {
19+ homepage = https://github.com/claudiodangelis/qr-filetransfer;
20+ description = "Transfer files over wifi by scanning a QR code from your terminal";
21+ longDescription = ''
22+ qr-filetransfer binds a web server to the address of your Wi-Fi network
23+ interface on a random port and creates a handler for it. The default
24+ handler serves the content and exits the program when the transfer is
25+ complete.
26+ '';
27+ license = licenses.mit;
28+ maintainers = with maintainers; [ fgaz ];
29+ };
30+}
pkgs/tools/networking/qr-filetransfer/deps.nixnew file+66
@@ -0,0 +1,66 @@
1+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
2+[
3+ {
4+ goPackagePath = "github.com/mattn/go-colorable";
5+ fetch = {
6+ type = "git";
7+ url = "https://github.com/mattn/go-colorable";
8+ rev = "efa589957cd060542a26d2dd7832fd6a6c6c3ade";
9+ sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r";
10+ };
11+ }
12+ {
13+ goPackagePath = "github.com/mattn/go-isatty";
14+ fetch = {
15+ type = "git";
16+ url = "https://github.com/mattn/go-isatty";
17+ rev = "3fb116b820352b7f0c281308a4d6250c22d94e27";
18+ sha256 = "084hplr4n4g5nvp70clljk428hc963460xz0ggcj3xdi4w7hhsvv";
19+ };
20+ }
21+ {
22+ goPackagePath = "github.com/mattn/go-runewidth";
23+ fetch = {
24+ type = "git";
25+ url = "https://github.com/mattn/go-runewidth";
26+ rev = "c88d7e5f2e24de48a200a2655ac8a0910be9a0f7";
27+ sha256 = "14prmzjlv9z31n6caaaq1kwi4p0mp3x4pv5r7d0575lcampa41jw";
28+ };
29+ }
30+ {
31+ goPackagePath = "github.com/mdp/qrterminal";
32+ fetch = {
33+ type = "git";
34+ url = "https://github.com/mdp/qrterminal";
35+ rev = "6967d3624af633162b77160078e12a4c14174470";
36+ sha256 = "1f2zrdv9sw2a6ni1712d27cayr3f8whqagx6f0yglc5gdd9f3i2n";
37+ };
38+ }
39+ {
40+ goPackagePath = "golang.org/x/sys";
41+ fetch = {
42+ type = "git";
43+ url = "https://go.googlesource.com/sys";
44+ rev = "a5c9d58dba9a56f97aaa86f55e638b718c5a6c42";
45+ sha256 = "02qv5i7yps35p7fa81345qz7k8i73gkigj69anwmpw9rhpmzayf9";
46+ };
47+ }
48+ {
49+ goPackagePath = "gopkg.in/cheggaaa/pb.v1";
50+ fetch = {
51+ type = "git";
52+ url = "https://gopkg.in/cheggaaa/pb.v1";
53+ rev = "007b75a044e968336a69a6c0c617251ab62ac14c";
54+ sha256 = "0l8m5cy6fbir7nrsk985ap7dxp9qlfmh8r73g7j9zg7pfq3lkhad";
55+ };
56+ }
57+ {
58+ goPackagePath = "rsc.io/qr";
59+ fetch = {
60+ type = "git";
61+ url = "https://github.com/rsc/qr";
62+ rev = "ca9a01fc2f9505024045632c50e5e8cd6142fafe";
63+ sha256 = "04yx493g0fqp8i59zjxnl4k3s0cl0kr5m8xh0ph8m10r1hkw0xr3";
64+ };
65+ }
66+]
pkgs/tools/package-management/appimage-run/default.nix+1
@@ -66,6 +66,7 @@ buildFHSUserEnv {
6666 dbus-glib
6767 libav
6868 atk
69+ at-spi2-atk
6970 libudev0-shim
7071 networkmanager098
7172
pkgs/tools/package-management/nix-index/default.nix+5−3
@@ -1,5 +1,5 @@
1−{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, curl
2−, Security
1+{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, makeWrapper, openssl, curl
2+, nix, Security
33}:
44
55rustPlatform.buildRustPackage rec {
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
1313 sha256 = "05fqfwz34n4ijw7ydw2n6bh4bv64rhks85cn720sy5r7bmhfmfa8";
1414 };
1515 cargoSha256 = "045qm7cyg3sdvf22i8b9cz8gsvggs5bn9xz8k1pvn5gxb7zj24cx";
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkgconfig makeWrapper ];
1717 buildInputs = [ openssl curl ]
1818 ++ stdenv.lib.optional stdenv.isDarwin Security;
1919
@@ -24,6 +24,8 @@ rustPlatform.buildRustPackage rec {
2424 cp ./command-not-found.sh $out/etc/profile.d/command-not-found.sh
2525 substituteInPlace $out/etc/profile.d/command-not-found.sh \
2626 --replace "@out@" "$out"
27+ wrapProgram $out/bin/nix-index \
28+ --prefix PATH : "${stdenv.lib.makeBinPath [ nix ]}"
2729 '';
2830
2931 meta = with stdenv.lib; {
pkgs/tools/package-management/nix-review/default.nix+2−2
@@ -8,13 +8,13 @@
88
99python3.pkgs.buildPythonApplication rec {
1010 pname = "nix-review";
11− version = "0.6.1";
11+ version = "1.0.1";
1212
1313 src = fetchFromGitHub {
1414 owner = "Mic92";
1515 repo = "nix-review";
1616 rev = version;
17− sha256 = "0ggw90zp40mms4hpphcn1vy1764rbvl2ix45h26v0wkn32cbqn49";
17+ sha256 = "18z7dws3ngx0ffqqgybq65xxsiycildd101q58sj51z1k3lnrynh";
1818 };
1919
2020 makeWrapperArgs = [
pkgs/tools/security/chrome-token-signing/default.nix+4−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, qmake, pcsclite, pkgconfig }:
1+{ stdenv, fetchFromGitHub, qmake, pcsclite, pkgconfig, opensc }:
22
33stdenv.mkDerivation rec {
44 name = "chrome-token-signing-${version}";
@@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
1616
1717 patchPhase = ''
1818 substituteInPlace host-linux/ee.ria.esteid.json --replace /usr $out
19+ # TODO: macos
20+ substituteInPlace host-shared/PKCS11Path.cpp \
21+ --replace opensc-pkcs11.so ${opensc}/lib/pkcs11/opensc-pkcs11.so
1922 '';
2023
2124 installPhase = ''
pkgs/tools/security/nsjail/default.nix+8−1
@@ -1,5 +1,6 @@
11{ stdenv, fetchFromGitHub, autoconf, bison, flex, libtool, pkgconfig, which
2−, libnl, protobuf, protobufc }:
2+, libnl, protobuf, protobufc, shadow
3+}:
34
45stdenv.mkDerivation rec {
56 name = "nsjail-${version}";
@@ -13,6 +14,12 @@ stdenv.mkDerivation rec {
1314 sha256 = "0cgycj0cz74plmz4asxryqprg6mkzpmnxzqbfsp1wwackinxq5fq";
1415 };
1516
17+ postPatch = ''
18+ substituteInPlace user.cc \
19+ --replace "/usr/bin/newgidmap" "${shadow}/bin/newgidmap" \
20+ --replace "/usr/bin/newuidmap" "${shadow}/bin/newuidmap"
21+ '';
22+
1623 nativeBuildInputs = [ autoconf bison flex libtool pkgconfig which ];
1724 buildInputs = [ libnl protobuf protobufc ];
1825 enableParallelBuilding = true;
pkgs/tools/security/pass/extensions/default.nix+1
@@ -12,4 +12,5 @@ with pkgs;
1212 pass-otp = callPackage ./otp.nix {};
1313 pass-tomb = callPackage ./tomb.nix {};
1414 pass-update = callPackage ./update.nix {};
15+ pass-genphrase = callPackage ./genphrase.nix {};
1516}
pkgs/tools/security/pass/extensions/genphrase.nixnew file+32
@@ -0,0 +1,32 @@
1+{ stdenv, pass, fetchFromGitHub }:
2+
3+stdenv.mkDerivation rec {
4+ name = "pass-genphrase-${version}";
5+ version = "0.1";
6+
7+ src = fetchFromGitHub {
8+ owner = "congma";
9+ repo = "pass-genphrase";
10+ rev = "${version}";
11+ sha256 = "0vcg3b79n1r949qfn8ns85bq2mfsmbf4jw2dlzif8425n8ppfsgd";
12+ };
13+
14+ dontBuild = true;
15+
16+ installTargets = "globalinstall";
17+
18+ installFlags = [ "PREFIX=$(out)" ];
19+
20+ postFixup = ''
21+ substituteInPlace $out/lib/password-store/extensions/genphrase.bash \
22+ --replace '$EXTENSIONS' "$out/lib/password-store/extensions/"
23+ '';
24+
25+ meta = with stdenv.lib; {
26+ description = "Pass extension that generates memorable passwords";
27+ homepage = https://github.com/congma/pass-genphrase;
28+ license = licenses.gpl3;
29+ maintainers = with maintainers; [ seqizz ];
30+ platforms = platforms.unix;
31+ };
32+}
pkgs/tools/security/vault/default.nix+4−13
@@ -1,23 +1,14 @@
11{ stdenv, fetchFromGitHub, go, gox, removeReferencesTo }:
22
3−let
4− # Deprecated since vault 0.8.2: use `vault -autocomplete-install` instead
5− # to install auto-complete for bash, zsh and fish
6− vaultBashCompletions = fetchFromGitHub {
7− owner = "iljaweis";
8− repo = "vault-bash-completion";
9− rev = "e2f59b64be1fa5430fa05c91b6274284de4ea77c";
10− sha256 = "10m75rp3hy71wlmnd88grmpjhqy0pwb9m8wm19l0f463xla54frd";
11− };
12−in stdenv.mkDerivation rec {
3+stdenv.mkDerivation rec {
134 name = "vault-${version}";
14− version = "0.11.2";
5+ version = "1.0.0";
156
167 src = fetchFromGitHub {
178 owner = "hashicorp";
189 repo = "vault";
1910 rev = "v${version}";
20− sha256 = "0lckpfp1yw6rfq2cardsp2qjiajg706qjk98cycrlsa5nr2csafa";
11+ sha256 = "0wqqf9mif6icfl888w2izvml7vqs4hkd5hrq4dhzcyig5w1bp0if";
2112 };
2213
2314 nativeBuildInputs = [ go gox removeReferencesTo ];
@@ -39,7 +30,7 @@ in stdenv.mkDerivation rec {
3930 cp pkg/*/* $out/bin/
4031 find $out/bin -type f -exec remove-references-to -t ${go} '{}' +
4132
42− cp ${vaultBashCompletions}/vault-bash-completion.sh $out/share/bash-completion/completions/vault
33+ echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault
4334 '';
4435
4536 meta = with stdenv.lib; {
pkgs/tools/system/proot/default.nix+2−7
@@ -1,6 +1,5 @@
11{ stdenv, fetchFromGitHub, fetchpatch
2−, talloc, docutils
3−, enableStatic ? true }:
2+, talloc, docutils }:
43
54({ version, rev, sha256, patches }: stdenv.mkDerivation {
65 name = "proot-${version}";
@@ -12,17 +11,13 @@
1211 owner = "cedric-vincent";
1312 };
1413
15− buildInputs = [ talloc ] ++ stdenv.lib.optional enableStatic stdenv.cc.libc.static;
14+ buildInputs = [ talloc ];
1615 nativeBuildInputs = [ docutils ];
1716
1817 enableParallelBuilding = true;
1918
2019 inherit patches;
2120
22− preBuild = stdenv.lib.optionalString enableStatic ''
23− export LDFLAGS="-static"
24− '';
25−
2621 makeFlags = [ "-C src" ];
2722
2823 postBuild = ''
pkgs/tools/typesetting/tectonic/default.nix+3−3
@@ -3,16 +3,16 @@
33
44rustPlatform.buildRustPackage rec {
55 name = "tectonic-${version}";
6− version = "0.1.9";
6+ version = "0.1.11";
77
88 src = fetchFromGitHub {
99 owner = "tectonic-typesetting";
1010 repo = "tectonic";
1111 rev = "v${version}";
12− sha256 = "1prrw1npmmqjx966dxrr4jll16scf0cv24nnc70zlbwwb15zhgiq";
12+ sha256 = "1j98qxlq74vs8nf2jsn2xw9iyrf8kih4v0hrvznkhcab6bpibp2x";
1313 };
1414
15− cargoSha256 = "00hcs9k9x23xy1pgf8skgb6i5kjwgipy8c0d27nniaxa3dpy5daq";
15+ cargoSha256 = "1zgav5zxfvdnrr7himykj5ha20cb5ldxpcpl8y6d19dirxvcmpc6";
1616
1717 nativeBuildInputs = [ pkgconfig ];
1818
pkgs/tools/virtualization/google-compute-engine/default.nix+2−1
@@ -2,6 +2,7 @@
22, fetchFromGitHub
33, buildPythonApplication
44, bash
5+, bashInteractive
56, systemd
67, utillinux
78, boto
@@ -25,7 +26,7 @@ buildPythonApplication rec {
2526 for file in $(find google_compute_engine -type f); do
2627 substituteInPlace "$file" \
2728 --replace /bin/systemctl "${systemd}/bin/systemctl" \
28− --replace /bin/bash "${bash}/bin/bash" \
29+ --replace /bin/bash "${bashInteractive}/bin/bash" \
2930 --replace /sbin/hwclock "${utillinux}/bin/hwclock"
3031
3132 # SELinux tool ??? /sbin/restorecon
pkgs/top-level/aliases.nix+1
@@ -210,6 +210,7 @@ mapAliases ({
210210 opencl-icd = ocl-icd; # added 2017-01-20
211211 openexr_ctl = ctl; # added 2018-04-25
212212 openjpeg_2_1 = openjpeg_2; # added 2018-10-25
213+ opensans-ttf = open-sans; # added 2018-12-04
213214 openssh_with_kerberos = openssh; # added 2018-01-28
214215 owncloudclient = owncloud-client; # added 2016-08
215216 p11_kit = p11-kit; # added 2018-02-25
pkgs/top-level/all-packages.nix+130−82
@@ -6,10 +6,23 @@
66 * Hint: ### starts category names.
77 */
88{ lib, noSysDirs, config}:
9−self: pkgs:
9+res: pkgs: super:
1010
1111with pkgs;
1212
13+let
14+ self =
15+ builtins.trace ''
16+ It seems that you are using a patched Nixpkgs that references the self
17+ variable in pkgs/top-level/all-packages.nix. This variable was incorrectly
18+ named, so its usage needs attention. Please use pkgs for packages or super
19+ for functions.
20+ ''
21+ res; # Do *NOT* use res in your fork. It will be removed.
22+
23+ # TODO: turn self into an error
24+
25+in
1326{
1427
1528 # Allow callPackage to fill in the pkgs argument
@@ -815,7 +828,7 @@ with pkgs;
815828
816829 androidsdk = androidenv.androidsdk_8_0;
817830
818− androidsdk_extras = self.androidenv.androidsdk_8_0_extras;
831+ androidsdk_extras = res.androidenv.androidsdk_8_0_extras;
819832
820833 webos = recurseIntoAttrs {
821834 cmake-modules = callPackage ../development/mobile/webos/cmake-modules.nix { };
@@ -3301,6 +3314,8 @@ with pkgs;
33013314
33023315 hiera-eyaml = callPackage ../tools/system/hiera-eyaml { };
33033316
3317+ hivemind = callPackage ../applications/misc/hivemind { };
3318+
33043319 hfsprogs = callPackage ../tools/filesystems/hfsprogs { };
33053320
33063321 highlight = callPackage ../tools/text/highlight ({
@@ -3477,9 +3492,7 @@ with pkgs;
34773492 buildGoPackage = buildGo110Package;
34783493 };
34793494
3480− ipmitool = callPackage ../tools/system/ipmitool {
3481− static = false;
3482− };
3495+ ipmitool = callPackage ../tools/system/ipmitool { };
34833496
34843497 ipmiutil = callPackage ../tools/system/ipmiutil {};
34853498
@@ -3533,7 +3546,7 @@ with pkgs;
35333546
35343547 jid = callPackage ../development/tools/jid { };
35353548
3536− jing = self.jing-trang;
3549+ jing = res.jing-trang;
35373550 jing-trang = callPackage ../tools/text/xml/jing-trang { };
35383551
35393552 jira-cli = callPackage ../development/tools/jira_cli { };
@@ -3560,6 +3573,8 @@ with pkgs;
35603573
35613574 jp2a = callPackage ../applications/misc/jp2a { };
35623575
3576+ jpeginfo = callPackage ../applications/graphics/jpeginfo { };
3577+
35633578 jpegoptim = callPackage ../applications/graphics/jpegoptim { };
35643579
35653580 jpegrescan = callPackage ../applications/graphics/jpegrescan { };
@@ -3662,6 +3677,8 @@ with pkgs;
36623677
36633678 kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { };
36643679
3680+ kube-router = callPackage ../applications/networking/cluster/kube-router { };
3681+
36653682 kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { };
36663683
36673684 peruse = libsForQt5.callPackage ../tools/misc/peruse { };
@@ -3964,14 +3981,14 @@ with pkgs;
39643981
39653982 libpointmatcher = callPackage ../development/libraries/libpointmatcher { };
39663983
3984+ libnids = callPackage ../tools/networking/libnids { };
3985+
39673986 libtorrent = callPackage ../tools/networking/p2p/libtorrent { };
39683987
39693988 libmpack = callPackage ../development/libraries/libmpack { };
39703989
39713990 libiberty = callPackage ../development/libraries/libiberty { };
39723991
3973− libiberty_static = libiberty.override { staticBuild = true; };
3974−
39753992 libxc = callPackage ../development/libraries/libxc { };
39763993
39773994 libxcomp = callPackage ../development/libraries/libxcomp { };
@@ -4819,23 +4836,23 @@ with pkgs;
48194836 libcap = if stdenv.isDarwin then null else libcap;
48204837 };
48214838
4822− pinentry_ncurses = self.pinentry.override {
4839+ pinentry_ncurses = res.pinentry.override {
48234840 gtk2 = null;
48244841 };
48254842
4826− pinentry_emacs = self.pinentry.override {
4843+ pinentry_emacs = res.pinentry.override {
48274844 enableEmacs = true;
48284845 };
48294846
4830− pinentry_gnome = self.pinentry.override {
4847+ pinentry_gnome = res.pinentry.override {
48314848 gcr = gnome3.gcr;
48324849 };
48334850
4834− pinentry_qt4 = self.pinentry.override {
4851+ pinentry_qt4 = res.pinentry.override {
48354852 qt = qt4;
48364853 };
48374854
4838− pinentry_qt5 = self.pinentry.override {
4855+ pinentry_qt5 = res.pinentry.override {
48394856 qt = qt5.qtbase;
48404857 };
48414858
@@ -4880,7 +4897,9 @@ with pkgs;
48804897 plowshare = callPackage ../tools/misc/plowshare { };
48814898
48824899 pngcheck = callPackage ../tools/graphics/pngcheck {
4883− zlib = zlibStatic;
4900+ zlib = zlib.override {
4901+ static = true;
4902+ };
48844903 };
48854904
48864905 pngcrush = callPackage ../tools/graphics/pngcrush { };
@@ -4999,6 +5018,8 @@ with pkgs;
49995018
50005019 remarshal = callPackage ../development/tools/remarshal { };
50015020
5021+ rig = callPackage ../tools/misc/rig { };
5022+
50025023 rocket = libsForQt5.callPackage ../tools/graphics/rocket { };
50035024
50045025 rtaudio = callPackage ../development/libraries/audio/rtaudio { };
@@ -5038,6 +5059,8 @@ with pkgs;
50385059
50395060 qshowdiff = callPackage ../tools/text/qshowdiff { };
50405061
5062+ qr-filetransfer = callPackage ../tools/networking/qr-filetransfer { };
5063+
50415064 qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { };
50425065
50435066 quickserve = callPackage ../tools/networking/quickserve { };
@@ -5188,7 +5211,7 @@ with pkgs;
51885211 routino = callPackage ../tools/misc/routino { };
51895212
51905213 rq = callPackage ../development/tools/rq {
5191− v8 = v8_static;
5214+ v8 = v8.override { static = true; };
51925215 };
51935216
51945217 rsnapshot = callPackage ../tools/backup/rsnapshot { };
@@ -7506,10 +7529,11 @@ with pkgs;
75067529 lua = lua5_1;
75077530 };
75087531
7509− teyjus = callPackage ../development/compilers/teyjus {
7510− inherit (ocaml-ng.ocamlPackages_4_02) ocaml;
7511− omake = omake_rc1;
7512− };
7532+ teyjus = callPackage ../development/compilers/teyjus (
7533+ with ocaml-ng.ocamlPackages_4_02; {
7534+ inherit ocaml;
7535+ omake = omake_rc1;
7536+ });
75137537
75147538 thrust = callPackage ../development/tools/thrust {
75157539 gconf = pkgs.gnome2.GConf;
@@ -8008,7 +8032,9 @@ with pkgs;
80088032 tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { };
80098033 tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { };
80108034
8011− proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { };
8035+ proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm {
8036+ v8_static = v8.override { static = true; };
8037+ };
80128038
80138039 wasm-gc = callPackage ../development/interpreters/wasm-gc { };
80148040
@@ -8150,13 +8176,14 @@ with pkgs;
81508176 apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
81518177 ant = apacheAnt;
81528178
8153− apacheKafka = apacheKafka_2_0;
8179+ apacheKafka = apacheKafka_2_1;
81548180 apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; };
81558181 apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; };
81568182 apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; };
81578183 apacheKafka_1_0 = callPackage ../servers/apache-kafka { majorVersion = "1.0"; };
81588184 apacheKafka_1_1 = callPackage ../servers/apache-kafka { majorVersion = "1.1"; };
81598185 apacheKafka_2_0 = callPackage ../servers/apache-kafka { majorVersion = "2.0"; };
8186+ apacheKafka_2_1 = callPackage ../servers/apache-kafka { majorVersion = "2.1"; };
81608187
81618188 kt = callPackage ../tools/misc/kt {};
81628189
@@ -8429,7 +8456,9 @@ with pkgs;
84298456
84308457 lattice-diamond = callPackage ../development/tools/lattice-diamond { };
84318458
8432− distcc = callPackage ../development/tools/misc/distcc { };
8459+ distcc = callPackage ../development/tools/misc/distcc {
8460+ libiberty_static = libiberty.override { staticBuild = true; };
8461+ };
84338462
84348463 # distccWrapper: wrapper that works as gcc or g++
84358464 # It can be used by setting in nixpkgs config like this, for example:
@@ -8531,6 +8560,8 @@ with pkgs;
85318560
85328561 jdepend = callPackage ../development/tools/analysis/jdepend { };
85338562
8563+ fedpkg = pythonPackages.callPackage ../development/tools/fedpkg { };
8564+
85348565 flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { };
85358566 flex = callPackage ../development/tools/parsing/flex { };
85368567
@@ -8571,11 +8602,11 @@ with pkgs;
85718602 gputils = callPackage ../development/tools/misc/gputils { };
85728603
85738604 gradleGen = callPackage ../development/tools/build-managers/gradle { };
8574− gradle = self.gradleGen.gradle_latest;
8575− gradle_2_14 = self.gradleGen.gradle_2_14;
8576− gradle_2_5 = self.gradleGen.gradle_2_5;
8577− gradle_3_5 = self.gradleGen.gradle_3_5;
8578− gradle_4_10 = self.gradleGen.gradle_4_10;
8605+ gradle = res.gradleGen.gradle_latest;
8606+ gradle_2_14 = res.gradleGen.gradle_2_14;
8607+ gradle_2_5 = res.gradleGen.gradle_2_5;
8608+ gradle_3_5 = res.gradleGen.gradle_3_5;
8609+ gradle_4_10 = res.gradleGen.gradle_4_10;
85798610
85808611 gperf = callPackage ../development/tools/misc/gperf { };
85818612 # 3.1 changed some parameters from int to size_t, leading to mismatches.
@@ -8637,8 +8668,6 @@ with pkgs;
86378668
86388669 iozone = callPackage ../development/tools/misc/iozone { };
86398670
8640− ired = callPackage ../development/tools/analysis/radare/ired.nix { };
8641−
86428671 itstool = callPackage ../development/tools/misc/itstool { };
86438672
86448673 jam = callPackage ../development/tools/build-managers/jam { };
@@ -8782,15 +8811,15 @@ with pkgs;
87828811
87838812 omake = callPackage ../development/tools/ocaml/omake { };
87848813
8785− inherit (ocamlPackages) omake_rc1;
8786−
87878814 omniorb = callPackage ../development/tools/omniorb { };
87888815
87898816 opengrok = callPackage ../development/tools/misc/opengrok { };
87908817
87918818 openocd = callPackage ../development/tools/misc/openocd { };
87928819
8793− oprofile = callPackage ../development/tools/profiling/oprofile { };
8820+ oprofile = callPackage ../development/tools/profiling/oprofile {
8821+ libiberty_static = libiberty.override { staticBuild = true; };
8822+ };
87948823
87958824 pahole = callPackage ../development/tools/misc/pahole {};
87968825
@@ -8848,21 +8877,14 @@ with pkgs;
88488877
88498878 puppet-lint = callPackage ../development/tools/puppet/puppet-lint { };
88508879
8880+ pyflame = callPackage ../development/tools/profiling/pyflame { };
8881+
88518882 pyrseas = callPackage ../development/tools/database/pyrseas { };
88528883
88538884 qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { };
88548885
88558886 r10k = callPackage ../tools/system/r10k { };
88568887
8857− radare = callPackage ../development/tools/analysis/radare {
8858− inherit (gnome2) vte;
8859− lua = lua5;
8860− useX11 = config.radare.useX11 or false;
8861− pythonBindings = config.radare.pythonBindings or false;
8862− rubyBindings = config.radare.rubyBindings or false;
8863− luaBindings = config.radare.luaBindings or false;
8864− };
8865−
88668888 inherit (callPackages ../development/tools/analysis/radare2 {
88678889 inherit (gnome2) vte;
88688890 lua = lua5;
@@ -9058,7 +9080,7 @@ with pkgs;
90589080 valgrind = callPackage ../development/tools/analysis/valgrind {
90599081 inherit (darwin) xnu bootstrap_cmds cctools;
90609082 };
9061− valgrind-light = self.valgrind.override { gdb = null; };
9083+ valgrind-light = res.valgrind.override { gdb = null; };
90629084
90639085 valkyrie = callPackage ../development/tools/analysis/valkyrie { };
90649086
@@ -9643,7 +9665,7 @@ with pkgs;
96439665 inherit (darwin) cf-private;
96449666 inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT;
96459667 };
9646− fltk = self.fltk13;
9668+ fltk = res.fltk13;
96479669
96489670 flyway = callPackage ../development/tools/flyway { };
96499671
@@ -9656,7 +9678,7 @@ with pkgs;
96569678
96579679 freetts = callPackage ../development/libraries/freetts { };
96589680
9659− frog = self.languageMachines.frog;
9681+ frog = res.languageMachines.frog;
96609682
96619683 fstrcmp = callPackage ../development/libraries/fstrcmp { };
96629684
@@ -9724,11 +9746,11 @@ with pkgs;
97249746 };
97259747
97269748 gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix {
9727− gtk = self.gtk2;
9749+ gtk = res.gtk2;
97289750 };
97299751
97309752 gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix {
9731− gtk = self.gtk2;
9753+ gtk = res.gtk2;
97329754 };
97339755
97349756 geoclue2 = callPackage ../development/libraries/geoclue {};
@@ -10125,7 +10147,7 @@ with pkgs;
1012510147 gumbo = callPackage ../development/libraries/gumbo { };
1012610148
1012710149 gvfs = callPackage ../development/libraries/gvfs {
10128− gnome = self.gnome3;
10150+ gnome = res.gnome3;
1012910151 };
1013010152
1013110153 gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { };
@@ -10775,6 +10797,8 @@ with pkgs;
1077510797
1077610798 libgphoto2 = callPackage ../development/libraries/libgphoto2 { };
1077710799
10800+ libgpiod = callPackage ../development/libraries/libgpiod { };
10801+
1077810802 libgpod = callPackage ../development/libraries/libgpod {
1077910803 inherit (pkgs.pythonPackages) mutagen;
1078010804 monoSupport = false;
@@ -11095,6 +11119,8 @@ with pkgs;
1109511119
1109611120 libopus = callPackage ../development/libraries/libopus { };
1109711121
11122+ libopusenc = callPackage ../development/libraries/libopusenc { };
11123+
1109811124 libosinfo = callPackage ../development/libraries/libosinfo {
1109911125 inherit (gnome3) libsoup;
1110011126 };
@@ -11354,7 +11380,7 @@ with pkgs;
1135411380 libxml2 = callPackage ../development/libraries/libxml2 { };
1135511381
1135611382 libxml2Python = pkgs.buildEnv { # slightly hacky
11357− name = "libxml2+py-${self.libxml2.version}";
11383+ name = "libxml2+py-${res.libxml2.version}";
1135811384 paths = with libxml2; [ dev bin py ];
1135911385 inherit (libxml2) passthru;
1136011386 # the hook to find catalogs is hidden by buildEnv
@@ -11794,9 +11820,9 @@ with pkgs;
1179411820 };
1179511821
1179611822 pcre = callPackage ../development/libraries/pcre { };
11797− pcre16 = self.pcre.override { variant = "pcre16"; };
11823+ pcre16 = res.pcre.override { variant = "pcre16"; };
1179811824 # pcre32 seems unused
11799− pcre-cpp = self.pcre.override { variant = "cpp"; };
11825+ pcre-cpp = res.pcre.override { variant = "cpp"; };
1180011826
1180111827 pcre2 = callPackage ../development/libraries/pcre2 { };
1180211828
@@ -12097,7 +12123,9 @@ with pkgs;
1209712123
1209812124 qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
1209912125
12100− qmltermwidget = callPackage ../development/libraries/qmltermwidget { };
12126+ qmltermwidget = callPackage ../development/libraries/qmltermwidget {
12127+ inherit (darwin.apple_sdk.libs) utmp;
12128+ };
1210112129 qmlbox2d = libsForQt59.callPackage ../development/libraries/qmlbox2d { };
1210212130
1210312131 qscintilla = callPackage ../development/libraries/qscintilla {
@@ -12378,10 +12406,13 @@ with pkgs;
1237812406 soapybladerf
1237912407 soapyhackrf
1238012408 soapyremote
12409+ soapyrtlsdr
1238112410 soapyuhd
1238212411 ];
1238312412 };
1238412413
12414+ soapyrtlsdr = callPackage ../applications/misc/soapyrtlsdr { };
12415+
1238512416 soapyuhd = callPackage ../applications/misc/soapyuhd { };
1238612417
1238712418 socket_wrapper = callPackage ../development/libraries/socket_wrapper { };
@@ -12697,8 +12728,6 @@ with pkgs;
1269712728 stdenv = overrideCC stdenv gcc6;
1269812729 });
1269912730
12700− v8_static = lowPrio (self.v8.override { static = true; });
12701−
1270212731 vaapiIntel = callPackage ../development/libraries/vaapi-intel { };
1270312732
1270412733 vaapi-intel-hybrid = callPackage ../development/libraries/vaapi-intel-hybrid { };
@@ -12924,10 +12953,6 @@ with pkgs;
1292412953
1292512954 zlog = callPackage ../development/libraries/zlog { };
1292612955
12927− zlibStatic = lowPrio (appendToName "static" (zlib.override {
12928− static = true;
12929− }));
12930−
1293112956 zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {};
1293212957 zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix {};
1293312958 zeromq = zeromq4;
@@ -14582,7 +14607,9 @@ with pkgs;
1458214607 linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
1458314608 linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
1458414609 linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
14585− # Don't forget to update linuxPackages_latest!
14610+ # When adding to this list:
14611+ # - Update linuxPackages_latest to the latest version
14612+ # - Update the rev in ../os-specific/linux/kernel/linux-libre.nix to the latest one.
1458614613
1458714614 # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds.
1458814615 linuxPackages_testing = linuxPackagesFor pkgs.linux_testing;
@@ -15418,6 +15445,8 @@ with pkgs;
1541815445
1541915446 man-pages = callPackage ../data/documentation/man-pages { };
1542015447
15448+ materia-theme = callPackage ../data/themes/materia-theme { };
15449+
1542115450 material-icons = callPackage ../data/fonts/material-icons { };
1542215451
1542315452 meslo-lg = callPackage ../data/fonts/meslo-lg {};
@@ -15458,6 +15487,8 @@ with pkgs;
1545815487
1545915488 nafees = callPackage ../data/fonts/nafees { };
1546015489
15490+ nordic-polar = callPackage ../data/themes/nordic-polar { };
15491+
1546115492 inherit (callPackages ../data/fonts/noto-fonts {})
1546215493 noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-extra;
1546315494
@@ -15479,7 +15510,7 @@ with pkgs;
1547915510
1548015511 open-dyslexic = callPackage ../data/fonts/open-dyslexic { };
1548115512
15482− opensans-ttf = callPackage ../data/fonts/opensans-ttf { };
15513+ open-sans = callPackage ../data/fonts/open-sans { };
1548315514
1548415515 orbitron = callPackage ../data/fonts/orbitron { };
1548515516
@@ -15621,7 +15652,7 @@ with pkgs;
1562115652 inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom;
1562215653
1562315654 tango-icon-theme = callPackage ../data/icons/tango-icon-theme {
15624− gtk = self.gtk2;
15655+ gtk = res.gtk2;
1562515656 };
1562615657
1562715658 themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) {};
@@ -15863,16 +15894,16 @@ with pkgs;
1586315894 libbitcoin-explorer = callPackage ../tools/misc/libbitcoin/libbitcoin-explorer.nix { };
1586415895
1586515896
15866− go-ethereum = self.altcoins.go-ethereum;
15867− ethabi = self.altcoins.ethabi;
15897+ go-ethereum = res.altcoins.go-ethereum;
15898+ ethabi = res.altcoins.ethabi;
1586815899
15869− parity = self.altcoins.parity;
15870− parity-beta = self.altcoins.parity-beta;
15871− parity-ui = self.altcoins.parity-ui;
15900+ parity = res.altcoins.parity;
15901+ parity-beta = res.altcoins.parity-beta;
15902+ parity-ui = res.altcoins.parity-ui;
1587215903
15873− stellar-core = self.altcoins.stellar-core;
15904+ stellar-core = res.altcoins.stellar-core;
1587415905
15875− particl-core = self.altcoins.particl-core;
15906+ particl-core = res.altcoins.particl-core;
1587615907
1587715908 aumix = callPackage ../applications/audio/aumix {
1587815909 gtkGUI = false;
@@ -15967,7 +15998,7 @@ with pkgs;
1596715998 };
1596815999 bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix {
1596916000 inherit (gnome3) zenity;
15970− inherit (self) bitwig-studio1;
16001+ inherit (res) bitwig-studio1;
1597116002 };
1597216003 bitwig-studio = bitwig-studio2;
1597316004
@@ -16647,7 +16678,7 @@ with pkgs;
1664716678 espeak-classic = callPackage ../applications/audio/espeak { };
1664816679
1664916680 espeak-ng = callPackage ../applications/audio/espeak-ng { };
16650− espeak = self.espeak-ng;
16681+ espeak = res.espeak-ng;
1665116682
1665216683 espeakedit = callPackage ../applications/audio/espeak/edit.nix { };
1665316684
@@ -16940,7 +16971,7 @@ with pkgs;
1694016971 inherit (pkgs.gnome3) defaultIconTheme;
1694116972 };
1694216973
16943− firefox-beta-bin = self.wrapFirefox firefox-beta-bin-unwrapped {
16974+ firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped {
1694416975 browserName = "firefox";
1694516976 name = "firefox-beta-bin-" +
1694616977 (builtins.parseDrvName firefox-beta-bin-unwrapped.name).version;
@@ -16955,7 +16986,7 @@ with pkgs;
1695516986 inherit (pkgs.gnome3) defaultIconTheme;
1695616987 };
1695716988
16958− firefox-devedition-bin = self.wrapFirefox firefox-devedition-bin-unwrapped {
16989+ firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped {
1695916990 browserName = "firefox";
1696016991 nameSuffix = "-devedition";
1696116992 name = "firefox-devedition-bin-" +
@@ -17042,6 +17073,7 @@ with pkgs;
1704217073 lcms = lcms2;
1704317074 inherit (gnome3) gexiv2;
1704417075 inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
17076+ inherit (darwin) cf-private;
1704517077 };
1704617078
1704717079 gimp-with-plugins = callPackage ../applications/graphics/gimp/wrapper.nix {
@@ -17338,6 +17370,7 @@ with pkgs;
1733817370 jackline = callPackage ../applications/networking/instant-messengers/jackline { };
1733917371
1734017372 slack = callPackage ../applications/networking/instant-messengers/slack { };
17373+ slack-dark = pkgs.slack.override { darkMode = true; };
1734117374
1734217375 slack-cli = callPackage ../tools/networking/slack-cli { };
1734317376
@@ -17841,6 +17874,8 @@ with pkgs;
1784117874 lua = lua5_1;
1784217875 };
1784317876
17877+ luppp = callPackage ../applications/audio/luppp { };
17878+
1784417879 lv2bm = callPackage ../applications/audio/lv2bm { };
1784517880
1784617881 lynx = callPackage ../applications/networking/browsers/lynx { };
@@ -19706,12 +19741,16 @@ with pkgs;
1970619741
1970719742 webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {};
1970819743
19709− weechat = callPackage ../applications/networking/irc/weechat {
19744+ wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { };
19745+
19746+ weechat-unwrapped = callPackage ../applications/networking/irc/weechat {
1971019747 inherit (darwin) libobjc;
1971119748 inherit (darwin) libresolv;
1971219749 guile = guile_2_0;
1971319750 };
1971419751
19752+ weechat = wrapWeechat weechat-unwrapped { };
19753+
1971519754 weechatScripts = callPackage ../applications/networking/irc/weechat/scripts { };
1971619755
1971719756 westonLite = weston.override {
@@ -19912,6 +19951,8 @@ with pkgs;
1991219951 kodi = kodiPlain;
1991319952 };
1991419953
19954+ kodi-cli = callPackage ../tools/misc/kodi-cli { };
19955+
1991519956 kodi-retroarch-advanced-launchers =
1991619957 callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix {
1991719958 cores = retroArchCores;
@@ -20485,6 +20526,8 @@ with pkgs;
2048520526
2048620527 kobodeluxe = callPackage ../games/kobodeluxe { };
2048720528
20529+ leela-zero = libsForQt5.callPackage ../games/leela-zero { };
20530+
2048820531 lgogdownloader = callPackage ../games/lgogdownloader { };
2048920532
2049020533 liberal-crime-squad = callPackage ../games/liberal-crime-squad { };
@@ -20580,7 +20623,9 @@ with pkgs;
2058020623 openspades = callPackage ../games/openspades { };
2058120624
2058220625 openttd = callPackage ../games/openttd {
20583− zlib = zlibStatic;
20626+ zlib = zlib.override {
20627+ static = true;
20628+ };
2058420629 };
2058520630
2058620631 opentyrian = callPackage ../games/opentyrian { };
@@ -20852,7 +20897,7 @@ with pkgs;
2085220897
2085320898 ut2004Packages = callPackage ../games/ut2004 { };
2085420899
20855− ut2004demo = self.ut2004Packages.ut2004 [ self.ut2004Packages.ut2004-demo ];
20900+ ut2004demo = res.ut2004Packages.ut2004 [ res.ut2004Packages.ut2004-demo ];
2085620901
2085720902 vapor = callPackage ../games/vapor { love = love_0_8; };
2085820903
@@ -20989,8 +21034,8 @@ with pkgs;
2098921034 # Included for backwards compatibility
2099021035 libsoup libwnck gtk-doc gnome-doc-utils;
2099121036
20992− gtk = self.gtk2;
20993− gtkmm = self.gtkmm2;
21037+ gtk = res.gtk2;
21038+ gtkmm = res.gtkmm2;
2099421039 });
2099521040
2099621041 gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { });
@@ -22044,7 +22089,7 @@ with pkgs;
2204422089
2204522090 fakenes = callPackage ../misc/emulators/fakenes { };
2204622091
22047− faust = self.faust2;
22092+ faust = res.faust2;
2204822093
2204922094 faust1 = callPackage ../applications/audio/faust/faust1.nix { };
2205022095
@@ -22170,6 +22215,8 @@ with pkgs;
2217022215
2217122216 openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { };
2217222217
22218+ loop = callPackage ../tools/misc/loop { };
22219+
2217322220 mailcore2 = callPackage ../development/libraries/mailcore2 {
2217422221 icu = icu58;
2217522222 };
@@ -22178,9 +22225,6 @@ with pkgs;
2217822225
2217922226 matcha = callPackage ../misc/themes/matcha { };
2218022227
22181− # previously known as flat-plat
22182− materia-theme = callPackage ../misc/themes/materia-theme { };
22183−
2218422228 mess = callPackage ../misc/emulators/mess {
2218522229 inherit (pkgs.gnome2) GConf;
2218622230 };
@@ -22267,7 +22311,7 @@ with pkgs;
2226722311 parameter set to the right value for your deployment target.
2226822312 */
2226922313 nixos = configuration:
22270− (import (self.path + "/nixos/lib/eval-config.nix") {
22314+ (import (res.path + "/nixos/lib/eval-config.nix") {
2227122315 inherit (pkgs.stdenv.hostPlatform) system;
2227222316 modules = [(
2227322317 { lib, ... }: {
@@ -22546,7 +22590,7 @@ with pkgs;
2254622590 samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung/1.00.37.nix { };
2254722591 samsung-unified-linux-driver_4_00_39 = callPackage ../misc/cups/drivers/samsung/4.00.39 { };
2254822592 samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { };
22549− samsung-unified-linux-driver = self.samsung-unified-linux-driver_4_01_17;
22593+ samsung-unified-linux-driver = res.samsung-unified-linux-driver_4_01_17;
2255022594
2255122595 sane-backends = callPackage ../applications/graphics/sane/backends {
2255222596 gt68xxFirmware = config.sane.gt68xxFirmware or null;
@@ -22631,6 +22675,8 @@ with pkgs;
2263122675 callPackage ../applications/networking/cluster/terraform-providers {}
2263222676 );
2263322677
22678+ terraform-docs = callPackage ../applications/networking/cluster/terraform-docs {};
22679+
2263422680 terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {};
2263522681
2263622682 terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape {};
@@ -22974,6 +23020,8 @@ with pkgs;
2297423020 inherit (darwin) libresolv;
2297523021 };
2297623022
23023+ dsniff = callPackage ../tools/networking/dsniff {};
23024+
2297723025 wal-g = callPackage ../tools/backup/wal-g {};
2297823026
2297923027 tlwg = callPackage ../data/fonts/tlwg { };
pkgs/top-level/default.nix+8−5
@@ -22,9 +22,8 @@
2222 # `*Platform`s.
2323 localSystem
2424
25−, # The system packages will ultimately be run on. Null if the two should be the
26− # same.
27− crossSystem ? null
25+, # The system packages will ultimately be run on.
26+ crossSystem ? localSystem
2827
2928, # Allow a configuration attribute set to be passed in as an argument.
3029 config ? {}
@@ -32,6 +31,9 @@
3231, # List of overlays layers used to extend Nixpkgs.
3332 overlays ? []
3433
34+, # List of overlays to apply to target packages only.
35+ crossOverlays ? []
36+
3537, # A function booting the final package set for a specific standard
3638 # environment. See below for the arguments given to that function, the type of
3739 # list it returns.
@@ -61,7 +63,8 @@ in let
6163 builtins.intersectAttrs { platform = null; } config
6264 // args.localSystem);
6365
64− crossSystem = lib.mapNullable lib.systems.elaborate crossSystem0;
66+ crossSystem = if crossSystem0 == null then localSystem
67+ else lib.systems.elaborate crossSystem0;
6568
6669 # A few packages make a new package set to draw their dependencies from.
6770 # (Currently to get a cross tool chain, or forced-i686 package.) Rather than
@@ -91,7 +94,7 @@ in let
9194 boot = import ../stdenv/booter.nix { inherit lib allPackages; };
9295
9396 stages = stdenvStages {
94− inherit lib localSystem crossSystem config overlays;
97+ inherit lib localSystem crossSystem config overlays crossOverlays;
9598 };
9699
97100 pkgs = boot stages;
pkgs/top-level/perl-packages.nix+13
@@ -9117,6 +9117,19 @@ let
91179117 };
91189118 };
91199119
9120+ MailSender = buildPerlPackage rec {
9121+ name = "Mail-Sender-0.903";
9122+ src = fetchurl {
9123+ url = "mirror://cpan/authors/id/C/CA/CAPOEIRAB/${name}.tar.gz";
9124+ sha256 = "4413eb49f520a8318151811ccb05a8d542973aada20aa503ad32f9ffc98a39bf";
9125+ };
9126+ meta = {
9127+ homepage = https://github.com/Perl-Email-Project/Mail-Sender;
9128+ description = "(DEPRECATED) module for sending mails with attachments through an SMTP server";
9129+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
9130+ };
9131+ };
9132+
91209133 MailSendmail = buildPerlPackage rec {
91219134 name = "Mail-Sendmail-0.80";
91229135 src = fetchurl {
pkgs/top-level/python-packages.nix+4−17
@@ -1661,8 +1661,6 @@ in {
16611661 then callPackage ../development/python-modules/faulthandler {}
16621662 else throw "faulthandler is built into ${python.executable}";
16631663
1664− fedpkg = callPackage ../development/python-modules/fedpkg { };
1665−
16661664 flit = callPackage ../development/python-modules/flit { };
16671665
16681666 flowlogs_reader = callPackage ../development/python-modules/flowlogs_reader { };
@@ -3041,7 +3039,9 @@ in {
30413039
30423040 graphviz = callPackage ../development/python-modules/graphviz { };
30433041
3044− pygraphviz = callPackage ../development/python-modules/pygraphviz { };
3042+ pygraphviz = callPackage ../development/python-modules/pygraphviz {
3043+ graphviz = pkgs.graphviz; # not the python package
3044+ };
30453045
30463046 pymc3 = callPackage ../development/python-modules/pymc3 { };
30473047
@@ -3910,18 +3910,6 @@ in {
39103910
39113911 sphinx = callPackage ../development/python-modules/sphinx { };
39123912
3913− sphinx_1_2 = self.sphinx.overridePythonAttrs rec {
3914− name = "sphinx-1.2.3";
3915− version = "1.2.3";
3916− src = pkgs.fetchurl {
3917− url = "mirror://pypi/s/sphinx/sphinx-1.2.3.tar.gz";
3918− sha256 = "94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04";
3919− };
3920− postPatch = '''';
3921− # Tests requires Pygments >=2.0.2 which isn't worth keeping around for this:
3922− doCheck = false;
3923− };
3924−
39253913 sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport { };
39263914
39273915 hieroglyph = callPackage ../development/python-modules/hieroglyph { };
@@ -4872,8 +4860,7 @@ in {
48724860 ROPGadget = callPackage ../development/python-modules/ROPGadget { };
48734861
48744862 # We need "normal" libxml2 and not the python package by the same name.
4875− pywbem = disabledIf isPy36
4876− (callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; });
4863+ pywbem = callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; };
48774864
48784865 unicorn = callPackage ../development/python-modules/unicorn { };
48794866
pkgs/top-level/stage.nix+17−1
@@ -91,7 +91,7 @@ let
9191 allPackages = self: super:
9292 let res = import ./all-packages.nix
9393 { inherit lib noSysDirs config; }
94− res self;
94+ res self super;
9595 in res;
9696
9797 aliases = self: super: lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib self super);
@@ -174,6 +174,22 @@ let
174174 # Prefer appendOverlays if used repeatedly.
175175 extend = f: self.appendOverlays [f];
176176
177+ # Fully static packages.
178+ # Currently uses Musl on Linux (couldn’t get static glibc to work).
179+ pkgsStatic = nixpkgsFun ({
180+ crossOverlays = [ (import ./static.nix) ];
181+ } // lib.optionalAttrs stdenv.hostPlatform.isLinux {
182+ crossSystem = {
183+ parsed = stdenv.hostPlatform.parsed // {
184+ abi = {
185+ "gnu" = lib.systems.parse.abis.musl;
186+ "gnueabi" = lib.systems.parse.abis.musleabi;
187+ "gnueabihf" = lib.systems.parse.abis.musleabihf;
188+ }.${stdenv.hostPlatform.parsed.abi.name}
189+ or lib.systems.parse.abis.musl;
190+ };
191+ };
192+ });
177193 };
178194
179195 # The complete chain of package set builders, applied from top to bottom.
pkgs/top-level/static.nixnew file+150
@@ -0,0 +1,150 @@
1+# Overlay that builds static packages.
2+
3+# Not all packages will build but support is done on a
4+# best effort basic.
5+#
6+# Note on Darwin/macOS: Apple does not provide a static libc
7+# so any attempts at static binaries are going to be very
8+# unsupported.
9+#
10+# Basic things like pkgsStatic.hello should work out of the box. More
11+# complicated things will need to be fixed with overrides.
12+
13+self: super: let
14+ inherit (super.stdenvAdapters) makeStaticBinaries
15+ overrideInStdenv
16+ makeStaticLibraries;
17+ inherit (super.lib) foldl optional flip id optionalAttrs composeExtensions;
18+ inherit (super) makeSetupHook;
19+
20+ # Best effort static binaries. Will still be linked to libSystem,
21+ # but more portable than Nix store binaries.
22+ makeStaticDarwin = stdenv: stdenv // {
23+ mkDerivation = args: stdenv.mkDerivation (args // {
24+ NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "")
25+ + " -static-libgcc";
26+ nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ (makeSetupHook {
27+ substitutions = {
28+ libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib";
29+ };
30+ } ../stdenv/darwin/portable-libsystem.sh) ];
31+ });
32+ };
33+
34+ staticAdapters = [ makeStaticLibraries ]
35+
36+ # Apple does not provide a static version of libSystem or crt0.o
37+ # So we can’t build static binaries without extensive hacks.
38+ ++ optional (!super.stdenv.hostPlatform.isDarwin) makeStaticBinaries
39+
40+ ++ optional super.stdenv.hostPlatform.isDarwin makeStaticDarwin
41+
42+ # Glibc doesn’t come with static runtimes by default.
43+ # ++ optional (super.stdenv.hostPlatform.libc == "glibc") ((flip overrideInStdenv) [ self.stdenv.glibc.static ])
44+ ;
45+
46+ # Force everything to link statically.
47+ haskellStaticAdapter = self: super: {
48+ mkDerivation = attrs: super.mkDerivation (attrs // {
49+ enableSharedLibraries = false;
50+ enableSharedExecutables = false;
51+ enableStaticLibraries = true;
52+ });
53+ };
54+
55+in {
56+ stdenv = foldl (flip id) super.stdenv staticAdapters;
57+
58+ haskell = super.haskell // {
59+ packageOverrides = composeExtensions
60+ (super.haskell.packageOverrides or (_: _: {}))
61+ haskellStaticAdapter;
62+ };
63+
64+ ncurses = super.ncurses.override {
65+ enableStatic = true;
66+ };
67+ libxml2 = super.libxml2.override {
68+ enableShared = false;
69+ enableStatic = true;
70+ };
71+ zlib = super.zlib.override {
72+ static = true;
73+ shared = false;
74+
75+ # Don’t use new stdenv zlib because
76+ # it doesn’t like the --disable-shared flag
77+ stdenv = super.stdenv;
78+ };
79+ xz = super.xz.override {
80+ enableStatic = true;
81+ };
82+ busybox = super.busybox.override {
83+ enableStatic = true;
84+ };
85+ v8 = super.v8.override {
86+ static = true;
87+ };
88+ libiberty = super.libiberty.override {
89+ staticBuild = true;
90+ };
91+ ipmitool = super.ipmitool.override {
92+ static = true;
93+ };
94+ neon = super.neon.override {
95+ static = true;
96+ shared = false;
97+ };
98+ libjpeg = super.libjpeg.override {
99+ static = true;
100+ };
101+ gifsicle = super.gifsicle.override {
102+ static = true;
103+ };
104+ bzip2 = super.bzip2.override {
105+ linkStatic = true;
106+ };
107+ optipng = super.optipng.override {
108+ static = true;
109+ };
110+ openssl = super.openssl.override {
111+ static = true;
112+
113+ # Don’t use new stdenv for openssl because it doesn’t like the
114+ # --disable-shared flag
115+ stdenv = super.stdenv;
116+ };
117+ boost = super.boost.override {
118+ enableStatic = true;
119+ enableShared = false;
120+ };
121+ gmp = super.gmp.override {
122+ withStatic = true;
123+ };
124+ cdo = super.cdo.override {
125+ enable_all_static = true;
126+ };
127+ gsm = super.gsm.override {
128+ staticSupport = true;
129+ };
130+ parted = super.parted.override {
131+ enableStatic = true;
132+ };
133+ libiconvReal = super.libiconvReal.override {
134+ enableShared = false;
135+ enableStatic = true;
136+ };
137+ perl = super.perl.override {
138+ # Don’t use new stdenv zlib because
139+ # it doesn’t like the --disable-shared flag
140+ stdenv = super.stdenv;
141+ };
142+
143+ darwin = super.darwin // {
144+ libiconv = super.darwin.libiconv.override {
145+ enableShared = false;
146+ enableStatic = true;
147+ };
148+ };
149+
150+}