f70be9a · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

Merge master into staging-next

commitf70be9a3d1fec2cb0ac3ed94a04ecc85c389a4b3 authorFrederik Rietdijk <fridh@fridh.nl> dateWed 11 Nov 2020, 16:00 (6 years ago) parent379aaa1 280e273

160 files changed+1580−812

compare with master

unifiedsplit

.editorconfig+5

@@ -76,10 +76,12 @@ trim_trailing_whitespace = unset

7676

7777[pkgs/build-support/dotnetenv/Wrapper/**]

7878end_of_line = unset

79+indent_style = unset

7980insert_final_newline = unset

8081trim_trailing_whitespace = unset

8182

8283[pkgs/build-support/upstream-updater/**]

84+indent_style = unset

8385trim_trailing_whitespace = unset

8486

8587[pkgs/development/compilers/elm/registry.dat]

@@ -96,6 +98,9 @@ trim_trailing_whitespace = unset

9698[pkgs/development/node-packages/composition.nix]

9799insert_final_newline = unset

98100

101+[pkgs/development/{perl-modules,ocaml-modules,tools/ocaml}/**]

102+indent_style = unset

103+

99104[pkgs/servers/dict/wordnet_structures.py]

100105trim_trailing_whitespace = unset

101106

.github/workflows/editorconfig.yml+3−1

@@ -2,6 +2,8 @@ name: "Checking EditorConfig"

33on:

44 pull_request:

5+ branches-ignore:

6+ - 'release-**'

68jobs:

79 tests:

@@ -23,5 +25,5 @@ jobs:

2325 - name: Checking EditorConfig

2426 if: env.GIT_DIFF

2527 run: |

26− ./bin/editorconfig-checker -disable-indentation \

28+ ./bin/editorconfig-checker -disable-indent-size \

2729 ${{ env.GIT_DIFF }}

doc/stdenv/meta.xml+1−1

@@ -190,7 +190,7 @@ hello-2.3 A program that produces a familiar, friendly greeting

190190 <listitem>

191191 <para>

192192 A list of names and e-mail addresses of the maintainers of this Nix expression. If you would like to be a maintainer of a package, you may want to add yourself to <link

193− xlink:href="https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix"><filename>nixpkgs/maintainers/maintainer-list.nix</filename></link> and write something like <literal>[ stdenv.lib.maintainers.alice stdenv.lib.maintainers.bob ]</literal>.

193+ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix"><filename>nixpkgs/maintainers/maintainer-list.nix</filename></link>. There is no restriction to becoming a maintainer, just add each new maintainer to that list in a separate commit titled 'maintainers: add alice', and reference maintainers with <literal>maintainers = with lib.maintainers; [ alice bob ]</literal>.

194194 </para>

195195 </listitem>

196196 </varlistentry>

lib/strings.nix+6−2

@@ -561,7 +561,9 @@ rec {

561561 enableFeature false "shared"

562562 => "--disable-shared"

563563 */

564− enableFeature = enable: feat: "--${if enable then "enable" else "disable"}-${feat}";

564+ enableFeature = enable: feat:

565+ assert isString feat; # e.g. passing openssl instead of "openssl"

566+ "--${if enable then "enable" else "disable"}-${feat}";

565567

566568 /* Create an --{enable-<feat>=<value>,disable-<feat>} string that can be passed to

567569 standard GNU Autoconf scripts.

@@ -583,7 +585,9 @@ rec {

583585 withFeature false "shared"

584586 => "--without-shared"

585587 */

586− withFeature = with_: feat: "--${if with_ then "with" else "without"}-${feat}";

588+ withFeature = with_: feat:

589+ assert isString feat; # e.g. passing openssl instead of "openssl"

590+ "--${if with_ then "with" else "without"}-${feat}";

587591

588592 /* Create an --{with-<feat>=<value>,without-<feat>} string that can be passed to

589593 standard GNU Autoconf scripts.

maintainers/maintainer-list.nix+6

@@ -1272,6 +1272,12 @@

12721272 githubId = 7214361;

12731273 name = "Roman Gerasimenko";

12741274 };

1275+ bburdette = {

1276+ email = "bburdette@protonmail.com";

1277+ github = "bburdette";

1278+ githubId = 157330;

1279+ name = "Ben Burdette";

1280+ };

12751281 bzizou = {

12761282 email = "Bruno@bzizou.net";

12771283 github = "bzizou";

nixos/doc/manual/release-notes/rl-2103.xml+5

@@ -146,6 +146,11 @@

146146 <link xlink:href="http://www.mutt.org/relnotes/2.0/">release notes for Mutt 2.0</link>.

147147 </para>

148148 </listitem>

149+ <listitem>

150+ <para>

151+ <literal>vim</literal> switched to Python 3, dropping all Python 2 support.

152+ </para>

153+ </listitem>

149154 </itemizedlist>

150155 </section>

151156

nixos/modules/module-list.nix+1

@@ -542,6 +542,7 @@

542542 ./services/monitoring/kapacitor.nix

543543 ./services/monitoring/loki.nix

544544 ./services/monitoring/longview.nix

545+ ./services/monitoring/mackerel-agent.nix

545546 ./services/monitoring/monit.nix

546547 ./services/monitoring/munin.nix

547548 ./services/monitoring/nagios.nix

nixos/modules/programs/ssmtp.nix+7

@@ -142,6 +142,13 @@ in

142142

143143 config = mkIf cfg.enable {

144144

145+ assertions = [

146+ {

147+ assertion = cfg.useSTARTTLS -> cfg.useTLS;

148+ message = "services.ssmtp.useSTARTTLS has no effect without services.ssmtp.useTLS";

149+ }

150+ ];

151+

145152 services.ssmtp.settings = mkMerge [

146153 ({

147154 MailHub = cfg.hostName;

nixos/modules/services/logging/promtail.nix+5−14

@@ -6,25 +6,14 @@ let

66 echo '${builtins.toJSON conf}' | ${pkgs.buildPackages.jq}/bin/jq 'del(._module)' > $out

77 '';

9+ allowSystemdJournal = cfg.configuration ? scrape_configs && lib.any (v: v ? journal) cfg.configuration.scrape_configs;

910in {

1011 options.services.promtail = with types; {

1112 enable = mkEnableOption "the Promtail ingresser";

1213

14+

1315 configuration = mkOption {

14− type = with lib.types; let

15− valueType = nullOr (oneOf [

16− bool

17− int

18− float

19− str

20− (lazyAttrsOf valueType)

21− (listOf valueType)

22− ]) // {

23− description = "JSON value";

24− emptyValue.value = {};

25− deprecationMessage = null;

26− };

27− in valueType;

16+ type = (pkgs.formats.json {}).type;

2817 description = ''

2918 Specify the configuration for Promtail in Nix.

3019 '';

@@ -80,6 +69,8 @@ in {

8069 RestrictRealtime = true;

8170 MemoryDenyWriteExecute = true;

8271 PrivateUsers = true;

72+

73+ SupplementaryGroups = lib.optional (allowSystemdJournal) "systemd-journal";

8374 } // (optionalAttrs (!pkgs.stdenv.isAarch64) { # FIXME: figure out why this breaks on aarch64

8475 SystemCallFilter = "@system-service";

8576 });

nixos/modules/services/misc/cfdyndns.nix+17−5

@@ -6,6 +6,12 @@ let

66 cfg = config.services.cfdyndns;

77in

88{

9+ imports = [

10+ (mkRemovedOptionModule

11+ [ "services" "cfdyndns" "apikey" ]

12+ "Use services.cfdyndns.apikeyFile instead.")

13+ ];

14+

915 options = {

1016 services.cfdyndns = {

1117 enable = mkEnableOption "Cloudflare Dynamic DNS Client";

@@ -17,10 +23,12 @@ in

1723 '';

1824 };

1925

20− apikey = mkOption {

21− type = types.str;

26+ apikeyFile = mkOption {

27+ default = null;

28+ type = types.nullOr types.str;

2229 description = ''

23− The API Key to use to authenticate to CloudFlare.

30+ The path to a file containing the API Key

31+ used to authenticate with CloudFlare.

2432 '';

2533 };

2634

@@ -45,13 +53,17 @@ in

4553 Type = "simple";

4654 User = config.ids.uids.cfdyndns;

4755 Group = config.ids.gids.cfdyndns;

48− ExecStart = "/bin/sh -c '${pkgs.cfdyndns}/bin/cfdyndns'";

4956 };

5057 environment = {

5158 CLOUDFLARE_EMAIL="${cfg.email}";

52− CLOUDFLARE_APIKEY="${cfg.apikey}";

5359 CLOUDFLARE_RECORDS="${concatStringsSep "," cfg.records}";

5460 };

61+ script = ''

62+ ${optionalString (cfg.apikeyFile != null) ''

63+ export CLOUDFLARE_APIKEY="$(cat ${escapeShellArg cfg.apikeyFile})"

64+ ''}

65+ ${pkgs.cfdyndns}/bin/cfdyndns

66+ '';

5567 };

5668

5769 users.users = {

nixos/modules/services/monitoring/loki.nix+3−1

@@ -39,7 +39,7 @@ in {

3939 };

4040

4141 configuration = mkOption {

42− type = types.attrs;

42+ type = (pkgs.formats.json {}).type;

4343 default = {};

4444 description = ''

4545 Specify the configuration for Loki in Nix.

@@ -78,6 +78,8 @@ in {

7878 '';

7979 }];

8080

81+ environment.systemPackages = [ pkgs.grafana-loki ]; # logcli

82+

8183 users.groups.${cfg.group} = { };

8284 users.users.${cfg.user} = {

8385 description = "Loki Service User";

nixos/modules/services/monitoring/mackerel-agent.nixnew file+111

@@ -0,0 +1,111 @@

1+{ config, lib, pkgs, ... }:

3+with lib;

5+let

6+ cfg = config.services.mackerel-agent;

7+ settingsFmt = pkgs.formats.toml {};

8+in {

9+ options.services.mackerel-agent = {

10+ enable = mkEnableOption "mackerel.io agent";

11+

12+ # the upstream package runs as root, but doesn't seem to be strictly

13+ # necessary for basic functionality

14+ runAsRoot = mkEnableOption "Whether to run as root.";

15+

16+ autoRetirement = mkEnableOption ''

17+ Whether to automatically retire the host upon OS shutdown.

18+ '';

19+

20+ apiKeyFile = mkOption {

21+ type = types.path;

22+ default = "";

23+ example = "/run/keys/mackerel-api-key";

24+ description = ''

25+ Path to file containing the Mackerel API key. The file should contain a

26+ single line of the following form:

27+

28+ <literallayout>apikey = "EXAMPLE_API_KEY"</literallayout>

29+ '';

30+ };

31+

32+ settings = mkOption {

33+ description = ''

34+ Options for mackerel-agent.conf.

35+

36+ Documentation:

37+ <link xlink:href="https://mackerel.io/docs/entry/spec/agent"/>

38+ '';

39+

40+ default = {};

41+ example = {

42+ verbose = false;

43+ silent = false;

44+ };

45+

46+ type = types.submodule {

47+ freeformType = settingsFmt.type;

48+

49+ options.host_status = {

50+ on_start = mkOption {

51+ type = types.enum [ "working" "standby" "maintenance" "poweroff" ];

52+ description = "Host status after agent startup.";

53+ default = "working";

54+ };

55+ on_stop = mkOption {

56+ type = types.enum [ "working" "standby" "maintenance" "poweroff" ];

57+ description = "Host status after agent shutdown.";

58+ default = "poweroff";

59+ };

60+ };

61+

62+ options.diagnostic =

63+ mkEnableOption "Collect memory usage for the agent itself";

64+ };

65+ };

66+ };

67+

68+ config = mkIf cfg.enable {

69+ environment.systemPackages = with pkgs; [ mackerel-agent ];

70+

71+ environment.etc = {

72+ "mackerel-agent/mackerel-agent.conf".source =

73+ settingsFmt.generate "mackerel-agent.conf" cfg.settings;

74+ "mackerel-agent/conf.d/api-key.conf".source = cfg.apiKeyFile;

75+ };

76+

77+ services.mackerel-agent.settings = {

78+ root = mkDefault "/var/lib/mackerel-agent";

79+ pidfile = mkDefault "/run/mackerel-agent/mackerel-agent.pid";

80+

81+ # conf.d stores the symlink to cfg.apiKeyFile

82+ include = mkDefault "/etc/mackerel-agent/conf.d/*.conf";

83+ };

84+

85+ # upstream service file in https://git.io/JUt4Q

86+ systemd.services.mackerel-agent = {

87+ description = "mackerel.io agent";

88+ after = [ "network-online.target" "nss-lookup.target" ];

89+ wantedBy = [ "multi-user.target" ];

90+ environment = {

91+ MACKEREL_PLUGIN_WORKDIR = mkDefault "%C/mackerel-agent";

92+ };

93+ serviceConfig = {

94+ DynamicUser = !cfg.runAsRoot;

95+ PrivateTmp = mkDefault true;

96+ CacheDirectory = "mackerel-agent";

97+ ConfigurationDirectory = "mackerel-agent";

98+ RuntimeDirectory = "mackerel-agent";

99+ StateDirectory = "mackerel-agent";

100+ ExecStart = "${pkgs.mackerel-agent}/bin/mackerel-agent supervise";

101+ ExecStopPost = mkIf cfg.autoRetirement "${pkg.mackerel-agent}/bin/mackerel-agent retire -force";

102+ ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";

103+ LimitNOFILE = mkDefault 65536;

104+ LimitNPROC = mkDefault 65536;

105+ };

106+ restartTriggers = [

107+ config.environment.etc."mackerel-agent/mackerel-agent.conf".source

108+ ];

109+ };

110+ };

111+}

nixos/modules/services/x11/desktop-managers/plasma5.nix+1−1

@@ -367,7 +367,7 @@ in

367367 security.pam.services.sddm.enableKwallet = true;

368368

369369 xdg.portal.enable = true;

370− xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];

370+ xdg.portal.extraPortals = [ plasma5.xdg-desktop-portal-kde ];

371371

372372 # Update the start menu for each user that is currently logged in

373373 system.userActivationScripts.plasmaSetup = activationScript;

nixos/modules/virtualisation/qemu-vm.nix+5−2

@@ -744,16 +744,19 @@ in

744744 (isEnabled "VIRTIO_PCI")

745745 (isEnabled "VIRTIO_NET")

746746 (isEnabled "EXT4_FS")

747+ (isEnabled "NET_9P_VIRTIO")

748+ (isEnabled "9P_FS")

747749 (isYes "BLK_DEV")

748750 (isYes "PCI")

749− (isYes "EXPERIMENTAL")

750751 (isYes "NETDEVICES")

751752 (isYes "NET_CORE")

752753 (isYes "INET")

753754 (isYes "NETWORK_FILESYSTEMS")

754− ] ++ optional (!cfg.graphics) [

755+ ] ++ optionals (!cfg.graphics) [

755756 (isYes "SERIAL_8250_CONSOLE")

756757 (isYes "SERIAL_8250")

758+ ] ++ optionals (cfg.writableStore) [

759+ (isEnabled "OVERLAY_FS")

757760 ];

758761

759762 };

nixos/tests/all-tests.nix+1

@@ -315,6 +315,7 @@ in

315315 samba = handleTest ./samba.nix {};

316316 sanoid = handleTest ./sanoid.nix {};

317317 sbt = handleTest ./sbt.nix {};

318+ sbt-extras = handleTest ./sbt-extras.nix {};

318319 scala = handleTest ./scala.nix {};

319320 sddm = handleTest ./sddm.nix {};

320321 service-runner = handleTest ./service-runner.nix {};

nixos/tests/loki.nix+2

@@ -45,6 +45,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }:

4545 machine.wait_for_open_port(3100)

4646 machine.wait_for_open_port(9080)

4747 machine.succeed("echo 'Loki Ingestion Test' > /var/log/testlog")

48+ # should not have access to journal unless specified

49+ machine.fail("systemctl show --property=SupplementaryGroups promtail | grep -q systemd-journal")

4850 machine.wait_until_succeeds(

4951 "${pkgs.grafana-loki}/bin/logcli --addr='http://localhost:3100' query --no-labels '{job=\"varlogs\",filename=\"/var/log/testlog\"}' | grep -q 'Loki Ingestion Test'"

5052 )

nixos/tests/sbt-extras.nixnew file+16

@@ -0,0 +1,16 @@

1+import ./make-test-python.nix ({ pkgs, ...} : {

2+ name = "sbt-extras";

3+ meta = with pkgs.stdenv.lib.maintainers; {

4+ maintainers = [ nequissimus ];

5+ };

7+ machine = { pkgs, ... }:

8+ {

9+ environment.systemPackages = [ pkgs.sbt-extras ];

10+ };

11+

12+ testScript =

13+ ''

14+ machine.succeed("(sbt -h)")

15+ '';

16+})

pkgs/applications/audio/ft2-clone/default.nix+2−2

@@ -9,13 +9,13 @@

1010stdenv.mkDerivation rec {

1111 pname = "ft2-clone";

12− version = "1.37";

12+ version = "1.39";

1313

1414 src = fetchFromGitHub {

1515 owner = "8bitbubsy";

1616 repo = "ft2-clone";

1717 rev = "v${version}";

18− sha256 = "1lhpzd46mpr3bq13qhd0bq724db5fhc8jplfb684c2q7sc4v92nk";

18+ sha256 = "0vc7gni24q649b53flz7rlgnc5xl2dqdklgwc2brj380a5s7g6m7";

1919 };

2020

2121 nativeBuildInputs = [ cmake ];

pkgs/applications/audio/qmmp/default.nix+2−2

@@ -29,11 +29,11 @@

2929# handle that.

3030

3131mkDerivation rec {

32− name = "qmmp-1.4.1";

32+ name = "qmmp-1.4.2";

3333

3434 src = fetchurl {

3535 url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";

36− sha256 = "0p18r2ri75vbyjzfa7bcl1dm372m6jvn9zj2p5ia2rh1g77fbm9a";

36+ sha256 = "1kvzw0n90crg3dgy8834qrjv0zb3ia5cny7virax9ax73y653jfa";

3737 };

3838

3939 nativeBuildInputs = [ cmake pkgconfig ];

pkgs/applications/audio/qtractor/default.nix+2−2

@@ -5,11 +5,11 @@

66stdenv.mkDerivation rec {

77 pname = "qtractor";

8− version = "0.9.15";

8+ version = "0.9.18";

1010 src = fetchurl {

1111 url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";

12− sha256 = "0k7a6llwrzs07flr9mvzvay9ygc2x64syg8npyabsw5a4d85fwsx";

12+ sha256 = "121vmygdzp37p6f93f8dbbg2m2r55j7amyiapzkqgypgn4vfdbwr";

1313 };

1414

1515 nativeBuildInputs = [

pkgs/applications/blockchains/ergo/default.nix+2−2

@@ -2,11 +2,11 @@

33stdenv.mkDerivation rec {

44 pname = "ergo";

5− version = "3.3.5";

5+ version = "3.3.6";

77 src = fetchurl {

88 url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";

9− sha256 = "0bxzpwwb42bppqli3zggx3lah7g6kwmy6k6k6dinypj6x0bafqcg";

9+ sha256 = "1zi559ixjxxsrpvvjbxa1d0g96px3h9amjvy149sfhp7b8w5hhk3";

1010 };

1111

1212 nativeBuildInputs = [ makeWrapper ];

pkgs/applications/blockchains/pivx.nix+1−1

@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {

5252 Zero Knowledge cryptography proofs for industry-leading transaction anonymity.

5353 '';

5454 license = licenses.mit;

55− homepage = "https://www.dash.org";

55+ homepage = "https://pivx.org";

5656 maintainers = with maintainers; [ wucke13 ];

5757 platforms = platforms.unix;

5858 };

pkgs/applications/editors/vim/configurable.nix+7−8

@@ -1,5 +1,5 @@

11{ source ? "default", callPackage, stdenv, ncurses, pkgconfig, gettext

2−, writeText, config, glib, gtk2-x11, gtk3-x11, lua, python, perl, tcl, ruby

2+, writeText, config, glib, gtk2-x11, gtk3-x11, lua, python3, perl, tcl, ruby

33, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu

44, libICE

55, vimPlugins

@@ -62,8 +62,6 @@ let

6262

6363 common = callPackage ./common.nix {};

6464

65− isPython3 = python.isPy3 or false;

66−

6765in stdenv.mkDerivation rec {

6866

6967 pname = "vim_configurable";

@@ -106,9 +104,10 @@ in stdenv.mkDerivation rec {

106104 "--with-luajit"

107105 ]

108106 ++ stdenv.lib.optionals pythonSupport [

109− "--enable-python${if isPython3 then "3" else ""}interp=yes"

110− "--with-python${if isPython3 then "3" else ""}-config-dir=${python}/lib"

111− "--disable-python${if (!isPython3) then "3" else ""}interp"

107+ "--enable-python3interp=yes"

108+ "--with-python3-config-dir=${python3}/lib"

109+ # Disables Python 2

110+ "--disable-pythoninterp"

112111 ]

113112 ++ stdenv.lib.optional nlsSupport "--enable-nls"

114113 ++ stdenv.lib.optional perlSupport "--enable-perlinterp"

@@ -134,7 +133,7 @@ in stdenv.mkDerivation rec {

134133 ++ stdenv.lib.optional (guiSupport == "gtk3") gtk3-x11

135134 ++ stdenv.lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc ]

136135 ++ stdenv.lib.optional luaSupport lua

137− ++ stdenv.lib.optional pythonSupport python

136+ ++ stdenv.lib.optional pythonSupport python3

138137 ++ stdenv.lib.optional tclSupport tcl

139138 ++ stdenv.lib.optional rubySupport ruby;

140139

@@ -163,7 +162,7 @@ in stdenv.mkDerivation rec {

163162

164163 ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc

165164 '' + stdenv.lib.optionalString wrapPythonDrv ''

166− wrapProgram "$out/bin/vim" --prefix PATH : "${python}/bin"

165+ wrapProgram "$out/bin/vim" --prefix PATH : "${python3}/bin"

167166 '' + stdenv.lib.optionalString (guiSupport == "gtk3") ''

168167

169168 rewrap () {

pkgs/applications/graphics/gimp/plugins/default.nix+7−30

@@ -127,21 +127,22 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; {

127127 name = "wavelet-sharpen-0.1.2";

128128 NIX_LDFLAGS = "-lm";

129129 src = fetchurl {

130− url = "http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz";

130+ url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz";

131131 sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw";

132132 };

133133 installPhase = "installPlugins src/wavelet-sharpen"; # TODO translations are not copied .. How to do this on nix?

134134 };

135135

136− lqrPlugin = pluginDerivation {

136+ lqrPlugin = pluginDerivation rec {

137137 /* menu:

138138 Layer/Liquid Rescale

139139 */

140− name = "lqr-plugin-0.6.1";

140+ pname = "lqr-plugin";

141+ version = "0.7.1";

141142 buildInputs = with pkgs; [ liblqr1 ];

142143 src = fetchurl {

143− url = "http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2";

144− sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9";

144+ url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/gimp-lqr-plugin-${version}.tar.bz2";

145+ sha256 = "sha256-YpgYPjHZkueJWS51QGmugXavGS+1x4o20St31qoRng4=";

145146 };

146147 #postInstall = ''mkdir -p $out/nix-support; echo "${liblqr1}" > "$out/nix-support/propagated-user-env-packages"'';

147148 installPhase = "installPlugins src/gimp-lqr-plugin";

@@ -196,35 +197,11 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; {

196197 lightning = scriptDerivation {

197198 name = "Lightning";

198199 src = fetchurl {

199− url = "http://registry.gimp.org/files/Lightning.scm";

200+ url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/Lightning.scm";

200201 sha256 = "c14a8f4f709695ede3f77348728a25b3f3ded420da60f3f8de3944b7eae98a49";

201202 };

202203 };

203204

204− /* space in name trouble ?

205−

206− rainbowPlasma = scriptDerivation {

207− # http://registry.gimp.org/node/164

208− name = "rainbow-plasma";

209− src = fetchurl {

210− url = "http://registry.gimp.org/files/Rainbow Plasma.scm";

211− sha256 = "34308d4c9441f9e7bafa118af7ec9540f10ea0df75e812e2f3aa3fd7b5344c23";

212− name = "Rainbow-Plasma.scm"; # nix doesn't like spaces, does it?

213− };

214− };

215− */

216−

217− /* doesn't seem to be working :-(

218− lightningGate = scriptDerivation {

219− # http://registry.gimp.org/node/153

220− name = "lightning-gate";

221− src = fetchurl {

222− url = "http://registry.gimp.org/files/LightningGate.scm";

223− sha256 = "181w1zi9a99kn2mfxjp43wkwcgw5vbb6iqjas7a9mhm8p04csys2";

224− };

225− };

226− */

227−

228205} // stdenv.lib.optionalAttrs (config.allowAliases or true) {

229206

230207 resynthesizer2 = resynthesizer;

pkgs/applications/logging/humioctl/default.nix+2−2

@@ -1,8 +1,8 @@

11{ buildGoModule, fetchFromGitHub, installShellFiles, stdenv }:

33let

4− humioCtlVersion = "0.27.0";

5− sha256 = "1h65g10dxcaw4wk0gyyyqj9f94xlphj30lp9w6rsfrk4pi3irzr4";

4+ humioCtlVersion = "0.28.1";

5+ sha256 = "0vy07nzafqhc14i179sfrzb795yh4pcyjj3py9fwq0nwnmxndby4";

66 vendorSha256 = "0anvah2rpqvxgmdrdj73k3vbf8073nmsl3aykgvb1nraf3gz3bpk";

77in buildGoModule {

88 name = "humioctl-${humioCtlVersion}";

pkgs/applications/misc/cheat/default.nix+2−2

@@ -3,13 +3,13 @@

44buildGoModule rec {

55 pname = "cheat";

6− version = "4.1.0";

6+ version = "4.1.1";

88 src = fetchFromGitHub {

99 owner = "cheat";

1010 repo = "cheat";

1111 rev = version;

12− sha256 = "0x6msbbqkwxs6msqacpqw4wlw7c9ilf8n6jqmx297ij6isswgksh";

12+ sha256 = "0mraraby0s213ay2ahqsdvnyg76awbqllrkkx17mrx9z3ykba62d";

1313 };

1414

1515 subPackages = [ "cmd/cheat" ];

pkgs/applications/misc/dstask/default.nix+2−2

@@ -2,13 +2,13 @@

33buildGoModule rec {

44 pname = "dstask";

5− version = "0.23";

5+ version = "0.23.1";

77 src = fetchFromGitHub {

88 owner = "naggie";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "15hr0ivwvm2lzpi8l5y5a3hya3i7r85pxna961m24gd4f8gs4cjl";

11+ sha256 = "0rfz8jim0xqcwdb5n28942v9r3hbvhjrwdgzvbwc9f9psqg2s8d2";

1212 };

1313

1414 # Set vendorSha256 to null because dstask vendors its dependencies (meaning

pkgs/applications/misc/gramps/default.nix+2−2

@@ -9,7 +9,7 @@

99let

1010 inherit (pythonPackages) python buildPythonApplication;

1111in buildPythonApplication rec {

12− version = "5.0.1";

12+ version = "5.1.3";

1313 pname = "gramps";

1414

1515 nativeBuildInputs = [ wrapGAppsHook gettext ];

@@ -26,7 +26,7 @@ in buildPythonApplication rec {

2626 owner = "gramps-project";

2727 repo = "gramps";

2828 rev = "v${version}";

29− sha256 = "1jz1fbjj6byndvir7qxzhd2ryirrd5h2kwndxpp53xdc05z1i8g7";

29+ sha256 = "109dwkswz2h2328xkqk2zj736d117s9pp7rz5cc1qg2vxn1lpm93";

3030 };

3131

3232 pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ];

pkgs/applications/misc/hugo/default.nix+3−3

@@ -2,16 +2,16 @@

33buildGoModule rec {

44 pname = "hugo";

5− version = "0.78.0";

5+ version = "0.78.1";

77 src = fetchFromGitHub {

88 owner = "gohugoio";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "0la1c6yj9dq9rqxk6m8n8l4cabgzlk0r3was8mvgd80g3x3zn55v";

11+ sha256 = "1rzv6az7fb1xvjxxq31rs42waqpwvks4h03lzjxv0kj8i43z116k";

1212 };

1313

14− vendorSha256 = "09fvvs85rvvh0z4px2bj5908xf1mrcslkzsz09p0gy5i3zaqfnp9";

14+ vendorSha256 = "06cw3qj57nhrxrbbxcyrqn53j6g11rd2q7bxw89fdn901mc26s03";

1515

1616 doCheck = false;

1717

pkgs/applications/misc/pwsafe/default.nix+2−2

@@ -1,5 +1,5 @@

11{ stdenv, fetchFromGitHub, cmake, pkgconfig, zip, gettext, perl

2−, wxGTK31, libXext, libXi, libXt, libXtst, xercesc

2+, wxGTK30, libXext, libXi, libXt, libXtst, xercesc

33, qrencode, libuuid, libyubikey, yubikey-personalization

44, curl, openssl, file

55}:

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {

1919 cmake gettext perl pkgconfig zip

2020 ];

2121 buildInputs = [

22− libXext libXi libXt libXtst wxGTK31

22+ libXext libXi libXt libXtst wxGTK30

2323 curl qrencode libuuid openssl xercesc

2424 libyubikey yubikey-personalization

2525 file

pkgs/applications/misc/spicetify-cli/default.nixnew file+32

@@ -0,0 +1,32 @@

1+{ lib, buildGoModule, fetchFromGitHub }:

3+buildGoModule rec {

4+ pname = "spicetify-cli";

5+ version = "1.1.0";

7+ src = fetchFromGitHub {

8+ owner = "khanhas";

9+ repo = pname;

10+ rev = "v${version}";

11+ sha256 = "08rnwj7ggh114n3mhhm8hb8fm1njgb4j6vba3hynp8x1c2ngidff";

12+ };

13+

14+ vendorSha256 = "0k06c3jw5z8rw8nk4qf794kyfipylmz6x6l126a2snvwi0lmc601";

15+

16+ # used at runtime, but not installed by default

17+ postInstall = ''

18+ cp -r ${src}/jsHelper $out/bin/jsHelper

19+ '';

20+

21+ doInstallCheck = true;

22+ installCheckPhase = ''

23+ $out/bin/spicetify-cli --help > /dev/null

24+ '';

25+

26+ meta = with lib; {

27+ description = "Command-line tool to customize Spotify client";

28+ homepage = "https://github.com/khanhas/spicetify-cli/";

29+ license = licenses.gpl3Plus;

30+ maintainers = with maintainers; [ jonringer ];

31+ };

32+}

pkgs/applications/networking/browsers/amfora/default.nix+3−3

@@ -2,16 +2,16 @@

33buildGoModule rec {

44 pname = "amfora";

5− version = "1.5.0";

5+ version = "1.6.0";

77 src = fetchFromGitHub {

88 owner = "makeworld-the-better-one";

99 repo = "amfora";

1010 rev = "v${version}";

11− sha256 = "011h5xzwiafh3fdp9wil8n618p45ph9swa66lw6s82ijpiizz79s";

11+ sha256 = "1f5r12hmdgj26p4ss5pcpfcvqlcn19fr9xvvvk2izckcr48p4fy7";

1212 };

1313

14− vendorSha256 = "10f3bh3r3jc1185r8r1ihg8rprdpl8qwg5b6wqwsda96ydkbpi2b";

14+ vendorSha256 = "0mkk7xxfxxp1w9890mkmag11mzxhy2zmh8v1macpyp1zmzgs21f8";

1515

1616 postInstall = ''

1717 sed -i "s:amfora:$out/bin/amfora:" amfora.desktop

pkgs/applications/networking/cluster/argo/default.nix+2−2

@@ -19,13 +19,13 @@ let

1919in

2020buildGoModule rec {

2121 pname = "argo";

22− version = "2.11.6";

22+ version = "2.11.7";

2323

2424 src = fetchFromGitHub {

2525 owner = "argoproj";

2626 repo = "argo";

2727 rev = "v${version}";

28− sha256 = "1vlz1f4hyzgz1x9xgzlmpnbjba8xyhpx9ybia0pwilfg7mwfq92r";

28+ sha256 = "1i7qgghnb39bibnk07f47k64qpkb1k8mi3bbfnx6mxl0jlq335af";

2929 };

3030

3131 vendorSha256 = "1ca0ssvbi4vrsn9ljc783hnh9bmf5p8nr1lz5wm8g3gbrrrf1ray";

pkgs/applications/networking/cluster/helmfile/default.nix+3−3

@@ -2,16 +2,16 @@

33buildGoModule rec {

44 pname = "helmfile";

5− version = "0.132.1";

5+ version = "0.134.0";

77 src = fetchFromGitHub {

88 owner = "roboll";

99 repo = "helmfile";

1010 rev = "v${version}";

11− sha256 = "03i9pl3iwqk5az73qm9rxdq8c5nd9l4w3c28yk55bfgpwpnxcwjc";

11+ sha256 = "0s64l3dj5ydal7rfyg1avckb2ri7a34y2x7rhbplam8lk0vdzx03";

1212 };

1313

14− vendorSha256 = "0r4p4nwhmxg06qyf86gd2g61l4r1mlpblh4vhsc1shbz9iigykzi";

14+ vendorSha256 = "1p5m5v5lpdyzywq2ybsa9zkygixdkaifn2szxj7v8x162bzf16r5";

1515

1616 doCheck = false;

1717

pkgs/applications/networking/cluster/helmsman/default.nix+2−2

@@ -2,13 +2,13 @@

33buildGoModule rec {

44 pname = "helmsman";

5− version = "3.4.6";

5+ version = "3.5.1";

77 src = fetchFromGitHub {

88 owner = "Praqma";

99 repo = "helmsman";

1010 rev = "v${version}";

11− sha256 = "018bkl6q6q8njv9qy87affs0g6c716vmhcqv2czv8qz454hn7i5h";

11+ sha256 = "0vng0ra8bjxmfq6xvdxn72f5bcjrv8i72dams80lf0mq3l7wjl7c";

1212 };

1313

1414 vendorSha256 = "05vnysr5r3hbayss1pyifgp989kjw81h95iack8ady62k6ys5njl";

pkgs/applications/networking/cluster/kube3d/default.nix+6−7

@@ -2,7 +2,7 @@

33buildGoModule rec {

44 pname = "kube3d";

5− version = "3.1.5";

5+ version = "3.2.0";

66 k3sVersion = "1.18.9-k3s1";

88 excludedPackages = ''tools'';

@@ -11,7 +11,7 @@ buildGoModule rec {

1111 owner = "rancher";

1212 repo = "k3d";

1313 rev = "v${version}";

14− sha256 = "0aspkar9im323d8117k48fvh1yylyspi2p2l2f5rdg1ilpa6hm53";

14+ sha256 = "0jy0l8rvmwi0qznnvv97v50lfkpc2bwjmbnq4pxnmf9ih970wjwh";

1515 };

1616

1717 buildFlagsArray = ''

@@ -23,12 +23,11 @@ buildGoModule rec {

2323

2424 nativeBuildInputs = [ installShellFiles ];

2525

26− # TODO: Move to enhanced installShellCompletion when in master: PR #83630

2726 postInstall = ''

28− $out/bin/k3d completion bash > k3d.bash

29− $out/bin/k3d completion fish > k3d.fish

30− $out/bin/k3d completion zsh > _k3d

31− installShellCompletion k3d.{bash,fish} --zsh _k3d

27+ installShellCompletion --cmd k3d \

28+ --bash <($out/bin/k3d completion bash) \

29+ --fish <($out/bin/k3d completion fish) \

30+ --zsh <($out/bin/k3d completion zsh)

3231 '';

3332

3433 vendorSha256 = null;

pkgs/applications/networking/cluster/terraform-providers/default.nix−10

@@ -149,16 +149,6 @@ let

149149 '';

150150 });

151151

152− # provider was moved to the `vultr` organization, but kept the old references:

153− # https://github.com/vultr/terraform-provider-vultr/pull/67

154− # this override should be removed as soon as new version (>1.4.1) is released.

155− vultr = automated-providers.vultr.overrideAttrs (attrs: {

156− prePatch = attrs.prePatch or "" + ''

157− substituteInPlace go.mod --replace terraform-providers/terraform-provider-vultr vultr/terraform-provider-vultr

158− substituteInPlace main.go --replace terraform-providers/terraform-provider-vultr vultr/terraform-provider-vultr

159− '';

160− });

161−

162152 # Packages that don't fit the default model

163153 ansible = callPackage ./ansible {};

164154 cloudfoundry = callPackage ./cloudfoundry {};

pkgs/applications/networking/cluster/terraform-providers/providers.json+3−3

@@ -1017,9 +1017,9 @@

10171017 "vultr": {

10181018 "owner": "vultr",

10191019 "repo": "terraform-provider-vultr",

1020− "rev": "v1.4.1",

1021− "sha256": "1jx9p4bwpa5zxig6gfk4akfsnbivvyhwcw8id2ch2ga9a67pwald",

1022− "version": "1.4.1"

1020+ "rev": "v1.5.0",

1021+ "sha256": "04qy366ignn53bbdj9s3032qr1x7h84q36qzl5ywydlw2va0qbsd",

1022+ "version": "1.5.0"

10231023 },

10241024 "wavefront": {

10251025 "owner": "terraform-providers",

pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix+265−265

@@ -1,665 +1,665 @@

11{

2− version = "78.4.1";

2+ version = "78.4.2";

33 sources = [

4− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/af/thunderbird-78.4.1.tar.bz2";

4+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/af/thunderbird-78.4.2.tar.bz2";

55 locale = "af";

66 arch = "linux-x86_64";

7− sha256 = "36268a7fe6ec5a0ea0243f83ffbd73204d5c4ef257b0c8857a50428304b2d4c2";

7+ sha256 = "8b1c2e12bd1de45251131d9fe444b06681577cafc019219dac4aa13b3abf989b";

88 }

9− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ar/thunderbird-78.4.1.tar.bz2";

9+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ar/thunderbird-78.4.2.tar.bz2";

1010 locale = "ar";

1111 arch = "linux-x86_64";

12− sha256 = "831e70f807f05ce2f82bb11db35d05ed80dac53ad00c12ff6e191a627d0d42d0";

12+ sha256 = "708ce9ae434ae78bd21d2c8a608a732d6ebdc88c2cc3c91c748d2b6a4eab24bd";

1313 }

14− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ast/thunderbird-78.4.1.tar.bz2";

14+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ast/thunderbird-78.4.2.tar.bz2";

1515 locale = "ast";

1616 arch = "linux-x86_64";

17− sha256 = "e6efde72ce7aeeda5f7c6d7cc0f3a08265c44546a0f8fc84a2adbc11cc038601";

17+ sha256 = "46aadaa73a4e214c016f05eb9e0dc0a3daa6a87fc72988c696bf243d475d0285";

1818 }

19− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/be/thunderbird-78.4.1.tar.bz2";

19+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/be/thunderbird-78.4.2.tar.bz2";

2020 locale = "be";

2121 arch = "linux-x86_64";

22− sha256 = "07fe33390caf37a96c000e0f5435d07711f7a95dbe04f85a222b17ae5a13f1bc";

22+ sha256 = "06abeef2331df228ad303d9280d077ef4a74af8658c4ac0147ae59e181dfc42e";

2323 }

24− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/bg/thunderbird-78.4.1.tar.bz2";

24+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/bg/thunderbird-78.4.2.tar.bz2";

2525 locale = "bg";

2626 arch = "linux-x86_64";

27− sha256 = "d460e201cbe4a1d6548a52121a33c2aaa7cbbf0e126fa1c4e8a431423424fb9e";

27+ sha256 = "3aa13c52a514f5331bf626f9e3138bfe995c6a223559a9fbd6d590858484d9c1";

2828 }

29− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/br/thunderbird-78.4.1.tar.bz2";

29+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/br/thunderbird-78.4.2.tar.bz2";

3030 locale = "br";

3131 arch = "linux-x86_64";

32− sha256 = "9e85928f1145391d9c3f238612b93e6344a2ad5e6179bf09502b1b69c8ad1b03";

32+ sha256 = "1f2d9ee7090e96e3e5611011c9fef8389b514dda4edbf47e889019312df6ab5f";

3333 }

34− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ca/thunderbird-78.4.1.tar.bz2";

34+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ca/thunderbird-78.4.2.tar.bz2";

3535 locale = "ca";

3636 arch = "linux-x86_64";

37− sha256 = "1516236c252f22933adf23bfe93d73fa272a4574deb674aef6e1f35006a6cc50";

37+ sha256 = "f48d5d02a04212ca14cd4c175102a0e45483299d8a4615ff96232431c4ffa4a5";

3838 }

39− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/cak/thunderbird-78.4.1.tar.bz2";

39+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/cak/thunderbird-78.4.2.tar.bz2";

4040 locale = "cak";

4141 arch = "linux-x86_64";

42− sha256 = "c46508321d32c468d067d86c04973ca345b09b0e983954eaa123d02778d61fbd";

42+ sha256 = "28b541daeac6aa6274f4185f9471ce8b2a46e18fe55ae1e373246d9f23d78ec6";

4343 }

44− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/cs/thunderbird-78.4.1.tar.bz2";

44+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/cs/thunderbird-78.4.2.tar.bz2";

4545 locale = "cs";

4646 arch = "linux-x86_64";

47− sha256 = "227209429c07238f38d334e5ac8a5fd895a4c87f51b21b4376df89c50bb6a789";

47+ sha256 = "d4f061ac86da0b6279b81b30c8949cca93aca5b2f90d0e5dafc5cdecc2868e05";

4848 }

49− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/cy/thunderbird-78.4.1.tar.bz2";

49+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/cy/thunderbird-78.4.2.tar.bz2";

5050 locale = "cy";

5151 arch = "linux-x86_64";

52− sha256 = "b272926205e5470df8aec8b22d6733e4f47993e76123fe81d4be26ad5a153062";

52+ sha256 = "824c703a570ae23d8e7b86d93baabb193842ac36fbc9d4ec65ae686e3d540de1";

5353 }

54− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/da/thunderbird-78.4.1.tar.bz2";

54+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/da/thunderbird-78.4.2.tar.bz2";

5555 locale = "da";

5656 arch = "linux-x86_64";

57− sha256 = "13f9fe10c84d2b8d8d0215cb58a9852486741f5bc8c6979f0a701bef14a70f4f";

57+ sha256 = "8dd27d2596346853e3fddab12ad0dabd700c5216310922e768faacb019b5b3d9";

5858 }

59− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/de/thunderbird-78.4.1.tar.bz2";

59+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/de/thunderbird-78.4.2.tar.bz2";

6060 locale = "de";

6161 arch = "linux-x86_64";

62− sha256 = "590f9a5a975544d2effedda942e3989a13be23b95f4e6707f9905fed3fc08214";

62+ sha256 = "3920c60073ee3066fbe35a1d2c34ab03a7b7e2dfbbe22af97fa32814000f6942";

6363 }

64− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/dsb/thunderbird-78.4.1.tar.bz2";

64+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/dsb/thunderbird-78.4.2.tar.bz2";

6565 locale = "dsb";

6666 arch = "linux-x86_64";

67− sha256 = "5b572c847f9ec76b25c225652c23ecf8c56523ffc3071b437310f0d8f9049b05";

67+ sha256 = "fd09bbf80996e3aaf12dba79c366c4cfff41a0db0cdf7f6ed4d9722fd2623ff1";

6868 }

69− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/el/thunderbird-78.4.1.tar.bz2";

69+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/el/thunderbird-78.4.2.tar.bz2";

7070 locale = "el";

7171 arch = "linux-x86_64";

72− sha256 = "7cad76ea5a07dce6bdd3db78485f83a998ff27037f8ca68f8617659a06910a05";

72+ sha256 = "a9df959b2df9c381b9881fe3015e654ac82ca441a3cfc25036c1e658401bf810";

7373 }

74− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/en-CA/thunderbird-78.4.1.tar.bz2";

74+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/en-CA/thunderbird-78.4.2.tar.bz2";

7575 locale = "en-CA";

7676 arch = "linux-x86_64";

77− sha256 = "f261b38fbc8d83c20be63015a444644a95f7d8b6584fcfc193145abcc69a4164";

77+ sha256 = "126e6fffa28b9c2a7eb7bb49254786fd0884aba62524dcf7d8352d6542903f77";

7878 }

79− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/en-GB/thunderbird-78.4.1.tar.bz2";

79+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/en-GB/thunderbird-78.4.2.tar.bz2";

8080 locale = "en-GB";

8181 arch = "linux-x86_64";

82− sha256 = "5c0c364b1408182c0cbae1c2d05041781e2e4f3a17fb1735d61196c9b647dba4";

82+ sha256 = "099ef4c54072c6a4a134badd02a51255573e876c8b630c3b9eaecfde997f9e03";

8383 }

84− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/en-US/thunderbird-78.4.1.tar.bz2";

84+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/en-US/thunderbird-78.4.2.tar.bz2";

8585 locale = "en-US";

8686 arch = "linux-x86_64";

87− sha256 = "a152c3b8c6ad4ba3a92a8a1f909b99599d8c3ded62b57e9721fb333b47f6509d";

87+ sha256 = "e6041bd8ad2a21f0a8f8d78fd395239f1f41e2948584770673aaa0f3a9978b3e";

8888 }

89− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/es-AR/thunderbird-78.4.1.tar.bz2";

89+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/es-AR/thunderbird-78.4.2.tar.bz2";

9090 locale = "es-AR";

9191 arch = "linux-x86_64";

92− sha256 = "dc06a64e0b20dd174d6158e5d2f393bf6a6907f8f515120220bb2a8480f58d1c";

92+ sha256 = "d4055f3134cd255f8e91ee2ef012bd4e4443e6db519cb7bf2543d4e193f59f61";

9393 }

94− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/es-ES/thunderbird-78.4.1.tar.bz2";

94+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/es-ES/thunderbird-78.4.2.tar.bz2";

9595 locale = "es-ES";

9696 arch = "linux-x86_64";

97− sha256 = "7d3b7ff0ffb9b19f10bd7c2cffb5dbff8216c65c01fd4032ba5b7924c73ce343";

97+ sha256 = "39f3c8e5262b1125f21e2bc0e51d53b09283ef4922a7bbec6146605ea0bd1d51";

9898 }

99− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/et/thunderbird-78.4.1.tar.bz2";

99+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/et/thunderbird-78.4.2.tar.bz2";

100100 locale = "et";

101101 arch = "linux-x86_64";

102− sha256 = "a9a8e610bc1c696137ee650fa11f2cbf8dece4ba32d1f0961ae697f6433cf1b2";

102+ sha256 = "60331d65f98b68397a0d53a08a169b97654aae3d26efe48f494f575e1a51fe13";

103103 }

104− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/eu/thunderbird-78.4.1.tar.bz2";

104+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/eu/thunderbird-78.4.2.tar.bz2";

105105 locale = "eu";

106106 arch = "linux-x86_64";

107− sha256 = "6835e8459b4191cd4bb5ae8011d032d475631e7a532450b98f0b087ed0a80fb6";

107+ sha256 = "206026522eb361b599dccf433887b1314b554adfea90ee558f36d116ae6c8f70";

108108 }

109− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/fa/thunderbird-78.4.1.tar.bz2";

109+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/fa/thunderbird-78.4.2.tar.bz2";

110110 locale = "fa";

111111 arch = "linux-x86_64";

112− sha256 = "7cfd8681a7ed38364a823881fbb42af8cf33d17bf911e9f5b97dd18102b412f5";

112+ sha256 = "88f1421d251e0bc5288f2c8ca333345ec97ca0a86d491b242471d1af82c04776";

113113 }

114− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/fi/thunderbird-78.4.1.tar.bz2";

114+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/fi/thunderbird-78.4.2.tar.bz2";

115115 locale = "fi";

116116 arch = "linux-x86_64";

117− sha256 = "8c84662afb60e3dc94eace5a493f7feef6598b78613fe99f195408e4ee2b0a11";

117+ sha256 = "4abbc607c3d6ec03a8416636e88ffdfd61fc0b062aa135d14fb3918c284f9ebd";

118118 }

119− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/fr/thunderbird-78.4.1.tar.bz2";

119+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/fr/thunderbird-78.4.2.tar.bz2";

120120 locale = "fr";

121121 arch = "linux-x86_64";

122− sha256 = "24449816c690757b05d1913ff1fa12eed47f316ac13c76a195ae0628c6950da0";

122+ sha256 = "406437d8cf7a695b636c3c1005df5a65f174bbb10d0d961ddda08833ee2c808d";

123123 }

124− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/fy-NL/thunderbird-78.4.1.tar.bz2";

124+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/fy-NL/thunderbird-78.4.2.tar.bz2";

125125 locale = "fy-NL";

126126 arch = "linux-x86_64";

127− sha256 = "9a0334f032333eda16cdabd5dffb05f5a22edb1dcf4bcd0b47495defd0d9f3dc";

127+ sha256 = "456f51fbef14e1de16fdb3d7c31b6736e0e7b43c509ac38bdb8a88cb4a2de0d9";

128128 }

129− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ga-IE/thunderbird-78.4.1.tar.bz2";

129+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ga-IE/thunderbird-78.4.2.tar.bz2";

130130 locale = "ga-IE";

131131 arch = "linux-x86_64";

132− sha256 = "33e5a54e2259984ff29d3394fe936b5af8830e489e0775ff36eace4c6b3dc145";

132+ sha256 = "0f1ab856deed39280ab9d6a43afd6f719470d4aafc4404e0662da0e14b64308a";

133133 }

134− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/gd/thunderbird-78.4.1.tar.bz2";

134+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/gd/thunderbird-78.4.2.tar.bz2";

135135 locale = "gd";

136136 arch = "linux-x86_64";

137− sha256 = "b91c4b3aafa2166cd27c52977711c55aa425f68c5f7cca64be1dd07fd533bc05";

137+ sha256 = "07f2fc13f34a70d4e6ecc65d465e33f5bcff63196996fe057f8584ef2e7e595c";

138138 }

139− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/gl/thunderbird-78.4.1.tar.bz2";

139+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/gl/thunderbird-78.4.2.tar.bz2";

140140 locale = "gl";

141141 arch = "linux-x86_64";

142− sha256 = "d1c03b3b92bef4f3c94518981cf99840944c8a36aab7b2cfe3f72f1f0e57e045";

142+ sha256 = "f4cb60a537ffba88823c8c8a60f2c164e62fbba13d448f2931c71e7d98d6abe0";

143143 }

144− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/he/thunderbird-78.4.1.tar.bz2";

144+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/he/thunderbird-78.4.2.tar.bz2";

145145 locale = "he";

146146 arch = "linux-x86_64";

147− sha256 = "7fdaf0e83eeb39b66a6d1c2600f2c6f1b69ec4f67dd7b33a39132e838a699f06";

147+ sha256 = "425a0bd38d231308fa5cac5d362b7818ccfb6b5fc06924ce312433ba4d5bf2b0";

148148 }

149− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/hr/thunderbird-78.4.1.tar.bz2";

149+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/hr/thunderbird-78.4.2.tar.bz2";

150150 locale = "hr";

151151 arch = "linux-x86_64";

152− sha256 = "4ba99eaa25964bde6108eeab702b096ba50b45d8db7e36f3203b0a71cc1e30cf";

152+ sha256 = "37d3f14aeed404bad5cab35c256473a5927787f889afee3da112e510999373f9";

153153 }

154− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/hsb/thunderbird-78.4.1.tar.bz2";

154+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/hsb/thunderbird-78.4.2.tar.bz2";

155155 locale = "hsb";

156156 arch = "linux-x86_64";

157− sha256 = "187a5f2b2e1b16fad948356f31b2ac903fe318432d9a3f105055c23d1225d11b";

157+ sha256 = "3249467db25d25866a4d1e0acd9a18a26bad13e2ca683df04ca5f8ca19affac3";

158158 }

159− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/hu/thunderbird-78.4.1.tar.bz2";

159+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/hu/thunderbird-78.4.2.tar.bz2";

160160 locale = "hu";

161161 arch = "linux-x86_64";

162− sha256 = "8f6b79692143e6e27cc844985366004d06c8e55184a73477fd20020575947ad8";

162+ sha256 = "f3a82c5917757f221ca59c4b6a950991b52b10f2782b1dffe21c7a7ca6a26272";

163163 }

164− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/hy-AM/thunderbird-78.4.1.tar.bz2";

164+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/hy-AM/thunderbird-78.4.2.tar.bz2";

165165 locale = "hy-AM";

166166 arch = "linux-x86_64";

167− sha256 = "4066683e4a635b163b9b14e1921d834b37a95cee8dd04fc6885094c5e0394dee";

167+ sha256 = "cb917c1ff3fa342a8ad3253a03a1dbb4a417c0bc3cdfd1422ef5ff06dcfcca74";

168168 }

169− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/id/thunderbird-78.4.1.tar.bz2";

169+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/id/thunderbird-78.4.2.tar.bz2";

170170 locale = "id";

171171 arch = "linux-x86_64";

172− sha256 = "1fed6d3a9a11d303db2f2c6f7a92639b92ca144ce3b45eed4607696ea4617511";

172+ sha256 = "1599ddf22093c6a99ccd3ec3e1492e65ce0b5ebdc3a69aafb321ec26f22b6a13";

173173 }

174− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/is/thunderbird-78.4.1.tar.bz2";

174+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/is/thunderbird-78.4.2.tar.bz2";

175175 locale = "is";

176176 arch = "linux-x86_64";

177− sha256 = "a627c95d2284b4e828a466865aa19262aa84a1a2267235c3f62d13c52081c580";

177+ sha256 = "8cb02ca7ce8c28c10aa1f16ed08417342e93da2dd00f15c5a89fd71306f9afb3";

178178 }

179− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/it/thunderbird-78.4.1.tar.bz2";

179+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/it/thunderbird-78.4.2.tar.bz2";

180180 locale = "it";

181181 arch = "linux-x86_64";

182− sha256 = "6b01e88da702deee95a3a6d526e563e854be7ae13414fed3a2c9cc427e906ffa";

182+ sha256 = "16f3c54980e614b20ef6a8c0a09ebe7707e298d753d373da79bb2d52d1cc43b6";

183183 }

184− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ja/thunderbird-78.4.1.tar.bz2";

184+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ja/thunderbird-78.4.2.tar.bz2";

185185 locale = "ja";

186186 arch = "linux-x86_64";

187− sha256 = "3b63cf4c45945f4a40159a417ed217b77128905de82812fe2165c0c5f66410a7";

187+ sha256 = "e4ec88dd86b46d814232662a4d558361043ac97b348a8fbb2076ec856087be6e";

188188 }

189− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ka/thunderbird-78.4.1.tar.bz2";

189+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ka/thunderbird-78.4.2.tar.bz2";

190190 locale = "ka";

191191 arch = "linux-x86_64";

192− sha256 = "c9d11ae298691f2e302078f865b047b1c2b568ae763495fbfe2f2d4f04a9ef6a";

192+ sha256 = "9c2a110ed4df58c334b533255c0f3bf46d777960967e46e74f7f376203bf467b";

193193 }

194− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/kab/thunderbird-78.4.1.tar.bz2";

194+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/kab/thunderbird-78.4.2.tar.bz2";

195195 locale = "kab";

196196 arch = "linux-x86_64";

197− sha256 = "b6367ccb74b2ced8708ca9f4c2c06aeaaf4f3bcba0b2b2fdf2c552aa10fcfc03";

197+ sha256 = "1f5cf7b8a03fb4273d9ce4d657c3a77ac4a26b7716e3bed700e14f05a398163d";

198198 }

199− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/kk/thunderbird-78.4.1.tar.bz2";

199+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/kk/thunderbird-78.4.2.tar.bz2";

200200 locale = "kk";

201201 arch = "linux-x86_64";

202− sha256 = "99ece9975a3981fa33887d3b5d60cd6874e1dab7c51d830dc0d13c28c103ca79";

