git.iko.soy/typeable/nixpkgs

on master help sign in

doc/contributing/reviewing-contributions.xml+2−2

@@ -7,8 +7,8 @@

77 <warning>

88 <para>

99 The following section is a draft, and the policy for reviewing is still being discussed in issues such as <link

10− xlink:href="https://github.com/NixOS/nixpkgs/issues/11166">#11166 </link> and <link

11− xlink:href="https://github.com/NixOS/nixpkgs/issues/20836">#20836 </link>.

10+ xlink:href="https://github.com/NixOS/nixpkgs/issues/11166">#11166 </link> and <link

11+ xlink:href="https://github.com/NixOS/nixpkgs/issues/20836">#20836 </link>.

1212 </para>

1313 </warning>

1414 <para>

doc/languages-frameworks/dotnet.section.md+2−2

@@ -64,9 +64,9 @@ $ dotnet --info

6464

6565The `dotnetCorePackages.sdk_X_Y` is preferred over the old dotnet-sdk as both major and minor version are very important for a dotnet environment. If a given minor version isn't present (or was changed), then this will likely break your ability to build a project.

6666

67−## dotnetCorePackages.sdk vs dotnetCorePackages.netcore vs dotnetCorePackages.aspnetcore

67+## dotnetCorePackages.sdk vs vs dotnetCorePackages.net vs dotnetCorePackages.netcore vs dotnetCorePackages.aspnetcore

6868

69−The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given version. The `netcore` and `aspnetcore` packages are meant to serve as minimal runtimes to deploy alongside already built applications.

69+The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given version. The `net`, `netcore` and `aspnetcore` packages are meant to serve as minimal runtimes to deploy alongside already built applications. For runtime versions >= .NET 5 `net` is used while `netcore` is used for older .NET Core runtime version.

7070

7171## Packaging a Dotnet Application

7272

doc/stdenv/meta.xml+1−2

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

189189 </term>

190190 <listitem>

191191 <para>

192− 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>. 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>.

192+ A list of the maintainers of this Nix expression. Maintainers are defined in <link 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 yourself to that list in a separate commit titled 'maintainers: add alice', and reference maintainers with <literal>maintainers = with lib.maintainers; [ alice bob ]</literal>.

194193 </para>

195194 </listitem>

196195 </varlistentry>

maintainers/maintainer-list.nix+18

@@ -2023,6 +2023,16 @@

20232023 githubId = 49904992;

20242024 name = "Dawid Sowa";

20252025 };

2026+ dbirks = {

2027+ email = "david@birks.dev";

2028+ github = "dbirks";

2029+ githubId = 7545665;

2030+ name = "David Birks";

2031+ keys = [{

2032+ longkeyid = "ed25519/0xBB999F83D9A19A36";

2033+ fingerprint = "B26F 9AD8 DA20 3392 EF87 C61A BB99 9F83 D9A1 9A36";

2034+ }];

2035+ };

20262036 dbohdan = {

20272037 email = "dbohdan@dbohdan.com";

20282038 github = "dbohdan";

@@ -3883,6 +3893,8 @@

38833893 };

38843894 jcumming = {

38853895 email = "jack@mudshark.org";

3896+ github = "jcumming";

3897+ githubId = 1982341;

38863898 name = "Jack Cummings";

38873899 };

38883900 jD91mZM2 = {

@@ -9970,4 +9982,10 @@

99709982 githubId = 19290397;

99719983 name = "Tunc Uzlu";

99729984 };

9985+ pulsation = {

9986+ name = "Philippe Sam-Long";

9987+ email = "1838397+pulsation@users.noreply.github.com";

9988+ github = "pulsation";

9989+ githubId = 1838397;

9990+ };

99739991}

nixos/doc/manual/configuration/gpu-accel.xml+38−38

@@ -65,16 +65,16 @@ Platform Vendor Advanced Micro Devices, Inc.</screen>

6565 <title>AMD</title>

6666

6767 <para>

68− Modern AMD <link

69− xlink:href="https://en.wikipedia.org/wiki/Graphics_Core_Next">Graphics

70− Core Next</link> (GCN) GPUs are supported through the

71− <package>rocm-opencl-icd</package> package. Adding this package to

72− <xref linkend="opt-hardware.opengl.extraPackages"/> enables OpenCL

73− support:

74−

75− <programlisting><xref linkend="opt-hardware.opengl.extraPackages"/> = [

76− rocm-opencl-icd

77−];</programlisting>

68+ Modern AMD <link

69+ xlink:href="https://en.wikipedia.org/wiki/Graphics_Core_Next">Graphics

70+ Core Next</link> (GCN) GPUs are supported through the

71+ <package>rocm-opencl-icd</package> package. Adding this package to

72+ <xref linkend="opt-hardware.opengl.extraPackages"/> enables OpenCL

73+ support:

74+

75+ <programlisting><xref linkend="opt-hardware.opengl.extraPackages"/> = [

76+ rocm-opencl-icd

77+ ];</programlisting>

7878 </para>

7979 </section>

8080

@@ -100,9 +100,9 @@ Platform Vendor Advanced Micro Devices, Inc.</screen>

100100 support. For example, for Gen8 and later GPUs, the following

101101 configuration can be used:

102102

103− <programlisting><xref linkend="opt-hardware.opengl.extraPackages"/> = [

104− intel-compute-runtime

105−];</programlisting>

103+ <programlisting><xref linkend="opt-hardware.opengl.extraPackages"/> = [

104+ intel-compute-runtime

105+ ];</programlisting>

106106

107107 </para>

108108 </section>

@@ -173,31 +173,31 @@ GPU1:

173173 <title>AMD</title>

174174

175175 <para>

176− Modern AMD <link

177− xlink:href="https://en.wikipedia.org/wiki/Graphics_Core_Next">Graphics

178− Core Next</link> (GCN) GPUs are supported through either radv, which is

179− part of <package>mesa</package>, or the <package>amdvlk</package> package.

180− Adding the <package>amdvlk</package> package to

181− <xref linkend="opt-hardware.opengl.extraPackages"/> makes both drivers

182− available for applications and lets them choose. A specific driver can

183− be forced as follows:

184−

185− <programlisting><xref linkend="opt-hardware.opengl.extraPackages"/> = [

186− pkgs.<package>amdvlk</package>

187−];

188−

189−# To enable Vulkan support for 32-bit applications, also add:

190−<xref linkend="opt-hardware.opengl.extraPackages32"/> = [

191− pkgs.driversi686Linux.<package>amdvlk</package>

192−];

193−

194−# For amdvlk

195−<xref linkend="opt-environment.variables"/>.VK_ICD_FILENAMES =

196− "/run/opengl-driver/share/vulkan/icd.d/amd_icd64.json";

197−# For radv

198−<xref linkend="opt-environment.variables"/>.VK_ICD_FILENAMES =

199− "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json";

200−</programlisting>

176+ Modern AMD <link

177+ xlink:href="https://en.wikipedia.org/wiki/Graphics_Core_Next">Graphics

178+ Core Next</link> (GCN) GPUs are supported through either radv, which is

179+ part of <package>mesa</package>, or the <package>amdvlk</package> package.

180+ Adding the <package>amdvlk</package> package to

181+ <xref linkend="opt-hardware.opengl.extraPackages"/> makes both drivers

182+ available for applications and lets them choose. A specific driver can

183+ be forced as follows:

184+

185+ <programlisting><xref linkend="opt-hardware.opengl.extraPackages"/> = [

186+ pkgs.<package>amdvlk</package>

187+ ];

188+

189+ # To enable Vulkan support for 32-bit applications, also add:

190+ <xref linkend="opt-hardware.opengl.extraPackages32"/> = [

191+ pkgs.driversi686Linux.<package>amdvlk</package>

192+ ];

193+

194+ # For amdvlk

195+ <xref linkend="opt-environment.variables"/>.VK_ICD_FILENAMES =

196+ "/run/opengl-driver/share/vulkan/icd.d/amd_icd64.json";

197+ # For radv

198+ <xref linkend="opt-environment.variables"/>.VK_ICD_FILENAMES =

199+ "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json";

200+ </programlisting>

201201 </para>

202202 </section>

203203 </section>

nixos/doc/manual/contributing-to-this-manual.xml+1−1

@@ -12,7 +12,7 @@ xlink:href="https://github.com/NixOS/nixpkgs">Nixpkgs</link> repository.

1212 You can quickly check your edits with the following:

1313 </para>

1414<screen>

15−<prompt>$ </prompt>cd /path/to/nixpkgs/nixos/doc/manual

15+<prompt>$ </prompt>cd /path/to/nixpkgs

1616<prompt>$ </prompt>nix-build nixos/release.nix -A manual.x86_64-linux

1717</screen>

1818 <para>

nixos/doc/manual/installation/installing-from-other-distro.xml+7

@@ -161,6 +161,13 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>

161161 existing systems without the help of a rescue USB drive or similar.

162162 </para>

163163 </warning>

164+ <note>

165+ <para>

166+ On some distributions there are separate PATHS for programs intended only for root.

167+ In order for the installation to succeed, you might have to use <literal>PATH="$PATH:/usr/sbin:/sbin"</literal>

168+ in the following command.

169+ </para>

170+ </note>

164171<screen><prompt>$ </prompt>sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt</screen>

165172 <para>

166173 Again, please refer to the <literal>nixos-install</literal> step in

nixos/doc/manual/release-notes/rl-2009.xml+35−25

@@ -234,7 +234,17 @@

234234 </listitem>

235235 </itemizedlist>

236236 </listitem>

237−

237+ <listitem>

238+ <para>

239+ Starting with this release, the hydra-build-result

240+ <literal>nixos-<replaceable>YY.MM</replaceable></literal>

241+ branches no longer exist in the <link

242+ xlink:href="https://github.com/nixos/nixpkgs-channels">deprecated

243+ nixpkgs-channels repository</link>. These branches are now in

244+ <link xlink:href="https://github.com/nixos/nixpkgs">the main nixpkgs

245+ repository</link>.

246+ </para>

247+ </listitem>

238248 </itemizedlist>

239249 </section>

240250

@@ -1593,30 +1603,30 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0";

15931603 <para>

15941604 Agda has been heavily reworked.

15951605 <itemizedlist>

1596− <listitem>

1597− <para>

1598− <literal>agda.mkDerivation</literal> has been heavily changed and

1599− is now located at <package>agdaPackages.mkDerivation</package>.

1600− </para>

1601− </listitem>

1602− <listitem>

1603− <para>

1604− New top-level packages <package>agda</package> and

1605− <literal>agda.withPackages</literal> have been added, the second

1606− of which sets up agda with access to chosen libraries.

1607− </para>

1608− </listitem>

1609− <listitem>

1610− <para>

1611− All agda libraries now live under

1612− <literal>agdaPackages</literal>.

1613− </para>

1614− </listitem>

1615− <listitem>

1616− <para>

1617− Many broken libraries have been removed.

1618− </para>

1619− </listitem>

1606+ <listitem>

1607+ <para>

1608+ <literal>agda.mkDerivation</literal> has been heavily changed and

1609+ is now located at <package>agdaPackages.mkDerivation</package>.

1610+ </para>

1611+ </listitem>

1612+ <listitem>

1613+ <para>

1614+ New top-level packages <package>agda</package> and

1615+ <literal>agda.withPackages</literal> have been added, the second

1616+ of which sets up agda with access to chosen libraries.

1617+ </para>

1618+ </listitem>

1619+ <listitem>

1620+ <para>

1621+ All agda libraries now live under

1622+ <literal>agdaPackages</literal>.

1623+ </para>

1624+ </listitem>

1625+ <listitem>

1626+ <para>

1627+ Many broken libraries have been removed.

1628+ </para>

1629+ </listitem>

16201630 </itemizedlist>

16211631 See the <link

16221632 xlink:href="https://nixos.org/nixpkgs/manual/#agda">new

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

@@ -163,6 +163,15 @@

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

164164 </para>

165165 </listitem>

166+ <listitem>

167+ <para>

168+ <link linkend="opt-boot.zfs.forceImportAll">boot.zfs.forceImportAll</link>

169+ previously did nothing, but has been fixed. However its default has been

170+ changed to <literal>false</literal> to preserve the existing default

171+ behaviour. If you have this explicitly set to <literal>true</literal>,

172+ please note that your non-root pools will now be forcibly imported.

173+ </para>

174+ </listitem>

166175 </itemizedlist>

167176 </section>

168177

nixos/doc/varlistentry-fixer.rb+37−37

@@ -15,8 +15,8 @@ require "rexml/document"

1515include REXML

1616

1717if ARGV.length < 1 then

18− $stderr.puts "Needs a filename."

19− exit 1

18+ $stderr.puts "Needs a filename."

19+ exit 1

2020end

2121

2222filename = ARGV.shift

@@ -51,17 +51,17 @@ $touched = false

5151# Generates: --optionnamevalue

5252# ^^ ^^

5353doc.elements.each("//varlistentry/term") do |term|

54− ["varname", "function", "option", "replaceable"].each do |prev_name|

55− term.elements.each(prev_name) do |el|

56− if el.next_element and

57− el.next_element.name == "replaceable" and

58− el.next_sibling_node.class == Element

59− then

60− $touched = true

61− term.insert_after(el, Text.new(" "))

62− end

63− end

64− end

54+ ["varname", "function", "option", "replaceable"].each do |prev_name|

55+ term.elements.each(prev_name) do |el|

56+ if el.next_element and

57+ el.next_element.name == "replaceable" and

58+ el.next_sibling_node.class == Element

59+ then

60+ $touched = true

61+ term.insert_after(el, Text.new(" "))

62+ end

63+ end

64+ end

6565end

6666

6767

@@ -75,17 +75,17 @@ end

7575# Generates: -Ipath

7676# ^^

7777doc.elements.each("//cmdsynopsis/arg") do |term|

78− ["option", "replaceable"].each do |prev_name|

79− term.elements.each(prev_name) do |el|

80− if el.next_element and

81− el.next_element.name == "replaceable" and

82− el.next_sibling_node.class == Element

83− then

84− $touched = true

85− term.insert_after(el, Text.new(" "))

86− end

87− end

88− end

78+ ["option", "replaceable"].each do |prev_name|

79+ term.elements.each(prev_name) do |el|

80+ if el.next_element and

81+ el.next_element.name == "replaceable" and

82+ el.next_sibling_node.class == Element

83+ then

84+ $touched = true

85+ term.insert_after(el, Text.new(" "))

86+ end

87+ end

88+ end

8989end

9090

9191# <cmdsynopsis>

@@ -104,21 +104,21 @@ end

104104# Generates: [{--profile-name | -p }name]

105105# ^^^^

106106doc.elements.each("//cmdsynopsis/arg") do |term|

107− ["group"].each do |prev_name|

108− term.elements.each(prev_name) do |el|

109− if el.next_element and

110− el.next_element.name == "replaceable" and

111− el.next_sibling_node.class == Element

112− then

113− $touched = true

114− term.insert_after(el, Text.new(" "))

115− end

116− end

117− end

107+ ["group"].each do |prev_name|

108+ term.elements.each(prev_name) do |el|

109+ if el.next_element and

110+ el.next_element.name == "replaceable" and

111+ el.next_sibling_node.class == Element

112+ then

113+ $touched = true

114+ term.insert_after(el, Text.new(" "))

115+ end

116+ end

117+ end

118118end

119119

120120

121121if $touched then

122− doc.context[:attribute_quote] = :quote

123− doc.write(output: File.open(filename, "w"))

122+ doc.context[:attribute_quote] = :quote

123+ doc.write(output: File.open(filename, "w"))

124124end

nixos/modules/config/pulseaudio.nix+1−1

@@ -263,7 +263,7 @@ in {

263263 (drv: drv.override { pulseaudio = overriddenPackage; })

264264 cfg.extraModules;

265265 modulePaths = builtins.map

266− (drv: "${drv}/lib/pulse-${overriddenPackage.version}/modules")

266+ (drv: "${drv}/${overriddenPackage.pulseDir}/modules")

267267 # User-provided extra modules take precedence

268268 (overriddenModules ++ [ overriddenPackage ]);

269269 in lib.concatStringsSep ":" modulePaths;

nixos/modules/hardware/acpilight.nix+1

@@ -19,6 +19,7 @@ in

1919 };

2020

2121 config = mkIf cfg.enable {

22+ environment.systemPackages = with pkgs; [ acpilight ];

2223 services.udev.packages = with pkgs; [ acpilight ];

2324 };

2425}

nixos/modules/services/hardware/bluetooth.nix+28−4

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

1515 hardware.bluetooth = {

1616 enable = mkEnableOption "support for Bluetooth";

1717

18+ hsphfpd.enable = mkEnableOption "support for hsphfpd[-prototype] implementation";

19+

1820 powerOnBoot = mkOption {

1921 type = types.bool;

2022 default = true;

@@ -72,7 +74,8 @@ in {

7274 };

7375 };

7476

75− environment.systemPackages = [ bluez-bluetooth ];

77+ environment.systemPackages = [ bluez-bluetooth ]

78+ ++ optionals cfg.hsphfpd.enable [ pkgs.hsphfpd ];

7679

7780 environment.etc."bluetooth/main.conf"= {

7881 source = pkgs.writeText "main.conf"

@@ -80,7 +83,8 @@ in {

8083 };

8184

8285 services.udev.packages = [ bluez-bluetooth ];

83− services.dbus.packages = [ bluez-bluetooth ];

86+ services.dbus.packages = [ bluez-bluetooth ]

87+ ++ optionals cfg.hsphfpd.enable [ pkgs.hsphfpd ];

8488 systemd.packages = [ bluez-bluetooth ];

8589

8690 systemd.services = {

@@ -90,11 +94,31 @@ in {

9094 # restarting can leave people without a mouse/keyboard

9195 unitConfig.X-RestartIfChanged = false;

9296 };

93− };

97+ }

98+ // (optionalAttrs cfg.hsphfpd.enable {

99+ hsphfpd = {

100+ after = [ "bluetooth.service" ];

101+ requires = [ "bluetooth.service" ];

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

103+

104+ description = "A prototype implementation used for connecting HSP/HFP Bluetooth devices";

105+ serviceConfig.ExecStart = "${pkgs.hsphfpd}/bin/hsphfpd.pl";

106+ };

107+ })

108+ ;

94109

95110 systemd.user.services = {

96111 obex.aliases = [ "dbus-org.bluez.obex.service" ];

97− };

112+ }

113+ // (optionalAttrs cfg.hsphfpd.enable {

114+ telephony_client = {

115+ wantedBy = [ "default.target"];

116+

117+ description = "telephony_client for hsphfpd";

118+ serviceConfig.ExecStart = "${pkgs.hsphfpd}/bin/telephony_client.pl";

119+ };

120+ })

121+ ;

98122

99123 };

100124

nixos/modules/tasks/filesystems/zfs.nix+2−5

@@ -175,14 +175,10 @@ in

175175

176176 forceImportAll = mkOption {

177177 type = types.bool;

178− default = true;

178+ default = false;

179179 description = ''

180180 Forcibly import all ZFS pool(s).

181181

182− This is enabled by default for backwards compatibility purposes, but it is highly

183− recommended to disable this option, as it bypasses some of the safeguards ZFS uses

184− to protect your ZFS pools.

185−

186182 If you set this option to <literal>false</literal> and NixOS subsequently fails to

187183 import your non-root ZFS pool(s), you should manually import each pool with

188184 "zpool import -f &lt;pool-name&gt;", and then reboot. You should only need to do

@@ -507,6 +503,7 @@ in

507503 Type = "oneshot";

508504 RemainAfterExit = true;

509505 };

506+ environment.ZFS_FORCE = optionalString cfgZfs.forceImportAll "-f";

510507 script = (importLib {

511508 # See comments at importLib definition.

512509 zpoolCmd="${packages.zfsUser}/sbin/zpool";

nixos/tests/postfix.nix+3−3

@@ -11,9 +11,9 @@ import ./make-test-python.nix {

1111 enable = true;

1212 enableSubmission = true;

1313 enableSubmissions = true;

14− sslCACert = certs.ca.cert;

15− sslCert = certs.${domain}.cert;

16− sslKey = certs.${domain}.key;

14+ tlsTrustedAuthorities = "${certs.ca.cert}";

15+ sslCert = "${certs.${domain}.cert}";

16+ sslKey = "${certs.${domain}.key}";

1717 submissionsOptions = {

1818 smtpd_sasl_auth_enable = "yes";

1919 smtpd_client_restrictions = "permit";

nixos/tests/zfs.nix+34−1

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

1818 maintainers = [ adisbladis ];

1919 };

2020

21− machine = { pkgs, ... }: {

21+ machine = { pkgs, lib, ... }: {

2222 virtualisation.emptyDiskImages = [ 4096 ];

2323 networking.hostId = "deadbeef";

2424 boot.kernelPackages = kernelPackage;

@@ -26,6 +26,24 @@ let

2626 boot.zfs.enableUnstable = enableUnstable;

2727

2828 environment.systemPackages = [ pkgs.parted ];

29+

30+ # Setup regular fileSystems machinery to ensure forceImportAll can be

31+ # tested via the regular service units.

32+ fileSystems = lib.mkVMOverride {

33+ "/forcepool" = {

34+ device = "forcepool";

35+ fsType = "zfs";

36+ options = [ "noauto" ];

37+ };

38+ };

39+

40+ # forcepool doesn't exist at first boot, and we need to manually test

41+ # the import after tweaking the hostId.

42+ systemd.services.zfs-import-forcepool.wantedBy = lib.mkVMOverride [];

43+ systemd.targets.zfs.wantedBy = lib.mkVMOverride [];

44+ boot.zfs.forceImportAll = true;

45+ # /dev/disk/by-id doesn't get populated in the NixOS test framework

46+ boot.zfs.devNodes = "/dev/disk/by-uuid";

2947 };

3048

3149 testScript = ''

@@ -57,6 +75,21 @@ let

5775 "zpool destroy rpool",

5876 "udevadm settle",

5977 )

78+

79+ with subtest("boot.zfs.forceImportAll works"):

80+ machine.succeed(

81+ "rm /etc/hostid",

82+ "zgenhostid deadcafe",

83+ "zpool create forcepool /dev/vdb1 -O mountpoint=legacy",

84+ )

85+ machine.shutdown()

86+ machine.start()

87+ machine.succeed("udevadm settle")

88+ machine.fail("zpool import forcepool")

89+ machine.succeed(

90+ "systemctl start zfs-import-forcepool.service",

91+ "mount -t zfs forcepool /tmp/mnt",

92+ )

6093 '' + extraTest;

6194

6295 };

pkgs/applications/audio/bambootracker/default.nix+3−4

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

33, fetchFromGitHub

44, qmake

55, qtbase

6−, qtmultimedia

76, qttools

87, alsaSupport ? stdenv.hostPlatform.isLinux

98, alsaLib

@@ -19,20 +18,20 @@ let

1918in

2019mkDerivation rec {

2120 pname = "bambootracker";

22− version = "0.4.4";

21+ version = "0.4.5";

2322

2423 src = fetchFromGitHub {

2524 owner = "rerrahkr";

2625 repo = "BambooTracker";

2726 rev = "v${version}";

28− sha256 = "0d0f4jqzknsiq725pvfndarfjg183f92rb0lim3wzshnsixr5vdc";

27+ sha256 = "0ibi0sykxf6cp5la2c4pgxf5gvy56yv259fbmdwdrdyv6vlddf42";

2928 };

3029

3130 sourceRoot = "source/BambooTracker";

3231

3332 nativeBuildInputs = [ qmake qttools ];

3433

35− buildInputs = [ qtbase qtmultimedia ]

34+ buildInputs = [ qtbase ]

3635 ++ optional alsaSupport alsaLib

3736 ++ optional pulseSupport libpulseaudio

3837 ++ optional jackSupport libjack2;

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

@@ -17,13 +17,13 @@

1717

1818stdenv.mkDerivation rec {

1919 pname = "musikcube";

20− version = "0.93.1";

20+ version = "0.94.0";

2121

2222 src = fetchFromGitHub {

2323 owner = "clangen";

2424 repo = pname;

2525 rev = version;

26− sha256 = "05qsxyr7x8l0vlmn4yjg4gglxvcw9raf6vfzvblsl2ngsdsrnizy";

26+ sha256 = "0hifyawsr38vsx12aqw38nms4kzbaghihib1r80x56f1jjsdhww0";

2727 };

2828

2929 nativeBuildInputs = [

pkgs/applications/audio/pulseaudio-modules-bt/default.nix+8−4

@@ -18,8 +18,12 @@

1818let

1919 pulseSources = runCommand "pulseaudio-sources" {} ''

2020 mkdir $out

21− tar -xf ${pulseaudio.src}

22− mv pulseaudio*/* $out/

21+ if [ -d ${pulseaudio.src} ]; then

22+ ln -s ${pulseaudio.src}/* $out/

23+ else

24+ tar -xf ${pulseaudio.src}

25+ mv pulseaudio*/* $out/

26+ fi

2327 '';

2428

2529in stdenv.mkDerivation rec {

@@ -61,7 +65,7 @@ in stdenv.mkDerivation rec {

6165

6266 # Pulseaudio version is detected with a -rebootstrapped suffix which build system assumptions

6367 substituteInPlace config.h.in --replace PulseAudio_VERSION ${pulseaudio.version}

64− substituteInPlace CMakeLists.txt --replace '${"\${PulseAudio_VERSION}"}' ${pulseaudio.version}

68+ substituteInPlace CMakeLists.txt --replace '${"\${PULSE_DIR}"}' ${pulseaudio.pulseDir}

6569

6670 # Fraunhofer recommends to enable afterburner but upstream has it set to false by default

6771 substituteInPlace src/modules/bluetooth/a2dp/a2dp_aac.c \

@@ -72,7 +76,7 @@ in stdenv.mkDerivation rec {

7276 for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do

7377 orig_rpath=$(patchelf --print-rpath "$so")

7478 patchelf \

75− --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \

79+ --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg}/lib:$out/${pulseaudio.pulseDir}/modules:$orig_rpath" \

7680 "$so"

7781 done

7882 '';

pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch+1−1

@@ -8,4 +8,4 @@ index 8d20dbf..63fe7ba 100644

88 module-bluetooth-policy

99- LIBRARY DESTINATION ${PulseAudio_modlibexecdir})

1010-

11−+ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pulse-${PulseAudio_VERSION}/modules/)

11++ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${PULSE_DIR}/modules/)

pkgs/applications/audio/vmpk/default.nix+10−7

@@ -1,19 +1,22 @@

1−{ stdenv, fetchurl, cmake, pkgconfig, alsaLib, libjack2, qt4 }:

1+{ mkDerivation, lib, fetchurl, cmake, pkg-config

2+, qttools, qtx11extras, drumstick

3+, docbook-xsl-nons

4+}:

25

3−stdenv.mkDerivation rec {

6+mkDerivation rec {

47 pname = "vmpk";

5− version = "0.5.1";

8+ version = "0.7.2";

69

710 src = fetchurl {

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

9− sha256 = "11fqnxgs9hr9255d93n7lazxzjwn8jpmn23nywdksh0pb1ffvfrc";

12+ sha256 = "5oLrjQADg59Mxpb0CNLQAE574IOSYLDLJNaQ/9q2cMQ=";

1013 };

1114

12− nativeBuildInputs = [ cmake pkgconfig ];

15+ nativeBuildInputs = [ cmake pkg-config qttools docbook-xsl-nons ];

1316

14− buildInputs = [ alsaLib libjack2 qt4 ];

17+ buildInputs = [ qtx11extras drumstick ];

1518

16− meta = with stdenv.lib; {

19+ meta = with lib; {

1720 description = "Virtual MIDI Piano Keyboard";

1821 homepage = "http://vmpk.sourceforge.net/";

1922 license = licenses.gpl3Plus;

pkgs/applications/blockchains/openethereum/default.nix+9−7

@@ -5,23 +5,23 @@

55, llvmPackages

66, openssl

77, pkg-config

8+, stdenv

89, systemd

10+, darwin

911}:

1012

1113rustPlatform.buildRustPackage rec {

1214 pname = "openethereum";

13− version = "3.0.1";

15+ version = "3.1.0";

1416

1517 src = fetchFromGitHub {

1618 owner = "openethereum";

1719 repo = "openethereum";

1820 rev = "v${version}";

19− sha256 = "08dkcrga1x18csh6pw6f54x5xwijppyjhg46cf4p452xc1l3a6ir";

21+ sha256 = "cs84Zz0nhagGDu5sDFTaFZF3SPEgJU8F4vGX7KLihOM=";

2022 };

2123

22− cargoSha256 = "1xliragihwjfc5qmfm0ng519bw8a28m1w1yqcl9mpk8zywiybaah";

23−

24− cargoPatches = [ ./lock.patch ];

24+ cargoSha256 = "6suNkHw1BbISb0MkYkUaD+mpUal+kn3y1SFVqzJFqJc=";

2525

2626 LIBCLANG_PATH = "${llvmPackages.libclang}/lib";

2727 nativeBuildInputs = [

@@ -31,7 +31,9 @@ rustPlatform.buildRustPackage rec {

3131 pkg-config

3232 ];

3333

34− buildInputs = [ openssl systemd ];

34+ buildInputs = [ openssl ]

35+ ++ stdenv.lib.optionals stdenv.isLinux [ systemd ]

36+ ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ];

3537

3638 cargoBuildFlags = [ "--features final" ];

3739

@@ -43,6 +45,6 @@ rustPlatform.buildRustPackage rec {

4345 homepage = "http://parity.io/ethereum";

4446 license = licenses.gpl3;

4547 maintainers = with maintainers; [ akru xrelkd ];

46− platforms = platforms.linux;

48+ platforms = stdenv.lib.platforms.unix;

4749 };

4850}

pkgs/applications/blockchains/openethereum/lock.patchdeleted−20

@@ -1,20 +0,0 @@

1−--- /nix/store/hv764a65zmfzw5scjhz5839agv10da6x-source/Cargo.lock 1969-12-31 16:00:01.000000000 -0800

2−+++ ./Cargo.lock 2020-07-31 21:30:31.146750066 -0700

3−@@ -3113,7 +3113,7 @@

4−

5− [[package]]

6− name = "openethereum"

7−-version = "3.0.0"

8−+version = "3.0.1"

9− dependencies = [

10− "ansi_term",

11− "atty",

12−@@ -3562,7 +3562,7 @@

13−

14− [[package]]

15− name = "parity-version"

16−-version = "3.0.0"

17−+version = "3.0.1"

18− dependencies = [

19− "parity-bytes",

20− "rlp",

pkgs/applications/blockchains/polkadot/default.nix+3−3

@@ -7,16 +7,16 @@

77}:

88rustPlatform.buildRustPackage rec {

99 pname = "polkadot";

10− version = "0.8.26";

10+ version = "0.8.26-1";

1111

1212 src = fetchFromGitHub {

1313 owner = "paritytech";

1414 repo = "polkadot";

1515 rev = "v${version}";

16− sha256 = "1bvma6k3gsjqh8w76k4kf52sjg8wxn1b7a409kmnmmvmd9j6z5ia";

16+ sha256 = "17ji1gjrx3gzw4msaz9kgvm132y14wgh8z183l3mfw1cj44a6kqk";

1717 };

1818

19− cargoSha256 = "0pacmmvvjgzmaxgg47qbfhqwl02jxj3i6vnmkjbj9npzqfmqf72d";

19+ cargoSha256 = "07zwlwx02xw1y20br2c4grwv7bprhynqy7gav4qh3vw117ijpiqk";

2020

2121 nativeBuildInputs = [ clang ];

2222

pkgs/applications/blockchains/turbo-geth.nixnew file+29

@@ -0,0 +1,29 @@

1+{ stdenv, buildGoModule, fetchFromGitHub }:

2+

3+buildGoModule rec {

4+ pname = "turbo-geth";

5+ version = "2020.11.01";

6+

7+ src = fetchFromGitHub {

8+ owner = "ledgerwatch";

9+ repo = pname;

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

11+ sha256 = "0hm8kqd0w231mlclsmsghf15r8pbrs5g064mkpx59qpqzk37lgss";

12+ };

13+

14+ vendorSha256 = "0b7ldrnwkz3r1d4fw95hvvpi3bz56d9v8p2mjzdvlpk5zhl2a37p";

15+ runVend = true;

16+

17+ subPackages = [

18+ "cmd/tg"

19+ "cmd/restapi"

20+ "cmd/rpcdaemon"

21+ ];

22+

23+ meta = with stdenv.lib; {

24+ homepage = "https://github.com/ledgerwatch/turbo-geth/";

25+ description = "Ethereum node and geth fork focused on scalability and modularity";

26+ license = with licenses; [ lgpl3 gpl3 ];

27+ maintainers = with maintainers; [ xwvvvvwx ];

28+ };

29+}

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

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

2424in

2525stdenv.mkDerivation rec {

2626 pname = "wasabiwallet";

27− version = "1.1.12";

27+ version = "1.1.12.2";

2828

2929 src = fetchurl {

3030 url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz";

31− sha256 = "0nfd0pwsgrkaxcxfs8wb3i8kslfcqnc91iahw3rmlcxdzb81kjs4";

31+ sha256 = "0nl7n24nsy3gyzrxa6llx81pvsjqcwi0a4qdv34dpcq483aclp2r";

3232 };

3333

3434 dontBuild = true;

pkgs/applications/editors/android-studio/default.nix+3−3

@@ -9,9 +9,9 @@ let

99 inherit buildFHSUserEnv;

1010 };

1111 stableVersion = {

12− version = "4.1.0.19"; # "Android Studio 4.1.0"

13− build = "201.6858069";

14− sha256Hash = "sha256-S5Uh/EpjE61l/z4UsPP7UEJ9Rk/hQidVVWX0bg/60gI=";

12+ version = "4.1.1.0"; # "Android Studio 4.1.1"

13+ build = "201.6953283";

14+ sha256Hash = "sha256-aAMhhJWcVFdvEZt8fI3tF12Eg3TzlU+kUFMNeCYN1os=";

1515 };

1616 betaVersion = {

1717 version = "4.1.0.18"; # "Android Studio 4.1 RC 3"

pkgs/applications/graphics/gimp/default.nix+4−2

@@ -163,8 +163,10 @@ in stdenv.mkDerivation rec {

163163 # The declarations for `gimp-with-plugins` wrapper,

164164 # used for determining plug-in installation paths

165165 majorVersion = "${lib.versions.major version}.0";

166− targetPluginDir = "lib/gimp/${majorVersion}/plug-ins";

167− targetScriptDir = "share/gimp/${majorVersion}/scripts";

166+ targetLibDir = "lib/gimp/${majorVersion}";

167+ targetDataDir = "share/gimp/${majorVersion}";

168+ targetPluginDir = "${targetLibDir}/plug-ins";

169+ targetScriptDir = "${targetDataDir}/scripts";

168170

169171 # probably its a good idea to use the same gtk in plugins ?

170172 gtk = gtk2;

pkgs/applications/graphics/gimp/plugins/default.nix+44−34

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

1−# install these packages into your profile. Then add

2−# ~/.nix-profile/gimp-version-plugins to your plugin list you can find at

3−# preferences -> Folders -> Plug-ins

4−# same applies for the scripts

1+# Use `gimp-with-plugins` package for GIMP with all plug-ins.

2+# If you just want a subset of plug-ins, you can specify them explicitly:

3+# `gimp-with-plugins.override { plugins = with gimpPlugins; [ gap ]; }`.

4+

5+{ config, lib, pkgs }:

56

6−{ config, pkgs, gimp }:

77let

8− inherit (pkgs) stdenv fetchurl pkgconfig intltool glib fetchFromGitHub;

9− inherit (gimp) targetPluginDir targetScriptDir;

8+ inherit (pkgs) stdenv fetchurl pkg-config intltool glib fetchFromGitHub;

9+in

1010

11− pluginDerivation = a: let

12− name = a.name or "${a.pname}-${a.version}";

11+lib.makeScope pkgs.newScope (self:

12+

13+let

14+ # Use GIMP from the scope.

15+ inherit (self) gimp;

16+

17+ pluginDerivation = attrs: let

18+ name = attrs.name or "${attrs.pname}-${attrs.version}";

1319 in stdenv.mkDerivation ({

1420 prePhases = "extraLib";

1521 extraLib = ''

1622 installScripts(){

17− mkdir -p $out/${targetScriptDir}/${name};

18− for p in "$@"; do cp "$p" -r $out/${targetScriptDir}/${name}; done

23+ mkdir -p $out/${gimp.targetScriptDir}/${name};

24+ for p in "$@"; do cp "$p" -r $out/${gimp.targetScriptDir}/${name}; done

1925 }

2026 installPlugins(){

21− mkdir -p $out/${targetPluginDir}/${name};

22− for p in "$@"; do cp "$p" -r $out/${targetPluginDir}/${name}; done

27+ mkdir -p $out/${gimp.targetPluginDir}/${name};

28+ for p in "$@"; do cp "$p" -r $out/${gimp.targetPluginDir}/${name}; done

2329 }

2430 '';

31+

32+ # Override installation paths.

33+ PKG_CONFIG_GIMP_2_0_GIMPLIBDIR = "${placeholder "out"}/${gimp.targetLibDir}";

34+ PKG_CONFIG_GIMP_2_0_GIMPDATADIR = "${placeholder "out"}/${gimp.targetDataDir}";

2535 }

26− // a

36+ // attrs

2737 // {

2838 name = "gimp-plugin-${name}";

29− buildInputs = [ gimp gimp.gtk glib ] ++ (a.buildInputs or []);

30− nativeBuildInputs = [ pkgconfig intltool ] ++ (a.nativeBuildInputs or []);

39+ buildInputs = [

40+ gimp

41+ gimp.gtk

42+ glib

43+ ] ++ (attrs.buildInputs or []);

44+

45+ nativeBuildInputs = [

46+ pkg-config

47+ intltool

48+ ] ++ (attrs.nativeBuildInputs or []);

3149 }

3250 );

3351

@@ -35,10 +53,11 @@ let

3553 phases = [ "extraLib" "installPhase" ];

3654 installPhase = "installScripts ${src}";

3755 } // attrs);

38−

3956in

57+{

58+ # Allow overriding GIMP package in the scope.

59+ inherit (pkgs) gimp;

4060

41−stdenv.lib.makeScope pkgs.newScope (self: with self; {

4261 gap = pluginDerivation {

4362 /* menu:

4463 Video

@@ -49,10 +68,6 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; {

4968 sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql";

5069 };

5170 NIX_LDFLAGS = "-lm";

52− patchPhase = ''

53− sed -e 's,^\(GIMP_PLUGIN_DIR=\).*,\1'"$out/${gimp.name}-plugins", \

54− -e 's,^\(GIMP_DATA_DIR=\).*,\1'"$out/share/${gimp.name}", -i configure

55− '';

5671 hardeningDisable = [ "format" ];

5772 meta = with stdenv.lib; {

5873 description = "The GIMP Animation Package";

@@ -99,7 +114,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; {

99114 version = "2.0.3";

100115 buildInputs = with pkgs; [ fftw ];

101116 nativeBuildInputs = with pkgs; [ autoreconfHook ];

102− makeFlags = [ "GIMP_LIBDIR=${placeholder "out"}/lib/gimp/2.0" ];

117+ makeFlags = [ "GIMP_LIBDIR=${placeholder "out"}/${gimp.targetLibDir}" ];

103118 src = fetchFromGitHub {

104119 owner = "bootchk";

105120 repo = "resynthesizer";

@@ -138,14 +153,14 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; {

138153 Layer/Liquid Rescale

139154 */

140155 pname = "lqr-plugin";

141− version = "0.7.1";

156+ version = "0.7.2";

142157 buildInputs = with pkgs; [ liblqr1 ];

143− src = fetchurl {

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=";

158+ src = fetchFromGitHub {

159+ owner = "carlobaldassi";

160+ repo = "gimp-lqr-plugin";

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

162+ sha256 = "81ajdZ2zQi/THxnBlSeT36tVTEzrS1YqLGpHMhFTKAo=";

146163 };

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

148− installPhase = "installPlugins src/gimp-lqr-plugin";

149164 };

150165

151166 gmic = pkgs.gmic-qt.override {

@@ -201,9 +216,4 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; {

201216 sha256 = "c14a8f4f709695ede3f77348728a25b3f3ded420da60f3f8de3944b7eae98a49";

202217 };

203218 };

204−

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

206−

207− resynthesizer2 = resynthesizer;

208−

209219})

pkgs/applications/graphics/gimp/wrapper.nix+1−1

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

22

33let

44allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues gimpPlugins);

5−selectedPlugins = if plugins == null then allPlugins else plugins;

5+selectedPlugins = lib.filter (pkg: pkg != gimpPlugins.gimp) (if plugins == null then allPlugins else plugins);

66extraArgs = map (x: x.wrapArgs or "") selectedPlugins;

77versionBranch = stdenv.lib.versions.majorMinor gimp.version;

88

pkgs/applications/graphics/lightburn/default.nix+2−2

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

66

77stdenv.mkDerivation rec {

88 pname = "lightburn";

9− version = "0.9.16";

9+ version = "0.9.18";

1010

1111 nativeBuildInputs = [

1212 p7zip

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

1616

1717 src = fetchurl {

1818 url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";

19− sha256 = "0xmpglfzff3jpxbr304czsa24fbp497b69yd8kjkjdp2cd0l70qc";

19+ sha256 = "0inl6zmc1726gmj85jbvq3ra4zphd2ikhrnqphgy2b0c72yh4pf7";

2020 };

2121

2222 buildInputs = [

pkgs/applications/graphics/pdfcpu/default.nix+3−3

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

22

33buildGoModule rec {

44 pname = "pdfcpu";

5− version = "0.3.6";

5+ version = "0.3.7";

66

77 src = fetchFromGitHub {

88 owner = "pdfcpu";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "0cbbbf93gxx768fs6pldy25xk46k7mc8k94r3f7cd83f1qd3s5zn";

11+ sha256 = "13b1ncpx189ca0h70j5cdp0jwlj95kasysryz1l6g13cwn9n6mii";

1212 };

1313

14− vendorSha256 = "1i0w4284icbl40yrjny9qd5iqrq18x63lrs7p1gz58nybc606azx";

14+ vendorSha256 = "11w9i1829hk1qb9w24dyxv1bi49358a274g60x11fp5x5cw7bqa7";

1515

1616 # No tests

1717 doCheck = false;

pkgs/applications/kde/k3b.nix−3

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

11{ mkDerivation, lib

22, extra-cmake-modules, kdoctools, makeWrapper, shared-mime-info

3−, qtwebkit

43, libkcddb, karchive, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui

54, flac, lame, libmad, libmpcdec, libvorbis

65, libsamplerate, libsndfile, taglib

@@ -17,8 +16,6 @@ mkDerivation {

1716 };

1817 nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];

1918 buildInputs = [

20− # qt

21− qtwebkit

2219 # kde

2320 libkcddb karchive kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui

2421 # formats

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

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

22

33stdenv.mkDerivation rec {

44 pname = "batsignal";

5− version = "1.1.3";

5+ version = "1.2.0";

66

77 src = fetchFromGitHub {

88 owner = "electrickite";

99 repo = "batsignal";

1010 rev = version;

11− sha256 = "12hj0j18db34x0xzgj6xmhvxm966d05z0rl3d9rlrcd2q96lilwf";

11+ sha256 = "0yc7xgwb3i4m8m9kg2xspqig3s2qgh2i9bkalvnkziayjb7y59qn";

1212 };

1313

1414 buildInputs = [ libnotify glib ];

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

@@ -19,7 +19,7 @@

1919}:

2020

2121let

22− version = "4.0.3";

22+ version = "4.0.4";

2323

2424 # electrum is not compatible with dnspython 2.0.0 yet

2525 # use the latest 1.x release instead

@@ -43,7 +43,7 @@ let

4343 owner = "spesmilo";

4444 repo = "electrum";

4545 rev = version;

46− sha256 = "1r40i0v7nm35m3pzbd0l5z4qphl13s31l9v5njmyvpfjirdmhjbv";

46+ sha256 = "0bzvyfqnd0r0l8syf95hr3nsh8rmmmcs74bvc7v04v0nm5m0fmf1";

4747

4848 extraPostFetch = ''

4949 mv $out ./all

@@ -58,7 +58,7 @@ py.pkgs.buildPythonApplication {

5858

5959 src = fetchurl {

6060 url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";

61− sha256 = "0q891fgzxvyzjxfczynx92hvclfs8i3nr5nr9sgbvz13hsg4s6lg";

61+ sha256 = "03dc5jwgp18sism5v4lbqfyn2zljchng8j2yi07yf8i01ivy2mmv";

6262 };

6363

6464 postUnpack = ''

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

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

22

33mkDerivation rec {

44 pname = "gpxsee";

5− version = "7.35";

5+ version = "7.36";

66

77 src = fetchFromGitHub {

88 owner = "tumic0";

99 repo = "GPXSee";

1010 rev = version;

11− sha256 = "1schmymcsd8s0r26qwyx56z107ql8pgrk1pnqy19mc7fyirdwmp5";

11+ sha256 = "18vsw6hw6kn5wmr4iarhx1v8q455j60fhf0hq69jkfyarl56b99j";

1212 };

1313

1414 patches = (substituteAll {

pkgs/applications/misc/gremlin-console/default.nix+2−2

@@ -2,10 +2,10 @@

22

33stdenv.mkDerivation rec {

44 pname = "gremlin-console";

5− version = "3.3.4";

5+ version = "3.4.8";

66 src = fetchzip {

77 url = "http://www-eu.apache.org/dist/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip";

8− sha256 = "14xr0yqklmm4jvj1hnkj89lj83zzs2l1375ni0jbf12gy31jlb2w";

8+ sha256 = "13ycr6ppyrz9rq7dasabjdk8lcsxdj3krb4j7d2jmbh2hij1rdvf";

99 };

1010

1111 buildInputs = [ makeWrapper ];

pkgs/applications/misc/joplin-desktop/default.nix+3−3

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

22

33let

44 pname = "joplin-desktop";

5− version = "1.2.6";

5+ version = "1.3.18";

66 name = "${pname}-${version}";

77

88 inherit (stdenv.hostPlatform) system;

@@ -16,8 +16,8 @@ let

1616 src = fetchurl {

1717 url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";

1818 sha256 = {

19− x86_64-linux = "14svzfhszb0pnsajbydsic0rdc64zp6csqjp6k2p2i20jf0c0im6";

20− x86_64-darwin = "1wdv8idnvn5567xdmsaa3f7skv48i9q6jqd4pgv8pz1zkhiqj0wi";

19+ x86_64-linux = "1dldy137ia8qxhf7d5xzq5slm12bhnmw4kx7fm37n1ajjdcn5sf7";

20+ x86_64-darwin = "0zm9vhxlfs1ldd8za4yha54psqwl0al4hzdfxjfp7ir98i9a4cj7";

2121 }.${system} or throwSystem;

2222 };

2323

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

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

55

66mkDerivation rec {

77 pname = "klayout";

8− version = "0.26.6";

8+ version = "0.26.8";

99

1010 src = fetchFromGitHub {

1111 owner = "KLayout";

1212 repo = "klayout";

1313 rev = "v${version}";

14− sha256 = "0z17pdjdc2r2m5yi5bfz504dzzs978z8p6bhlf08v2npvigp8vz1";

14+ sha256 = "0pkhvxcfk70dnmgczyyq585mxrfwqai44ikshs4c1imh92z25llq";

1515 };

1616

1717 postPatch = ''

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

@@ -17,10 +17,10 @@ let

1717

1818 pname = "simplenote";

1919

20− version = "1.21.1";

20+ version = "2.0.0";

2121

2222 sha256 = {

23− x86_64-linux = "00qx82d17yrrg2mxwhm40av0mpf5hy14j338i5ijhwp79yc8fk8x";

23+ x86_64-linux = "18alzsl1y9pvd5rs6gfnzv0py8ha0im33ylg7h6dicil5vii4l05";

2424 }.${system} or throwSystem;

2525

2626 meta = with stdenv.lib; {

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

@@ -20,14 +20,14 @@

2020}:

2121

2222mkDerivation rec {

23− version = "1.0.0";

23+ version = "1.0.1";

2424 pname = "syncthingtray";

2525

2626 src = fetchFromGitHub {

2727 owner = "Martchus";

2828 repo = "syncthingtray";

2929 rev = "v${version}";

30− sha256 = "sha256-mB23UOUrOfEmbFfVsAXyi3iod0NAfp/sl7Gkklqfmbo=";

30+ sha256 = "1dln5gh3p8nz9qmg07cw2s0lpzp3rfhyrwdhczj89g27bwk0lr4k";

3131 };

3232

3333 buildInputs = [ qtbase cpp-utilities qtutilities ]

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

@@ -2,12 +2,12 @@

22

33stdenv.mkDerivation rec {

44 pname = "wofi";

5− version = "1.2.1";

5+ version = "1.2.3";

66

77 src = fetchhg {

88 url = "https://hg.sr.ht/~scoopta/wofi";

99 rev = "v${version}";

10− sha256 = "0hx61br19dlmc3lay23ww3n9ry06m7b6xrkjx7sk4vrg1422iq99";

10+ sha256 = "0glpb2gf5n78s01z3rn614ak8ibxhfr824gy6xlljbxclgds264i";

1111 };

1212

1313 nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ];

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

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

22

33stdenv.mkDerivation rec {

44 pname = "xmenu";

5− version = "4.3.1";

5+ version = "4.4.1";

66

77 src = fetchFromGitHub {

88 owner = "phillbush";

99 repo = "xmenu";

1010 rev = "v${version}";

11− sha256 = "0m97w1nwak5drcxxlyisqb73fxkapy2rlph9mg531kbx3k2h30r1";

11+ sha256 = "1s70zvsaqnsjqs298vw3py0vcvia68xlks1wcz37pb88bwligz1x";

1212 };

1313

1414 buildInputs = [ imlib2 libX11 libXft libXinerama ];

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

1818 meta = with stdenv.lib; {

1919 description = "A menu utility for X";

2020 homepage = "https://github.com/phillbush/xmenu";

21− license = licenses.publicDomain;

21+ license = licenses.mit;

2222 maintainers = with maintainers; [ neonfuz ];

2323 platforms = platforms.all;

2424 };

pkgs/applications/misc/xmrig/proxy.nix+2−2

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

44

55stdenv.mkDerivation rec {

66 pname = "xmrig-proxy";

7− version = "6.3.0";

7+ version = "6.4.0";

88

99 src = fetchFromGitHub {

1010 owner = "xmrig";

1111 repo = "xmrig-proxy";

1212 rev = "v${version}";

13− sha256 = "1jh527bcl74018jd0qi32y4pcgmnbm21dyfhj4kg0j0ip15mx9j6";

13+ sha256 = "0bcbil9b5z95haqbmdqaslckvjflw7h77fqrcdxc6lrn29575nnf";

1414 };

1515

1616 nativeBuildInputs = [ cmake ];

pkgs/applications/misc/zathura/core/default.nix+2−2

@@ -10,11 +10,11 @@ with stdenv.lib;

1010

1111stdenv.mkDerivation rec {

1212 pname = "zathura";

13− version = "0.4.5";

13+ version = "0.4.7";

1414

1515 src = fetchurl {

1616 url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";

17− sha256 = "0b3nrcvykkpv2vm99kijnic2gpfzva520bsjlihaxandzfm9ff8c";

17+ sha256 = "1rx1fk9s556fk59lmqgvhwrmv71ashh89bx9adjq46wq5gzdn4p0";

1818 };

1919

2020 outputs = [ "bin" "man" "dev" "out" ];

pkgs/applications/misc/zathura/pdf-mupdf/default.nix+28−12

@@ -1,29 +1,45 @@

11{ stdenv, lib, meson, ninja, fetchurl, fetchpatch

2−, pkgconfig, zathura_core, cairo , gtk-mac-integration, girara, mupdf }:

2+, cairo

3+, girara

4+, gtk-mac-integration

5+, gumbo

6+, jbig2dec

7+, libjpeg

8+, mupdf

9+, openjpeg_2

10+, pkgconfig

11+, zathura_core

12+}:

313

414stdenv.mkDerivation rec {

5− version = "0.3.5";

15+ version = "0.3.6";

616 pname = "zathura-pdf-mupdf";

717

818 src = fetchurl {

919 url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";

10− sha256 = "1pjwsb7zwclxsvz229fl7y2saf1pv3ifwv3ay8viqxgrp9x3z9hq";

20+ sha256 = "1r3v37k9fl2rxipvacgxr36llywvy7n20a25h3ajlyk70697sa66";

1121 };

1222

13− patches = [

14− # compatibility with MuPDF 1.17

15− (fetchpatch {

16− url = "https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/commit/c7f341addb76d5e6fd8c24c666d8fe97c451a4cb.patch";

17− sha256 = "12rikx2j7dpngfma9x4i504w58a8xx3rc0gmyz183v19hn54c075";

18− })

19− ];

20−

2123 nativeBuildInputs = [ meson ninja pkgconfig ];

2224

2325 buildInputs = [

24− zathura_core girara mupdf cairo

26+ cairo

27+ girara

28+ gumbo

29+ jbig2dec

30+ libjpeg

31+ mupdf

32+ openjpeg_2

33+ zathura_core

2534 ] ++ lib.optional stdenv.isDarwin gtk-mac-integration;

2635

36+ mesonFlags = [

37+ "-Dlink-external=true"

38+ ];

39+

40+ # avoid: undefined symbol: gumbo_destroy_output

41+ NIX_LDFLAGS = [ "-lgumbo" ];

42+

2743 PKG_CONFIG_ZATHURA_PLUGINDIR= "lib/zathura";

2844

2945 meta = with lib; {

pkgs/applications/networking/browsers/brave/default.nix+2−2

@@ -86,11 +86,11 @@ in

8686

8787stdenv.mkDerivation rec {

8888 pname = "brave";

89− version = "1.15.76";

89+ version = "1.16.72";

9090

9191 src = fetchurl {

9292 url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";

93− sha256 = "3b054584c2272a9eeb9029f754cabaf4804db295fd0e6b84ead680b08af38d48";

93+ sha256 = "0gcmbqkrkdrjj0cc34bp56iqawhyfz46k7q8x82pw9b1rbjp1x6k";

9494 };

9595

9696 dontConfigure = true;

pkgs/applications/networking/browsers/chromium/upstream-info.json+12−12

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

11{

22 "stable": {

3− "version": "86.0.4240.183",

4− "sha256": "1g39i82js7fm4fqb8i66d6xs0kzqjxzi4vzvvwz5y9rkbikcc4ma",

5− "sha256bin64": "1r0dxqsx6j19hgwr3v2sdlb2vd7gb961c4wba4ymd8wy8j8pzly9",

3+ "version": "86.0.4240.198",

4+ "sha256": "0i3s1il0x5yi3528gdsg3bhnyhs2x24zh7p1nd5apv3va9g85ax0",

5+ "sha256bin64": "0qfhs73r6j0r3nyqbnscnf7h1rs1s68lfl5ndsyd32dmip7ma01x",

66 "deps": {

77 "gn": {

88 "version": "2020-08-07",

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

1313 }

1414 },

1515 "beta": {

16− "version": "87.0.4280.40",

17− "sha256": "07xh76fl257np68way6i5rf64qbvirkfddy7m5gvqb0fzcqd7dp3",

18− "sha256bin64": "1b2z0aqlh28pqrk6dmabxp1d4mvp9iyfmi4kqmns4cdpg0qgaf41",

16+ "version": "87.0.4280.47",

17+ "sha256": "0a3c4kz85857wrbcxqknbqmai250d36nq332l66a83r8sidhbxfq",

18+ "sha256bin64": "0bjls2airr4p448rx7im1a7gff68yfnfb5vymr4bin4kz0s38mpw",

1919 "deps": {

2020 "gn": {

2121 "version": "2020-09-09",

@@ -26,15 +26,15 @@

2626 }

2727 },

2828 "dev": {

29− "version": "88.0.4300.0",

30− "sha256": "00cfs2rp4h8ybn2snr1d8ygg635hx7q5gv2aqriy1j6f8a1pgh1b",

31− "sha256bin64": "110r1m14h91212nx6pfhn8wkics7wlwx1608l5cqsxxcpvpzl3pv",

29+ "version": "88.0.4315.5",

30+ "sha256": "0k6man2xq8vmnk73dqv3fcc9929agqq8j6s6nvc9z653q4jdphkw",

31+ "sha256bin64": "0m139w8lwaawridk8in24ss1g1i6ah5298xky226k3vhk5i4mn3j",

3232 "deps": {

3333 "gn": {

34− "version": "2020-09-09",

34+ "version": "2020-10-21",

3535 "url": "https://gn.googlesource.com/gn",

36− "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2",

37− "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk"

36+ "rev": "f5f465b52e5df6d4de9fbe67cc79f1914ba4dbfc",

37+ "sha256": "1xb31vsvg27ivvcdyiq93h8wj4d90qdrpagfh1dvm6xszkajsca1"

3838 }

3939 }

4040 }

pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix+6−6

@@ -91,19 +91,19 @@ let

9191 fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];

9292

9393 # Upstream source

94− version = "10.0.2";

94+ version = "10.0.4";

9595

9696 lang = "en-US";

9797

9898 srcs = {

9999 x86_64-linux = fetchurl {

100100 url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";

101− sha256 = "sha256-JBJDMC44VSh1ekXPxsVvFk5nOB8Ro4UGtD32pG1weP8=";

101+ sha256 = "sha256-2Ye1+mhFnkZnAYQXgKZ5YIOiIVaiunTCyCOM+ZExw2I==";

102102 };

103103

104104 i686-linux = fetchurl {

105105 url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";

106− sha256 = "sha256-EanW2Q8TtCPY5FSp8zfgBXMte9+RfKE24fu8ROtArK0=";

106+ sha256 = "sha256-B0WGkIt8KDtma/WGyenQ04ctKE7AantUtYnwsjAZZb0=";

107107 };

108108 };

109109in

@@ -231,9 +231,10 @@ stdenv.mkDerivation rec {

231231

232232 # Preload extensions by moving into the runtime instead of storing under the

233233 # user's profile directory.

234− mkdir -p "$TBB_IN_STORE/browser/extensions"

234+ # See https://support.mozilla.org/en-US/kb/deploying-firefox-with-extensions

235+ mkdir -p "$TBB_IN_STORE/distribution/extensions"

235236 mv "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/extensions/"* \

236− "$TBB_IN_STORE/browser/extensions"

237+ "$TBB_IN_STORE/distribution/extensions"

237238

238239 # Hard-code paths to geoip data files. TBB resolves the geoip files

239240 # relative to torrc-defaults_path but if we do not hard-code them

@@ -409,6 +410,5 @@ stdenv.mkDerivation rec {

409410 # the compound is "libre" in a strict sense (some components place certain

410411 # restrictions on redistribution), it's free enough for our purposes.

411412 license = licenses.free;

412− broken = true;

413413 };

414414}

pkgs/applications/networking/browsers/ungoogled-chromium/common.nix+6−1

@@ -344,7 +344,12 @@ let

344344 patchelf --set-rpath "${libGL}/lib:$origRpath" "$chromiumBinary"

345345 '';

346346

347− passthru.updateScript = ./update.py;

347+ passthru = {

348+ updateScript = ./update.py;

349+ chromiumDeps = {

350+ gn = gnChromium;

351+ };

352+ };

348353 };

349354

350355# Remove some extraAttrs we supplied to the base attributes already.

pkgs/applications/networking/browsers/ungoogled-chromium/default.nix+2−13

@@ -37,26 +37,15 @@ let

3737 inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs

3838 cupsSupport pulseSupport useOzone;

3939 inherit ungoogled;

40− # TODO: Remove after we can update gn for the stable channel (backward incompatible changes):

4140 gnChromium = gn.overrideAttrs (oldAttrs: {

42− version = "2020-07-20";

41+ inherit (upstream-info.deps.gn) version;

4342 src = fetchgit {

44− url = "https://gn.googlesource.com/gn";

45− rev = "3028c6a426a4aaf6da91c4ebafe716ae370225fe";

46− sha256 = "0h3wf4152zdvrbb0jbj49q6814lfl3rcy5mj8b2pl9s0ahvkbc6q";

43+ inherit (upstream-info.deps.gn) url rev sha256;

4744 };

4845 });

4946 } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "87") {

5047 useOzone = true; # YAY: https://chromium-review.googlesource.com/c/chromium/src/+/2382834 \o/

5148 useVaapi = !stdenv.isAarch64; # TODO: Might be best to not set use_vaapi anymore (default is fine)

52− gnChromium = gn.overrideAttrs (oldAttrs: {

53− version = "2020-08-17";

54− src = fetchgit {

55− url = "https://gn.googlesource.com/gn";

56− rev = "6f13aaac55a977e1948910942675c69f2b4f7a94";

57− sha256 = "01hpma1sllpdx09mvr4d6073sg6zmk6iv44kd3r28khymcj4s251";

58− };

59− });

6049 });

6150

6251 browser = callPackage ./browser.nix { inherit channel enableWideVine; };

pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix+3−3

@@ -1,6 +1,6 @@

11{

2− "86.0.4240.111" = {

3− rev = "86.0.4240.111-1";

4− sha256 = "0fkk0lxbvik8q8d5njxmwiam64qz5g74hlb56w24nh5mh1jm59a8";

2+ "86.0.4240.183" = {

3+ rev = "86.0.4240.183-1";

4+ sha256 = "0528l2wr5bpl1cwsxzl5zxz1gw91kffkh5j1kzmc5n7m4mscqxyc";

55 };

66}

pkgs/applications/networking/browsers/ungoogled-chromium/update.py+29−1

@@ -1,13 +1,15 @@

11#! /usr/bin/env nix-shell

2−#! nix-shell -i python -p python3 nix

2+#! nix-shell -i python -p python3 nix nix-prefetch-git

33

44import csv

55import json

6+import re

67import subprocess

78import sys

89

910from codecs import iterdecode

1011from collections import OrderedDict

12+from datetime import datetime

1113from os.path import abspath, dirname

1214from urllib.request import urlopen

1315

@@ -26,6 +28,30 @@ def nix_prefetch_url(url, algo='sha256'):

2628 out = subprocess.check_output(['nix-prefetch-url', '--type', algo, url])

2729 return out.decode('utf-8').rstrip()

2830

31+def nix_prefetch_git(url, rev):

32+ print(f'nix-prefetch-git {url} {rev}')

33+ out = subprocess.check_output(['nix-prefetch-git', '--quiet', '--url', url, '--rev', rev])

34+ return json.loads(out)

35+

36+def get_file_revision(revision, file_path):

37+ url = f'https://raw.githubusercontent.com/chromium/chromium/{revision}/{file_path}'

38+ with urlopen(url) as http_response:

39+ return http_response.read()

40+

41+def get_channel_dependencies(channel):

42+ deps = get_file_revision(channel['version'], 'DEPS')

43+ gn_pattern = b"'gn_version': 'git_revision:([0-9a-f]{40})'"

44+ gn_commit = re.search(gn_pattern, deps).group(1).decode()

45+ gn = nix_prefetch_git('https://gn.googlesource.com/gn', gn_commit)

46+ return {

47+ 'gn': {

48+ 'version': datetime.fromisoformat(gn['date']).date().isoformat(),

49+ 'url': gn['url'],

50+ 'rev': gn['rev'],

51+ 'sha256': gn['sha256']

52+ }

53+ }

54+

2955channels = {}

3056last_channels = load_json(JSON_PATH)

3157

@@ -58,6 +84,8 @@ with urlopen(HISTORY_URL) as resp:

5884 # the next one.

5985 continue

6086

87+ channel['deps'] = get_channel_dependencies(channel)

88+

6189 channels[channel_name] = channel

6290

6391with open(JSON_PATH, 'w') as out:

pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json+33−9

@@ -1,17 +1,41 @@

11{

22 "stable": {

3− "version": "86.0.4240.111",

4− "sha256": "05y7lwr89awkhvgmwkx3br9j4ap2aypg2wsc0nz8mi7kxc1dnyzj",

5− "sha256bin64": "10aqiiydw4i3jxnw8xxdgkgcqbfqc67n1fbrg40y54kg0v5dz8l6"

3+ "version": "86.0.4240.183",

4+ "sha256": "1g39i82js7fm4fqb8i66d6xs0kzqjxzi4vzvvwz5y9rkbikcc4ma",

5+ "sha256bin64": "1r0dxqsx6j19hgwr3v2sdlb2vd7gb961c4wba4ymd8wy8j8pzly9",

6+ "deps": {

7+ "gn": {

8+ "version": "2020-08-07",

9+ "url": "https://gn.googlesource.com/gn",

10+ "rev": "e327ffdc503815916db2543ec000226a8df45163",

11+ "sha256": "0kvlfj3www84zp1vmxh76x8fdjm9hyk8lkh2vdsidafpmm75fphr"

12+ }

13+ }

614 },

715 "beta": {

8− "version": "87.0.4280.27",

9− "sha256": "0w0asxj7jlsw69cssfia8km4q9cx1c2mliks2rmhf4jk0hsghasm",

10− "sha256bin64": "1lsx4mhy8nachfb8c9f3mrx5nqw2bi046dqirb4lnv7y80jjjs1k"

16+ "version": "87.0.4280.40",

17+ "sha256": "07xh76fl257np68way6i5rf64qbvirkfddy7m5gvqb0fzcqd7dp3",

18+ "sha256bin64": "1b2z0aqlh28pqrk6dmabxp1d4mvp9iyfmi4kqmns4cdpg0qgaf41",

19+ "deps": {

20+ "gn": {

21+ "version": "2020-09-09",

22+ "url": "https://gn.googlesource.com/gn",

23+ "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2",

24+ "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk"

25+ }

26+ }

1127 },

1228 "dev": {

13− "version": "88.0.4298.4",

14− "sha256": "0ka11gmpkyrmifajaxm66c16hrj3xakdvhjqg04slyp2sv0nlhrl",

15− "sha256bin64": "0768y31jqbl1znp7yp6mvl5j12xl1nwjkh2l8zdga81q0wz52hh6"

29+ "version": "88.0.4300.0",

30+ "sha256": "00cfs2rp4h8ybn2snr1d8ygg635hx7q5gv2aqriy1j6f8a1pgh1b",

31+ "sha256bin64": "110r1m14h91212nx6pfhn8wkics7wlwx1608l5cqsxxcpvpzl3pv",

32+ "deps": {

33+ "gn": {

34+ "version": "2020-09-09",

35+ "url": "https://gn.googlesource.com/gn",

36+ "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2",

37+ "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk"

38+ }

39+ }

1640 }

1741}

pkgs/applications/networking/cloudflared/default.nix+2−2

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

22

33buildGoModule rec {

44 pname = "cloudflared";

5− version = "2020.10.2";

5+ version = "2020.11.3";

66

77 src = fetchFromGitHub {

88 owner = "cloudflare";

99 repo = "cloudflared";

1010 rev = version;

11− sha256 = "0ppl74gb46r2x65hl7z1hjdqlr8la0pvhy8af8isk11sbxmprqjj";

11+ sha256 = "1v262wr1z0z3frb9avg6bgsv973cn6gmn4w6wghpcjwsm6jld575";

1212 };

1313

1414 vendorSha256 = null;

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

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

22

33buildGoModule rec {

44 pname = "k9s";

5− version = "0.23.3";

5+ version = "0.23.10";

66

77 src = fetchFromGitHub {

88 owner = "derailed";

99 repo = "k9s";

1010 rev = "v${version}";

11− sha256 = "0jdrjsv6miprw0bj964rgkbci4xdwfi536z3px93i2n9zrhhawpn";

11+ sha256 = "0nfgi67ja36mymhcyh4902680pkfnk4g8j8nbajksx9nfp53n91v";

1212 };

1313

1414 buildFlagsArray = ''

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

1818 -X github.com/derailed/k9s/cmd.commit=${src.rev}

1919 '';

2020

21− vendorSha256 = "105vmy8agl3ppgi28wg7djx0jrfam7nxfvvlps9ycgyrv2qpjh2n";

21+ vendorSha256 = "116aidry55917ays7rn5r5kj17nbgb9qi16bplml9kxfkjv072kz";

2222

2323 doCheck = false;

2424

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

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

22

33buildGoModule rec {

44 pname = "kubelogin";

5− version = "0.0.6";

5+ version = "0.0.7";

66

77 src = fetchFromGitHub {

88 owner = "Azure";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "18rkjdl8asr5c1kgdm2iqb5qwkfcrv2sk3nns3hhfqzs2v9mxmha";

11+ sha256 = "0jw8v6ff0iwkwxlhcr35cvhy4zg31dsm1s3q4fxgi901yj1wn6zy";

1212 };

1313

1414 vendorSha256 = "0al8y65xvnwl34jkpqyf6zwr21xn30zswknlym9nnn1n47fyayxb";

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

@@ -15,13 +15,13 @@ with lib;

1515

1616stdenv.mkDerivation rec {

1717 pname = "kubernetes";

18− version = "1.19.3";

18+ version = "1.19.4";

1919

2020 src = fetchFromGitHub {

2121 owner = "kubernetes";

2222 repo = "kubernetes";

2323 rev = "v${version}";

24− sha256 = "0fpkgrykkjmkrh327g6zf3r6s39bnv5w1wlqsvvzyp2zsswgw81v";

24+ sha256 = "05gisihrklkzsdsrrmvmqlfwfdx73jbwd5668n5wa5hp432qyvwi";

2525 };

2626

2727 nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];

pkgs/applications/networking/cluster/octant/default.nixnew file+49

@@ -0,0 +1,49 @@

1+{ stdenv, fetchurl }:

2+let

3+ version = "0.16.0";

4+

5+ system = stdenv.hostPlatform.system;

6+ suffix = {

7+ x86_64-linux = "Linux-64bit";

8+ aarch64-linux = "Linux-arm64";

9+ x86_64-darwin = "macOS-64bit";

10+ }."${system}" or (throw "Unsupported system: ${system}");

11+

12+ baseurl = "https://github.com/vmware-tanzu/octant/releases/download";

13+ fetchsrc = sha256: fetchurl {

14+ url = "${baseurl}/v${version}/octant_${version}_${suffix}.tar.gz";

15+ sha256 = sha256."${system}";

16+ };

17+in

18+stdenv.mkDerivation rec {

19+ pname = "octant";

20+ inherit version;

21+

22+ src = fetchsrc {

23+ x86_64-linux = "1i6i42hwxaczkfv8ldxn3wp6bslgwfkycvh88khfmapw2f5f9mhr";

24+ aarch64-linux = "1ka5vscyqxckxnhnymp06yi0r2ljw42q0g62yq7qv4safljd452p";

25+ x86_64-darwin = "1c50c2r2hq2fi8jcijq6vn336w96ar7b6qccv5w2240i0szsxxql";

26+ };

27+

28+ doBuild = false;

29+ doCheck = false;

30+

31+ installPhase = ''

32+ mkdir -p "$out/bin"

33+ mv octant $out/bin

34+ '';

35+

36+ meta = with stdenv.lib; {

37+ description = "Highly extensible platform for developers to better understand the complexity of Kubernetes clusters.";

38+ longDescription = ''

39+ Octant is a tool for developers to understand how applications run on a Kubernetes cluster.

40+ It aims to be part of the developer's toolkit for gaining insight and approaching complexity found in Kubernetes.

41+ Octant offers a combination of introspective tooling, cluster navigation, and object management along with a

42+ plugin system to further extend its capabilities.

43+ '';

44+ homepage = "https://octant.dev/";

45+ license = licenses.asl20;

46+ platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];

47+ maintainers = with maintainers; [ jk ];

48+ };

49+}

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

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

22

33buildGoModule rec {

44 pname = "tanka";

5− version = "0.11.1";

5+ version = "0.12.0";

66

77 src = fetchFromGitHub {

88 owner = "grafana";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "0hp10qgalglsdhh6z6v4azh2hsr89mdrv1g5lssfl5jyink409yd";

11+ sha256 = "1f67b236njz1qdxjyf2568vkigjmpylqlra29jlgm6vhd5qky7ia";

1212 };

1313

14− vendorSha256 = "15x8fqz2d2793ivgxpd9jyr34njzi1xpyxdlfyj1b01n2vr3xg4m";

14+ vendorSha256 = "1pr265g11lcviqw974lf05q52qrfpwnpn9a64q6088g0nfp4ly06";

1515

1616 doCheck = false;

1717

pkgs/applications/networking/cluster/terraform/default.nix+1−1

@@ -114,7 +114,7 @@ let

114114 (orig: { passthru = orig.passthru // passthru; })

115115 else

116116 lib.appendToName "with-plugins" (stdenv.mkDerivation {

117− inherit (terraform) name;

117+ inherit (terraform) name meta;

118118 buildInputs = [ makeWrapper ];

119119

120120 buildCommand = pluginDir + ''

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

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

22

33buildGoModule rec {

44 pname = "terragrunt";

5− version = "0.25.5";

5+ version = "0.26.2";

66

77 src = fetchFromGitHub {

88 owner = "gruntwork-io";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "19rsnhws4cvssxjmm22j746jck0wzrhwi24hnlwxkdaaw92yd36l";

11+ sha256 = "0bp43rsnkq2ysdl0v28i9agan738m0zk5yn8zza6js28sx0y7kns";

1212 };

1313

1414 vendorSha256 = "0l85jx02dj9qvxs8l0ln5fln8vssi0fisblm5i1scz9x4a1jqg9n";

pkgs/applications/networking/gns3/default.nix+3−3

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

11{ callPackage, libsForQt5 }:

22

33let

4− stableVersion = "2.2.15";

4+ stableVersion = "2.2.16";

55 previewVersion = stableVersion;

66 addVersion = args:

77 let version = if args.stable then stableVersion else previewVersion;

@@ -26,8 +26,8 @@ let

2626 };

2727 mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { };

2828 mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { };

29− guiSrcHash = "149yphmxc47bhc2f942lp4bx354qj3cyrpn10s1xabkn2hwrsm0d";

30− serverSrcHash = "03cfg48xzgz362ra5x853k8r244dgbrmszcprs2lg70i3m722345";

29+ guiSrcHash = "1kz5gr5rwqp1hn9fw17v6sy2467506zks574nqcd2vgxzhr6cy6x";

30+ serverSrcHash = "1r6qj1l8jgyjm67agn83zp9c2n7pgfzwyh8a5q314zxi18nm6rqp";

3131in {

3232 guiStable = mkGui {

3333 stable = true;

pkgs/applications/networking/instant-messengers/dino/default.nix+2−11

@@ -18,24 +18,15 @@

1818

1919stdenv.mkDerivation rec {

2020 pname = "dino";

21− version = "0.1.0";

21+ version = "0.2.0";

2222

2323 src = fetchFromGitHub {

2424 owner = "dino";

2525 repo = "dino";

2626 rev = "v${version}";

27− sha256 = "1k5cgj5n8s40i71wqdh6m1q0njl45ichfdbbywx9rga5hljz1c54";

27+ sha256 = "0wy1hb3kz3k4gqqwx308n37cqag2d017jwfz0b5s30nkx2pbwspw";

2828 };

2929

30− patches = [

31− (fetchpatch {

32− # Allow newer versions of libsignal-protocol-c

33− url = "https://github.com/dino/dino/commit/fbd70ceaac5ebbddfa21a580c61165bf5b861303.patch";

34− sha256 = "0ydpwsmwrzfsry89fsffkfalhki4n1dw99ixjvpiingdrhjmwyl2";

35− excludes = [ "plugins/signal-protocol/libsignal-protocol-c" ];

36− })

37− ];

38−

3930 nativeBuildInputs = [

4031 vala

4132 cmake

pkgs/applications/networking/instant-messengers/signal-cli/default.nix+2−2

@@ -2,12 +2,12 @@

22

33stdenv.mkDerivation rec {

44 pname = "signal-cli";

5− version = "0.6.10";

5+ version = "0.6.11";

66

77 # Building from source would be preferred, but is much more involved.

88 src = fetchurl {

99 url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";

10− sha256 = "0zglcx5ylqjc3hjkzi84mjhp9dchnnkv12qq75q5pqkx1w45rmim";

10+ sha256 = "0gkaxhx87yn8gmkqjdn78m1axfnfkw07sw9qsn7821966fd5l5ax";

1111 };

1212

1313 buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];

pkgs/applications/networking/instant-messengers/toxic/default.nix+2−2

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

44

55stdenv.mkDerivation rec {

66 pname = "toxic";

7− version = "0.8.3";

7+ version = "0.8.4";

88

99 src = fetchFromGitHub {

1010 owner = "Tox";

1111 repo = "toxic";

1212 rev = "v${version}";

13− sha256 = "09l2j3lwvrq7bf3051vjsnml9w63790ly3iylgf26gkrmld6k31w";

13+ sha256 = "0p1cmj1kyp506y5xm04mhlznhf5wcylvgsn6b307ms91vjqs3fg2";

1414 };

1515

1616 makeFlags = [ "PREFIX=$(out)"];

pkgs/applications/networking/irc/weechat/default.nix+2−2

@@ -27,12 +27,12 @@ let

2727 in

2828 assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;

2929 stdenv.mkDerivation rec {

30− version = "2.9";

30+ version = "3.0";

3131 pname = "weechat";

3232

3333 src = fetchurl {

3434 url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";

35− sha256 = "12h4m4ag8cdab7q6f5n357mfg0fdayab1gcikncjkkid3bjd4r4g";

35+ sha256 = "0ciddvyhyp38fnfsi1plj3z8d76f28lbzbxib2857vw7rzyqfcky";

3636 };

3737

3838 outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;

pkgs/applications/networking/nextcloud-client/default.nix+1−1

@@ -64,7 +64,7 @@ mkDerivation rec {

6464 description = "Nextcloud themed desktop client";

6565 homepage = "https://nextcloud.com";

6666 license = licenses.gpl2;

67− maintainers = with maintainers; [ caugner ma27 ];

67+ maintainers = with maintainers; [ caugner ];

6868 platforms = platforms.linux;

6969 };

7070}

pkgs/applications/networking/seaweedfs/default.nix+3−3

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

22

33buildGoModule rec {

44 pname = "seaweedfs";

5− version = "2.07";

5+ version = "2.09";

66

77 src = fetchFromGitHub {

88 owner = "chrislusf";

99 repo = "seaweedfs";

1010 rev = version;

11− sha256 = "0yrfpj4ph9f321vqfn1zadv44pqa3ivjq9rx6gsz9hlv50gfaqn1";

11+ sha256 = "0yy5a7hr597vj6xbn7f5vzqdwnr637b3l1d62cmk0h7qbmh4anji";

1212 };

1313

14− vendorSha256 = "1ysqagi4y25bi84h5fhkdimnsigy43klf6hrcqn7q75382fb4bzn";

14+ vendorSha256 = "1r7k0rzizs61r4gqqll7l2j7mdpi3w1ja6l4w6vxgzb45h2sjhi7";

1515

1616 subPackages = [ "weed" ];

1717

pkgs/applications/networking/sniffers/sngrep/default.nix+2−2

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

22

33stdenv.mkDerivation rec {

44 pname = "sngrep";

5− version = "1.4.7";

5+ version = "1.4.8";

66

77 src = fetchFromGitHub {

88 owner = "irontec";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "1dx5l48m4634y0zi6wjky412g80lfxqq1nphv7pi1kwvm1k5m5ri";

11+ sha256 = "0lnwsw9x4y4lr1yh749y24f71p5zsghwh5lp28zqfanw025mipf2";

1212 };

1313

1414 buildInputs = [

pkgs/applications/networking/sync/unison/4.08-compatibility.patchdeleted−52

@@ -1,52 +0,0 @@

1−From 29fa058c3127f3b47c347dcaa4a94f4c0e888308 Mon Sep 17 00:00:00 2001

2−From: Jaap Boender <jaapb@kerguelen.org>

3−Date: Thu, 21 Mar 2019 12:26:51 +0000

4−Subject: [PATCH] Compatibility with OCaml 4.08

5−

6−---

7− src/files.ml | 2 +-

8− src/recon.ml | 4 ++--

9− src/system/system_generic.ml | 2 +-

10− 3 files changed, 4 insertions(+), 4 deletions(-)

11−

12−diff --git a/src/files.ml b/src/files.ml

13−index ba42ad57..5babf21e 100644

14−--- a/src/files.ml

15−+++ b/src/files.ml

16−@@ -722,7 +722,7 @@ let get_files_in_directory dir =

17− with End_of_file ->

18− dirh.System.closedir ()

19− end;

20−- Sort.list (<) !files

21−+ List.sort String.compare !files

22−

23− let ls dir pattern =

24− Util.convertUnixErrorsToTransient

25−diff --git a/src/recon.ml b/src/recon.ml

26−index 5ed358d7..0df2cfe4 100644

27−--- a/src/recon.ml

28−+++ b/src/recon.ml

29−@@ -651,8 +651,8 @@ let rec reconcile

30−

31− (* Sorts the paths so that they will be displayed in order *)

32− let sortPaths pathUpdatesList =

33−- Sort.list

34−- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)

35−+ List.sort

36−+ Path.compare

37− pathUpdatesList

38−

39− let rec enterPath p1 p2 t =

40−diff --git a/src/system/system_generic.ml b/src/system/system_generic.ml

41−index ed8e18f3..0e28a781 100755

42−--- a/src/system/system_generic.ml

43−+++ b/src/system/system_generic.ml

44−@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen

45− let chmod = Unix.chmod

46− let chown = Unix.chown

47− let utimes = Unix.utimes

48−-let link = Unix.link

49−+let link s d = Unix.link s d

50− let openfile = Unix.openfile

51− let opendir f =

52− let h = Unix.opendir f in

pkgs/applications/networking/sync/unison/default.nix+2−8

@@ -6,12 +6,12 @@ let inherit (ocamlPackages) ocaml lablgtk; in

66stdenv.mkDerivation (rec {

77

88 pname = "unison";

9− version = "2.51.2";

9+ version = "2.51.3";

1010 src = fetchFromGitHub {

1111 owner = "bcpierce00";

1212 repo = "unison";

1313 rev = "v${version}";

14− sha256 = "1bykiyc0dc5pkw8x370qkg2kygq9pq7yqzsgczd3y13b6ivm4sdq";

14+ sha256 = "sha256-42hmdMwOYSWGiDCmhuqtpCWtvtyD2l+kA/bhHD/Qh5Y=";

1515 };

1616

1717 buildInputs = [ ocaml makeWrapper ncurses ];

@@ -27,12 +27,6 @@ stdenv.mkDerivation (rec {

2727 "UISTYLE=${if enableX11 then "gtk2" else "text"}"

2828 ] ++ stdenv.lib.optional (!ocaml.nativeCompilers) "NATIVE=false";

2929

30− patches = [

31− # NOTE: Only needed until Unison 2.51.3 is released!

32− ./4.08-compatibility.patch

33− ./lablgtk.patch

34− ];

35−

3630 preInstall = "mkdir -p $out/bin";

3731

3832 postInstall = if enableX11 then ''

pkgs/applications/networking/sync/unison/lablgtk.patchdeleted−31

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

1−From 2e7ea9481c6c3ff2ec513c39f73cfe15c0763c06 Mon Sep 17 00:00:00 2001

2−From: daviddavid <geiger.david68210@gmail.com>

3−Date: Mon, 26 Feb 2018 13:36:36 +0100

4−Subject: [PATCH] Fix for lablgtk >= 2.18.6

5−

6−---

7− src/uigtk2.ml | 4 ++--

8− 1 file changed, 2 insertions(+), 2 deletions(-)

9−

10−diff --git a/src/uigtk2.ml b/src/uigtk2.ml

11−index 2ba6d79..04c4da4 100644

12−--- a/src/uigtk2.ml

13−+++ b/src/uigtk2.ml

14−@@ -89,12 +89,12 @@ let fontItalic = lazy (Pango.Font.from_string "italic")

15− (* This does not work with the current version of Lablgtk, due to a bug

16− let icon =

17− GdkPixbuf.from_data ~width:48 ~height:48 ~has_alpha:true

18−- (Gpointer.region_of_string Pixmaps.icon_data)

19−+ (Gpointer.region_of_bytes Pixmaps.icon_data)

20− *)

21− let icon =

22− let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in

23− Gpointer.blit

24−- (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p);

25−+ (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p);

26− p

27−

28− let leftPtrWatch =

29−--

30−2.25.1

31−

pkgs/applications/radio/dump1090/default.nix+2−2

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

99

1010stdenv.mkDerivation rec {

1111 pname = "dump1090";

12− version = "3.8.1";

12+ version = "4.0";

1313

1414 src = fetchFromGitHub {

1515 owner = "flightaware";

1616 repo = pname;

1717 rev = "v${version}";

18− sha256 = "0xg8rzrxqklx1m9ncxsd96dlkbjcsxfi2mrb859v50f07xysdyd8";

18+ sha256 = "1zacsqaqsiapljhzw31dwc4nld2rp98jm3ivkyznrhzk9n156p42";

1919 };

2020

2121 nativeBuildInputs = [ pkgconfig ];

pkgs/applications/radio/gqrx/default.nix+2−2

@@ -9,13 +9,13 @@ assert pulseaudioSupport -> libpulseaudio != null;

99

1010mkDerivation rec {

1111 pname = "gqrx";

12− version = "2.13.2";

12+ version = "2.13.5";

1313

1414 src = fetchFromGitHub {

1515 owner = "csete";

1616 repo = "gqrx";

1717 rev = "v${version}";

18− sha256 = "1lcy9gqb1x9fwq550bywj7h66rdacq5893wsax1p7qvqa27d945b";

18+ sha256 = "168wjad5g0ka555hwsciwbj7fqx1c89q59hq1yxj8aiyp5kfcahx";

1919 };

2020

2121 nativeBuildInputs = [ cmake ];

pkgs/applications/radio/quisk/default.nixnew file+39

@@ -0,0 +1,39 @@

1+{ stdenv, python38Packages, fetchPypi

2+, fftw, alsaLib, pulseaudio, wxPython_4_0 }:

3+

4+python38Packages.buildPythonApplication rec {

5+ pname = "quisk";

6+ version = "4.1.72";

7+

8+ src = fetchPypi {

9+ inherit pname version;

10+ sha256 = "0qw00b9d0l3ysdrmd3nr5a2zlwg9ygdil7krnk2gjp5g8bb778k7";

11+ };

12+

13+ buildInputs = [ fftw alsaLib pulseaudio ];

14+

15+ propagatedBuildInputs = [ wxPython_4_0 ];

16+

17+ doCheck = false;

18+

19+ meta = with stdenv.lib; {

20+ description = "A SDR transceiver for radios that use the Hermes protocol";

21+ longDescription = ''

22+ QUISK is a Software Defined Radio (SDR) transceiver. You supply radio

23+ hardware that converts signals at the antenna to complex (I/Q) data at an

24+ intermediate frequency (IF). Data can come from a sound card, Ethernet or

25+ USB. Quisk then filters and demodulates the data and sends the audio to

26+ your speakers or headphones. For transmit, Quisk takes the microphone

27+ signal, converts it to I/Q data and sends it to the hardware.

28+

29+ Quisk can be used with SoftRock, Hermes Lite 2, HiQSDR, Odyssey and many

30+ radios that use the Hermes protocol. Quisk can connect to digital

31+ programs like Fldigi and WSJT-X. Quisk can be connected to other software

32+ like N1MM+ and software that uses Hamlib.

33+ '';

34+ license = licenses.gpl2Plus;

35+ homepage = "https://james.ahlstrom.name/quisk/";

36+ maintainers = with maintainers; [ pulsation ];

37+ platforms = platforms.linux;

38+ };

39+}

pkgs/applications/science/electronics/magic-vlsi/default.nix+14−8

@@ -1,16 +1,20 @@

1−{ stdenv, fetchurl, m4, tcsh, libX11, tcl, tk, cairo, ncurses, mesa_glu, python3 }:

1+{ stdenv, fetchurl

2+, m4, tcsh, libX11, tcl, tk

3+, cairo, ncurses, mesa_glu, python3

4+}:

25

3−stdenv.mkDerivation {

6+stdenv.mkDerivation rec {

47 pname = "magic-vlsi";

5− version = "8.3.5";

8+ version = "8.3.80";

69

710 src = fetchurl {

8− url = "http://opencircuitdesign.com/magic/archive/magic-8.3.5.tgz";

9− sha256 = "0wv4zmxlqjfaakgp802icn0cd9f8ylkz2sppix83axq8p5cg90yq";

11+ url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz";

12+ sha256 = "0a5x4sh5xsr79pqbgv6221jc4fvaxkg2pvrdhy1cs4bmsc1sbm9j";

1013 };

1114

1215 buildInputs = [ m4 tcsh libX11 tcl tk cairo ncurses mesa_glu ];

1316 nativeBuildInputs = [ python3 ];

17+ enableParallelBuilding = true;

1418

1519 configureFlags = [

1620 "--with-tcl=${tcl}"

@@ -22,6 +26,8 @@ stdenv.mkDerivation {

2226 patchShebangs scripts/*

2327 '';

2428

29+ NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration";

30+

2531 patches = [

2632 ./0001-strip-bin-prefix.patch

2733 ./0002-fix-format-security.patch

@@ -29,8 +35,8 @@ stdenv.mkDerivation {

2935

3036 meta = with stdenv.lib; {

3137 description = "VLSI layout tool written in Tcl";

32− homepage = "http://opencircuitdesign.com/magic/";

33− license = licenses.mit;

34− maintainers = [ maintainers.anna328p ];

38+ homepage = "http://opencircuitdesign.com/magic/";

39+ license = licenses.mit;

40+ maintainers = with maintainers; [ anna328p thoughtpolice ];

3541 };

3642}

pkgs/applications/science/electronics/verilog/default.nix+21−26

@@ -6,40 +6,35 @@

66

77let

88 iverilog-test = fetchFromGitHub {

9− owner = "steveicarus";

10− repo = "ivtest";

11− rev = "6882cb8ec08926c4e356c6092f0c5f8c23328d5c";

12− sha256 = "04sj5nqzwls1y760kgnd9c2whkcrr8kvj9lisd5rvk0w580kjb2x";

9+ owner = "steveicarus";

10+ repo = "ivtest";

11+ rev = "d4c80beb845cad92136c05074b3910b822a9315f";

12+ sha256 = "13cpnkki3xmhsh2v4bp2s35mhwknapcikdh85g4q6925ka940r45";

1313 };

1414in

1515stdenv.mkDerivation rec {

16− pname = "iverilog";

17− version = "unstable-2020-08-24";

16+ pname = "iverilog";

17+ version = "unstable-2020-10-24";

1818

1919 src = fetchFromGitHub {

20− owner = "steveicarus";

21− repo = pname;

22− rev = "d8556e4c86e1465b68bdc8d5ba2056ba95a42dfd";

23− sha256 = "sha256-sT9j/0Q2FD5MOGpH/quMGvAuM7t7QavRHKD9lX7Elfs=";

20+ owner = "steveicarus";

21+ repo = pname;

22+ rev = "d6e01d0c557253414109a4dde46b2966a5a3fb08";

23+ sha256 = "1bl75mbycj9zpjbpay8z12384yk9ih5q9agsrjh9pva0vv3h4y4y";

2424 };

2525

26− enableParallelBuilding = true;

27−

28− preConfigure = ''

29− chmod +x $PWD/autoconf.sh

30− $PWD/autoconf.sh

31− '';

32−

3326 nativeBuildInputs = [ autoconf gperf flex bison ];

34−

3527 buildInputs = [ readline ncurses bzip2 zlib ];

3628

37− # tests from .travis.yml

38− doCheck = true; # runs ``make check``

39− # most tests pass, but some that rely on exact text of floating-point numbers fail on aarch64.

29+ preConfigure = "bash $PWD/autoconf.sh";

30+

31+ enableParallelBuilding = true;

32+ doCheck = true;

33+

34+ # most tests pass, but some that rely on exact text of floating-point numbers

35+ # fail on aarch64.

4036 doInstallCheck = !stdenv.isAarch64;

4137 installCheckInputs = [ perl ];

42−

4338 installCheckPhase = ''

4439 # copy tests to allow writing results

4540 export TESTDIR=$(mktemp -d)

@@ -58,9 +53,9 @@ stdenv.mkDerivation rec {

5853

5954 meta = with stdenv.lib; {

6055 description = "Icarus Verilog compiler";

61− homepage = "http://iverilog.icarus.com/";

62− license = with licenses; [ gpl2Plus lgpl21Plus] ;

63− maintainers = with maintainers; [ winden ];

64− platforms = platforms.all;

56+ homepage = "http://iverilog.icarus.com/";

57+ license = with licenses; [ gpl2Plus lgpl21Plus ];

58+ maintainers = with maintainers; [ winden thoughtpolice ];

59+ platforms = platforms.all;

6560 };

6661}

pkgs/applications/science/logic/lean/default.nix+2−2

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

22

33stdenv.mkDerivation rec {

44 pname = "lean";

5− version = "3.21.0";

5+ version = "3.23.0";

66

77 src = fetchFromGitHub {

88 owner = "leanprover-community";

99 repo = "lean";

1010 rev = "v${version}";

11− sha256 = "1c7f2x6hdamjkr50761gcb5mg8hhlc75k1mf18vn1k9zsy1gxlgz";

11+ sha256 = "09mklc1p6ms1jayg2f89hqfmhca3h5744lli936l38ypn1d00sxx";

1212 };

1313

1414 nativeBuildInputs = [ cmake ];

pkgs/applications/version-management/git-and-tools/gh/default.nix+5−6

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

22

33buildGoModule rec {

44 pname = "gh";

5− version = "1.2.0";

5+ version = "1.2.1";

66

77 src = fetchFromGitHub {

88 owner = "cli";

99 repo = "cli";

1010 rev = "v${version}";

11− sha256 = "17hbgi1jh4p07r4p5mr7w7p01i6zzr28mn5i4jaki7p0jwfqbvvi";

11+ sha256 = "1lk3lhw598v966c553a3j0bp6vhf03xg7ggv827vzs1s8gnhxshz";

1212 };

1313

14− vendorSha256 = "0ybbwbw4vdsxdq4w75s1i0dqad844sfgs69b3vlscwfm6g3i9h51";

14+ vendorSha256 = "0bkd2ndda6w8pdpvw8hhlb60g8r6gbyymgfb69dvanw5i5shsp5q";

1515

1616 nativeBuildInputs = [ installShellFiles ];

1717

@@ -30,9 +30,8 @@ buildGoModule rec {

3030 done

3131 '';

3232

33− checkPhase = ''

34− make test

35− '';

33+ # fails with `unable to find git executable in PATH`

34+ doCheck = false;

3635

3736 meta = with lib; {

3837 description = "GitHub CLI tool";

pkgs/applications/version-management/pijul/default.nix+30−50

@@ -1,64 +1,44 @@

1−{ stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, nettle, clang, libclang, pkgconfig }:

2−

3−let

4− # nettle-sys=1.0.1 requires the des-compat.h header, but it was removed in

5− # nettle 3.5. See https://nest.pijul.com/pijul_org/pijul/discussions/416

6− # Remove with the next release

7− nettle_34 = nettle.overrideAttrs (_oldAttrs: rec {

8− version = "3.4.1";

9− src = fetchurl {

10− url = "mirror://gnu/nettle/nettle-${version}.tar.gz";

11− sha256 = "1bcji95n1iz9p9vsgdgr26v6s7zhpsxfbjjwpqcihpfd6lawyhgr";

12− };

13− });

14−in rustPlatform.buildRustPackage rec {

1+{ stdenv

2+, fetchCrate

3+, rustPlatform

4+, pkg-config

5+, clang

6+, libclang

7+, libsodium

8+, openssl

9+, xxHash

10+, zstd

11+, darwin

12+, gitImportSupport ? true

13+, libgit2 ? null

14+}:

15+

16+rustPlatform.buildRustPackage rec {

1517 pname = "pijul";

16− version = "0.12.0";

18+ version = "1.0.0-alpha";

1719

18− src = fetchurl {

19− url = "https://pijul.org/releases/${pname}-${version}.tar.gz";

20− sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q";

20+ src = fetchCrate {

21+ inherit version pname;

22+ sha256 = "0dnw2cxsxb20my81szyqjsmmnkakxawvsk6cnd1fi88k4lr0z2xh";

2123 };

2224

23− cargoSha256 = "0rf8qmgzgyl718yznbskzafyg963ygibjmqncd93zdandgl9nj5v";

24−

25− # N.B. The cargo depfile checker expects us to have unpacked the src tarball

26− # into the standard dirname "source".

27− cargoDepsHook = ''

28− ln -s ${pname}-${version} source

29− '';

30−

31− # TODO: Delete once pijul fixes upstream:

32− # https://nest.pijul.com/pijul_org/pijul/discussions/447

33− postPatch = ''

34− pushd ../${pname}-${version}-vendor.tar.gz/thrussh/

35− patch -p1 < ${./thrussh-build-fix.patch}

36− substituteInPlace .cargo-checksum.json --replace \

37− 9696ed2422a483cd8de48ac241178a0441be6636909c76174c536b8b1cba9d45 \

38− a199f2bba520d56e11607b77be4dde0cfae576c90badb9fbd39af4784e8120d1

39− popd

40− '';

41−

42− nativeBuildInputs = [ pkgconfig clang ];

43−

44− postInstall = ''

45− mkdir -p $out/share/{bash-completion/completions,zsh/site-functions,fish/vendor_completions.d}

46− $out/bin/pijul generate-completions --bash > $out/share/bash-completion/completions/pijul

47− $out/bin/pijul generate-completions --zsh > $out/share/zsh/site-functions/_pijul

48− $out/bin/pijul generate-completions --fish > $out/share/fish/vendor_completions.d/pijul.fish

49− '';

50−

51− LIBCLANG_PATH = libclang + "/lib";

25+ cargoSha256 = "130vryqs0g4a0328ivqafdylwqs64g4mp8vgmz6nz4c9l3h9wgcx";

5226

53− buildInputs = [ openssl libsodium nettle_34 libclang ] ++ stdenv.lib.optionals stdenv.isDarwin

54− (with darwin.apple_sdk.frameworks; [ CoreServices Security ]);

27+ cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git";

28+ LIBCLANG_PATH = "${libclang}/lib";

5529

5630 doCheck = false;

31+ nativeBuildInputs = [ pkg-config clang ];

32+ buildInputs = [ openssl libclang libsodium xxHash zstd ]

33+ ++ (stdenv.lib.optionals gitImportSupport [ libgit2 ])

34+ ++ (stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [

35+ CoreServices Security SystemConfiguration

36+ ]));

5737

5838 meta = with stdenv.lib; {

5939 description = "A distributed version control system";

6040 homepage = "https://pijul.org";

6141 license = with licenses; [ gpl2Plus ];

62− maintainers = [ maintainers.gal_bolle ];

42+ maintainers = with maintainers; [ gal_bolle dywedir ];

6343 };

6444}

pkgs/applications/version-management/pijul/thrussh-build-fix.patchdeleted−12

@@ -1,12 +0,0 @@

1−--- a/src/client/connection.rs 2020-02-04 12:48:43.845299096 +0100

2−+++ b/src/client/connection.rs 2020-02-04 12:50:00.140329310 +0100

3−@@ -546,8 +546,8 @@

4− &[msg::NEWKEYS],

5− &mut session.0.write_buffer,

6− );

7−- session.0.kex = Some(Kex::NewKeys(newkeys));

8− newkeys.sent = true;

9−+ session.0.kex = Some(Kex::NewKeys(newkeys));

10− }

11− Ok(())

12− }

pkgs/applications/video/makemkv/default.nix+23−6

@@ -1,23 +1,33 @@

1−{ stdenv, mkDerivation, fetchurl, autoPatchelfHook

2−, ffmpeg_3, openssl, qtbase, zlib, pkgconfig

1+{ stdenv

2+, mkDerivation

3+, fetchurl

4+, autoPatchelfHook

5+, pkg-config

6+, ffmpeg_3

7+, openssl

8+, qtbase

9+, zlib

10+

11+, withJava ? true

12+, jre_headless

313}:

414

515let

6− version = "1.15.2";

16+ version = "1.15.3";

717 # Using two URLs as the first one will break as soon as a new version is released

818 src_bin = fetchurl {

919 urls = [

1020 "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"

1121 "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"

1222 ];

13− sha256 = "1dbips0qllbwhak44c50nlwn8n3kx8i6773cal5zl3dv4v2nf6ql";

23+ hash = "sha256-Y23aetnwqLGaBIgJ/AP0oCrh8P5jpVrcMJgmc0Oe+i8=";

1424 };

1525 src_oss = fetchurl {

1626 urls = [

1727 "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"

1828 "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"

1929 ];

20− sha256 = "1wnhzlz5fw6qwh82hjcpimg60xb3a9a54zb6gcjhqr9zdly2zphy";

30+ hash = "sha256-Qruq9YKAaNF1pDtOhptP95UjFL2NA4EuROR4v6XZHEw=";

2131 };

2232in mkDerivation {

2333 pname = "makemkv";

@@ -27,10 +37,17 @@ in mkDerivation {

2737

2838 sourceRoot = "makemkv-oss-${version}";

2939

30− nativeBuildInputs = [ autoPatchelfHook pkgconfig ];

40+ nativeBuildInputs = [ autoPatchelfHook pkg-config ];

3141

3242 buildInputs = [ ffmpeg_3 openssl qtbase zlib ];

3343

44+ qtWrapperArgs =

45+ let

46+ binPath = stdenv.lib.makeBinPath [ jre_headless ];

47+ in stdenv.lib.optionals withJava [

48+ ''--prefix PATH : ${binPath}''

49+ ];

50+

3451 installPhase = ''

3552 runHook preInstall

3653

pkgs/applications/video/obs-studio/default.nix+20−2

@@ -32,6 +32,7 @@

3232, alsaLib

3333, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux

3434, libpulseaudio

35+, libcef

3536}:

3637

3738let

@@ -44,8 +45,9 @@ in mkDerivation rec {

4445 src = fetchFromGitHub {

4546 owner = "obsproject";

4647 repo = "obs-studio";

47− rev = version;

48− sha256 = "1d502f80whh686mvq0yn6zpa5nvmnlzxwp5sjz43vpbbvhpbrdqj";

48+ rev = "refs/tags/${version}";

49+ sha256 = "1bf56z2yb7gq1knqwcqj369c3wl9jr3wll5vlngmfy2gwqrczjmw";

50+ fetchSubmodules = true;

4951 };

5052

5153 nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ];

@@ -55,6 +57,7 @@ in mkDerivation rec {

5557 fdk_aac

5658 ffmpeg

5759 jansson

60+ libcef

5861 libjack2

5962 libv4l

6063 libxkbcommon

@@ -73,6 +76,18 @@ in mkDerivation rec {

7376 ++ optional alsaSupport alsaLib

7477 ++ optional pulseaudioSupport libpulseaudio;

7578

79+ # Copied from the obs-linuxbrowser

80+ postUnpack = ''

81+ mkdir -p cef/Release cef/Resources cef/libcef_dll_wrapper/

82+ for i in ${libcef}/share/cef/*; do

83+ cp -r $i cef/Release/

84+ cp -r $i cef/Resources/

85+ done

86+ cp -r ${libcef}/lib/libcef.so cef/Release/

87+ cp -r ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/

88+ cp -r ${libcef}/include cef/

89+ '';

90+

7691 # obs attempts to dlopen libobs-opengl, it fails unless we make sure

7792 # DL_OPENGL is an explicit path. Not sure if there's a better way

7893 # to handle this.

@@ -80,6 +95,9 @@ in mkDerivation rec {

8095 "-DCMAKE_CXX_FLAGS=-DDL_OPENGL=\\\"$(out)/lib/libobs-opengl.so\\\""

8196 "-DOBS_VERSION_OVERRIDE=${version}"

8297 "-Wno-dev" # kill dev warnings that are useless for packaging

98+ # Add support for browser source

99+ "-DBUILD_BROWSER=ON"

100+ "-DCEF_ROOT_DIR=../../cef"

83101 ];

84102

85103 postInstall = ''

pkgs/applications/video/obs-studio/linuxbrowser.nixdeleted−49

@@ -1,49 +0,0 @@

1−# We don't have a wrapper which can supply obs-studio plugins so you have to

2−# somewhat manually install this:

3−

4−# nix-env -f . -iA obs-linuxbrowser

5−# mkdir -p ~/.config/obs-studio/plugins

6−# ln -s ~/.nix-profile/share/obs/obs-plugins/obs-linuxbrowser ~/.config/obs-studio/plugins/

7−

8−{ stdenv, fetchFromGitHub, obs-studio, cmake, libcef }:

9−

10−stdenv.mkDerivation rec {

11− pname = "obs-linuxbrowser";

12− version = "0.6.1-6-gf86dba6";

13−

14− src = fetchFromGitHub {

15− owner = "bazukas";

16− repo = "obs-linuxbrowser";

17− rev = version;

18− sha256 = "08d7qz0721va88bcyia8p0ycw50f6x3yk97s3vzhsc9xpq691kpi";

19− };

20−

21− nativeBuildInputs = [ cmake ];

22− buildInputs = [ obs-studio ];

23− postUnpack = ''

24− mkdir -p cef/Release cef/Resources cef/libcef_dll_wrapper/

25− for i in ${libcef}/share/cef/*; do

26− ln -s $i cef/Release/

27− ln -s $i cef/Resources/

28− done

29− ln -s ${libcef}/lib/libcef.so cef/Release/

30− ln -s ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/

31− ln -s ${libcef}/include cef/

32− '';

33− cmakeFlags = [

34− "-DCEF_ROOT_DIR=../../cef"

35− "-DOBS_INCLUDE_SEARCH_DIR=${obs-studio}/include/obs"

36− ];

37− installPhase = ''

38− mkdir -p $out/share/obs/obs-plugins

39− cp -r build/obs-linuxbrowser $out/share/obs/obs-plugins/

40− '';

41−

42− meta = with stdenv.lib; {

43− description = "Browser source plugin for obs-studio based on Chromium Embedded Framework";

44− homepage = "https://github.com/bazukas/obs-linuxbrowser";

45− maintainers = with maintainers; [ puffnfresh ];

46− license = licenses.gpl2;

47− platforms = with platforms; linux;

48− };

49−}

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

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

22

33stdenv.mkDerivation rec {

44 pname = "gnome-shell-extension-clipboard-indicator";

5− version = "34";

5+ version = "37";

66

77 src = fetchFromGitHub {

88 owner = "Tudmotu";

99 repo = "gnome-shell-extension-clipboard-indicator";

1010 rev = "v${version}";

11− sha256 = "0i00psc1ky70zljd14jzr627y7nd8xwnwrh4xpajl1f6djabh12s";

11+ sha256 = "0npxhaam2ra2b9zh2gk2q0n5snlhx6glz86m3jf8hz037w920k41";

1212 };

1313

1414 uuid = "clipboard-indicator@tudmotu.com";

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

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

22

33stdenv.mkDerivation rec {

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

5− version = "9";

5+ version = "10";

66

77 src = fetchFromGitHub {

88 owner = "material-shell";

99 repo = "material-shell";

1010 rev = version;

11− sha256 = "154ids72hkkvibqpq3522wf6h9qw7zkjnf8dgz50vxbkiiy015xn";

11+ sha256 = "18d813n8s7ns8xp75zmlna7a8mi23rn9yqps51xvdd0sdgn72a1c";

1212 };

1313

1414 # This package has a Makefile, but it's used for building a zip for

pkgs/development/compilers/4th/default.nixnew file+39

@@ -0,0 +1,39 @@

1+{ stdenv, fetchurl }:

2+

3+stdenv.mkDerivation rec {

4+ pname = "4th";

5+ version = "3.62.5";

6+

7+ src = fetchurl {

8+ url = "https://sourceforge.net/projects/forth-4th/files/${pname}-${version}/${pname}-${version}-unix.tar.gz";

9+ sha256 = "sha256-+CL33Yz7CxdEpi1lPG7+kzV4rheJ7GCgiFCaOLyktPw=";

10+ };

11+

12+ dontConfigure = true;

13+

14+ makeFlags = [

15+ "-C sources"

16+ "CC=${stdenv.cc}/bin/cc"

17+ ];

18+

19+ preInstall = ''

20+ install -d ${placeholder "out"}/bin \

21+ ${placeholder "out"}/lib \

22+ ${placeholder "out"}/share/doc/${pname} \

23+ ${placeholder "out"}/share/man

24+ '';

25+

26+ installFlags = [

27+ "BINARIES=${placeholder "out"}/bin"

28+ "LIBRARIES=${placeholder "out"}/lib"

29+ "DOCDIR=${placeholder "out"}/share/doc"

30+ "MANDIR=${placeholder "out"}/share/man"

31+ ];

32+

33+ meta = with stdenv.lib; {

34+ description = "A portable Forth compiler";

35+ homepage = "https://thebeez.home.xs4all.nl/4tH/index.html";

36+ license = licenses.lgpl3;

37+ platforms = platforms.linux;

38+ };

39+}

pkgs/development/compilers/bluespec/default.nix+1−1

@@ -90,6 +90,6 @@ in stdenv.mkDerivation rec {

9090 platforms = [ "x86_64-linux" ];

9191 # darwin fails at https://github.com/B-Lang-org/bsc/pull/35#issuecomment-583731562

9292 # aarch64 fails, as GHC fails with "ghc: could not execute: opt"

93− maintainers = with stdenv.lib.maintainers; [ flokli thoughtpolice ];

93+ maintainers = with stdenv.lib.maintainers; [ jcumming thoughtpolice ];

9494 };

9595}

pkgs/development/compilers/compcert/default.nix−3

@@ -3,9 +3,6 @@

33, tools ? stdenv.cc

44}:

55

6−assert lib.versionAtLeast ocamlPackages.ocaml.version "4.02";

7−assert lib.versionAtLeast coq.coq-version "8.8.0";

8−

96let

107 ocaml-pkgs = with ocamlPackages; [ ocaml findlib menhir ];

118 ccomp-platform = if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux";

pkgs/development/compilers/dasm/default.nix+2−2

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

22

33stdenv.mkDerivation rec {

44 pname = "dasm";

5− version = "2.20.14";

5+ version = "2.20.14.1";

66

77 src = fetchFromGitHub {

88 owner = "dasm-assembler";

99 repo = "dasm";

1010 rev = version;

11− sha256 = "09hzw228j43a78624bmq9cam7y1fjs48d3hpjqh2gn8iwnyk0pnp";

11+ sha256 = "1bna0bj503xyn5inwzzsrsgi9qg8p20by4dfk7azj91ynw56pl41";

1212 };

1313

1414 configurePhase = false;

pkgs/development/compilers/dotnet/default.nix+22−4

@@ -105,12 +105,30 @@ rec {

105105

106106 # v5.0.0

107107

108+ aspnetcore_5_0 = buildAspNetCore {

109+ version = "5.0.0";

110+ sha512 = {

111+ x86_64-linux = "402046ee144915ef7d75a788cf19552eea56cf897681721b74bfc403fd366f71eb7e56f6b83ea299b6b812c6b87378c15e7bfe249415427dcd147dfeacd084d0";

112+ aarch64-linux = "13e174de1cf10135531468c2a76852de2c37253f4d8b487ff25d249c2d7a1c590475545ca246515338baff2950422ec6c5ffe2180e8327f25cb5f9fede696ccc";

113+ x86_64-darwin = "b47a9958f5412b22edb2cb47702ad442c389901ede3ca2a7f75d901f8ed608494431849f498c2191327065ff1db52a1658b1a8c0feb53aaec4c814fb0baf6818";

114+ };

115+ };

116+

117+ net_5_0 = buildNetCore {

118+ version = "5.0.0";

119+ sha512 = {

120+ x86_64-linux = "d4d67df5ff5f6dde0d865a6e87559955bd57429df396cf7d05fe77f09e6220c67dc5e66439b1801ca4d301a62f81f666122bf4b623b31a46b861677dcafc62a4";

121+ aarch64-linux = "c7a5ae2bd4e0edbd3b681c2997ebf1633bfa1cd30a4333cb63fc9945b4e7c9278282516fb5bc22c710ce6fb59dc2e28230c07b0e99826165fa148406ab8afb0f";

122+ x86_64-darwin = "eba97211e158a0c1c15b03a79b42027319d83456dc377a2513c32defb560cd43fcfa1e84154a43243b77ca6b454c4dbc32be4153f0ba9c954c7b1e69ab5d7c53";

123+ };

124+ };

125+

108126 sdk_5_0 = buildNetCoreSdk {

109− version = "5.0.100-rc.1.20452.10";

127+ version = "5.0.100";

110128 sha512 = {

111− x86_64-linux = "d7e709dacc4bb188c2380060d24bfb5b791240dc33af8499fb4a31e1885a9377dad1d1ebc76847432ea67d5e4ac832a31679dc293e09fa6dade28f5fbbe4db9b";

112− aarch64-linux = "2d04890c71e845d1eb08f5dfbbb9c93024d7a52fb1cc3fd50bd51bc6bd44e455c5c82abc8f04eef23bd012984ae5f86143c600ceb49c4c733935d95d5b68785f";

113− x86_64-darwin = "06bb40273071f3dd1e84ebf58abc7798795d5f1ac298f24bf7109d1597fd52ff31bcbf2b81f86d91d37ae293678d07f8da0469d7cbd318d19a8d718b6629dcac";

129+ x86_64-linux = "bec37bfb327c45cc01fd843ef93b22b556f753b04724bba501622df124e7e144c303a4d7e931b5dbadbd4f7b39e5adb8f601cb6293e317ad46d8fe7d52aa9a09";

130+ aarch64-linux = "5fceac0a9468097d66af25516da597eb4836b294ed1647ba272ade5c8faea2ed977a95d9ce720c44d71607fa3a0cf9de55afe0e66c0c89ab1cc6736945978204";

131+ x86_64-darwin = "69ccc7c686ac06f6c658d118f59cf1a0e7284b4570375dd88d3e3043098e311745922301f2650d159624d09c4d39a1f3cbdd5daee0e408eef915de839e3bce8f";

114132 };

115133 };

116134}

pkgs/development/compilers/go/1.14.nix+2−2

@@ -36,11 +36,11 @@ in

3636

3737stdenv.mkDerivation rec {

3838 pname = "go";

39− version = "1.14.11";

39+ version = "1.14.12";

4040

4141 src = fetchurl {

4242 url = "https://dl.google.com/go/go${version}.src.tar.gz";

43− sha256 = "05hgnyda5bpm29gnx1956syq54jmpk4k9cf976vypw8ckg9g6w8q";

43+ sha256 = "0wdr85l3rr6w50dmlbsib895gs9cc19z5piblp0v9slrsxx4nkxk";

4444 };

4545

4646 # perl is used for testing go vet

pkgs/development/compilers/go/1.15.nix+2−2

@@ -36,11 +36,11 @@ in

3636

3737stdenv.mkDerivation rec {

3838 pname = "go";

39− version = "1.15.4";

39+ version = "1.15.5";

4040

4141 src = fetchurl {

4242 url = "https://dl.google.com/go/go${version}.src.tar.gz";

43− sha256 = "0rr3gp99bmdzg381x5fdwa15brllihn57175l0c82sqqljlscg86";

43+ sha256 = "1wc43h3pmi92r6ypmh58vq13vm44rl1di09assz3xdwlry86n1y1";

4444 };

4545

4646 # perl is used for testing go vet

pkgs/development/compilers/nextpnr/default.nix+3−3

@@ -14,14 +14,14 @@ let

1414in

1515with stdenv; mkDerivation rec {

1616 pname = "nextpnr";

17− version = "2020.08.22";

17+ version = "2020.11.10";

1818

1919 srcs = [

2020 (fetchFromGitHub {

2121 owner = "YosysHQ";

2222 repo = "nextpnr";

23− rev = "c8ecb8341ca766e1e7565cc2b652b63eaba67508";

24− sha256 = "1cf9ad7w5x452qdc6m9c3in6v9yzip3n1as978lbdh76f5mc00fv";

23+ rev = "cf331ca2a7fa92d3414fabf003ce6fc7b515f76b";

24+ sha256 = "0ka8ncfq3v8v70m3gwb3nd2rb39sy4vz0lx9hi277cbdsprmf55j";

2525 name = "nextpnr";

2626 })

2727 (fetchFromGitHub {

pkgs/development/compilers/souffle/default.nix+2−2

@@ -10,13 +10,13 @@ let

1010in

1111stdenv.mkDerivation rec {

1212 pname = "souffle";

13− version = "2.0.1";

13+ version = "2.0.2";

1414

1515 src = fetchFromGitHub {

1616 owner = "souffle-lang";

1717 repo = "souffle";

1818 rev = version;

19− sha256 = "0f7jwmgv83m85lrb2qwvr4cfwzbqww7pik884xd2593fsfqhpnkn";

19+ sha256 = "1fa6yssgndrln8qbbw2j7j199glxp63irfrz1c2y424rq82mm2r5";

2020 };

2121

2222 nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ];

pkgs/development/compilers/yosys/default.nix+31−8

@@ -14,15 +14,32 @@

1414, zlib

1515}:

1616

17+# NOTE: as of late 2020, yosys has switched to an automation robot that

18+# automatically tags their repository Makefile with a new build number every

19+# day when changes are committed. please MAKE SURE that the version number in

20+# the 'version' field exactly matches the YOSYS_VER field in the Yosys

21+# makefile!

22+#

23+# if a change in yosys isn't yet available under a build number like this (i.e.

24+# it was very recently merged, within an hour), wait a few hours for the

25+# automation robot to tag the new version, like so:

26+#

27+# https://github.com/YosysHQ/yosys/commit/71ca9a825309635511b64b3ec40e5e5e9b6ad49b

28+#

29+# note that while most nix packages for "unstable versions" use a date-based

30+# version scheme, synchronizing the nix package version here with the unstable

31+# yosys version number helps users report better bugs upstream, and is

32+# ultimately less confusing than using dates.

33+

1734stdenv.mkDerivation rec {

1835 pname = "yosys";

19− version = "2020.10.20";

36+ version = "0.9+3675";

2037

2138 src = fetchFromGitHub {

2239 owner = "YosysHQ";

2340 repo = "yosys";

24− rev = "06347b119b08257eff37cdd10ed802e794c1a3cf";

25− sha256 = "07058r8095192gwkiy2yyvj9vxv09fcw9bqi2b39wn85lh5kx2k2";

41+ rev = "71ca9a825309635511b64b3ec40e5e5e9b6ad49b";

42+ sha256 = "03jlhfvm5rxx8yybf94nqd3ld2y6brp8r0k6gfi56chv3iqqavy3";

2643 };

2744

2845 enableParallelBuilding = true;

@@ -55,11 +72,17 @@ stdenv.mkDerivation rec {

5572 (cd misc && ${protobuf}/bin/protoc --cpp_out ../backends/protobuf/ ./yosys.proto)

5673

5774 if ! grep -q "ABCREV = ${shortAbcRev}" Makefile; then

58− echo "yosys isn't compatible with the provided abc (${shortAbcRev}), failing."

75+ echo "ERROR: yosys isn't compatible with the provided abc (${shortAbcRev}), failing."

76+ exit 1

77+ fi

78+

79+ if ! grep -q "YOSYS_VER := ${version}" Makefile; then

80+ echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (${version}), failing."

5981 exit 1

6082 fi

6183 '';

6284

85+ checkTarget = "test";

6386 doCheck = true;

6487 checkInputs = [ verilog ];

6588

@@ -68,10 +91,10 @@ stdenv.mkDerivation rec {

6891 # they just assume that 'yosys-abc' is available -- but it's not installed

6992 # when using ABCEXTERNAL

7093 #

71− # add a symlink to fake things so that both variants work the same way.

72− postInstall = ''

73− ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc

74− '';

94+ # add a symlink to fake things so that both variants work the same way. this

95+ # is also needed at build time for the test suite.

96+ postBuild = "ln -sfv ${abc-verifier}/bin/abc ./yosys-abc";

97+ postInstall = "ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc";

7598

7699 meta = with stdenv.lib; {

77100 description = "Open RTL synthesis framework and tools";

pkgs/development/haskell-modules/configuration-common.nix+3−3

@@ -1110,9 +1110,9 @@ self: super: {

11101110 })

11111111 (pkgs.fetchpatch {

11121112 # Relax dependency constraints,

1113− # upstream PR: https://github.com/james-preston/hail/pull/15

1114− url = "https://patch-diff.githubusercontent.com/raw/james-preston/hail/pull/15.patch";

1115− sha256 = "03kdvr8hxi6isb8yxp5rgcmz855n19m1yacn3d56a4i58j2mldjw";

1113+ # upstream PR: https://github.com/james-preston/hail/pull/16

1114+ url = "https://patch-diff.githubusercontent.com/raw/james-preston/hail/pull/16.patch";

1115+ sha256 = "0dpagpn654zjrlklihsg911lmxjj8msylbm3c68xa5aad1s9gcf7";

11161116 })

11171117 ];

11181118 });

pkgs/development/haskell-modules/configuration-hackage2nix.yaml−1

@@ -5717,7 +5717,6 @@ broken-packages:

57175717 - Haggressive

57185718 - hahp

57195719 - haiji

5720− - hail

57215720 - hailgun-send

57225721 - hairy

57235722 - hakaru

pkgs/development/interpreters/evcxr/default.nix+14−6

@@ -2,22 +2,30 @@

22

33rustPlatform.buildRustPackage rec {

44 pname = "evcxr";

5− version = "0.5.3";

5+ version = "0.6.0";

66

77 src = fetchFromGitHub {

88 owner = "google";

99 repo = "evcxr";

1010 rev = "v${version}";

11− sha256 = "144xqi19d2nj9qgmhpx6d1kfhx9vfkmk7rnq6nzybpx4mbbl3ki2";

11+ sha256 = "sha256-QpUhUE65/IuT/VenziPX6z+CbJswbPPIv/ZnTthZpEU=";

1212 };

1313

14− cargoSha256 = "07lzxh0wh6azrlzfaacg29zmkn8jdnkdqbwgd5ajy79y8nii3c7z";

14+ cargoSha256 = "sha256-iUzVd4XtD+41yTV/BmqWLenzAUNPfS7vIHm1KfuPe9A=";

15+

16+ RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";

1517

1618 nativeBuildInputs = [ pkgconfig makeWrapper cmake ];

1719 buildInputs = stdenv.lib.optional stdenv.isDarwin Security;

18− postInstall = ''

19− wrapProgram $out/bin/evcxr --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]}

20− wrapProgram $out/bin/evcxr_jupyter --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]}

20+ postInstall = let

21+ wrap = exe: ''

22+ wrapProgram $out/bin/${exe} \

23+ --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]} \

24+ --set-default RUST_SRC_PATH "$RUST_SRC_PATH"

25+ '';

26+ in ''

27+ ${wrap "evcxr"}

28+ ${wrap "evcxr_jupyter"}

2129 rm $out/bin/testing_runtime

2230 '';

2331

pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch+20−13

@@ -1,18 +1,18 @@

1−From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001

2−From: Frederik Rietdijk <fridh@fridh.nl>

3−Date: Mon, 28 Aug 2017 09:24:06 +0200

4−Subject: [PATCH] Don't use ldconfig

1+From 084c6dd6352077e64f10cf7aa168f95d800f3819 Mon Sep 17 00:00:00 2001

2+From: Jonathan Ringer <jonringer117@gmail.com>

3+Date: Mon, 9 Nov 2020 10:24:35 -0800

4+Subject: [PATCH] CPython: Don't use ldconfig

55

66---

7− Lib/ctypes/util.py | 70 ++----------------------------------------------------

8− 1 file changed, 2 insertions(+), 68 deletions(-)

7+ Lib/ctypes/util.py | 77 ++--------------------------------------------

8+ 1 file changed, 2 insertions(+), 75 deletions(-)

99

1010diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py

11−index 5e8b31a854..7b45ce6c15 100644

11+index 0c2510e..7fb98af 100644

1212--- a/Lib/ctypes/util.py

1313+++ b/Lib/ctypes/util.py

14−@@ -94,46 +94,7 @@ elif os.name == "posix":

15− import re, tempfile

14+@@ -100,53 +100,7 @@ elif os.name == "posix":

15+ return thefile.read(4) == elf_header

1616

1717 def _findLib_gcc(name):

1818- # Run GCC's linker with the -t (aka --trace) option and examine the

@@ -51,15 +51,22 @@ index 5e8b31a854..7b45ce6c15 100644

5151- # Raised if the file was already removed, which is the normal

5252- # behaviour of GCC if linking fails

5353- pass

54−- res = re.search(expr, trace)

54+- res = re.findall(expr, trace)

5555- if not res:

5656- return None

57−- return os.fsdecode(res.group(0))

57+-

58+- for file in res:

59+- # Check if the given file is an elf file: gcc can report

60+- # some files that are linker scripts and not actual

61+- # shared objects. See bpo-41976 for more details

62+- if not _is_elf(file):

63+- continue

64+- return os.fsdecode(file)

5865+ return None

5966

6067

6168 if sys.platform == "sunos5":

62−@@ -255,34 +216,7 @@ elif os.name == "posix":

69+@@ -268,34 +222,7 @@ elif os.name == "posix":

6370 else:

6471

6572 def _findSoname_ldconfig(name):

@@ -96,5 +103,5 @@ index 5e8b31a854..7b45ce6c15 100644

96103 def _findLib_ld(name):

97104 # See issue #9998 for why this is needed

98105--

99−2.15.0

106+2.28.0

100107

pkgs/development/interpreters/python/cpython/default.nix+3

@@ -14,6 +14,7 @@

1414, self

1515, configd

1616, autoreconfHook

17+, autoconf-archive

1718, python-setup-hook

1819, nukeReferences

1920# For the Python package set

@@ -67,6 +68,8 @@ let

6768

6869 nativeBuildInputs = optionals (!stdenv.isDarwin) [

6970 autoreconfHook

71+ ] ++ optionals (!stdenv.isDarwin && passthru.pythonAtLeast "3.10") [

72+ autoconf-archive # needed for AX_CHECK_COMPILE_FLAG

7073 ] ++ [

7174 nukeReferences

7275 ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

pkgs/development/interpreters/python/default.nix+2−2

@@ -122,9 +122,9 @@ in {

122122 major = "3";

123123 minor = "10";

124124 patch = "0";

125− suffix = "a1";

125+ suffix = "a2";

126126 };

127− sha256 = "0q59a99w1yad808mx4w6l0j7bk7dbd2kakngbk0w1h9z4dhr8wyv";

127+ sha256 = "0zl5h61s8n2w2v1n40af0mwaw7lqh5fl1ys7kyjgcph60vb9wzjr";

128128 inherit (darwin) configd;

129129 inherit passthruFun;

130130 };

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

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

22

33stdenv.mkDerivation rec {

44 pname = "armadillo";

5− version = "10.1.1";

5+ version = "10.1.2";

66

77 src = fetchurl {

88 url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";

9− sha256 = "13hwynp1dnk3flw8ly00wjj12x2wsvj2da39bzay8c08m3dj3q4m";

9+ sha256 = "0pb3ypdaiiw0895x1zzzjvkrfp39bsl3s4f6zb5bzv4wbjv7kvwn";

1010 };

1111

1212 nativeBuildInputs = [ cmake ];

pkgs/development/libraries/ayatana-ido/default.nix+2−2

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

55

66stdenv.mkDerivation rec {

77 pname = "ayatana-ido";

8− version = "0.8.0";

8+ version = "0.8.1";

99

1010 src = fetchFromGitHub {

1111 owner = "AyatanaIndicators";

1212 repo = pname;

1313 rev = version;

14− sha256 = "1jmdvvgrgicpnpnygc24qcisqb9y026541gb6lw6fwapvc9aj73p";

14+ sha256 = "1mcw6gmacrzx4cyg4223dpwcmj3qf8l30mxsg43292lajzwsm2hz";

1515 };

1616

1717 nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc vala gobject-introspection ];

pkgs/development/libraries/bobcat/default.nix+6−5

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

1−{ stdenv, fetchFromGitHub, icmake

1+{ stdenv, fetchFromGitLab, icmake

22, libmilter, libX11, openssl, readline

33, utillinux, yodl }:

44

55stdenv.mkDerivation rec {

66 pname = "bobcat";

7− version = "4.08.03";

7+ version = "5.05.00";

88

9− src = fetchFromGitHub {

10− sha256 = "163mdl8hxids7123bjxmqhcaqyc1dv7hv8k33s713ac6lzawarq2";

9+ src = fetchFromGitLab {

10+ sha256 = "sha256:14lvxzkxmkk54s97ah996m6s1wbw1g3iwawbhsf8qw7sf75vlp1h";

11+ domain = "gitlab.com";

1112 rev = version;

1213 repo = "bobcat";

1314 owner = "fbb-git";

@@ -36,7 +37,7 @@ stdenv.mkDerivation rec {

3637

3738 meta = with stdenv.lib; {

3839 description = "Brokken's Own Base Classes And Templates";

39− homepage = "https://fbb-git.github.io/bobcat/";

40+ homepage = "https://fbb-git.gitlab.io/bobcat/";

4041 license = licenses.gpl3;

4142 platforms = platforms.linux;

4243 };

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

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

22

33stdenv.mkDerivation rec {

44 pname = "catch2";

5− version = "2.13.2";

5+ version = "2.13.3";

66

77 src = fetchFromGitHub {

88 owner = "catchorg";

99 repo = "Catch2";

1010 rev = "v${version}";

11− sha256="100r0kmra8jmra2hv92lzvwcmphpaiccwvq3lpdsa5b7hailhach";

11+ sha256="0m7pwsam1nb93akgnf5fxi737pgbrbcj0y28bavhzcss7yrm4gys";

1212 };

1313

1414 nativeBuildInputs = [ cmake ];

pkgs/development/libraries/drumstick/default.nix+16−8

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

1−{ stdenv, fetchurl, alsaLib, cmake, docbook_xsl, docbook_xml_dtd_45, doxygen

2−, fluidsynth, pkgconfig, qtbase, qtsvg

1+{ stdenv, fetchurl

2+, cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, pkg-config, wrapQtAppsHook

3+, alsaLib, fluidsynth, qtbase, qtsvg, libpulseaudio

34}:

45

56stdenv.mkDerivation rec {

@@ -11,18 +12,25 @@ stdenv.mkDerivation rec {

1112 sha256 = "1n9wvg79yvkygrkc8xd8pgrd3d7hqmr7gh24dccf0px23lla9b3m";

1213 };

1314

15+ patches = [

16+ ./drumstick-fluidsynth.patch

17+ ./drumstick-plugins.patch

18+ ];

19+

20+ postPatch = ''

21+ substituteInPlace library/rt/backendmanager.cpp --subst-var out

22+ '';

23+

1424 outputs = [ "out" "dev" "man" ];

1525

1626 enableParallelBuilding = true;

1727

18− #Temporarily remove drumstick-piano; Gives segment fault. Submitted ticket

19− postInstall = ''

20− rm $out/bin/drumstick-vpiano

21− '';

28+ nativeBuildInputs = [

29+ cmake docbook_xml_dtd_45 docbook_xml_dtd_45 docbook_xsl doxygen pkg-config wrapQtAppsHook

30+ ];

2231

23− nativeBuildInputs = [ cmake pkgconfig docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_45 ];

2432 buildInputs = [

25− alsaLib doxygen fluidsynth qtbase qtsvg

33+ alsaLib fluidsynth libpulseaudio qtbase qtsvg

2634 ];

2735

2836 meta = with stdenv.lib; {

pkgs/development/libraries/drumstick/drumstick-fluidsynth.patchnew file+9

@@ -0,0 +1,9 @@

1+It works with fluidsynth 2.

2+

3+Backported from r400: https://sourceforge.net/p/drumstick/code/400/

4+

5+--- a/library/rt-backends/CMakeLists.txt

6++++ b/library/rt-backends/CMakeLists.txt

7+@@ -54,1 +54,1 @@ if (PKG_CONFIG_FOUND)

8+- pkg_check_modules(FLUIDSYNTH fluidsynth>=1.1.1 fluidsynth<=1.1.11)

9++ pkg_check_modules(FLUIDSYNTH fluidsynth>=1.1.1)

pkgs/development/libraries/drumstick/drumstick-plugins.patchnew file+12

@@ -0,0 +1,12 @@

1+Make it look for its plugin in its own installation directory.

2+

3+--- a/library/rt/backendmanager.cpp

4++++ b/library/rt/backendmanager.cpp

5+@@ -159,6 +159,7 @@ namespace rt {

6+ foreach(const QString& path, QCoreApplication::libraryPaths()) {

7+ d->appendDir( path + QDir::separator() + QSTR_DRUMSTICK, result );

8+ }

9++ d->appendDir( "@out@/lib/drumstick", result );

10+ return result;

11+ }

12+

pkgs/development/libraries/faudio/default.nix+3−3

@@ -4,16 +4,16 @@

44

55stdenv.mkDerivation rec {

66 pname = "faudio";

7− version = "20.10";

7+ version = "20.11";

88

99 src = fetchFromGitHub {

1010 owner = "FNA-XNA";

1111 repo = "FAudio";

1212 rev = version;

13− sha256 = "0f5b45zdsy3yv2jsdy5zsd6xcfk1z5w5vlyvnim3d4bn875sp370";

13+ sha256 = "0mc8dkdmvkaq418vwn6y9d7fbcdp47djc38rly7b4zarl8hwmc4q";

1414 };

1515

16− nativeBuildInputs = [cmake];

16+ nativeBuildInputs = [cmake];

1717

1818 buildInputs = [ SDL2 ];

1919

pkgs/development/libraries/fmt/default.nix+67−51

@@ -1,60 +1,76 @@

11{ stdenv, fetchFromGitHub, fetchpatch, cmake, enableShared ? true }:

22

3−stdenv.mkDerivation rec {

4− pname = "fmt";

5− version = "6.2.1";

3+let

4+ generic = { version, sha256, patches ? [ ] }:

5+ stdenv.mkDerivation {

6+ pname = "fmt";

7+ inherit version;

68

7− outputs = [ "out" "dev" ];

9+ outputs = [ "out" "dev" ];

810

9− src = fetchFromGitHub {

10− owner = "fmtlib";

11− repo = "fmt";

12− rev = version;

11+ src = fetchFromGitHub {

12+ owner = "fmtlib";

13+ repo = "fmt";

14+ rev = version;

15+ inherit sha256;

16+ };

17+

18+ inherit patches;

19+

20+ nativeBuildInputs = [ cmake ];

21+

22+ cmakeFlags = [

23+ "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}"

24+ "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests

25+ ];

26+

27+ doCheck = true;

28+

29+ meta = with stdenv.lib; {

30+ description = "Small, safe and fast formatting library";

31+ longDescription = ''

32+ fmt (formerly cppformat) is an open-source formatting library. It can be

33+ used as a fast and safe alternative to printf and IOStreams.

34+ '';

35+ homepage = "http://fmtlib.net/";

36+ downloadPage = "https://github.com/fmtlib/fmt/";

37+ maintainers = [ maintainers.jdehaas ];

38+ license = licenses.bsd2;

39+ platforms = platforms.all;

40+ };

41+ };

42+in

43+{

44+ fmt_6 = generic {

45+ version = "6.2.1";

1346 sha256 = "1i6nfxazq4d05r3sxyc3ziwkqq7s8rdbv9p16afv66aqmsbqqqic";

47+

48+ patches = [

49+ # Fix BC break breaking Kodi

50+ # https://github.com/xbmc/xbmc/issues/17629

51+ # https://github.com/fmtlib/fmt/issues/1620

52+ (fetchpatch {

53+ url = "https://github.com/fmtlib/fmt/commit/7d01859ef16e6b65bc023ad8bebfedecb088bf81.patch";

54+ sha256 = "0v8hm5958ih1bmnjr16fsbcmdnq4ykyf6b0hg6dxd5hxd126vnxx";

55+ })

56+

57+ # Fix paths in pkg-config file

58+ # https://github.com/fmtlib/fmt/pull/1657

59+ (fetchpatch {

60+ url = "https://github.com/fmtlib/fmt/commit/78f041ab5b40a1145ba686aeb8013e8788b08cd2.patch";

61+ sha256 = "1hqp96zl9l3qyvsm7pxl6ah8c26z035q2mz2pqhqa0wvzd1klcc6";

62+ })

63+

64+ # Fix cmake config paths.

65+ (fetchpatch {

66+ url = "https://github.com/fmtlib/fmt/pull/1702.patch";

67+ sha256 = "18cadqi7nac37ymaz3ykxjqs46rvki396g6qkqwp4k00cmic23y3";

68+ })

69+ ];

1470 };

1571

16− patches = [

17− # Fix BC break breaking Kodi

18− # https://github.com/xbmc/xbmc/issues/17629

19− # https://github.com/fmtlib/fmt/issues/1620

20− (fetchpatch {

21− url = "https://github.com/fmtlib/fmt/commit/7d01859ef16e6b65bc023ad8bebfedecb088bf81.patch";

22− sha256 = "0v8hm5958ih1bmnjr16fsbcmdnq4ykyf6b0hg6dxd5hxd126vnxx";

23− })

24−

25− # Fix paths in pkg-config file

26− # https://github.com/fmtlib/fmt/pull/1657

27− (fetchpatch {

28− url = "https://github.com/fmtlib/fmt/commit/78f041ab5b40a1145ba686aeb8013e8788b08cd2.patch";

29− sha256 = "1hqp96zl9l3qyvsm7pxl6ah8c26z035q2mz2pqhqa0wvzd1klcc6";

30− })

31−

32− # Fix cmake config paths.

33− (fetchpatch {

34− url = "https://github.com/fmtlib/fmt/pull/1702.patch";

35− sha256 = "18cadqi7nac37ymaz3ykxjqs46rvki396g6qkqwp4k00cmic23y3";

36− })

37− ];

38−

39− nativeBuildInputs = [ cmake ];

40−

41− cmakeFlags = [

42− "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}"

43− "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests

44− ];

45−

46− doCheck = true;

47−

48− meta = with stdenv.lib; {

49− description = "Small, safe and fast formatting library";

50− longDescription = ''

51− fmt (formerly cppformat) is an open-source formatting library. It can be

52− used as a fast and safe alternative to printf and IOStreams.

53− '';

54− homepage = "http://fmtlib.net/";

55− downloadPage = "https://github.com/fmtlib/fmt/";

56− maintainers = [ maintainers.jdehaas ];

57− license = licenses.bsd2;

58− platforms = platforms.all;

72+ fmt_7 = generic {

73+ version = "7.0.3";

74+ sha256 = "17q2fdzakk5p0s3fx3724gs5k2b5ylp8f1d6j2m3wgvlfldx9k9a";

5975 };

6076}

pkgs/development/libraries/google-cloud-cpp/default.nix+1−1

@@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {

5757 license = with licenses; [ asl20 ];

5858 homepage = "https://github.com/googleapis/google-cloud-cpp";

5959 description = "C++ Idiomatic Clients for Google Cloud Platform services";

60− maintainers = with maintainers; [ andir flokli ];

60+ maintainers = with maintainers; [ andir ];

6161 broken = true; # Broken on Hydra since 2020-05-19

6262 };

6363}

pkgs/development/libraries/gstreamer/bad/default.nix+7−1

@@ -116,16 +116,18 @@ in stdenv.mkDerivation rec {

116116 meson

117117 ninja

118118 pkgconfig

119+ orc # for orcc

119120 python3

120121 gettext

121122 gobject-introspection

122123 ] ++ optionals stdenv.isLinux [

123− wayland-protocols

124+ wayland # for wayland-scanner

124125 ];

125126

126127 buildInputs = [

127128 gst-plugins-base

128129 orc

130+ gobject-introspection

129131 faad2

130132 libass

131133 libkate

@@ -179,6 +181,7 @@ in stdenv.mkDerivation rec {

179181 ] ++ optionals stdenv.isLinux [

180182 bluez

181183 wayland

184+ wayland-protocols

182185 ] ++ optionals (!stdenv.isDarwin) [

183186 # wildmidi requires apple's OpenAL

184187 # TODO: package apple's OpenAL, fix wildmidi, include on Darwin

@@ -282,6 +285,9 @@ in stdenv.mkDerivation rec {

282285 "-Dapplemedia=disabled"

283286 ];

284287

288+ # Argument list too long

289+ strictDeps = true;

290+

285291 postPatch = ''

286292 patchShebangs \

287293 scripts/extract-release-date-from-doap-file.py

pkgs/development/libraries/intel-media-driver/default.nix+2−2

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

55

66stdenv.mkDerivation rec {

77 pname = "intel-media-driver";

8− version = "20.4.0";

8+ version = "20.4.1";

99

1010 src = fetchFromGitHub {

1111 owner = "intel";

1212 repo = "media-driver";

1313 rev = "intel-media-${version}";

14− sha256 = "0nah3h3s6hqbgz1wqp5j1grzq0q939wbh4b9d27dmb4wy6ma41sl";

14+ sha256 = "1axklxzv85flhv41s8nmp7m4kswnav6qpg8w9przac9ji07rknwl";

1515 };

1616

1717 cmakeFlags = [

pkgs/development/libraries/libcef/default.nix+4−4

@@ -15,12 +15,12 @@ let

1515in

1616stdenv.mkDerivation rec {

1717 pname = "cef-binary";

18− version = "74.1.14-g50c3c5c";

18+ version = "75.1.14-gc81164e";

1919

2020 src = fetchurl {

21− name = "cef_binary_74.1.14+g50c3c5c+chromium-74.0.3729.131_linux64_minimal.tar.bz2";

22− url = "http://opensource.spotify.com/cefbuilds/cef_binary_74.1.19%2Bgb62bacf%2Bchromium-74.0.3729.157_linux64_minimal.tar.bz2";

23− sha256 = "0v3540kq4y68gq7mb4d8a9issm363lm5ngrd6d96pcc7vckkw4wn";

21+ name = "cef_binary_75.1.14+gc81164e+chromium-75.0.3770.100_linux64_minimal.tar.bz2";

22+ url = "http://opensource.spotify.com/cefbuilds/cef_binary_75.1.14%2Bgc81164e%2Bchromium-75.0.3770.100_linux64_minimal.tar.bz2";

23+ sha256 = "0985b2bx505j0q693hifjgidzb597wqf5idql5aqxs8lfxhc2pgg";

2424 };

2525

2626 nativeBuildInputs = [ cmake ];

pkgs/development/libraries/libplacebo/default.nix+2−10

@@ -15,24 +15,16 @@

1515

1616stdenv.mkDerivation rec {

1717 pname = "libplacebo";

18− version = "2.72.0";

18+ version = "2.72.2";

1919

2020 src = fetchFromGitLab {

2121 domain = "code.videolan.org";

2222 owner = "videolan";

2323 repo = pname;

2424 rev = "v${version}";

25− sha256 = "1yhf9xyxdawbihsx89dpjlac800wrmpwx63rphad2nj225y9q40f";

25+ sha256 = "1ijqpx1pagc6qg63ynqrinvckwc8aaw1i0lx48gg5szwk8afib4i";

2626 };

2727

28− patches = [

29− # to work with latest glslang, remove on release >2.72.0

30− (fetchpatch {

31− url = "https://code.videolan.org/videolan/libplacebo/-/commit/523056828ab86c2f17ea65f432424d48b6fdd389.patch";

32− sha256 = "051vhd0l3yad1fzn5zayi08kqs9an9j8p7m63kgqyfv1ksnydpcs";

33− })

34− ];

35−

3628 nativeBuildInputs = [

3729 meson

3830 ninja

pkgs/development/libraries/librdf/raptor2.nix+11−2

@@ -1,13 +1,22 @@

11{ stdenv, fetchurl, libxml2, libxslt }:

22

33stdenv.mkDerivation rec {

4− name = "raptor2-2.0.15";

4+ pname = "raptor2";

5+ version = "2.0.15";

56

67 src = fetchurl {

7− url = "http://download.librdf.org/source/${name}.tar.gz";

8+ url = "http://download.librdf.org/source/${pname}-${version}.tar.gz";

89 sha256 = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed";

910 };

1011

12+ patches = [

13+ (fetchurl {

14+ name = "CVE-2017-18926.patch";

15+ url = "https://github.com/dajobe/raptor/commit/590681e546cd9aa18d57dc2ea1858cb734a3863f.patch";

16+ sha256 = "1qlpb5rm3j2yi0x6zgdi5apymg5zlvwq3g1zl417gkjrlvxmndgp";

17+ })

18+ ];

19+

1120 buildInputs = [ libxml2 libxslt ];

1221

1322 postInstall = "rm -rvf $out/share/gtk-doc";

pkgs/development/libraries/nanoflann/default.nix+3−3

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

11{stdenv, fetchFromGitHub, cmake}:

22

33stdenv.mkDerivation rec {

4− version = "1.3.1";

4+ version = "1.3.2";

55 pname = "nanoflann";

6−

6+

77 src = fetchFromGitHub {

88 owner = "jlblancoc";

99 repo = "nanoflann";

1010 rev = "v${version}";

11− sha256 = "07vi3yn5y9zk9acdbxy954ghdml15wnyqfizzqwsw8zmc9bf30ih";

11+ sha256 = "0lq1zqwjvk8wv15hd7aw57jsqbvv45cwb8ngdh1d2iyw5rvnbhsn";

1212 };

1313

1414 buildInputs = [ cmake ];

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

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

55# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn

66stdenv.mkDerivation rec {

77 pname = "oneDNN";

8− version = "1.6.4";

8+ version = "1.7";

99

1010 src = fetchFromGitHub {

1111 owner = "oneapi-src";

1212 repo = "oneDNN";

1313 rev = "v${version}";

14− sha256 = "0y4lpx24k08wydv4aprfn2icg6ixk0iprk8pmbvyaa6gyab70vjy";

14+ sha256 = "15kanz3zflmxr355dhny4rdycq0ni9iz42vvlblzc5lmj39n84fj";

1515 };

1616

1717 outputs = [ "out" "dev" "doc" ];

pkgs/development/libraries/opencascade-occt/default.nix+2−2

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

33

44stdenv.mkDerivation rec {

55 pname = "opencascade-occt";

6− version = "7.4.0p1";

6+ version = "7.5.0";

77 commit = "V${builtins.replaceStrings ["."] ["_"] version}";

88

99 src = fetchurl {

1010 name = "occt-${commit}.tar.gz";

1111 url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz";

12− sha256 = "0b9hs3akx1f3hhg4zdip6qdv04ssqqcf9kk12amkidgvsl73z2hs";

12+ sha256 = "0bpzpaqki3k6i7xmhan0f1c1fr05smpcmgrp4vh572j61lwpq1r3";

1313 };

1414

1515 nativeBuildInputs = [ cmake ninja ];

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

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

55

66stdenv.mkDerivation rec {

77 pname = "opendht";

8− version = "2.1.4";

8+ version = "2.1.6";

99

1010 src = fetchFromGitHub {

1111 owner = "savoirfairelinux";

1212 repo = "opendht";

1313 rev = version;

14− sha256 = "1ax26ri1ifb6s8ppd28jmanka9yf8mw3np65q2h4djhhik0phhal";

14+ sha256 = "0sjb2a3yqnabwgmmn8gapc1dq9m8vp9z8w85zhsj654i5h3gp6zv";

1515 };

1616

1717 nativeBuildInputs =

pkgs/development/libraries/physics/geant4/default.nix+3−3

@@ -48,12 +48,12 @@ let

4848in

4949

5050stdenv.mkDerivation rec {

51− version = "10.6.2";

51+ version = "10.6.3";

5252 pname = "geant4";

5353

5454 src = fetchurl{

55− url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.p02.tar.gz";

56− sha256 = "0vznm3pjlbihjy1wsxc4gj229k0dzc283wvil2xghyl08vwdpnpc";

55+ url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.p03.tar.gz";

56+ sha256 = "1wzv5xky1pfm7wdfdkvqcaaqlcnsrz35dc7zcrxh8l3j5rki6pqb";

5757 };

5858

5959 boost_python_lib = "python${builtins.replaceStrings ["."] [""] python3.pythonVersion}";

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

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

22

33stdenv.mkDerivation rec {

44 pname = "qpdf";

5− version = "10.0.1";

5+ version = "10.0.3";

66

77 src = fetchFromGitHub {

88 owner = "qpdf";

99 repo = "qpdf";

1010 rev = "release-qpdf-${version}";

11− sha256 = "0g3rqf4wd1n9cms7ra1jnszsgw5bygv37jq2l20d8z5fajckhyyi";

11+ sha256 = "14c4ig51hhrvrwhhriklylp40349xqgd3filajsvqk9vaww6na7f";

1212 };

1313

1414 nativeBuildInputs = [ perl ];

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

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

22

33stdenv.mkDerivation rec {

44 pname = "qrencode";

5− version = "4.0.2";

5+ version = "4.1.1";

66

77 outputs = [ "bin" "out" "man" "dev" ];

88

99 src = fetchurl {

1010 url = "https://fukuchi.org/works/qrencode/qrencode-${version}.tar.gz";

11− sha256 = "079v3a15ydpr67zdi3xbgvic8n2kxvi0m32dyz8jaik10yffgayv";

11+ sha256 = "sha256-2kSO1PUqumvLDNSMrA3VG4aSvMxM0SdDFAL8pvgXHo4=";

1212 };

1313

1414 nativeBuildInputs = [ pkgconfig ];

pkgs/development/libraries/rnnoise-plugin/default.nix+2−2

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

22

33stdenv.mkDerivation rec {

44 pname = "rnnoise-plugin";

5− version = "0.9";

5+ version = "0.91";

66

77 src = fetchFromGitHub {

88 owner = "werman";

99 repo = "noise-suppression-for-voice";

1010 rev = "v${version}";

11− sha256 = "18bq5b50xw3d4r1ildinafpg3isb9y216430h4mm9wr3ir7h76a7";

11+ sha256 = "11pwisbcks7g0mdgcrrv49v3ci1l6m26bbb7f67xz4pr1hai5dwc";

1212 };

1313

1414 buildInputs = [ cmake ];

pkgs/development/libraries/soundtouch/default.nix+7−4

@@ -2,23 +2,26 @@

22

33stdenv.mkDerivation rec {

44 pname = "soundtouch";

5− version = "2.1.2";

5+ version = "2.2";

66

77 src = fetchFromGitLab {

88 owner = pname;

99 repo = pname;

1010 rev = version;

11− sha256 = "174wgm3s0inmbnkrlnspxjwm2014qhjhkbdqa5r8rbfi0nzqxzsz";

11+ sha256 = "12i6yg8vvqwyk412lxl2krbfby6hnxld8qxy0k4m5xp4g94jiq4p";

1212 };

1313

1414 nativeBuildInputs = [ autoconf automake libtool ];

1515

1616 preConfigure = "./bootstrap";

1717

18+ enableParallelBuilding = true;

19+

1820 meta = with lib; {

1921 description = "A program and library for changing the tempo, pitch and playback rate of audio";

20− homepage = "http://www.surina.net/soundtouch/";

21− license = licenses.lgpl21;

22+ homepage = "https://www.surina.net/soundtouch/";

23+ license = licenses.lgpl21Plus;

2224 platforms = platforms.all;

25+ maintainers = with maintainers; [ orivej ];

2326 };

2427}

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

@@ -21,13 +21,13 @@

2121

2222stdenv.mkDerivation rec {

2323 pname = "tiledb";

24− version = "2.0.7";

24+ version = "2.1.2";

2525

2626 src = fetchFromGitHub {

2727 owner = "TileDB-Inc";

2828 repo = "TileDB";

2929 rev = version;

30− sha256 = "00g8ibsbnl4wjfx3qg4qy6s7z6dsj898j0yqfhw1gjr1pb5dsapb";

30+ sha256 = "12f3jvb9b6ji5w2n2k3sjn156ikaf06mriwbqlc54ii1zznaw43r";

3131 };

3232

3333 # (bundled) blosc headers have a warning on some archs that it will be using

pkgs/development/ocaml-modules/digestif/default.nix+12−12

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

1−{ lib, fetchurl, fetchpatch, buildDunePackage

1+{ lib, ocaml, fetchurl, buildDunePackage

22, bigarray-compat, eqaf, stdlib-shims

3−, alcotest

3+, alcotest, astring, bos, findlib, fpath

44}:

55

66buildDunePackage rec {

77 pname = "digestif";

8− version = "0.8.0";

8+ version = "0.9.0";

9+

10+ useDune2 = true;

911

1012 src = fetchurl {

1113 url = "https://github.com/mirage/digestif/releases/download/v${version}/digestif-v${version}.tbz";

12− sha256 = "09g4zngqiw97cljv8ds4m063wcxz3y7c7vzaprsbpjzi0ja5jdcy";

14+ sha256 = "0vk9prgjp46xs8qizq7szkj6mqjj2ymncs2016bc8zswcdc1a3q4";

1315 };

1416

15− # Fix tests with alcotest ≥ 1

16− patches = [ (fetchpatch {

17− url = "https://github.com/mirage/digestif/commit/b65d996c692d75da0a81323253429e07d14b72b6.patch";

18− sha256 = "0sf7qglcp19dhs65pwrrc7d9v57icf18jsrhpmvwskx8b4dchfiv";

19− })];

20−

21− buildInputs = lib.optional doCheck alcotest;

2217 propagatedBuildInputs = [ bigarray-compat eqaf stdlib-shims ];

2318

24− doCheck = true;

19+ checkInputs = [ alcotest astring bos fpath ];

20+ doCheck = lib.versionAtLeast ocaml.version "4.05";

21+

22+ postCheck = ''

23+ ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ test/test_runes.ml

24+ '';

2525

2626 meta = {

2727 description = "Simple hash algorithms in OCaml";

pkgs/development/ocaml-modules/mstruct/default.nixdeleted−24

@@ -1,24 +0,0 @@

1−{ stdenv, fetchFromGitHub, buildDunePackage, cstruct }:

2−

3−buildDunePackage rec {

4− pname = "mstruct";

5− version = "1.4.0";

6−

7− minimumOCamlVersion = "4.02";

8−

9− src = fetchFromGitHub {

10− owner = "mirage";

11− repo = "ocaml-${pname}";

12− rev = "v${version}";

13− sha256 = "1p4ygwzs3n1fj4apfib0z0sabpph21bkq1dgjk4bsa59pq4prncm";

14− };

15−

16− propagatedBuildInputs = [ cstruct ];

17−

18− meta = {

19− description = "A thin mutable layer on top of cstruct";

20− license = stdenv.lib.licenses.isc;

21− maintainers = [ stdenv.lib.maintainers.vbgl ];

22− inherit (src.meta) homepage;

23− };

24−}

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

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

22

33buildPythonPackage rec {

44 pname = "bitstring";

5− version = "3.1.5";

5+ version = "3.1.7";

66

77 src = fetchPypi {

88 inherit pname version;

9− sha256 = "1algq30j6rz12b1902bpw7iijx5lhrfqhl80d4ac6xzkrrpshqy1";

10− extension = "zip";

9+ sha256 = "0jl6192dwrlm5ybkbh7ywmyaymrc3cmz9y07nm7qdli9n9rfpwzx";

1110 };

1211

1312 meta = with stdenv.lib; {

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

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

22

33buildPythonPackage rec {

44 pname = "colorlog";

5− version = "4.2.1";

5+ version = "4.4.0";

66

77 src = fetchPypi {

88 inherit pname version;

9− sha256 = "066i7904vc7814gqnlprksf0ikz2dmviw93r2mr7sf53qci5irbm";

9+ sha256 = "0272c537469ab1e63b9915535874d15b671963c9325db0c4891a2aeff97ce3d1";

1010 };

1111

1212 checkInputs = [ pytest ];

pkgs/development/python-modules/fastecdsa/default.nixnew file+40

@@ -0,0 +1,40 @@

1+{ lib

2+, buildPythonPackage

3+, fetchPypi

4+, gmp

5+, pytestCheckHook

6+}:

7+

8+buildPythonPackage rec {

9+ pname = "fastecdsa";

10+ version = "2.1.5";

11+

12+ src = fetchPypi {

13+ inherit pname version;

14+ sha256 = "d0772f7fe243e8a82d33e95c542ea6cc0ef7f3cfcced7440d6defa71a35addfa";

15+ };

16+

17+ buildInputs = [ gmp ];

18+

19+ checkInputs = [ pytestCheckHook ];

20+

21+ # skip tests which require being online to download test vectors

22+ pytestFlags = [

23+ "--ignore=fastecdsa/tests/test_wycheproof_vectors.py"

24+ "--ignore=fastecdsa/tests/test_rfc6979_ecdsa.py"

25+ ];

26+

27+ # skip tests for now, they fail with

28+ # ImportError: cannot import name '_ecdsa' from 'fastecdsa'

29+ # but the installed package works just fine

30+ doCheck = false;

31+

32+ pythonImportsCheck = [ "fastecdsa" ];

33+

34+ meta = with lib; {

35+ description = "Fast elliptic curve digital signatures";

36+ homepage = "https://github.com/AntonKueltz/fastecdsa";

37+ license = licenses.unlicense;

38+ maintainers = with maintainers; [ prusnak ];

39+ };

40+}

pkgs/development/python-modules/gtts-token/default.nix+13−9

@@ -1,31 +1,35 @@

11{ lib

22, buildPythonPackage

3−, fetchPypi

3+, fetchFromGitHub

44, requests

5+, pytestCheckHook

56}:

67

78buildPythonPackage rec {

89 pname = "gtts-token";

9− version = "1.1.3";

10+ version = "1.1.4";

1011

11− src = fetchPypi {

12− pname = "gTTS-token";

13− inherit version;

14− sha256 = "9d6819a85b813f235397ef931ad4b680f03d843c9b2a9e74dd95175a4bc012c5";

12+ src = fetchFromGitHub {

13+ owner = "boudewijn26";

14+ repo = "gTTS-token";

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

16+ sha256 = "0vr52zc0jqyfvsccl67j1baims3cdx2is1y2lpx2kav9gadkn8hp";

1517 };

1618

1719 propagatedBuildInputs = [

1820 requests

1921 ];

2022

21− # Tests only in github repo, require working internet connection

22− doCheck = false;

23+ checkInputs = [ pytestCheckHook ];

24+

25+ # requires internet access

26+ disabledTests = [ "test_real" ];

2327

2428 meta = with lib; {

2529 description = "Calculates a token to run the Google Translate text to speech";

2630 homepage = "https://github.com/boudewijn26/gTTS-token";

2731 license = licenses.mit;

28− maintainers = [ maintainers.makefu ];

32+ maintainers = with maintainers; [ makefu ];

2933 };

3034}

3135

pkgs/development/python-modules/py-multihash/default.nix+9−5

@@ -1,6 +1,6 @@

11{ base58

22, buildPythonPackage

3−, fetchPypi

3+, fetchFromGitHub

44, isPy27

55, lib

66, morphys

@@ -14,11 +14,13 @@

1414

1515buildPythonPackage rec {

1616 pname = "py-multihash";

17− version = "0.2.3";

17+ version = "1.0.0";

1818

19− src = fetchPypi {

20− inherit pname version ;

21− sha256 = "f0ade4de820afdc4b4aaa40464ec86c9da5cae3a4578cda2daab4b0eb7e5b18d";

19+ src = fetchFromGitHub {

20+ owner = "multiformats";

21+ repo = pname;

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

23+ sha256 = "07qglrbgcb8sr9msqw2v7dqj9s4rs6nyvhdnx02i5w6xx5ibzi3z";

2224 };

2325

2426 nativeBuildInputs = [

@@ -38,6 +40,8 @@ buildPythonPackage rec {

3840 pytestcov

3941 ];

4042

43+ pythonImportsCheck = [ "multihash" ];

44+

4145 disabled = isPy27;

4246

4347 meta = with lib; {

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

@@ -10,13 +10,13 @@

1010

1111buildPythonPackage rec {

1212 pname = "setuptools-rust";

13− version = "0.11.4";

13+ version = "0.11.5";

1414

1515 disabled = isPy27;

1616

1717 src = fetchPypi {

1818 inherit pname version;

19− sha256 = "9714fcb94c78e6ab1864ddac7750049e105fd4f7c52103aecf40d408e94a722f";

19+ sha256 = "04ea21f1bd029046fb87d098be4d7dc74663a58dd1f9fc6edcf8f3e4123ec4a8";

2020 };

2121

2222 nativeBuildInputs = [ setuptools_scm ];

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

@@ -3,21 +3,29 @@

33, fetchFromGitHub

44, glibcLocales

55, urwid

6+, fetchpatch

67}:

78

89buildPythonPackage rec {

910 pname = "urwidtrees";

10− version = "1.0.2";

11+ version = "1.0.3";

1112

1213 src = fetchFromGitHub {

1314 owner = "pazz";

1415 repo = "urwidtrees";

1516 rev = version;

16− sha256 = "1n1kpidvkdnsqyb82vlvk78gmly96kh8351lqxn2pzgwwns6fml2";

17+ sha256 = "sha256-yGSjwagCd5TiwEFtF6ZhDuVqj4PTa5pVXhs8ebr2O/g=";

1718 };

1819

1920 propagatedBuildInputs = [ urwid ];

2021

22+ patches = [

23+ (fetchpatch {

24+ url = "https://github.com/pazz/urwidtrees/commit/ed39dbc4fc67b0e0249bf108116a88cd18543aa9.patch";

25+ sha256 = "sha256-fA+30d2uVaoNCg4rtoWLNPvrZtq41Co4vcmM80hkURs=";

26+ })

27+ ];

28+

2129 checkInputs = [ glibcLocales ];

2230 LC_ALL="en_US.UTF-8";

2331

pkgs/development/tools/analysis/rr/default.nix+2−2

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

11{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python3Packages, which, procps, gdb, capnproto }:

22

33stdenv.mkDerivation rec {

4− version = "5.3.0";

4+ version = "5.4.0";

55 pname = "rr";

66

77 src = fetchFromGitHub {

88 owner = "mozilla";

99 repo = "rr";

1010 rev = version;

11− sha256 = "1x6l1xsdksnhz9v50p4r7hhmr077cq20kaywqy1jzdklvkjqzf64";

11+ sha256 = "1sfldgkkmsdyaqa28i5agcykc63gwm3zjihd64g86i852w8al2w6";

1212 };

1313

1414 postPatch = ''

pkgs/development/tools/build-managers/bloop/default.nix+4−4

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

1010

1111stdenv.mkDerivation rec {

1212 pname = "bloop";

13− version = "1.4.4";

13+ version = "1.4.5";

1414

1515 bloop-coursier-channel = fetchurl {

1616 url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json";

17− sha256 = "1pyf559bpnsmvca4kw36nb9lwkwa9q0ghrpa117s96dhvrp3i2bv";

17+ sha256 = "0a3ayvq62nbfrcs2xgrfqg27h0wf9x28pxabmwd8y0ncafsnifjy";

1818 };

1919

2020 bloop-bash = fetchurl {

@@ -54,8 +54,8 @@ stdenv.mkDerivation rec {

5454

5555 outputHashMode = "recursive";

5656 outputHashAlgo = "sha256";

57− outputHash = if stdenv.isLinux && stdenv.isx86_64 then "0hf0priy93zqba78a9nvbgl3mzwlc4jz43gz7cv2cdkj6x0lp0y1"

58− else if stdenv.isDarwin && stdenv.isx86_64 then "0g2rnmlfnqymji4f4rn0kaz7hipgv3bakdpn08600gg1f3s8gabw"

57+ outputHash = if stdenv.isLinux && stdenv.isx86_64 then "0wh02djny3a9882423lh4kf67z981d1ky85gfphsw52fbdhbzmn9"

58+ else if stdenv.isDarwin && stdenv.isx86_64 then "0db30zbqpa9q285hspaba124dfnnr1gmlrxwwvn9szxz1d55n417"

5959 else throw "unsupported platform";

6060 };

6161

pkgs/development/tools/dt-schema/default.nix+2−2

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

1111

1212buildPythonPackage rec {

1313 pname = "dtschema";

14− version = "2020.8.1";

14+ version = "2020.11";

1515

1616 src = fetchPypi {

1717 inherit pname version;

18− sha256 = "5c98202abb4977aac6a2995a7f4ed2f7e51739db6fd72861d29681f865c27c1b";

18+ sha256 = "ad052d293eadb5b64631bfffac62c496427ad4105e76eef19a5422ba762ee734";

1919 };

2020

2121 nativeBuildInputs = [ setuptools_scm git ];

pkgs/development/tools/metals/default.nix+2−2

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

22

33stdenv.mkDerivation rec {

44 pname = "metals";

5− version = "0.9.4";

5+ version = "0.9.5";

66

77 deps = stdenv.mkDerivation {

88 name = "${pname}-deps-${version}";

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

1616 '';

1717 outputHashMode = "recursive";

1818 outputHashAlgo = "sha256";

19− outputHash = "1k07gg13z3kambvvrxsc27781cd5npb2a50ahdbj7x6j6h67k0pg";

19+ outputHash = "1hcfnxxahh3yfkpz6ybfr9xsf5mx008rhn7q6p8pmfxrgkdh4c1l";

2020 };

2121

2222 nativeBuildInputs = [ makeWrapper ];

pkgs/development/tools/misc/lsof/default.nix+2−2

@@ -4,7 +4,7 @@ let dialect = with stdenv.lib; last (splitString "-" stdenv.hostPlatform.system)

44

55stdenv.mkDerivation rec {

66 pname = "lsof";

7− version = "4.93.2";

7+ version = "4.94.0";

88

99 depsBuildBuild = [ buildPackages.stdenv.cc ];

1010 buildInputs = [ ncurses ];

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

1313 owner = "lsof-org";

1414 repo = "lsof";

1515 rev = version;

16− sha256 = "1gd6r0nv8xz76pmvk52dgmfl0xjvkxl0s51b4jk4a0lphw3393yv";

16+ sha256 = "0yxv2jg6rnzys49lyrz9yjb4knamah4xvlqj596y6ix3vm4k3chp";

1717 };

1818

1919 patches = [ ./no-build-info.patch ];

pkgs/development/tools/misc/nix-build-uncached/default.nix+2−2

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

22

33buildGoModule rec {

44 pname = "nix-build-uncached";

5− version = "1.0.2";

5+ version = "1.1.0";

66

77 src = fetchFromGitHub {

88 owner = "Mic92";

99 repo = "nix-build-uncached";

1010 rev = "v${version}";

11− sha256 = "0hjx2gdwzg02fzxhsf7akp03vqj2s7wmcv9xfqn765zbqnljz14v";

11+ sha256 = "1v9xyv0hhvfw61k4pbgzrlgy7igl619cangi40fkh7gdvs01dxz4";

1212 };

1313

1414 vendorSha256 = null;

pkgs/development/tools/misc/terraformer/default.nix+3−3

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

22

33buildGoModule rec {

44 pname = "terraformer";

5− version = "0.8.8";

5+ version = "0.8.9";

66

77 src = fetchFromGitHub {

88 owner = "GoogleCloudPlatform";

99 repo = pname;

1010 rev = version;

11− sha256 = "1lzf30vpa0blbkz4ngnhrn3hpbqflqd4sni4bly9yqh4fnc44nvi";

11+ sha256 = "11j7yra0qbjadg4cb57qbdxf0di7crfv0aqam6gc1zng3fzlh4w9";

1212 };

1313

14− vendorSha256 = "087448wkaw6jxv9d26hck4w3vdh06vcgywna6ydkqvxr0hp011b6";

14+ vendorSha256 = "1lsg5svdnmqiradpr4h2420y5jmml3af8pp0np1735n3wh1q1blh";

1515

1616 subPackages = [ "." ];

1717

pkgs/development/tools/packet-cli/default.nix+3−3

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

22

33buildGoModule rec {

44 pname = "packet-cli";

5− version = "0.0.8";

5+ version = "0.1.1";

66

77 src = fetchFromGitHub {

88 owner = "packethost";

99 repo = pname;

1010 rev = version;

11− sha256 = "0ys6zyhyi65g0sj15pb6rslgbjgkh73y32gc0yvhfd6xmgzaxpxf";

11+ sha256 = "089fcn7yslijjivyvwl85j32gfwif8aazqdhm6hi676lz80ssppp";

1212 };

1313

14− vendorSha256 = "1h9p3hrr61hwkhkh4qbw0ld3hd5xi75qm8rwfrpz5z06jba1ll25";

14+ vendorSha256 = "1p3v4pzw9hc1iviv1zghw9imbd23nlp24dpa8hf0w8a03jvpy96x";

1515

1616 postInstall = ''

1717 ln -s $out/bin/packet-cli $out/bin/packet

pkgs/development/tools/parsing/bisonc++/default.nixnew file+56

@@ -0,0 +1,56 @@

1+{stdenv, fetchurl, fetchFromGitLab

2+, yodl, icmake, flexcpp, bobcat

3+}:

4+stdenv.mkDerivation rec {

5+ pname = "bisonc++";

6+ version = "6.04.00";

7+

8+ src = fetchFromGitLab {

9+ domain = "gitlab.com";

10+ owner = "fbb-git";

11+ repo = "bisoncpp";

12+ rev = "6.04.00";

13+ sha256 = "sha256:0aa9bij4g08ilsk6cgrbgi03vyhqr9fn6j2164sjin93m63212wl";

14+ };

15+

16+ buildInputs = [ bobcat ];

17+

18+ nativeBuildInputs = [ yodl icmake flexcpp ];

19+

20+ setSourceRoot = ''

21+ sourceRoot="$(echo */bisonc++)"

22+ '';

23+

24+ gpl = fetchurl {

25+ url = "https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt";

26+ sha256 = "sha256:0hq6i0dm4420825fdm0lnnppbil6z67ls67n5kgjcd912dszjxw1";

27+ };

28+

29+ postPatch = ''

30+ substituteInPlace INSTALL.im --replace /usr $out

31+ patchShebangs .

32+ for file in $(find documentation -type f); do

33+ substituteInPlace "$file" --replace /usr/share/common-licenses/GPL ${gpl}

34+ substituteInPlace "$file" --replace /usr $out

35+ done

36+ '';

37+

38+ buildPhase = ''

39+ ./build program

40+ ./build man

41+ ./build manual

42+ '';

43+

44+ installPhase = ''

45+ ./build install x

46+ '';

47+

48+ meta = with stdenv.lib; {

49+ inherit version;

50+ description = "A parser generator like bison, but it generates C++ code";

51+ license = licenses.gpl2Plus;

52+ maintainers = with maintainers; [ raskin ];

53+ platforms = platforms.linux;

54+ homepage = "https://fbb-git.gitlab.io/bisoncpp/";

55+ };

56+}

pkgs/development/tools/parsing/tree-sitter/default.nix+15−5

@@ -3,6 +3,9 @@

33, writeShellScript, runCommand, which

44, rustPlatform, jq, nix-prefetch-git, xe, curl, emscripten

55, callPackage

6+, enableShared ? true

7+, enableStatic ? false

8+, Security

69}:

710

811# TODO: move to carnix or https://github.com/kolloch/crate2nix

@@ -11,9 +14,9 @@ let

1114 # 1) change all these hashes

1215 # 2) nix-build -A tree-sitter.updater.update-all-grammars

1316 # 3) run the ./result script that is output by that (it updates ./grammars)

14− version = "0.17.1";

15− sha256 = "sha256-k61actAEyao/Ea8aw9PCm252U+1I0d43MAYC68/lui4=";

16− cargoSha256 = "sha256-Jp/Fl20ZZfaIdWinOOujNVH5JjJNtyUYHfyTrmeeoRg=";

17+ version = "0.17.3";

18+ sha256 = "sha256-uQs80r9cPX8Q46irJYv2FfvuppwonSS5HVClFujaP+U=";

19+ cargoSha256 = "sha256-fonlxLNh9KyEwCj7G5vxa7cM/DlcHNFbQpp0SwVQ3j4=";

1720

1821 src = fetchFromGitHub {

1922 owner = "tree-sitter";

@@ -49,6 +52,8 @@ in rustPlatform.buildRustPackage {

4952 pname = "tree-sitter";

5053 inherit src version cargoSha256;

5154

55+ buildInputs = lib.optionals stdenv.isDarwin [ Security ];

56+

5257 nativeBuildInputs = [ emscripten which ];

5358

5459 postPatch = ''

@@ -68,6 +73,12 @@ in rustPlatform.buildRustPackage {

6873 bash ./script/build-wasm --debug

6974 '';

7075

76+ postInstall = ''

77+ PREFIX=$out make install

78+ ${lib.optionalString (!enableShared) "rm $out/lib/*.so{,.*}"}

79+ ${lib.optionalString (!enableStatic) "rm $out/lib/*.a"}

80+ '';

81+

7182 # test result: FAILED. 120 passed; 13 failed; 0 ignored; 0 measured; 0 filtered out

7283 doCheck = false;

7384

@@ -95,9 +106,8 @@ in rustPlatform.buildRustPackage {

95106 '';

96107 license = lib.licenses.mit;

97108 maintainers = with lib.maintainers; [ Profpatsch ];

98− # Darwin needs some more work with default libraries

99109 # Aarch has test failures with how tree-sitter compiles the generated C files

100− broken = stdenv.isDarwin || stdenv.isAarch64;

110+ broken = stdenv.isAarch64;

101111 };

102112

103113}

pkgs/development/tools/parsing/tree-sitter/grammars/default.nix+1

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

55 embedded-template = (builtins.fromJSON (builtins.readFile ./tree-sitter-embedded-template.json));

66 go = (builtins.fromJSON (builtins.readFile ./tree-sitter-go.json));

77 html = (builtins.fromJSON (builtins.readFile ./tree-sitter-html.json));

8+ java = (builtins.fromJSON (builtins.readFile ./tree-sitter-java.json));

89 javascript = (builtins.fromJSON (builtins.readFile ./tree-sitter-javascript.json));

910 jsdoc = (builtins.fromJSON (builtins.readFile ./tree-sitter-jsdoc.json));

1011 json = (builtins.fromJSON (builtins.readFile ./tree-sitter-json.json));

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json+4−4

@@ -1,9 +1,9 @@

11{

22 "url": "https://github.com/tree-sitter/tree-sitter-cpp",

3− "rev": "5e7476bd014445abdae879661e9caf299215478a",

4− "date": "2020-05-14T11:46:56-07:00",

5− "path": "/nix/store/xz540ah1xx06n3wwmk3ym72nj0bz82hh-tree-sitter-cpp",

6− "sha256": "0v2l5269bhbpzcd929r3pn88gqcczx6spsq7p6ibsvsydbwj95wx",

3+ "rev": "fb8250eef8b4cf1ce104806c50dc206e388b0e72",

4+ "date": "2020-11-02T09:46:58-08:00",

5+ "path": "/nix/store/qmza43f0fraa111bg50vaxsgnrs5kqs1-tree-sitter-cpp",

6+ "sha256": "1sbk5a2p1fh6798naiswsap6fpj7n7bqhwd3xdyi35xf613qpwsi",

77 "fetchSubmodules": false,

88 "deepClone": false,

99 "leaveDotGit": false

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json+4−4

@@ -1,9 +1,9 @@

11{

22 "url": "https://github.com/tree-sitter/tree-sitter-go",

3− "rev": "34181774b3e86b7801c939c79c7b80a82df91a2b",

4− "date": "2020-08-13T12:21:50-07:00",

5− "path": "/nix/store/3a5w7pz1m74y0lhbzq3bw3k2297lypqs-tree-sitter-go",

6− "sha256": "0cfi7ghs0m3iqwd4jvsqgsj4gnfikn1j2q0wbkdfvz2j25l0qwq0",

3+ "rev": "dadfd9c9aab2630632e61cfce645c13c35aa092f",

4+ "date": "2020-10-27T13:42:16-04:00",

5+ "path": "/nix/store/91a8w265vjc955hyp7cqvpm8ks9zcmqv-tree-sitter-go",

6+ "sha256": "1pwbzkg7s0l2fhr4p1rpcldjcpxbkaqsm3q81543almc75k38x8w",

77 "fetchSubmodules": false,

88 "deepClone": false,

99 "leaveDotGit": false

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.jsonnew file+10

@@ -0,0 +1,10 @@

1+{

2+ "url": "https://github.com/tree-sitter/tree-sitter-java",

3+ "rev": "f7b62ac33d63bea56ce202ace107aaa4285e50af",

4+ "date": "2020-10-27T13:41:02-04:00",

5+ "path": "/nix/store/h51zjbzdrm89gczcdv7nyih54vnd2xps-tree-sitter-java",

6+ "sha256": "0jbh79brs1dskfqw05s9ndrp46hibyc37nfvhxlvanmgj3pjwgxb",

7+ "fetchSubmodules": false,

8+ "deepClone": false,

9+ "leaveDotGit": false

10+}

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json+4−4

@@ -1,9 +1,9 @@

11{

22 "url": "https://github.com/tree-sitter/tree-sitter-javascript",

3− "rev": "3d5493495b62b4ff8e8c24aee7519dd904e25813",

4− "date": "2020-09-21T17:18:41-07:00",

5− "path": "/nix/store/bhjws8yif1ihhvhfsrdrp4inf03ks08r-tree-sitter-javascript",

6− "sha256": "10fscmclcgl1a0314ppkfy0s7pmiiz5vjipbmks76608kic8nzpp",

3+ "rev": "852f11b394804ac2a8986f8bcaafe77753635667",

4+ "date": "2020-10-27T13:43:40-04:00",

5+ "path": "/nix/store/7a9nd3prxbv2izvilqdxf58his097ak7-tree-sitter-javascript",

6+ "sha256": "1cdqx75fm7fvna0iymw7n03a7f6gayfg97qwqz3himi0775fz9ir",

77 "fetchSubmodules": false,

88 "deepClone": false,

99 "leaveDotGit": false

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json+4−4

@@ -1,9 +1,9 @@

11{

22 "url": "https://github.com/tree-sitter/tree-sitter-python",

3− "rev": "30f538aa1f932a2864c102694761d3127a61dc68",

4− "date": "2020-09-21T13:21:51-07:00",

5− "path": "/nix/store/bxv85lm636xdsdqjf4n7sxjlhhh35qnv-tree-sitter-python",

6− "sha256": "0hzzz90pn1qwyl5xk03cah62rbvp1c1yp1pw2m3hifqflxg4rs1g",

3+ "rev": "d245768132eb6cb74d8a394ca4d29dc57169b096",

4+ "date": "2020-10-27T13:20:04-04:00",

5+ "path": "/nix/store/afv7ibxpf5c2shafa89cnza88hsfb7kj-tree-sitter-python",

6+ "sha256": "075r5i2id2rn76xm3pcrn5cpvj63dlaxcpvphig39a4c9f9hrpdx",

77 "fetchSubmodules": false,

88 "deepClone": false,

99 "leaveDotGit": false

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json+4−4

@@ -1,9 +1,9 @@

11{

22 "url": "https://github.com/tree-sitter/tree-sitter-ruby",

3− "rev": "a6fcb529e9097a2efbbb3f4857e42773e7f2474f",

4− "date": "2020-05-26T16:18:48-07:00",

5− "path": "/nix/store/yqd5b7ky21scahnhrik9psalbkwi3ab3-tree-sitter-ruby",

6− "sha256": "0bxg5lfdazz5mlfnf0amcygvc8b2ydzl2blvbbhnziyx92r8di6q",

3+ "rev": "f86d90cce578e28c824afdcdbdca7d031b88c0b0",

4+ "date": "2020-11-02T20:49:49-08:00",

5+ "path": "/nix/store/gs0hhb1dlgmv0y60zyyz7ki30yvpddfx-tree-sitter-ruby",

6+ "sha256": "1n1irdjfmv27p5ia2vqzv8zfsq19pxi0as0wrkb7z7s1lqr1gwrb",

77 "fetchSubmodules": false,

88 "deepClone": false,

99 "leaveDotGit": false

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json+4−4

@@ -1,9 +1,9 @@

11{

22 "url": "https://github.com/tree-sitter/tree-sitter-rust",

3− "rev": "40620bf4097cbc9cea79504d7e877865df43a19e",

4− "date": "2020-05-15T10:53:35-07:00",

5− "path": "/nix/store/r24bba6gxchb5zqzghna8yjvqnngbv4a-tree-sitter-rust",

6− "sha256": "0hjp6nsskw341g97x41481b3zfwh8g853fs9six6j1mh92irmv6y",

3+ "rev": "cf47ff80cbd8bdc6dd649a005c5f5d73f9c347e2",

4+ "date": "2020-11-04T06:23:40-08:00",

5+ "path": "/nix/store/8cvjxw8cz5jrkqwvgq88r7rfm269xwk1-tree-sitter-rust",

6+ "sha256": "0yzcag0yy3ncxwpnb3fmsw8bxaidp7z8kbl8wwaxaj2vvxxf6sam",

77 "fetchSubmodules": false,

88 "deepClone": false,

99 "leaveDotGit": false

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json+4−4

@@ -1,9 +1,9 @@

11{

22 "url": "https://github.com/tree-sitter/tree-sitter-typescript",

3− "rev": "5a38a5bd04364d9f48b902fd1514e075b98b0edc",

4− "date": "2020-09-17T10:19:01-07:00",

5− "path": "/nix/store/b3q7vz9zhgjdbv3c2xap4k2ghpdjp2yf-tree-sitter-typescript",

6− "sha256": "1mxwvzqbaaq11cz7zidiwr29fs0b6ycf3nadwdkgiz8c6x2xx398",

3+ "rev": "73afadbd117a8e8551758af9c3a522ef46452119",

4+ "date": "2020-10-20T12:15:52-07:00",

5+ "path": "/nix/store/wrgp1j5l50cigv5cmlxikw693a55i6g9-tree-sitter-typescript",

6+ "sha256": "0dsbmcvjzys9s229drp1l8anram7d6nsx1nixl5m9znw54hr4w9p",

77 "fetchSubmodules": false,

88 "deepClone": false,

99 "leaveDotGit": false

pkgs/development/tools/pipenv/default.nix+2−2

@@ -18,11 +18,11 @@ let

1818

1919in buildPythonApplication rec {

2020 pname = "pipenv";

21− version = "2020.8.13";

21+ version = "2020.11.4";

2222

2323 src = fetchPypi {

2424 inherit pname version;

25− sha256 = "eff0e10eadb330f612edfa5051d3d8e775e9e0e918c3c50361da703bd0daa035";

25+ sha256 = "d6ac39d1721517b23aca12cdb4c726dc318ec4d7bdede5c1220bbb81775005c3";

2626 };

2727

2828 LC_ALL = "en_US.UTF-8";

pkgs/development/tools/sd-local/default.nix+3−3

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

22

33buildGoModule rec {

44 pname = "sd-local";

5− version = "1.0.5";

5+ version = "1.0.12";

66

77 src = fetchFromGitHub {

88 owner = "screwdriver-cd";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "09j1wcx66sz2b0pps0bgbay5x06lc0d2awxjvd5zi8wqnbsrdq60";

11+ sha256 = "1amj5qsnxf6ya2l5rigjia5qis8i7q0qnd9ci74r721nj95m9jvr";

1212 };

1313

14− vendorSha256 = "1qy51jx181rwim2v53ysgf7rys0nmxsbawvsbh3z1ihh3dlgw5bc";

14+ vendorSha256 = "1y4nyw7rpgipblxqaps2zsd07cin8d0i0g9gvsnc3vifi6g29s8z";

1515

1616 subPackages = [ "." ];

1717

pkgs/development/tools/skaffold/default.nix+2−2

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

22

33buildGoPackage rec {

44 pname = "skaffold";

5− version = "1.15.0";

5+ version = "1.16.0";

66

77 goPackagePath = "github.com/GoogleContainerTools/skaffold";

88 subPackages = ["cmd/skaffold"];

@@ -19,7 +19,7 @@ buildGoPackage rec {

1919 owner = "GoogleContainerTools";

2020 repo = "skaffold";

2121 rev = "v${version}";

22− sha256 = "0cir9ld61pq1rziw6vyz1ihkq0aylzrsxg1vqb9544rwnbq7z2qs";

22+ sha256 = "18v1s1k05bq38aljazvpxvp543xchy9h4n531pis4w4jl47n387f";

2323 };

2424

2525 nativeBuildInputs = [ installShellFiles ];

pkgs/development/tools/trellis/default.nix+6−6

@@ -8,26 +8,26 @@ let

88in

99stdenv.mkDerivation rec {

1010 pname = "trellis";

11− version = "2020.07.27";

11+ version = "2020.11.07";

1212

1313 # git describe --tags

1414 realVersion = with stdenv.lib; with builtins;

15− "1.0-182-g${substring 0 7 (elemAt srcs 0).rev}";

15+ "1.0-469-g${substring 0 7 (elemAt srcs 0).rev}";

1616

1717 srcs = [

1818 (fetchFromGitHub {

1919 owner = "SymbiFlow";

2020 repo = "prjtrellis";

21− rev = "8c0a6382e11b160ed88d17af8493c12a897617ed";

22− sha256 = "1g0ppjfw8dq5cg5kl2p1p87grb0i88apaim4f5b6wj4sfqz8iln8";

21+ rev = "b013a135a9b95c18ece559e19aa73ad6c84446c9";

22+ sha256 = "09bx30jm9bgdxmbxf49a27spg4yd1nk5r5mympq7xi28hq1xwjnf";

2323 name = "trellis";

2424 })

2525

2626 (fetchFromGitHub {

2727 owner = "SymbiFlow";

2828 repo = "prjtrellis-db";

29− rev = "c137076fdd8bfca3d2bf9cdacda9983dbbec599a";

30− sha256 = "1br0vw8wwcn2qhs8kxkis5xqlr2nw7r3mf1qwjp8xckd6fa1wlcw";

29+ rev = "2cf058e7a3ba36134d21e34823e9b2ecaaceac2c";

30+ sha256 = "1hjaw5jkwiaiznm2z0smy88m2cdz63cd51z4nibajfih7ikvkj6g";

3131 name = "trellis-database";

3232 })

3333 ];

pkgs/development/tools/vagrant/default.nix+2−2

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

55let

66 # NOTE: bumping the version and updating the hash is insufficient;

77 # you must use bundix to generate a new gemset.nix in the Vagrant source.

8− version = "2.2.11";

8+ version = "2.2.13";

99 url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";

10− sha256 = "sha256-KDQDEMebqQYgsBroHmQrm/OJWTES9C9eGl0dDHTBpIc=";

10+ sha256 = "sha256-NN+8t08yycINbtxOjhOWU96nJ0fZKDAopEr3WyAeG8U=";

1111

1212 deps = bundlerEnv rec {

1313 name = "${pname}-${version}";

pkgs/development/tools/vagrant/gemset.nix+2−2

@@ -138,10 +138,10 @@

138138 platforms = [];

139139 source = {

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

141− sha256 = "1w923wmdi3gyiky0asqdw5dnh3gcjs2xyn82ajvjfjwh6sn0clgi";

141+ sha256 = "07q48aca4r782jh53znqq7ams4pcf1dhmq21dwhyxzjqfclcb48g";

142142 type = "gem";

143143 };

144− version = "3.2.1";

144+ version = "3.3.0";

145145 };

146146 little-plugger = {

147147 groups = ["default"];

pkgs/development/tools/yarn/default.nix+2−2

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

22

33stdenv.mkDerivation rec {

44 pname = "yarn";

5− version = "1.22.5";

5+ version = "1.22.10";

66

77 src = fetchzip {

88 url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";

9− sha256 = "1yb1pb80jhw6mx1r28hf7zd54dygmnrf30r3fz7kn9nrgdpl5in8";

9+ sha256 = "0pdimll8lhsnqfafhdaxd6h6mgxhj1c7h56r111cmxhzw462y3mr";

1010 };

1111

1212 buildInputs = [ nodejs ];

pkgs/development/tools/yq-go/default.nix+2−2

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

22

33buildGoModule rec {

44 pname = "yq-go";

5− version = "3.4.0";

5+ version = "3.4.1";

66

77 src = fetchFromGitHub {

88 owner = "mikefarah";

99 rev = version;

1010 repo = "yq";

11− sha256 = "1rvs27c5mz55zqq9c7yif0dms53bd30d8ylh45f3y3zgh82jihp8";

11+ sha256 = "09kcqa15assjhp3kdffa3yhc2vykinzgscjzg996qa85kjircy9b";

1212 };

1313

1414 vendorSha256 = "0l5bhbp8dfq04hb4xcpx96ksfwx4xvk0pj5ma00rk3z913ikygcd";

pkgs/games/empty-epsilon/default.nix+3−3

@@ -4,7 +4,7 @@ let

44

55 major = "2020";

66 minor = "08";

7− patch = "07";

7+ patch = "25";

88

99 version = "${major}.${minor}.${patch}";

1010

@@ -16,7 +16,7 @@ let

1616 owner = "daid";

1717 repo = "SeriousProton";

1818 rev = "EE-${version}";

19− sha256 = "1mfizhmwh6xgb5n34l3wrbxm21f7gsvsyacsmnxw9rkz0ya7ch30";

19+ sha256 = "sha256-LiMEgsUpNBtduFO85ct6NYr/Smbzd8yE8Vce3voErLY=";

2020 };

2121

2222 nativeBuildInputs = [ cmake ];

@@ -42,7 +42,7 @@ stdenv.mkDerivation {

4242 owner = "daid";

4343 repo = "EmptyEpsilon";

4444 rev = "EE-${version}";

45− sha256 = "0p41wx9yk09xjmfkjpdgi3b2999ps2am3xqwd866q11f6ci7viv5";

45+ sha256 = "sha256-3QREWTq1Jq9T/FtGFVU4MidZeUQvRSVChn9JKxv2SiQ=";

4646 };

4747

4848 nativeBuildInputs = [ cmake ];

pkgs/misc/drivers/epson-escpr2/default.nix+4−4

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

22

33stdenv.mkDerivation rec {

44 pname = "epson-inkjet-printer-escpr2";

5− version = "1.1.23";

5+ version = "1.1.24";

66

77 src = fetchurl {

88 # To find new versions, visit

@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {

1111 # version.

1212 # NOTE: Don't forget to update the webarchive link too!

1313 urls = [

14− "https://download3.ebz.epson.net/dsc/f/03/00/12/04/34/22448566e405c21c3f4436dfd8927176add3e680/epson-inkjet-printer-escpr2-1.1.23-1lsb3.2.src.rpm"

15− "https://web.archive.org/web/20201019154323if_/https://download3.ebz.epson.net/dsc/f/03/00/12/04/34/22448566e405c21c3f4436dfd8927176add3e680/epson-inkjet-printer-escpr2-1.1.23-1lsb3.2.src.rpm"

14+ "https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm"

15+ "https://web.archive.org/web/20201112163802if_/https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm"

1616 ];

17− sha256 = "1d5zd8cwgp3n25ramdqwqb770iim7kh4l7hmhf6a6ivpy0cxpwx6";

17+ sha256 = "sha256-DPzjKKsTWbfDk1MsVPXNsO5D7C/RiNegmwq2sEMx2co=";

1818 };

1919

2020 patches = [ ./cups-filter-ppd-dirs.patch ];

pkgs/misc/vim-plugins/generated.nix+178−178

@@ -221,12 +221,12 @@ let

221221

222222 barbar-nvim = buildVimPluginFrom2Nix {

223223 pname = "barbar-nvim";

224− version = "2020-11-06";

224+ version = "2020-11-13";

225225 src = fetchFromGitHub {

226226 owner = "romgrk";

227227 repo = "barbar.nvim";

228− rev = "92e70f9e369d106476de283354bc30e37a94e864";

229− sha256 = "17az4flcsry4f2p4xnmgw0ymbbybcfycajm25g6r692hcbgkg5dx";

228+ rev = "16fee1a0309910645f28caa1a3cac607a4ea47a3";

229+ sha256 = "1h5cn9z9446pjzdpr4nnay7g4cfyl4cf541nmy6r0v7mq68zfijc";

230230 };

231231 meta.homepage = "https://github.com/romgrk/barbar.nvim/";

232232 };

@@ -401,12 +401,12 @@ let

401401

402402 coc-explorer = buildVimPluginFrom2Nix {

403403 pname = "coc-explorer";

404− version = "2020-11-02";

404+ version = "2020-11-13";

405405 src = fetchFromGitHub {

406406 owner = "weirongxu";

407407 repo = "coc-explorer";

408− rev = "3530aaf09473366e3d21811a708d9cde7e1f4a02";

409− sha256 = "1qksmhgn71rax5gz5zjxp80wx3xabgv9k8y9pbldr19r777gb14r";

408+ rev = "6be196d41f9738b6678de07f5509f56a58c149ec";

409+ sha256 = "1gmc2m2i7i11hx8v18bvz18pzwf82234z740syl66xm2q9z1d1sb";

410410 };

411411 meta.homepage = "https://github.com/weirongxu/coc-explorer/";

412412 };

@@ -425,12 +425,12 @@ let

425425

426426 coc-markdownlint = buildVimPluginFrom2Nix {

427427 pname = "coc-markdownlint";

428− version = "2020-11-02";

428+ version = "2020-11-12";

429429 src = fetchFromGitHub {

430430 owner = "fannheyward";

431431 repo = "coc-markdownlint";

432− rev = "56af4992a9f48a5ae210a0bf346e00a08075908a";

433− sha256 = "0gjfs3mrxv88z8fvm4rc51hw8kghami80pbvz7jcz0bf9bfwgdaw";

432+ rev = "a9304f7b096871e15c2992d0d09e7c7f3a3675d4";

433+ sha256 = "0r7mr4qmw04hhxihfn4pndpv0dakwjcj6jf1jccgydxc35qv14vj";

434434 };

435435 meta.homepage = "https://github.com/fannheyward/coc-markdownlint/";

436436 };

@@ -473,12 +473,12 @@ let

473473

474474 coc-nvim = buildVimPluginFrom2Nix {

475475 pname = "coc-nvim";

476− version = "2020-11-05";

476+ version = "2020-11-13";

477477 src = fetchFromGitHub {

478478 owner = "neoclide";

479479 repo = "coc.nvim";

480− rev = "815d105fe9bada4fda9c85f98557005b70a9e667";

481− sha256 = "0hxrja25hwcnw31bwcrs8krvjdxwvb6wxjrrx9zwbplj4x7xbkyp";

480+ rev = "02a058c5fb563ce79bead38a49bbff21664c016e";

481+ sha256 = "1dhfi86i0cx1llaj6ywk8wv3ym595fkscg5w4qrbxazsmbjgrbaq";

482482 };

483483 meta.homepage = "https://github.com/neoclide/coc.nvim/";

484484 };

@@ -606,12 +606,12 @@ let

606606

607607 Coqtail = buildVimPluginFrom2Nix {

608608 pname = "Coqtail";

609− version = "2020-10-30";

609+ version = "2020-11-09";

610610 src = fetchFromGitHub {

611611 owner = "whonore";

612612 repo = "Coqtail";

613− rev = "778f5f5868aec79bb5415f790c8f18b8253fd99c";

614− sha256 = "1p7lg6ln9vkw6ds3bllyf1rlpnlhb5cyly6cab1v9zgjz4xagx80";

613+ rev = "42625407e022ff3cd56c53ac87270ad9fb70f605";

614+ sha256 = "0rm5vvdzl63lm76fmp52l51619bd62gk7ddg1j8vzb074nlyc66m";

615615 };

616616 meta.homepage = "https://github.com/whonore/Coqtail/";

617617 };

@@ -702,24 +702,24 @@ let

702702

703703 ctrlp-vim = buildVimPluginFrom2Nix {

704704 pname = "ctrlp-vim";

705− version = "2020-10-16";

705+ version = "2020-11-12";

706706 src = fetchFromGitHub {

707707 owner = "ctrlpvim";

708708 repo = "ctrlp.vim";

709− rev = "3866ae170a342fb40d83e1538c37c81c7977b821";

710− sha256 = "1ksi46g33ghdrp0nff0fyysxnzw0sr1x5b1ln6xzjv4hkdxiz51k";

709+ rev = "971c4d41880b72dbbf1620b3ad91418a6a6f6b9c";

710+ sha256 = "0n68hg59h4rjn0ziqbsh5pr03l3kr98zk54659ny6vq107af1w96";

711711 };

712712 meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/";

713713 };

714714

715715 dart-vim-plugin = buildVimPluginFrom2Nix {

716716 pname = "dart-vim-plugin";

717− version = "2020-08-14";

717+ version = "2020-11-10";

718718 src = fetchFromGitHub {

719719 owner = "dart-lang";

720720 repo = "dart-vim-plugin";

721− rev = "378bddc9f0e109607935ab9a4ac717df008deac7";

722− sha256 = "0idaph0wdaf2rk9mh468zg8c4gf5hyvad5zqlpcd9q1f576ysswy";

721+ rev = "8ff9e1abd264f16fd1d192024348f6c63b514a0d";

722+ sha256 = "15rkgh68j9agbj4144a0jis7qpcfjfspp6598laqjz1qzrx82pmf";

723723 };

724724 meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/";

725725 };

@@ -908,12 +908,12 @@ let

908908

909909 deoplete-jedi = buildVimPluginFrom2Nix {

910910 pname = "deoplete-jedi";

911− version = "2020-08-06";

911+ version = "2020-11-07";

912912 src = fetchFromGitHub {

913913 owner = "deoplete-plugins";

914914 repo = "deoplete-jedi";

915− rev = "2786058b9022ce6e50db7f75088e69e07185e52c";

916− sha256 = "0myn6rgwq7yd3hpxdxa7kj3dlk2x9ljqlznqg95qcm8i0w53z1wg";

915+ rev = "2d61fe45e348f89979c8faf663b3e88c61435f47";

916+ sha256 = "0qmszwrchp272zc4rf727k9l0x472lxbbql8k2pyj1vd1ks97q1i";

917917 };

918918 meta.homepage = "https://github.com/deoplete-plugins/deoplete-jedi/";

919919 };

@@ -1040,12 +1040,12 @@ let

10401040

10411041 deoplete-nvim = buildVimPluginFrom2Nix {

10421042 pname = "deoplete-nvim";

1043− version = "2020-11-04";

1043+ version = "2020-11-11";

10441044 src = fetchFromGitHub {

10451045 owner = "Shougo";

10461046 repo = "deoplete.nvim";

1047− rev = "9aacded51b323f338859f01fcdca30a4acaf7dcc";

1048− sha256 = "07gmj9cljbn4h7naxayq05p38930ffby97zg3x2c98x3hxldqsq8";

1047+ rev = "44a3e2393a99d5975ac7f282be10d008f4c70251";

1048+ sha256 = "1ikaqqmms0zcf997wf9jysdzmn2r1w9gqjqn58sw5drnnfamwvml";

10491049 };

10501050 meta.homepage = "https://github.com/Shougo/deoplete.nvim/";

10511051 };

@@ -1076,12 +1076,12 @@ let

10761076

10771077 diagnostic-nvim = buildVimPluginFrom2Nix {

10781078 pname = "diagnostic-nvim";

1079− version = "2020-10-01";

1079+ version = "2020-11-13";

10801080 src = fetchFromGitHub {

10811081 owner = "nvim-lua";

10821082 repo = "diagnostic-nvim";

1083− rev = "bef1c6140563cb6416081b2517ae9953cd4e05ab";

1084− sha256 = "05f2hr3229zph3x9lhmabb9rzdf61r92f3ybj2gs40hfbak0c3pb";

1083+ rev = "a8401479822e638fa70472009949e7be8b24e0fd";

1084+ sha256 = "1dl4b8xhvnb2x9fw220jis7hqmiwfz0969d44l96p41bj68qbbs9";

10851085 };

10861086 meta.homepage = "https://github.com/nvim-lua/diagnostic-nvim/";

10871087 };

@@ -1112,12 +1112,12 @@ let

11121112

11131113 dracula-vim = buildVimPluginFrom2Nix {

11141114 pname = "dracula-vim";

1115− version = "2020-11-04";

1115+ version = "2020-11-13";

11161116 src = fetchFromGitHub {

11171117 owner = "dracula";

11181118 repo = "vim";

1119− rev = "8242b8f5aaa07fb3102d8ef649797454039b261b";

1120− sha256 = "15sjrn8ajagbymxswa5qmaqbw517s2j9xavzhfxmfffv9h10rs3c";

1119+ rev = "ba00ac0432541811955e50b8420c25b22762c7c9";

1120+ sha256 = "1rp0zip0p07rbfiz8b5nvm6k1d80yvdgn4h59v3bg8j9qan7rg3h";

11211121 };

11221122 meta.homepage = "https://github.com/dracula/vim/";

11231123 };

@@ -1343,12 +1343,12 @@ let

13431343

13441344 fzf-vim = buildVimPluginFrom2Nix {

13451345 pname = "fzf-vim";

1346− version = "2020-11-03";

1346+ version = "2020-11-11";

13471347 src = fetchFromGitHub {

13481348 owner = "junegunn";

13491349 repo = "fzf.vim";

1350− rev = "61c4b6d1ed30287edcbfd3dbaed4e43b5c251c93";

1351− sha256 = "09fx5bg9kaw2zv98vvvx5pix0b0dn06kxk3mq9khiak2liyq96lv";

1350+ rev = "53b3aea0da5e3581e224c958dbc13558cbe5daee";

1351+ sha256 = "0r19v3431ps7mmq2vb0vf1phwmgi1xp0n7z43wa68i4ilyjhbnr6";

13521352 };

13531353 meta.homepage = "https://github.com/junegunn/fzf.vim/";

13541354 };

@@ -1559,12 +1559,12 @@ let

15591559

15601560 hoon-vim = buildVimPluginFrom2Nix {

15611561 pname = "hoon-vim";

1562− version = "2020-10-15";

1562+ version = "2020-11-09";

15631563 src = fetchFromGitHub {

15641564 owner = "urbit";

15651565 repo = "hoon.vim";

1566− rev = "aeb307427f2ffaf756cb04574f5ed0d77626d51e";

1567− sha256 = "11nsws8q54lya6lk51zkwhv47rmidg1wclgd4vq7v4jwc25gw8id";

1566+ rev = "91b1922f8627bb0a55341bb088f2526d0f43a6ac";

1567+ sha256 = "0h87r7r74iljwvfc6mb1maa08cxwnk6k89gc6vnwqm1zx6qxw1js";

15681568 };

15691569 meta.homepage = "https://github.com/urbit/hoon.vim/";

15701570 };

@@ -1655,12 +1655,12 @@ let

16551655

16561656 indentLine = buildVimPluginFrom2Nix {

16571657 pname = "indentLine";

1658− version = "2020-10-12";

1658+ version = "2020-11-11";

16591659 src = fetchFromGitHub {

16601660 owner = "Yggdroot";

16611661 repo = "indentLine";

1662− rev = "6107214eff0cac5d9810d29ae8614ddfdfcd986b";

1663− sha256 = "1aycs427w9w5hjnif5c13wf3jd872a3i94zzdfisfrispbs3ad2m";

1662+ rev = "9662ef8f0443211b11fd87919343d12179bca548";

1663+ sha256 = "1mdbppz3xb8dzbw61fcv3gn3ad4hgia9i5s96vyw5frwxlkfyqpm";

16641664 };

16651665 meta.homepage = "https://github.com/Yggdroot/indentLine/";

16661666 };

@@ -1920,12 +1920,12 @@ let

19201920

19211921 lh-vim-lib = buildVimPluginFrom2Nix {

19221922 pname = "lh-vim-lib";

1923− version = "2020-10-27";

1923+ version = "2020-11-10";

19241924 src = fetchFromGitHub {

19251925 owner = "LucHermitte";

19261926 repo = "lh-vim-lib";

1927− rev = "b5959b4fa3635d9a7eac587a5c223effca14a970";

1928− sha256 = "0rfl5c2bf0j6kn1knzg4kywi7xvqhr6impwfh5466ncb4p529vlk";

1927+ rev = "38a20127dc8aaf76f686b0b96023b51c466969b9";

1928+ sha256 = "19pw4mmhp4cj2xjb6ygiahmix2wq123a738whjg5137zkrzfqz2j";

19291929 };

19301930 meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/";

19311931 };

@@ -1956,11 +1956,11 @@ let

19561956

19571957 lightline-vim = buildVimPluginFrom2Nix {

19581958 pname = "lightline-vim";

1959− version = "2020-11-05";

1959+ version = "2020-11-13";

19601960 src = fetchFromGitHub {

19611961 owner = "itchyny";

19621962 repo = "lightline.vim";

1963− rev = "53176a0b75d6389d775d7bce0d494e58fc654f38";

1963+ rev = "fdccae8c9dc243d58f48c428b99be4920f89d1a0";

19641964 sha256 = "0wg0nrjbr8my98ivaawj3khyx1fkkgbafwhmq6mlb8j8aj47pigx";

19651965 };

19661966 meta.homepage = "https://github.com/itchyny/lightline.vim/";

@@ -2280,12 +2280,12 @@ let

22802280

22812281 neco-vim = buildVimPluginFrom2Nix {

22822282 pname = "neco-vim";

2283− version = "2020-09-13";

2283+ version = "2020-11-10";

22842284 src = fetchFromGitHub {

22852285 owner = "Shougo";

22862286 repo = "neco-vim";

2287− rev = "e7b5a73cba668a351b0953063b6e18e1dc1773b2";

2288− sha256 = "0mfli085rpr5assb4n21wnd59fnnsbfilim7impcwr9imvrw6ymf";

2287+ rev = "2b1dca6ca16d6f5655748fcd4d54d772fcfd0d81";

2288+ sha256 = "1prnclm9i7m09v1ip0sgkgddxwclas3x48zc8c800vxmmvjhzd7j";

22892289 };

22902290 meta.homepage = "https://github.com/Shougo/neco-vim/";

22912291 };

@@ -2316,12 +2316,12 @@ let

23162316

23172317 neoformat = buildVimPluginFrom2Nix {

23182318 pname = "neoformat";

2319− version = "2020-11-02";

2319+ version = "2020-11-05";

23202320 src = fetchFromGitHub {

23212321 owner = "sbdchd";

23222322 repo = "neoformat";

2323− rev = "2132bc678f5389593cea1b82ec1ea630cde0041a";

2324− sha256 = "0h4ymq4jgxw48s2ccvsj5612pmb8vdsqq2hgx877rjji1chxk432";

2323+ rev = "0b1c3ed1d19fceb3c7367fe40ef9934819effb13";

2324+ sha256 = "0479vh85cdrijrghpkva5s4sv0q66hs5n2gl5nhqplz52may0xxg";

23252325 };

23262326 meta.homepage = "https://github.com/sbdchd/neoformat/";

23272327 };

@@ -2340,12 +2340,12 @@ let

23402340

23412341 neomake = buildVimPluginFrom2Nix {

23422342 pname = "neomake";

2343− version = "2020-07-15";

2343+ version = "2020-11-09";

23442344 src = fetchFromGitHub {

23452345 owner = "neomake";

23462346 repo = "neomake";

2347− rev = "a3082cca83424e28730c738cf33157326b0be5ba";

2348− sha256 = "0jxxy6ibj73xh77rvfkcqr98q1pr563zsmzq1qdm3s9lb6xvzka6";

2347+ rev = "3b611ca24a7b78f7842facf6361404724717af1a";

2348+ sha256 = "0x710kk7cac4m6s7xlqbm8pch1kfbwkmk6myvmsgf2qflj2qxn2j";

23492349 };

23502350 meta.homepage = "https://github.com/neomake/neomake/";

23512351 };

@@ -2364,12 +2364,12 @@ let

23642364

23652365 neosnippet-snippets = buildVimPluginFrom2Nix {

23662366 pname = "neosnippet-snippets";

2367− version = "2020-10-08";

2367+ version = "2020-11-10";

23682368 src = fetchFromGitHub {

23692369 owner = "Shougo";

23702370 repo = "neosnippet-snippets";

2371− rev = "7448233dfd40e7f0a1075fefa76d1d5a84e5d28a";

2372− sha256 = "0dy7fgdhkz06720ws4r5gyksqg60hb2v157vkbzii3jqd5fx8mkf";

2371+ rev = "4b0829cc82704d98ac65a95e9317b8dd1fe90dee";

2372+ sha256 = "0yvkixv8ls4j7blfnk4a4bkxr47qfq0rs7ddzsfc6m3w2zms7c6j";

23732373 };

23742374 meta.homepage = "https://github.com/Shougo/neosnippet-snippets/";

23752375 };

@@ -2400,12 +2400,12 @@ let

24002400

24012401 neoterm = buildVimPluginFrom2Nix {

24022402 pname = "neoterm";

2403− version = "2020-09-30";

2403+ version = "2020-11-05";

24042404 src = fetchFromGitHub {

24052405 owner = "kassio";

24062406 repo = "neoterm";

2407− rev = "e24d0edc1ac932da813e3034b6ecee9179c4b0e9";

2408− sha256 = "1n21i2y8w58ijqsj8c798s60in6lbw3ayx35vm781sk2gfrf1ckl";

2407+ rev = "78461935fcd6888c02e4368126a2cb645b80816e";

2408+ sha256 = "07szw3jd5vj4sxzmrdalk79pdba7cm0c7k3rvn5bw4lyjgzml7ll";

24092409 };

24102410 meta.homepage = "https://github.com/kassio/neoterm/";

24112411 };

@@ -2472,24 +2472,24 @@ let

24722472

24732473 nerdtree-git-plugin = buildVimPluginFrom2Nix {

24742474 pname = "nerdtree-git-plugin";

2475− version = "2020-10-16";

2475+ version = "2020-11-11";

24762476 src = fetchFromGitHub {

24772477 owner = "Xuyuanp";

24782478 repo = "nerdtree-git-plugin";

2479− rev = "01b84c63b9ba48628285779fbdfd046dd2bc2970";

2480− sha256 = "1bmnm5my7r8ranafanwc33qksic444p47i23qsnkkphxk2hiq5q7";

2479+ rev = "9e33a3fe8aa90f5ece2439f3b1b3a98fe7e35f85";

2480+ sha256 = "1qv526rn4yysvpka6pigs4p6gk5izqh0ik32b5aa2qk3059lkpx4";

24812481 };

24822482 meta.homepage = "https://github.com/Xuyuanp/nerdtree-git-plugin/";

24832483 };

24842484

24852485 neuron-vim = buildVimPluginFrom2Nix {

24862486 pname = "neuron-vim";

2487− version = "2020-10-29";

2487+ version = "2020-11-11";

24882488 src = fetchFromGitHub {

24892489 owner = "fiatjaf";

24902490 repo = "neuron.vim";

2491− rev = "2b4321bf12a4d0b589cd8c26aabb7e31311dab26";

2492− sha256 = "0h8m72n4jdl9fa308wrchckn6xsbs3b5w8b0714qf9rdpg8jzwa6";

2491+ rev = "1f0d334aaee523c9269811809d64b0d2057a3fdf";

2492+ sha256 = "18shra0cff76vsla9ydzmbi41d2iqgb6fh7f9i994lknjqlhfcgw";

24932493 };

24942494 meta.homepage = "https://github.com/fiatjaf/neuron.vim/";

24952495 };

@@ -2604,12 +2604,12 @@ let

26042604

26052605 nvim-treesitter = buildVimPluginFrom2Nix {

26062606 pname = "nvim-treesitter";

2607− version = "2020-11-04";

2607+ version = "2020-11-13";

26082608 src = fetchFromGitHub {

26092609 owner = "nvim-treesitter";

26102610 repo = "nvim-treesitter";

2611− rev = "6e80f426bf9dc44c14b73d3589c6e19cbe9aa682";

2612− sha256 = "14nprh59sif0kvkdxqw8ij7wnnm4d5zcv4cfgah4y7mj5a99na53";

2611+ rev = "1f98c2e92810f02afcd7ce981beac5142e34ea87";

2612+ sha256 = "1g9f1w9xghzmy9npf208ywb67wx6ryz6vfl2k0shwk7iym0fxpyp";

26132613 };

26142614 meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";

26152615 };

@@ -2640,12 +2640,12 @@ let

26402640

26412641 oceanic-next = buildVimPluginFrom2Nix {

26422642 pname = "oceanic-next";

2643− version = "2019-04-10";

2643+ version = "2020-11-08";

26442644 src = fetchFromGitHub {

26452645 owner = "mhartington";

26462646 repo = "oceanic-next";

2647− rev = "08158eec24cd154afd1623686aeb336fad580be7";

2648− sha256 = "1s2h9mnhl54ww7zpdllwlxz93d5i7l7rx3s9mr8w6sv8azcak3v8";

2647+ rev = "9fa644b0f545cad22ee28ee3dd9a719a9a6bf75b";

2648+ sha256 = "0xxc6im5rvd2c14i0jpnsgjhcsc7l5zs30razc4gqvv753g663qs";

26492649 };

26502650 meta.homepage = "https://github.com/mhartington/oceanic-next/";

26512651 };

@@ -2676,12 +2676,12 @@ let

26762676

26772677 open-browser-github-vim = buildVimPluginFrom2Nix {

26782678 pname = "open-browser-github-vim";

2679− version = "2020-07-08";

2679+ version = "2020-11-11";

26802680 src = fetchFromGitHub {

26812681 owner = "tyru";

26822682 repo = "open-browser-github.vim";

2683− rev = "7c31cd0093fdf89d53fa02b210c82b1326b00a8c";

2684− sha256 = "1r3b16b7siyxj3n44z899spma5vamc5g76p947h95m9d0rc6sfnk";

2683+ rev = "ee132b0f8ea180f996a2e34c5e977d23c615b47a";

2684+ sha256 = "17da42h05840vv8n4sj0im4rc18g2drb9sh0grjlpnz86mc8fqj0";

26852685 };

26862686 meta.homepage = "https://github.com/tyru/open-browser-github.vim/";

26872687 };

@@ -2712,12 +2712,12 @@ let

27122712

27132713 papercolor-theme = buildVimPluginFrom2Nix {

27142714 pname = "papercolor-theme";

2715− version = "2020-06-16";

2715+ version = "2020-11-09";

27162716 src = fetchFromGitHub {

27172717 owner = "NLKNguyen";

27182718 repo = "papercolor-theme";

2719− rev = "c657f5c2d5964bbae633f8a42c16f8316f6d6733";

2720− sha256 = "1vv1gd64isrgyxc4fyp5mzlhffwkzdc8agnv0aka4v7qdaca45ni";

2719+ rev = "0428fc228afc50085326bfd43746b7734e42c428";

2720+ sha256 = "092zp0f5jvfwh2q8asxdnkrhz9djgw0lqzg70g38xk606fxy16a9";

27212721 };

27222722 meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/";

27232723 };

@@ -3132,12 +3132,12 @@ let

31323132

31333133 skim-vim = buildVimPluginFrom2Nix {

31343134 pname = "skim-vim";

3135− version = "2020-10-20";

3135+ version = "2020-11-11";

31363136 src = fetchFromGitHub {

31373137 owner = "lotabout";

31383138 repo = "skim.vim";

3139− rev = "2908249af6b759c79c7834862bd42af3a8bc6d4e";

3140− sha256 = "1819niha13yzhk7sya1mx8qigjwacd4mdp6s2hkk03l1s6x84dj7";

3139+ rev = "83faea7f2581005d4adc9256ec76e0fe3f8a15e6";

3140+ sha256 = "0wppb2wgpk085cwh9kmqzv6f30j2hb3brqx2ik371gkrcfbpf4ly";

31413141 };

31423142 meta.homepage = "https://github.com/lotabout/skim.vim/";

31433143 };

@@ -3313,12 +3313,12 @@ let

33133313

33143314 syntastic = buildVimPluginFrom2Nix {

33153315 pname = "syntastic";

3316− version = "2020-11-04";

3316+ version = "2020-11-06";

33173317 src = fetchFromGitHub {

33183318 owner = "vim-syntastic";

33193319 repo = "syntastic";

3320− rev = "5788b1c6df63bc31ae93d6c1a3523e0602c60901";

3321− sha256 = "1a6mr5ffwx7f7yclp9i2hvkq2lf3zm1j4761vqmc8nq73w4sbd2z";

3320+ rev = "63741646a9e87bbe105674747555aded6f52c490";

3321+ sha256 = "0x1rn76zjig4kdbs719fcpc22mbh2jz93ni8zpzpkn8r186f05s5";

33223322 };

33233323 meta.homepage = "https://github.com/vim-syntastic/syntastic/";

33243324 };

@@ -3361,12 +3361,12 @@ let

33613361

33623362 tagbar = buildVimPluginFrom2Nix {

33633363 pname = "tagbar";

3364− version = "2020-11-03";

3364+ version = "2020-11-13";

33653365 src = fetchFromGitHub {

33663366 owner = "preservim";

33673367 repo = "tagbar";

3368− rev = "53c8e196764ec74353c0e9c758daa108b9fe4c38";

3369− sha256 = "07ayc60w86w4mnm49jh4h89pwz5ry2a5vagy8xsv5hy1r6wqirpy";

3368+ rev = "68a77323cb707e227d16302d39d35949dbb0f85a";

3369+ sha256 = "1038p1w7pfwg6ydqxbahb9plab8d40mdqmnbm6z36y7yrssmjhsj";

33703370 };

33713371 meta.homepage = "https://github.com/preservim/tagbar/";

33723372 };

@@ -3409,14 +3409,14 @@ let

34093409

34103410 telescope-nvim = buildVimPluginFrom2Nix {

34113411 pname = "telescope-nvim";

3412− version = "2020-11-03";

3412+ version = "2020-11-13";

34133413 src = fetchFromGitHub {

3414− owner = "nvim-lua";

3414+ owner = "nvim-telescope";

34153415 repo = "telescope.nvim";

3416− rev = "1f3110bf54877b975956e42911e05d517d8f4993";

3417− sha256 = "1172fj2vzf9p86pvl9b297xp9qmikwmcj7j3qv3dgk3rdh4f66mg";

3416+ rev = "3e58e1ab7d4c80fec7d9b02e3f27503bd72f21ff";

3417+ sha256 = "0ilxdffipa7mcaam1x21h0k578q2mq76a4ajnmmmis7066jk39z4";

34183418 };

3419− meta.homepage = "https://github.com/nvim-lua/telescope.nvim/";

3419+ meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";

34203420 };

34213421

34223422 tender-vim = buildVimPluginFrom2Nix {

@@ -3554,24 +3554,24 @@ let

35543554

35553555 ultisnips = buildVimPluginFrom2Nix {

35563556 pname = "ultisnips";

3557− version = "2020-10-21";

3557+ version = "2020-11-09";

35583558 src = fetchFromGitHub {

35593559 owner = "SirVer";

35603560 repo = "ultisnips";

3561− rev = "e6478871c04bb75f3c6cb9b90e171fffbf9c8ff3";

3562− sha256 = "17f1q0hv89l5mdiv3xrk1l3lnlxj6gbg8pnzcpx5dk4sd14xivd3";

3561+ rev = "b837416c1ffe39b168baee35c0938739e96211c5";

3562+ sha256 = "1c1ahpdw0d18x5g5s5mpv7mcf0igrpla33k2khmk4q739ywb21qc";

35633563 };

35643564 meta.homepage = "https://github.com/SirVer/ultisnips/";

35653565 };

35663566

35673567 undotree = buildVimPluginFrom2Nix {

35683568 pname = "undotree";

3569− version = "2019-03-13";

3569+ version = "2020-11-10";

35703570 src = fetchFromGitHub {

35713571 owner = "mbbill";

35723572 repo = "undotree";

3573− rev = "be23eacb2a63380bd79e207a738c728214ecc9d3";

3574− sha256 = "00zyvff32zp7pyjzkq8da9xhr378mlpi8gj717yfr9wbwwarwfd7";

3573+ rev = "9ceb50062135dd30de3da000d5fd46125f51887d";

3574+ sha256 = "1vwjggf3csbysavk3yyfzjklyq8xwfvk17rprmj660h2whgjjzvg";

35753575 };

35763576 meta.homepage = "https://github.com/mbbill/undotree/";

35773577 };

@@ -3902,12 +3902,12 @@ let

39023902

39033903 vim-airline = buildVimPluginFrom2Nix {

39043904 pname = "vim-airline";

3905− version = "2020-11-05";

3905+ version = "2020-11-10";

39063906 src = fetchFromGitHub {

39073907 owner = "vim-airline";

39083908 repo = "vim-airline";

3909− rev = "d64e5f8dd7ac0b094f0caacc63453a0418b37fdb";

3910− sha256 = "0kspf0m00slrscld6qg5rj3i4lr9pwv25xvqqldyk8h884b182g7";

3909+ rev = "731bdb11d2f57365e02bdb8adaeb59a8b93db27d";

3910+ sha256 = "1b6l1460319rnl4p3zzpz3ngc114bfyqicbdyq6pk4sy5hbn15j1";

39113911 };

39123912 meta.homepage = "https://github.com/vim-airline/vim-airline/";

39133913 };

@@ -3926,12 +3926,12 @@ let

39263926

39273927 vim-airline-themes = buildVimPluginFrom2Nix {

39283928 pname = "vim-airline-themes";

3929− version = "2020-11-05";

3929+ version = "2020-11-08";

39303930 src = fetchFromGitHub {

39313931 owner = "vim-airline";

39323932 repo = "vim-airline-themes";

3933− rev = "3dafdfc0424716bae21f5340314f7d90a9ddf4f2";

3934− sha256 = "1j18anw9202cplfzgmsy8y6pl8zrxwnrhyn9djy580slakrk1s8k";

3933+ rev = "cd6f16978d5af4b9fb861be9d728732d72789df3";

3934+ sha256 = "0ifb43q053grj2fvjjw52xsr79xnpc00k9302xnx1x4li9s5l64d";

39353935 };

39363936 meta.homepage = "https://github.com/vim-airline/vim-airline-themes/";

39373937 };

@@ -4046,12 +4046,12 @@ let

40464046

40474047 vim-bsv = buildVimPluginFrom2Nix {

40484048 pname = "vim-bsv";

4049− version = "2019-07-11";

4049+ version = "2020-11-08";

40504050 src = fetchFromGitHub {

40514051 owner = "mtikekar";

40524052 repo = "vim-bsv";

4053− rev = "dc775cb06891dd0923b5e2a882f5dcee6451540a";

4054− sha256 = "18wsbvypi62nwgcazw2m47d6k8ymlv1zwabs2gwl931n710ldkfc";

4053+ rev = "b03893b98f5b772297e48671a9c5f92f1c7d10eb";

4054+ sha256 = "1cd0jmxmb30c50a0ssa96a34qm2r3vasnn0x6ah9azx75k4anrcx";

40554055 };

40564056 meta.homepage = "https://github.com/mtikekar/vim-bsv/";

40574057 };

@@ -4130,12 +4130,12 @@ let

41304130

41314131 vim-clap = buildVimPluginFrom2Nix {

41324132 pname = "vim-clap";

4133− version = "2020-11-04";

4133+ version = "2020-11-07";

41344134 src = fetchFromGitHub {

41354135 owner = "liuchengxu";

41364136 repo = "vim-clap";

4137− rev = "992c2d43318ba096eedac0592a0c2d6f90fed236";

4138− sha256 = "1nl29l1zb9prsm5iz0psiav846fv2ybwxd06rmf2mcigg96502vr";

4137+ rev = "45a91bf706e9dcf85172c126bbac8964e209a4ae";

4138+ sha256 = "1b7sb9dqdy48w28pjhh9vsr20w0gd5lillrlynskywab9x99ifkx";

41394139 };

41404140 meta.homepage = "https://github.com/liuchengxu/vim-clap/";

41414141 };

@@ -4178,12 +4178,12 @@ let

41784178

41794179 vim-codefmt = buildVimPluginFrom2Nix {

41804180 pname = "vim-codefmt";

4181− version = "2020-09-09";

4181+ version = "2020-11-12";

41824182 src = fetchFromGitHub {

41834183 owner = "google";

41844184 repo = "vim-codefmt";

4185− rev = "9346c381c94c0f9312c6e7970a4ab15419935464";

4186− sha256 = "03nymldw5ifc57z5vr0xaz00vml6v854zp2fnzm4q9v9n295kh66";

4185+ rev = "d418de02d5a6225883b08466414e33e80a509685";

4186+ sha256 = "1lsl2xcsyjj7ri32p89d425bq1lhpkbfac72hnwc7k6xwq87ibgm";

41874187 };

41884188 meta.homepage = "https://github.com/google/vim-codefmt/";

41894189 };

@@ -4586,12 +4586,12 @@ let

45864586

45874587 vim-exchange = buildVimPluginFrom2Nix {

45884588 pname = "vim-exchange";

4589− version = "2020-06-24";

4589+ version = "2020-11-09";

45904590 src = fetchFromGitHub {

45914591 owner = "tommcdo";

45924592 repo = "vim-exchange";

4593− rev = "0e95600517aad244d947b955a2e34ec30bdd09ff";

4594− sha256 = "1dh8xc5szm5rrv7xp299hcfhgp1155k5kfipzz6q2r69blhwyl1d";

4593+ rev = "8bb662407f8576fa645fb6908b63b6473e236580";

4594+ sha256 = "08q39xg1s90gkp24v374kbvsw6lzin61b1mkp4ibkl76h2lp0r3g";

45954595 };

45964596 meta.homepage = "https://github.com/tommcdo/vim-exchange/";

45974597 };

@@ -4694,12 +4694,12 @@ let

46944694

46954695 vim-floaterm = buildVimPluginFrom2Nix {

46964696 pname = "vim-floaterm";

4697− version = "2020-10-19";

4697+ version = "2020-11-10";

46984698 src = fetchFromGitHub {

46994699 owner = "voldikss";

47004700 repo = "vim-floaterm";

4701− rev = "f6654e2f9c29bd85039a11f305acd4e5222b03f8";

4702− sha256 = "07bh7hkajfg5gchmi0psy0anaz2rdvhii3p09xml9dfkvrapzdrx";

4701+ rev = "3c34e84282f542be7dc75c3d2154c1f25df4a47e";

4702+ sha256 = "1c48s8655fg1bddnzxpqfl8cxdk3dsc4a45ixsc7s910bk8rlxn6";

47034703 };

47044704 meta.homepage = "https://github.com/voldikss/vim-floaterm/";

47054705 };

@@ -4802,12 +4802,12 @@ let

48024802

48034803 vim-gitgutter = buildVimPluginFrom2Nix {

48044804 pname = "vim-gitgutter";

4805− version = "2020-10-30";

4805+ version = "2020-11-05";

48064806 src = fetchFromGitHub {

48074807 owner = "airblade";

48084808 repo = "vim-gitgutter";

4809− rev = "696a6ed389e5b54c8bf480f44ee4e8fc59e6f903";

4810− sha256 = "1x38qi9kzhvhfyrzhfbzj8xvgmi02prqg6zcvpnwdmxcs5asgj39";

4809+ rev = "987a33355ef424161fdbc4e5d625b5b5aed9704c";

4810+ sha256 = "1qg5ri74wipf0krnwgii2jqdzy36hpwnx8nvgf7vkw8a3l90rswj";

48114811 };

48124812 meta.homepage = "https://github.com/airblade/vim-gitgutter/";

48134813 };

@@ -4838,12 +4838,12 @@ let

48384838

48394839 vim-go = buildVimPluginFrom2Nix {

48404840 pname = "vim-go";

4841− version = "2020-11-01";

4841+ version = "2020-11-13";

48424842 src = fetchFromGitHub {

48434843 owner = "fatih";

48444844 repo = "vim-go";

4845− rev = "35ea9acf5fc409d1eed341333789f18c2d135c66";

4846− sha256 = "0n6yj1ql2c2kq9y407zr9d6pkpwp7jjzssbd0fyl68cb9rxzg3j8";

4845+ rev = "e3d6ada0530190300a5227bb0b417ee71b994cc2";

4846+ sha256 = "1kyyidicghhgnsc9x2gynnxh4x6yzjdg5d633sb74xkkhgvxx9yn";

48474847 };

48484848 meta.homepage = "https://github.com/fatih/vim-go/";

48494849 };

@@ -4862,12 +4862,12 @@ let

48624862

48634863 vim-graphql = buildVimPluginFrom2Nix {

48644864 pname = "vim-graphql";

4865− version = "2020-10-04";

4865+ version = "2020-11-12";

48664866 src = fetchFromGitHub {

48674867 owner = "jparise";

48684868 repo = "vim-graphql";

4869− rev = "51c5b178cce145c3aaa22fbc37fd5d64065baebc";

4870− sha256 = "0kgnyc94fd5i7456vdnad58yn1qcanfp0lg7xdf5dbs1nbarzywg";

4869+ rev = "c2fe34c8c950aceb56b9b4c69e9e95922fa7a78e";

4870+ sha256 = "1q7v0qyd1my9hgxyhz921fr4c6x9ipfgqlm41546iz097vnv715p";

48714871 };

48724872 meta.homepage = "https://github.com/jparise/vim-graphql/";

48734873 };

@@ -5271,12 +5271,12 @@ let

52715271

52725272 vim-jsx-pretty = buildVimPluginFrom2Nix {

52735273 pname = "vim-jsx-pretty";

5274− version = "2020-09-29";

5274+ version = "2020-11-07";

52755275 src = fetchFromGitHub {

52765276 owner = "MaxMEllon";

52775277 repo = "vim-jsx-pretty";

5278− rev = "3a24dca8f8cc9b88efca3faf446db41f5b7da121";

5279− sha256 = "0gn9rlwndq0awv51gxvd3gsxlh5sb76cvc60bh0lsh4f4lhmyy3r";

5278+ rev = "8059c9269ab62ffc4ccca587e2a2a894806fa5e6";

5279+ sha256 = "04jmmyz79mrq7mpl9kqrc8v28gn50jl93lzkyyhzp7dyhixgbgkm";

52805280 };

52815281 meta.homepage = "https://github.com/MaxMEllon/vim-jsx-pretty/";

52825282 };

@@ -5439,12 +5439,12 @@ let

54395439

54405440 vim-lsc = buildVimPluginFrom2Nix {

54415441 pname = "vim-lsc";

5442− version = "2020-10-17";

5442+ version = "2020-11-08";

54435443 src = fetchFromGitHub {

54445444 owner = "natebosch";

54455445 repo = "vim-lsc";

5446− rev = "9230c11dfb630ef4a9dadf491f1e1c1b2d86ace8";

5447− sha256 = "13w3fjwy3iy6j48f16g3bg956dd0fl9ynywd1nqvk4ba305g6crx";

5446+ rev = "c8f04821a9b92fd5675ed9ad54c59bec9af37eaf";

5447+ sha256 = "1m6cr2c3srnddxmmly8icnx1jyzh5cjxf9sffp3f871cgq954jy7";

54485448 };

54495449 meta.homepage = "https://github.com/natebosch/vim-lsc/";

54505450 };

@@ -5643,12 +5643,12 @@ let

56435643

56445644 vim-mundo = buildVimPluginFrom2Nix {

56455645 pname = "vim-mundo";

5646− version = "2020-07-20";

5646+ version = "2020-11-08";

56475647 src = fetchFromGitHub {

56485648 owner = "simnalamburt";

56495649 repo = "vim-mundo";

5650− rev = "f6b24082b1d22932cb834673c37aa936b6f4f6da";

5651− sha256 = "1xr7g5wxfdd2rzdr94p2sasfm6zyha2rhjr3rx5mnpbcik7l3j61";

5650+ rev = "33a91cc55ebc7a55b8846c46f0ab50ec0d81613f";

5651+ sha256 = "18qbmnwlwf9hmak73zam44daf6c50hi72b9g8ra7v1l5psgi39z7";

56525652 };

56535653 meta.homepage = "https://github.com/simnalamburt/vim-mundo/";

56545654 };

@@ -5871,12 +5871,12 @@ let

58715871

58725872 vim-pandoc = buildVimPluginFrom2Nix {

58735873 pname = "vim-pandoc";

5874− version = "2020-07-30";

5874+ version = "2020-11-07";

58755875 src = fetchFromGitHub {

58765876 owner = "vim-pandoc";

58775877 repo = "vim-pandoc";

5878− rev = "049ece9fa8f21afaa62215865afac22daa6fd30f";

5879− sha256 = "0wjrbp06ffh9ficd22lcijrc99n72b7gbg5lqpms9r0442fb88kq";

5878+ rev = "0aeed75603a55887c2b492d1fe19ac8065dae671";

5879+ sha256 = "13xjpkq9lbb04igwif23zmb3395awk48kdyfshsga2gbv5h1i9fn";

58805880 };

58815881 meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/";

58825882 };

@@ -6051,12 +6051,12 @@ let

60516051

60526052 vim-projectionist = buildVimPluginFrom2Nix {

60536053 pname = "vim-projectionist";

6054− version = "2020-05-05";

6054+ version = "2020-10-31";

60556055 src = fetchFromGitHub {

60566056 owner = "tpope";

60576057 repo = "vim-projectionist";

6058− rev = "1d95458273a8ecdb678e65db918c045f9bb7e220";

6059− sha256 = "1h5gb29rs64cfr55g12s1f0w0cqzqs2nhfw8qfbfch5jbh21p10p";

6058+ rev = "0c6967d3a8c3bd3d3b42013531c3f12c843aff80";

6059+ sha256 = "1s6yxnlwxlblj5m9gxlc8699g2a1d7cbjacp4fk4fa9mrkga7bv8";

60606060 };

60616061 meta.homepage = "https://github.com/tpope/vim-projectionist/";

60626062 };

@@ -6495,12 +6495,12 @@ let

64956495

64966496 vim-snippets = buildVimPluginFrom2Nix {

64976497 pname = "vim-snippets";

6498− version = "2020-11-02";

6498+ version = "2020-11-13";

64996499 src = fetchFromGitHub {

65006500 owner = "honza";

65016501 repo = "vim-snippets";

6502− rev = "0f3d4d187c842419fe6e131fe20f5f3336418a62";

6503− sha256 = "09phzarfakz5mv3jshsab60iiq8byv6xggb0qiasafvxfrcx8c2s";

6502+ rev = "3e30104f106a2aaf4dc5f7072aba7d97fdf8bb2d";

6503+ sha256 = "1pxh5s9r20wbawyrcalkb6nr21xsmsc00wdaf2ryz5vhpakai72w";

65046504 };

65056505 meta.homepage = "https://github.com/honza/vim-snippets/";

65066506 };

@@ -6844,12 +6844,12 @@ let

68446844

68456845 vim-tmux-navigator = buildVimPluginFrom2Nix {

68466846 pname = "vim-tmux-navigator";

6847− version = "2020-09-29";

6847+ version = "2020-11-12";

68486848 src = fetchFromGitHub {

68496849 owner = "christoomey";

68506850 repo = "vim-tmux-navigator";

6851− rev = "6c0b5d2faa49f2059331a4004b34a916c96abcb3";

6852− sha256 = "11kq87drp0ca5rj9j34rpajbzv79wxm3k2cf249dxvi0chcl41ma";

6851+ rev = "6a1e58c3ca3bc7acca36c90521b3dfae83b2a602";

6852+ sha256 = "17219h69vd6b994qrywg1rpx80y1rmycbfsmf9wb6c693sx721sn";

68536853 };

68546854 meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/";

68556855 };

@@ -6880,12 +6880,12 @@ let

68806880

68816881 vim-trailing-whitespace = buildVimPluginFrom2Nix {

68826882 pname = "vim-trailing-whitespace";

6883− version = "2020-06-29";

6883+ version = "2020-11-13";

68846884 src = fetchFromGitHub {

68856885 owner = "bronson";

68866886 repo = "vim-trailing-whitespace";

6887− rev = "610ca1a97c8dc85cdeb38635e5a4703317c4b94d";

6888− sha256 = "1bh15yw2aysvpn2ndnc0s6jzc0y93x6q1blc5pph67rdix5bm7gy";

6887+ rev = "b5289251ae8f93473febdcf2fd10e39a8287d9fd";

6888+ sha256 = "083zlwm3a85cclb28ryas4rpd3b4ph8n7chb1nwvcc22g447pfsl";

68896889 };

68906890 meta.homepage = "https://github.com/bronson/vim-trailing-whitespace/";

68916891 };

@@ -7000,24 +7000,24 @@ let

70007000

70017001 vim-vsnip = buildVimPluginFrom2Nix {

70027002 pname = "vim-vsnip";

7003− version = "2020-10-27";

7003+ version = "2020-11-08";

70047004 src = fetchFromGitHub {

70057005 owner = "hrsh7th";

70067006 repo = "vim-vsnip";

7007− rev = "562cabf644314c97224a025ad2594a47966e6207";

7008− sha256 = "1i1b8la3w9x8lay63kqx958k4csxnqmdw9bfmhyh2vf1p0cdqv6l";

7007+ rev = "5fedeec956359d05496ad92fb6fd02231aeb4c76";

7008+ sha256 = "18k44h3fvg8vm8dwxy78jpl1zv8sbr0kiviyxm03hy3n6sb2czlg";

70097009 };

70107010 meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";

70117011 };

70127012

70137013 vim-vsnip-integ = buildVimPluginFrom2Nix {

70147014 pname = "vim-vsnip-integ";

7015− version = "2020-10-25";

7015+ version = "2020-11-09";

70167016 src = fetchFromGitHub {

70177017 owner = "hrsh7th";

70187018 repo = "vim-vsnip-integ";

7019− rev = "383573b9b07fd37caf98247dfdbb1d4711eecee9";

7020− sha256 = "1kavjyr53cbg630snri2x94f7h80p2vl6vlskqfwi3djfdvn68x6";

7019+ rev = "8f171eac11eb7668a33991953f9ae5af9556cc59";

7020+ sha256 = "0a8f1nblgwdv7z0ycxlx5arx68dgg5qzvwwgws18lpf201qp07sx";

70217021 };

70227022 meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/";

70237023 };

@@ -7264,12 +7264,12 @@ let

72647264

72657265 vimspector = buildVimPluginFrom2Nix {

72667266 pname = "vimspector";

7267− version = "2020-10-23";

7267+ version = "2020-11-09";

72687268 src = fetchFromGitHub {

72697269 owner = "puremourning";

72707270 repo = "vimspector";

7271− rev = "7b048367f7d4921e4eeea1bb82e6f368b418d89a";

7272− sha256 = "0n1kqiki5gag7nd5c5gmnv6czv90kzsfndbb92n3wzvwxhpf1ff6";

7271+ rev = "30741f88139931c5ee83ef906cf16ee1187bf8f3";

7272+ sha256 = "01b3q4zmys5xnikwl8jg28057d5war0hk1wzizw3rly3kjmmkx8y";

72737273 fetchSubmodules = true;

72747274 };

72757275 meta.homepage = "https://github.com/puremourning/vimspector/";

@@ -7277,12 +7277,12 @@ let

72777277

72787278 vimtex = buildVimPluginFrom2Nix {

72797279 pname = "vimtex";

7280− version = "2020-10-29";

7280+ version = "2020-11-12";

72817281 src = fetchFromGitHub {

72827282 owner = "lervag";

72837283 repo = "vimtex";

7284− rev = "982185bb454942a5c04d41b647ab58fceb4e7683";

7285− sha256 = "16vy97k6lgl62pibhdfdigfv2gp16hvzlfywv1i6wx46hycb3swq";

7284+ rev = "01762d18f86422ddc85361c86b849f9707f23ef3";

7285+ sha256 = "0ncgfd23x8g5n568amzd9x7bvvm5mgjs7qqmr9qn7hjpprad5icq";

72867286 };

72877287 meta.homepage = "https://github.com/lervag/vimtex/";

72887288 };

@@ -7325,12 +7325,12 @@ let

73257325

73267326 vista-vim = buildVimPluginFrom2Nix {

73277327 pname = "vista-vim";

7328− version = "2020-10-10";

7328+ version = "2020-11-10";

73297329 src = fetchFromGitHub {

73307330 owner = "liuchengxu";

73317331 repo = "vista.vim";

7332− rev = "27889ff58d4340167bb8dd4abbe9ff4a8869da8f";

7333− sha256 = "1asc8fqyv6rfmdd0g5n78mzzssn7rcanzy2d30gddgfa3gr65yms";

7332+ rev = "bc3b2a74efb253be4b79cc7b70b192e1360f26c1";

7333+ sha256 = "0qfdykp7sf4p2h8gfx40qmnfj94p4hksngqqkzrhzi9z3i6fqk2a";

73347334 };

73357335 meta.homepage = "https://github.com/liuchengxu/vista.vim/";

73367336 };

@@ -7349,12 +7349,12 @@ let

73497349

73507350 wal-vim = buildVimPluginFrom2Nix {

73517351 pname = "wal-vim";

7352− version = "2020-03-06";

7352+ version = "2020-11-08";

73537353 src = fetchFromGitHub {

73547354 owner = "dylanaraps";

73557355 repo = "wal.vim";

7356− rev = "10f228ce1e7947f62be412f916229131b7710239";

7357− sha256 = "0aiwsrcqnazam56cvwmck4bf7w543cr219bkmq0ngqzna72h9735";

7356+ rev = "c72ba0d18946f29aab9c95eb6975d321c68b3681";

7357+ sha256 = "03hrn0d6mqjlrixwx5l270jfgwgkzr6xg00h39i49j7k3f1ql078";

73587358 };

73597359 meta.homepage = "https://github.com/dylanaraps/wal.vim/";

73607360 };

@@ -7445,12 +7445,12 @@ let

74457445

74467446 yats-vim = buildVimPluginFrom2Nix {

74477447 pname = "yats-vim";

7448− version = "2020-11-01";

7448+ version = "2020-11-09";

74497449 src = fetchFromGitHub {

74507450 owner = "HerringtonDarkholme";

74517451 repo = "yats.vim";

7452− rev = "fc97ad973a2bbf932dffb74c5560e97f60d21ce7";

7453− sha256 = "07gx88vapcb579nvmkbmps16spvd1y8kvmi28955lw31rxi1n7b3";

7452+ rev = "d4f95eebcf8b765bf1198b57045e45f976ab0c19";

7453+ sha256 = "04blzfgklh9x0xb1qa9bndhha8cnks83v0xn2pr8wzi2i0r3r4mx";

74547454 fetchSubmodules = true;

74557455 };

74567456 meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/";

@@ -7458,12 +7458,12 @@ let

74587458

74597459 YouCompleteMe = buildVimPluginFrom2Nix {

74607460 pname = "YouCompleteMe";

7461− version = "2020-10-30";

7461+ version = "2020-11-13";

74627462 src = fetchFromGitHub {

74637463 owner = "ycm-core";

74647464 repo = "YouCompleteMe";

7465− rev = "fa8c985dee864d33e48e3b3e803b541bdc433ffa";

7466− sha256 = "1cc9wyp3dbh4fvic9zvh2bxqw0nrb3zwzlfj106cs2qbrpkiqszd";

7465+ rev = "604a2a02e070bbd46f58c79a46f4df048e26a97c";

7466+ sha256 = "0m9wfpm855cp9zzg0nsd6bb7ijmgj9vhfhm7x5nhmqjqjfyl8282";

74677467 fetchSubmodules = true;

74687468 };

74697469 meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";

pkgs/misc/vim-plugins/vim-plugin-names+1−1

@@ -373,7 +373,7 @@ nvie/vim-flake8

373373nvim-lua/completion-nvim

374374nvim-lua/diagnostic-nvim

375375nvim-lua/lsp_extensions.nvim

376−nvim-lua/telescope.nvim

376+nvim-telescope/telescope.nvim

377377nvim-treesitter/completion-treesitter

378378nvim-treesitter/nvim-treesitter

379379ocaml/vim-ocaml

pkgs/misc/vscode-extensions/default.nix+4−4

@@ -179,8 +179,8 @@ stdenv.lib.mapAttrs (_n: stdenv.lib.recurseIntoAttrs)

179179 mktplcRef = {

180180 name = "scala";

181181 publisher = "scala-lang";

182− version = "0.3.8";

183− sha256 = "17dl10m3ayf57sqgil4mr9fjdm7i8gb5clrs227b768pp2d39ll9";

182+ version = "0.4.5";

183+ sha256 = "0nrj32a7a86vwc9gfh748xs3mmfwbc304dp7nks61f0lx8b4wzxw";

184184 };

185185 meta = {

186186 license = stdenv.lib.licenses.mit;

@@ -191,8 +191,8 @@ stdenv.lib.mapAttrs (_n: stdenv.lib.recurseIntoAttrs)

191191 mktplcRef = {

192192 name = "metals";

193193 publisher = "scalameta";

194− version = "1.9.4";

195− sha256 = "029s1al1f3qk4pa3539rs045g9jwkhbmdg7wj7biqc6shcria4ca";

194+ version = "1.9.6";

195+ sha256 = "12sjzk64kz7z8zqh3zg1dyb3v4c5xxgi1ain1jvw8hwf0hicqlgi";

196196 };

197197 meta = {

198198 license = stdenv.lib.licenses.asl20;

pkgs/os-specific/linux/bcc/default.nix+2−8

@@ -6,13 +6,13 @@

66

77python.pkgs.buildPythonApplication rec {

88 pname = "bcc";

9− version = "0.16.0";

9+ version = "0.17.0";

1010

1111 disabled = !stdenv.isLinux;

1212

1313 src = fetchurl {

1414 url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz";

15− sha256 = "sha256-ekVRyugpZOU1nr0N9kWCSoJTmtD2qGsn/DmWgK7XZ/c=";

15+ sha256 = "sha256-aEy8WwtKGaf7GZOTK5IHhwzenqU2U+vpWrcNWMCGvMw=";

1616 };

1717 format = "other";

1818

@@ -26,12 +26,6 @@ python.pkgs.buildPythonApplication rec {

2626 # This is needed until we fix

2727 # https://github.com/NixOS/nixpkgs/issues/40427

2828 ./fix-deadlock-detector-import.patch

29−

30− # This is already upstream; remove it on the next release

31− (fetchpatch {

32− url = "https://github.com/iovisor/bcc/commit/60de17161fe7f44b534a8da343edbad2427220e3.patch";

33− sha256 = "0pd5b4vgpdxbsrjwrw2kmn4l9hpj0rwdm3hvwvk7dsr3raz7w4b3";

34− })

3529 ];

3630

3731 propagatedBuildInputs = [ python.pkgs.netaddr ];

pkgs/os-specific/linux/criu/default.nix+2−2

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

44

55stdenv.mkDerivation rec {

66 pname = "criu";

7− version = "3.14";

7+ version = "3.15";

88

99 src = fetchurl {

1010 url = "https://download.openvz.org/criu/${pname}-${version}.tar.bz2";

11− sha256 = "1jrr3v99g18gc0hriz0avq6ccdvyya0j6wwz888sdsc4icc30gzn";

11+ sha256 = "09d0j24x0cyc7wkgi7cnxqgfjk7kbdlm79zxpj8d356sa3rw2z24";

1212 };

1313

1414 enableParallelBuilding = true;

pkgs/os-specific/linux/kernel/hardened/patches.json+10−10

@@ -1,18 +1,18 @@

11{

22 "4.14": {

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"

3+ "name": "linux-hardened-4.14.206.a.patch",

4+ "sha256": "17pd23lvhkpa923nw24g5b0gv0kmzj9jkkmc8366k86r0zxk6z53",

5+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.206.a/linux-hardened-4.14.206.a.patch"

66 },

77 "4.19": {

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"

8+ "name": "linux-hardened-4.19.157.a.patch",

9+ "sha256": "159v7z1a55b5kcmkrdna18hvcnscxf79r00kvr0kl8flvsnhf1p0",

10+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.157.a/linux-hardened-4.19.157.a.patch"

1111 },

1212 "5.4": {

13− "name": "linux-hardened-5.4.76.a.patch",

13+ "name": "linux-hardened-5.4.77.a.patch",

1414 "sha256": "0b47id64vi55s7lmyasmvhwbfcv9cjwfhw9g4lf220g0rnl6h8jm",

15− "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.76.a/linux-hardened-5.4.76.a.patch"

15+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.77.a/linux-hardened-5.4.77.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.7.a.patch",

23+ "name": "linux-hardened-5.9.8.a.patch",

2424 "sha256": "1sb4rsd3yfh49aqg5j24zav9x38c44q7d9pyx6pb8pl368rd26l4",

25− "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.7.a/linux-hardened-5.9.7.a.patch"

25+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.8.a/linux-hardened-5.9.8.a.patch"

2626 }

2727}

pkgs/os-specific/linux/kernel/linux-4.14.nix+2−2

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

33with stdenv.lib;

44

55buildLinux (args // rec {

6− version = "4.14.205";

6+ version = "4.14.206";

77

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 = "0m6ajw3iypxwvym8hmymd0dlcm9gdczpa6y6id4b447r774aqmcc";

16+ sha256 = "1b46f0s15xnlam43cmw8w41rrvcwrhm6km0278lq6f86lpx3w8qw";

1717 };

1818} // (args.argsOverride or {}))

pkgs/os-specific/linux/kernel/linux-4.19.nix+2−2

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

33with stdenv.lib;

44

55buildLinux (args // rec {

6− version = "4.19.156";

6+ version = "4.19.157";

77

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 = "0b9g2v8dvlhq0kbns2z62v93pnaprk7xbjzzx8rk0b522x42nq08";

16+ sha256 = "0mgpgv2ny49bb7kgaygy2ay6ckjgw7mg091viivi66jw4mjs7p3n";

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:

22

33buildLinux (args // rec {

4− version = "4.4.242";

4+ version = "4.4.243";

55 extraMeta.branch = "4.4";

66

77 src = fetchurl {

88 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

9− sha256 = "089gigqali5q8izac82ybigxyi1bnw0xhm1cc590h4v7lkmk0mm1";

9+ sha256 = "1daqbmj9ka9wdkkym625hqwqaxq5n11y7c4yc9ln3xkjpnv4dplm";

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:

22

33buildLinux (args // rec {

4− version = "4.9.242";

4+ version = "4.9.243";

55 extraMeta.branch = "4.9";

66

77 src = fetchurl {

88 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

9− sha256 = "1r1myvxkhnsz419i5y6zjdkz177q3d19jk7748vv1v505gi3k1g4";

9+ sha256 = "111rlzx6z4kf8zwxncib96d9wy6qmkbs0cq3dhnybipwlyf1iank";

1010 };

1111} // (args.argsOverride or {}))

pkgs/os-specific/linux/kernel/linux-5.4.nix+2−2

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

33with stdenv.lib;

44

55buildLinux (args // rec {

6− version = "5.4.76";

6+ version = "5.4.77";

77

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 = "1lpppqjsrcmpr6vawxycsy7lpwdh3pb3d3f841sxzqgm3b9mymkg";

16+ sha256 = "1xyvml0mps7bsa11bgpa4l0w8x6pasdz9yab2z4ds394f1lkxq53";

1717 };

1818} // (args.argsOverride or {}))

pkgs/os-specific/linux/kernel/linux-5.9.nix+2−2

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

33with stdenv.lib;

44

55buildLinux (args // rec {

6− version = "5.9.7";

6+ version = "5.9.8";

77

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 = "1dv933lnkcfrpjbq1hdc3b5r210f6vn5y04jp87pij4mmkn47a6y";

16+ sha256 = "19l67gzk97higd2cbggipcb0wi21pv0ag0mc4qh6cqk564xp6mkn";

1717 };

1818} // (args.argsOverride or {}))

pkgs/os-specific/linux/kernel/linux-mptcp-94.nixdeleted−26

@@ -1,26 +0,0 @@

1−{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, structuredExtraConfig ? {}, ... } @ args:

2−let

3− mptcpVersion = "0.94.6";

4− modDirVersion = "4.14.127";

5−in

6−buildLinux ({

7− version = "${modDirVersion}-mptcp_v${mptcpVersion}";

8− inherit modDirVersion;

9−

10− extraMeta = {

11− branch = "4.4";

12− maintainers = with stdenv.lib.maintainers; [ teto layus ];

13− };

14−

15− src = fetchFromGitHub {

16− owner = "multipath-tcp";

17− repo = "mptcp";

18− rev = "v${mptcpVersion}";

19− sha256 = "071cx9205wpzhi5gc2da79w2abs3czd60jg0xml7j1szc5wl4yfn";

20− };

21−

22− structuredExtraConfig = stdenv.lib.mkMerge [

23− (import ./mptcp-config.nix { inherit stdenv; })

24− structuredExtraConfig

25− ];

26−} // args)

pkgs/os-specific/linux/kernel/linux-rt-5.4.nix+2−2

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

66, ... } @ args:

77

88let

9− version = "5.4.74-rt41"; # updated by ./update-rt.sh

9+ version = "5.4.74-rt42"; # updated by ./update-rt.sh

1010 branch = lib.versions.majorMinor version;

1111 kversion = builtins.elemAt (lib.splitString "-" version) 0;

1212in buildLinux (args // {

@@ -21,7 +21,7 @@ in buildLinux (args // {

2121 name = "rt";

2222 patch = fetchurl {

2323 url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";

24− sha256 = "0ap5zvdx6zxwqh2cy67rha4zgz3k8vqzd2vhll1mx81d10fmvmp8";

24+ sha256 = "11hk5ps2nsffcjmccp839l55nzbl9irss0ralj2y1xah1ikbs7fh";

2525 };

2626 }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;

2727

pkgs/os-specific/linux/kernel/linux-testing.nix+2−2

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

33with stdenv.lib;

44

55buildLinux (args // rec {

6− version = "5.10-rc2";

6+ version = "5.10-rc3";

77 extraMeta.branch = "5.10";

88

99 # modDirVersion needs to be x.y.z, will always add .0

@@ -11,7 +11,7 @@ buildLinux (args // rec {

1111

1212 src = fetchurl {

1313 url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";

14− sha256 = "1qh353xd48mbvavpw61r2lz1cn8007yyc2xqiacbn8xsj7xdlxkj";

14+ sha256 = "08zwz6rjpd6nzhzs1hwix3709w22495sxcs0ajizyq50pydn77vd";

1515 };

1616

1717 # Should the testing kernels ever be built on Hydra?

pkgs/os-specific/linux/microcode/intel.nix+2−2

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

22

33stdenv.mkDerivation rec {

44 pname = "microcode-intel";

5− version = "20200616";

5+ version = "20201112";

66

77 src = fetchFromGitHub {

88 owner = "intel";

99 repo = "Intel-Linux-Processor-Microcode-Data-Files";

1010 rev = "microcode-${version}";

11− sha256 = "13jrs8hwh7dhjjb9kncb8lk199afaxglkh1cfisl6zca1h36g563";

11+ sha256 = "104l3py5z6405wpa2fscqpc5r9dgrf1ckaf27hrswivi32gvp7f2";

1212 };

1313

1414 nativeBuildInputs = [ iucode-tool libarchive ];

pkgs/os-specific/linux/pcm/default.nix+2−2

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

11{ stdenv, fetchFromGitHub }:

22

33stdenv.mkDerivation rec {

4− version = "202009";

4+ version = "202010";

55 pname = "pcm";

66

77 src = fetchFromGitHub {

88 owner = "opcm";

99 repo = "pcm";

1010 rev = version;

11− sha256 = "1phkdmbgvrmv5w0xa4i2j9v7lcxkxjdhzi5x6l52z9y9as30dzbd";

11+ sha256 = "00i7bp7hqwnphh7qyjydvz5s14ydj8rwivz995bdnd37582dyij9";

1212 };

1313

1414 installPhase = ''

pkgs/os-specific/linux/wireguard/default.nix+2−6

@@ -7,17 +7,13 @@ assert stdenv.lib.versionOlder kernel.version "5.6";

77

88stdenv.mkDerivation rec {

99 pname = "wireguard";

10− version = "1.0.20200908";

10+ version = "1.0.20201112";

1111

1212 src = fetchzip {

1313 url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz";

14− sha256 = "1nd2kc3c62907kxm1084dw7krd8xsy3hxydmcpz4jvk03vm5dnkg";

14+ sha256 = "sha256-HnYvjZ3VUH79NwNIvyTTygWYbVqEL2ttvlOlLiHhb5s=";

1515 };

1616

17− patches = [

18− ./linux-5.4.76-fix.patch

19− ];

20−

2117 hardeningDisable = [ "pic" ];

2218

2319 KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";

pkgs/os-specific/linux/wireguard/linux-5.4.76-fix.patchdeleted−12

@@ -1,12 +0,0 @@

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

7−

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+2−2

@@ -203,9 +203,9 @@ in {

203203 # incompatibleKernelVersion = "4.19";

204204

205205 # this package should point to a version / git revision compatible with the latest kernel release

206− version = "2.0.0-rc5";

206+ version = "2.0.0-rc6";

207207

208− sha256 = "0vnldx95c36yy18v1hfr8r4cmmh3hw4n6pwz30drkwgywakjwnsd";

208+ sha256 = "0p027x9hsawniwa9h3yayfbcx010anwcfy45rqgkg2r91zr2nfvw";

209209 isUnstable = true;

210210 };

211211}

pkgs/servers/atlassian/confluence.nix+2−2

@@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null);

88

99stdenvNoCC.mkDerivation rec {

1010 pname = "atlassian-confluence";

11− version = "7.8.1";

11+ version = "7.9.0";

1212

1313 src = fetchurl {

1414 url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz";

15− sha256 = "0jgwd8vb58yzwvnns0kyb0vzgrdvjwzvpk4x8228hrisjxahsm45";

15+ sha256 = "0y21ivvzzs6mq2p96csmhbvz1jzwp1x4zrw26qrwavf84l2v7nlh";

1616 };

1717

1818 buildPhase = ''

pkgs/servers/bazarr/default.nix+2−2

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

22

33stdenv.mkDerivation rec {

44 pname = "bazarr";

5− version = "0.9.0.5";

5+ version = "0.9.0.6";

66

77 src = fetchurl {

88 url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz";

9− sha256 = "1mm8qghkif48jr7fq28kp7zk5x71zm43isf0a96crpi9qi91sdd5";

9+ sha256 = "1mgvsi8y3camj215vnbw20f1z6jvpbyrj1hrcj4szxfcjkxdg2hv";

1010 };

1111

1212 nativeBuildInputs = [ makeWrapper ];

pkgs/servers/home-assistant/component-packages.nix+2−2

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

22# Do not edit!

33

44{

5− version = "0.117.5";

5+ version = "0.117.6";

66 components = {

77 "abode" = ps: with ps; [ abodepy ];

88 "accuweather" = ps: with ps; [ accuweather ];

@@ -312,7 +312,7 @@

312312 "google_maps" = ps: with ps; [ ]; # missing inputs: locationsharinglib

313313 "google_pubsub" = ps: with ps; [ google_cloud_pubsub ];

314314 "google_translate" = ps: with ps; [ gtts-token ];

315− "google_travel_time" = ps: with ps; [ ]; # missing inputs: googlemaps

315+ "google_travel_time" = ps: with ps; [ googlemaps ];

316316 "google_wifi" = ps: with ps; [ ];

317317 "gpmdp" = ps: with ps; [ websocket_client ];

318318 "gpsd" = ps: with ps; [ ]; # missing inputs: gps3

pkgs/servers/home-assistant/default.nix+2−2

@@ -67,7 +67,7 @@ let

6767 extraBuildInputs = extraPackages py.pkgs;

6868

6969 # Don't forget to run parse-requirements.py after updating

70− hassVersion = "0.117.5";

70+ hassVersion = "0.117.6";

7171

7272in with py.pkgs; buildPythonApplication rec {

7373 pname = "homeassistant";

@@ -83,7 +83,7 @@ in with py.pkgs; buildPythonApplication rec {

8383 owner = "home-assistant";

8484 repo = "core";

8585 rev = version;

86− sha256 = "1al2pwj2xrhqyaz2pal4a1bdh4sm63ijfaw8pajghz5z23gf62r0";

86+ sha256 = "1f9w7migwmdvnbiv4bi0b31zdfrsg87zgiz2l3gymn6w89f3h8y1";

8787 };

8888

8989 # leave this in, so users don't have to constantly update their downstream patch handling

pkgs/servers/jackett/default.nix+2−2

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

22

33stdenv.mkDerivation rec {

44 pname = "jackett";

5− version = "0.16.1964";

5+ version = "0.16.2131";

66

77 src = fetchurl {

88 url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";

9− sha256 = "06mj9pahziwm77nqjiqcbg3zfxkjy7sp15h84iqcxp0lpz0w2z55";

9+ sha256 = "1689w80cjji7wq1x3sgkpmx0n543mqkzvhb3hdmz6f66h479hcpk";

1010 };

1111

1212 nativeBuildInputs = [ makeWrapper ];

pkgs/servers/livepeer/default.nix+2−2

@@ -4,7 +4,7 @@

44

55buildGoModule rec {

66 pname = "livepeer";

7− version = "0.5.11";

7+ version = "0.5.12";

88

99 runVend = true;

1010 vendorSha256 = "13cgwpf3v4vlvb0mgdxsdybpghx1cp3fzkdwmq8b193a8dcl8s63";

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

1313 owner = "livepeer";

1414 repo = "go-livepeer";

1515 rev = "v${version}";

16− sha256 = "12vbnl74z6jk77bnws8a5z5n7bnhkbb4ngzxfir5l3g9zrpsc5p3";

16+ sha256 = "15gx6pd6zn40x60p07dyaf1ydxvrg372lk3djp302mph8y0ijqfg";

1717 };

1818

1919 # livepeer_cli has a vendoring problem

pkgs/servers/mail/postfix/default.nix+3−1

@@ -1,6 +1,6 @@

11{ stdenv, lib, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl, libnsl

22, coreutils, findutils, gnugrep, gawk, icu, pcre, m4

3−, buildPackages

3+, buildPackages, nixosTests

44, withLDAP ? true, openldap

55, withPgSQL ? false, postgresql

66, withMySQL ? false, libmysqlclient

@@ -96,6 +96,8 @@ in stdenv.mkDerivation rec {

9696 --prefix PATH ":" ${lib.makeBinPath [ coreutils findutils gnugrep gawk gnused ]}

9797 '';

9898

99+ passthru.tests = { inherit (nixosTests) postfix postfix-raise-smtpd-tls-security-level; };

100+

99101 meta = with lib; {

100102 homepage = "http://www.postfix.org/";

101103 description = "A fast, easy to administer, and secure mail server";

pkgs/servers/monitoring/grafana/default.nix+4−4

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

22

33buildGoModule rec {

44 pname = "grafana";

5− version = "7.3.1";

5+ version = "7.3.2";

66

77 excludedPackages = [ "release_publisher" ];

88

@@ -10,15 +10,15 @@ buildGoModule rec {

1010 rev = "v${version}";

1111 owner = "grafana";

1212 repo = "grafana";

13− sha256 = "02by07d0h07zvws2yj71qa84sgp3x49p5ib0bahh0iyr50xqb3yj";

13+ sha256 = "0lknymp203bgrwq8g05pk07p385k2hh9wap4ql4lxylsn89szs65";

1414 };

1515

1616 srcStatic = fetchurl {

1717 url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";

18− sha256 = "0rqipwiz8bsqkhiv30k9jmk5szhabk9rgl37n7y8l0yk2avbq895";

18+ sha256 = "08smddc86jm3ign1pb1arw1zqkh72dbddizzn1bqg4lanx2xwjca";

1919 };

2020

21− vendorSha256 = "0shaxm2y5i29rb0k5bfpcsxbw3ap913l1rb5qbr9hrx7l142dbx8";

21+ vendorSha256 = "09rb96fm7ij16r843lbwcxb26vmjyahs1bi5pnnqz0mnm0vvmsjb";

2222

2323 postPatch = ''

2424 substituteInPlace pkg/cmd/grafana-server/main.go \

pkgs/servers/monitoring/sensu-go/default.nix+3−3

@@ -4,19 +4,19 @@ let

44 generic = { subPackages, pname, postInstall ? "" }:

55 buildGoModule rec {

66 inherit pname;

7− version = "5.21.2";

7+ version = "6.1.2";

88 shortRev = "3a1ac58"; # for internal version info

99

1010 src = fetchFromGitHub {

1111 owner = "sensu";

1212 repo = "sensu-go";

1313 rev = "v${version}";

14− sha256 = "1hsvdqz0ckk8d1yxinqwylw97jd3gnf7c63zkjly87vasg98qk9x";

14+ sha256 = "1g4vh4ay5m3sl00j8rn4db87kfdyxcmnaf0rxnv4ah2fbj5nrh2n";

1515 };

1616

1717 inherit subPackages postInstall;

1818

19− vendorSha256 = "06yfaj9k5n3jw8a142sscaqrvdw2lq51v884lp65wjdwy5c3jbba";

19+ vendorSha256 = "12qi94k8fjx0kaq2x977yhan8ynd6j6cbqx1l60gqs2xgkm71k9r";

2020

2121 doCheck = false;

2222

pkgs/servers/monitoring/thanos/default.nix+3−3

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

11{ stdenv, buildGoModule, fetchFromGitHub }:

22buildGoModule rec {

33 pname = "thanos";

4− version = "0.15.0";

4+ version = "0.16.0";

55

66 src = fetchFromGitHub {

77 rev = "v${version}";

88 owner = "thanos-io";

99 repo = "thanos";

10− sha256 = "099waxv4p6jq2nimc3ql80j8ikhbzqwr2470x8m96x5kcirmz8nl";

10+ sha256 = "0432pxpl071wjsijc5b7176mc4lr7sqdwyzqn7dvwkrvvq3n6g5k";

1111 };

1212

13− vendorSha256 = "0vfl6bra6487vzv0hd1pnkq7888m4ddn12q69gcm6a7w1z5wvj5b";

13+ vendorSha256 = "0pbnkqwpp74vanyk3cljj4kgbcid16y9mb5my3iiimbrziw2dkwr";

1414

1515 doCheck = false;

1616

pkgs/servers/pounce/default.nix+2−2

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

22

33stdenv.mkDerivation rec {

44 pname = "pounce";

5− version = "1.4p2";

5+ version = "2.0";

66

77 src = fetchzip {

88 url = "https://git.causal.agency/pounce/snapshot/pounce-${version}.tar.gz";

9− sha256 = "0fpnj9yvmj4gbbfpya4i0lyin56r782pz19z3pgd8xgs22gd48cc";

9+ sha256 = "0vr42s8l617k6893zq7qn9wz7kcdchmr99ivbkrmvd38qrhsa02l";

1010 };

1111

1212 buildInputs = [ libressl ];

pkgs/servers/pulseaudio/add-option-for-installation-sysconfdir.patchnew file+100

@@ -0,0 +1,100 @@

1+

2+diff --git a/meson.build b/meson.build

3+index 86af7243e..e2d48ab94 100644

4+--- a/meson.build

5++++ b/meson.build

6+@@ -65,6 +65,11 @@ datadir = join_paths(prefix, get_option('datadir'))

7+ localedir = join_paths(prefix, get_option('localedir'))

8+ localstatedir = join_paths(prefix, get_option('localstatedir'))

9+ sysconfdir = join_paths(prefix, get_option('sysconfdir'))

10++if get_option('sysconfdir_install') != ''

11++ sysconfdir_install = join_paths(get_option('prefix'), get_option('sysconfdir_install'))

12++else

13++ sysconfdir_install = sysconfdir

14++endif

15+ privlibdir = join_paths(libdir, 'pulseaudio')

16+

17+ alsadatadir = get_option('alsadatadir')

18+@@ -75,6 +80,11 @@ endif

19+ pkgconfigdir = join_paths(libdir, 'pkgconfig')

20+ pulselibexecdir = join_paths(libexecdir, 'pulse')

21+ pulsesysconfdir = join_paths(sysconfdir, 'pulse')

22++if get_option('sysconfdir_install') != ''

23++ pulsesysconfdir_install = join_paths(get_option('prefix'), get_option('sysconfdir_install'), 'pulse')

24++else

25++ pulsesysconfdir_install = pulsesysconfdir

26++endif

27+

28+ modlibexecdir = get_option('modlibexecdir')

29+ if modlibexecdir == ''

30+diff --git a/meson_options.txt b/meson_options.txt

31+index 824f24e08..59a2b57ab 100644

32+--- a/meson_options.txt

33++++ b/meson_options.txt

34+@@ -66,6 +66,9 @@ option('bashcompletiondir',

35+ option('zshcompletiondir',

36+ type : 'string',

37+ description : 'Directory for zsh completion scripts ["no" disables]')

38++option('sysconfdir_install',

39++ type: 'string', value: '',

40++ description: 'sysconfdir to use during installation')

41+

42+ # Optional features

43+

44+diff --git a/src/daemon/meson.build b/src/daemon/meson.build

45+index 9c9f807e7..425cecb46 100644

46+--- a/src/daemon/meson.build

47++++ b/src/daemon/meson.build

48+@@ -53,7 +53,7 @@ if x11_dep.found()

49+ po_dir : po_dir,

50+ type : 'desktop',

51+ install : true,

52+- install_dir : join_paths(sysconfdir, 'xdg', 'autostart'),

53++ install_dir : join_paths(sysconfdir_install, 'xdg', 'autostart'),

54+ )

55+

56+ desktop_utils = find_program('desktop-file-validate', required: false)

57+@@ -85,7 +85,7 @@ custom_target('daemon.conf',

58+ command : [m4, '@INPUT@'],

59+ build_by_default : true,

60+ install : true,

61+- install_dir : pulsesysconfdir,

62++ install_dir : pulsesysconfdir_install,

63+ )

64+

65+ default_conf = configuration_data()

66+@@ -111,7 +111,7 @@ custom_target('default.pa',

67+ command : [m4, '@INPUT@'],

68+ build_by_default : true,

69+ install : true,

70+- install_dir : pulsesysconfdir,

71++ install_dir : pulsesysconfdir_install,

72+ )

73+

74+ system_conf = configuration_data()

75+@@ -132,12 +132,12 @@ custom_target('system.pa',

76+ command : [m4, '@INPUT@'],

77+ build_by_default : true,

78+ install : true,

79+- install_dir : pulsesysconfdir,

80++ install_dir : pulsesysconfdir_install,

81+ )

82+

83+ if dbus_dep.found()

84+ install_data('pulseaudio-system.conf',

85+- install_dir : join_paths(sysconfdir, 'dbus-1', 'system.d')

86++ install_dir : join_paths(sysconfdir_install, 'dbus-1', 'system.d')

87+ )

88+ endif

89+

90+diff --git a/src/pulse/meson.build b/src/pulse/meson.build

91+index aaebff53e..05a29a0d0 100644

92+--- a/src/pulse/meson.build

93++++ b/src/pulse/meson.build

94+@@ -130,5 +130,5 @@ client_conf_file = configure_file(

95+ input : 'client.conf.in',

96+ output : 'client.conf',

97+ configuration : client_conf,

98+- install_dir : pulsesysconfdir,

99++ install_dir : pulsesysconfdir_install,

100+ )

pkgs/servers/pulseaudio/correct-ldflags.patchnew file+13

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

1+diff --git a/meson.build b/meson.build

2+index 45df103f0..d57d13172 100644

3+--- a/meson.build

4++++ b/meson.build

5+@@ -342,7 +342,7 @@ cdata.set('MESON_BUILD', 1)

6+ # On ELF systems we don't want the libraries to be unloaded since we don't clean them up properly,

7+ # so we request the nodelete flag to be enabled.

8+ # On other systems, we don't really know how to do that, but it's welcome if somebody can tell.

9+-nodelete_link_args = ['-Wl,-z,nodelete']

10++nodelete_link_args = cc.get_supported_link_arguments(['-Wl,-z,nodelete'])

11+

12+ # Code coverage

13+

pkgs/servers/pulseaudio/default.nix+4

@@ -124,6 +124,10 @@ stdenv.mkDerivation rec {

124124 --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules"

125125 '';

126126

127+ passthru = {

128+ pulseDir = "lib/pulse-" + lib.versions.majorMinor version;

129+ };

130+

127131 meta = {

128132 description = "Sound server for POSIX and Win32 systems";

129133 homepage = "http://www.pulseaudio.org/";

pkgs/servers/pulseaudio/hsphfpd.nixnew file+46

@@ -0,0 +1,46 @@

1+{ stdenv, fetchFromGitHub, makeWrapper, perlPackages }:

2+

3+let

4+ perlLibs = with perlPackages; [ NetDBus XMLTwig XMLParser ];

5+in

6+stdenv.mkDerivation {

7+ pname = "hsphfpd";

8+ version = "2020-10-25";

9+

10+ src = fetchFromGitHub {

11+ owner = "pali";

12+ repo = "hsphfpd-prototype";

13+ rev = "601bf8f7bf2da97257aa6f786ec4cbb69b0ecbc8";

14+ sha256 = "06hh0xmp143334x8dg5nmp5727g38q2m5kqsvlrfia6vw2hcq0v0";

15+ };

16+

17+ nativeBuildInputs = [ makeWrapper ];

18+ buildInputs = [ perlPackages.perl ];

19+ dontBuild = true;

20+

21+ installPhase = ''

22+ runHook preInstall

23+

24+ mkdir -p $out/share/dbus-1/system.d

25+ cp org.hsphfpd.conf $out/share/dbus-1/system.d

26+

27+ mkdir -p $out/bin

28+ cp *.pl $out/bin

29+

30+ runHook postInstall

31+ '';

32+

33+ postFixup = ''

34+ for f in $out/bin/*.pl; do

35+ wrapProgram "$f" --set PERL5LIB "${perlPackages.makePerlPath perlLibs}"

36+ done

37+ '';

38+

39+ meta = with stdenv.lib; {

40+ description = "Bluetooth HSP/HFP daemon";

41+ homepage = "https://github.com/pali/hsphfpd-prototype";

42+ license = licenses.artistic1;

43+ maintainers = with maintainers; [ gebner ];

44+ platforms = platforms.linux;

45+ };

46+}

pkgs/servers/pulseaudio/pali.nixnew file+219

@@ -0,0 +1,219 @@

1+{ lib

2+, stdenv

3+, fetchurl

4+, fetchFromGitLab

5+, meson

6+, ninja

7+, pkgconfig

8+, libsndfile

9+, libtool

10+, makeWrapper

11+, perlPackages

12+, xorg

13+, libcap

14+, alsaLib

15+, glib

16+, dconf

17+, avahi

18+, libjack2

19+, libasyncns

20+, lirc

21+, dbus

22+, sbc

23+, bluez5

24+, udev

25+, openssl

26+, fftwFloat

27+, soxr

28+, speexdsp

29+, systemd

30+, webrtc-audio-processing

31+, gtk3

32+, tdb

33+, orc

34+, check

35+, gettext

36+, gst_all_1

37+, libopenaptx

38+

39+, x11Support ? true

40+

41+, # Whether to support the JACK sound system as a backend.

42+ jackaudioSupport ? false

43+

44+, airtunesSupport ? true

45+

46+, bluetoothSupport ? true

47+

48+, remoteControlSupport ? true

49+

50+, zeroconfSupport ? true

51+

52+, # Whether to build only the library.

53+ libOnly ? false

54+

55+# Building from Git source

56+, fromGit ? true

57+

58+, CoreServices

59+, AudioUnit

60+, Cocoa

61+}:

62+

63+stdenv.mkDerivation rec {

64+ pname = "${if libOnly then "lib" else ""}pulseaudio-hsphfpd";

65+ version = "13.99.2";

66+

67+ outputs = [ "out" "dev" ];

68+

69+ # https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/288

70+ src = fetchFromGitLab {

71+ domain = "gitlab.freedesktop.org";

72+ owner = "pali";

73+ repo = "pulseaudio";

74+ rev = "5336b39e7e03cf50386e719e287a712b59730eb8";

75+ sha256 = "0vc0i5rzkns3xw6y2q0c94p2qdi5k3mgjvhicgq1b0py2qxmji16";

76+ };

77+

78+ patches = [

79+ ./add-option-for-installation-sysconfdir.patch

80+ ./correct-ldflags.patch

81+ ];

82+

83+ # Says it should be v${version} but it's parsing logic is broken

84+ preConfigure = lib.optionalString fromGit ''

85+ sed -i "s@version : run_command.*@version: '${version}',@" meson.build

86+ '';

87+

88+ nativeBuildInputs = [

89+ gettext

90+ makeWrapper

91+ meson

92+ ninja

93+ pkgconfig

94+ perlPackages.perl

95+ perlPackages.XMLParser

96+ ];

97+

98+ checkInputs = [

99+ check

100+ ];

101+

102+ propagatedBuildInputs = lib.optional stdenv.isLinux libcap;

103+

104+ buildInputs = [

105+ libopenaptx

106+ fftwFloat

107+ libsndfile

108+ libtool

109+ orc

110+ soxr

111+ speexdsp

112+ tdb

113+ sbc

114+ gst_all_1.gst-plugins-base

115+ ] ++ lib.optionals bluetoothSupport [

116+ bluez5

117+ ] ++ lib.optionals stdenv.isLinux [

118+ dbus

119+ glib

120+ gtk3

121+ libasyncns

122+ ] ++ lib.optionals stdenv.isDarwin [

123+ AudioUnit

124+ Cocoa

125+ CoreServices

126+ ] ++ lib.optionals (!libOnly) (

127+ lib.optionals x11Support [

128+ xorg.libXi

129+ xorg.libXtst

130+ xorg.xlibsWrapper

131+ ] ++ lib.optionals stdenv.isLinux [

132+ alsaLib

133+ systemd

134+ udev

135+ ] ++ lib.optional airtunesSupport openssl

136+ ++ lib.optional jackaudioSupport libjack2

137+ ++ lib.optional remoteControlSupport lirc

138+ ++ lib.optional zeroconfSupport avahi

139+ ++ [ webrtc-audio-processing ]

140+ );

141+

142+ mesonFlags = [

143+ "--localstatedir=/var"

144+ "--sysconfdir=/etc"

145+ "-Daccess_group=audio"

146+ "-Dbashcompletiondir=${placeholder "out"}/share/bash-completions/completions"

147+ "-Dman=false" # TODO: needs xmltoman; also doesn't check for this

148+ "-Dsysconfdir_install=${placeholder "out"}/etc"

149+ "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"

150+ "-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d"

151+ "-Dzshcompletiondir=${placeholder "out"}/share/zsh/site-functions"

152+ ] ++ lib.optionals (!stdenv.isLinux) [

153+ "-Dasyncns=disabled"

154+ "-Ddbus=disabled"

155+ "-Dglib=disabled"

156+ "-Dgsettings=disabled"

157+ "-Dgtk=disabled"

158+ ] ++ lib.optionals (!stdenv.isLinux || libOnly) [

159+ "-Dalsa=disabled"

160+ "-Dsystemd=disabled"

161+ "-Dudev=disabled"

162+ ] ++ lib.optional libOnly "-Dwebrtc-aec=disabled"

163+ ++ lib.optional (!x11Support) "-Dx11=disabled"

164+ ++ lib.optional (!bluetoothSupport) "-Dbluez5=false"

165+ ++ lib.optional (!airtunesSupport) "-Dopenssl=disabled"

166+ ++ lib.optional (!jackaudioSupport) "-Djack=disabled"

167+ ++ lib.optional (!remoteControlSupport) "-Dlirc=disabled"

168+ ++ lib.optional (!zeroconfSupport) "-Davahi=disabled"

169+ ++ lib.optional (!doCheck) "-Dtests=false";

170+

171+ # To create ~/.config/pulse

172+ preCheck = ''

173+ export HOME=$(mktemp -d)

174+ '';

175+

176+ doCheck = true;

177+

178+ # not sure what the best practices are here -- can't seem to find a way

179+ # for the compiler to bring in stdlib and stdio (etc.) properly

180+ # the alternative is to copy the files from /usr/include to src, but there are

181+ # probably a large number of files that would need to be copied (I stopped

182+ # after the seventh)

183+ NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I/usr/include";

184+

185+ NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreServices -framework Cocoa -framework AudioUnit";

186+

187+ postInstall = ''

188+ moveToOutput lib/cmake "$dev"

189+ rm -f $out/bin/qpaeq # this is packaged by the "qpaeq" package now, because of missing deps

190+ '' + lib.optionalString libOnly ''

191+ rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}}

192+ '';

193+

194+ preFixup = lib.optionalString (stdenv.isLinux && !libOnly) ''

195+ wrapProgram $out/libexec/pulse/gsettings-helper \

196+ --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${pname}-${version}" \

197+ --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules"

198+ '';

199+

200+ passthru = {

201+ pulseDir = "lib/pulse-" + lib.versions.majorMinor version;

202+ };

203+

204+ meta = with lib; {

205+ description = "A featureful, general-purpose sound server";

206+ homepage = "http://www.pulseaudio.org/";

207+ license = licenses.lgpl2Plus;

208+ maintainers = with maintainers; [ lovek323 ];

209+ platforms = platforms.unix;

210+ longDescription = ''

211+ PulseAudio is a sound system for POSIX OSes, meaning that it is

212+ a proxy for your sound applications. It allows you to do advanced

213+ operations on your sound data as it passes between your application

214+ and your hardware. Things like transferring the audio to a different machine,

215+ changing the sample format or channel count and mixing several sounds into one

216+ are easily achieved using a sound server.

217+ '';

218+ };

219+}

pkgs/servers/rtsp-simple-server/default.nix+3−3

@@ -5,16 +5,16 @@

55

66buildGoModule rec {

77 pname = "rtsp-simple-server";

8− version = "0.10.0";

8+ version = "0.12.0";

99

1010 src = fetchFromGitHub {

1111 owner = "aler9";

1212 repo = pname;

1313 rev = "v${version}";

14− sha256 = "rnUmPyT9jAqm7Vf2TokgRGPTn7rTBUvrpJU21IopFsM=";

14+ sha256 = "0mslag208410bvnhnd5hr7zvj8026m291ivkvr9sz3v6rh68cisy";

1515 };

1616

17− vendorSha256 = "jAWDz/TclfCKQR/Gh99zSiGAsraciNU+yzFe5DGTeQI=";

17+ vendorSha256 = "1884lbfsalry68m0kzfvbrk4dz9y19d2xxaivafwb7nc0wp64734";

1818

1919 # Tests need docker

2020 doCheck = false;

pkgs/servers/sickbeard/sickgear.nix+2−2

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

44 pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]);

55in stdenv.mkDerivation rec {

66 pname = "sickgear";

7− version = "0.21.42";

7+ version = "0.22.15";

88

99 src = fetchFromGitHub {

1010 owner = "SickGear";

1111 repo = "SickGear";

1212 rev = "release_${version}";

13− sha256 = "0a18vn1vy4zdp40iizgg3yji6k74r54rb7d7gn5byz1zj28g5c5c";

13+ sha256 = "1hc0aahfxyv05d3bskfxcv7ik5zvd1j22r3z964idhch8csxw92l";

1414 };

1515

1616 dontBuild = true;

pkgs/servers/sql/cockroachdb/default.nix+2−2

@@ -14,13 +14,13 @@ let

1414in

1515buildGoPackage rec {

1616 pname = "cockroach";

17− version = "20.1.7";

17+ version = "20.1.8";

1818

1919 goPackagePath = "github.com/cockroachdb/cockroach";

2020

2121 src = fetchurl {

2222 url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz";

23− sha256 = "1m1jziby0mzfbpwsak1marh1k9sx8vhc17ix6lgikxip4dpf52qg";

23+ sha256 = "0mm3hfr778c7djza8gr1clwa8wca4d3ldh9hlg80avw4x664y5zi";

2424 };

2525

2626 NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ];

pkgs/servers/tracing/tempo/default.nix+2−2

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

11{ lib, buildGoModule, fetchFromGitHub }:

22

33buildGoModule rec {

4− version = "0.2.0";

4+ version = "0.3.0";

55 pname = "tempo";

66

77 src = fetchFromGitHub {

88 rev = "v${version}";

99 owner = "grafana";

1010 repo = "tempo";

11− sha256 = "061l72il8arxa53zfbasiwyjdxc4bf498glxrdj5ijcwgvx14275";

11+ sha256 = "0inqljiavqyq8dk2w0w0l2bds5390mrf8j190yb7lqwx9ra0cjp9";

1212 };

1313

1414 vendorSha256 = null;

pkgs/servers/traefik/default.nix+3−3

@@ -2,15 +2,15 @@

22

33buildGoModule rec {

44 pname = "traefik";

5− version = "2.3.1";

5+ version = "2.3.2";

66

77 src = fetchzip {

88 url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";

9− sha256 = "09328yb6pbrikd1dljmf6spg177w1ymqk1i2152m5srd39mc6ixv";

9+ sha256 = "1h8wflkzjzz0nr81d99f8vksihqa6q4vmkqq40170a8js06fgizx";

1010 stripRoot = false;

1111 };

1212

13− vendorSha256 = "026yxahwvbw41vf7yfycwmw797fpw19g1nyi1wcxkkkw383v7dsk";

13+ vendorSha256 = "16y6cyw4xipadwz7wlzl55sn81by9hc37crf143dfb4c3kmwb581";

1414

1515 doCheck = false;

1616

pkgs/servers/web-apps/rss-bridge/default.nix+2−2

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

22

33stdenv.mkDerivation rec {

44 pname = "rss-bridge";

5− version = "2020-02-26";

5+ version = "2020-11-10";

66

77 src = fetchFromGitHub {

88 owner = "RSS-Bridge";

99 repo = "rss-bridge";

1010 rev = version;

11− sha256 = "075k4bylx9308d083ry5a9q4629ccnrnndqqdqp1g42rzlqrw79q";

11+ sha256 = "00cp61lqvhi7b7j0rglsqg3l7cg8s9b8vq098bgvg5dygyi44hyv";

1212 };

1313

1414 patchPhase = ''

pkgs/shells/zsh/oh-my-zsh/default.nix+3−3

@@ -5,15 +5,15 @@

55, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:

66

77stdenv.mkDerivation rec {

8− version = "2020-11-10";

8+ version = "2020-11-12";

99 pname = "oh-my-zsh";

10− rev = "dc4692b53e4a1dc512d405f36f2d2af30c66304b";

10+ rev = "9b119866dd0e2d5054abd992f4dfbf346ac81b0d";

1111

1212 src = fetchFromGitHub {

1313 inherit rev;

1414 owner = "ohmyzsh";

1515 repo = "ohmyzsh";

16− sha256 = "00jm6vvjq265injnrd6mbmq2dm3w8wmw3g7ibhv9spi2r3zb6400";

16+ sha256 = "0m65ii79lp8mhl4adicg4qqzj93321gxpg6s91h0wbpkdgd53qxw";

1717 };

1818

1919 installPhase = ''

pkgs/shells/zsh/pure-prompt/default.nix+2−2

@@ -4,13 +4,13 @@ with stdenv.lib;

44

55stdenv.mkDerivation rec {

66 pname = "pure-prompt";

7− version = "1.13.0";

7+ version = "1.15.0";

88

99 src = fetchFromGitHub {

1010 owner = "sindresorhus";

1111 repo = "pure";

1212 rev = "v${version}";

13− sha256 = "16q9v4c8lagp4vxm7qhagilqnwf1g4pbds56x5wfj4cwc0x2gclw";

13+ sha256 = "0r4y8bglwdq85dwlxh9sm23ppzy1z7i8kmjny5mx9css0likj8qv";

1414 };

1515

1616 installPhase = ''

pkgs/tools/admin/eksctl/default.nix+2−2

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

22

33buildGoModule rec {

44 pname = "eksctl";

5− version = "0.30.0";

5+ version = "0.31.0";

66

77 src = fetchFromGitHub {

88 owner = "weaveworks";

99 repo = pname;

1010 rev = version;

11− sha256 = "0kg966czixkmaaznl7xm751jpx4252nkm99vaigg1iwhlx2yczh9";

11+ sha256 = "08vdcbgi0s9rm8rh025yifacqma2c0dxf6jdfnacrz1gj2s7s4rd";

1212 };

1313

1414 vendorSha256 = "1lhs1h0x3ryq0bd5w9ny7i2j9d0x2904br1vlxy677w2xsa9213p";

pkgs/tools/admin/procs/default.nix+3−3

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

22

33rustPlatform.buildRustPackage rec {

44 pname = "procs";

5− version = "0.10.5";

5+ version = "0.10.7";

66

77 src = fetchFromGitHub {

88 owner = "dalance";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "0w6a8pfk5s30yi5038kdqh4dncx2pskm7a23z66c4xj3842ci79c";

11+ sha256 = "0aaspzx8sna1m5zldql0ps3sldazwr32q0md0p8z3nimww24i3b3";

1212 };

1313

14− cargoSha256 = "07fwznx2czk1ibb77xcfhma9dpqps0m7rsmbb90gah6f32gah617";

14+ cargoSha256 = "1nb38nnmmc4hf8crp0bka029hlph15zm796nqziq25i26cgz4xvp";

1515

1616 buildInputs = stdenv.lib.optional stdenv.isDarwin Security;

1717

pkgs/tools/admin/ssmsh/default.nixnew file+26

@@ -0,0 +1,26 @@

1+{ stdenv, buildGoModule, fetchFromGitHub }:

2+

3+buildGoModule rec {

4+ pname = "ssmsh";

5+ version = "1.4.3";

6+

7+ src = fetchFromGitHub {

8+ owner = "bwhaley";

9+ repo = pname;

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

11+ sha256 = "0rvvawn4cavqhbrrp616mi5ipn4q6j22227h4rbjh0zxdlna23gm";

12+ };

13+

14+ vendorSha256 = "127xni0i7w42075bspmm5r61j858i1p59jr2ib8f9r1pbizh63xw";

15+

16+ doCheck = true;

17+

18+ buildFlagsArray = [ "-ldflags=-w -s -X main.Version=${version}" ];

19+

20+ meta = with stdenv.lib; {

21+ homepage = "https://github.com/bwhaley/ssmsh";

22+ description = "An interactive shell for AWS Parameter Store";

23+ license = licenses.mit;

24+ maintainers = with maintainers; [ dbirks ];

25+ };

26+}

pkgs/tools/admin/stripe-cli/default.nix+2−2

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

22

33buildGoModule rec {

44 pname = "stripe-cli";

5− version = "1.5.3";

5+ version = "1.5.4";

66

77 src = fetchFromGitHub {

88 owner = "stripe";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "0anrn7dkxgbzilh45gyqrp2930bkg3g3diarb50qp0rlim302sgy";

11+ sha256 = "1gb9xk40drj7z6sw6a2hva4kvim508q4f3cfjpmr7yjzspqy32p0";

1212 };

1313

1414 vendorSha256 = "05cyn9cgmijj6dl075slwm5qc6fj6m5sm414wqm50xz2fjs0400r";

pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patchnew file+42

@@ -0,0 +1,42 @@

1+From 56873cf29974ff0dfc1ba1afb7022ce49e300835 Mon Sep 17 00:00:00 2001

2+From: Maximilian Bosch <maximilian@mbosch.me>

3+Date: Wed, 11 Nov 2020 11:58:25 +0100

4+Subject: [PATCH 2/2] Make sure that the setuid-wrapped `umount` is invoked

5+

6+---

7+ src/dav_fuse.c | 2 +-

8+ src/umount_davfs.c | 4 ++--

9+ 2 files changed, 3 insertions(+), 3 deletions(-)

10+

11+diff --git a/src/dav_fuse.c b/src/dav_fuse.c

12+index 734bc1f..4501433 100644

13+--- a/src/dav_fuse.c

14++++ b/src/dav_fuse.c

15+@@ -187,7 +187,7 @@ dav_fuse_loop(int device, char *mpoint, size_t bufsize, time_t idle_time,

16+ unmounting = 1;

17+ pid_t pid = fork();

18+ if (pid == 0) {

19+- execl("/bin/umount", "umount", "-il", mountpoint, NULL);

20++ execl("@wrapperDir@/umount", "umount", "-il", mountpoint, NULL);

21+ _exit(EXIT_FAILURE);

22+ }

23+ }

24+diff --git a/src/umount_davfs.c b/src/umount_davfs.c

25+index b7019c3..75e3b4b 100644

26+--- a/src/umount_davfs.c

27++++ b/src/umount_davfs.c

28+@@ -122,9 +122,9 @@ main(int argc, char *argv[])

29+

30+ char *umount_command = NULL;

31+ if (mpoint) {

32+- umount_command = ne_concat("umount -i '", mpoint, "'", NULL);

33++ umount_command = ne_concat("@wrapperDir@/umount -i '", mpoint, "'", NULL);

34+ } else {

35+- umount_command = ne_concat("umount -i '", argv[optind], "'", NULL);

36++ umount_command = ne_concat("@wrapperDir@/umount -i '", argv[optind], "'", NULL);

37+ error(0, 0,

38+ _("\n"

39+ " can't evaluate PID file name;\n"

40+--

41+2.28.0

42+

pkgs/tools/filesystems/davfs2/default.nix+6−16

@@ -1,42 +1,32 @@

11{ stdenv

22, fetchurl

33, fetchpatch

4−, autoreconfHook

54, neon

65, procps

76, substituteAll

87, zlib

8+, wrapperDir ? "/run/wrappers/bin"

99}:

1010

1111stdenv.mkDerivation rec {

12− name = "davfs2-1.5.6";

12+ name = "davfs2-1.6.0";

1313

1414 src = fetchurl {

1515 url = "mirror://savannah/davfs2/${name}.tar.gz";

16− sha256 = "00fqadhmhi2bmdar5a48nicmjcagnmaj9wgsvjr6cffmrz6pcx21";

16+ sha256 = "sha256-LmtnVoW9kXdyvmDwmZrgmMgPef8g3BMej+xFR8u2O1A=";

1717 };

1818

19− nativeBuildInputs = [

20− autoreconfHook # neon-0.31.patch requires reconfiguration

21− ];

22−

2319 buildInputs = [ neon zlib ];

2420

2521 patches = [

26− ./isdir.patch

2722 ./fix-sysconfdir.patch

2823 (substituteAll {

2924 src = ./0001-umount_davfs-substitute-ps-command.patch;

3025 ps = "${procps}/bin/ps";

3126 })

32−

33− # Fix build with neon 0.31

34− # http://savannah.nongnu.org/bugs/?58101

35− (fetchpatch {

36− name = "neon-0.31.patch";

37− url = "http://savannah.nongnu.org/bugs/download.php?file_id=48737";

38− sha256 = "117x9rql6wk230pl1nram3pp8svll9wzfs5nf407z4jnrdr1zm0j";

39− extraPrefix = ""; # empty means add 'a/' and 'b/'

27+ (substituteAll {

28+ src = ./0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch;

29+ inherit wrapperDir;

4030 })

4131 ];

4232

pkgs/tools/filesystems/netatalk/default.nix+2−2

@@ -1,6 +1,6 @@

11{ fetchurl, stdenv, autoreconfHook, pkgconfig, perl, python

22, db, libgcrypt, avahi, libiconv, pam, openssl, acl

3−, ed, glibc, libevent

3+, ed, libtirpc, libevent

44}:

55

66stdenv.mkDerivation rec {

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

3838 /^afpd_LDADD

3939 /am__append_2

4040 a

41− ${glibc.static}/lib/librpcsvc.a \\

41+ ${libtirpc}/lib/libtirpc.so \\

4242 .

4343 w

4444 EOF

pkgs/tools/filesystems/rar2fs/default.nix+2−2

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

77

88stdenv.mkDerivation rec {

99 pname = "rar2fs";

10− version = "1.29.1";

10+ version = "1.29.2";

1111

1212 src = fetchFromGitHub {

1313 owner = "hasse69";

1414 repo = pname;

1515 rev = "v${version}";

16− sha256 = "03m20bnlm70xamrxnswxs4fzc2lr2wr6f7jq6b3a8sdwq3pqbzzx";

16+ sha256 = "0j7ai0gcbln2lyfc87xxmj0zpf3lnqa6fdm5rar3kdqhczb7s93y";

1717 };

1818

1919 postPatch = ''

pkgs/tools/graphics/oxipng/default.nix+6−11

@@ -1,20 +1,15 @@

1−{ stdenv, fetchFromGitHub, rustPlatform }:

1+{ stdenv, fetchCrate, rustPlatform }:

22

33rustPlatform.buildRustPackage rec {

4− version = "3.0.1";

4+ version = "4.0.0";

55 pname = "oxipng";

66

7− src = fetchFromGitHub {

8− owner = "shssoichiro";

9− repo = pname;

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

11− sha256 = "11lncwxksm7aqczy9ay1qnba2wmgfsirhgrl6vv1jlgj41b7mzi5";

7+ src = fetchCrate {

8+ inherit version pname;

9+ sha256 = "0p9h006l75ci324lbcx496732pb77srcd46g6dnfw3mcrg33cspc";

1210 };

1311

14− cargoSha256 = "0lalb981qzlnmqfg170mh6lnc0qlzb94wc39mf859g2jvxk3pkrl";

15−

16− # https://crates.io/crates/cloudflare-zlib#arm-vs-nightly-rust

17− cargoBuildFlags = [ "--features=cloudflare-zlib/arm-always" ];

12+ cargoSha256 = "1r2zw7p95abxqc31b5gswdyhm4msxsiml34dsh9x8zydhqnwy17j";

1813

1914 doCheck = !stdenv.isAarch64 && !stdenv.isDarwin;

2015

pkgs/tools/graphics/vips/default.nix+2−2

@@ -26,7 +26,7 @@

2626

2727stdenv.mkDerivation rec {

2828 pname = "vips";

29− version = "8.10.1";

29+ version = "8.10.2";

3030

3131 outputs = [ "bin" "out" "man" "dev" ];

3232

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

3434 owner = "libvips";

3535 repo = "libvips";

3636 rev = "v${version}";

37− sha256 = "0zfhp86vbxs5qdnjy8hvdcjslfkafvd3s3rjr2dppwm0iz4gdbfx";

37+ sha256 = "1psi39a4h0awwbyizbsk467z0djwq0rh8hvkklbsd5b92m7768sp";

3838 # Remove unicode file names which leads to different checksums on HFS+

3939 # vs. other filesystems because of unicode normalisation.

4040 extraPostFetch = ''

pkgs/tools/graphics/viu/default.nix+3−3

@@ -2,18 +2,18 @@

22

33rustPlatform.buildRustPackage rec {

44 pname = "viu";

5− version = "1.1";

5+ version = "1.2.1";

66

77 src = fetchFromGitHub {

88 owner = "atanunq";

99 repo = "viu";

1010 rev = "v${version}";

11− sha256 = "1algvndpl63g3yzp3hhbgm7839njpbmw954nsiwf0j591spz4lph";

11+ sha256 = "1q248jnbv64mkvg18465dpvjkw2v2hfqyvdvdixyrwyrnlv5cicv";

1212 };

1313 # tests are failing, reported at upstream: https://github.com/atanunq/viu/issues/40

1414 doCheck = false;

1515

16− cargoSha256 = "1jccaln72aqa9975nbs95gimndqx5kgfkjmh40z6chx1hvn4m2ga";

16+ cargoSha256 = "18rskn8fchlgk295yk8sc2g1x6h43rmhqif871hgzdx1i35sbajr";

1717

1818 meta = with lib; {

1919 description = "A command-line application to view images from the terminal written in Rust";

pkgs/tools/misc/broot/default.nix+3−3

@@ -11,14 +11,14 @@

1111

1212rustPlatform.buildRustPackage rec {

1313 pname = "broot";

14− version = "1.0.4";

14+ version = "1.0.5";

1515

1616 src = fetchCrate {

1717 inherit pname version;

18− sha256 = "06gq7xn9g5wk6d5p732998q7lxbw2g6qb8vsv95jcnybarf88n1v";

18+ sha256 = "0b28xdc3dwhr4vb3w19fsrbj2m82zwkg44l4an3r4mi2vgb25nv2";

1919 };

2020

21− cargoSha256 = "1cbvi3jgj78gly3xkqbn8ai0ra5hpdphpdy7cphlrym0aj77ck4a";

21+ cargoSha256 = "07gsga5hf4l64kyjadqvmbg5bay7mad9kg2pi4grjxdw6lsxky0f";

2222

2323 nativeBuildInputs = [

2424 makeWrapper

pkgs/tools/misc/colord/default.nix+2−2

@@ -29,13 +29,13 @@

2929

3030stdenv.mkDerivation rec {

3131 pname = "colord";

32− version = "1.4.4";

32+ version = "1.4.5";

3333

3434 outputs = [ "out" "dev" "devdoc" "man" "installedTests" ];

3535

3636 src = fetchurl {

3737 url = "https://www.freedesktop.org/software/colord/releases/${pname}-${version}.tar.xz";

38− sha256 = "19f0938fr7nvvm3jr263dlknaq7md40zrac2npfyz25zc00yh3ws";

38+ sha256 = "05sydi6qqqx1rrqwnga1vbg9srkf89wdcfw5w4p4m7r37m2flx5p";

3939 };

4040

4141 patches = [

pkgs/tools/misc/diffoscope/default.nix+2−2

@@ -16,11 +16,11 @@ let

1616in

1717python3Packages.buildPythonApplication rec {

1818 pname = "diffoscope";

19− version = "160";

19+ version = "161";

2020

2121 src = fetchurl {

2222 url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";

23− sha256 = "1nshcgq31nrbh4r70i5azs7s0wfc4llb60ka1w8rncy22rg8rabc";

23+ sha256 = "sha256-Frk+aVUQhWn/TvlG4zy5+R2z92rFIwO4NPRXYkS0rN4=";

2424 };

2525

2626 outputs = [ "out" "man" ];

pkgs/tools/misc/fortune/default.nix+2−2

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

22

33stdenv.mkDerivation rec {

44 pname = "fortune-mod";

5− version = "3.2.0";

5+ version = "3.4.1";

66

77 # We use fetchurl instead of fetchFromGitHub because the release pack has some

88 # special files.

99 src = fetchurl {

1010 url = "https://github.com/shlomif/fortune-mod/releases/download/${pname}-${version}/${pname}-${version}.tar.xz";

11− sha256 = "0j554ja4min5rbqni8qn5gzk4xiyd643b8r50jyi32pcs88dwp7n";

11+ sha256 = "02hjf432mq5qpbf1hywid7b356jys5n9brrrmm6z6r05jpzybbg3";

1212 };

1313

1414 nativeBuildInputs = [ cmake perl ];

pkgs/tools/misc/lokalise2-cli/default.nix+2−2

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

22

33buildGoModule rec {

44 pname = "lokalise2-cli";

5− version = "2.6.0";

5+ version = "2.6.1";

66

77 src = fetchFromGitHub {

88 owner = "lokalise";

99 repo = "lokalise-cli-2-go";

1010 rev = "v${version}";

11− sha256 = "15lwy2rrb5d5r0asa51bgjr42pcknk6znx6qirw9s924i8dbzp6s";

11+ sha256 = "0a3bah5xa2vmxgqkqihbvcc8rpl64yhw3i0c30lhfdfza0jisaql";

1212 };

1313

1414 vendorSha256 = "06y1v0v1kkbd5vxa8h0qvasm9ibwwhz0v4x03k3nb5xlwn0x9jx8";

pkgs/tools/misc/mutagen/default.nix+2−2

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

22

33buildGoModule rec {

44 pname = "mutagen";

5− version = "0.11.7";

5+ version = "0.11.8";

66

77 src = fetchFromGitHub {

88 owner = "mutagen-io";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "11wp94khj9bzmadij0nq6i6q0x9z6h0zy4a6fhf322y5nxsmvcgy";

11+ sha256 = "17ycd2y7hgwa2yxbin86i6aj67x7xaajwz3mqgdyfvkja5hgbjyr";

1212 };

1313

1414 vendorSha256 = "0szs9yc49fyh55ra1wf8zj76kdah0x49d45cgivk3gqh2hl17j6l";

pkgs/tools/misc/onefetch/default.nix+3−3

@@ -3,16 +3,16 @@

33

44rustPlatform.buildRustPackage rec {

55 pname = "onefetch";

6− version = "2.7.0";

6+ version = "2.7.1";

77

88 src = fetchFromGitHub {

99 owner = "o2sh";

1010 repo = pname;

1111 rev = "v${version}";

12− sha256 = "sha256-9HZLr/dwr5T1m6H/SHy9ULfKMkyrLNb2Z8W3RlSWzGM=";

12+ sha256 = "1l4acikxkxvmdqn10ck4w4f100vz7kfrzghz5h4haj7ycrr35j3l";

1313 };

1414

15− cargoSha256 = "sha256-cyffVX1XEF5zaNbk/VeZEtKG/Npwv5Yzz9OU5G9UyGc=";

15+ cargoSha256 = "0rmy0jnf5rqd4dqyl6rinxb3n3rzqnixrybs4i27lcas9m753z40";

1616

1717 buildInputs = with stdenv;

1818 lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ];

pkgs/tools/misc/pgcenter/default.nix+2−2

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

22

33buildGoModule rec {

44 pname = "pgcenter";

5− version = "0.6.5";

5+ version = "0.6.6";

66

77 src = fetchFromGitHub {

88 owner = "lesovsky";

99 repo = "pgcenter";

1010 rev = "v${version}";

11− sha256 = "03n1gn944z6rz5g643y68hvfxpxp65mip32w1zx43xr60x1vpf2v";

11+ sha256 = "1axwsclssxsg38ppdmd4v1lbs87ksrwj5z76ckjk8jjfni1xp9sr";

1212 };

1313

1414 vendorSha256 = "1mzvpr12qh9668iz97p62zl4zhlrcyfgwr4a9zg9irj585pkb5x2";

pkgs/tools/misc/pgmetrics/default.nix+2−2

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

22

33buildGoModule rec {

44 pname = "pgmetrics";

5− version = "1.10.0";

5+ version = "1.10.2";

66

77 src = fetchFromGitHub {

88 owner = "rapidloop";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "1256mcac75nlr1c7pzsgqmjq026m6qxh9dlldndvl1s08bk7pxr9";

11+ sha256 = "0mhdw985gs9gh44iz78a588nnnapirpnd7s0zh35jyripx8pgw47";

1212 };

1313

1414 vendorSha256 = "16x33fmh4q993rw0jr65337yimska4fwgyyw3kmq84q0x28a3zg5";

pkgs/tools/misc/pistol/default.nix+3−3

@@ -6,16 +6,16 @@

66

77buildGoModule rec {

88 pname = "pistol";

9− version = "0.1.4";

9+ version = "0.1.7";

1010

1111 src = fetchFromGitHub {

1212 owner = "doronbehar";

1313 repo = pname;

1414 rev = "v${version}";

15− sha256 = "1x9wb0gj5l71xz15ia0i2hrnhcpf457i21w41jzw2ink2fbdxp3b";

15+ sha256 = "0kspix7ac4fb0gblrlhnf8hi2ijc997qqkhmy47jibmj6120lmqk";

1616 };

1717

18− vendorSha256 = "0dg4f9g6895nv3c6d74ijl6hzsyn620ndspbcq7ynvb1z0hsg6iz";

18+ vendorSha256 = "08fjavadx5mwibzc130mlhp4zph6iwv15xnd4rsniw6zldkzmczy";

1919

2020 doCheck = false;

2121

pkgs/tools/misc/rpm-ostree/default.nix+3−3

@@ -40,13 +40,13 @@

4040

4141stdenv.mkDerivation rec {

4242 pname = "rpm-ostree";

43− version = "2020.5";

43+ version = "2020.7";

4444

4545 outputs = [ "out" "dev" "man" "devdoc" ];

4646

4747 src = fetchurl {

4848 url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";

49− sha256 = "MLLCmnStvGuSbVBdfOm2Sdzzz7LvPQkgDt9G0CDqCkA=";

49+ sha256 = "1f8ajri6k5ni2rm8c75nydl8wcza0q6bv2bia3aqd0mr7iw31pbm";

5050 };

5151

5252 nativeBuildInputs = [

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

116116

117117 meta = with stdenv.lib; {

118118 description = "A hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model";

119− homepage = "https://rpm-ostree.readthedocs.io/en/latest/";

119+ homepage = "https://coreos.github.io/rpm-ostree/";

120120 license = licenses.lgpl2Plus;

121121 maintainers = with maintainers; [ copumpkin ];

122122 platforms = platforms.linux;

pkgs/tools/misc/slurp/default.nix+2−2

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

55

66stdenv.mkDerivation rec {

77 pname = "slurp";

8− version = "1.3.0";

8+ version = "1.3.1";

99

1010 src = fetchFromGitHub {

1111 owner = "emersion";

1212 repo = "slurp";

1313 rev = "v${version}";

14− sha256 = "191yjn909dax8z66ks58wjadrycpbwryirkfjcy99dhq7dijg9fh";

14+ sha256 = "1fby2v2ylcadgclds05wpkl9xi2r9dfz49dqyqpn20rjv1wnz3jv";

1515 };

1616

1717 nativeBuildInputs = [

pkgs/tools/misc/trash-cli/default.nix+2−14

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

33

44python3Packages.buildPythonApplication rec {

55 pname = "trash-cli";

6− version = "0.17.1.14";

6+ version = "0.20.11.7";

77

88 src = fetchFromGitHub {

99 owner = "andreafrancia";

1010 repo = "trash-cli";

1111 rev = version;

12− sha256 = "1bqazna223ibqjwbc1wfvfnspfyrvjy8347qlrgv4cpng72n7gfi";

12+ sha256 = "0083vagy0jkahb5sw1il7r53ggk45zbjwwjsqd76v7ph3v1awf4v";

1313 };

1414

1515 patches = [

@@ -19,18 +19,6 @@ python3Packages.buildPythonApplication rec {

1919 libc = let ext = if stdenv.isDarwin then ".dylib" else ".so.6";

2020 in "${stdenv.cc.libc}/lib/libc${ext}";

2121 })

22−

23− # Fix build on Python 3.6.

24− (fetchpatch {

25− url = "https://github.com/andreafrancia/trash-cli/commit/a21b80d1e69783bb09376c3f60dd2f2a10578805.patch";

26− sha256 = "0w49rjh433sjfc2cl5a9wlbr6kcn9f1qg905qsyv7ay3ar75wvyp";

27− })

28−

29− # Fix listing trashed files over mount points, see https://github.com/andreafrancia/trash-cli/issues/95

30− (fetchpatch {

31− url = "https://github.com/andreafrancia/trash-cli/commit/436dfddb4c2932ba3ff696e4732750b7bdc58461.patch";

32− sha256 = "02pkcz7nj67jbnqpw1943nrv95m8xyjvab4j62fa64r73fagm8m4";

33− })

3422 ];

3523

3624 checkInputs = with python3Packages; [

pkgs/tools/package-management/nfpm/default.nix+3−3

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

22

33buildGoModule rec {

44 pname = "nfpm";

5− version = "1.8.0";

5+ version = "1.10.0";

66

77 src = fetchFromGitHub {

88 owner = "goreleaser";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "0hg15k9bz5iw7mv4m31rg4f5anfiirr3vjvy16z532vwfh05ixw3";

11+ sha256 = "1pgdajbphqfn430jwm052czz1d4ynl6n4z2wjzmblv7lwkbh9j3d";

1212 };

1313

14− vendorSha256 = "032l0xrf4ny4ildinxlfjy8sslhcl2krmgnm07dnx999jxlswxym";

14+ vendorSha256 = "0x7r7qn4852q57fx5mcrw3aqdydmidk9g0hvj6apj81q77k5svqs";

1515

1616 doCheck = false;

1717

pkgs/tools/security/1password-gui/default.nix+2−2

@@ -13,11 +13,11 @@ in

1313

1414stdenv.mkDerivation rec {

1515 pname = "1password";

16− version = "0.9.2-1";

16+ version = "0.9.3";

1717

1818 src = fetchurl {

1919 url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";

20− sha256 = "19m8qfhmdzgz76xba9wi5cb12jqwr17afqzajvgq681i52fij0lr";

20+ sha256 = "wO1HwXl6Lf7+2fXX7i8nrD/hi9dAWn50Jkoztx6aT0Q=";

2121 };

2222

2323 nativeBuildInputs = [ makeWrapper ];

pkgs/tools/security/saml2aws/default.nix+2−2

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

22

33buildGoModule rec {

44 pname = "saml2aws";

5− version = "2.27.0";

5+ version = "2.27.1";

66

77 src = fetchFromGitHub {

88 owner = "Versent";

99 repo = "saml2aws";

1010 rev = "v${version}";

11− sha256 = "15ddzab93iqwbvxnaw5wp4dzwlxjqxvyy1c4w37jm69zkczylrmc";

11+ sha256 = "1ffq7jh14cj45wn5rx9awh5k8hqbfwm4fjz0a0rq22yqfwbbkkj2";

1212 };

1313

1414 runVend = true;

pkgs/tools/security/spectre-meltdown-checker/default.nix+2−2

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

22

33stdenv.mkDerivation rec {

44 pname = "spectre-meltdown-checker";

5− version = "0.43";

5+ version = "0.44";

66

77 src = fetchFromGitHub {

88 owner = "speed47";

99 repo = "spectre-meltdown-checker";

1010 rev = "v${version}";

11− sha256 = "1ys5m1yvm26qjlsjpqqd33lwpb880p0ay289hmifxjjawkqddjgg";

11+ sha256 = "1b47wlc52jnp2d5c7kbqnxmlm4g3cfbv25q30llv5mlmzs6d7bam";

1212 };

1313

1414 prePatch = ''

pkgs/tools/system/bfs/default.nix+2−2

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

22

33stdenv.mkDerivation rec {

44 pname = "bfs";

5− version = "2.0";

5+ version = "2.1";

66

77 src = fetchFromGitHub {

88 repo = "bfs";

99 owner = "tavianator";

1010 rev = version;

11− sha256 = "0cx650cz4ap1ng25n17pkz0n6zcs87l4bs0mabhqr289rfkf3ddd";

11+ sha256 = "1iricyigm0rsc8fr91vk3krvyafbnp0y3ww1rjv94l6jbdl7rrlb";

1212 };

1313

1414 buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ];

pkgs/tools/system/inxi/default.nix+2−2

@@ -22,13 +22,13 @@ let

2222 ++ recommendedDisplayInformationPrograms;

2323in stdenv.mkDerivation rec {

2424 pname = "inxi";

25− version = "3.1.08-1";

25+ version = "3.1.09-1";

2626

2727 src = fetchFromGitHub {

2828 owner = "smxi";

2929 repo = "inxi";

3030 rev = version;

31− sha256 = "15b0fn8kv09k7kzyzix1pr1wmjw5yinzgw01v8pf9p547m4a899a";

31+ sha256 = "0m6s8kxjppy3jm39is5i1lbrah29cw86rq0vamvx46izbdyf84y5";

3232 };

3333

3434 buildInputs = [ perl makeWrapper ];

pkgs/tools/system/throttled/default.nix+2−2

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

22

33stdenv.mkDerivation rec {

44 pname = "throttled";

5− version = "0.7";

5+ version = "0.8";

66

77 src = fetchFromGitHub {

88 owner = "erpalma";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "1y1sczvj2qc8ml9i1rdzr8hklvci9bdphm3mmri2ncaqys8wdbh4";

11+ sha256 = "0qw124gdgjqij3xhgg8j1mdsg6j0xg340as5qf8hd3gwc38sqi9x";

1212 };

1313

1414 nativeBuildInputs = [ python3Packages.wrapPython ];

pkgs/tools/text/ocrmypdf/default.nix+2−2

@@ -29,14 +29,14 @@ let

2929in

3030buildPythonApplication rec {

3131 pname = "ocrmypdf";

32− version = "11.0.1";

32+ version = "11.3.3";

3333 disabled = ! python3Packages.isPy3k;

3434

3535 src = fetchFromGitHub {

3636 owner = "jbarlow83";

3737 repo = "OCRmyPDF";

3838 rev = "v${version}";

39− sha256 = "194ds9i1zd80ynzwgv7kprax0crh7bbchayawdcvg2lyr64a82xn";

39+ sha256 = "0qv34clid65p11dgqalyk7b7myn5ibiz8i9xxhxkmjblw297p6ak";

4040 };

4141

4242 nativeBuildInputs = with python3Packages; [

pkgs/tools/text/ugrep/default.nix+2−2

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

22

33stdenv.mkDerivation rec {

44 pname = "ugrep";

5− version = "2.5.5";

5+ version = "3.0.4";

66

77 src = fetchFromGitHub {

88 owner = "Genivia";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "0ba9h0m9c28rllym1djij3b97k4rj06nsgajmbxg5mpxfzplgxy2";

11+ sha256 = "0z3l6dm7v5fdki70nmz2qzrzqmkj3lngiwpswqmyygm7v8gvmimv";

1212 };

1313

1414 buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ];

pkgs/tools/text/vale/default.nix+2−2

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

22

33buildGoModule rec {

44 pname = "vale";

5− version = "2.5.0";

5+ version = "2.6.1";

66

77 subPackages = [ "." ];

88 outputs = [ "out" "data" ];

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

1111 owner = "errata-ai";

1212 repo = "vale";

1313 rev = "v${version}";

14− sha256 = "0favaijdddm0lajlv0a277mg286jh12kwfndf98zdp0vfq9lv00d";

14+ sha256 = "1xn3i1d8z2zlnykcz0z779naashn92kd7fnnssamjqblclr8dsp8";

1515 };

1616

1717 vendorSha256 = null;

pkgs/tools/text/vgrep/default.nix+2−2

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

22

33buildGoModule rec {

44 pname = "vgrep";

5− version = "2.5.0";

5+ version = "2.5.1";

66

77 src = fetchFromGitHub {

88 owner = "vrothberg";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "1waxp66286q325avvsq58s8qkfjqa39s5p8c3z59scpm0244nr80";

11+ sha256 = "06rnmg6ljj4f1g602wdp2wy9v0m1m0sj6jl6wywyjl8grjqc3vac";

1212 };

1313

1414 vendorSha256 = null;

pkgs/tools/virtualization/rootlesskit/default.nix+2−2

@@ -2,14 +2,14 @@

22

33buildGoPackage rec {

44 pname = "rootlesskit";

5− version = "0.10.0";

5+ version = "0.11.0";

66 goPackagePath = "github.com/rootless-containers/rootlesskit";

77

88 src = fetchFromGitHub {

99 owner = "rootless-containers";

1010 repo = "rootlesskit";

1111 rev = "v${version}";

12− sha256 = "0jrzqaczd5zxlbvh0hjym8pc1d7y8c66gslq3d3l5vv4z7hz7yfr";

12+ sha256 = "1x5f02yw5bzkjwg7lcsa7549d8fj13dnk596rgg90q0z6vqfarzj";

1313 };

1414

1515 meta = with lib; {

pkgs/top-level/all-packages.nix+37−19

@@ -479,6 +479,8 @@ in

479479

480480 ociTools = callPackage ../build-support/oci-tools { };

481481

482+ octant = callPackage ../applications/networking/cluster/octant { };

483+

482484 pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;

483485

484486 pruneLibtoolFiles = makeSetupHook { name = "prune-libtool-files"; }

@@ -2532,6 +2534,8 @@ in

25322534

25332535 socklog = callPackage ../tools/system/socklog { };

25342536

2537+ ssmsh = callPackage ../tools/admin/ssmsh { };

2538+

25352539 stagit = callPackage ../development/tools/stagit { };

25362540

25372541 starboard = callPackage ../applications/networking/cluster/starboard { };

@@ -8582,6 +8586,8 @@ in

85828586

85838587 ### DEVELOPMENT / COMPILERS

85848588

8589+ _4th = callPackage ../development/compilers/4th { };

8590+

85858591 abcl = callPackage ../development/compilers/abcl {

85868592 jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731

85878593 jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731

@@ -10899,6 +10905,8 @@ in

1089910905 };

1090010906 });

1090110907

10908+ bisoncpp = callPackage ../development/tools/parsing/bisonc++ { };

10909+

1090210910 black = with python3Packages; toPythonApplication black;

1090310911

1090410912 blackfire = callPackage ../development/tools/misc/blackfire { };

@@ -11945,7 +11953,9 @@ in

1194511953

1194611954 travis = callPackage ../development/tools/misc/travis { };

1194711955

11948− tree-sitter = callPackage ../development/tools/parsing/tree-sitter { };

11956+ tree-sitter = callPackage ../development/tools/parsing/tree-sitter {

11957+ inherit (darwin.apple_sdk.frameworks) Security;

11958+ };

1194911959

1195011960 trellis = callPackage ../development/tools/trellis { };

1195111961

@@ -12652,7 +12662,10 @@ in

1265212662

1265312663 flyway = callPackage ../development/tools/flyway { };

1265412664

12655− fmt = callPackage ../development/libraries/fmt/default.nix { };

12665+ inherit (callPackages ../development/libraries/fmt { })

12666+ fmt_6 fmt_7;

12667+

12668+ fmt = fmt_7;

1265612669

1265712670 fplll = callPackage ../development/libraries/fplll {};

1265812671 fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {};

@@ -16788,7 +16801,9 @@ in

1678816801

1678916802 grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { };

1679016803

16791− gerbera = callPackage ../servers/gerbera { };

16804+ gerbera = callPackage ../servers/gerbera {

16805+ fmt = fmt_6;

16806+ };

1679216807

1679316808 gobetween = callPackage ../servers/gobetween { };

1679416809

@@ -17031,6 +17046,12 @@ in

1703117046

1703217047 # PulseAudio daemons

1703317048

17049+ hsphfpd = callPackage ../servers/pulseaudio/hsphfpd.nix { };

17050+

17051+ pulseaudio-hsphfpd = callPackage ../servers/pulseaudio/pali.nix {

17052+ inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;

17053+ };

17054+

1703417055 pulseaudio = callPackage ../servers/pulseaudio {

1703517056 inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;

1703617057 };

@@ -17963,18 +17984,11 @@ in

1796317984

1796417985 linux_mptcp = linux_mptcp_95;

1796517986

17966− linux_mptcp_94 = callPackage ../os-specific/linux/kernel/linux-mptcp-94.nix {

17967− kernelPatches =

17968− [ kernelPatches.bridge_stp_helper

17969− kernelPatches.request_key_helper

17970− kernelPatches.cpu-cgroup-v2."4.11"

17971− kernelPatches.modinst_arg_list_too_long

17972− ]

17973− ++ lib.optionals ((stdenv.hostPlatform.platform.kernelArch or null) == "mips")

17974− [ kernelPatches.mips_fpureg_emu

17975− kernelPatches.mips_fpu_sigill

17976− kernelPatches.mips_ext3_n32

17977− ];

17987+ linux_mptcp_5_9 = linux_5_9.override {

17988+ structuredExtraConfig = with lib.kernel; {

17989+ MPTCP = yes;

17990+ MPTCP_IPV6 = yes;

17991+ };

1797817992 };

1797917993

1798017994 linux_mptcp_95 = callPackage ../os-specific/linux/kernel/linux-mptcp-95.nix {

@@ -21597,7 +21611,9 @@ in

2159721611

2159821612 swaylock-effects = callPackage ../applications/window-managers/sway/lock-effects.nix { };

2159921613

21600− waybar = callPackage ../applications/misc/waybar { };

21614+ waybar = callPackage ../applications/misc/waybar {

21615+ fmt = fmt_6;

21616+ };

2160121617

2160221618 hikari = callPackage ../applications/window-managers/hikari { };

2160321619

@@ -22800,8 +22816,6 @@ in

2280022816 inherit (gnome2) libglade;

2280122817 };

2280222818

22803− obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { };

22804−

2280522819 obs-studio = libsForQt514.callPackage ../applications/video/obs-studio { };

2280622820

2280722821 obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { };

@@ -23283,6 +23297,8 @@ in

2328323297

2328423298 quilter = callPackage ../applications/editors/quilter { };

2328523299

23300+ quisk = python38Packages.callPackage ../applications/radio/quisk { };

23301+

2328623302 quiterss = libsForQt514.callPackage ../applications/networking/newsreaders/quiterss {};

2328723303

2328823304 falkon = libsForQt514.callPackage ../applications/networking/browsers/falkon { };

@@ -24248,7 +24264,7 @@ in

2424824264 onlyLibVLC = true;

2424924265 };

2425024266

24251− vmpk = callPackage ../applications/audio/vmpk { };

24267+ vmpk = libsForQt5.callPackage ../applications/audio/vmpk { };

2425224268

2425324269 vmware-horizon-client = callPackage ../applications/networking/remote/vmware-horizon-client { };

2425424270

@@ -24976,6 +24992,8 @@ in

2497624992

2497724993 tessera = callPackage ../applications/blockchains/tessera.nix { };

2497824994

24995+ turbo-geth = callPackage ../applications/blockchains/turbo-geth.nix { };

24996+

2497924997 vertcoin = libsForQt514.callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = true; };

2498024998 vertcoind = callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = false; };

2498124999

pkgs/top-level/ocaml-packages.nix−2

@@ -599,8 +599,6 @@ let

599599

600600 mparser = callPackage ../development/ocaml-modules/mparser { };

601601

602− mstruct = callPackage ../development/ocaml-modules/mstruct { };

603−

604602 mtime = callPackage ../development/ocaml-modules/mtime { };

605603

606604 mustache = callPackage ../development/ocaml-modules/mustache { };

pkgs/top-level/perl-packages.nix+60−4

@@ -1758,6 +1758,21 @@ let

17581758 buildInputs = [ TestWarn ];

17591759 };

17601760

1761+ CatalystAuthenticationStoreLDAP = buildPerlPackage {

1762+ pname = "Catalyst-Authentication-Store-LDAP";

1763+ version = "1.016";

1764+ src = fetchurl {

1765+ url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Authentication-Store-LDAP-1.016.tar.gz";

1766+ sha256 = "0cm399vxqqf05cjgs1j5v3sk4qc6nmws5nfhf52qvpbwc4m82mq8";

1767+ };

1768+ propagatedBuildInputs = [ NetLDAP CatalystPluginAuthentication ClassAccessorFast ];

1769+ buildInputs = [ TestMore TestMockObject TestException NetLDAPServerTest ];

1770+ meta = {

1771+ description= "Authentication from an LDAP Directory";

1772+ license = with stdenv.lib.licenses; [ artistic1 ];

1773+ };

1774+ };

1775+

17611776 CatalystComponentInstancePerContext = buildPerlPackage {

17621777 pname = "Catalyst-Component-InstancePerContext";

17631778 version = "0.001001";

@@ -8300,12 +8315,12 @@ let

83008315 };

83018316 };

83028317

8303− FutureAsyncAwait = buildPerlModule {

8318+ FutureAsyncAwait = buildPerlModule rec {

83048319 pname = "Future-AsyncAwait";

8305− version = "0.45";

8320+ version = "0.46";

83068321 src = fetchurl {

8307− url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-0.45.tar.gz";

8308− sha256 = "1aq19b21r9i4c1mxkrv0irnx16234cnzsx50178c7xif4gqkar9k";

8322+ url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-${version}.tar.gz";

8323+ sha256 = "1iqbs7n8923xjkai51hiczn5an8cskddl7qrfi30axjl1d56h6r0";

83098324 };

83108325 buildInputs = [ TestRefcount ];

83118326 propagatedBuildInputs = [ Future XSParseSublike ];

@@ -14910,6 +14925,47 @@ let

1491014925 };

1491114926 };

1491214927

14928+ NetLDAPServer = buildPerlPackage {

14929+ pname = "Net-LDAP-Server";

14930+ version = "0.43";

14931+ src = fetchurl {

14932+ url = "mirror://cpan/authors/id/A/AA/AAR/Net-LDAP-Server-0.43.tar.gz";

14933+ sha256 = "0qmh3cri3fpccmwz6bhwp78yskrb3qmalzvqn0a23hqbsfs4qv6x";

14934+ };

14935+ propagatedBuildInputs = [ NetLDAP ConvertASN1 ];

14936+ meta = {

14937+ description = "LDAP server side protocol handling";

14938+ license = with stdenv.lib.licenses; [ artistic1 ];

14939+ };

14940+ };

14941+

14942+ NetLDAPSID = buildPerlPackage {

14943+ pname = "Net-LDAP-SID";

14944+ version = "0.0001";

14945+ src = fetchurl {

14946+ url = "mirror://cpan/authors/id/K/KA/KARMAN/Net-LDAP-SID-0.001.tar.gz";

14947+ sha256 = "1mnnpkmj8kpb7qw50sm8h4sd8py37ssy2xi5hhxzr5whcx0cvhm8";

14948+ };

14949+ meta = {

14950+ description= "Active Directory Security Identifier manipulation";

14951+ license = with stdenv.lib.licenses; [ artistic2 ];

14952+ };

14953+ };

14954+

14955+ NetLDAPServerTest = buildPerlPackage {

14956+ pname = "Net-LDAP-Server-Test";

14957+ version = "0.22";

14958+ src = fetchurl {

14959+ url = "mirror://cpan/authors/id/K/KA/KARMAN/Net-LDAP-Server-Test-0.22.tar.gz";

14960+ sha256 = "13idip7jky92v4adw60jn2gcc3zf339gsdqlnc9nnvqzbxxp285i";

14961+ };

14962+ propagatedBuildInputs = [ NetLDAP NetLDAPServer TestMore DataDump NetLDAPSID ];

14963+ meta = {

14964+ description= "test Net::LDAP code";

14965+ license = with stdenv.lib.licenses; [ artistic1 ];

14966+ };

14967+ };

14968+

1491314969 NetNetmask = buildPerlPackage {

1491414970 pname = "Net-Netmask";

1491514971 version = "1.9104";

pkgs/top-level/python-packages.nix+2

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

20122012

20132013 fastdtw = callPackage ../development/python-modules/fastdtw { };

20142014

2015+ fastecdsa = callPackage ../development/python-modules/fastecdsa { };

2016+

20152017 fasteners = callPackage ../development/python-modules/fasteners { };

20162018

20172019 fastentrypoints = callPackage ../development/python-modules/fastentrypoints { };

pkgs/top-level/static.nix+5

@@ -286,6 +286,11 @@ in {

286286

287287 libexecinfo = super.libexecinfo.override { enableShared = false; };

288288

289+ tree-sitter = super.tree-sitter.override {

290+ enableShared = false;

291+ enableStatic = true;

292+ };

293+

289294 xorg = super.xorg.overrideScope' (xorgself: xorgsuper: {

290295 libX11 = xorgsuper.libX11.overrideAttrs (attrs: {

291296 depsBuildBuild = attrs.depsBuildBuild ++ [ (self.buildPackages.stdenv.cc.libc.static or null) ];