202+ sha256 = "002ac92fee28c3ec9c05587025eddb4065a842df0430ace7f468ed8f3ec2df27";

203203 }

204− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ko/thunderbird-78.4.1.tar.bz2";

204+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ko/thunderbird-78.4.2.tar.bz2";

205205 locale = "ko";

206206 arch = "linux-x86_64";

207− sha256 = "d81c844cbd490e5eeeb2739a9b040062baf3bbdf13ddfbceb59b5630019b935d";

207+ sha256 = "277f0fdfbda0d215a03ccd663f0986cf1b0a1c4e68e3ef36e81c8505d6eb7d09";

208208 }

209− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/lt/thunderbird-78.4.1.tar.bz2";

209+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/lt/thunderbird-78.4.2.tar.bz2";

210210 locale = "lt";

211211 arch = "linux-x86_64";

212− sha256 = "56b5813a5b0debfe90fa2a20fb9a13ea210e2eed37f180f3e23e851f871241e2";

212+ sha256 = "65b6737b4ff528453bdaf57cc525a74c79899a9563d189123f87db729aa0f529";

213213 }

214− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ms/thunderbird-78.4.1.tar.bz2";

214+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ms/thunderbird-78.4.2.tar.bz2";

215215 locale = "ms";

216216 arch = "linux-x86_64";

217− sha256 = "8dc3f341a69b9ef458c1203ff15779beecf3db2dede1cd8740ee19a9552f22f3";

217+ sha256 = "cd40e14d4dbcf03ea7e5ab672678abc9b3b46c5b67fdbb961928a860c2f3218b";

218218 }

219− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/nb-NO/thunderbird-78.4.1.tar.bz2";

219+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/nb-NO/thunderbird-78.4.2.tar.bz2";

220220 locale = "nb-NO";

221221 arch = "linux-x86_64";

222− sha256 = "0fe431d3773de39431cd777cf301d2c3d8074dd41596bf6a6f1bef96870413b4";

222+ sha256 = "49c9633a0552a704b06df87ea91991017be920684d12f66c72f6795dafd1cd5d";

223223 }

224− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/nl/thunderbird-78.4.1.tar.bz2";

224+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/nl/thunderbird-78.4.2.tar.bz2";

225225 locale = "nl";

226226 arch = "linux-x86_64";

227− sha256 = "4127bdb6338210d9928fc84838a57cfb731aa3254aa5427471deca00bb12beca";

227+ sha256 = "4514d79caa1e2b44cafdc9ef06aa54c4708763c888a489d6bdf4473597221316";

228228 }

229− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/nn-NO/thunderbird-78.4.1.tar.bz2";

229+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/nn-NO/thunderbird-78.4.2.tar.bz2";

230230 locale = "nn-NO";

231231 arch = "linux-x86_64";

232− sha256 = "cf0c6d67115ee36b80010d93d50991a544af332ca19f1ed1199f49c7dd125049";

232+ sha256 = "f6aab88e4708659658be8cfb457c40533969a261af489a976f4010439a833458";

233233 }

234− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/pa-IN/thunderbird-78.4.1.tar.bz2";

234+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/pa-IN/thunderbird-78.4.2.tar.bz2";

235235 locale = "pa-IN";

236236 arch = "linux-x86_64";

237− sha256 = "283c2be7f9bc0aa3d505f1838f1c03721a4b956870ac2b1e762b966e87767ce0";

237+ sha256 = "10f5a885550f2cbee158fedc7111b96a0f07764b5d6d60004d17c233153f304b";

238238 }

239− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/pl/thunderbird-78.4.1.tar.bz2";

239+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/pl/thunderbird-78.4.2.tar.bz2";

240240 locale = "pl";

241241 arch = "linux-x86_64";

242− sha256 = "4c07e4500ad4c0d698942e3c47ced3bbd6142e4a70292629ebbe53ef5f1816f9";

242+ sha256 = "1a192c0a9b8ac2f9b18445e69024462b8e95b78bff48014b55dd451e260aaf73";

243243 }

244− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/pt-BR/thunderbird-78.4.1.tar.bz2";

244+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/pt-BR/thunderbird-78.4.2.tar.bz2";

245245 locale = "pt-BR";

246246 arch = "linux-x86_64";

247− sha256 = "c6ace3452d1720681e668da50d16811286c1e73021bd06ab9b538c6f6fc5fda6";

247+ sha256 = "b9dc3db4d8cf4fc2b958695f9077c50d48d355e850618320adff179d33a116d0";

248248 }

249− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/pt-PT/thunderbird-78.4.1.tar.bz2";

249+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/pt-PT/thunderbird-78.4.2.tar.bz2";

250250 locale = "pt-PT";

251251 arch = "linux-x86_64";

252− sha256 = "b9ab4d38b271e2987b5e425a277042dc149794cf461283114553133e7fed5f06";

252+ sha256 = "0a3887ff46f9ecc1576bda76e1469eed8ef43813ccec25536e2dbae289196bd5";

253253 }

254− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/rm/thunderbird-78.4.1.tar.bz2";

254+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/rm/thunderbird-78.4.2.tar.bz2";

255255 locale = "rm";

256256 arch = "linux-x86_64";

257− sha256 = "50fc69135b789b2bb5d8008292d3fc25f1a0a30bba35c6e24ddfeabe55231407";

257+ sha256 = "1a13d443c00da4300aaf58d0af0620541de04e02e87218fa0774cad4b2aaa34f";

258258 }

259− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ro/thunderbird-78.4.1.tar.bz2";

259+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ro/thunderbird-78.4.2.tar.bz2";

260260 locale = "ro";

261261 arch = "linux-x86_64";

262− sha256 = "1e050b33a942dc815e739c57944a0d705982e18e74637172b0366a9b06916f7b";

262+ sha256 = "62bd15566895dc9462b985f2f5e1afcc7057ef4e93f69005b9ebe89821a2a73a";

263263 }

264− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ru/thunderbird-78.4.1.tar.bz2";

264+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ru/thunderbird-78.4.2.tar.bz2";

265265 locale = "ru";

266266 arch = "linux-x86_64";

267− sha256 = "c295bda57db84e07f28affa4201c4f612478efce733cb9c69962f6d7a797218b";

267+ sha256 = "e0624e745da31cafe1b885393e11622bac6ddd2e3e4c0cd35432eb5e0e57a47c";

268268 }

269− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/si/thunderbird-78.4.1.tar.bz2";

269+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/si/thunderbird-78.4.2.tar.bz2";

270270 locale = "si";

271271 arch = "linux-x86_64";

272− sha256 = "63dc83cfab8be94893ca6a0d60e448d14db1afcae55192149a882456dca77e9a";

272+ sha256 = "46e286fd0913b07ede577514b8e64ce279afd7bda3054b7cba4ec1f9981eef03";

273273 }

274− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sk/thunderbird-78.4.1.tar.bz2";

274+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/sk/thunderbird-78.4.2.tar.bz2";

275275 locale = "sk";

276276 arch = "linux-x86_64";

277− sha256 = "5ab5ea76649582ddf10fa77bbb95040d157883e0905df72f5bc0ae79167d97be";

277+ sha256 = "3ab838c25d5e10d318705bed69e690d287e6b988412a3f9d5d94f2b7c8cd831b";

278278 }

279− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sl/thunderbird-78.4.1.tar.bz2";

279+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/sl/thunderbird-78.4.2.tar.bz2";

280280 locale = "sl";

281281 arch = "linux-x86_64";

282− sha256 = "da3f8a30797386bc7c9ba135ba360cee01143bc76a2315e7a2223bab90e2283e";

282+ sha256 = "c04e1a339c4fb2ca8748da6bbc0f5a4dc9eb032b565d6f2333c7d1751eaaaa9a";

283283 }

284− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sq/thunderbird-78.4.1.tar.bz2";

284+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/sq/thunderbird-78.4.2.tar.bz2";

285285 locale = "sq";

286286 arch = "linux-x86_64";

287− sha256 = "f2f9639c4b4dc4bfba476aa92814fee65ecd3fca27652177614d1107e4200246";

287+ sha256 = "ae9052f081baf3f25c43b2b1e109ce50abeacb5b2322ef38f8d42fb070417908";

288288 }

289− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sr/thunderbird-78.4.1.tar.bz2";

289+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/sr/thunderbird-78.4.2.tar.bz2";

290290 locale = "sr";

291291 arch = "linux-x86_64";

292− sha256 = "3bcad0c845e4481a22c1b330b6cd94c3c6fc46c33597ce5af0594368579a8260";

292+ sha256 = "c4eec55d9be21e02158e8266b9b7b424aa1f5d1078d9de2f0dfce4fef5f801d2";

293293 }

294− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sv-SE/thunderbird-78.4.1.tar.bz2";

294+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/sv-SE/thunderbird-78.4.2.tar.bz2";

295295 locale = "sv-SE";

296296 arch = "linux-x86_64";

297− sha256 = "9b09d4ab71000429c5015dd8a0642cfe0eeeaa785d2cac6e876b1cd6aadaeb44";

297+ sha256 = "c7c01c580e1201e2948d0bfe3e029b6bd3a98e9845e6ff648d8bd4fbc8189d37";

298298 }

299− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/th/thunderbird-78.4.1.tar.bz2";

299+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/th/thunderbird-78.4.2.tar.bz2";

300300 locale = "th";

301301 arch = "linux-x86_64";

302− sha256 = "b33e42f0271ee84a581a737513197d5f036695706b19697a53000834c199c75f";

302+ sha256 = "f09079980e41c156e62f8d008d600850ca8a62fc88917f3cc06d10321bb3e500";

303303 }

304− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/tr/thunderbird-78.4.1.tar.bz2";

304+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/tr/thunderbird-78.4.2.tar.bz2";

305305 locale = "tr";

306306 arch = "linux-x86_64";

307− sha256 = "f419ed9f0f06575da2f89486d830ab7fd2b439dcfcac92f1b31c573901e7b9ea";

307+ sha256 = "2b99f6fcf904c7cdf67de2ed957167b6e1fe7d997c5a422641bba0af8a22b7f4";

308308 }

309− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/uk/thunderbird-78.4.1.tar.bz2";

309+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/uk/thunderbird-78.4.2.tar.bz2";

310310 locale = "uk";

311311 arch = "linux-x86_64";

312− sha256 = "bcecec66a6ef8b928da2aa5d52d89f4f1587d4e45bf0e836b71912b0e5a43f7c";

312+ sha256 = "d502f4447e1e0c02e9384435e1b552c4da6d083225555b03f90d71ed04314324";

313313 }

314− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/uz/thunderbird-78.4.1.tar.bz2";

314+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/uz/thunderbird-78.4.2.tar.bz2";

315315 locale = "uz";

316316 arch = "linux-x86_64";

317− sha256 = "2b33f40b9da386e61f3bdcacd9c16fc06dac18d2b36865292700744dfbe2da25";

317+ sha256 = "7b9548f91dcf0ee6bfaed9d735baf9254842a633e3f06986d00d9d86b0f645d6";

318318 }

319− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/vi/thunderbird-78.4.1.tar.bz2";

319+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/vi/thunderbird-78.4.2.tar.bz2";

320320 locale = "vi";

321321 arch = "linux-x86_64";

322− sha256 = "b5d005c45221c41e1e81234b755f6a9d380220cc03f43012c40440a0378c19e0";

322+ sha256 = "32f78b425fd56900d1b3319e571af151214edee83a22321a449556e8ddebea69";

323323 }

324− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/zh-CN/thunderbird-78.4.1.tar.bz2";

324+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/zh-CN/thunderbird-78.4.2.tar.bz2";

325325 locale = "zh-CN";

326326 arch = "linux-x86_64";

327− sha256 = "c08765cc8562cce08b4cda04123cd8672f5abb130b597f36f4c143d74b09b9b3";

327+ sha256 = "a6252fdd66dbfbd33444a3ebdacef38f8b600891af324d31f22f2fcf59b1e7fb";

328328 }

329− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/zh-TW/thunderbird-78.4.1.tar.bz2";

329+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/zh-TW/thunderbird-78.4.2.tar.bz2";

330330 locale = "zh-TW";

331331 arch = "linux-x86_64";

332− sha256 = "56f84ea43a5288a6cd34f8de5f69dde05737474f11c70d638981ef2ff4ea5bfa";

332+ sha256 = "b97a176fc12f156d8503e07819e9a0536b338850b8527c3896d93a36d64083aa";

333333 }

334− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/af/thunderbird-78.4.1.tar.bz2";

334+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/af/thunderbird-78.4.2.tar.bz2";

335335 locale = "af";

336336 arch = "linux-i686";

337− sha256 = "95384cf3d0ab6ad8d3bb133e8ff7c1881523c0f7be840c5ab6016325ebc7f9ff";

337+ sha256 = "e1f0a03f540da701f9e742cf7a05e21a1216ba5c60c402968799ff494ffb1fcc";

338338 }

339− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ar/thunderbird-78.4.1.tar.bz2";

339+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ar/thunderbird-78.4.2.tar.bz2";

340340 locale = "ar";

341341 arch = "linux-i686";

342− sha256 = "c2cf87579a092bec69042b35743574872b8b791d54628c35c28d44c1dc605b6b";

342+ sha256 = "5bbee34fe9c5cf02f2f3c8160264f3a0ca3ad880bd75fd1ede87f906b886c7fd";

343343 }

344− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ast/thunderbird-78.4.1.tar.bz2";

344+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ast/thunderbird-78.4.2.tar.bz2";

345345 locale = "ast";

346346 arch = "linux-i686";

347− sha256 = "127ce24b2c06606e9567e2106ba5cb9628d8bda10620b01cbfe60bc287977c94";

347+ sha256 = "8a5e481e9aa16619513260d532ec6f7e2c6338b41a0a44468950ec26287b2a26";

348348 }

349− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/be/thunderbird-78.4.1.tar.bz2";

349+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/be/thunderbird-78.4.2.tar.bz2";

350350 locale = "be";

351351 arch = "linux-i686";

352− sha256 = "e8acd7cc25f91af91caee7487598cf1f60512864cf1fee714d2289a65f0cc195";

352+ sha256 = "27f600f0d4b977cde9ede5bd39efd97bfa1abc04f3d1c7a3290339e7eedaef47";

353353 }

354− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/bg/thunderbird-78.4.1.tar.bz2";

354+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/bg/thunderbird-78.4.2.tar.bz2";

355355 locale = "bg";

356356 arch = "linux-i686";

357− sha256 = "461e4ec0b0f3dcb78426a99f0b8dc32b14dbc561b89e8d422433f5360425448d";

357+ sha256 = "a9a6c127461ca7da6b5fca5e2d2ca8b1eecbbe78b42a9e18e16bc7a343c761ec";

358358 }

359− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/br/thunderbird-78.4.1.tar.bz2";

359+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/br/thunderbird-78.4.2.tar.bz2";

360360 locale = "br";

361361 arch = "linux-i686";

362− sha256 = "ba3902a457d0570d3eeaa63cc83a67e35532e547127b71f38781158bc3cc5e60";

362+ sha256 = "b8f363ca9ada5b2ed80a9526d1f775d9c17bfecd6b84113391fd6a5b1966bd90";

363363 }

364− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ca/thunderbird-78.4.1.tar.bz2";

364+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ca/thunderbird-78.4.2.tar.bz2";

365365 locale = "ca";

366366 arch = "linux-i686";

367− sha256 = "609de3623c6f4075bedee741533843f6f9fd1afc5933fe3a8709f5c16c7d7bc5";

367+ sha256 = "e1c5035ab818ce7525c2bd659622b14b3fe544b7f4c8432bca2b018c7ba1bfa5";

368368 }

369− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/cak/thunderbird-78.4.1.tar.bz2";

369+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/cak/thunderbird-78.4.2.tar.bz2";

370370 locale = "cak";

371371 arch = "linux-i686";

372− sha256 = "4a5aa707eca53cf5490189a09d222abaa8290ea3366d4bf081273c23e89b3fc0";

372+ sha256 = "f42d03442c8ab4bd844b0414e6d6c8ee168230714b55bbff1704117315f26a0d";

373373 }

374− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/cs/thunderbird-78.4.1.tar.bz2";

374+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/cs/thunderbird-78.4.2.tar.bz2";

375375 locale = "cs";

376376 arch = "linux-i686";

377− sha256 = "0450c73284b274af21f3f0c4c21842e11fa2a86fcb38f96332c1ca8984149c62";

377+ sha256 = "c45a3b75c5106377d73f72b905814972a58604b4f2bfe49f05f5177584f2e0d6";

378378 }

379− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/cy/thunderbird-78.4.1.tar.bz2";

379+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/cy/thunderbird-78.4.2.tar.bz2";

380380 locale = "cy";

381381 arch = "linux-i686";

382− sha256 = "5686316ec53a76dab272934dbd274a47802c5c31f2ae8719bcf85c22e12cc3f7";

382+ sha256 = "e8e1f70703c9c22fceb2efe10f55a2f25da4085822ada1a3a3a3736ae41c0503";

383383 }

384− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/da/thunderbird-78.4.1.tar.bz2";

384+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/da/thunderbird-78.4.2.tar.bz2";

385385 locale = "da";

386386 arch = "linux-i686";

387− sha256 = "2025f5946989905fd197fe5bf6c51160e7c9d281d6cfd220ea3ee0393cc54ca0";

387+ sha256 = "d8fb3be7bc41ae6ae0d064bdf9ab9cc569f65dc18f720de960ace84bb2514b68";

388388 }

389− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/de/thunderbird-78.4.1.tar.bz2";

389+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/de/thunderbird-78.4.2.tar.bz2";

390390 locale = "de";

391391 arch = "linux-i686";

392− sha256 = "906e8a5de0aa12b496f4d4447df25432b11c88d79b7ab4a55291a9d65434aa03";

392+ sha256 = "373f50cb99608779e502d76af0e4a301ef0b8b75a6ec235f64da7626188157c6";

393393 }

394− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/dsb/thunderbird-78.4.1.tar.bz2";

394+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/dsb/thunderbird-78.4.2.tar.bz2";

395395 locale = "dsb";

396396 arch = "linux-i686";

397− sha256 = "d6bfb2b790d8391344916515d1cc6ca2eb68a3e58934cacba14e77788aec6b09";

397+ sha256 = "07518d32b488fb805adceea1126ca104f2e86e3a1245f6cc4fe108b70335c995";

398398 }

399− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/el/thunderbird-78.4.1.tar.bz2";

399+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/el/thunderbird-78.4.2.tar.bz2";

400400 locale = "el";

401401 arch = "linux-i686";

402− sha256 = "5f96345a945697326b24fcd73a96fa2f49edb66b02f4c23b6d392fad87935e08";

402+ sha256 = "97699a80d96422dad4c95658c9c4d472bd1d69e1823f5a5f7dce5fdaddf1211f";

403403 }

404− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/en-CA/thunderbird-78.4.1.tar.bz2";

404+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/en-CA/thunderbird-78.4.2.tar.bz2";

405405 locale = "en-CA";

406406 arch = "linux-i686";

407− sha256 = "b57e44fd16e33b178778a60f0bd47519585a3e648b3b621f1fd693836c5fb598";

407+ sha256 = "0b2dc377399c4f27acb717c7f0e59e9e735ad3d2ba1e617a93a3fa337b6dd2c0";

408408 }

409− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/en-GB/thunderbird-78.4.1.tar.bz2";

409+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/en-GB/thunderbird-78.4.2.tar.bz2";

410410 locale = "en-GB";

411411 arch = "linux-i686";

412− sha256 = "6f656dcbd7aaab5995beb11a9847e32f8820199272e2f9ce27583cd3d7e50a76";

412+ sha256 = "679fd1138a8795b0e7d64a4b8d8a2821deb8b30d40092e9df98b0a08d6cc6539";

413413 }

414− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/en-US/thunderbird-78.4.1.tar.bz2";

414+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/en-US/thunderbird-78.4.2.tar.bz2";

415415 locale = "en-US";

416416 arch = "linux-i686";

417− sha256 = "8c6bccc757df947bed74a3f7448a3885932a4f6c21d24ab6b5c7a94ab83ebae5";

417+ sha256 = "a86f2780353dff8a449f323d5f54d83ce70b724db1a2d77dc3cecf6d1e849ada";

418418 }

419− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/es-AR/thunderbird-78.4.1.tar.bz2";

419+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/es-AR/thunderbird-78.4.2.tar.bz2";

420420 locale = "es-AR";

421421 arch = "linux-i686";

422− sha256 = "55bbc629ceadf359e0ad05e763a31479f6c57c38f372e55812b028681a5ff32a";

422+ sha256 = "1fbd2312a971f658243dd6733067157fe3de509a88b2cce766ee8e45c243d23d";

423423 }

424− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/es-ES/thunderbird-78.4.1.tar.bz2";

424+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/es-ES/thunderbird-78.4.2.tar.bz2";

425425 locale = "es-ES";

426426 arch = "linux-i686";

427− sha256 = "bf30dd8882b2b35bfaa62a6c4b40a823333476128a6d5dd3e3d2c8eb16303b9a";

427+ sha256 = "e51217ca711a307c67f538d487eb836d49e4ccd6b8ff9b1a1926bd481322d46f";

428428 }

429− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/et/thunderbird-78.4.1.tar.bz2";

429+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/et/thunderbird-78.4.2.tar.bz2";

430430 locale = "et";

431431 arch = "linux-i686";

432− sha256 = "5b977eab7f203e230d6a03b36afebdb32c481f1eb8129e454977791469ed5651";

432+ sha256 = "345ccfa0e703893795d226aacf95645cc2cdc7dc99f5f9fba108466f74af19fe";

433433 }

434− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/eu/thunderbird-78.4.1.tar.bz2";

434+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/eu/thunderbird-78.4.2.tar.bz2";

435435 locale = "eu";

436436 arch = "linux-i686";

437− sha256 = "f2d606a6f825640c0f344cf470d87a1dea5fc6ff538239ce25c3d7c9fc76237d";

437+ sha256 = "47e95ce28a229dbd01d8598d3a5b7f00d8e2c1934f8da4ff92052693dbb0c7c9";

438438 }

439− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/fa/thunderbird-78.4.1.tar.bz2";

439+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/fa/thunderbird-78.4.2.tar.bz2";

440440 locale = "fa";

441441 arch = "linux-i686";

442− sha256 = "95d0d3d1b456c035cc6ed09df970e9e772a71af3703f05e9388e844d7f80edab";

442+ sha256 = "6c05b6a34a1ae3232b417e37c6c71bb05e46a296019b55192331cd441f212e1b";

443443 }

444− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/fi/thunderbird-78.4.1.tar.bz2";

444+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/fi/thunderbird-78.4.2.tar.bz2";

445445 locale = "fi";

446446 arch = "linux-i686";

447− sha256 = "e0be2532774bbe017a6091d7e1ec79901f692c39e04e01fe4094f7c8179fbaf4";

447+ sha256 = "fe043a86dd6679dc20ed17920e008894d78562d099861c0cda598c74aff3b176";

448448 }

449− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/fr/thunderbird-78.4.1.tar.bz2";

449+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/fr/thunderbird-78.4.2.tar.bz2";

450450 locale = "fr";

451451 arch = "linux-i686";

452− sha256 = "48cc16a61958160f369b32e8a0dcd2979ee65e18efe3d1dd3a4af1109842718b";

452+ sha256 = "950fa73e6f5fcf2fd66da9af7b79e43420e3ce75c9227fee095ea65ce2769a7f";

453453 }

454− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/fy-NL/thunderbird-78.4.1.tar.bz2";

454+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/fy-NL/thunderbird-78.4.2.tar.bz2";

455455 locale = "fy-NL";

456456 arch = "linux-i686";

457− sha256 = "386d0a2ed01b158f0fe18eb6820ff9a17fbbea61241eaf873782271ac84eb103";

457+ sha256 = "e01f59e5b7abde309421515240229d16cc0ec6ad4ea52ef1a54fb65f0bc49091";

458458 }

459− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ga-IE/thunderbird-78.4.1.tar.bz2";

459+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ga-IE/thunderbird-78.4.2.tar.bz2";

460460 locale = "ga-IE";

461461 arch = "linux-i686";

462− sha256 = "c0c15410e6812e8652181ab347b3fe60fdce3b5b9958d54ef3f96ecc46a4d344";

462+ sha256 = "53a7b0b5a2046525701120101fbab5c581b99de56caadf3aed4732f444c35569";

463463 }

464− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/gd/thunderbird-78.4.1.tar.bz2";

464+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/gd/thunderbird-78.4.2.tar.bz2";

465465 locale = "gd";

466466 arch = "linux-i686";

467− sha256 = "3989f0c0f87ebfca3e4cfad0ac9ca2964791ab8f1163f1bec340444ae4a72a7b";

467+ sha256 = "eaea6b3770d5bc51a00e25fee02110f5614d9ef52049fc092d90dc1e8de4c210";

468468 }

469− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/gl/thunderbird-78.4.1.tar.bz2";

469+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/gl/thunderbird-78.4.2.tar.bz2";

470470 locale = "gl";

471471 arch = "linux-i686";

472− sha256 = "eb1b58c93e492a79f92660909e671ee7ec504701b8e074d3dc6f3d3fe3619660";

472+ sha256 = "b0c5d871785d1efa23bdbe341d8186b96394375ac56bb541d5d9a75bc784b471";

473473 }

474− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/he/thunderbird-78.4.1.tar.bz2";

474+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/he/thunderbird-78.4.2.tar.bz2";

475475 locale = "he";

476476 arch = "linux-i686";

477− sha256 = "f584e117ba4fbfbb7d2c28b68377a88aad87929657141adac5ce960bcf5f4fa3";

477+ sha256 = "cef410178a3cf310c7bf158eba5c12093385dfda1de334d6d6e0c28ada16c7ca";

478478 }

479− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/hr/thunderbird-78.4.1.tar.bz2";

479+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/hr/thunderbird-78.4.2.tar.bz2";

480480 locale = "hr";

481481 arch = "linux-i686";

482− sha256 = "633eab2f8ac99426dd85b614f04d96509125f0799c187305b7678496d9ceff0f";

482+ sha256 = "9040e2235a752a50cbe09207684df928b84787629d21c8d53e6b9bfc708b09a3";

483483 }

484− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/hsb/thunderbird-78.4.1.tar.bz2";

484+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/hsb/thunderbird-78.4.2.tar.bz2";

485485 locale = "hsb";

486486 arch = "linux-i686";

487− sha256 = "80e4b98bbc9874de9b4c8e35633f6eea7b5707cfc4943df7264cf0bbfba49d99";

487+ sha256 = "b0bb84d18c588abf2f05abc8ecb1f3a169221fcdf4117e48b3169362cfc69aa6";

488488 }

489− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/hu/thunderbird-78.4.1.tar.bz2";

489+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/hu/thunderbird-78.4.2.tar.bz2";

490490 locale = "hu";

491491 arch = "linux-i686";

492− sha256 = "5a9339a876a7e0dced6769a99a948329f6eaa400acb6920a24d06695120f682a";

492+ sha256 = "6d5d0ded325cf7852ef638d7f5d8dd4d7ce127ad7f4eace22ce696541f9485a5";

493493 }

494− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/hy-AM/thunderbird-78.4.1.tar.bz2";

494+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/hy-AM/thunderbird-78.4.2.tar.bz2";

495495 locale = "hy-AM";

496496 arch = "linux-i686";

497− sha256 = "286542d67a76a6e8f0c34e7aca9c23c8922bf85f8be77c913285e208f8b195a7";

497+ sha256 = "cbb8de1462385ef9bdb42cec5e8c81664347dc9e7573f602f41ff586c217d8ea";

498498 }

499− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/id/thunderbird-78.4.1.tar.bz2";

499+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/id/thunderbird-78.4.2.tar.bz2";

500500 locale = "id";

501501 arch = "linux-i686";

502− sha256 = "930cbbe1520c544a25cfbdf8d10b4e6ae19a812c8a20ce51053ba0d5fc2b4b24";

502+ sha256 = "358a95d7d87adc85cd39bf6da1373026de5b8631139ee1ec44e9410b027e00cd";

503503 }

504− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/is/thunderbird-78.4.1.tar.bz2";

504+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/is/thunderbird-78.4.2.tar.bz2";

505505 locale = "is";

506506 arch = "linux-i686";

507− sha256 = "7fca3c4c9d3a309ec182d1486438973741fe2f1e39afd3ccb769256657db20a6";

507+ sha256 = "c7b27e5311737cd5f3d314830aba0ec165669d8c949edb37482fb4df3b460f9e";

508508 }

509− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/it/thunderbird-78.4.1.tar.bz2";

509+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/it/thunderbird-78.4.2.tar.bz2";

510510 locale = "it";

511511 arch = "linux-i686";

512− sha256 = "3b44f63975cfe7460f3eadd9f71f13db9ded5d9e5622ec322f556692f979434b";

512+ sha256 = "a302c50190fb992fcdaa66a8de9c5f5d177a5563fcec55e5f433761646ccfcbd";

513513 }

514− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ja/thunderbird-78.4.1.tar.bz2";

514+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ja/thunderbird-78.4.2.tar.bz2";

515515 locale = "ja";

516516 arch = "linux-i686";

517− sha256 = "1284e52cda834b1ef9b5ac6a1dc29858f6e1519d0fd47d330744c0d294338650";

517+ sha256 = "d2357cc5bb5b5493035a79b504db8db2750f5880705b693554e2170d8d840cb0";

518518 }

519− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ka/thunderbird-78.4.1.tar.bz2";

519+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ka/thunderbird-78.4.2.tar.bz2";

520520 locale = "ka";

521521 arch = "linux-i686";

522− sha256 = "b12a79e20fce3db2541dcde61e04206e82530d1d79b58637bfcede87294fd801";

522+ sha256 = "2d150d1160d92499fd9dc4d632e006170a27929f88909715c0d0210005516ff7";

523523 }

524− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/kab/thunderbird-78.4.1.tar.bz2";

524+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/kab/thunderbird-78.4.2.tar.bz2";

525525 locale = "kab";

526526 arch = "linux-i686";

527− sha256 = "9766eab276e77b0e33ad7ecbf8f26b84aa2a079a4fc9e4dfc992c41074513e40";

527+ sha256 = "4f9879d5a106ec9fc3bd423fdb5df25a3e0d47690cfec652654472addd21a2c2";

528528 }

529− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/kk/thunderbird-78.4.1.tar.bz2";

529+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/kk/thunderbird-78.4.2.tar.bz2";

530530 locale = "kk";

531531 arch = "linux-i686";

532− sha256 = "aec202db7c28ae69c9f7684a2e4f30a16ab29ec983aacb32bbe4b5bd31b76e94";

532+ sha256 = "f8d7fe1f39af2019bb37e117545e8cb2901feb0d31a92287eb4b30da2e431a6b";

533533 }

534− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ko/thunderbird-78.4.1.tar.bz2";

534+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ko/thunderbird-78.4.2.tar.bz2";

535535 locale = "ko";

536536 arch = "linux-i686";

537− sha256 = "b0e553c14925413461a87f1d81591bfa4e2ce2c5ad87e8ec609fef76ba4f17d8";

537+ sha256 = "bd9abd627205fe33430717a60eea8b54498325a8fe4d92fb5572a2719ba50341";

538538 }

539− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/lt/thunderbird-78.4.1.tar.bz2";

539+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/lt/thunderbird-78.4.2.tar.bz2";

540540 locale = "lt";

541541 arch = "linux-i686";

542− sha256 = "6036247e3025c2b513762577e7de1d1eda050572f674c31391e583ccd16e80f8";

542+ sha256 = "69ab343eb79c42c4a1a9ea480aa2ac50d95e9140968690fd99b3d13824be17ef";

543543 }

544− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ms/thunderbird-78.4.1.tar.bz2";

544+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ms/thunderbird-78.4.2.tar.bz2";

545545 locale = "ms";

546546 arch = "linux-i686";

547− sha256 = "0852cb745130e22af327e2ce39249751ed482c8216c18f4545bd294f4afb4e29";

547+ sha256 = "fb1246094e22ff59f8671a6aa0827c8e51a7fa8dc2bb565a3cb446d35c098f16";

548548 }

549− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/nb-NO/thunderbird-78.4.1.tar.bz2";

549+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/nb-NO/thunderbird-78.4.2.tar.bz2";

550550 locale = "nb-NO";

551551 arch = "linux-i686";

552− sha256 = "eebec58d3a20956894711266715ce5a4afcfd44b5eb7b334dc0c22068fbb10a6";

552+ sha256 = "0ffcd2db855686c4b7e8751884aa4a8729b0fc8da597d256d37d6c73a50c7585";

553553 }

554− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/nl/thunderbird-78.4.1.tar.bz2";

554+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/nl/thunderbird-78.4.2.tar.bz2";

555555 locale = "nl";

556556 arch = "linux-i686";

557− sha256 = "0c6d35960d89681087bcfbf403ff727f53ba2e67de9c69d04f96b68447b616d8";

557+ sha256 = "615205a37248619a664b4649f808ddce9b019aae60a900fe4d2ca2dfdd717fe2";

558558 }

559− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/nn-NO/thunderbird-78.4.1.tar.bz2";

559+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/nn-NO/thunderbird-78.4.2.tar.bz2";

560560 locale = "nn-NO";

561561 arch = "linux-i686";

562− sha256 = "b761b921ba2e604dcde7ac0e03a83ef29a3311309cb95bc39801b8bcfd80ef98";

562+ sha256 = "8813d2b40da457d5d7c0da88d54b8b0c13d2ea0215b9bee2966215d366d79a81";

563563 }

564− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/pa-IN/thunderbird-78.4.1.tar.bz2";

564+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/pa-IN/thunderbird-78.4.2.tar.bz2";

565565 locale = "pa-IN";

566566 arch = "linux-i686";

567− sha256 = "fa350ad64a3ff760a6e2cc6ac6b6ad1d6b9ad300b6c3420477148152bc207499";

567+ sha256 = "31feb987ff8493d96e15395deb93506b13089db28d91c0bf6ee4da271db8a0d2";

568568 }

569− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/pl/thunderbird-78.4.1.tar.bz2";

569+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/pl/thunderbird-78.4.2.tar.bz2";

570570 locale = "pl";

571571 arch = "linux-i686";

572− sha256 = "8b187d44bc1364dc76258ff3452610483b2ab3d060c9de43e47c25fd3103c5d9";

572+ sha256 = "a9c30450e918ec4c0a95da51c071f8c4ec4f870976ac494ae6042aa3fdbc4a56";

573573 }

574− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/pt-BR/thunderbird-78.4.1.tar.bz2";

574+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/pt-BR/thunderbird-78.4.2.tar.bz2";

575575 locale = "pt-BR";

576576 arch = "linux-i686";

577− sha256 = "1ff199f91e49d72bd9821bfe3e2d33cb4a750a6c46aaf16a80554c195694ed43";

577+ sha256 = "157d64059b2a7a1082f233c05fdc0302f92dfa496c0075761bd54327b439594c";

578578 }

579− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/pt-PT/thunderbird-78.4.1.tar.bz2";

579+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/pt-PT/thunderbird-78.4.2.tar.bz2";

580580 locale = "pt-PT";

581581 arch = "linux-i686";

582− sha256 = "098043202612b362a16353c84a5b9e662331c2311679357592b5a77a6690b68d";

582+ sha256 = "d8a403996d56e22809e9124fc4c9dec98cda19a5fad7144fa87e452ae75a990e";

583583 }

584− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/rm/thunderbird-78.4.1.tar.bz2";

584+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/rm/thunderbird-78.4.2.tar.bz2";

585585 locale = "rm";

586586 arch = "linux-i686";

587− sha256 = "ab9bb22e53da48744885634a14886ddb23dd5ccab376e5323824daa3f22ae0cf";

587+ sha256 = "97524948b2f9259d1b08b9bbc6533b79fd5e592b08fb5fc5cc63bdb749d5866c";

588588 }

589− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ro/thunderbird-78.4.1.tar.bz2";

589+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ro/thunderbird-78.4.2.tar.bz2";

590590 locale = "ro";

591591 arch = "linux-i686";

592− sha256 = "fb3e61830c5693c7f3b84eb4e3c60ff97324c5654352008aabbe9f16ea40cb0e";

592+ sha256 = "99e2c94054fd01001555fdcf4e9ee8a04fbae77e5ff9d34ebc42a6415b939bbd";

593593 }

594− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ru/thunderbird-78.4.1.tar.bz2";

594+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ru/thunderbird-78.4.2.tar.bz2";

595595 locale = "ru";

596596 arch = "linux-i686";

597− sha256 = "f9fceef81a605ebc66fd90e2759205c4eb7160095312579eb7543b4293dd7a7d";

597+ sha256 = "f1996c3f3b6b5371f853f6854edd15ee030b6238f396870a2cff39320eac111a";

598598 }

599− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/si/thunderbird-78.4.1.tar.bz2";

599+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/si/thunderbird-78.4.2.tar.bz2";

600600 locale = "si";

601601 arch = "linux-i686";

602− sha256 = "0903c3d1bf790c5c10167839e3bc60d80a23e4230895703f7c931856cb617038";

602+ sha256 = "10df360a1d5a94ccd218a265024fb3f3d9d9a72b8c749ab93d797a3879cbad03";

603603 }

604− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sk/thunderbird-78.4.1.tar.bz2";

604+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/sk/thunderbird-78.4.2.tar.bz2";

605605 locale = "sk";

606606 arch = "linux-i686";

607− sha256 = "2018e5685fbcb5c2cc8925be39b04f6d98347cb59446af62846378818d6435f6";

607+ sha256 = "a5f9e0b983961cc4e4ff7cb6f03c197cd8729eead74d6c0b657b441a91635326";

608608 }

609− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sl/thunderbird-78.4.1.tar.bz2";

609+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/sl/thunderbird-78.4.2.tar.bz2";

610610 locale = "sl";

611611 arch = "linux-i686";

612− sha256 = "d20b13b5caa2f5c9c431f3e69095f094800fa520b3a5a57c27a4c9c565961fb8";

612+ sha256 = "10526684f3066322066f204a2cf978c779bb895d5c7ba73880ee32caf63d62a7";

613613 }

614− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sq/thunderbird-78.4.1.tar.bz2";

614+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/sq/thunderbird-78.4.2.tar.bz2";

615615 locale = "sq";

616616 arch = "linux-i686";

617− sha256 = "164041c3958f57f90d17fe1457205a420f326c17e88da0197732435cf6a5dfca";

617+ sha256 = "d422e42397d2012efaeeb37101a5b1b29feb34e9e9dbaf87a85f9e2f881511ea";

618618 }

619− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sr/thunderbird-78.4.1.tar.bz2";

619+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/sr/thunderbird-78.4.2.tar.bz2";

620620 locale = "sr";

621621 arch = "linux-i686";

622− sha256 = "8ffcd2dea1b4980519220a27346b5c0fa955b89580836c38711c21c8eb7d26c8";

622+ sha256 = "1e9b5637581c2c4973efcc5b0844ca228f66c4fbb0a44e88201973623aad0b83";

623623 }

624− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sv-SE/thunderbird-78.4.1.tar.bz2";

624+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/sv-SE/thunderbird-78.4.2.tar.bz2";

625625 locale = "sv-SE";

626626 arch = "linux-i686";

627− sha256 = "83536011e7bfe2e7a0a760ed879e041b4caa3ee27e95829331faefd29e8deebb";

627+ sha256 = "592daeeebdb5f56f486a4e6efa1c51e709d834a65c861e76e5b6fd86f8a4bb09";

628628 }

629− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/th/thunderbird-78.4.1.tar.bz2";

629+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/th/thunderbird-78.4.2.tar.bz2";

630630 locale = "th";

631631 arch = "linux-i686";

632− sha256 = "13be237b698dc9b468af7a2b8ff062118421a7b798771f1db4f82bcb1098f83c";

632+ sha256 = "00f883ed3d542d0bf3da3e744523cfd1b3405ae0b928dd83c42e55e5f1bab4e1";

633633 }

634− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/tr/thunderbird-78.4.1.tar.bz2";

634+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/tr/thunderbird-78.4.2.tar.bz2";

635635 locale = "tr";

636636 arch = "linux-i686";

637− sha256 = "c70d085f6ceed58e7ea55ab01d121627a55df2f5e961ef160f4965db941660b3";

637+ sha256 = "ab69a35eebbd1cdef80b22a398c4d570c17e13a8a36e5399b892974d7ed29b10";

638638 }

639− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/uk/thunderbird-78.4.1.tar.bz2";

639+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/uk/thunderbird-78.4.2.tar.bz2";

640640 locale = "uk";

641641 arch = "linux-i686";

642− sha256 = "c1b7b0efe7af03a488c80020247e2d8038d6dffa313188083bb75c1bc09c35fc";

642+ sha256 = "efbd5bf9552333d78c68191265b3ecccb2a59ae19f2bfe7a1d8b096a44c9fcdc";

643643 }

644− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/uz/thunderbird-78.4.1.tar.bz2";

644+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/uz/thunderbird-78.4.2.tar.bz2";

645645 locale = "uz";

646646 arch = "linux-i686";

647− sha256 = "f4b8d20603c5e1dcc72760623803fc4cb34fffffd7b394c1998b860b5e3bc129";

647+ sha256 = "db90d47b59efeb5c847ecdf8b7438a4f99d0954283f1deda39a0ee08f54fdfd1";

648648 }

649− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/vi/thunderbird-78.4.1.tar.bz2";

649+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/vi/thunderbird-78.4.2.tar.bz2";

650650 locale = "vi";

651651 arch = "linux-i686";

652− sha256 = "6d9d7885ba742ae28766ed98e64aa59892ffb51ad67eb9bc47d5a3974b8a7f50";

652+ sha256 = "1d616c682f04f7c0ec976d41eb71d3ac929eaa3199b4af749a80c906a3f2a212";

653653 }

654− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/zh-CN/thunderbird-78.4.1.tar.bz2";

654+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/zh-CN/thunderbird-78.4.2.tar.bz2";

655655 locale = "zh-CN";

656656 arch = "linux-i686";

657− sha256 = "e47c2e9b66c99c8ba02c60f739d31ea2d679cdc4d6f1f407257ef3372cabf364";

657+ sha256 = "490e4e310606846836d93ca9704b7de11bf307b918933fd0187aa5d3795a82bf";

658658 }

659− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/zh-TW/thunderbird-78.4.1.tar.bz2";

659+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/zh-TW/thunderbird-78.4.2.tar.bz2";

660660 locale = "zh-TW";

661661 arch = "linux-i686";

662− sha256 = "1cbab249ae670a204e464a9082365967a74ce2533bdab60682c14fe65dafba16";

662+ sha256 = "c62476ac43d302ad9895524f6f66350122edfdf393697111d5868cf25b996c1a";

663663 }

664664 ];

665665}

pkgs/applications/networking/mailreaders/thunderbird/default.nix+2−2

@@ -70,13 +70,13 @@ assert waylandSupport -> gtk3Support == true;

7070

7171stdenv.mkDerivation rec {

7272 pname = "thunderbird";

73− version = "78.4.1";

73+ version = "78.4.2";

7474

7575 src = fetchurl {

7676 url =

7777 "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";

7878 sha512 =

79− "2mbb139xdi69bnvvg7zabwbw181xnz7y154viynmkwyh4iww0hcsvr88q246gnif8a7jns3pi4qgqxgzflyl6mzpsvfdrbjs5hylanx";

79+ "1bd8z6fm2nky4p3qxc5jh9dca7v7g77i6kdn6p5dzzm4gyadqvk00bfa4nzglzi9nwwyld14r3ydjd6ms012yk07q4aqdsrf51b9k4y";

8080 };

8181

8282 nativeBuildInputs = [

pkgs/applications/office/portfolio/default.nix+2−2

@@ -24,11 +24,11 @@ let

2424in

2525stdenv.mkDerivation rec {

2626 pname = "PortfolioPerformance";

27− version = "0.49.0";

27+ version = "0.49.2";

2828

2929 src = fetchurl {

3030 url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";

31− sha256 = "1b3dll6ljkj2wyiy3ns9cgxqgjjr60dfrqrbbwdbndqj4pzfvbyf";

31+ sha256 = "0c2ixzwbc094wqc2lyrh3w1azswg6xz3wdh8l4lbkiw02s9czhhn";

3232 };

3333

3434 nativeBuildInputs = [

pkgs/applications/office/timekeeper/default.nixnew file+44

@@ -0,0 +1,44 @@

1+{ stdenv

2+, fetchFromGitHub

3+, poco

4+, pkg-config

5+, gnome2

6+, gtkmm2

7+, lib

8+}:

10+stdenv.mkDerivation rec {

11+ pname = "timekeeper";

12+ version = "1.0";

13+

14+ src = fetchFromGitHub {

15+ owner = "bburdette";

16+ repo = "TimeKeeper";

17+ rev = "v${version}";

18+ fetchSubmodules = true;

19+ sha256 = "03rvzkygnn7igcindbb5bcmfy0l83n0awkzprsnhlb6ndxax3k9w";

20+ };

21+

22+ nativeBuildInputs = [

23+ poco

24+ pkg-config

25+ ];

26+

27+ buildInputs = [

28+ gtkmm2

29+ gnome2.libglademm

30+ gnome2.libglade

31+ ];

32+

33+ installPhase = ''

34+ install -Dm755 TimeKeeper/TimeKeeper $out/bin/timekeeper

35+ '';

36+

37+ meta = with stdenv.lib; {

38+ description = "Log hours worked and make reports";

39+ homepage = "https://github.com/bburdette/TimeKeeper";

40+ maintainers = with maintainers; [ bburdette ];

41+ platforms = [ "x86_64-linux" ];

42+ license = licenses.bsd3;

43+ };

44+}

pkgs/applications/science/math/qalculate-gtk/default.nix+2−2

@@ -2,13 +2,13 @@

33stdenv.mkDerivation rec {

44 pname = "qalculate-gtk";

5− version = "3.13.0";

5+ version = "3.14.0";

77 src = fetchFromGitHub {

88 owner = "qalculate";

99 repo = "qalculate-gtk";

1010 rev = "v${version}";

11− sha256 = "0yrzvsii84r9d2i2hrs4f65wzv3yj24l9d9yqfv3j85881h8wkm2";

11+ sha256 = "1pff3m5xnw9kai6n110j1grxzcf2r7pxi76jin1lxhm8q8gmnnz1";

1212 };

1313

1414 hardeningDisable = [ "format" ];

pkgs/applications/version-management/git-and-tools/default.nix+1−1

@@ -198,7 +198,7 @@ let

198198 gitstatus = callPackage ./gitstatus { };

199199

200200 gitui = callPackage ./gitui {

201− inherit (darwin.apple_sdk.frameworks) Security;

201+ inherit (darwin.apple_sdk.frameworks) Security AppKit;

202202 };

203203

204204 grv = callPackage ./grv { };

pkgs/applications/version-management/git-and-tools/gitui/default.nix+2−2

@@ -1,4 +1,4 @@

1−{ stdenv, rustPlatform, fetchFromGitHub, libiconv, xorg, python3, Security }:

1+{ stdenv, rustPlatform, fetchFromGitHub, libiconv, xorg, python3, Security, AppKit }:

22rustPlatform.buildRustPackage rec {

33 pname = "gitui";

44 version = "0.10.1";

@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {

1515 nativeBuildInputs = [ python3 ];

1616 buildInputs = [ ]

1717 ++ stdenv.lib.optional stdenv.isLinux xorg.libxcb

18− ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];

18+ ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security AppKit ];

1919

2020 meta = with stdenv.lib; {

2121 description = "Blazing fast terminal-ui for git written in rust";

pkgs/applications/version-management/gitlab-triage/Gemfilenew file+3

@@ -0,0 +1,3 @@

1+source 'https://rubygems.org' do

2+ gem 'gitlab-triage'

3+end

pkgs/applications/version-management/gitlab-triage/Gemfile.locknew file+35

@@ -0,0 +1,35 @@

1+GEM

2+ remote: https://rubygems.org/

3+ specs:

4+ activesupport (5.2.4.4)

5+ concurrent-ruby (~> 1.0, >= 1.0.2)

6+ i18n (>= 0.7, < 2)

7+ minitest (~> 5.1)

8+ tzinfo (~> 1.1)

9+ concurrent-ruby (1.1.7)

10+ gitlab-triage (1.13.0)

11+ activesupport (~> 5.1)

12+ httparty (~> 0.17)

13+ httparty (0.18.1)

14+ mime-types (~> 3.0)

15+ multi_xml (>= 0.5.2)

16+ i18n (1.8.5)

17+ concurrent-ruby (~> 1.0)

18+ mime-types (3.3.1)

19+ mime-types-data (~> 3.2015)

20+ mime-types-data (3.2020.0512)

21+ minitest (5.14.2)

22+ multi_xml (0.6.0)

23+ thread_safe (0.3.6)

24+ tzinfo (1.2.7)

25+ thread_safe (~> 0.1)

26+

27+PLATFORMS

28+ ruby

29+ x86_64-linux

30+

31+DEPENDENCIES

32+ gitlab-triage!

33+

34+BUNDLED WITH

35+ 2.1.4

pkgs/applications/version-management/gitlab-triage/default.nixnew file+14

@@ -0,0 +1,14 @@

1+{ lib, bundlerApp }:

3+bundlerApp {

4+ pname = "gitlab-triage";

5+ gemdir = ./.;

6+ exes = [ "gitlab-triage" ];

8+ meta = with lib; {

9+ description = "GitLab's issues and merge requests triage, automated!";

10+ homepage = "https://gitlab.com/gitlab-org/gitlab-triage";

11+ license = licenses.mit;

12+ maintainers = with maintainers; [ SuperSandro2000 ];

13+ };

14+}

pkgs/applications/version-management/gitlab-triage/gemset.nixnew file+118

@@ -0,0 +1,118 @@

1+{

2+ activesupport = {

3+ dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];

4+ groups = ["default"];

5+ platforms = [];

6+ source = {

7+ remotes = ["https://rubygems.org"];

8+ sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd";

9+ type = "gem";

10+ };

11+ version = "5.2.4.4";

12+ };

13+ concurrent-ruby = {

14+ groups = ["default"];

15+ platforms = [];

16+ source = {

17+ remotes = ["https://rubygems.org"];

18+ sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz";

19+ type = "gem";

20+ };

21+ version = "1.1.7";

22+ };

23+ gitlab-triage = {

24+ dependencies = ["activesupport" "httparty"];

25+ groups = ["default"];

26+ platforms = [];

27+ source = {

28+ remotes = ["https://rubygems.org"];

29+ sha256 = "11sas3h3n638gni1mysck1ahyakqnl8gg6g21pc3krs6jrg9qxj9";

30+ type = "gem";

31+ };

32+ version = "1.13.0";

33+ };

34+ httparty = {

35+ dependencies = ["mime-types" "multi_xml"];

36+ groups = ["default"];

37+ platforms = [];

38+ source = {

39+ remotes = ["https://rubygems.org"];

40+ sha256 = "17gpnbf2a7xkvsy20jig3ljvx8hl5520rqm9pffj2jrliq1yi3w7";

41+ type = "gem";

42+ };

43+ version = "0.18.1";

44+ };

45+ i18n = {

46+ dependencies = ["concurrent-ruby"];

47+ groups = ["default"];

48+ platforms = [];

49+ source = {

50+ remotes = ["https://rubygems.org"];

51+ sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk";

52+ type = "gem";

53+ };

54+ version = "1.8.5";

55+ };

56+ mime-types = {

57+ dependencies = ["mime-types-data"];

58+ groups = ["default"];

59+ platforms = [];

60+ source = {

61+ remotes = ["https://rubygems.org"];

62+ sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh";

63+ type = "gem";

64+ };

65+ version = "3.3.1";

66+ };

67+ mime-types-data = {

68+ groups = ["default"];

69+ platforms = [];

70+ source = {

71+ remotes = ["https://rubygems.org"];

72+ sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753";

73+ type = "gem";

74+ };

75+ version = "3.2020.0512";

76+ };

77+ minitest = {

78+ groups = ["default"];

79+ platforms = [];

80+ source = {

81+ remotes = ["https://rubygems.org"];

82+ sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v";

83+ type = "gem";

84+ };

85+ version = "5.14.2";

86+ };

87+ multi_xml = {

88+ groups = ["default"];

89+ platforms = [];

90+ source = {

91+ remotes = ["https://rubygems.org"];

92+ sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj";

93+ type = "gem";

94+ };

95+ version = "0.6.0";

96+ };

97+ thread_safe = {

98+ groups = ["default"];

99+ platforms = [];

100+ source = {

101+ remotes = ["https://rubygems.org"];

102+ sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";

103+ type = "gem";

104+ };

105+ version = "0.3.6";

106+ };

107+ tzinfo = {

108+ dependencies = ["thread_safe"];

109+ groups = ["default"];

110+ platforms = [];

111+ source = {

112+ remotes = ["https://rubygems.org"];

113+ sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r";

114+ type = "gem";

115+ };

116+ version = "1.2.7";

117+ };

118+}

pkgs/applications/window-managers/sway/default.nix+2−8

@@ -7,13 +7,13 @@

88stdenv.mkDerivation rec {

99 pname = "sway-unwrapped";

10− version = "1.5";

10+ version = "1.5.1";

1111

1212 src = fetchFromGitHub {

1313 owner = "swaywm";

1414 repo = "sway";

1515 rev = version;

16− sha256 = "0r3b7h778l9i20z3him9i2qsaynpn9y78hzfgv3cqi8fyry2c4f9";

16+ sha256 = "1xsa3h8zhf29p0mi90baxpr76jkd9pd1gr97ky8cnjbcs4isj9j0";

1717 };

1818

1919 patches = [

@@ -21,12 +21,6 @@ stdenv.mkDerivation rec {

2121 ./load-configuration-from-etc.patch

2222 ];

2323

24− postPatch = ''

25− substituteInPlace meson.build \

26− --replace "v1.5" "1.5" \

27− --replace "wlroots_version = ['>=0.11.0', '<0.12.0']" "wlroots_version = ['>=0.11.0', '<0.13.0']"

28− '';

29−

3024 nativeBuildInputs = [

3125 meson ninja pkg-config wayland scdoc

3226 ];

pkgs/data/fonts/jetbrains-mono/default.nix+2−2

@@ -1,14 +1,14 @@

11{ lib, fetchzip }:

33let

4− version = "2.200";

4+ version = "2.210";

55in

66fetchzip {

77 name = "JetBrainsMono-${version}";

99 url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip";

1010

11− sha256 = "16v914ph9sgdz3w56yz9f26zpj2lpxjb6ppnphxlmbllh68z1fh4";

11+ sha256 = "05csy42qji8xbaq5iap2nmki0d0cbiwiq9kbzjd1cah9qn6gfill";

1212

1313 postFetch = ''

1414 mkdir -p $out/share/fonts

pkgs/data/fonts/vista-fonts/default.nix+2−2

@@ -1,4 +1,4 @@

1−{stdenv, fetchzip, cabextract}:

1+{ stdenv, fetchzip, cabextract }:

33fetchzip {

44 name = "vista-fonts-1";

@@ -21,7 +21,7 @@ fetchzip {

2121 done

2222 '';

2323

24− sha256 = "1l27zg5jraa16zm11d3qz1w7m6f1ih3xy5avww454ylm50fw6z11";

24+ sha256 = "sha256-x7JSXS9Q1fzlJTVR+MAS3f2+cmo/H0s1qkY9FPjx2zI=";

2525

2626 meta = {

2727 description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)";

pkgs/desktops/gnome-3/core/gdm/default.nix+2−2

@@ -47,13 +47,13 @@ in

4747

4848stdenv.mkDerivation rec {

4949 pname = "gdm";

50− version = "3.38.1";

50+ version = "3.38.2";

5151

5252 outputs = [ "out" "dev" ];

5353

5454 src = fetchurl {

5555 url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

56− sha256 = "0wkzy5mrxq963fm4pmn6bhml73zmc8bq61frm77a175046c590q8";

56+ sha256 = "1k2k3rv10y9dppp6ffz6gqi2p6s3g03bxjyy8njvcjyxqdk6d8i5";

5757 };

5858

5959 mesonFlags = [

pkgs/desktops/gnome-3/core/mutter/3.34/default.nix+2−2

@@ -35,7 +35,7 @@

3535, xorgserver

3636, python3

3737, wrapGAppsHook

38−, libsysprof-capture

38+, sysprof

3939, desktop-file-utils

4040, libcap_ng

4141, egl-wayland

@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {

9696 libxkbfile

9797 pango

9898 pipewire_0_2 # TODO: backport pipewire 0.3 support

99− libsysprof-capture

99+ sysprof

100100 upower

101101 xkeyboard_config

102102 xwayland

pkgs/desktops/gnome-3/extensions/paperwm/default.nix+2−2

@@ -2,13 +2,13 @@

33stdenv.mkDerivation rec {

44 pname = "gnome-shell-extension-paperwm";

5− version = "38.0";

5+ version = "38.1";

77 src = fetchFromGitHub {

88 owner = "paperwm";

99 repo = "PaperWM";

1010 rev = version;

11− sha256 = "01r2ifwrl8w735d0ckzlwhvclax9dxd2ld5y2svv5bp444zbjsag";

11+ sha256 = "1jq15qrq3khqpjsjbcc17amdr1k53jkvambdacdf56xbqkycvlgs";

1212 };

1313

1414 uuid = "paperwm@hedning:matrix.org";

pkgs/development/compilers/fsharp41/default.nix+1

@@ -41,6 +41,7 @@ stdenv.mkDerivation rec {

4141 ./fsharp-IsPathRooted-type-inference.patch

4242 ./fsharp-string-switchName.patch

4343 ./fsharp-path-overloads.patch

44+ ./fsharp-GetFileNameWithoutExtension-type-inference.patch

4445 ];

4546

4647 configurePhase = ''

pkgs/development/compilers/fsharp41/fsharp-GetFileNameWithoutExtension-type-inference.patchnew file+13

@@ -0,0 +1,13 @@

1+diff --git a/src/scripts/fssrgen.fsx b/src/scripts/fssrgen.fsx

2+index 0bee9b79e..e6ceda11e 100644

3+--- a/src/scripts/fssrgen.fsx

4++++ b/src/scripts/fssrgen.fsx

5+@@ -329,7 +329,7 @@ let StringBoilerPlate filename =

6+ // END BOILERPLATE

7+ "

9+-let RunMain(filename, outFilename, outXmlFilenameOpt, projectNameOpt) =

10++let RunMain(filename:string, outFilename, outXmlFilenameOpt, projectNameOpt) =

11+ try

12+ let justfilename = System.IO.Path.GetFileNameWithoutExtension(filename)

13+ if justfilename |> Seq.exists (fun c -> not(System.Char.IsLetterOrDigit(c))) then

pkgs/development/dhall-modules/Prelude.nix+11−59

@@ -1,59 +1,11 @@

1−{ buildDhallGitHubPackage, lib }:

2−

3−let

4− makePrelude =

5− version: { rev, sha256 }:

6− buildDhallGitHubPackage {

7− name = "Prelude-${version}";

8− owner = "dhall-lang";

9− repo = "dhall-lang";

10− directory = "Prelude";

11− file = "package.dhall";

12−

13− inherit rev sha256;

14− };

15−

16−in

17− lib.mapAttrs makePrelude {

18− # Prelude versions older than 7.0.0 use old-style union literals, which are

19− # no longer supported by the latest version of the standard

20− "7.0.0" = {

21− rev = "f0509b403ace4b8a72ebb5fa9c473b9aeabeaf33";

22− sha256 = "00ldlvqfh411vnrnc41zfnlvgfanwfd3l8hdia8kni3r8q9qmd71";

23− };

24−

25− "8.0.0" = {

26− rev = "136a3491753fef251b2087031617d1ee1053f285";

27− sha256 = "0haxd5dhi5bmg06a0hx1blpivmwrcnndydwagibj3zvch4knyi2q";

28− };

29−

30− "9.0.0" = {

31− rev = "6cbf57c946e7e6576babc23a38320e53ecfa6bee";

32− sha256 = "1r06fijszyifq5b4j6libwkm06g8693m9n5c4kq61dvzrjfd2gim";

33− };

34−

35− "10.0.0" = {

36− rev = "ecbf82785cff406bbd162bbabf3df6f817c805e0";

37− sha256 = "0gxkr9649jqpykdzqjc98gkwnjry8wp469037brfghyidwsm021m";

38− };

39−

40− "11.0.0" = {

41− rev = "8098184d17c3aecc82674a7b874077a7641be05a";

42− sha256 = "0rdvyxq7mvas82wsfzzpk6imzm8ax4q58l522mx0ks69pacpr3yi";

43− };

44−

45− "11.1.0" = {

46− rev = "31e90e1996f6c4cb50e03ccb1f3c45beb4bd278c";

47− sha256 = "0rdvyxq7mvas82wsfzzpk6imzm8ax4q58l522mx0ks69pacpr3yi";

48− };

49−

50− "12.0.0" = {

51− rev = "9f248138f69ee5e22192dc3d0417d5c77b189e04";

52− sha256 = "1gbr0376sfamp0ibhcbxz4vaxr6ipv42y42p5wyksfhz3ls9x5ph";

53− };

54−

55− "13.0.0" = {

56− rev = "48db9e1ff1f8881fa4310085834fbc19e313ebf0";

57− sha256 = "0kg3rzag3irlcldck63rjspls614bc2sbs3zq44h0pzcz9v7z5h9";

58− };

59− }

1+{ buildDhallGitHubPackage }:

3+buildDhallGitHubPackage {

4+ name = "Prelude-13.0.0";

5+ owner = "dhall-lang";

6+ repo = "dhall-lang";

7+ directory = "Prelude";

8+ file = "package.dhall";

9+ rev = "48db9e1ff1f8881fa4310085834fbc19e313ebf0";

10+ sha256 = "0kg3rzag3irlcldck63rjspls614bc2sbs3zq44h0pzcz9v7z5h9";

11+}

pkgs/development/dhall-modules/dhall-kubernetes.nix+10−27

@@ -1,27 +1,10 @@

1−{ buildDhallGitHubPackage, lib }:

2−

3−let

4− makeDhallKubernetes =

5− version: { rev, sha256 }:

6− buildDhallGitHubPackage {

7− name = "dhall-kubernetes-${version}";

8− owner = "dhall-lang";

9− repo = "dhall-kubernetes";

10− file = "package.dhall";

11−

12− inherit rev sha256;

13− };

14−

15−in

16− lib.mapAttrs makeDhallKubernetes {

17− # 2.1.0 was the first version to introduce a top-level `package.dhall` file

18− "2.1.0" = {

19− rev = "bbfec3d8548b605f1c9628f34029ab4a7d928839";

20− sha256 = "10zkigj05khiy6w2sqcm5nw7d47r5k52xq8np8q86h0phy798g96";

21− };

22−

23− "3.0.0" = {

24− rev = "3c6d09a9409977cdde58a091d76a6d20509ca4b0";

25− sha256 = "1r4awh770ghsrwabh5ddy3jpmrbigakk0h32542n1kh71w3cdq1h";

26− };

27− }

1+{ buildDhallGitHubPackage }:

3+buildDhallGitHubPackage {

4+ name = "dhall-kubernetes-3.0.0";

5+ owner = "dhall-lang";

6+ repo = "dhall-kubernetes";

7+ file = "package.dhall";

8+ rev = "3c6d09a9409977cdde58a091d76a6d20509ca4b0";

9+ sha256 = "1r4awh770ghsrwabh5ddy3jpmrbigakk0h32542n1kh71w3cdq1h";

10+}

pkgs/development/dhall-modules/dhall-packages.nix+43−43

@@ -1,51 +1,51 @@

1−{ buildDhallGitHubPackage, dhall-kubernetes, lib, Prelude }:

1+{ buildDhallGitHubPackage, dhall-kubernetes, Prelude }:

33let

4− makeDhallPackages =

5− version: { rev, sha256, dependencies }:

6− buildDhallGitHubPackage {

7− name = "dhall-packages-${version}";

8− owner = "EarnestResearch";

9− repo = "dhall-packages";

10− file = "package.dhall";

4+ Prelude_12_0_0 = Prelude.overridePackage {

5+ name = "Prelude-12.0.0";

6+ rev = "9f248138f69ee5e22192dc3d0417d5c77b189e04";

7+ sha256 = "1gbr0376sfamp0ibhcbxz4vaxr6ipv42y42p5wyksfhz3ls9x5ph";

8+ };

119

12− inherit rev sha256 dependencies;

13− };

10+ kubernetes = {

11+ "6a47bd" = dhall-kubernetes.overridePackage {

12+ name = "dhall-kubernetes-6a47bd";

13+ rev = "6a47bd50c4d3984a13570ea62382a3ad4a9919a4";

14+ sha256 = "1azqs0x2kia3xw93rfk2mdi8izd7gy9aq6qzbip32gin7dncmfhh";

15+ };

1416

15−in

16− lib.mapAttrs makeDhallPackages {

17− "0.11.1" =

18− let

19− k8s_6a47bd = dhall-kubernetes.override {

20− rev = "6a47bd50c4d3984a13570ea62382a3ad4a9919a4";

21− sha256 = "1azqs0x2kia3xw93rfk2mdi8izd7gy9aq6qzbip32gin7dncmfhh";

22− };

23−

24− k8s_4ad581 = dhall-kubernetes.override {

25− rev = "4ad58156b7fdbbb6da0543d8b314df899feca077";

26− sha256 = "12fm70qbhcainxia388svsay2cfg9iksc6mss0nvhgxhpypgp8r0";

27− };

17+ "4ad581" = dhall-kubernetes.overridePackage {

18+ name = "dhall-kubernetes-4ad581";

19+ rev = "4ad58156b7fdbbb6da0543d8b314df899feca077";

20+ sha256 = "12fm70qbhcainxia388svsay2cfg9iksc6mss0nvhgxhpypgp8r0";

21+ };

2822

29− k8s_fee24c = dhall-kubernetes.override {

30− rev = "fee24c0993ba0b20190e2fdb94e386b7fb67252d";

31− sha256 = "11d93z8y0jzrb8dl43gqha9z96nxxqkl7cbxpz8hw8ky9x6ggayk";

32− };

23+ "fee24c" = dhall-kubernetes.overridePackage {

24+ name = "dhall-kubernetes-fee24c";

25+ rev = "fee24c0993ba0b20190e2fdb94e386b7fb67252d";

26+ sha256 = "11d93z8y0jzrb8dl43gqha9z96nxxqkl7cbxpz8hw8ky9x6ggayk";

27+ };

28+ };

3329

34− in

35− { rev = "8d228f578fbc7bb16c04a7c9ac8c6c7d2e13d1f7";

36− sha256 = "1v4y1x13lxy6cxf8xqc6sb0mc4mrd4frkxih95v9q2wxw4vkw2h7";

30+in

31+ buildDhallGitHubPackage {

32+ name = "dhall-packages-0.11.1";

33+ owner = "EarnestResearch";

34+ repo = "dhall-packages";

35+ file = "package.dhall";

36+ rev = "8d228f578fbc7bb16c04a7c9ac8c6c7d2e13d1f7";

37+ sha256 = "1v4y1x13lxy6cxf8xqc6sb0mc4mrd4frkxih95v9q2wxw4vkw2h7";

3738

38− dependencies = [

39− (k8s_6a47bd.override { file = "1.14/package.dhall"; })

40− (k8s_6a47bd.override { file = "1.15/package.dhall"; })

41− (k8s_6a47bd.override { file = "1.16/package.dhall"; })

42− (k8s_4ad581.override { file = "types.dhall"; })

43− (k8s_fee24c.override { file = "types/io.k8s.api.core.v1.ServiceSpec.dhall"; })

44− (k8s_fee24c.override { file = "types/io.k8s.api.core.v1.PodTemplateSpec.dhall"; })

45− Prelude."12.0.0"

46− (Prelude."12.0.0".override { file = "JSON/package.dhall"; })

47− (Prelude."12.0.0".override { file = "JSON/Type"; })

48− (Prelude."12.0.0".override { file = "Map/Type"; })

49− ];

50− };

39+ dependencies = [

40+ (kubernetes."6a47bd".overridePackage { file = "1.14/package.dhall"; })

41+ (kubernetes."6a47bd".overridePackage { file = "1.15/package.dhall"; })

42+ (kubernetes."6a47bd".overridePackage { file = "1.16/package.dhall"; })

43+ (kubernetes."4ad581".overridePackage { file = "types.dhall"; })

44+ (kubernetes."fee24c".overridePackage { file = "types/io.k8s.api.core.v1.ServiceSpec.dhall"; })

45+ (kubernetes."fee24c".overridePackage { file = "types/io.k8s.api.core.v1.PodTemplateSpec.dhall"; })

46+ Prelude_12_0_0

47+ (Prelude_12_0_0.overridePackage { file = "JSON/package.dhall"; })

48+ (Prelude_12_0_0.overridePackage { file = "JSON/Type"; })

49+ (Prelude_12_0_0.overridePackage { file = "Map/Type"; })

50+ ];

5151 }

pkgs/development/dhall-modules/lib.nixnew file+25

@@ -0,0 +1,25 @@

1+{ lib }:

3+let

4+ # This is essentially the same thing as `lib.makeOverridable`, except storing

5+ # the override method in a method named `overridePackage` so that it's not

6+ # shadowed by the `override` method added by `callPackage`

7+ makePackageOverridable = f: args:

8+ let

9+ result = lib.makeOverridable f args;

10+

11+ copyArgs = g: lib.setFunctionArgs g (lib.functionArgs f);

12+

13+ overrideWith =

14+ update: args // (if lib.isFunction update then update args else update);

15+

16+ overridePackage =

17+ copyArgs (update: makePackageOverridable f (overrideWith update));

18+

19+ in

20+ result // { inherit overridePackage; };

21+

22+in

23+ lib // {

24+ inherit makePackageOverridable;

25+ }

pkgs/development/interpreters/dhall/build-dhall-directory-package.nix+1−1

@@ -5,7 +5,7 @@

55# the `file`

66#

77# This function is used by `dhall-to-nixpkgs` when given a directory

8−lib.makeOverridable

8+lib.makePackageOverridable

99 ( { # Arguments passed through to `buildDhallPackage`

1010 name

1111 , dependencies ? []

pkgs/development/interpreters/dhall/build-dhall-github-package.nix+1−1

@@ -1,7 +1,7 @@

11{ buildDhallPackage, fetchFromGitHub, lib }:

33# This function is used by `dhall-to-nixpkgs` when given a GitHub repository

4−lib.makeOverridable

4+lib.makePackageOverridable

55 ( { # Arguments passed through to `buildDhallPackage`

66 name

77 , dependencies ? []

pkgs/development/interpreters/wasmtime/default.nix+3−3

@@ -2,17 +2,17 @@

33rustPlatform.buildRustPackage rec {

44 pname = "wasmtime";

5− version = "0.20.0";

5+ version = "0.21.0";

77 src = fetchFromGitHub {

88 owner = "bytecodealliance";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "01k1fpk2qp4kv0xr4f0xmrjkr98j5ws48r1aks8l80mffs4ynqfr";

11+ sha256 = "0q7wsnq5zdskxwzsxwm98jfnv2frnwca1dkhwndcn9yyz2gyw57m";

1212 fetchSubmodules = true;

1313 };

1414

15− cargoSha256 = "0vghcs1nbxlkmw9wfikzb1ndscx7fkmgv5q8dnfcisl05zpkj7si";

15+ cargoSha256 = "1r1fm28zaxfbzd17jzaz8ql6ss6y6djgdhpfpkvpbw9l8l06x4lc";

1616

1717 nativeBuildInputs = [ python cmake clang ];

1818 buildInputs = [ llvmPackages.libclang ] ++

pkgs/development/libraries/cpp-utilities/default.nix+2−2

@@ -7,13 +7,13 @@

88stdenv.mkDerivation rec {

99 pname = "cpp-utilities";

10− version = "5.7.0";

10+ version = "5.8.0";

1111

1212 src = fetchFromGitHub {

1313 owner = "Martchus";

1414 repo = pname;

1515 rev = "v${version}";

16− sha256 = "04483v9bw6wp831f34fn46zj54v9y7f6qqfmx85fjxhkr3rqk4i0";

16+ sha256 = "06mpag2hg2vb03pdc5f9cjkpgw3kdh3bh29xfrbb16ixk4rhv0j7";

1717 };

1818

1919 nativeBuildInputs = [ cmake ];

pkgs/development/libraries/doctest/default.nix+2−2

@@ -2,13 +2,13 @@

33stdenv.mkDerivation rec {

44 pname = "doctest";

5− version = "2.4.0";

5+ version = "2.4.1";

77 src = fetchFromGitHub {

88 owner = "onqtam";

99 repo = "doctest";

1010 rev = version;

11− sha256 = "1yi95saqv8qb3ix6w8d7ffvs7qbwvqmq6wblckhxhicxxdxk85cd";

11+ sha256 = "17g7n6rjs90i0b231x5s934qnr8m80ga2yg1z344bnsdiqcjd63w";

1212 };

1313

1414 nativeBuildInputs = [ cmake ];

pkgs/development/libraries/duckdb/default.nix+2−2

@@ -5,13 +5,13 @@

66stdenv.mkDerivation rec {

77 pname = "duckdb";

8− version = "0.2.1";

8+ version = "0.2.2";

1010 src = fetchFromGitHub {

1111 owner = "cwida";

1212 repo = "duckdb";

1313 rev = "v${version}";

14− sha256 = "18l4qdzfm8k9ggn49r3h99cbcmmq01byzkxps3pvmq8q246hb55x";

14+ sha256 = "1pzz2zjzpvji5am21vd9kjxj0pnxsjmrsfqrym9h2rk2mi7p2cx8";

1515 };

1616

1717 nativeBuildInputs = [ cmake ];

pkgs/development/libraries/globalarrays/default.nix+2−2

@@ -3,7 +3,7 @@

33} :

55let

6− version = "5.7.2";

6+ version = "5.8";

88in stdenv.mkDerivation {

99 pname = "globalarrays";

@@ -13,7 +13,7 @@ in stdenv.mkDerivation {

1313 owner = "GlobalArrays";

1414 repo = "ga";

1515 rev = "v${version}";

16− sha256 = "0c1y9a5jpdw9nafzfmvjcln1xc2gklskaly0r1alm18ng9zng33i";

16+ sha256 = "0bky91ncz6vy0011ps9prsnq9f4a5s5xwr23kkmi39xzg0417mnd";

1717 };

1818

1919 nativeBuildInputs = [ autoreconfHook ];

pkgs/development/libraries/libe57format/default.nix+33

@@ -5,6 +5,9 @@

55 boost,

66 xercesc,

77 icu,

9+ dos2unix,

10+ fetchpatch,

811}:

912

1013stdenv.mkDerivation rec {

@@ -25,9 +28,39 @@ stdenv.mkDerivation rec {

2528 buildInputs = [

2629 boost

2730 icu

31+ ];

32+

33+ propagatedBuildInputs = [

34+ # Necessary for projects that try to find libE57Format via CMake

35+ # due to the way that libe57format's CMake config is written.

2836 xercesc

2937 ];

3038

39+ # TODO: Remove CMake patching when https://github.com/asmaloney/libE57Format/pull/60 is available.

40+

41+ # GNU patch cannot patch `CMakeLists.txt` that has CRLF endings,

42+ # see https://unix.stackexchange.com/questions/239364/how-to-fix-hunk-1-failed-at-1-different-line-endings-message/243748#243748

43+ # so convert it first.

44+ prePatch = ''

45+ ${dos2unix}/bin/dos2unix CMakeLists.txt

46+ '';

47+ patches = [

48+ (fetchpatch {

49+ name = "libE57Format-cmake-Fix-config-filename.patch";

50+ url = "https://github.com/asmaloney/libE57Format/commit/279d8d6b60ee65fb276cdbeed74ac58770a286f9.patch";

51+ sha256 = "0fbf92hs1c7yl169i7zlbaj9yhrd1yg3pjf0wsqjlh8mr5m6rp14";

52+ })

53+ ];

54+ # It appears that while the patch has

55+ # diff --git a/cmake/E57Format-config.cmake b/cmake/e57format-config.cmake

56+ # similarity index 100%

57+ # rename from cmake/E57Format-config.cmake

58+ # rename to cmake/e57format-config.cmake

59+ # GNU patch doesn't interpret that.

60+ postPatch = ''

61+ mv cmake/E57Format-config.cmake cmake/e57format-config.cmake

62+ '';

63+

3164 # The build system by default builds ONLY static libraries, and with

3265 # `-DE57_BUILD_SHARED=ON` builds ONLY shared libraries, see:

3366 # https://github.com/asmaloney/libE57Format/issues/48

pkgs/development/libraries/opencv/default.nix+3−4

@@ -19,13 +19,13 @@ in

1919

2020stdenv.mkDerivation rec {

2121 pname = "opencv";

22− version = "2.4.13";

22+ version = "2.4.13.7";

2323

2424 src = fetchFromGitHub {

25− owner = "Itseez";

25+ owner = "opencv";

2626 repo = "opencv";

2727 rev = version;

28− sha256 = "1k29rxlvrhgc5hadg2nc50wa3d2ls9ndp373257p756a0aividxh";

28+ sha256 = "062js7zhh4ixi2wk61wyi23qp9zsk5vw24iz2i5fab2hp97y5zq3";

2929 };

3030

3131 patches =

@@ -87,6 +87,5 @@ stdenv.mkDerivation rec {

8787 license = licenses.bsd3;

8888 maintainers = with maintainers; [ ];

8989 platforms = platforms.linux;

90− broken = true;

9190 };

9291}

pkgs/development/libraries/physics/geant4/default.nix+5

@@ -38,6 +38,9 @@

3838# For enablePython

3939, boost

4040, python3

41+

42+# For tests

43+, callPackage

4144}:

4245

4346let

@@ -108,6 +111,8 @@ stdenv.mkDerivation rec {

108111 inherit stdenv fetchurl;

109112 geant_version = version;

110113 };

114+

115+ tests = callPackage ./tests.nix {};

111116 };

112117

113118 # Set the myriad of envars required by Geant4 if we use a nix-shell.

pkgs/development/libraries/physics/geant4/tests.nixnew file+31

@@ -0,0 +1,31 @@

1+{ stdenv, cmake, geant4 }:

3+{

4+ example_B1 = stdenv.mkDerivation {

5+ name = "${geant4.name}-test-example_B1";

7+ inherit (geant4) src;

9+ nativeBuildInputs = [ cmake ];

10+ buildInputs = [ geant4 ];

11+ checkInputs = with geant4.data; [

12+ G4EMLOW

13+ G4ENSDFSTATE

14+ G4PARTICLEXS

15+ G4PhotonEvaporation

16+ ];

17+

18+ prePatch = ''

19+ cd examples/basic/B1

20+ '';

21+

22+ doCheck = true;

23+ checkPhase = ''

24+ runHook preCheck

25+

26+ ./exampleB1 ../run2.mac

27+

28+ runHook postCheck

29+ '';

30+ };

31+}

pkgs/development/libraries/science/math/libtorch/bin.nix+8

@@ -45,6 +45,14 @@ in stdenv.mkDerivation {

4545

4646 # We do not care about Java support...

4747 rm -f $out/lib/lib*jni* 2> /dev/null || true

48+

49+ # Fix up library paths for split outputs

50+ substituteInPlace $dev/share/cmake/Torch/TorchConfig.cmake \

51+ --replace \''${TORCH_INSTALL_PREFIX}/lib "$out/lib" \

52+

53+ substituteInPlace \

54+ $dev/share/cmake/Caffe2/Caffe2Targets-release.cmake \

55+ --replace \''${_IMPORT_PREFIX}/lib "$out/lib" \

4856 '';

4957

5058 postFixup = let

pkgs/development/libraries/science/math/libtorch/test/CMakeLists.txt+1

@@ -1,3 +1,4 @@

1+cmake_minimum_required(VERSION 3.0)

12find_package(Torch REQUIRED)

23set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORCH_CXX_FLAGS}")

34add_executable(test test.cpp)

pkgs/development/libraries/simpleitk/default.nix+2−2

@@ -2,13 +2,13 @@

33stdenv.mkDerivation rec {

44 pname = "simpleitk";

5− version = "2.0.0";

5+ version = "2.0.1";

77 src = fetchFromGitHub {

88 owner = "SimpleITK";

99 repo = "SimpleITK";

1010 rev = "v${version}";

11− sha256 = "1nf3cl3ywqg04446xhkb97kcashrgibsihxn2sqrs81i9d0rw5kn";

11+ sha256 = "0yijli538hd96pfg4vpfk983y6d5bw9dlbs9nsq4rp83r08qdcc5";

1212 };

1313

1414 nativeBuildInputs = [ cmake swig ];

pkgs/development/libraries/wxwidgets/3.1/default.nix+64−23

@@ -1,13 +1,32 @@

1−{ stdenv, fetchFromGitHub, fetchurl, pkgconfig

2−, libXinerama, libSM, libXxf86vm

3−, gtk2, gtk3

4−, xorgproto, gst_all_1, setfile

1+{ stdenv

2+, fetchFromGitHub

3+, fetchurl

4+, pkgconfig

5+, libXinerama

6+, libSM

7+, libXxf86vm

8+, libXtst

9+, gtk2

10+, GConf ? null

11+, gtk3

12+, xorgproto

13+, gst_all_1

14+, setfile

515, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms

6−, withMesa ? libGLSupported, libGLU ? null, libGL ? null

7−, compat28 ? false, compat30 ? true, unicode ? true

16+, withMesa ? libGLSupported

17+, libGLU ? null

18+, libGL ? null

19+, compat28 ? false

20+, compat30 ? true

21+, unicode ? true

822, withGtk2 ? true

9−, withWebKit ? false, webkitgtk ? null

10−, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null

23+, withWebKit ? false

24+, webkitgtk ? null

25+, AGL ? null

26+, Carbon ? null

27+, Cocoa ? null

28+, Kernel ? null

29+, QTKit ? null

1130}:

1231

1332with stdenv.lib;

@@ -18,47 +37,58 @@ assert withWebKit -> webkitgtk != null;

1837assert assertMsg (withGtk2 -> withWebKit == false) "wxGTK31: You cannot enable withWebKit when using withGtk2.";

1938

2039stdenv.mkDerivation rec {

21− version = "3.1.3";

40+ version = "3.1.4";

2241 pname = "wxwidgets";

2342

2443 src = fetchFromGitHub {

2544 owner = "wxWidgets";

2645 repo = "wxWidgets";

2746 rev = "v${version}";

28− sha256 = "022mby78q7n0bhd4mph04hz93c9qamnvzv3h1s26r839k28760f4";

47+ sha256 = "1fwzrk6w5k0vs8kqdq5lpzdbp5c09hx740wg6mi6vgmc1r67dv67";

48+ fetchSubmodules = true;

2949 };

3050

3151 buildInputs = [

32− libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base

33− ] ++ optionals withGtk2 [ gtk2 ]

34− ++ optional (!withGtk2) gtk3

35− ++ optional withMesa libGLU

36− ++ optional withWebKit webkitgtk

37− ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];

52+ libXinerama

53+ libSM

54+ libXxf86vm

55+ libXtst

56+ xorgproto

57+ gst_all_1.gstreamer

58+ gst_all_1.gst-plugins-base

59+ ] ++ optionals withGtk2 [ gtk2 GConf ]

60+ ++ optional (!withGtk2) gtk3

61+ ++ optional withMesa libGLU

62+ ++ optional withWebKit webkitgtk

63+ ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];

3864

3965 nativeBuildInputs = [ pkgconfig ];

4066

4167 propagatedBuildInputs = optional stdenv.isDarwin AGL;

4268

4369 patches = [

44− (fetchurl { # https://trac.wxwidgets.org/ticket/17942

70+ (fetchurl {

71+ # https://trac.wxwidgets.org/ticket/17942

4572 url = "https://trac.wxwidgets.org/raw-attachment/ticket/17942/"

46− + "fix_assertion_using_hide_in_destroy.diff";

73+ + "fix_assertion_using_hide_in_destroy.diff";

4774 sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy";

4875 })

4976 ];

5077

5178 configureFlags =

52− [ "--disable-precomp-headers" "--enable-mediactrl"

79+ [

80+ "--disable-precomp-headers"

81+ "--enable-mediactrl"

5382 (if compat28 then "--enable-compat28" else "--disable-compat28")

54− (if compat30 then "--enable-compat30" else "--disable-compat30") ]

83+ (if compat30 then "--enable-compat30" else "--disable-compat30")

84+ ]

5585 ++ optional unicode "--enable-unicode"

5686 ++ optional withMesa "--with-opengl"

5787 ++ optionals stdenv.isDarwin

5888 # allow building on 64-bit

5989 [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ]

6090 ++ optionals withWebKit

61− ["--enable-webview" "--enable-webviewwebkit"];

91+ [ "--enable-webview" "--enable-webviewwebkit" ];

6292

6393 SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib ";

6494

@@ -90,8 +120,19 @@ stdenv.mkDerivation rec {

90120 platforms = with platforms; darwin ++ linux;

91121 license = licenses.wxWindows;

92122 homepage = "https://www.wxwidgets.org/";

93− description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base";

94− longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";

123+ description = "A C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base";

124+ longDescription = ''

125+ WxWidgets gives you a single, easy-to-use API for

126+ writing GUI applications on multiple platforms that still utilize the

127+ native platform's controls and utilities. Link with the appropriate library

128+ for your platform and compiler, and your application will adopt the look

129+ and feel appropriate to that platform. On top of great GUI functionality,

130+ wxWidgets gives you: online help, network programming, streams, clipboard

131+ and drag and drop, multithreading, image loading and saving in a variety of

132+ popular formats, database support, HTML viewing and printing, and much

133+ more.

134+ '';

95135 badPlatforms = [ "x86_64-darwin" ];

136+ maintainers = with maintainers; [ tfmoraes ];

96137 };

97138}

pkgs/development/python-modules/aioconsole/default.nix+2−2

@@ -10,12 +10,12 @@

1010# wrapped to be able to find aioconsole and any other packages.

1111buildPythonPackage rec {

1212 pname = "aioconsole";

13− version = "0.3.0";

13+ version = "0.3.1";

1414 disabled = pythonOlder "3.6";

1515

1616 src = fetchPypi {

1717 inherit pname version;

18− sha256 = "b84724e6b93d1306a909974864df377236cf4bab8e0594096fed7936207205c5";

18+ sha256 = "7c038bb40b7690bf5be6b17154830b7bff25e7be1c02d8420a346c3efbd5d8e5";

1919 };

2020

2121 # hardcodes a test dependency on an old version of pytest-asyncio

pkgs/development/python-modules/awkward/default.nix+2−2

@@ -10,11 +10,11 @@

1010

1111buildPythonPackage rec {

1212 pname = "awkward";

13− version = "0.13.0";

13+ version = "0.14.0";

1414

1515 src = fetchPypi {

1616 inherit pname version;

17− sha256 = "1a461ee084ea5e98333dacf2506e9b2619ee89cece14b9b99830b546b35c5922";

17+ sha256 = "6a3878f46e8bc2acf28a0b9feb69d354ad2fee2a2a0f65c48c115aa74f245204";

1818 };

1919

2020 nativeBuildInputs = [ pytestrunner ];

pkgs/development/python-modules/azure-mgmt-sql/default.nix+2−2

@@ -10,12 +10,12 @@

1010

1111buildPythonPackage rec {

1212 pname = "azure-mgmt-sql";

13− version = "0.23.0";

13+ version = "0.24.0";

1414

1515 src = fetchPypi {

1616 inherit pname version;

1717 extension = "zip";

18− sha256 = "acf7d4c83fb43152a809e3894528e561e601be543250c2824cc615cc88a70855";

18+ sha256 = "da391ed00d82cd8e20ca50affdc43b99fd9a7919b54a3a0d53c73cb41eea09d3";

1919 };

2020

2121 propagatedBuildInputs = [

pkgs/development/python-modules/cairosvg/default.nix+2−2

@@ -4,13 +4,13 @@

55buildPythonPackage rec {

66 pname = "CairoSVG";

7− version = "2.4.2";

7+ version = "2.5.0";

99 disabled = !isPy3k;

1010

1111 src = fetchPypi {

1212 inherit pname version;

13− sha256 = "1bb7irxbaxxb9ahm3z5wsx1q96mm5gzskc7b6q07h9ikcnb8yrjf";

13+ sha256 = "3fc50d10f0cbef53b3ee376a97a88d81bbd9e2f190f7e63de08431a1a08e9afa";

1414 };

1515

1616 propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ];

pkgs/development/python-modules/chalice/default.nix+2−2

@@ -22,11 +22,11 @@

2222

2323buildPythonPackage rec {

2424 pname = "chalice";

25− version = "1.21.3";

25+ version = "1.21.4";

2626

2727 src = fetchPypi {

2828 inherit pname version;

29− sha256 = "0b44514cdbafab08b18e21f59fc016cead0b78f5f5fdf14eccd993c469130b39";

29+ sha256 = "fb3580272cc66ba0fd59914b7ac395d2da6b9b32b11dc7557aa80a0ae7cccf3c";

3030 };

3131

3232 checkInputs = [ watchdog pytest hypothesis mock ];

pkgs/development/python-modules/dbus-next/default.nix+2−2

@@ -7,13 +7,13 @@

88buildPythonPackage rec {

99 pname = "dbus-next";

10− version = "0.1.4";

10+ version = "0.2.1";

1111

1212 src = fetchFromGitHub {

1313 owner = "altdesktop";

1414 repo = "python-dbus-next";

1515 rev = "v${version}";

16− sha256 = "sha256-C/aFDHmt6Qws6ek+++wM5GRN6TEvMGMiFktKIXRdGL0=";

16+ sha256 = "0c14mmysx014n1m4pi4ymi6pzxf8dkjr6fm2cmp96x05z9v90vlr";

1717 };

1818

1919 checkInputs = [

pkgs/development/python-modules/django-q/default.nix+2−2

@@ -3,11 +3,11 @@

44buildPythonPackage rec {

55 pname = "django-q";

6− version = "1.3.3";

6+ version = "1.3.4";

88 src = fetchPypi {

99 inherit pname version;

10− sha256 = "de7077660ede36bfdd89ab9405d6393b598bb3e0bfed61f59a0a9074cc4942bb";

10+ sha256 = "523d54dcf1b66152c1b658f914f00ed3b518a3432a9decd4898738ca8dbbe10f";

1111 };

1212

1313 propagatedBuildInputs = [

pkgs/development/python-modules/dropbox/default.nix+2−2

@@ -3,11 +3,11 @@

44buildPythonPackage rec {

55 pname = "dropbox";

6− version = "10.7.0";

6+ version = "10.8.0";

88 src = fetchPypi {

99 inherit pname version;

10− sha256 = "08c1e0bbc16499e0138431e34777c35ea086734ff15ee5067b0df3424df2a9ec";

10+ sha256 = "2312a0314d7698f6aa6944bf6d73a756f4ff7d7d90fa26c323a418a84dc3b533";

1111 };

1212

1313 # Set DROPBOX_TOKEN environment variable to a valid token.

pkgs/development/python-modules/google_cloud_automl/default.nix+2−2

@@ -4,11 +4,11 @@

55buildPythonPackage rec {

66 pname = "google-cloud-automl";

7− version = "2.0.0";

7+ version = "2.1.0";

99 src = fetchPypi {

1010 inherit pname version;

11− sha256 = "16hr1i2771z4yh19xg6kk037h9cv5j64q5bxb9nmkvj12hdwbwgv";

11+ sha256 = "520dfe2ee04d28f3088c9c582fa2a534fc272647d5e2e59acc903c0152e61696";

1212 };

1313

1414 disabled = pythonOlder "3.6";

pkgs/development/python-modules/gphoto2/default.nix+2−2

@@ -4,11 +4,11 @@

55buildPythonPackage rec {

66 pname = "gphoto2";

7− version = "2.2.3";

7+ version = "2.2.4";

99 src = fetchPypi {

1010 inherit pname version;

11− sha256 = "35d3ae97a9f13526746fb506de627a73328328528b436a51567fcb7e640883e9";

11+ sha256 = "48b4c4ab70826d3ddaaf7440564d513c02d78680fa690994b0640d383ffb8a7d";

1212 };

1313

1414 nativeBuildInputs = [ pkgconfig ];

pkgs/development/python-modules/itemadapter/default.nix+2−2

@@ -2,13 +2,13 @@

33buildPythonPackage rec {

44 pname = "itemadapter";

5− version = "0.1.1";

5+ version = "0.2.0";

77 disabled = isPy27;

99 src = fetchPypi {

1010 inherit pname version;

11− sha256 = "b5e75d48c769ee5c89de12aeba537b2d62d7b575cd549d5d430ed8a67faa63f2";

11+ sha256 = "cb7aaa577fefe2aa6f229ccf4d058e05f44e0178a98c8fb70ee4d95acfabb423";

1212 };

1313

1414 doCheck = false; # infinite recursion with Scrapy

pkgs/development/python-modules/keep/default.nix+2−2

@@ -9,11 +9,11 @@

1010buildPythonPackage rec {

1111 pname = "keep";

12− version = "2.9";

12+ version = "2.10";

1313

1414 src = fetchPypi {

1515 inherit pname version;

16− sha256 = "0902kcvhbmy5q5n0ai1df29ybf87qaljz306c5ssl8j9xdjipcq2";

16+ sha256 = "ce71d14110df197ab5afdbd26a14c0bd266b79671118ae1351835fa192e61d9b";

1717 };

1818

1919 propagatedBuildInputs = [

pkgs/development/python-modules/onnx/default.nix+2−2

@@ -18,7 +18,7 @@

1818

1919buildPythonPackage rec {

2020 pname = "onnx";

21− version = "1.7.0";

21+ version = "1.8.0";

2222

2323 # Due to Protobuf packaging issues this build of Onnx with Python 2 gives

2424 # errors on import.

@@ -27,7 +27,7 @@ buildPythonPackage rec {

2727

2828 src = fetchPypi {

2929 inherit pname version;

30− sha256 = "0j6rgfbhsw3a8id8pyg18y93k68lbjbj1kq6qia36h69f6pvlyjy";

30+ sha256 = "5f787fd3ce1290e12da335237b3b921152157e51aa09080b65631b3ce3fcc50c";

3131 };

3232

3333 nativeBuildInputs = [ cmake ];

pkgs/development/python-modules/pymavlink/default.nix+2−2

@@ -2,11 +2,11 @@

33buildPythonPackage rec {

44 pname = "pymavlink";

5− version = "2.4.11";

5+ version = "2.4.12";

77 src = fetchPypi {

88 inherit pname version;

9− sha256 = "0b1265b169f809c6ca94911ad2d7649b8e087a7cc573a0a6ea62ade9bea7ca5c";

9+ sha256 = "2954bb071ff67fc5ab29ed2dabe3b5355c4063fb8b014477d9bfbceb87358bc6";

1010 };

1111

1212 propagatedBuildInputs = [ future lxml ];

pkgs/development/python-modules/pytorch/default.nix+26−20

@@ -4,8 +4,18 @@

44 openMPISupport ? false, openmpi ? null,

55 buildDocs ? false,

66 cudaArchList ? null,

7− numpy, pyyaml, cffi, click, typing, cmake, hypothesis, numactl, psutil,

8− linkFarm, symlinkJoin,

8+ # Native build inputs

9+ cmake, utillinux, linkFarm, symlinkJoin, which,

10+

11+ # Build inputs

12+ numactl,

13+

14+ # Propagated build inputs

15+ dataclasses, numpy, pyyaml, cffi, click, typing-extensions,

16+

17+ # Unit tests

18+ hypothesis, psutil,

919

1020 # virtual pkg that consistently instantiates blas across nixpkgs

1121 # See https://github.com/NixOS/nixpkgs/pull/83888

@@ -17,7 +27,7 @@

1727 # dependencies for torch.utils.tensorboard

1828 pillow, six, future, tensorflow-tensorboard, protobuf,

1929

20− utillinux, which, isPy3k }:

30+ isPy3k, pythonOlder }:

2131

2232assert !openMPISupport || openmpi != null;

2333

@@ -102,7 +112,7 @@ let

102112in buildPythonPackage rec {

103113 pname = "pytorch";

104114 # Don't forget to update pytorch-bin to the same version.

105− version = "1.6.0";

115+ version = "1.7.0";

106116

107117 disabled = !isPy3k;

108118

@@ -117,23 +127,10 @@ in buildPythonPackage rec {

117127 repo = "pytorch";

118128 rev = "v${version}";

119129 fetchSubmodules = true;

120− sha256 = "14hhjsi6fnpaw9m1a3bhvdinsks6fhss6bbcrfk6jgns64abqdaz";

130+ sha256 = "0hb11m5kvs4nsi5bc9ijnv6k07593p9dw40rcn33s9vspinrcjd4";

121131 };

122132

123− patches = lib.optionals stdenv.isAarch64 [

124− # GNU aarch64 assembler does not support 4s on neon mov:

125− # https://github.com/pytorch/pytorch/issues/33124

126− #

127− # Fix from:

128− # https://github.com/pytorch/pytorch/pull/40584

129− #

130− # This patch can be removed with the next major version (1.7.0).

131− (fetchpatch {

132− name = "qnnpack-neon-fix.patch";

133− url = "https://github.com/pytorch/pytorch/commit/7676682584d0caf9243bce74ea0a88711ec4a807.diff";

134− sha256 = "13spncaqlpsp8qk2850yly7xqwmhhfwznhmzkk8jgpslkbx75vgq";

135− })

136− ] ++ lib.optionals stdenv.isDarwin [

133+ patches = lib.optionals stdenv.isDarwin [

137134 # pthreadpool added support for Grand Central Dispatch in April

138135 # 2020. However, this relies on functionality (DISPATCH_APPLY_AUTO)

139136 # that is available starting with macOS 10.13. However, our current

@@ -142,6 +139,13 @@ in buildPythonPackage rec {

142139 ./pthreadpool-disable-gcd.diff

143140 ];

144141

142+ # The dataclasses module is included with Python >= 3.7. This should

143+ # be fixed with the next PyTorch release.

144+ postPatch = ''

145+ substituteInPlace setup.py \

146+ --replace "'dataclasses'" "'dataclasses; python_version < \"3.7\"'"

147+ '';

148+

145149 preConfigure = lib.optionalString cudaSupport ''

146150 export TORCH_CUDA_ARCH_LIST="${lib.strings.concatStringsSep ";" final_cudaArchList}"

147151 export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++

@@ -217,9 +221,11 @@ in buildPythonPackage rec {

217221 click

218222 numpy

219223 pyyaml

224+ typing-extensions

220225 # the following are required for tensorboard support

221226 pillow six future tensorflow-tensorboard protobuf

222− ] ++ lib.optionals openMPISupport [ openmpi ];

227+ ] ++ lib.optionals openMPISupport [ openmpi ]

228+ ++ lib.optionals (pythonOlder "3.7") [ dataclasses ];

223229

224230 checkInputs = [ hypothesis ninja psutil ];

225231

pkgs/development/python-modules/rope/default.nix+2−2

@@ -2,11 +2,11 @@

33buildPythonPackage rec {

44 pname = "rope";

5− version = "0.17.0";

5+ version = "0.18.0";

77 src = fetchPypi {

88 inherit pname version;

9− sha256 = "658ad6705f43dcf3d6df379da9486529cf30e02d9ea14c5682aa80eb33b649e1";

9+ sha256 = "786b5c38c530d4846aa68a42604f61b4e69a493390e3ca11b88df0fbfdc3ed04";

1010 };

1111

1212 checkInputs = [ nose ];

pkgs/development/python-modules/snowflake-connector-python/default.nix+2−2

@@ -25,12 +25,12 @@

2525

2626buildPythonPackage rec {

2727 pname = "snowflake-connector-python";

28− version = "2.3.4";

28+ version = "2.3.5";

2929 disabled = isPy27;

3030

3131 src = fetchPypi {

3232 inherit pname version;

33− sha256 = "5a072ee61ef156e5938e04447f0b99248b87ef262e498b5e5002f5b579cd7fb2";

33+ sha256 = "b953a53141a88406e9c0e3144582a7c257e5c89fa81e97664d520999991812e7";

3434 };

3535

3636 propagatedBuildInputs = [

pkgs/development/python-modules/tensorboardx/default.nix+6

@@ -19,6 +19,12 @@ buildPythonPackage rec {

1919

2020 propagatedBuildInputs = [ numpy protobuf six ];

2121

22+ # apparently torch API changed a bit at 1.6

23+ postPatch = ''

24+ substituteInPlace tensorboardX/pytorch_graph.py --replace "torch.onnx.set_training(model, False)" "torch.onnx.select_model_mode_for_export(model, torch.onnx.TrainingMode.EVAL)"

25+ '';

26+

27+

2228 disabledTests = [ "test_TorchVis" "test_onnx_graph" ];

2329

2430 meta = with lib; {

pkgs/development/python-modules/tokenizers/default.nix+13−3

@@ -32,6 +32,14 @@ let

3232 url = "https://norvig.com/big.txt";

3333 sha256 = "0yz80icdly7na03cfpl0nfk5h3j3cam55rj486n03wph81ynq1ps";

3434 };

35+ docPipelineTokenizer = fetchurl {

36+ url = "https://s3.amazonaws.com/models.huggingface.co/bert/anthony/doc-pipeline/tokenizer.json";

37+ hash = "sha256-i533xC8J5CDMNxBjo+p6avIM8UOcui8RmGAmK0GmfBc=";

38+ };

39+ docQuicktourTokenizer = fetchurl {

40+ url = "https://s3.amazonaws.com/models.huggingface.co/bert/anthony/doc-quicktour/tokenizer.json";

41+ hash = "sha256-ipY9d5DR5nxoO6kj7rItueZ9AO5wq9+Nzr6GuEIfIBI=";

42+ };

3543 openaiVocab = fetchurl {

3644 url = "https://s3.amazonaws.com/models.huggingface.co/bert/openai-gpt-vocab.json";

3745 sha256 = "0y40gc9bixj5rxv674br1rxmxkd3ly29p80x1596h8yywwcrpx7x";

@@ -42,16 +50,16 @@ let

4250 };

4351in rustPlatform.buildRustPackage rec {

4452 pname = "tokenizers";

45− version = "0.9.2";

53+ version = "0.9.4";

4654

4755 src = fetchFromGitHub {

4856 owner = "huggingface";

4957 repo = pname;

5058 rev = "python-v${version}";

51− sha256 = "0rsm1g5zfq3ygdb3s8v9xqqpgfzvvkc4n5ik3ahy8sw7pyjljb4m";

59+ hash = "sha256-JXoH9yfhMIFg5qDY5zrF6iWb7XKugjMfk1NxSizfaWg=";

5260 };

5361

54− cargoSha256 = "0yn699dq9hdjh7fyci99ni8mmd5qdhzrsi80grzgf5cch8g38rbi";

62+ cargoSha256 = "sha256-u9qitrOxJSABs0VjwHUZgmw7VTQXNbp6l8fKKE/RQ7M=";

5563

5664 sourceRoot = "source/bindings/python";

5765

@@ -82,6 +90,8 @@ in rustPlatform.buildRustPackage rec {

8290 ln -s ${robertaMerges} roberta-base-merges.txt

8391 ln -s ${albertVocab} albert-base-v1-tokenizer.json

8492 ln -s ${bertVocab} bert-base-uncased-vocab.txt

93+ ln -s ${docPipelineTokenizer} bert-wiki.json

94+ ln -s ${docQuicktourTokenizer} tokenizer-wiki.json

8595 ln -s ${norvigBig} big.txt

8696 ln -s ${openaiVocab} openai-gpt-vocab.json

8797 ln -s ${openaiMerges} openai-gpt-merges.txt )

pkgs/development/python-modules/transformers/default.nix+5

@@ -45,6 +45,11 @@ buildPythonPackage rec {

4545 timeout-decorator

4646 ];

4747

48+ postPatch = ''

49+ substituteInPlace setup.py \

50+ --replace "tokenizers == 0.9.2" "tokenizers"

51+ '';

52+

4853 preCheck = ''

4954 export HOME="$TMPDIR"

5055

pkgs/development/python-modules/trytond/default.nix+2−2

@@ -25,12 +25,12 @@ with stdenv.lib;

2525

2626buildPythonApplication rec {

2727 pname = "trytond";

28− version = "5.6.8";

28+ version = "5.8.0";

2929 disabled = pythonOlder "3.5";

3030

3131 src = fetchPypi {

3232 inherit pname version;

33− sha256 = "330067d7319a50b9fb15e89d224e89ab28bc363926774adf7fa119f681b106b6";

33+ sha256 = "ae9baf7a83a3249686703eee71e81a0283570f545ce985a999fd74b6ab3d4e4f";

3434 };

3535

3636 # Tells the tests which database to use

pkgs/development/python-modules/uproot-methods/default.nix+2−2

@@ -6,12 +6,12 @@

66}:

88buildPythonPackage rec {

9− version = "0.7.4";

9+ version = "0.8.0";

1010 pname = "uproot-methods";

1111

1212 src = fetchPypi {

1313 inherit pname version;

14− sha256 = "7f110208a3a2aa9b4d6da11233fd0f206ea039b52bca4bfe312f1b9dcf788476";

14+ sha256 = "57da3d67e1a42b548020debdd23285b5710e3bb2aac20eb7b2d2a686822aa1ab";

1515 };

1616

1717 propagatedBuildInputs = [ numpy awkward ];

pkgs/development/python-modules/wxPython/4.1.nixnew file+75

@@ -0,0 +1,75 @@

1+{ lib

2+, stdenv

3+, fetchPypi

4+, buildPythonPackage

5+, which

6+, pkgconfig

7+, python

8+, isPy27

9+, pyopengl

10+, doxygen

11+, cairo

12+, ncurses

13+, pango

14+, wxGTK

15+}:

16+let

17+ dynamic-linker = stdenv.cc.bintools.dynamicLinker;

18+in

19+buildPythonPackage rec {

20+ pname = "wxPython";

21+ version = "4.1.0";

22+ disabled = isPy27;

23+

24+ src = fetchPypi {

25+ inherit pname version;

26+ sha256 = "12x4ci5q7qni4rkfiq6lnpn1fk8b0sfc6dck5wyxkj2sfp5pa91f";

27+ };

28+

29+ # https://github.com/NixOS/nixpkgs/issues/75759

30+ # https://github.com/wxWidgets/Phoenix/issues/1316

31+ doCheck = false;

32+

33+ nativeBuildInputs = [ which doxygen wxGTK pkgconfig ];

34+

35+ buildInputs = [

36+ wxGTK.gtk

37+ ncurses

38+ ];

39+

40+ DOXYGEN = "${doxygen}/bin/doxygen";

41+

42+ preConfigure = lib.optionalString (!stdenv.isDarwin) ''

43+ substituteInPlace wx/lib/wxcairo/wx_pycairo.py \

44+ --replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")'

45+ substituteInPlace wx/lib/wxcairo/wx_pycairo.py \

46+ --replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [

47+ ("gdk", "${wxGTK.gtk}/lib/libgtk-x11-3.0.so"),

48+ ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"),

49+ ("appsvc", None)

50+ ]}'

51+

52+ # https://github.com/wxWidgets/Phoenix/pull/1584

53+ # It'll be not needed in next version because https://github.com/wxWidgets/Phoenix/pull/1699

54+ substituteInPlace build.py --replace "os.environ['PYTHONPATH'] = phoenixDir()" \

55+ "os.environ['PYTHONPATH'] = os.environ['PYTHONPATH'] + os.pathsep + phoenixDir()"

56+ '';

57+

58+ buildPhase = ''

59+ ${python.interpreter} build.py -v --use_syswx dox etg --nodoc build_py

60+ '';

61+

62+ installPhase = ''

63+ ${python.interpreter} setup.py install --skip-build --prefix=$out

64+ wrapPythonPrograms

65+ '';

66+

67+ passthru = { inherit wxGTK; };

68+

69+ meta = with lib; {

70+ description = "Cross platform GUI toolkit for Python, Phoenix version";

71+ homepage = "http://wxpython.org/";

72+ license = licenses.wxWindows;

73+ maintainers = with maintainers; [ tfmoraes ];

74+ };

75+}

pkgs/development/python-modules/xstatic-bootbox/default.nix+2−2

@@ -5,11 +5,11 @@

66buildPythonPackage rec {

77 pname = "XStatic-Bootbox";

8− version = "4.4.0.1";

8+ version = "5.5.1.1";

1010 src = fetchPypi {

1111 inherit version pname;

12− sha256 = "1g00q38g1k576lxjlwglv4w3fj4z0z8lxlwpc66wyhjglj4r4bwd";

12+ sha256 = "4b2120bb33a1d8ada8f9e0532ad99987aa03879b17b08bfdc6b8326d6eb7c205";

1313 };

1414

1515 # no tests implemented

pkgs/development/tools/analysis/cargo-tarpaulin/default.nix+3−3

@@ -2,13 +2,13 @@

33rustPlatform.buildRustPackage rec {

44 pname = "cargo-tarpaulin";

5− version = "0.15.0";

5+ version = "0.17.0";

77 src = fetchFromGitHub {

88 owner = "xd009642";

99 repo = "tarpaulin";

1010 rev = version;

11− sha256 = "0ga2zfq4365hxvr3wd3isc146ibivy3bfcy24rb6cq3av3b90a8k";

11+ sha256 = "1z104cd3wg718x1d89znppx4h6f0c6icgmpcllyrd0d19lb71a2b";

1212 };

1313

1414 nativeBuildInputs = [

@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {

1616 ];

1717 buildInputs = [ openssl ];

1818

19− cargoSha256 = "1ij1bic95315kba7k7igix33kmwr2va0c2hbysjs0bl5kcnai4f7";

19+ cargoSha256 = "0pn9xgryfb7f0plx50v9i7hsv1wib87pi0fl43cv6hgqyrdb52ny";

2020 #checkFlags = [ "--test-threads" "1" ];

2121 doCheck = false;

2222

pkgs/development/tools/analysis/codeql/default.nix+2−2

@@ -12,7 +12,7 @@

1212

1313stdenv.mkDerivation rec {

1414 pname = "codeql";

15− version = "2.3.2";

15+ version = "2.3.3";

1616

1717 dontConfigure = true;

1818 dontBuild = true;

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {

2020

2121 src = fetchzip {

2222 url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";

23− sha256 = "1fzybh21jw02gdmqkh54gin4chqxj5r5alkrqk1wcryhf73brsbb";

23+ sha256 = "17a574g92jfff2059mhaw2x31npglp9rfcwwk73adbajpiyf4g8q";

2424 };

2525

2626 nativeBuildInputs = [

pkgs/development/tools/azcopy/default.nix+3−3

@@ -2,18 +2,18 @@

33buildGoModule rec {

44 pname = "azure-storage-azcopy";

5− version = "10.6.1";

5+ version = "10.7.0";

77 src = fetchFromGitHub {

88 owner = "Azure";

99 repo = "azure-storage-azcopy";

1010 rev = "v${version}";

11− sha256 = "1gmpdyc55mkzdkkhyzvy9517znvcj8hd9x3rpkpr86vfzgjv9qyv";

11+ sha256 = "0l2109r9a8fhd66zgsi56zdmy390fpnvy08rbxf6rfc0a55n96ka";

1212 };

1313

1414 subPackages = [ "." ];

1515

16− vendorSha256 = "10sxkb2dh1il4ps15dlvq0xsry8hax27imb5qg3khdmjhb4yaj7k";

16+ vendorSha256 = "032yzl8mmgmmxbpsymndp4ddgi572jh5drwql0bjjabp3yqwj1g1";

1717

1818 doCheck = false;

1919

pkgs/development/tools/build-managers/bear/default.nix+2−2

@@ -16,13 +16,13 @@

1616

1717stdenv.mkDerivation rec {

1818 pname = "bear";

19− version = "3.0.1";

19+ version = "3.0.2";

2020

2121 src = fetchFromGitHub {

2222 owner = "rizsotto";

2323 repo = pname;

2424 rev = version;

25− sha256 = "02vzlm48ywf6s3fly19j94k11dqx94x8pgmkq1ylx3z3d1y3b5zb";

25+ sha256 = "0x1an9sxcr0f45c9kdpgpcrc773cc28zsffbxddpqp0h1qh9s4ns";

2626 };

2727

2828 nativeBuildInputs = [ cmake pkg-config ];

pkgs/development/tools/build-managers/sbt-extras/default.nix+50−12

@@ -1,18 +1,17 @@

1−{ stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk }:

1+{ stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk, writeScript

2+, common-updater-scripts, cacert, git, nixfmt, nix, jq, coreutils, gnused

3+, nixosTests }:

3−let

4− rev = "1e9230f35879ce23cbd8d16add07d2134fd479c9";

5− version = "2020-09-24";

6−in

7−stdenv.mkDerivation {

8− name = "sbt-extras-${version}";

9− inherit version;

5+stdenv.mkDerivation rec {

6+ pname = "sbt-extras";

7+ rev = "a36958f50bf8806c13f7c67ab0f13936e189351b";

8+ version = "2020-11-08";

109

1110 src = fetchFromGitHub {

1211 owner = "paulp";

1312 repo = "sbt-extras";

1413 inherit rev;

15− sha256 = "1k6vknjjbhr5jfpiyh2yzayn2ziqi1bb862l1q2786q59161ij3j";

14+ sha256 = "1xp5r7ia8r2nr4g76wp0mnh95d5ha0dblsqvgicq240dgc28360r";

1615 };

1716

1817 dontBuild = true;

@@ -26,14 +25,53 @@ stdenv.mkDerivation {

2625

2726 install bin/sbt $out/bin

2827

29− wrapProgram $out/bin/sbt --prefix PATH : ${stdenv.lib.makeBinPath [ which curl ]}

28+ wrapProgram $out/bin/sbt --prefix PATH : ${

29+ stdenv.lib.makeBinPath [ which curl ]

30+ }

3031 '';

3132

33+ passthru = {

34+ tests = { inherit (nixosTests) sbt-extras; };

35+

36+ updateScript = writeScript "update.sh" ''

37+ #!${stdenv.shell}

38+ set -xo errexit

39+ PATH=${

40+ stdenv.lib.makeBinPath [

41+ common-updater-scripts

42+ curl

43+ cacert

44+ git

45+ nixfmt

46+ nix

47+ jq

48+ coreutils

49+ gnused

50+ ]

51+ }

52+

53+ oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')"

54+ latestSha="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits\?sha\=master\&since\=$oldVersion | jq -r '.[0].sha')"

55+

56+ if [ ! "null" = "$latestSha" ]; then

57+ nixpkgs="$(git rev-parse --show-toplevel)"

58+ default_nix="$nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix"

59+ latestDate="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits/$latestSha | jq '.commit.committer.date' | sed 's|"$.*$T.*|\1|g')"

60+ update-source-version ${pname} "$latestSha" --version-key=rev

61+ update-source-version ${pname} "$latestDate" --ignore-same-hash

62+ nixfmt "$default_nix"

63+ else

64+ echo "${pname} is already up-to-date"

65+ fi

66+ '';

67+ };

68+

3269 meta = {

33− description = "A more featureful runner for sbt, the simple/scala/standard build tool";

70+ description =

71+ "A more featureful runner for sbt, the simple/scala/standard build tool";

3472 homepage = "https://github.com/paulp/sbt-extras";

3573 license = stdenv.lib.licenses.bsd3;

36− maintainers = with stdenv.lib.maintainers; [ puffnfresh ];

74+ maintainers = with stdenv.lib.maintainers; [ nequissimus puffnfresh ];

3775 platforms = stdenv.lib.platforms.unix;

3876 };

3977}

pkgs/development/tools/doctl/default.nix+2−2

@@ -2,7 +2,7 @@

33buildGoModule rec {

44 pname = "doctl";

5− version = "1.49.0";

5+ version = "1.51.0";

77 vendorSha256 = null;

@@ -32,7 +32,7 @@ buildGoModule rec {

3232 owner = "digitalocean";

3333 repo = "doctl";

3434 rev = "v${version}";

35− sha256 = "1z7424am1fb1l9bz8q1lfzmhz84c29v7k5p391m4hhbl8h46x6ca";

35+ sha256 = "1pc1nyzjzgnwchxbhgwiq46rysxpvxv7nmshvmphqm7avxfsmdzf";

3636 };

3737

3838 meta = with lib; {

pkgs/development/tools/gauge/default.nix+2−2

@@ -2,7 +2,7 @@

33buildGoPackage rec {

44 pname = "gauge";

5− version = "1.1.4";

5+ version = "1.1.5";

77 goPackagePath = "github.com/getgauge/gauge";

88 excludedPackages = ''$build\|man$'';

@@ -11,7 +11,7 @@ buildGoPackage rec {

1111 owner = "getgauge";

1212 repo = "gauge";

1313 rev = "v${version}";

14− sha256 = "07kq6j5scbcicgb8dqkf129q5ppvnlvkfp165ql30jrkfd6ybf6y";

14+ sha256 = "0jijw9x1ccqbb9kkzx1bj3wsq6v1415hvlbiihswqbb559bcmira";

1515 };

1616

1717 meta = with stdenv.lib; {

pkgs/development/tools/goconst/default.nix+2−2

@@ -5,7 +5,7 @@

66buildGoPackage rec {

77 pname = "goconst";

8− version = "1.2.0";

8+ version = "1.3.2";

1010 goPackagePath = "github.com/jgautheron/goconst";

1111

@@ -15,7 +15,7 @@ buildGoPackage rec {

1515 owner = "jgautheron";

1616 repo = "goconst";

1717 rev = version;

18− sha256 = "10yy9llmbznaq3v11sxywk1wpwhn0ddly7lxs31z1sf8paan7aig";

18+ sha256 = "0bfiblp1498ic5jbdsm6mnc8s9drhasbqsw0asi6kmcz2kmslp9s";

1919 };

2020

2121 meta = with lib; {

pkgs/development/tools/golangci-lint/default.nix+3−3

@@ -2,16 +2,16 @@

33buildGoModule rec {

44 pname = "golangci-lint";

5− version = "1.32.0";

5+ version = "1.32.2";

77 src = fetchFromGitHub {

88 owner = "golangci";

99 repo = "golangci-lint";

1010 rev = "v${version}";

11− sha256 = "157sqpwhb2984yri7w6x6pzp53ql56svv8bvbigcih3syrngxspr";

11+ sha256 = "14zy8sq5bc26hxb3hg4afd7dpnrw25qi3g6v8y2p05isdf55laww";

1212 };

1313

14− vendorSha256 = "1caf0flmq032azxwyfq6dvhw757nncxigfkf32s2a6g3jmqr1g3y";

14+ vendorSha256 = "1l73qqpyn40z2czh2d8wgp3lpj6vnv8ll29yyryx0wm59ric732g";

1515

1616 doCheck = false;

1717

pkgs/development/tools/hcloud/default.nix+3−3

@@ -2,18 +2,18 @@

33buildGoModule rec {

44 pname = "hcloud";

5− version = "1.19.1";

5+ version = "1.20.0";

77 src = fetchFromGitHub {

88 owner = "hetznercloud";

99 repo = "cli";

1010 rev = "v${version}";

11− sha256 = "0iq04jfqvmwlm6947kzz4c3a33lvwxvj42z179rc3126b5v7bq54";

11+ sha256 = "0sjshcppcfdfz29nsrzvrciypcb4r7fbl2sqhlkcq948b7k3jk8b";

1212 };

1313

1414 nativeBuildInputs = [ installShellFiles ];

1515

16− vendorSha256 = "1svwrb5wyz5d8fgx36bpypnfq4hmpfxyd197cla9wnqpbkia7n5r";

16+ vendorSha256 = "0q6jm2ghwrbjxn76i8wz72xjdmwfvl5dn8n4zilyjjx9vvllwdjw";

1717

1818 doCheck = false;

1919

pkgs/development/tools/misc/act/default.nix+2−2

@@ -2,13 +2,13 @@

33buildGoModule rec {

44 pname = "act";

5− version = "0.2.16";

5+ version = "0.2.17";

77 src = fetchFromGitHub {

88 owner = "nektos";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "0zhn6av1adphkk9g13m5na63r8fqcjw8wibcja9v9mbw886zcc3p";

11+ sha256 = "0s7bgm2q7z9xpaj6kfvg63v12k35ckaxwmh6bbjh15xibaw58183";

1212 };

1313

1414 vendorSha256 = "0bcrw3hf92m7n58lrlm0vj1wiwwy82q2rl1a725q3d6xwvi5kh9h";

pkgs/development/tools/misc/circleci-cli/default.nix+3−3

@@ -2,16 +2,16 @@

33buildGoModule rec {

44 pname = "circleci-cli";

5− version = "0.1.11146";

5+ version = "0.1.11458";

77 src = fetchFromGitHub {

88 owner = "CircleCI-Public";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "1pn421sc3ipdqvdwl6fvlvwcddck3v23j8rfk5lq5a2n4ip5r8z8";

11+ sha256 = "028qm25vhqp2a1jpvy4csgzqy5ijmsnzyh9696x660glrk5q2r1i";

1212 };

1313

14− vendorSha256 = "0fjj8hh0s0jcgz48japbcfpl4ihba2drvvxlyg69j8hrcb9lmi4l";

14+ vendorSha256 = "15l9f87vgspdsxhwqdm56z3dvrspc8k1bbyvhhhnvqf3fkiki2bw";

1515

1616 doCheck = false;

1717

pkgs/development/tools/rust/cargo-make/default.nix+3−3

@@ -4,11 +4,11 @@

55rustPlatform.buildRustPackage rec {

66 pname = "cargo-make";

7− version = "0.32.8";

7+ version = "0.32.9";

99 src = fetchCrate {

1010 inherit pname version;

11− sha256 = "sha256-TwutU4RjiYtxc2vT67Bgqe/WRHi5aXwgzvZu7Wk4Cao=";

11+ sha256 = "0f6avprq0d65v5fk3kn2kvw3w024f21yq6v8y7d9rbwqxxf87jlf";

1212 };

1313

1414 nativeBuildInputs = [ pkg-config ];

@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {

1616 buildInputs = [ openssl ]

1717 ++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];

1818

19− cargoSha256 = "sha256-HzRriPVaMn6qDu6h/NQjILglO4/0//8J1orV4Uz+XEI=";

19+ cargoSha256 = "0v0657hh8ivqaq4sn0saaiz06shxavhrh9mksjlzj7c2ym6cxkih";

2020

2121 # Some tests fail because they need network access.

2222 # However, Travis ensures a proper build.

pkgs/development/tools/wrangler/default.nix+1−1

@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {

1313

1414 cargoSha256 = "0d9wvdjjakznz8dnqx4gqxh0xkxrh4229460hg6dr9qn492p7nfx";

1515

16− nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config perl ];

16+ nativeBuildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ];

1717

1818 buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ]

1919 ++ stdenv.lib.optionals stdenv.isDarwin [

pkgs/development/web/flyctl/default.nix+2−2

@@ -2,13 +2,13 @@

33buildGoModule rec {

44 pname = "flyctl";

5− version = "0.0.145";

5+ version = "0.0.146";

77 src = fetchFromGitHub {

88 owner = "superfly";

99 repo = "flyctl";

1010 rev = "v${version}";

11− sha256 = "00by00jslj9nkq89iwvc5f0jcn4lv8i6xs9y9l2x044rq525q08q";

11+ sha256 = "0qqrzzgr7r2j5cwhbfwfl1z6k9qgqpsdf8f0n545hg48i52q0p2q";

1212 };

1313

1414 preBuild = ''

pkgs/development/web/nodejs/v15.nix+2−2

@@ -8,6 +8,6 @@ let

88in

99 buildNodejs {

1010 inherit enableNpm;

11− version = "15.1.0";

12− sha256 = "1fd0ck6nlmp937j00y17q2k9xszzwf4s383p1z4v4qzj0qzxflvk";

11+ version = "15.2.0";

12+ sha256 = "022kw29sjf46mgvwciihi2cmf9sfjpqi0xih8xpk7xiwfmx02ypn";

1313 }

pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix+7−12

@@ -3,27 +3,22 @@

33appleDerivation {

44 # We can't just run the root build, because https://github.com/facebook/xcbuild/issues/264

6+ patchPhase = ''

7+ substituteInPlace adv_cmds.xcodeproj/project.pbxproj \

8+ --replace '/usr/lib/libtermcap.dylib' 'libncurses.dylib'

9+ '';

10+

611 # pkill requires special private headers that are unavailable in

712 # NixPkgs. These ones are needed:

813 # - xpc/xpxc.h

914 # - os/base_private.h

1015 # - _simple.h

1116 # We disable it here for now. TODO: build pkill inside adv_cmds

12−

13− # We also disable locale here because of some issues with a missing

14− # "lstdc++".

15− patchPhase = ''

16− substituteInPlace adv_cmds.xcodeproj/project.pbxproj \

17− --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" \

18− --replace "FDF278D60FC6204E00D7A3C6 /* locale.cc in Sources */," "" \

19− --replace '/usr/lib/libtermcap.dylib' 'libncurses.dylib'

20− '';

21−

2217 buildPhase = ''

2318 targets=$(xcodebuild -list \

2419 | awk '/Targets:/{p=1;print;next} p&&/^\s*$/{p=0};p' \

2520 | tail -n +2 | sed 's/^[ \t]*//' \

26− | grep -v -e Desktop -e Embedded -e mklocale -e colldef)

21+ | grep -v -e Desktop -e Embedded -e mklocale -e pkill -e pgrep -e colldef)

2722

2823 for i in $targets; do

2924 xcodebuild SYMROOT=$PWD/Products OBJROOT=$PWD/Intermediates -target $i

@@ -34,7 +29,7 @@ appleDerivation {

3429 installPhase = ''

3530 for f in Products/Release/*; do

3631 if [ -f $f ]; then

37− install -D $file $out/bin/$(basename $f)

32+ install -D $f $out/bin/$(basename $f)

3833 fi

3934 done

4035

pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch+37−11

@@ -1,5 +1,5 @@

11diff --git a/data/meson.build b/data/meson.build

2−index bb749fd4..b611875b 100644

2+index 14454458..12a798c0 100644

33--- a/data/meson.build

44+++ b/data/meson.build

55@@ -17,7 +17,7 @@ endif

@@ -73,10 +73,10 @@ index 826a3c1d..b78db663 100644

7373+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),

7474 )

7575diff --git a/meson.build b/meson.build

76−index 87ea67e5..3a4374db 100644

76+index a6fb55dd..aedb7530 100644

7777--- a/meson.build

7878+++ b/meson.build

79−@@ -175,6 +175,12 @@ endif

79+@@ -183,6 +183,12 @@ endif

8080 mandir = join_paths(prefix, get_option('mandir'))

8181 localedir = join_paths(prefix, get_option('localedir'))

8282

@@ -90,7 +90,7 @@ index 87ea67e5..3a4374db 100644

9090 gio = dependency('gio-2.0', version : '>= 2.45.8')

9191 giounix = dependency('gio-unix-2.0', version : '>= 2.45.8', required: false)

9292diff --git a/meson_options.txt b/meson_options.txt

93−index 3da9b6c4..6c80275b 100644

93+index 0a0e2853..198ae930 100644

9494--- a/meson_options.txt

9595+++ b/meson_options.txt

9696@@ -1,3 +1,4 @@

@@ -99,7 +99,7 @@ index 3da9b6c4..6c80275b 100644

9999 option('agent', type : 'boolean', value : true, description : 'enable the fwupd agent')

100100 option('consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support')

101101diff --git a/plugins/ata/meson.build b/plugins/ata/meson.build

102−index 8444bb8a..fa4a8ad1 100644

102+index f32b97fe..679ccc7b 100644

103103--- a/plugins/ata/meson.build

104104+++ b/plugins/ata/meson.build

105105@@ -7,7 +7,7 @@ install_data([

@@ -122,11 +122,37 @@ index ed4eee70..76dbdb1d 100644

122122- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),

123123+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),

124124 )

125+diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build

126+index d829e153..e2917bbe 100644

127+--- a/plugins/msr/meson.build

128++++ b/plugins/msr/meson.build

129+@@ -5,7 +5,7 @@ install_data(['msr.quirk'],

130+ )

131+

132+ install_data(['fwupd-msr.conf'],

133+- install_dir: join_paths(sysconfdir, 'modules-load.d')

134++ install_dir: join_paths(sysconfdir_install, 'modules-load.d')

135+ )

136+

137+ shared_module('fu_plugin_msr',

138+diff --git a/plugins/platform-integrity/meson.build b/plugins/platform-integrity/meson.build

139+index 6f1c4bc5..c5d043fc 100644

140+--- a/plugins/platform-integrity/meson.build

141++++ b/plugins/platform-integrity/meson.build

142+@@ -7,7 +7,7 @@ install_data([

143+ )

144+

145+ install_data(['fwupd-platform-integrity.conf'],

146+- install_dir: join_paths(sysconfdir, 'modules-load.d')

147++ install_dir: join_paths(sysconfdir_install, 'modules-load.d')

148+ )

149+

150+ shared_module('fu_plugin_platform_integrity',

125151diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build

126−index 25fc5c7d..77eb9a83 100644

152+index 92762791..08bb37ea 100644

127153--- a/plugins/redfish/meson.build

128154+++ b/plugins/redfish/meson.build

129−@@ -27,7 +27,7 @@ shared_module('fu_plugin_redfish',

155+@@ -26,7 +26,7 @@ shared_module('fu_plugin_redfish',

130156 )

131157

132158 install_data(['redfish.conf'],

@@ -136,10 +162,10 @@ index 25fc5c7d..77eb9a83 100644

136162

137163 if get_option('tests')

138164diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build

139−index 06ab34ee..297a9182 100644

165+index 6b2368fb..2bd06fed 100644

140166--- a/plugins/thunderbolt/meson.build

141167+++ b/plugins/thunderbolt/meson.build

142−@@ -46,7 +46,7 @@ executable('tbtfwucli',

168+@@ -31,7 +31,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt',

143169 )

144170

145171 install_data(['thunderbolt.conf'],

@@ -149,10 +175,10 @@ index 06ab34ee..297a9182 100644

149175 # we use functions from 2.52 in the tests

150176 if get_option('tests') and umockdev.found() and gio.version().version_compare('>= 2.52')

151177diff --git a/plugins/uefi/meson.build b/plugins/uefi/meson.build

152−index 5838cecc..9ba3d5cd 100644

178+index 2d1b2d22..c4217a72 100644

153179--- a/plugins/uefi/meson.build

154180+++ b/plugins/uefi/meson.build

155−@@ -101,7 +101,7 @@ if get_option('man')

181+@@ -97,7 +97,7 @@ if get_option('man')

156182 endif

157183

158184 install_data(['uefi.conf'],

pkgs/os-specific/linux/kernel/hardened/patches.json+12−12

@@ -1,18 +1,18 @@

11{

22 "4.14": {

3− "name": "linux-hardened-4.14.204.a.patch",

4− "sha256": "1vwja9mqycw3322p8a896l9mkxvzym6r9q17zfgwpqi3kvr9k74h",

5− "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.204.a/linux-hardened-4.14.204.a.patch"

3+ "name": "linux-hardened-4.14.205.a.patch",

4+ "sha256": "0a9llmpkz4rs1xr574iiyjvll1i9fd6y5k0gxqniz2x2m2nl1mkz",

5+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.205.a/linux-hardened-4.14.205.a.patch"

66 },

77 "4.19": {

8− "name": "linux-hardened-4.19.155.a.patch",

9− "sha256": "0jrvd9yws7cym08j28r7wv3i83zlk5z0vl0l1mibak04h43mibgf",

10− "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.155.a/linux-hardened-4.19.155.a.patch"

8+ "name": "linux-hardened-4.19.156.a.patch",

9+ "sha256": "1f3di0fvsfs9p549nna67i108v3730hc5mjyh8lk07s2bbigi09z",

10+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.156.a/linux-hardened-4.19.156.a.patch"

1111 },

1212 "5.4": {

13− "name": "linux-hardened-5.4.75.a.patch",

14− "sha256": "169m2a3wm5lsyzp7cp8nvxarhgcnan41ap7k5r7jx7x1frx2vzxm",

15− "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.75.a/linux-hardened-5.4.75.a.patch"

13+ "name": "linux-hardened-5.4.76.a.patch",

14+ "sha256": "0b47id64vi55s7lmyasmvhwbfcv9cjwfhw9g4lf220g0rnl6h8jm",

15+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.76.a/linux-hardened-5.4.76.a.patch"

1616 },

1717 "5.8": {

1818 "name": "linux-hardened-5.8.18.a.patch",

@@ -20,8 +20,8 @@

2020 "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.18.a/linux-hardened-5.8.18.a.patch"

2121 },

2222 "5.9": {

23− "name": "linux-hardened-5.9.6.a.patch",

24− "sha256": "1h25jkbp0yz2jfmbnwrldd1rcpag8mbf8dv6kc79j7qg1agafxkn",

25− "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.6.a/linux-hardened-5.9.6.a.patch"

23+ "name": "linux-hardened-5.9.7.a.patch",

24+ "sha256": "1sb4rsd3yfh49aqg5j24zav9x38c44q7d9pyx6pb8pl368rd26l4",

25+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.7.a/linux-hardened-5.9.7.a.patch"

2626 }

2727}

pkgs/os-specific/linux/kernel/linux-4.14.nix+2−2

@@ -3,7 +3,7 @@

33with stdenv.lib;

55buildLinux (args // rec {

6− version = "4.14.204";

6+ version = "4.14.205";

88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed

99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "1ncacsy2g80zigfx8nmr1f7v50s1y9ys1xy9jgizrnvmxjcji0wy";

16+ sha256 = "0m6ajw3iypxwvym8hmymd0dlcm9gdczpa6y6id4b447r774aqmcc";

1717 };

1818} // (args.argsOverride or {}))

pkgs/os-specific/linux/kernel/linux-4.19.nix+2−2

@@ -3,7 +3,7 @@

33with stdenv.lib;

55buildLinux (args // rec {

6− version = "4.19.155";

6+ version = "4.19.156";

88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed

99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "1lj81aadyskmxs3j4s923nhnk69dfj2kiwm0nxabbcjw83sliinb";

16+ sha256 = "0b9g2v8dvlhq0kbns2z62v93pnaprk7xbjzzx8rk0b522x42nq08";

1717 };

1818} // (args.argsOverride or {}))

pkgs/os-specific/linux/kernel/linux-4.4.nix+2−2

@@ -1,11 +1,11 @@

11{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:

33buildLinux (args // rec {

4− version = "4.4.241";

4+ version = "4.4.242";

55 extraMeta.branch = "4.4";

77 src = fetchurl {

88 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

9− sha256 = "054jd6jgymxbkjfmk8wbckihl355gjimjg2xi5yr4v2343qi9zij";

9+ sha256 = "089gigqali5q8izac82ybigxyi1bnw0xhm1cc590h4v7lkmk0mm1";

1010 };

1111} // (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:

33buildLinux (args // rec {

4− version = "4.9.241";

4+ version = "4.9.242";

55 extraMeta.branch = "4.9";

77 src = fetchurl {

88 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

9− sha256 = "0b5k9cwz7vpaybw4nd03pn2z4d8qbhmhd9mx4j2yd0fqj57x1in4";

9+ sha256 = "1r1myvxkhnsz419i5y6zjdkz177q3d19jk7748vv1v505gi3k1g4";

1010 };

1111} // (args.argsOverride or {}))

pkgs/os-specific/linux/kernel/linux-5.4.nix+2−2

@@ -3,7 +3,7 @@

33with stdenv.lib;

55buildLinux (args // rec {

6− version = "5.4.75";

6+ version = "5.4.76";

88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed

99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

@@ -13,6 +13,6 @@ buildLinux (args // rec {

1313

1414 src = fetchurl {

1515 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

16− sha256 = "0w0lpiy56zqdm2vpx9ckxakna334n88pnqbv52zyfcslxgb6yinj";

16+ sha256 = "1lpppqjsrcmpr6vawxycsy7lpwdh3pb3d3f841sxzqgm3b9mymkg";

1717 };

1818} // (args.argsOverride or {}))

pkgs/os-specific/linux/kernel/linux-5.9.nix+2−2

@@ -3,7 +3,7 @@

33with stdenv.lib;

55buildLinux (args // rec {

6− version = "5.9.6";

6+ version = "5.9.7";

88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed

99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

@@ -13,6 +13,6 @@ buildLinux (args // rec {

1313

1414 src = fetchurl {

1515 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

16− sha256 = "0w2kcng09nzk09dwkx4azdfgnwzbd2mz8lyl4j69bwx837z85hbc";

16+ sha256 = "1dv933lnkcfrpjbq1hdc3b5r210f6vn5y04jp87pij4mmkn47a6y";

1717 };

1818} // (args.argsOverride or {}))

pkgs/os-specific/linux/kernel/linux-libre.nix+2−2

@@ -1,8 +1,8 @@

11{ stdenv, lib, fetchsvn, linux

22, scripts ? fetchsvn {

33 url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";

4− rev = "17744";

5− sha256 = "120jf6d1xrpwf8yfqzfqp8a1189lca0si8fxci16sf4bdg5q1had";

4+ rev = "17762";

5+ sha256 = "1fj77j9x20w8xwk2xmga625dv81c145gj01z8yxz8i3x2cxwccrs";

66 }

77, ...

88}:

pkgs/os-specific/linux/wireguard/default.nix+4

@@ -14,6 +14,10 @@ stdenv.mkDerivation rec {

1414 sha256 = "1nd2kc3c62907kxm1084dw7krd8xsy3hxydmcpz4jvk03vm5dnkg";

1515 };

1616

17+ patches = [

18+ ./linux-5.4.76-fix.patch

19+ ];

20+

1721 hardeningDisable = [ "pic" ];

1822

1923 KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";

pkgs/os-specific/linux/wireguard/linux-5.4.76-fix.patchnew file+12

@@ -0,0 +1,12 @@

1+diff -u -r wireguard-linux-compat-1.0.20200908/src/compat/compat-asm.h wireguard-linux-compat-1.0.20200908-lts/src/compat/compat-asm.h

2+--- wireguard-linux-compat-1.0.20200908/src/compat/compat-asm.h 2020-09-08 16:22:40.000000000 +0000

3++++ wireguard-linux-compat-1.0.20200908-lts/src/compat/compat-asm.h 2020-11-10 15:05:43.720093522 +0000

4+@@ -40,7 +40,7 @@

5+ #undef pull

6+ #endif

8+-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)

9++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 76)

10+ #define SYM_FUNC_START ENTRY

11+ #define SYM_FUNC_END ENDPROC

12+ #endif

pkgs/os-specific/linux/zfs/default.nix+4−3

@@ -161,10 +161,11 @@ let

161161 (cd $out/share/bash-completion/completions; ln -s zfs zpool)

162162 '';

163163

164− postFixup = ''

165− path="PATH=${makeBinPath [ coreutils gawk gnused gnugrep utillinux smartmontools sysstat sudo ]}"

164+ postFixup = let

165+ path = "PATH=${makeBinPath [ coreutils gawk gnused gnugrep utillinux smartmontools sysstat ]}:$PATH";

166+ in ''

166167 for i in $out/libexec/zfs/zpool.d/*; do

167− sed -i "2i$path" $i

168+ sed -i '2i${path}' $i

168169 done

169170 '';

170171

pkgs/servers/dns/knot-dns/default.nix+2−2

@@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in

88stdenv.mkDerivation rec {

99 pname = "knot-dns";

10− version = "3.0.1";

10+ version = "3.0.2";

1111

1212 src = fetchurl {

1313 url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";

14− sha256 = "97af6724b04308f691392c80d75564ff8b246871f2f59c4f03cede3c4dd401bb";

14+ sha256 = "f813a5e53263ef51d0415508e1f7d33cfbb75a139ccb10a344ae5a91689933fb";

1515 };

1616

1717 outputs = [ "bin" "out" "dev" ];

pkgs/servers/dns/knot-resolver/default.nix+3−2

@@ -16,11 +16,11 @@ lua = luajitPackages;

1616

1717unwrapped = stdenv.mkDerivation rec {

1818 pname = "knot-resolver";

19− version = "5.1.3";

19+ version = "5.2.0";

2020

2121 src = fetchurl {

2222 url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz";

23− sha256 = "20cd829027e39a9f7d993894e3640e886825b492d9ac1a744ac5616cc101458b";

23+ sha256 = "8824267ca3331fa06d418c1351b68c648da0af121bcbc84c6e08f5b1e28d9433";

2424 };

2525

2626 outputs = [ "out" "dev" ];

@@ -67,6 +67,7 @@ unwrapped = stdenv.mkDerivation rec {

6767 postInstall = ''

6868 rm "$out"/lib/libkres.a

6969 rm "$out"/lib/knot-resolver/upgrade-4-to-5.lua # not meaningful on NixOS

70+ rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help

7071 '';

7172

7273 doInstallCheck = with stdenv; hostPlatform == buildPlatform;

pkgs/servers/mail/postfix/default.nix+2−2

@@ -26,11 +26,11 @@ in stdenv.mkDerivation rec {

2626

2727 pname = "postfix";

2828

29− version = "3.5.6";

29+ version = "3.5.7";

3030

3131 src = fetchurl {

3232 url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz";

33− sha256 = "0shyxk83adv4pbfilmskyrgjpb57vyhmvqbmfqawxbc22mksmh4f";

33+ sha256 = "0q89iwan5yd84yrzdv3sqg1zanmw56bl2f5gyv5wfg8m9vqp995p";

3434 };

3535

3636 nativeBuildInputs = [ makeWrapper m4 ];

pkgs/servers/monitoring/do-agent/default.nix+2−2

@@ -2,13 +2,13 @@

33buildGoModule rec {

44 pname = "do-agent";

5− version = "3.7.1";

5+ version = "3.8.0";

77 src = fetchFromGitHub {

88 owner = "digitalocean";

99 repo = "do-agent";

1010 rev = version;

11− sha256 = "16mmh1kz6zbncfisd9qnb3ssgpkcb4hb7700jlzbdjqxyjmy0qsf";

11+ sha256 = "141hmkswb65sq99ad6vg4dkrbhsmni88hlrfdxqdn89hvsz8f7b2";

1212 };

1313

1414 buildFlagsArray = ''

pkgs/servers/monitoring/loki/default.nix+11−1

@@ -1,4 +1,12 @@

1−{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, systemd, fetchpatch }:

1+{ stdenv

2+, lib

3+, buildGoModule

4+, fetchFromGitHub

5+, makeWrapper

6+, nixosTests

7+, systemd

8+, fetchpatch

9+}:

210

311buildGoModule rec {

412 version = "2.0.0";

@@ -32,6 +40,8 @@ buildGoModule rec {

3240 --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib"

3341 '';

3442

43+ passthru.tests = { inherit (nixosTests) loki; };

44+

3545 doCheck = true;

3646

3747 meta = with stdenv.lib; {

pkgs/servers/monitoring/mackerel-agent/default.nixnew file+42

@@ -0,0 +1,42 @@

1+{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, iproute, nettools }:

3+buildGoModule rec {

4+ pname = "mackerel-agent";

5+ version = "0.69.3";

7+ src = fetchFromGitHub {

8+ owner = "mackerelio";

9+ repo = pname;

10+ rev = "v${version}";

11+ sha256 = "0jkvqqzk6wyjsdsmn2l2cdw8pjqzswlqb9p492czhgrfy065lrqp";

12+ };

13+

14+ nativeBuildInputs = [ makeWrapper ];

15+ checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ];

16+ buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute ];

17+

18+ vendorSha256 = "0kjky2mhs6dapnr4xpjpnbibp6y8r320igddplynsfsp8vwrfp7m";

19+

20+ subPackages = [ "." ];

21+

22+ buildFlagsArray = ''

23+ -ldflags=

24+ -X=main.version=${version}

25+ -X=main.gitcommit=v${version}

26+ '';

27+

28+ postInstall = ''

29+ wrapProgram $out/bin/mackerel-agent \

30+ --prefix PATH : "${lib.makeBinPath buildInputs}"

31+ '';

32+

33+ doCheck = true;

34+

35+ meta = with lib; {

36+ description = "System monitoring service for mackerel.io";

37+ homepage = "https://github.com/mackerelio/mackerel-agent";

38+ license = licenses.asl20;

39+ maintainers = with maintainers; [ midchildan ];

40+ platforms = platforms.all;

41+ };

42+}

pkgs/servers/monitoring/prometheus/process-exporter.nix+2−2

@@ -2,7 +2,7 @@

33buildGoPackage rec {

44 pname = "process-exporter";

5− version = "0.5.0";

5+ version = "0.7.1";

77 goPackagePath = "github.com/ncabatoff/process-exporter";

@@ -10,7 +10,7 @@ buildGoPackage rec {

1010 owner = "ncabatoff";

1111 repo = pname;

1212 rev = "v${version}";

13− sha256 = "129vqry3l8waxcyvx83wg0dvh3qg4pr3rl5fw7vmhgdzygbaq3bq";

13+ sha256 = "0jkh4xzjlrlabpll3igpyhqs35f1dxifjkbfxvijjcq9yahxfj0x";

1414 };

1515

1616 postPatch = ''

pkgs/servers/sql/dolt/default.nix+3−3

@@ -2,18 +2,18 @@

33buildGoModule rec {

44 pname = "dolt";

5− version = "0.21.1";

5+ version = "0.21.4";

77 src = fetchFromGitHub {

88 owner = "liquidata-inc";

99 repo = "dolt";

1010 rev = "v${version}";

11− sha256 = "03fg91r6lxfq58c5843vysaw8hbagiq4r2qxc4nh9w1b3mc71h7v";

11+ sha256 = "13dr3iq3v14i9zlcpv8yvq6yp90b70512bk2jkr5arlk2bilba8c";

1212 };

1313

1414 modRoot = "./go";

1515 subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];

16− vendorSha256 = "19755xbjxxva574mj0sc7kqqmr4k22bbvf4aj3d0hhcfjpyhn434";

16+ vendorSha256 = "1x3a4q629jrgh7x8b81n2iapbxjfd389pj1wc2zd6c5l9r70xr97";

1717

1818 doCheck = false;

1919

pkgs/servers/web-apps/moodle/default.nix+3−3

@@ -1,8 +1,8 @@

11{ lib, stdenv, fetchurl, writeText, plugins ? [ ] }:

33let

4− version = "3.9.2";

5− stableVersion = builtins.substring 0 2 (builtins.replaceStrings ["."] [""] version);

4+ version = "3.10";

5+ stableVersion = lib.concatStrings (lib.take 2 (lib.splitVersion version));

77in stdenv.mkDerivation rec {

88 pname = "moodle";

@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {

1111 src = fetchurl {

1212 url =

1313 "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz";

14− sha256 = "ygy9xlYs49Ga3u2Q/vqxhnDnqXsrh6YYTAtcsXF8kNo=";

14+ sha256 = "4aYKZmXym1Tq/462PIgJb4sHGUclEkU0Ok1iQJ6u0aw=";

1515 };

1616

1717 phpConfig = writeText "config.php" ''

pkgs/shells/zsh/oh-my-zsh/default.nix+4−4

@@ -5,15 +5,15 @@

55, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:

77stdenv.mkDerivation rec {

8− version = "2020-11-04";

8+ version = "2020-11-10";

99 pname = "oh-my-zsh";

10− rev = "3e6ee85a161c8089955c19364728e167025a911d";

10+ rev = "dc4692b53e4a1dc512d405f36f2d2af30c66304b";

1111

1212 src = fetchFromGitHub {

1313 inherit rev;

1414 owner = "ohmyzsh";

1515 repo = "ohmyzsh";

16− sha256 = "/8ySf5ulSx2HtPG/tzPzOI1ljksxF+hGwjXFhGIseBk=";

16+ sha256 = "00jm6vvjq265injnrd6mbmq2dm3w8wmw3g7ibhv9spi2r3zb6400";

1717 };

1818

1919 installPhase = ''

@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {

9292 if [ ! "null" = "$latestSha" ]; then

9393 nixpkgs="$(git rev-parse --show-toplevel)"

9494 default_nix="$nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix"

95− latestDate="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits/$latestSha | jq '.commit.author.date' | sed 's|"$.*$T.*|\1|g')"

95+ latestDate="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits/$latestSha | jq '.commit.committer.date' | sed 's|"$.*$T.*|\1|g')"

9696 update-source-version oh-my-zsh "$latestSha" --version-key=rev

9797 update-source-version oh-my-zsh "$latestDate" --ignore-same-hash

9898 nixfmt "$default_nix"

pkgs/stdenv/generic/check-meta.nix+15−5

@@ -80,9 +80,9 @@ let

8080 pos_str = meta: meta.position or "«unknown-file»";

8181

8282 remediation = {

83− unfree = remediate_whitelist "Unfree";

84− broken = remediate_whitelist "Broken";

85− unsupported = remediate_whitelist "UnsupportedSystem";

83+ unfree = remediate_whitelist "Unfree" remediate_unfree_predicate;

84+ broken = remediate_whitelist "Broken" (x: "");

85+ unsupported = remediate_whitelist "UnsupportedSystem" (x: "");

8686 blacklisted = x: "";

8787 insecure = remediate_insecure;

8888 broken-outputs = remediateOutputsToInstall;

@@ -98,7 +98,17 @@ let

9898 Broken = "broken packages";

9999 UnsupportedSystem = "packages that are unsupported for this system";

100100 }.${allow_attr};

101− remediate_whitelist = allow_attr: attrs:

101+ remediate_unfree_predicate = attrs:

102+ ''

103+

104+ Alternatively you can configure a predicate to whitelist specific packages:

105+ { nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [

106+ "${lib.getName attrs}"

107+ ];

108+ }

109+ '';

110+

111+ remediate_whitelist = allow_attr: rebuild_amendment: attrs:

102112 ''

103113 a) To temporarily allow ${remediation_phrase allow_attr}, you can use an environment variable

104114 for a single invocation of the nix tools.

@@ -108,7 +118,7 @@ let

108118 b) For `nixos-rebuild` you can set

109119 { nixpkgs.config.allow${allow_attr} = true; }

110120 in configuration.nix to override this.

111−

121+ ${rebuild_amendment attrs}

112122 c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add

113123 { allow${allow_attr} = true; }

114124 to ~/.config/nixpkgs/config.nix.

pkgs/tools/admin/azure-cli/default.nix+2−2

@@ -1,12 +1,12 @@

11{ stdenv, lib, python, fetchFromGitHub, installShellFiles }:

33let

4− version = "2.14.0";

4+ version = "2.14.2";

55 src = fetchFromGitHub {

66 owner = "Azure";

77 repo = "azure-cli";

88 rev = "azure-cli-${version}";

9− sha256 = "0rihxkdckfkqzrr3jc8jpdpjg3pgz5jymyz19lpva8qqln7cmzpy";

9+ sha256 = "1d5qd39b0i5icg193ybr9gzl0axqw5ml5zjwqin1zxqj5y3r6sc2";

1010 };

1111

1212 # put packages that needs to be overriden in the py package scope

pkgs/tools/admin/exoscale-cli/default.nix+2−2

@@ -2,13 +2,13 @@

33buildGoPackage rec {

44 pname = "exoscale-cli";

5− version = "1.19.0";

5+ version = "1.20.2";

77 src = fetchFromGitHub {

88 owner = "exoscale";

99 repo = "cli";

1010 rev = "v${version}";

11− sha256 = "05j9bwg8ph3xysd3rvykfznzs476w6wi6hj4mfg7jzw5r23ddc7k";

11+ sha256 = "1vawc3ba7p35gil57wz9s1mlp1x99imvwcxfzlkfhgizfa56vfrx";

1212 };

1313

1414 goPackagePath = "github.com/exoscale/cli";

pkgs/tools/filesystems/duperemove/default.nix+2−2

@@ -3,13 +3,13 @@

44stdenv.mkDerivation rec {

55 pname = "duperemove";

6− version = "0.11.1";

6+ version = "0.11.2";

88 src = fetchFromGitHub {

99 owner = "markfasheh";

1010 repo = "duperemove";

1111 rev = "v${version}";

12− sha256 = "1scz76pvpljvrpfn176125xwaqwyy4pirlm11sc9spb2hyzknw2z";

12+ sha256 = "1a87mka2sfzhbch2jip6wlvvs0glxq9lqwmyrp359d1rmwwmqiw9";

1313 };

1414

1515 nativeBuildInputs = [ pkgconfig ];

pkgs/tools/graphics/gifski/default.nix+3−3

@@ -2,16 +2,16 @@

33rustPlatform.buildRustPackage rec {

44 pname = "gifski";

5− version = "1.2.2";

5+ version = "1.2.4";

77 src = fetchFromGitHub {

88 owner = "ImageOptim";

99 repo = "gifski";

1010 rev = version;

11− sha256 = "175wlvn6psa3xx9g2i05xykk24wpmkr0m27rm95jyi0kzlqdc466";

11+ sha256 = "0mr4ni75klmzfjivfv5xmcdw03y1gjvkz1d297gwh46zq1q7blf3";

1212 };

1313

14− cargoSha256 = "01gf8v6q2rpaik6dyxch8n2mpaxp222v32zrw19059hn3smg98l0";

14+ cargoSha256 = "0wm139lik6w2hwg72j8hcphp0z89bbabfxjmfyqrih6akyzb0l01";

1515

1616 nativeBuildInputs = [ pkgconfig ];

1717

pkgs/tools/misc/cp437/default.nixnew file+28

@@ -0,0 +1,28 @@

1+{ stdenv, fetchFromGitHub }:

2+let version = "0.6";

3+in

4+stdenv.mkDerivation {

5+ pname = "cp437";

6+ inherit version;

8+ src = fetchFromGitHub {

9+ owner = "keaston";

10+ repo = "cp437";

11+ rev = "v${version}";

12+ sha256 = "18f4mnfnyviqclbhmbhix80k823481ypkwbp26qfvhnxdgzbggcc";

13+ };

14+

15+ installPhase = ''

16+ install -Dm755 cp437 -t $out/bin

17+ '';

18+

19+ meta = with stdenv.lib; {

20+ description = ''

21+ Emulates an old-style "code page 437" / "IBM-PC" character

22+ set terminal on a modern UTF-8 terminal emulator

23+ '';

24+ homepage = "https://github.com/keaston/cp437";

25+ license = licenses.bsd3;

26+ maintainers = with maintainers; [ jb55 ];

27+ };

28+}

pkgs/tools/misc/duf/default.nix+2−2

@@ -2,13 +2,13 @@

33buildGoModule rec {

44 pname = "duf";

5− version = "0.4.0";

5+ version = "0.5.0";

77 src = fetchFromGitHub {

88 owner = "muesli";

99 repo = "duf";

1010 rev = "v${version}";

11− sha256 = "093kir1zwpkl0jic4p1f032ir5k7kra94di2indzn0fa4j4r7a0i";

11+ sha256 = "0n0nvrqrlr75dmf2j6ja615ighzs35cfixn7z9cwdz3vhj1xhc5f";

1212 };

1313

1414 dontStrip = true;

pkgs/tools/misc/fluent-bit/default.nix+2−2

@@ -2,13 +2,13 @@

33stdenv.mkDerivation rec {

44 pname = "fluent-bit";

5− version = "1.6.2";

5+ version = "1.6.3";

77 src = fetchFromGitHub {

88 owner = "fluent";

99 repo = "fluent-bit";

1010 rev = "v${version}";

11− sha256 = "0v2n43mn6n4nn6r2d4ksp98793xkx334xp078vhvgi01nsmd60x7";

11+ sha256 = "0c8b5xg1shdncw24jsnzwk96ln4qmw1h2qlxv6467lf083kz0azw";

1212 };

1313

1414 nativeBuildInputs = [ cmake flex bison ];

pkgs/tools/misc/tmuxp/default.nix+2−2

@@ -4,11 +4,11 @@ with python.pkgs;

55buildPythonApplication rec {

66 pname = "tmuxp";

7− version = "1.5.8";

7+ version = "1.6.2";

99 src = fetchPypi {

1010 inherit pname version;

11− sha256 = "09b403c9e1ef50695fab1e72376ff5674906b485fbcaad50c7cafec1ba775087";

11+ sha256 = "feec0be98a60c8cd8557bce388156202496dd9c8998e6913e595e939aeb0f735";

1212 };

1313

1414 postPatch = ''

pkgs/tools/misc/topgrade/default.nix+3−3

@@ -2,16 +2,16 @@

33rustPlatform.buildRustPackage rec {

44 pname = "topgrade";

5− version = "5.8.1";

5+ version = "5.9.1";

77 src = fetchFromGitHub {

88 owner = "r-darwish";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "0m3kqk0ghlpzysyql777jlk5c0nb36z44vabw6r0484fh5vncwrh";

11+ sha256 = "17vrnwx8qv2s2m9sj7h4gxxrnppqs9yzjzp8jsyfnpqd66h60wcg";

1212 };

1313

14− cargoSha256 = "1h5cyiyhpagdin9a8gfsccbl4jahw33nbkg5m74axyp4qrfc1mkz";

14+ cargoSha256 = "1k5lslin5qpmgz1zkz6xazjnapbr0i5r2ifzcz7bdbxwkaaliksd";

1515

1616 buildInputs = lib.optional stdenv.isDarwin Foundation;

1717

pkgs/tools/networking/dnsproxy/default.nix+2−2

@@ -2,13 +2,13 @@

33buildGoModule rec {

44 pname = "dnsproxy";

5− version = "0.32.6";

5+ version = "0.33.2";

77 src = fetchFromGitHub {

88 owner = "AdguardTeam";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "0wcn2wr521n2vcmpnwphgycq109251nkfdr0wzn7lk2zl5qx81ax";

11+ sha256 = "0x005lgncaf1fzs27fpcpf6dcncb7wia6fka64pmjxdsq7nmh1hh";

1212 };

1313

1414 vendorSha256 = null;

pkgs/tools/networking/frp/default.nix+2−2

@@ -2,13 +2,13 @@

33buildGoModule rec {

44 pname = "frp";

5− version = "0.34.1";

5+ version = "0.34.2";

77 src = fetchFromGitHub {

88 owner = "fatedier";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "1n1b7rr6njblz3rmsdl6xng4swlagg2z3jnik0gnajiq3w8ajwdj";

11+ sha256 = "0r7bp99kbp5nh5kqrxc4fb7pblpmcksbq67c6z922hvynpgnycj0";

1212 };

1313

1414 vendorSha256 = "18d9478ndzywwmh0jsxcb4i2rqyn3vzrgwflqrsv7krijalknsc9";

pkgs/tools/nix/nixos-generators/default.nix+2−2

@@ -2,12 +2,12 @@

33stdenv.mkDerivation rec {

44 pname = "nixos-generators";

5− version = "1.1.0";

5+ version = "1.2.0";

66 src = fetchFromGitHub {

77 owner = "nix-community";

88 repo = "nixos-generators";

99 rev = version;

10− sha256 = "04cfhj42c2m7lafir9ksh36n3nhx3x20lhamyk4zc5p3pm1xdbs6";

10+ sha256 = "1iwc39hzvzzyndxwbnl3fck7phxnjpnhy8zn4nyp8is1fiw0648v";

1111 };

1212 nativeBuildInputs = [ makeWrapper ];

1313 installFlags = [ "PREFIX=$(out)" ];

pkgs/tools/security/aws-okta/default.nix+2−2

@@ -2,7 +2,7 @@

33buildGoPackage rec {

44 pname = "aws-okta";

5− version = "1.0.6";

5+ version = "1.0.8";

77 goPackagePath = "github.com/segmentio/aws-okta";

@@ -10,7 +10,7 @@ buildGoPackage rec {

1010 owner = "segmentio";

1111 repo = "aws-okta";

1212 rev = "v${version}";

13− sha256 = "1nhcqj3vhdgk0a0smmyqphjw2slcvqbb8xd8bx506j8h8x84p6yf";

13+ sha256 = "14bg9rdfxkpw00phc8faz4ghiyb0j7a9qai74lidrzplzl139bzf";

1414 };

1515

1616 buildFlags = [ "--tags" "release" ];

pkgs/tools/security/doppler/default.nix+2−2

@@ -2,13 +2,13 @@

33buildGoModule rec {

44 pname = "doppler";

5− version = "3.16.0";

5+ version = "3.16.1";

77 src = fetchFromGitHub {

88 owner = "dopplerhq";

99 repo = "cli";

1010 rev = version;

11− sha256 = "1hypi62bzdpa55bd9z9lvisw7ybcn8jlk0kyck9h7wc2ll59jzwx";

11+ sha256 = "141ic9vgkqv3hdcpj1dlb4lawzd2rm7h2np21x28mmsd0hlg6v7y";

1212 };

1313

1414 vendorSha256 = "1s8zwjfk9kcddn8cywr7llh9v5m140kvmi5lmy2glvwh3rwccgxf";

pkgs/tools/system/ctop/default.nix+2−2

@@ -2,13 +2,13 @@

33buildGoModule rec {

44 pname = "ctop";

5− version = "0.7.4";

5+ version = "0.7.5";

77 src = fetchFromGitHub {

88 owner = "bcicen";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "0zslxd00pypn6ri7r420mqxjqy3i6qv944f7899saapsb2m08w7j";

11+ sha256 = "0mm1gapnz67mwc346jr530xwpiajq1b2f295s8gz5nrb2a23mqln";

1212 };

1313

1414 vendorSha256 = "0a5rwnf251jbp7jz2ln8z9hqp0112c6kx0y09nncvlcki35qq9sh";

pkgs/tools/text/amber/default.nix+3−3

@@ -4,16 +4,16 @@

55rustPlatform.buildRustPackage rec {

66 pname = "amber";

7− version = "0.5.4";

7+ version = "0.5.5";

99 src = fetchFromGitHub {

1010 owner = "dalance";

1111 repo = pname;

1212 rev = "v${version}";

13− sha256 = "0pqz3spb5lmrj7w8hynmah9nrcfjsb1s0bmrr0cng9a9jx8amwzn";

13+ sha256 = "083gpssnhjxp1gr5rn27k9j4pm42wqz76llrn5yh91rwcwvlg1l8";

1414 };

1515

16− cargoSha256 = "1ps70swh96xbfn4hng5krlmwvw2bwrl2liqvx9v9vy6pr86643s6";

16+ cargoSha256 = "199wfc98vq6vgrz8xqqh8lz4j3ig7w66mrk1am9x0viyhj92fvx0";

1717

1818 buildInputs = stdenv.lib.optional stdenv.isDarwin Security;

1919

pkgs/tools/text/asciigraph/default.nixnew file+22

@@ -0,0 +1,22 @@

1+{ lib, buildGoPackage, fetchFromGitHub }:

3+buildGoPackage rec {

4+ pname = "asciigraph";

5+ version = "0.5.1";

7+ goPackagePath = "github.com/guptarohit/asciigraph";

9+ src = fetchFromGitHub {

10+ owner = "guptarohit";

11+ repo = pname;

12+ rev = "v${version}";

13+ sha256 = "0aqf64b5d5lf9scvxdx5f3p0vvx5s59mrvr6hcjljg1prksah9ns";

14+ };

15+

16+ meta = with lib; {

17+ homepage = "https://github.com/guptarohit/asciigraph";

18+ description = "Lightweight ASCII line graph ╭┈╯ command line app";

19+ license = licenses.bsd3;

20+ maintainers = [ maintainers.mmahut ];

21+ };

22+}

pkgs/top-level/all-packages.nix+12

@@ -192,6 +192,8 @@ in

192192

193193 comedilib = callPackage ../development/libraries/comedilib { };

194194

195+ cp437 = callPackage ../tools/misc/cp437 { };

196+

195197 cpu-x = callPackage ../applications/misc/cpu-x { };

196198

197199 dhallToNix = callPackage ../build-support/dhall-to-nix.nix {

@@ -4139,6 +4141,8 @@ in

41394141

41404142 gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { };

41414143

4144+ gitlab-triage = callPackage ../applications/version-management/gitlab-triage { };

4145+

41424146 gitlab-workhorse = callPackage ../applications/version-management/gitlab/gitlab-workhorse { };

41434147

41444148 gitaly = callPackage ../applications/version-management/gitlab/gitaly { };

@@ -7571,6 +7575,8 @@ in

75717575

75727576 timetable = callPackage ../applications/office/timetable { };

75737577

7578+ timekeeper = callPackage ../applications/office/timekeeper { };

7579+

75747580 timezonemap = callPackage ../development/libraries/timezonemap { };

75757581

75767582 tzupdate = callPackage ../applications/misc/tzupdate { };

@@ -8648,6 +8654,8 @@ in

86488654

86498655 arachne-pnr = callPackage ../development/compilers/arachne-pnr { };

86508656

8657+ asciigraph = callPackage ../tools/text/asciigraph { };

8658+

86518659 asn1c = callPackage ../development/compilers/asn1c { };

86528660

86538661 aspectj = callPackage ../development/compilers/aspectj { };

@@ -15790,6 +15798,8 @@ in

1579015798

1579115799 spice-up = callPackage ../applications/office/spice-up { };

1579215800

15801+ spicetify-cli = callPackage ../applications/misc/spicetify-cli { };

15802+

1579315803 spirv-cross = callPackage ../tools/graphics/spirv-cross { };

1579415804

1579515805 sratom = callPackage ../development/libraries/audio/sratom { };

@@ -16864,6 +16874,8 @@ in

1686416874

1686516875 labelImg = callPackage ../applications/science/machine-learning/labelimg { };

1686616876

16877+ mackerel-agent = callPackage ../servers/monitoring/mackerel-agent { };

16878+

1686716879 mailman = callPackage ../servers/mail/mailman/wrapped.nix { };

1686816880

1686916881 mailman-rss = callPackage ../development/python-modules/mailman-rss { };

pkgs/top-level/dhall-packages.nix+5−13

@@ -8,16 +8,6 @@ let

88 let

99 callPackage = newScope self;

1010

11− prefer = version: path:

12− let

13− packages = callPackage path { };

14−

15− in

16− packages."${version}".overrideAttrs (_: {

17− passthru = packages;

18− }

19− );

20−

2111 buildDhallPackage =

2212 callPackage ../development/interpreters/dhall/build-dhall-package.nix { };

2313

@@ -34,14 +24,16 @@ let

3424 buildDhallDirectoryPackage

3525 ;

3626

27+ lib = import ../development/dhall-modules/lib.nix { inherit lib; };

28+

3729 dhall-kubernetes =

38− prefer "3.0.0" ../development/dhall-modules/dhall-kubernetes.nix;

30+ callPackage ../development/dhall-modules/dhall-kubernetes.nix { };

3931

4032 dhall-packages =

41− prefer "0.11.1" ../development/dhall-modules/dhall-packages.nix;

33+ callPackage ../development/dhall-modules/dhall-packages.nix { };

4234

4335 Prelude =

44− prefer "13.0.0" ../development/dhall-modules/Prelude.nix;

36+ callPackage ../development/dhall-modules/Prelude.nix { };

4537 };

4638

4739in

pkgs/top-level/python-packages.nix+8

@@ -7689,6 +7689,14 @@ in {

76897689 };

76907690 };

76917691

7692+ wxPython_4_1 = callPackage ../development/python-modules/wxPython/4.1.nix {

7693+ inherit (pkgs) pkgconfig;

7694+ wxGTK = pkgs.wxGTK31.override {

7695+ withGtk2 = false;

7696+ withWebKit = true;

7697+ };

7698+ };

7699+

76927700 wxPython = self.wxPython30;

76937701

76947702 x11_hash = callPackage ../development/python-modules/x11_hash { };