2d104c9 · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

Merge master into staging-next

commit2d104c99a7d99ead0a9eeb74f1f523aa77aae743 authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> dateWed 16 Jun 2021, 18:04 (5 years ago) parentb08ae54 d86f211

95 files changed+1478−543

compare with master

unifiedsplit

README.md+2−2

@@ -46,9 +46,9 @@ Nixpkgs and NixOS are built and tested by our continuous integration

4646system, [Hydra](https://hydra.nixos.org/).

4747

4848* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)

49−* [Continuous package builds for the NixOS 20.09 release](https://hydra.nixos.org/jobset/nixos/release-20.09)

49+* [Continuous package builds for the NixOS 21.05 release](https://hydra.nixos.org/jobset/nixos/release-21.05)

5050* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)

51−* [Tests for the NixOS 20.09 release](https://hydra.nixos.org/job/nixos/release-20.09/tested#tabs-constituents)

51+* [Tests for the NixOS 21.05 release](https://hydra.nixos.org/job/nixos/release-21.05/tested#tabs-constituents)

5252

5353Artifacts successfully built with Hydra are published to cache at

5454https://cache.nixos.org/. When successful build and test criteria are

doc/languages-frameworks/gnome.section.md+19−1

@@ -8,12 +8,30 @@ Programs in the GNOME universe are written in various languages but they all use

99[GSettings](https://developer.gnome.org/gio/stable/GSettings.html) API is often used for storing settings. GSettings schemas are required, to know the type and other metadata of the stored values. GLib looks for `glib-2.0/schemas/gschemas.compiled` files inside the directories of `XDG_DATA_DIRS`.

1010

11−On Linux, GSettings API is implemented using [dconf](https://wiki.gnome.org/Projects/dconf) backend. You will need to add `dconf` GIO module to `GIO_EXTRA_MODULES` variable, otherwise the `memory` backend will be used and the saved settings will not be persistent.

11+On Linux, GSettings API is implemented using [dconf](https://wiki.gnome.org/Projects/dconf) backend. You will need to add `dconf` [GIO module](#ssec-gnome-gio-modules) to `GIO_EXTRA_MODULES` variable, otherwise the `memory` backend will be used and the saved settings will not be persistent.

1212

1313Last you will need the dconf database D-Bus service itself. You can enable it using `programs.dconf.enable`.

1414

1515Some applications will also require `gsettings-desktop-schemas` for things like reading proxy configuration or user interface customization. This dependency is often not mentioned by upstream, you should grep for `org.gnome.desktop` and `org.gnome.system` to see if the schemas are needed.

1616

17+### GIO modules {#ssec-gnome-gio-modules}

18+

19+GLib’s [GIO](https://developer.gnome.org/gio/stable/ch01.html) library supports several [extension points](https://developer.gnome.org/gio/stable/extending-gio.html). Notably, they allow:

20+

21+* implementing settings backends (already [mentioned](#ssec-gnome-settings))

22+* adding TLS support

23+* proxy settings

24+* virtual file systems

25+

26+The modules are typically installed to `lib/gio/modules/` directory of a package and you need to add them to `GIO_EXTRA_MODULES` if you need any of those features.

27+

28+In particular, we recommend:

29+

30+* adding `dconf.lib` for any software on Linux that reads [GSettings](#ssec-gnome-settings) (even transitivily through e.g. GTK’s file manager)

31+* adding `glib-networking` for any software that accesses network using GIO or libsoup – glib-networking contains a module that implements TLS support and loads system-wide proxy settings

32+

33+To allow software to use various virtual file systems, `gvfs` package can be also added. But that is usually an optional feature so we typically use `gvfs` from the system (e.g. installed globally using NixOS module).

34+

1735### GdkPixbuf loaders {#ssec-gnome-gdk-pixbuf-loaders}

1836

1937GTK applications typically use [GdkPixbuf](https://developer.gnome.org/gdk-pixbuf/stable/) to load images. But `gdk-pixbuf` package only supports basic bitmap formats like JPEG, PNG or TIFF, requiring to use third-party loader modules for other formats. This is especially painful since GTK itself includes SVG icons, which cannot be rendered without a loader provided by `librsvg`.

maintainers/maintainer-list.nix+5

@@ -7281,6 +7281,11 @@

72817281 githubId = 628342;

72827282 name = "Tim Steinbach";

72837283 };

7284+ nessdoor = {

7285+ name = "Tomas Antonio Lopez";

7286+ email = "entropy.overseer@protonmail.com";

7287+ githubId = 25993494;

7288+ };

72847289 netcrns = {

72857290 email = "jason.wing@gmx.de";

72867291 github = "netcrns";

nixos/lib/test-driver/test-driver.py+1−1

@@ -973,7 +973,7 @@ def subtest(name: str) -> Iterator[None]:

973973

974974

975975if __name__ == "__main__":

976− arg_parser = argparse.ArgumentParser()

976+ arg_parser = argparse.ArgumentParser(prog="nixos-test-driver")

977977 arg_parser.add_argument(

978978 "-K",

979979 "--keep-vm-state",

nixos/lib/testing-python.nix+135−122

@@ -16,13 +16,19 @@ rec {

1616

1717 inherit pkgs;

1818

19−

20− mkTestDriver =

19+ # Reifies and correctly wraps the python test driver for

20+ # the respective qemu version and with or without ocr support

21+ pythonTestDriver = {

22+ qemu_pkg ? pkgs.qemu_test

23+ , enableOCR ? false

24+ }:

2125 let

22− testDriverScript = ./test-driver/test-driver.py;

23− in

24− qemu_pkg: stdenv.mkDerivation {

2526 name = "nixos-test-driver";

27+ testDriverScript = ./test-driver/test-driver.py;

28+ ocrProg = tesseract4.override { enableLanguages = [ "eng" ]; };

29+ imagemagick_tiff = imagemagick_light.override { inherit libtiff; };

30+ in stdenv.mkDerivation {

31+ inherit name;

2632

2733 nativeBuildInputs = [ makeWrapper ];

2834 buildInputs = [ (python3.withPackages (p: [ p.ptpython p.colorama ])) ];

@@ -35,7 +41,7 @@ rec {

3541 buildPhase = ''

3642 python <<EOF

3743 from pydoc import importfile

38− with open('driver-exports', 'w') as fp:

44+ with open('driver-symbols', 'w') as fp:

3945 fp.write(','.join(dir(importfile('${testDriverScript}'))))

4046 EOF

4147 '';

@@ -57,20 +63,17 @@ rec {

5763 # TODO: copy user script part into this file (append)

5864

5965 wrapProgram $out/bin/nixos-test-driver \

66+ --argv0 ${name} \

6067 --prefix PATH : "${lib.makeBinPath [ qemu_pkg vde2 netpbm coreutils ]}" \

68+ ${lib.optionalString enableOCR

69+ "--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \

6170

62− install -m 0644 -vD driver-exports $out/nix-support/driver-exports

71+ install -m 0644 -vD driver-symbols $out/nix-support/driver-symbols

6372 '';

6473 };

6574

6675 # Run an automated test suite in the given virtual network.

67− runTests = {

68− # the script that runs the network

69− driver,

70− # a source position in the format of builtins.unsafeGetAttrPos

71− # for meta.position

72− pos,

73− }:

76+ runTests = { driver, pos }:

7477 stdenv.mkDerivation {

7578 name = "vm-test-run-${driver.testName}";

7679

@@ -87,10 +90,99 @@ rec {

8790 inherit driver;

8891 };

8992

90− inherit pos;

93+ inherit pos; # for better debugging

9194 };

9295

96+ # Generate convenience wrappers for running the test driver

97+ # has vlans, vms and test script defaulted through env variables

98+ # also instantiates test script with nodes, if it's a function (contract)

99+ setupDriverForTest = {

100+ testScript

101+ , testName

102+ , nodes

103+ , qemu_pkg ? pkgs.qemu_test

104+ , enableOCR ? false

105+ , skipLint ? false

106+ , passthru ? {}

107+ }:

108+ let

109+ # FIXME: get this pkg from the module system

110+ testDriver = pythonTestDriver { inherit qemu_pkg enableOCR;};

111+

112+ testDriverName =

113+ let

114+ # A standard store path to the vm monitor is built like this:

115+ # /tmp/nix-build-vm-test-run-$name.drv-0/vm-state-machine/monitor

116+ # The max filename length of a unix domain socket is 108 bytes.

117+ # This means $name can at most be 50 bytes long.

118+ maxTestNameLen = 50;

119+ testNameLen = builtins.stringLength testName;

120+ in with builtins;

121+ if testNameLen > maxTestNameLen then

122+ abort

123+ ("The name of the test '${testName}' must not be longer than ${toString maxTestNameLen} " +

124+ "it's currently ${toString testNameLen} characters long.")

125+ else

126+ "nixos-test-driver-${testName}";

127+

128+ vlans = map (m: m.config.virtualisation.vlans) (lib.attrValues nodes);

129+ vms = map (m: m.config.system.build.vm) (lib.attrValues nodes);

130+

131+ nodeHostNames = map (c: c.config.system.name) (lib.attrValues nodes);

132+

133+ invalidNodeNames = lib.filter

134+ (node: builtins.match "^[A-z_]([A-z0-9_]+)?$" node == null)

135+ (builtins.attrNames nodes);

136+

137+ testScript' =

138+ # Call the test script with the computed nodes.

139+ if lib.isFunction testScript

140+ then testScript { inherit nodes; }

141+ else testScript;

93142

143+ in

144+ if lib.length invalidNodeNames > 0 then

145+ throw ''

146+ Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})!

147+ All machines are referenced as python variables in the testing framework which will break the

148+ script when special characters are used.

149+ Please stick to alphanumeric chars and underscores as separation.

150+ ''

151+ else lib.warnIf skipLint "Linting is disabled" (runCommand testDriverName

152+ {

153+ inherit testName;

154+ nativeBuildInputs = [ makeWrapper ];

155+ testScript = testScript';

156+ preferLocalBuild = true;

157+ passthru = passthru // {

158+ inherit nodes;

159+ };

160+ }

161+ ''

162+ mkdir -p $out/bin

163+

164+ echo -n "$testScript" > $out/test-script

165+ ${lib.optionalString (!skipLint) ''

166+ PYFLAKES_BUILTINS="$(

167+ echo -n ${lib.escapeShellArg (lib.concatStringsSep "," nodeHostNames)},

168+ < ${lib.escapeShellArg "${testDriver}/nix-support/driver-symbols"}

169+ )" ${python3Packages.pyflakes}/bin/pyflakes $out/test-script

170+ ''}

171+

172+ ln -s ${testDriver}/bin/nixos-test-driver $out/bin/

173+ vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done))

174+ wrapProgram $out/bin/nixos-test-driver \

175+ --add-flags "''${vms[*]}" \

176+ --run "export testScript=\"\$(${coreutils}/bin/cat $out/test-script)\"" \

177+ --set VLANS '${toString vlans}'

178+ ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms

179+ wrapProgram $out/bin/nixos-run-vms \

180+ --add-flags "''${vms[*]}" \

181+ --set tests 'start_all(); join_all();' \

182+ --set VLANS '${toString vlans}'

183+ '');

184+

185+ # Make a full-blown test

94186 makeTest =

95187 { testScript

96188 , enableOCR ? false

@@ -106,128 +198,47 @@ rec {

106198 , ...

107199 } @ t:

108200 let

109− # A standard store path to the vm monitor is built like this:

110− # /tmp/nix-build-vm-test-run-$name.drv-0/vm-state-machine/monitor

111− # The max filename length of a unix domain socket is 108 bytes.

112− # This means $name can at most be 50 bytes long.

113− maxTestNameLen = 50;

114− testNameLen = builtins.stringLength name;

115−

116−

117−

118− ocrProg = tesseract4.override { enableLanguages = [ "eng" ]; };

119−

120− imagemagick_tiff = imagemagick_light.override { inherit libtiff; };

121−

122− # Generate convenience wrappers for running the test driver

123− # interactively with the specified network, and for starting the

124− # VMs from the command line.

125− mkDriver = qemu_pkg:

201+ nodes = qemu_pkg:

126202 let

127203 build-vms = import ./build-vms.nix {

128204 inherit system pkgs minimal specialArgs;

129− extraConfigurations = extraConfigurations ++ (pkgs.lib.optional (qemu_pkg != null)

205+ extraConfigurations = extraConfigurations ++ [(

130206 {

131207 virtualisation.qemu.package = qemu_pkg;

132− }

133− ) ++ [(

134− {

135208 # Ensure we do not use aliases. Ideally this is only set

136209 # when the test framework is used by Nixpkgs NixOS tests.

137210 nixpkgs.config.allowAliases = false;

138211 }

139212 )];

140213 };

141−

142− # FIXME: get this pkg from the module system

143− testDriver = mkTestDriver (if qemu_pkg == null then pkgs.qemu_test else qemu_pkg);

144−

145− nodes = build-vms.buildVirtualNetwork (

146− t.nodes or (if t ? machine then { machine = t.machine; } else { })

147− );

148− vlans = map (m: m.config.virtualisation.vlans) (lib.attrValues nodes);

149− vms = map (m: m.config.system.build.vm) (lib.attrValues nodes);

150−

151− testScript' =

152− # Call the test script with the computed nodes.

153− if lib.isFunction testScript

154− then testScript { inherit nodes; }

155− else testScript;

156−

157− testDriverName = with builtins;

158− if testNameLen > maxTestNameLen then

159− abort

160− ("The name of the test '${name}' must not be longer than ${toString maxTestNameLen} " +

161− "it's currently ${toString testNameLen} characters long.")

162− else

163− "nixos-test-driver-${name}";

164214 in

165− lib.warnIf skipLint "Linting is disabled" (runCommand testDriverName

166− {

167− nativeBuildInputs = [ makeWrapper ];

168− testScript = testScript';

169− preferLocalBuild = true;

170− testName = name;

171− passthru = passthru // {

172− inherit nodes;

173− };

174− }

175− ''

176− mkdir -p $out/bin

177−

178− echo -n "$testScript" > $out/test-script

179− ${lib.optionalString (!skipLint) ''

180− PYFLAKES_BUILTINS="$(

181− echo -n ${lib.escapeShellArg (lib.concatStringsSep "," nodeHostNames)},

182− < ${lib.escapeShellArg "${testDriver}/nix-support/driver-exports"}

183− )" ${python3Packages.pyflakes}/bin/pyflakes $out/test-script

184− ''}

185−

186− ln -s ${testDriver}/bin/nixos-test-driver $out/bin/

187− vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done))

188− wrapProgram $out/bin/nixos-test-driver \

189− --add-flags "''${vms[*]}" \

190− ${lib.optionalString enableOCR

191− "--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \

192− --run "export testScript=\"\$(${coreutils}/bin/cat $out/test-script)\"" \

193− --set VLANS '${toString vlans}'

194− ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms

195− wrapProgram $out/bin/nixos-run-vms \

196− --add-flags "''${vms[*]}" \

197− ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \

198− --set tests 'start_all(); join_all();' \

199− --set VLANS '${toString vlans}'

200− ''); # "

201−

202− passMeta = drv: drv // lib.optionalAttrs (t ? meta) {

203− meta = (drv.meta or { }) // t.meta;

204− };

205−

206− driver = mkDriver null;

207− driverInteractive = mkDriver pkgs.qemu;

208−

209− test = passMeta (runTests { inherit driver pos; });

215+ build-vms.buildVirtualNetwork (

216+ t.nodes or (if t ? machine then { machine = t.machine; } else { })

217+ );

210218

211− nodeNames = builtins.attrNames driver.nodes;

212− invalidNodeNames = lib.filter

213− (node: builtins.match "^[A-z_]([A-z0-9_]+)?$" node == null)

214− nodeNames;

219+ driver = setupDriverForTest {

220+ inherit testScript enableOCR skipLint;

221+ testName = name;

222+ qemu_pkg = pkgs.qemu_test;

223+ nodes = nodes pkgs.qemu_test;

224+ };

225+ driverInteractive = setupDriverForTest {

226+ inherit testScript enableOCR skipLint;

227+ testName = name;

228+ qemu_pkg = pkgs.qemu;

229+ nodes = nodes pkgs.qemu;

230+ };

215231

216− nodeHostNames = map (c: c.config.system.name) (lib.attrValues driver.nodes);

232+ test =

233+ let

234+ passMeta = drv: drv // lib.optionalAttrs (t ? meta) {

235+ meta = (drv.meta or { }) // t.meta;

236+ };

237+ in passMeta (runTests { inherit driver pos; });

217238

218239 in

219− if lib.length invalidNodeNames > 0 then

220− throw ''

221− Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})!

222− All machines are referenced as python variables in the testing framework which will break the

223− script when special characters are used.

224−

225− Please stick to alphanumeric chars and underscores as separation.

226− ''

227− else

228240 test // {

229− inherit test driver driverInteractive;

230− inherit (driver) nodes;

241+ inherit test driver driverInteractive nodes;

231242 };

232243

233244 runInMachine =

@@ -235,7 +246,7 @@ rec {

235246 , machine

236247 , preBuild ? ""

237248 , postBuild ? ""

238− , qemu ? pkgs.qemu_test

249+ , qemu_pkg ? pkgs.qemu_test

239250 , ... # ???

240251 }:

241252 let

@@ -272,6 +283,8 @@ rec {

272283 client.succeed("sync") # flush all data before pulling the plug

273284 '';

274285

286+ testDriver = pythonTestDriver { inherit qemu_pkg; };

287+

275288 vmRunCommand = writeText "vm-run" ''

276289 xchg=vm-state-client/xchg

277290 ${coreutils}/bin/mkdir $out

@@ -290,7 +303,7 @@ rec {

290303 unset xchg

291304

292305 export tests='${testScript}'

293− ${mkTestDriver qemu}/bin/nixos-test-driver --keep-vm-state ${vm.config.system.build.vm}/bin/run-*-vm

306+ ${testDriver}/bin/nixos-test-driver --keep-vm-state ${vm.config.system.build.vm}/bin/run-*-vm

294307 ''; # */

295308

296309 in

nixos/modules/services/misc/matrix-synapse.nix+12−1

@@ -143,6 +143,13 @@ in {

143143 List of additional Matrix plugins to make available.

144144 '';

145145 };

146+ withJemalloc = mkOption {

147+ type = types.bool;

148+ default = false;

149+ description = ''

150+ Whether to preload jemalloc to reduce memory fragmentation and overall usage.

151+ '';

152+ };

146153 no_tls = mkOption {

147154 type = types.bool;

148155 default = false;

@@ -720,7 +727,11 @@ in {

720727 --keys-directory ${cfg.dataDir} \

721728 --generate-keys

722729 '';

723− environment.PYTHONPATH = makeSearchPathOutput "lib" cfg.package.python.sitePackages [ pluginsEnv ];

730+ environment = {

731+ PYTHONPATH = makeSearchPathOutput "lib" cfg.package.python.sitePackages [ pluginsEnv ];

732+ } // optionalAttrs (cfg.withJemalloc) {

733+ LD_PRELOAD = "${pkgs.jemalloc}/lib/libjemalloc.so";

734+ };

724735 serviceConfig = {

725736 Type = "notify";

726737 User = "matrix-synapse";

pkgs/applications/audio/helvum/default.nix+3−3

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

1313

1414rustPlatform.buildRustPackage rec {

1515 pname = "helvum";

16− version = "0.2.0";

16+ version = "0.2.1";

1717

1818 src = fetchFromGitLab {

1919 domain = "gitlab.freedesktop.org";

2020 owner = "ryuukyu";

2121 repo = pname;

2222 rev = version;

23− sha256 = "sha256-sQ4epL3QNOLHuR/dr/amHgiaxV/1SWeb3eijnjAAR3w=";

23+ sha256 = "sha256-ZnpdGXK8N8c/s4qC2NXcn0Pdqrqr47iOWvVwXD9pn1A=";

2424 };

2525

26− cargoSha256 = "sha256-uNTSU06Fz/ud04K40e98rb7o/uAht0DsiJOXeHX72vw=";

26+ cargoSha256 = "sha256-2v2L20rUWftXdhhuE3wiRrDIuSg6VFxfpWYMRaMUyTU=";

2727

2828 nativeBuildInputs = [ clang copyDesktopItems pkg-config ];

2929 buildInputs = [ glib gtk4 pipewire ];

pkgs/applications/audio/ptcollab/default.nix+4−8

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

44, fetchFromGitHub

55, nix-update-script

66, qmake

7+, pkg-config

78, qtbase

89, qtmultimedia

910, libvorbis

@@ -12,21 +13,16 @@

1213

1314mkDerivation rec {

1415 pname = "ptcollab";

15− version = "0.4.0";

16+ version = "0.4.1";

1617

1718 src = fetchFromGitHub {

1819 owner = "yuxshao";

1920 repo = "ptcollab";

2021 rev = "v${version}";

21− sha256 = "1yfnf47saxxj17x0vyxihr343kp7gz3fashzky79j80sqlm6ng85";

22+ sha256 = "sha256-98v9it9M5FXCsOpWvO10uKYmEH15v1FEH1hH73XHa7w=";

2223 };

2324

24− postPatch = ''

25− substituteInPlace src/editor.pro \

26− --replace '/usr/include/rtmidi' '${rtmidi}/include/rtmidi'

27− '';

28−

29− nativeBuildInputs = [ qmake ];

25+ nativeBuildInputs = [ qmake pkg-config ];

3026

3127 buildInputs = [ qtbase qtmultimedia libvorbis rtmidi ];

3228

pkgs/applications/audio/sidplayfp/default.nix+9−2

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

11{ stdenv

22, lib

33, fetchFromGitHub

4+, nix-update-script

45, autoreconfHook

56, perl

67, pkg-config

@@ -15,13 +16,13 @@

1516

1617stdenv.mkDerivation rec {

1718 pname = "sidplayfp";

18− version = "2.1.1";

19+ version = "2.2.0";

1920

2021 src = fetchFromGitHub {

2122 owner = "libsidplayfp";

2223 repo = "sidplayfp";

2324 rev = "v${version}";

24− sha256 = "0s3xmg3yzfqbsnlh2y46w7b5jim5zq7mshs6hx03q8wdr75cvwh4";

25+ sha256 = "sha256-hN7225lhuYyo4wPDiiEc9FaPg90pZ13mLw93V8tb/P0=";

2526 };

2627

2728 nativeBuildInputs = [ autoreconfHook perl pkg-config ];

@@ -37,6 +38,12 @@ stdenv.mkDerivation rec {

3738

3839 enableParallelBuilding = true;

3940

41+ passthru = {

42+ updateScript = nix-update-script {

43+ attrPath = pname;

44+ };

45+ };

46+

4047 meta = with lib; {

4148 description = "A SID player using libsidplayfp";

4249 homepage = "https://github.com/libsidplayfp/sidplayfp";

pkgs/applications/blockchains/go-ethereum.nix+1

@@ -4,6 +4,7 @@ let

44 # A list of binaries to put into separate outputs

55 bins = [

66 "geth"

7+ "clef"

78 ];

910in buildGoModule rec {

pkgs/applications/editors/poke/default.nix+2−2

@@ -19,11 +19,11 @@ let

1919 isCross = stdenv.hostPlatform != stdenv.buildPlatform;

2020in stdenv.mkDerivation rec {

2121 pname = "poke";

22− version = "1.2";

22+ version = "1.3";

2323

2424 src = fetchurl {

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

26− hash = "sha256-9hz42ltkwBoTWTc3JarRyiV/NcHJJp5NUN0GZBg932I=";

26+ hash = "sha256-unhjA0obCABLDuj4i9qUFgcH6aeB1VVvVVtQdYPPDxs=";

2727 };

2828

2929 postPatch = ''

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

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

1010

1111mkDerivation rec {

1212 pname = "krita";

13− version = "4.4.3";

13+ version = "4.4.5";

1414

1515 src = fetchurl {

1616 url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.gz";

17− sha256 = "0rwghzci2wn2jmisvnzs23yxc2z3d4dcx2qbbhcvjyi3q8ij61nl";

17+ sha256 = "sha256-S/1ygIcNEGCgDREj2Db8Gltb+KAoZ2Z58CaM1ef7dWg=";

1818 };

1919

2020 nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ];

pkgs/applications/misc/jquake/default.nixnew file+66

@@ -0,0 +1,66 @@

1+{ lib, stdenv, fetchurl, copyDesktopItems, makeDesktopItem, unzip, jre8 }:

3+stdenv.mkDerivation rec {

4+ pname = "jquake";

5+ version = "1.6.1";

7+ src = fetchurl {

8+ url = "https://fleneindre.github.io/downloads/JQuake_${version}_linux.zip";

9+ sha256 = "0nw6xjc3i1b8rk15arc5d0ji2bycc40rz044qd03vzxvh0h8yvgl";

10+ };

11+

12+ nativeBuildInputs = [ unzip copyDesktopItems ];

13+

14+ sourceRoot = ".";

15+

16+ postPatch = ''

17+ # JQuake emits a lot of debug-like messages in console, but I

18+ # don't think it's in our interest to void them by default. Log them at

19+ # the appropriate level.

20+ sed -i "/^java/ s/$/\ | logger -p user.debug/" JQuake.sh

21+

22+ # By default, an 'errors.log' file is created in the current directory.

23+ # cd into a temporary directory and let it be created there.

24+ substituteInPlace JQuake.sh \

25+ --replace "java -jar " "exec ${jre8.outPath}/bin/java -jar $out/lib/" \

26+ --replace "[JAR FOLDER]" "\$(mktemp -p /tmp -d jquake-errlog-XXX)"

27+ '';

28+

29+ dontConfigure = true;

30+ dontBuild = true;

31+

32+ installPhase = ''

33+ runHook preInstall

34+

35+ chmod +x JQuake.sh

36+

37+ mkdir -p $out/{bin,lib}

38+ mv JQuake.sh $out/bin/JQuake

39+ mv {JQuake.jar,JQuake_lib} $out/lib

40+ mv sounds $out/lib

41+

42+ mkdir -p $out/share/licenses/jquake

43+ mv LICENSE* $out/share/licenses/jquake

44+

45+ runHook postInstall

46+ '';

47+

48+ desktopItems = [

49+ (makeDesktopItem {

50+ name = "JQuake";

51+ desktopName = "JQuake";

52+ exec = "JQuake";

53+ comment = "Real-time earthquake map of Japan";

54+ })

55+ ];

56+

57+ meta = with lib; {

58+ description = "Real-time earthquake map of Japan";

59+ homepage = "http://jquake.net";

60+ downloadPage = "https://jquake.net/?down";

61+ changelog = "https://jquake.net/?docu";

62+ maintainers = with maintainers; [ nessdoor ];

63+ license = licenses.unfree;

64+ platforms = platforms.linux;

65+ };

66+}

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

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

33stdenv.mkDerivation rec {

44 pname = "logseq";

5− version = "0.1.3";

5+ version = "0.1.8";

77 src = fetchurl {

88 url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";

9− sha256 = "1akg3xjbh01nb7l06qpvz3xsjj64kf042xjnapn60jlgg5y34vbm";

9+ sha256 = "0q8lci72rzzc04wnfqry31zav07srw0iymjlq5mxygsq4h9bcq01";

1010 name = "${pname}-${version}.AppImage";

1111 };

1212

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

@@ -90,11 +90,11 @@ in

9090

9191stdenv.mkDerivation rec {

9292 pname = "brave";

93− version = "1.25.68";

93+ version = "1.25.72";

9494

9595 src = fetchurl {

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

97− sha256 = "OBf42L6pctflNLjtcbnw2wKo7TisRSMF3SriDPFlB6I=";

97+ sha256 = "7bvcLKc/ZyVSTGOsRIO9qgHc8dSYOJaoEHJw7V2Vl/M=";

9898 };

9999

100100 dontConfigure = true;

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

@@ -31,15 +31,15 @@

3131 }

3232 },

3333 "dev": {

34− "version": "93.0.4535.3",

35− "sha256": "19iy4p59n0pg9s39g614y4yxh5f6h86bcp471qdnm6fvzmzcxd18",

36− "sha256bin64": "16q9s8l20bmr2n0y3pi505l5hbhbmpi8kh47aylj5gzk1nr30a8r",

34+ "version": "93.0.4542.2",

35+ "sha256": "0sfyi52kaxg5mllcvn61285fjnj72vglv9fjf36ri93v6gh34rgw",

36+ "sha256bin64": "0hk31b9nk834gykv977dv7f1hyl7jp527bx5ldxhwcy27333h1hr",

3737 "deps": {

3838 "gn": {

39− "version": "2021-05-07",

39+ "version": "2021-06-11",

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

41− "rev": "39a87c0b36310bdf06b692c098f199a0d97fc810",

42− "sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4"

41+ "rev": "e0c476ffc83dc10897cb90b45c03ae2539352c5c",

42+ "sha256": "01p5w57kksihzg9nb5096a74cw2rp8zzgdjcjm1pgrqvd1mxpjm4"

4343 }

4444 }

4545 },

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

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

33buildGoModule rec {

44 pname = "kube3d";

5− version = "4.4.5";

5+ version = "4.4.6";

77 src = fetchFromGitHub {

88 owner = "rancher";

99 repo = "k3d";

1010 rev = "v${version}";

11− sha256 = "sha256-nT/17R1Gky9509U077tgwS7iQKRMJUk8rwQiHSHcP+s=";

11+ sha256 = "sha256-gId7zDrtkTjFN59yaFyeYwrDZV24hkkV+4dPr8Jr22E=";

1212 };

1313

1414 vendorSha256 = null;

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

@@ -27,10 +27,10 @@ in {

2727 pname = "discord-canary";

2828 binaryName = "DiscordCanary";

2929 desktopName = "Discord Canary";

30− version = "0.0.124";

30+ version = "0.0.125";

3131 src = fetchurl {

3232 url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";

33− sha256 = "060ypr9rn5yl8iwh4v3ax1v6501yaq72sx50q47sm0wyxn7gpv91";

33+ sha256 = "0ly5a6l7rvl54mc39xma14jrcrf11q3ndnkkr16by5hy3palmz9g";

3434 };

3535 };

3636}.${branch}

pkgs/applications/networking/instant-messengers/kaidan/default.nixnew file+62

@@ -0,0 +1,62 @@

1+{ mkDerivation

2+, lib

3+, fetchFromGitLab

4+, cmake

5+, extra-cmake-modules

6+, pkg-config

7+, qtquickcontrols2

8+, qtmultimedia

9+, qtlocation

10+, qqc2-desktop-style

11+, kirigami2

12+, knotifications

13+, zxing-cpp

14+, qxmpp

15+, gst_all_1

16+}:

17+

18+mkDerivation rec {

19+ pname = "kaidan";

20+ version = "0.8.0";

21+

22+ src = fetchFromGitLab {

23+ domain = "invent.kde.org";

24+ owner = "network";

25+ repo = pname;

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

27+ sha256 = "070njci5zyzahmz3nqyp660chxnqx1mxp31w17syfllvrw403qmg";

28+ };

29+

30+ nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];

31+

32+ buildInputs = with gst_all_1; [

33+ qtquickcontrols2

34+ qtmultimedia

35+ qtlocation

36+ qqc2-desktop-style

37+ kirigami2

38+ knotifications

39+ zxing-cpp

40+ qxmpp

41+ gstreamer

42+ gst-plugins-bad

43+ gst-plugins-base

44+ gst-plugins-good

45+ ];

46+ postInstall = ''

47+ qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")

48+ '';

49+

50+ meta = with lib; {

51+ description = "User-friendly and modern chat app, using XMPP";

52+ homepage = "https://www.kaidan.im";

53+ license = with licenses; [

54+ gpl3Plus

55+ mit

56+ asl20

57+ cc-by-sa-40

58+ ];

59+ maintainers = with maintainers; [ astro ];

60+ platforms = with platforms; linux;

61+ };

62+}

pkgs/applications/networking/instant-messengers/kdeltachat/default.nix+3−3

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

1313

1414mkDerivation rec {

1515 pname = "kdeltachat";

16− version = "unstable-2021-06-06";

16+ version = "unstable-2021-06-14";

1717

1818 src = fetchFromSourcehut {

1919 owner = "~link2xt";

2020 repo = "kdeltachat";

21− rev = "321c19b7415e837acc4e66d535e82518618bc096";

22− sha256 = "19py9mxpjz09fhyyvxf75s77nq0jwwfiljq9289192p61grk6625";

21+ rev = "25da4228768e260ea9f67d5aa10558e7cf9cf7ee";

22+ sha256 = "17igh34cbd0w5mzra4k779nxc5s8hk6sj25h308w079y0b21lf7w";

2323 };

2424

2525 nativeBuildInputs = [

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

@@ -28,7 +28,7 @@ let

2828 else "");

2929in stdenv.mkDerivation rec {

3030 pname = "signal-desktop";

31− version = "5.4.1"; # Please backport all updates to the stable channel.

31+ version = "5.5.0"; # Please backport all updates to the stable channel.

3232 # All releases have a limited lifetime and "expire" 90 days after the release.

3333 # When releases "expire" the application becomes unusable until an update is

3434 # applied. The expiration date for the current release can be extracted with:

@@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {

3838

3939 src = fetchurl {

4040 url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";

41− sha256 = "1f1narpqj8gcyi4r574nqm1cbyi3azk1y7d1j300scr51gk74fq6";

41+ sha256 = "0l12hwwv0ks2hgp1xc5nmn5rcqzwxdpjqhwysix550m26bz4jczp";

4242 };

4343

4444 nativeBuildInputs = [

pkgs/applications/networking/mailreaders/sylpheed/default.nix+12−1

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

11{ lib, stdenv, fetchurl, pkg-config, gtk2, openssl ? null, gpgme ? null

2−, gpgSupport ? true, sslSupport ? true }:

2+, gpgSupport ? true, sslSupport ? true, fetchpatch }:

44assert gpgSupport -> gpgme != null;

55assert sslSupport -> openssl != null;

@@ -15,6 +15,17 @@ stdenv.mkDerivation rec {

1515 sha256 = "0j9y5vdzch251s264diw9clrn88dn20bqqkwfmis9l7m8vmwasqd";

1616 };

1717

18+ patches = [

19+ (fetchpatch {

20+ # patch upstream bug https://sylpheed.sraoss.jp/redmine/issues/306

21+ name = "patch-libsylph_ssl_c.patch";

22+ url = "https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/mail/sylpheed/patches/patch-libsylph_ssl_c?rev=1.4&content-type=text/plain";

23+ sha256 = "sha256-k9OwPtHrEjaxXdH0trNqXgJMhR8kjgtei9pi6OFvILk=";

24+ })

25+ ];

26+

27+ patchFlags = [ "-p0" ];

28+

1829 nativeBuildInputs = [ pkg-config ];

1930

2031 buildInputs = [ gtk2 ]

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

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

33buildGoModule rec {

44 pname = "glab";

5− version = "1.18.0";

5+ version = "1.18.1";

77 src = fetchFromGitHub {

88 owner = "profclems";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "sha256-/WKfMmaFjnzRWCJZEZF/CguU0K7FOtgvKNMSQGvjODQ=";

11+ sha256 = "sha256-ahP5y5i0SMj2+mP4RYc7MLZGElX5eLgKwiVhBYGOX2g=";

1212 };

1313

14− vendorSha256 = "sha256-PCkVjLdOdOhJGNSkVPFK/ONRdJT7MS0COjYgPNT5dNw=";

14+ vendorSha256 = "sha256-ssVmqcJ/DxUqAkHm9tn4RwWuKzTHvxoqJquXPIRy4b8=";

1515 runVend = true;

1616

1717 # Tests are trying to access /homeless-shelter

pkgs/applications/virtualization/singularity/default.nix+2−2

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

1515

1616buildGoPackage rec {

1717 pname = "singularity";

18− version = "3.7.4";

18+ version = "3.8.0";

1919

2020 src = fetchurl {

2121 url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz";

22− sha256 = "sha256-wmY2movydH9E4HWYWMP8OyMluXWogYsmaPC5exJNAWQ=";

22+ sha256 = "sha256-6WCLDgqMgFIYu+eV6RdkhIN7L3/LleVGm4U7OAmiQS4=";

2323 };

2424

2525 goPackagePath = "github.com/sylabs/singularity";

pkgs/applications/window-managers/i3/balance-workspace.nix+2−2

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

33buildPythonPackage rec {

44 pname = "i3-balance-workspace";

5− version = "1.8.4";

5+ version = "1.8.5";

77 src = fetchPypi {

88 inherit pname version;

9− sha256 = "bb220eb373e290312b0aafe3d7b1cc1cca34c93189a4fca5bee93ef39aafbe3d";

9+ sha256 = "7b5d72b756f79878a058484825bb343b100433e00a01f80c9c6d1ccc9f4af57a";

1010 };

1111

1212 propagatedBuildInputs = [ i3ipc ];

pkgs/applications/window-managers/wayfire/default.nix+1−1

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

1−{ stdenv, lib, fetchurl, meson, ninja, pkg-config, git

1+{ lib, stdenv, fetchurl, meson, ninja, pkg-config

22, cairo, libdrm, libexecinfo, libinput, libjpeg, libxkbcommon, wayland

33, wayland-protocols, wf-config, wlroots, mesa

44}:

pkgs/desktops/gnome/apps/gnome-music/default.nix+2−2

@@ -30,13 +30,13 @@

3030

3131python3.pkgs.buildPythonApplication rec {

3232 pname = "gnome-music";

33− version = "40.0";

33+ version = "40.1.1";

3434

3535 format = "other";

3636

3737 src = fetchurl {

3838 url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";

39− sha256 = "1djqhd4jccvk352hwxjhiwjgbnv1qnpv450f2c6w6581vcn9pq38";

39+ sha256 = "IMtnPhHC8xQ9NYjPyrmhInkQgOun3GASypTBhglVjVE=";

4040 };

4141

4242 nativeBuildInputs = [

pkgs/desktops/gnome/core/evince/default.nix+2−2

@@ -44,13 +44,13 @@

4444

4545stdenv.mkDerivation rec {

4646 pname = "evince";

47− version = "40.1";

47+ version = "40.2";

4848

4949 outputs = [ "out" "dev" "devdoc" ];

5050

5151 src = fetchurl {

5252 url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz";

53− sha256 = "0bfg7prmjk3z8irx1nfkkqph3igg3cy4pwd7pcxjxbshqdin6rks";

53+ sha256 = "D/fseTdqipesTNJ00y6ATH4jbvLS1dP2Rt5uuIKmPHc=";

5454 };

5555

5656 postPatch = ''

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

@@ -13,11 +13,11 @@

1313

1414stdenv.mkDerivation rec {

1515 pname = "gnome-shell-extensions";

16− version = "40.1";

16+ version = "40.2";

1717

1818 src = fetchurl {

1919 url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz";

20− sha256 = "T7/OCtQ1e+5zrn3Bjqoe9MqnOF5PlPavuN/HJR/RqL8=";

20+ sha256 = "qFGN1Mg6eE+o05pe1gC/gdY3oY7r5ZDjticYPgv5FPg=";

2121 };

2222

2323 patches = [

pkgs/development/libraries/audio/libbass/default.nix+1−1

@@ -15,7 +15,7 @@ let

1515 x86_64-linux = "x64/libbass.so";

1616 };

1717 urlpath = "bass24-linux.zip";

18− sha256 = "1z01im0l2ydi608vc0n0c1cfyp1vrh6681zn2zkhg98vvs20y805";

18+ sha256 = "1ycvpfa7yyi1qxgflpfzcw1q32f0isd14m9cf351pk8zwndkmp4q";

1919 };

2020

2121 bass_fx = {

pkgs/development/libraries/gnutls/default.nix+1−1

@@ -112,7 +112,7 @@ stdenv.mkDerivation {

112112 tampering, or message forgery."

113113 '';

114114

115− homepage = "https://www.gnu.org/software/gnutls/";

115+ homepage = "https://gnutls.org/";

116116 license = licenses.lgpl21Plus;

117117 maintainers = with maintainers; [ eelco fpletz ];

118118 platforms = platforms.all;

pkgs/development/libraries/libserdes/default.nixnew file+61

@@ -0,0 +1,61 @@

1+{ stdenv

2+, lib

3+, fetchFromGitHub

4+, perl

5+, boost

6+, rdkafka

7+, jansson

8+, curl

9+, avro-c

10+, avro-cpp }:

11+

12+stdenv.mkDerivation rec {

13+ pname = "libserdes";

14+ version = "6.2.0";

15+

16+ src = fetchFromGitHub {

17+ owner = "confluentinc";

18+ repo = pname;

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

20+ sha256 = "194ras18xw5fcnjgg1isnb24ydx9040ndciniwcbdb7w7wd901gc";

21+ };

22+

23+ outputs = [ "dev" "out" ];

24+

25+ nativeBuildInputs = [ perl ];

26+

27+ buildInputs = [ boost rdkafka jansson curl avro-c avro-cpp ];

28+

29+ makeFlags = [ "GEN_PKG_CONFIG=y" ];

30+

31+ postPatch = ''

32+ patchShebangs configure lds-gen.pl

33+ '';

34+

35+ # Has a configure script but it’s not Autoconf so steal some bits from multiple-outputs.sh:

36+ setOutputFlags = false;

37+

38+ preConfigure = ''

39+ configureFlagsArray+=(

40+ "--libdir=''${!outputLib}/lib"

41+ "--includedir=''${!outputInclude}/include"

42+ )

43+ '';

44+

45+ preInstall = ''

46+ installFlagsArray+=("pkgconfigdir=''${!outputDev}/lib/pkgconfig")

47+ '';

48+

49+ # Header files get installed with executable bit for some reason; get rid of it.

50+ postInstall = ''

51+ chmod -x ''${!outputInclude}/include/libserdes/*.h

52+ '';

53+

54+ meta = with lib; {

55+ description = "A schema-based serializer/deserializer C/C++ library with support for Avro and the Confluent Platform Schema Registry";

56+ homepage = "https://github.com/confluentinc/libserdes";

57+ license = licenses.asl20;

58+ maintainers = with maintainers; [ liff ];

59+ platforms = platforms.all;

60+ };

61+}

pkgs/development/libraries/libsidplayfp/default.nix+9−16

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

11{ stdenv

22, lib

33, fetchFromGitHub

4−, fetchpatch

4+, nix-update-script

55, autoreconfHook

66, pkg-config

77, perl

@@ -16,29 +16,16 @@

1616

1717stdenv.mkDerivation rec {

1818 pname = "libsidplayfp";

19− version = "2.1.1";

19+ version = "2.2.0";

2020

2121 src = fetchFromGitHub {

2222 owner = "libsidplayfp";

2323 repo = "libsidplayfp";

2424 rev = "v${version}";

2525 fetchSubmodules = true;

26− sha256 = "0487gap2b0ypikyra74lk1qwqwr0vncldamk5xb1db2x97v504fd";

26+ sha256 = "sha256-lDM4nJozZF8Rt+XWnM41hBAYatZVsmvvQajgHLI9uy0=";

2727 };

2828

29− # https://github.com/libsidplayfp/libsidplayfp/issues/13

30− # Remove on next version bump

31− patches = [

32− (fetchpatch {

33− url = "https://github.com/libsidplayfp/libsidplayfp/commit/84f5498f5653261ed84328e1b5676c31e3ba9e6e.patch";

34− sha256 = "1vysbl4fkdzm11k40msng2ag6i6mb6z9jsw32vyj9calcfha5957";

35− })

36− (fetchpatch {

37− url = "https://github.com/libsidplayfp/libsidplayfp/commit/c1a1b732cc2e791d910522d58f47c6d094493c6d.patch";

38− sha256 = "1d3sgdly0q9dysgkx5afxbwfas6p0m8n3lw1hmj4n6wm3j9sdz4g";

39− })

40− ];

41−

4229 postPatch = ''

4330 patchShebangs .

4431 '';

@@ -72,6 +59,12 @@ stdenv.mkDerivation rec {

7259 mv docs/html $doc/share/doc/libsidplayfp/

7360 '';

7461

62+ passthru = {

63+ updateScript = nix-update-script {

64+ attrPath = pname;

65+ };

66+ };

67+

7568 meta = with lib; {

7669 description = "A library to play Commodore 64 music derived from libsidplay2";

7770 longDescription = ''

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

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

11{ lib, stdenv, fetchFromGitLab, cmake, gfortran, perl }:

33let

4− version = "5.1.4";

4+ version = "5.1.5";

66in stdenv.mkDerivation {

77 pname = "libxc";

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

1111 owner = "libxc";

1212 repo = "libxc";

1313 rev = version;

14− sha256 = "0rs6v72zz3jr22r29zxxdk8wdsfv6wid6cx2661974z09dbvbr1f";

14+ sha256 = "0cy3x2zn1bldc5i0rzislfbc8h4nqgds445jkfqjv0d1shvdy0zn";

1515 };

1616

1717 buildInputs = [ gfortran ];

pkgs/development/libraries/qxmpp/default.nixnew file+46

@@ -0,0 +1,46 @@

1+{ mkDerivation

2+, lib

3+, fetchFromGitHub

4+, cmake

5+, pkg-config

6+, withGstreamer ? true

7+, gst_all_1

8+}:

10+mkDerivation rec {

11+ pname = "qxmpp";

12+ version = "1.4.0";

13+

14+ src = fetchFromGitHub {

15+ owner = "qxmpp-project";

16+ repo = pname;

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

18+ sha256 = "1knpq1jkwk0lxdwczbmzf7qrjvlxba9yr40nbq9s5nqkcx6q1c3i";

19+ };

20+

21+ nativeBuildInputs = [

22+ cmake

23+ ] ++ lib.optionals withGstreamer [

24+ pkg-config

25+ ];

26+ buildInputs = lib.optionals withGstreamer (with gst_all_1; [

27+ gstreamer

28+ gst-plugins-bad

29+ gst-plugins-base

30+ gst-plugins-good

31+ ]);

32+ cmakeFlags = [

33+ "-DBUILD_EXAMPLES=false"

34+ "-DBUILD_TESTS=false"

35+ ] ++ lib.optionals withGstreamer [

36+ "-DWITH_GSTREAMER=ON"

37+ ];

38+

39+ meta = with lib; {

40+ description = "Cross-platform C++ XMPP client and server library";

41+ homepage = "https://github.com/qxmpp-project/qxmpp";

42+ license = licenses.lgpl21Plus;

43+ maintainers = with maintainers; [ astro ];

44+ platforms = with platforms; linux;

45+ };

46+}

pkgs/development/libraries/science/math/tensorflow-lite/default.nix+9

@@ -76,6 +76,15 @@ stdenv.mkDerivation rec {

7676 sha256 = "1jdw2i1rq06zqd6aabh7bbm0avsg4pygnfmd7gviv0blhih9054l";

7777 };

7878

79+ patches = [

80+ # TODO: remove on the next version bump

81+ (fetchpatch {

82+ name = "include-schema-conversion-utils-source.patch";

83+ url = "https://github.com/tensorflow/tensorflow/commit/f3c4f4733692150fd6174f2cd16438cfaba2e5ab.patch";

84+ sha256 = "0zx4hbz679kn79f30159rl1mq74dg45cvaawii0cyv48z472yy4k";

85+ })

86+ ];

87+

7988 buildInputs = [ zlib flatbuffers ];

8089

8190 dontConfigure = true;

pkgs/development/ocaml-modules/reason-native/cli.nixnew file+11

@@ -0,0 +1,11 @@

1+{ re, reason, pastel, ... }:

3+{

4+ pname = "cli";

6+ buildInputs = [

7+ re

8+ reason

9+ pastel

10+ ];

11+}

pkgs/development/ocaml-modules/reason-native/console.nixnew file+21

@@ -0,0 +1,21 @@

1+{ buildDunePackage, callPackage, reason, console, ... }:

3+{

4+ pname = "console";

6+ buildInputs = [

7+ reason

8+ ];

10+ passthru.tests = {

11+ console = callPackage ./tests/console {

12+ inherit buildDunePackage reason console;

13+ };

14+ };

15+

16+ meta = {

17+ description = "A library providing a web-influenced polymorphic console API for native Console.log(anything) with runtime printing";

18+ downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/console";

19+ homepage = "https://reason-native.com/docs/console/";

20+ };

21+}

pkgs/development/ocaml-modules/reason-native/default.nixnew file+43

@@ -0,0 +1,43 @@

1+{ newScope, lib, fetchFromGitHub, callPackage, buildDunePackage, atdgen, junit, qcheck-core, re, reason, reason-native }:

3+let

4+ generic = (somePath:

5+ let

6+ prepkg = import somePath {

7+ inherit callPackage cli buildDunePackage atdgen junit qcheck-core re reason;

8+ inherit (reason-native) console file-context-printer fp pastel rely;

9+ };

10+ in

11+ buildDunePackage

12+ ({

13+ version = "2021-16-16-aec0ac6";

14+ src = fetchFromGitHub {

15+ owner = "reasonml";

16+ repo = "reason-native";

17+ rev = "aec0ac681be7211b4d092262281689c46deb63e1";

18+ sha256 = "sha256-QoyI50MBY3RJBmM1y90n7oXrLmHe0CQxKojv+7YbegE=";

19+ };

20+ useDune2 = true;

21+ meta = with lib; {

22+ description = "Libraries for building and testing native Reason programs";

23+ downloadPage = "https://github.com/reasonml/reason-native";

24+ homepage = "https://reason-native.com/";

25+ license = licenses.mit;

26+ maintainers = with maintainers; [ superherointj ];

27+ } // (prepkg.meta or {});

28+ } // prepkg)

29+ );

30+ cli = generic ./cli.nix; # Used only by Rely.

31+in

32+ lib.makeScope newScope (self: with self; {

33+ console = generic ./console.nix;

34+ dir = generic ./dir.nix;

35+ file-context-printer = generic ./file-context-printer.nix;

36+ fp = generic ./fp.nix;

37+ pastel = generic ./pastel.nix;

38+ pastel-console = generic ./pastel-console.nix;

39+ qcheck-rely = generic ./qcheck-rely.nix;

40+ refmterr = generic ./refmterr.nix;

41+ rely = generic ./rely.nix;

42+ rely-junit-reporter = generic ./rely-junit-reporter.nix;

43+ })

pkgs/development/ocaml-modules/reason-native/dir.nixnew file+18

@@ -0,0 +1,18 @@

1+{ reason, fp, ... }:

3+{

4+ pname = "dir";

6+ buildInputs = [

7+ reason

8+ ];

10+ propagatedBuildInputs = [

11+ fp

12+ ];

13+

14+ meta = {

15+ description = "A library that provides a consistent API for common system, user and application directories consistently on all platforms";

16+ downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/dir";

17+ };

18+}

pkgs/development/ocaml-modules/reason-native/file-context-printer.nixnew file+20

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

1+{ reason, re, pastel, ... }:

3+{

4+ pname = "file-context-printer";

6+ buildInputs = [

7+ reason

8+ ];

10+ propagatedBuildInputs = [

11+ re

12+ pastel

13+ ];

14+

15+ meta = {

16+ description = "Utility for displaying snippets of files on the command line";

17+ downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/file-context-printer";

18+ homepage = "https://reason-native.com/docs/file-context-printer/";

19+ };

20+}

pkgs/development/ocaml-modules/reason-native/fp.nixnew file+14

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

1+{ reason, ... }:

3+{

4+ pname = "fp";

6+ buildInputs = [

7+ reason

8+ ];

10+ meta = {

11+ description = "A library for creating and operating on file paths consistently on multiple platforms";

12+ downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/fp";

13+ };

14+}

pkgs/development/ocaml-modules/reason-native/pastel-console.nixnew file+20

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

1+{ reason, console, pastel, ... }:

3+{

4+ pname = "pastel-console";

6+ buildInputs = [

7+ reason

8+ ];

10+ propagatedBuildInputs = [

11+ console

12+ pastel

13+ ];

14+

15+ meta = {

16+ description = "Small library for pretty coloring to Console output";

17+ downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/pastel-console";

18+ homepage = "https://reason-native.com/docs/pastel/console";

19+ };

20+}

pkgs/development/ocaml-modules/reason-native/pastel.nixnew file+20

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

1+{ reason, re, ... }:

3+{

4+ pname = "pastel";

6+ minimalOCamlVersion = "4.05";

8+ buildInputs = [

9+ reason

10+ ];

11+ propagatedBuildInputs = [

12+ re

13+ ];

14+

15+ meta = {

16+ description = "A text formatting library that harnesses Reason JSX to provide intuitive terminal output. Like React but for CLI";

17+ downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/pastel";

18+ homepage = "https://reason-native.com/docs/pastel/";

19+ };

20+}

pkgs/development/ocaml-modules/reason-native/qcheck-rely.nixnew file+20

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

1+{ qcheck-core, reason, console, rely, ... }:

3+{

4+ pname = "qcheck-rely";

6+ buildInputs = [

7+ reason

8+ ];

10+ propagatedBuildInputs = [

11+ qcheck-core

12+ console

13+ rely

14+ ];

15+

16+ meta = {

17+ description = "A library containing custom Rely matchers allowing for easily using QCheck with Rely. QCheck is a 'QuickCheck inspired property-based testing for OCaml, and combinators to generate random values to run tests on'";

18+ downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/qcheck-rely";

19+ };

20+}

pkgs/development/ocaml-modules/reason-native/refmterr.nixnew file+21

@@ -0,0 +1,21 @@

1+{ atdgen, re, reason, pastel, ... }:

3+{

4+ pname = "refmterr";

6+ buildInputs = [

7+ reason

8+ ];

10+ propagatedBuildInputs = [

11+ atdgen

12+ re

13+ pastel

14+ ];

15+

16+ meta = {

17+ description = "An error formatter tool for Reason and OCaml. Takes raw error output from compiler and converts to pretty output";

18+ downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/refmterr";

19+ homepage = "https://reason-native.com/docs/refmterr/";

20+ };

21+}

pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nixnew file+23

@@ -0,0 +1,23 @@

1+{ atdgen, junit, re, reason, pastel, rely, ... }:

3+{

4+ pname = "rely-junit-reporter";

6+ buildInputs = [

7+ atdgen

8+ reason

9+ ];

10+

11+ propagatedBuildInputs = [

12+ junit

13+ re

14+ pastel

15+ rely

16+ ];

17+

18+ meta = {

19+ description = "A tool providing JUnit Reporter for Rely Testing Framework";

20+ downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/rely-junit-reporter";

21+ homepage = "https://reason-native.com/docs/rely/";

22+ };

23+}

pkgs/development/ocaml-modules/reason-native/rely.nixnew file+22

@@ -0,0 +1,22 @@

1+{ re, reason, cli, file-context-printer, pastel, ... }:

3+{

4+ pname = "rely";

6+ buildInputs = [

7+ reason

8+ ];

10+ propagatedBuildInputs = [

11+ re

12+ cli

13+ file-context-printer

14+ pastel

15+ ];

16+

17+ meta = {

18+ description = "A Jest-inspired testing framework for native OCaml/Reason";

19+ downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/rely";

20+ homepage = "https://reason-native.com/docs/rely/";

21+ };

22+}

pkgs/development/ocaml-modules/reason-native/tests/console/console-test.opamnew file

No changes to the content.

pkgs/development/ocaml-modules/reason-native/tests/console/console-test.renew file+1

@@ -0,0 +1 @@

1+Console.log(Some("Hello fellow Nixer!")); /* {"Hello fellow Nixer!"} */

pkgs/development/ocaml-modules/reason-native/tests/console/default.nixnew file+20

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

1+{ lib, buildDunePackage, reason, console }:

3+buildDunePackage rec {

4+ pname = "console-test";

5+ version = "1";

7+ src = ./.;

9+ useDune2 = true;

10+

11+ buildInputs = [

12+ reason

13+ console

14+ ];

15+

16+ doInstallCheck = true;

17+ postInstallCheck = ''

18+ $out/bin/console-test | grep -q "{\"Hello fellow Nixer!\"}" > /dev/null

19+ '';

20+}

pkgs/development/ocaml-modules/reason-native/tests/console/dunenew file+4

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

1+(executable

2+ (name console-test)

3+ (public_name console-test)

4+ (libraries reason console.lib))

pkgs/development/python-modules/arcam-fmj/default.nixnew file+51

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

1+{ lib

2+, buildPythonPackage

3+, pythonOlder

4+, fetchFromGitHub

5+, aiohttp

6+, attrs

7+, defusedxml

8+, pytest-aiohttp

9+, pytest-mock

10+, pytestCheckHook

11+}:

12+

13+buildPythonPackage rec {

14+ pname = "arcam-fmj";

15+ version = "0.7.0";

16+

17+ disabled = pythonOlder "3.8";

18+

19+ src = fetchFromGitHub {

20+ owner = "elupus";

21+ repo = "arcam_fmj";

22+ rev = version;

23+ sha256 = "0y4wvvbcsizjd9qz6iw4gjhq5qf0qcqs27hpx1cd90vhy6rclxm0";

24+ };

25+

26+ propagatedBuildInputs = [

27+ aiohttp

28+ attrs

29+ defusedxml

30+ ];

31+

32+ checkInputs = [

33+ pytest-aiohttp

34+ pytest-mock

35+ pytestCheckHook

36+ ];

37+

38+ pythonImportsCheck = [

39+ "arcam.fmj"

40+ "arcam.fmj.client"

41+ "arcam.fmj.state"

42+ "arcam.fmj.utils"

43+ ];

44+

45+ meta = with lib; {

46+ description = "Python library for speaking to Arcam receivers";

47+ homepage = "https://github.com/elupus/arcam_fmj";

48+ license = licenses.mit;

49+ maintainers = with maintainers; [ dotlambda ];

50+ };

51+}

pkgs/development/python-modules/bimmer-connected/default.nixnew file+43

@@ -0,0 +1,43 @@

1+{ lib

2+, buildPythonPackage

3+, pythonOlder

4+, fetchFromGitHub

5+, pbr

6+, requests

7+, pytestCheckHook

8+}:

10+buildPythonPackage rec {

11+ pname = "bimmer-connected";

12+ version = "0.7.15";

13+

14+ disabled = pythonOlder "3.5";

15+

16+ src = fetchFromGitHub {

17+ owner = "bimmerconnected";

18+ repo = "bimmer_connected";

19+ rev = version;

20+ sha256 = "193m16rrq7mfvzjcq823icdr9fp3i8grqqn3ci8zhcsq6w3vnb90";

21+ };

22+

23+ nativeBuildInputs = [

24+ pbr

25+ ];

26+

27+ PBR_VERSION = version;

28+

29+ propagatedBuildInputs = [

30+ requests

31+ ];

32+

33+ checkInputs = [

34+ pytestCheckHook

35+ ];

36+

37+ meta = with lib; {

38+ description = "Library to read data from the BMW Connected Drive portal";

39+ homepage = "https://github.com/bimmerconnected/bimmer_connected";

40+ license = licenses.asl20;

41+ maintainers = with maintainers; [ dotlambda ];

42+ };

43+}

pkgs/development/python-modules/colorthief/default.nixnew file+33

@@ -0,0 +1,33 @@

1+{ lib

2+, buildPythonPackage

3+, fetchFromGitHub

4+, pillow

5+}:

7+buildPythonPackage rec {

8+ pname = "colorthief";

9+ version = "0.2.1";

10+

11+ src = fetchFromGitHub {

12+ owner = "fengsp";

13+ repo = "color-thief-py";

14+ rev = version;

15+ sha256 = "0lzpflal1iqbj4k7hayss5z024qf2sn8c3wxw03a0mgxg06ca2hm";

16+ };

17+

18+ propagatedBuildInputs = [

19+ pillow

20+ ];

21+

22+ # no tests implemented

23+ doCheck = false;

24+

25+ pythonImportsCheck = [ "colorthief" ];

26+

27+ meta = with lib; {

28+ description = "Python module for grabbing the color palette from an image";

29+ homepage = "https://github.com/fengsp/color-thief-py";

30+ license = licenses.bsd3;

31+ maintainers = with maintainers; [ dotlambda ];

32+ };

33+}

pkgs/development/python-modules/goalzero/default.nixnew file+36

@@ -0,0 +1,36 @@

1+{ lib

2+, buildPythonPackage

3+, pythonOlder

4+, fetchPypi

5+, aiohttp

6+, ratelimit

7+}:

9+buildPythonPackage rec {

10+ pname = "goalzero";

11+ version = "0.1.7";

12+

13+ disabled = pythonOlder "3.6";

14+

15+ src = fetchPypi {

16+ inherit pname version;

17+ sha256 = "1f6a2755a745ea14e65d6bf3e56bd090a508bf6f63ccb76b9b89ce3d844a2160";

18+ };

19+

20+ propagatedBuildInputs = [

21+ aiohttp

22+ ratelimit

23+ ];

24+

25+ # no tests implemented

26+ doCheck = false;

27+

28+ pythonImportsCheck = [ "goalzero" ];

29+

30+ meta = with lib; {

31+ description = "Goal Zero Yeti REST Api Library";

32+ homepage = "https://github.com/tkdrob/goalzero";

33+ license = licenses.mit;

34+ maintainers = with maintainers; [ dotlambda ];

35+ };

36+}

pkgs/development/python-modules/libpyfoscam/default.nixnew file+26

@@ -0,0 +1,26 @@

1+{ lib

2+, buildPythonPackage

3+, fetchPypi

4+}:

6+buildPythonPackage rec {

7+ pname = "libpyfoscam";

8+ version = "1.1";

10+ src = fetchPypi {

11+ inherit pname version;

12+ sha256 = "c274cafd2c6493ab397fe9f0f8aae0b2c35c7c661fe76dde3bd2f1cd56b8fc32";

13+ };

14+

15+ # tests need access to a camera

16+ doCheck = false;

17+

18+ pythonImportsCheck = [ "libpyfoscam" ];

19+

20+ meta = with lib; {

21+ description = "Python Library for Foscam IP Cameras";

22+ homepage = "https://github.com/viswa-swami/python-foscam";

23+ license = licenses.lgpl3Plus;

24+ maintainers = with maintainers; [ dotlambda ];

25+ };

26+}

pkgs/development/python-modules/pycontrol4/default.nixnew file+43

@@ -0,0 +1,43 @@

1+{ lib

2+, buildPythonPackage

3+, pythonOlder

4+, fetchFromGitHub

5+, aiohttp

6+, xmltodict

7+}:

9+buildPythonPackage rec {

10+ pname = "pycontrol4";

11+ version = "0.1.0";

12+

13+ disabled = pythonOlder "3.6";

14+

15+ src = fetchFromGitHub {

16+ owner = "lawtancool";

17+ repo = "pyControl4";

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

19+ sha256 = "0idw9kv6yxrbp0r33vb1jlzgil20m2rjjfrxhcwxmbjjqv93zn6d";

20+ };

21+

22+ propagatedBuildInputs = [

23+ aiohttp

24+ xmltodict

25+ ];

26+

27+ # tests access network

28+ doCheck = false;

29+

30+ pythonImportsCheck = [

31+ "pyControl4.account"

32+ "pyControl4.alarm"

33+ "pyControl4.director"

34+ "pyControl4.light"

35+ ];

36+

37+ meta = with lib; {

38+ description = "Python 3 asyncio package for interacting with Control4 systems";

39+ homepage = "https://github.com/lawtancool/pyControl4";

40+ license = licenses.asl20;

41+ maintainers = with maintainers; [ dotlambda ];

42+ };

43+}

pkgs/development/python-modules/pycoolmasternet-async/default.nixnew file+31

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

1+{ lib

2+, buildPythonPackage

3+, pythonOlder

4+, fetchFromGitHub

5+}:

7+buildPythonPackage rec {

8+ pname = "pycoolmasternet-async";

9+ version = "0.1.2";

10+

11+ disabled = pythonOlder "3.7";

12+

13+ src = fetchFromGitHub {

14+ owner = "OnFreund";

15+ repo = "pycoolmasternet-async";

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

17+ sha256 = "0qzdk18iqrvin8p8zrydf69d6pii3j47j11h7ymmsx08gh7c176g";

18+ };

19+

20+ # no tests implemented

21+ doCheck = false;

22+

23+ pythonImportsCheck = [ "pycoolmasternet_async" ];

24+

25+ meta = with lib; {

26+ description = "Python library to control CoolMasterNet HVAC bridges over asyncio";

27+ homepage = "https://github.com/OnFreund/pycoolmasternet-async";

28+ license = licenses.mit;

29+ maintainers = with maintainers; [ dotlambda ];

30+ };

31+}

pkgs/development/tools/analysis/dotenv-linter/default.nix+3−3

@@ -5,16 +5,16 @@

66rustPlatform.buildRustPackage rec {

77 pname = "dotenv-linter";

8− version = "3.0.0";

8+ version = "3.1.0";

1010 src = fetchFromGitHub {

1111 owner = "dotenv-linter";

1212 repo = "dotenv-linter";

1313 rev = "v${version}";

14− sha256 = "sha256-3Lj5GtWGyWDkZPhxYQu7UWzmh7TO5wk1UJ0lek1jTto=";

14+ sha256 = "sha256-hhaMI2Z97aT/8FxxtWpn+o3BSo26iyBP+ucpO3x4AbQ=";

1515 };

1616

17− cargoSha256 = "sha256-FDkxJuZPzDrgLJgefkRUPS+0Ys3DaBOD3XAuS/Z6TtI=";

17+ cargoSha256 = "sha256-F9Xyg8/qp0j0+jyd5EVe2idocubzu+Cj6yAwrHuabvM=";

1818

1919 meta = with lib; {

2020 description = "Lightning-fast linter for .env files. Written in Rust";

pkgs/development/tools/database/litestream/default.nixnew file+30

@@ -0,0 +1,30 @@

1+{ buildGoModule

2+, fetchFromGitHub

3+, lib

4+}:

5+buildGoModule rec {

6+ pname = "litestream";

7+ version = "0.3.5";

9+ src = fetchFromGitHub {

10+ owner = "benbjohnson";

11+ repo = pname;

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

13+ sha256 = "sha256-OQ8j0FOUWU5TfCl4AZpmX5tuhtHAbrhvzT6ve6AJNn0=";

14+ };

15+

16+ ldflags = [

17+ "-s"

18+ "-w"

19+ "-X main.Version=${version}"

20+ ];

21+

22+ vendorSha256 = "sha256-ScG8cukUuChOvN9r0HvVJsYnu1X9DSO7aD32iu55jIM=";

23+

24+ meta = with lib; {

25+ description = "Streaming replication for SQLite";

26+ license = licenses.asl20;

27+ homepage = "https://litestream.io/";

28+ maintainers = with maintainers; [ fbrs ];

29+ };

30+}

pkgs/development/tools/packer/default.nix+3−3

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

33buildGoModule rec {

44 pname = "packer";

5− version = "1.7.2";

5+ version = "1.7.3";

77 src = fetchFromGitHub {

88 owner = "hashicorp";

99 repo = "packer";

1010 rev = "v${version}";

11− sha256 = "sha256-Ey1gkld7WosJgoqnNp4Lz2x3PTI+w5p+A8Cwv4+uUZw=";

11+ sha256 = "sha256-k5GCUFzjf0mipIQlnf7VCUS2j7cFwoGCeM7T6qgGnJA=";

1212 };

1313

14− vendorSha256 = null;

14+ vendorSha256 = "sha256-5Wb7WAUGXJ7VMWiQyboH3PXJazsqitD9N0Acd+WItaY=";

1515

1616 subPackages = [ "." ];

1717

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json+4−4

@@ -1,9 +1,9 @@

11{

22 "url": "https://github.com/tree-sitter/tree-sitter-c-sharp",

3− "rev": "5b6bfbdcdbdda7da4839d7163ce579ed98410282",

4− "date": "2021-05-21T15:22:56+02:00",

5− "path": "/nix/store/msyjbgxf3y3rj6m3w2apd65cvr9x523r-tree-sitter-c-sharp",

6− "sha256": "0ls2qic3jb20zv4m5pdrc3ikfb66afay3krvc6gsq1fi9hbxrmvv",

3+ "rev": "aa429589525bb849189a0c5ddb52267ce578f988",

4+ "date": "2021-06-07T18:47:38+02:00",

5+ "path": "/nix/store/mclvpa5kfbl9g5ij3xjdhnqc6bqzqcj6-tree-sitter-c-sharp",

6+ "sha256": "07alycp4bclr0ycn44dj2481xag0s10nwgyrdxar3j91hphd966s",

77 "fetchSubmodules": false,

88 "deepClone": false,

99 "leaveDotGit": false

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json+4−4

@@ -1,9 +1,9 @@

11{

22 "url": "https://github.com/tree-sitter/tree-sitter-c",

3− "rev": "f05e279aedde06a25801c3f2b2cc8ac17fac52ae",

4− "date": "2021-03-28T09:12:10-07:00",

5− "path": "/nix/store/4bcxsfrgrcpjy3f6dsmqli2xawjpyz44-tree-sitter-c",

6− "sha256": "1rismmgaqii1sdnri66h75sgw3mky4aha9hff6fan1qzll4f3hif",

3+ "rev": "008008e30a81849fca0c79291e2b480855e0e02c",

4+ "date": "2021-05-26T09:13:01-07:00",

5+ "path": "/nix/store/vkps4991ip8dhgjqwfw7mamnmnizw31m-tree-sitter-c",

6+ "sha256": "1mw4vma7kl504qn91f6janiqk9i05849rizqkqhyagb3glfbkrx2",

77 "fetchSubmodules": false,

88 "deepClone": false,

99 "leaveDotGit": false

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json+4−4

@@ -1,9 +1,9 @@

11{

22 "url": "https://github.com/tree-sitter/tree-sitter-haskell",

3− "rev": "2e33ffa3313830faa325fe25ebc3769896b3a68b",

4− "date": "2021-04-19T23:45:03+02:00",

5− "path": "/nix/store/75mc2mfs4sm21c871s5lm9djnjk90r7n-tree-sitter-haskell",

6− "sha256": "0np7mzi1na1qscdxsjpyw314iwcmpzzrx1v7fk3yxc70qwzjcpp1",

3+ "rev": "237f4eb4417c28f643a29d795ed227246afb66f9",

4+ "date": "2021-06-05T13:41:42+02:00",

5+ "path": "/nix/store/wwi86c3ix0zq8czwljxxypw5w2mxnz5h-tree-sitter-haskell",

6+ "sha256": "0gx6mr6yg053i5mif8i8qwkk9h57laf9riw5r24av1y7cal7sszd",

77 "fetchSubmodules": false,

88 "deepClone": false,

99 "leaveDotGit": false

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": "6c8cfae935f67dd9e3a33982e5e06be0ece6399a",

4− "date": "2021-05-11T09:51:32-07:00",

5− "path": "/nix/store/dhh1gz45l3h3p31jfg5fgy1kns1lbw6d-tree-sitter-javascript",

6− "sha256": "1mw6miw4yp6s1i0b08hflamfvrjdim4fnnj6fy461n05jp1s1i78",

3+ "rev": "45b9ce2a2588c0e6d616b0ee2a710b1fcb99c5b5",

4+ "date": "2021-06-09T14:12:41-07:00",

5+ "path": "/nix/store/j6r7z3m4wk6baz70qg2xn2mq3jlnyq6f-tree-sitter-javascript",

6+ "sha256": "0rzpyxbh1j9l12jxyryc06f8jhbd5ci18lfb7bw2msc685b2ckcx",

77 "fetchSubmodules": false,

88 "deepClone": false,

99 "leaveDotGit": false

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json+5−5

@@ -1,9 +1,9 @@

11{

2− "url": "https://github.com/Azganoth/tree-sitter-lua",

3− "rev": "a943944ec09c5e96f455bb166079de4ef3534457",

4− "date": "2020-12-27T00:15:24-03:00",

5− "path": "/nix/store/6glr8p3x58pva0nn586dk5jwb3bpgqrj-tree-sitter-lua",

6− "sha256": "0pm6wwb3kv73bfvvshdmvazcb1is5x1z6jwr31gz0niln18nqvpb",

2+ "url": "https://github.com/nvim-treesitter/tree-sitter-lua",

3+ "rev": "b6d4e9e10ccb7b3afb45018fbc391b4439306b23",

4+ "date": "2021-03-05T14:55:53+01:00",

5+ "path": "/nix/store/mlvnfmm5q67810qdim11qs4ivq54jrmr-tree-sitter-lua",

6+ "sha256": "17kf1m2qpflqv7xng6ls4v1qxfgdlpgxs4qjwb6rcc8nbcdsj4ms",

77 "fetchSubmodules": false,

88 "deepClone": false,

99 "leaveDotGit": false

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json+4−4

@@ -1,9 +1,9 @@

11{

22 "url": "https://github.com/tree-sitter/tree-sitter-php",

3− "rev": "6a271f4075e11815e787df9055a950fb844ee63b",

4− "date": "2021-05-13T12:41:22+02:00",

5− "path": "/nix/store/n6hycd1scxa990xchk5h09ilxi7w18f5-tree-sitter-php",

6− "sha256": "1ijxc6brd0d35hr89ic8k5ispc6sj4mxln7bznd9n6zrgjvfdjqb",

3+ "rev": "b065fc4ded84c30aff14c07ec6e7cf449e222b04",

4+ "date": "2021-06-01T20:33:20+02:00",

5+ "path": "/nix/store/czdqn2nz8pgrd64w74yskx6vl233phxn-tree-sitter-php",

6+ "sha256": "1qr2byy344haqybd0zz2hazncay7zndkp4p3317ck50xrs05z086",

77 "fetchSubmodules": false,

88 "deepClone": false,

99 "leaveDotGit": false

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json+4−4

@@ -1,9 +1,9 @@

11{

22 "url": "https://github.com/tree-sitter/tree-sitter-ql",

3− "rev": "965948cce9a94a710b1339851e0919471ad5ee2c",

4− "date": "2021-03-04T14:34:34-08:00",

5− "path": "/nix/store/4hi59c856ii2b79nv2wjib6qbp3hk24i-tree-sitter-ql",

6− "sha256": "01y1fzclwlaffx0rzg49h7kyvhhm25fba0w362n2y8hgjp3imgmg",

3+ "rev": "8e7fd7e638d4a0ec7a792ee16b19dbc6407aa810",

4+ "date": "2021-06-02T18:46:47+02:00",

5+ "path": "/nix/store/yhyi9y09shv1fm87gka43vnv9clvyd92-tree-sitter-ql",

6+ "sha256": "0x5f9989ymqvw3g8acckyk4j7zpmnc667qishbgly9icl9rkmv7w",

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": "fe6a2d634da0e16b11b5aa255cc3df568a4572fd",

4− "date": "2021-03-03T16:54:30-08:00",

5− "path": "/nix/store/ragrvqj7hm98r74v5b3fljvc47gd3nhj-tree-sitter-ruby",

6− "sha256": "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v",

3+ "rev": "391269d74d20154bbd0ac9be20b35eced6920290",

4+ "date": "2021-05-04T14:02:32-07:00",

5+ "path": "/nix/store/hamsaml0yzi13qd61abypjwbv33rd824-tree-sitter-ruby",

6+ "sha256": "0biyhydfzybz3g6hhdd0rk6yav7xsk61j8lnmpsi60vaxabdsaiv",

77 "fetchSubmodules": false,

88 "deepClone": false,

99 "leaveDotGit": false

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json+4−4

@@ -1,9 +1,9 @@

11{

22 "url": "https://github.com/Himujjal/tree-sitter-svelte",

3− "rev": "c696a13a587b0595baf7998f1fb9e95c42750263",

4− "date": "2021-03-20T16:45:11+05:30",

5− "path": "/nix/store/8krdxqwpi95ljrb5jgalwgygz3aljqr8-tree-sitter-svelte",

6− "sha256": "0ckmss5gmvffm6danlsvgh6gwvrlznxsqf6i6ipkn7k5lxg1awg3",

3+ "rev": "10c113001acf9852817150acb3031a5e68d2b4cf",

4+ "date": "2021-05-02T10:05:14+05:30",

5+ "path": "/nix/store/mpfr56mfiizhwr4hq7h422glmdc4hg48-tree-sitter-svelte",

6+ "sha256": "1n7addsnin6czm5hrbhaaqqgf0c3nz3mpcdysm2z4icgn7fjq281",

77 "fetchSubmodules": false,

88 "deepClone": false,

99 "leaveDotGit": false

pkgs/development/tools/parsing/tree-sitter/update.nix+1−1

@@ -75,7 +75,7 @@ let

7575 repo = "tree-sitter-nix";

7676 };

7777 "tree-sitter-lua" = {

78− orga = "Azganoth";

78+ orga = "nvim-treesitter";

7979 repo = "tree-sitter-lua";

8080 };

8181 "tree-sitter-fennel" = {

pkgs/development/tools/protoc-gen-twirp/default.nix+2−3

@@ -2,20 +2,19 @@

33buildGoPackage rec {

44 pname = "protoc-gen-twirp";

5− version = "8.0.0";

5+ version = "8.1.0";

77 src = fetchFromGitHub {

88 owner = "twitchtv";

99 repo = "twirp";

1010 rev = "v${version}";

11− sha256 = "sha256-lwozRwH96nh4Zlf6ggOF+FuUEfxkN38wxygg5HXw/M0=";

11+ sha256 = "sha256-ezSNrDfOE1nj4FlX7E7Z7/eGfQw1B7NP34aj8ml5pDk=";

1212 };

1313

1414 goPackagePath = "github.com/twitchtv/twirp";

1515

1616 subPackages = [

1717 "protoc-gen-twirp"

18− "protoc-gen-twirp_python"

1918 ];

2019

2120 doCheck = true;

pkgs/development/web/deno/default.nix+3−3

@@ -17,15 +17,15 @@

1717

1818rustPlatform.buildRustPackage rec {

1919 pname = "deno";

20− version = "1.11.0";

20+ version = "1.11.1";

2121

2222 src = fetchFromGitHub {

2323 owner = "denoland";

2424 repo = pname;

2525 rev = "v${version}";

26− sha256 = "sha256-rsQ9MdMgYPqnLzMfW4rwDpx5QKVDm6TMCCHqJzvTpjw=";

26+ sha256 = "sha256-+EXkWtqJihNx5wvEhRycVpPDs1QxfoqcbMW5aLrofI8=";

2727 };

28− cargoSha256 = "sha256-nKbc73bEKb0XzuBZApu21E1OzkgU9sqbCaaWhUMiWdQ=";

28+ cargoSha256 = "sha256-j/1NJlGRq1MuE+EU7VstwSMmRYfudBmv3nAe3bAyv+U=";

2929

3030 # Install completions post-install

3131 nativeBuildInputs = [ installShellFiles ];

pkgs/games/osu-lazer/default.nix+2−2

@@ -16,13 +16,13 @@ let

1616

1717in stdenv.mkDerivation rec {

1818 pname = "osu-lazer";

19− version = "2021.602.0";

19+ version = "2021.612.0";

2020

2121 src = fetchFromGitHub {

2222 owner = "ppy";

2323 repo = "osu";

2424 rev = version;

25− sha256 = "t9Byn3eAAkxnBQBfdvz2CGGXu8d3JzTnSz7I68Ntp3A=";

25+ sha256 = "1hrk8sfg4bdrrrqpwb5a8dhpy0lfnrx575z3l2jygzbwgqgr4jy4";

2626 };

2727

2828 patches = [ ./bypass-tamper-detection.patch ];

pkgs/games/osu-lazer/deps.nix+24−29

@@ -301,8 +301,8 @@

301301 })

302302 (fetchNuGet {

303303 name = "Markdig";

304− version = "0.22.1";

305− sha256 = "1m62kjwz93h323w8qvwmld2g8dy17a3ny5wyy29pwqj7ig4y8ymj";

304+ version = "0.24.0";

305+ sha256 = "03i0mw9717xwf3pffr8ar7k7fmyhgdw222j58l4x0xr4slpg94l7";

306306 })

307307 (fetchNuGet {

308308 name = "MessagePack";

@@ -374,6 +374,11 @@

374374 version = "1.0.0";

375375 sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh";

376376 })

377+ (fetchNuGet {

378+ name = "Microsoft.Bcl.AsyncInterfaces";

379+ version = "1.1.0";

380+ sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1";

381+ })

377382 (fetchNuGet {

378383 name = "Microsoft.Bcl.AsyncInterfaces";

379384 version = "5.0.0";

@@ -446,13 +451,13 @@

446451 })

447452 (fetchNuGet {

448453 name = "Microsoft.Diagnostics.NETCore.Client";

449− version = "0.2.61701";

450− sha256 = "1ic1607jj4ln8dbibf1fz5v9svk9x2kqlgvhndc6ijaqnbc4wcr1";

454+ version = "0.2.221401";

455+ sha256 = "1k55l60bg8lj5ayl3kixbzvx2684xd7a9nzha5fiqjgp85cimb3r";

451456 })

452457 (fetchNuGet {

453458 name = "Microsoft.Diagnostics.Runtime";

454− version = "2.0.222201";

455− sha256 = "1vsa6xbqi4f2mx85rjmq641r9zgssj0bbfcsqlsa5nx6lqh2rf2q";

459+ version = "2.0.226801";

460+ sha256 = "1w8ahqkv8nbq2ch17aa9axhqqnybmc9bsxpdhpiy52ix70mr72w1";

456461 })

457462 (fetchNuGet {

458463 name = "Microsoft.DotNet.PlatformAbstractions";

@@ -571,8 +576,8 @@

571576 })

572577 (fetchNuGet {

573578 name = "Microsoft.Extensions.ObjectPool";

574− version = "5.0.5";

575− sha256 = "0hh0xm14hp479dsd0gb9igz0vbbn3sak27v39phpyilxvk7ky5z1";

579+ version = "5.0.6";

580+ sha256 = "0kwhcnsagwn3x9ms2sfy5js25gfnipkrakqgn7bbg0a1k35qa5xx";

576581 })

577582 (fetchNuGet {

578583 name = "Microsoft.Extensions.Options";

@@ -751,13 +756,13 @@

751756 })

752757 (fetchNuGet {

753758 name = "ppy.LocalisationAnalyser";

754− version = "2021.525.0";

755− sha256 = "1h8p8d1xk03904fifhi77zrjkh4sknp4mxjqd3nbpfyikd8f7c8p";

759+ version = "2021.608.0";

760+ sha256 = "1lsb7nr2gynz7llbl22f5mrd9hlxaq48gssfcn5qfji7afv8kwql";

756761 })

757762 (fetchNuGet {

758763 name = "ppy.osu.Framework";

759− version = "2021.601.0";

760− sha256 = "0y17s60r4q0c05gm67fmp700zwb7k74xdi45hprblyxsplnbkmi0";

764+ version = "2021.611.0";

765+ sha256 = "14a2032khf2ys51rp6qs3ikp0lvqxgdqh0hbvchj34q0l3g40yv0";

761766 })

762767 (fetchNuGet {

763768 name = "ppy.osu.Framework.NativeLibs";

@@ -766,8 +771,8 @@

766771 })

767772 (fetchNuGet {

768773 name = "ppy.osu.Game.Resources";

769− version = "2021.525.0";

770− sha256 = "15ksxv5fasfzdkmwikjbn17c1d4rssjfm2vp71b7m834ghm6pnbd";

774+ version = "2021.611.0";

775+ sha256 = "01pbxccfrwzn47xg9xgjn91l6w3d0d3gqkkx53ak7ynxbbvx9q07";

771776 })

772777 (fetchNuGet {

773778 name = "ppy.osuTK.NS20";

@@ -1009,11 +1014,6 @@

10091014 version = "1.5.0";

10101015 sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06";

10111016 })

1012− (fetchNuGet {

1013− name = "System.Collections.Immutable";

1014− version = "1.7.1";

1015− sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq";

1016− })

10171017 (fetchNuGet {

10181018 name = "System.Collections.Immutable";

10191019 version = "5.0.0";

@@ -1379,11 +1379,6 @@

13791379 version = "4.3.0";

13801380 sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq";

13811381 })

1382− (fetchNuGet {

1383− name = "System.Reflection.Metadata";

1384− version = "1.8.1";

1385− sha256 = "17xxl3m99wa4hcpqy42vl8qb1jk2jfq32rj3sfjc1a46hi2si5jj";

1386− })

13871382 (fetchNuGet {

13881383 name = "System.Reflection.Metadata";

13891384 version = "5.0.0";

@@ -1444,11 +1439,6 @@

14441439 version = "4.5.3";

14451440 sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln";

14461441 })

1447− (fetchNuGet {

1448− name = "System.Runtime.CompilerServices.Unsafe";

1449− version = "4.7.1";

1450− sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j";

1451− })

14521442 (fetchNuGet {

14531443 name = "System.Runtime.CompilerServices.Unsafe";

14541444 version = "5.0.0";

@@ -1699,6 +1689,11 @@

16991689 version = "4.3.0";

17001690 sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z";

17011691 })

1692+ (fetchNuGet {

1693+ name = "System.Threading.Tasks.Extensions";

1694+ version = "4.5.2";

1695+ sha256 = "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj";

1696+ })

17021697 (fetchNuGet {

17031698 name = "System.Threading.Tasks.Extensions";

17041699 version = "4.5.3";

pkgs/misc/emulators/punes/default.nix+3−3

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

1717

1818mkDerivation rec {

1919 pname = "punes";

20− version = "unstable-2021-04-25";

20+ version = "unstable-2021-06-05";

2121

2222 src = fetchFromGitHub {

2323 owner = "punesemu";

2424 repo = "puNES";

25− rev = "4b4c3495a56d3989544cb56079ce641da8aa9b35";

26− sha256 = "1wszvdgm38513v26p14k58shbkxn1qhkn8l0hsqi04vviicad59s";

25+ rev = "07fd123f62b2d075894a0cc966124db7b427b791";

26+ sha256 = "1wxff7b397ayd2s2v14w6a0zfgklc7y0kv3mkz1gg5x47mnll24l";

2727 };

2828

2929 postPatch = ''

pkgs/misc/vim-plugins/generated.nix+237−225

@@ -221,12 +221,12 @@ final: prev:

221221

222222 auto-session = buildVimPluginFrom2Nix {

223223 pname = "auto-session";

224− version = "2021-06-01";

224+ version = "2021-06-13";

225225 src = fetchFromGitHub {

226226 owner = "rmagatti";

227227 repo = "auto-session";

228− rev = "80ddcf26eca11cf4d48a52ffec094fe5a4711f32";

229− sha256 = "0kh6a5hm0ppsbfpp7yhr2k4v36mj203q59wy15sgajx08ww0jj3m";

228+ rev = "7587e38c32f4bba2b41516fc3aba3ddc50995e97";

229+ sha256 = "126fxl5krs6xkq12yjw6j9whh74msznw939hq4i0fcrhsx2f5y5m";

230230 };

231231 meta.homepage = "https://github.com/rmagatti/auto-session/";

232232 };

@@ -269,12 +269,12 @@ final: prev:

269269

270270 barbar-nvim = buildVimPluginFrom2Nix {

271271 pname = "barbar-nvim";

272− version = "2021-06-03";

272+ version = "2021-06-12";

273273 src = fetchFromGitHub {

274274 owner = "romgrk";

275275 repo = "barbar.nvim";

276− rev = "23b6f64c9523522dd185482c856de492476a760c";

277− sha256 = "1ijm4w4nqa037vjpjgjizhzrnpj10hwjc93lhzq29qs3cx85df1q";

276+ rev = "33639e53d0bf69444275ed048c5bfd7e29396634";

277+ sha256 = "0zqc4j0nbdhap8a67529n2k4k53xnqxrjsn2a4sdqdwvm207y6r9";

278278 };

279279 meta.homepage = "https://github.com/romgrk/barbar.nvim/";

280280 };

@@ -413,12 +413,12 @@ final: prev:

413413

414414 chadtree = buildVimPluginFrom2Nix {

415415 pname = "chadtree";

416− version = "2021-06-09";

416+ version = "2021-06-16";

417417 src = fetchFromGitHub {

418418 owner = "ms-jpq";

419419 repo = "chadtree";

420− rev = "eaee30fe7afdbce73f92d0c766f4b411c8de5525";

421− sha256 = "0b73k55zfhd4ygqiwwps17fp9nksbs8km57vfl0y85vb3ajzg0l6";

420+ rev = "7da6e0f36b88144a3371a07c8ccb8cc9510da9ea";

421+ sha256 = "18j5jj28riv7nchxlj9q4p83gkn3h1b43c4fpdqfidhbda0lxhl6";

422422 };

423423 meta.homepage = "https://github.com/ms-jpq/chadtree/";

424424 };

@@ -449,12 +449,12 @@ final: prev:

449449

450450 ci_dark = buildVimPluginFrom2Nix {

451451 pname = "ci_dark";

452− version = "2021-06-04";

452+ version = "2021-06-14";

453453 src = fetchFromGitHub {

454454 owner = "yunlingz";

455455 repo = "ci_dark";

456− rev = "d50cd0c60ecdaffb779d2acb7ce2bb94df1ed867";

457− sha256 = "0pqpvqas1z173c2ngka787d9gp49ai3x85haingkxvir3bf0nbqm";

456+ rev = "436cda40ec6491c68d5f995fa9da41361a3478fc";

457+ sha256 = "0jw07l6l273w6rs877anjdmiraawain48zs2xxzyvh4pshw8szz9";

458458 };

459459 meta.homepage = "https://github.com/yunlingz/ci_dark/";

460460 };

@@ -557,12 +557,12 @@ final: prev:

557557

558558 coc-nvim = buildVimPluginFrom2Nix {

559559 pname = "coc-nvim";

560− version = "2021-06-08";

560+ version = "2021-06-16";

561561 src = fetchFromGitHub {

562562 owner = "neoclide";

563563 repo = "coc.nvim";

564− rev = "898335d52ed925e8dd5dd3da3c25470d352b2e11";

565− sha256 = "19ks20v1mjm5yrhlrkxqpmsc8jz2nfz5w38ixfkpbhdj3qwdf5gg";

564+ rev = "0692698256a55c0c9c2f12988f12dc68b00890ad";

565+ sha256 = "0ncdjkgg0yi76rklzhvysiaczh85gwbbsyxnn6z29g5clxcar3j0";

566566 };

567567 meta.homepage = "https://github.com/neoclide/coc.nvim/";

568568 };

@@ -774,12 +774,12 @@ final: prev:

774774

775775 conjure = buildVimPluginFrom2Nix {

776776 pname = "conjure";

777− version = "2021-06-08";

777+ version = "2021-06-13";

778778 src = fetchFromGitHub {

779779 owner = "Olical";

780780 repo = "conjure";

781− rev = "643ae9bf5f08e752a22027628b69a31ce271f1b5";

782− sha256 = "0jbd1y0riq6xdyh0x5msw8475b7v0viapgkmawyda3ax8bczb3jv";

781+ rev = "b55e4906a10db0f6917058aec6616075c4d06994";

782+ sha256 = "0agmfahppcaxxn3kwfg9wx9ncdz51qixqh52xw6rddhpda5h7gfm";

783783 };

784784 meta.homepage = "https://github.com/Olical/conjure/";

785785 };

@@ -1014,24 +1014,24 @@ final: prev:

10141014

10151015 denite-nvim = buildVimPluginFrom2Nix {

10161016 pname = "denite-nvim";

1017− version = "2021-06-06";

1017+ version = "2021-06-14";

10181018 src = fetchFromGitHub {

10191019 owner = "Shougo";

10201020 repo = "denite.nvim";

1021− rev = "a20d2376b57ca500782719f1c4f83796d160c296";

1022− sha256 = "15hrlr6f98y1cmdyrlady6h4b501b7mvyzfbvsqcxjj8vj18pxas";

1021+ rev = "2e63db65e99d2d34835e227aa6803ec6cfbde3a9";

1022+ sha256 = "0v2lvrvlmsdpccfwjcl18ijif9appzn62cl58m6p2y4zvcz7dh0z";

10231023 };

10241024 meta.homepage = "https://github.com/Shougo/denite.nvim/";

10251025 };

10261026

10271027 deol-nvim = buildVimPluginFrom2Nix {

10281028 pname = "deol-nvim";

1029− version = "2021-06-05";

1029+ version = "2021-06-13";

10301030 src = fetchFromGitHub {

10311031 owner = "Shougo";

10321032 repo = "deol.nvim";

1033− rev = "6f3574b091d48e37599dcb356349a31472556716";

1034− sha256 = "0im9jnrbf1qbglh9wzqalfvp98wx9ccg5gk89k40nz3gggpwsbfh";

1033+ rev = "5861affed0158c68b91b0bd3d9f0f4184ac5bb29";

1034+ sha256 = "0dhhqzdr0j1zvgwsssx90b9rfcval18cr5jc9kg6xlccg492x7jl";

10351035 };

10361036 meta.homepage = "https://github.com/Shougo/deol.nvim/";

10371037 };

@@ -1304,12 +1304,12 @@ final: prev:

13041304

13051305 diffview-nvim = buildVimPluginFrom2Nix {

13061306 pname = "diffview-nvim";

1307− version = "2021-06-08";

1307+ version = "2021-06-15";

13081308 src = fetchFromGitHub {

13091309 owner = "sindrets";

13101310 repo = "diffview.nvim";

1311− rev = "93c3aba19c54a7e68fab6c9864eff499a744b4cc";

1312− sha256 = "01s43bg2y0yb5h7gkr75j23i5jy5acaz0m65nbx5c6x1lbm7fy20";

1311+ rev = "f06495b12ba47460c61e8ad1388326e3f94e5637";

1312+ sha256 = "0lxv2c8wa0a6nknw2vfms9fzgjrmjk8klavhs8ay1qcgzis9s1iq";

13131313 };

13141314 meta.homepage = "https://github.com/sindrets/diffview.nvim/";

13151315 };

@@ -1462,12 +1462,12 @@ final: prev:

14621462

14631463 falcon = buildVimPluginFrom2Nix {

14641464 pname = "falcon";

1465− version = "2021-04-14";

1465+ version = "2021-06-11";

14661466 src = fetchFromGitHub {

14671467 owner = "fenetikm";

14681468 repo = "falcon";

1469− rev = "376aacc4ec6dd5495f201bc5bea0c1bcff574535";

1470− sha256 = "1y3r36594f6vhgi0gzszl9pf1d7jizxj6iamcpwmbqbj75i62hp3";

1469+ rev = "0893abf44cd6dda4d50e98c4ab1f9aea8e61d617";

1470+ sha256 = "12fa2kwg2495qhs845g31a9iszlrry4jc19famgpjg1glgm9lkrm";

14711471 };

14721472 meta.homepage = "https://github.com/fenetikm/falcon/";

14731473 };

@@ -1522,12 +1522,12 @@ final: prev:

15221522

15231523 ferret = buildVimPluginFrom2Nix {

15241524 pname = "ferret";

1525− version = "2020-12-08";

1525+ version = "2021-06-12";

15261526 src = fetchFromGitHub {

15271527 owner = "wincent";

15281528 repo = "ferret";

1529− rev = "fbcd9de1e88391d8a1ab39adb520d6a5ac29792f";

1530− sha256 = "068v0gj7vn3halj0mcjfnziklqcssyln61ip5zalnw7x6vm3yblk";

1529+ rev = "ce27366ab52ef27a2307836e586b9b9c54a00ae5";

1530+ sha256 = "1j69gd5j7bml6a8gaa8skp3z0145372pnqmqq8hfn7gvncql6l97";

15311531 };

15321532 meta.homepage = "https://github.com/wincent/ferret/";

15331533 };

@@ -1607,12 +1607,12 @@ final: prev:

16071607

16081608 friendly-snippets = buildVimPluginFrom2Nix {

16091609 pname = "friendly-snippets";

1610− version = "2021-05-28";

1610+ version = "2021-06-13";

16111611 src = fetchFromGitHub {

16121612 owner = "rafamadriz";

16131613 repo = "friendly-snippets";

1614− rev = "496ccb632e1dd66ab4561304faa431125c0bf0de";

1615− sha256 = "1rbgji9x0bf8l7kqph77nfnpipy4d1863ml3wx75404q43nld7w8";

1614+ rev = "22c37fd12074290561210004918a870db085ceb3";

1615+ sha256 = "1nky1sq602vn8bwdr4h7a3djx0s8adq6jd7jbb87vqb3z63q4xl9";

16161616 };

16171617 meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";

16181618 };

@@ -1739,24 +1739,24 @@ final: prev:

17391739

17401740 gina-vim = buildVimPluginFrom2Nix {

17411741 pname = "gina-vim";

1742− version = "2021-06-05";

1742+ version = "2021-06-12";

17431743 src = fetchFromGitHub {

17441744 owner = "lambdalisue";

17451745 repo = "gina.vim";

1746− rev = "7069668147157d872821ebed1eee07742ece48fd";

1747− sha256 = "0fbr154jgvr71liq0cwdl1qwg8j40yg9i2gb6ykz4p2y5cvs3wz6";

1746+ rev = "abdbe0fe33f3b6fc59e94f7cc3072768f8dfd8ac";

1747+ sha256 = "1f3shh6jxr5i1an2dbb1vmc0l2xg03fm6ava25ahxg4b5ka59bc5";

17481748 };

17491749 meta.homepage = "https://github.com/lambdalisue/gina.vim/";

17501750 };

17511751

17521752 git-blame-nvim = buildVimPluginFrom2Nix {

17531753 pname = "git-blame-nvim";

1754− version = "2021-04-15";

1754+ version = "2021-06-14";

17551755 src = fetchFromGitHub {

17561756 owner = "f-person";

17571757 repo = "git-blame.nvim";

1758− rev = "bba913f065b7fba7150e71dc07e093c758c5ca98";

1759− sha256 = "1xvy5pnqcrvcs19b2b6l3n9rkj281grcgbrsg87iwvc9sw98bywl";

1758+ rev = "125f09f3e09091fa9cc6585156e199d08989dc0e";

1759+ sha256 = "1d6al5yrwv0wfmy39k8ky5ha1x0a6mz6djscibwz13fvgqka2730";

17601760 };

17611761 meta.homepage = "https://github.com/f-person/git-blame.nvim/";

17621762 };

@@ -1799,12 +1799,12 @@ final: prev:

17991799

18001800 gitsigns-nvim = buildVimPluginFrom2Nix {

18011801 pname = "gitsigns-nvim";

1802− version = "2021-06-08";

1802+ version = "2021-06-16";

18031803 src = fetchFromGitHub {

18041804 owner = "lewis6991";

18051805 repo = "gitsigns.nvim";

1806− rev = "b5a6c6c0cbac430d61965be1fac5b984d3c9c469";

1807− sha256 = "19k96irs8saibjxah457ir418l3aih1rp3arj6b1m14p3yf2dxy3";

1806+ rev = "229d9c0d387789e5aff7138a513fcd1184b0ec26";

1807+ sha256 = "03yl9dq09l7mfal44qh16k4wav0lq4cq0ng715knnvqc0qhyk7p1";

18081808 };

18091809 meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";

18101810 };

@@ -1907,12 +1907,12 @@ final: prev:

19071907

19081908 gruvbox-flat-nvim = buildVimPluginFrom2Nix {

19091909 pname = "gruvbox-flat-nvim";

1910− version = "2021-06-09";

1910+ version = "2021-06-11";

19111911 src = fetchFromGitHub {

19121912 owner = "eddyekofo94";

19131913 repo = "gruvbox-flat.nvim";

1914− rev = "0b27de51438f62870f1558ef9c27cb20caec69cf";

1915− sha256 = "0k9hqjw857ri0vbgjncbbfgh0yh1bpqr25vj0drp9wiakn5pywqf";

1914+ rev = "4e6615e601ce6861dddc6533532a7901fd0a68a4";

1915+ sha256 = "0p4390xdf4m3n6604nvpaca4dnswayja69brg55lhs5x1nrrfsn0";

19161916 };

19171917 meta.homepage = "https://github.com/eddyekofo94/gruvbox-flat.nvim/";

19181918 };

@@ -2003,12 +2003,12 @@ final: prev:

20032003

20042004 hologram-nvim = buildVimPluginFrom2Nix {

20052005 pname = "hologram-nvim";

2006− version = "2021-05-21";

2006+ version = "2021-06-14";

20072007 src = fetchFromGitHub {

20082008 owner = "edluffy";

20092009 repo = "hologram.nvim";

2010− rev = "593a458d04f7457669280373d98e41195c106d13";

2011− sha256 = "0diq42zdr9l8qw198c5y4jy5siab3cwh4ncsb5z111m28n6a6i5c";

2010+ rev = "d8300f996fde96fc37c02b89f70642c1c44057a3";

2011+ sha256 = "0g9i5mgd69kgkl27my1xnyd3yf77c8313ikbhm7cn6i6iqml1blf";

20122012 };

20132013 meta.homepage = "https://github.com/edluffy/hologram.nvim/";

20142014 };

@@ -2147,12 +2147,12 @@ final: prev:

21472147

21482148 indent-blankline-nvim = buildVimPluginFrom2Nix {

21492149 pname = "indent-blankline-nvim";

2150− version = "2021-03-06";

2150+ version = "2021-06-10";

21512151 src = fetchFromGitHub {

21522152 owner = "lukas-reineke";

21532153 repo = "indent-blankline.nvim";

2154− rev = "47691a67b690ad6ebd9df67574691822d226a5b6";

2155− sha256 = "0lkw6mslkd0gax0s280icpa5saq3320kkkmjih04mmnnf1vnwq6a";

2154+ rev = "5d5d2f80ec48e3f5fe7237ec17cd1587f39d3be7";

2155+ sha256 = "005nv99jw9ricgy1xyxixl1ssyh7jai9kv7cx95g5igfvvpblz7k";

21562156 };

21572157 meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";

21582158 };

@@ -2400,12 +2400,12 @@ final: prev:

24002400

24012401 LeaderF = buildVimPluginFrom2Nix {

24022402 pname = "LeaderF";

2403− version = "2021-06-09";

2403+ version = "2021-06-10";

24042404 src = fetchFromGitHub {

24052405 owner = "Yggdroot";

24062406 repo = "LeaderF";

2407− rev = "183fa5f3203983fed87174e6f193f271133fe974";

2408− sha256 = "17if75p3x4lkqncl296f3jdq0rcc69b0mgj0dbz6cl851bmqvy40";

2407+ rev = "95f14d52554bc5d9e7fe1bfe92c0c542aab9125e";

2408+ sha256 = "0isbqyi3ny0zy2npq15j4hpkhnqvf17zv39wpc62i91dqyplp4yy";

24092409 };

24102410 meta.homepage = "https://github.com/Yggdroot/LeaderF/";

24112411 };

@@ -2496,24 +2496,24 @@ final: prev:

24962496

24972497 lightline-ale = buildVimPluginFrom2Nix {

24982498 pname = "lightline-ale";

2499− version = "2021-05-04";

2499+ version = "2021-06-09";

25002500 src = fetchFromGitHub {

25012501 owner = "maximbaz";

25022502 repo = "lightline-ale";

2503− rev = "98a7417ff66829b1d14cb9e4e7aa6a1a0ef25103";

2504− sha256 = "1ripdl58pcmylgzzj92v8myjjw22h1g9g6drld9ng1qcg1zn2br8";

2503+ rev = "a861f691ac7e40b1b359bc7a147078fa1e0570ce";

2504+ sha256 = "0bi3pghcjdpbrp235bhkgqrsyfr1m6v40krxfb2qbc1yy9plbs9q";

25052505 };

25062506 meta.homepage = "https://github.com/maximbaz/lightline-ale/";

25072507 };

25082508

25092509 lightline-bufferline = buildVimPluginFrom2Nix {

25102510 pname = "lightline-bufferline";

2511− version = "2021-04-16";

2511+ version = "2021-06-09";

25122512 src = fetchFromGitHub {

25132513 owner = "mengelbrecht";

25142514 repo = "lightline-bufferline";

2515− rev = "570e732e9e89f2a900a1e86fb3fa170c7dd201d6";

2516− sha256 = "0jvd7jp92qffas5hb2m6jg1vlm4g2is8q8hkj5mhyr5gnbpj2xf0";

2515+ rev = "ce6b2e1e09654af34a80af774879eac4708cc11e";

2516+ sha256 = "0cv5845d1gg9mv5pcp8c9afydvgihgfyk7ibjr3fgkqacwcfzjmy";

25172517 };

25182518 meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";

25192519 };

@@ -2542,6 +2542,18 @@ final: prev:

25422542 meta.homepage = "https://github.com/itchyny/lightline.vim/";

25432543 };

25442544

2545+ lightspeed-nvim = buildVimPluginFrom2Nix {

2546+ pname = "lightspeed-nvim";

2547+ version = "2021-06-16";

2548+ src = fetchFromGitHub {

2549+ owner = "ggandor";

2550+ repo = "lightspeed.nvim";

2551+ rev = "2c9ee4d31c84835e0d929a98d9142ac9e3e9dc0c";

2552+ sha256 = "0hc0xis0zgikf8mlsvqrn2vqjq6v1sscfihd8895wrz0hnzcmn8s";

2553+ };

2554+ meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";

2555+ };

2556+

25452557 limelight-vim = buildVimPluginFrom2Nix {

25462558 pname = "limelight-vim";

25472559 version = "2020-10-13";

@@ -2604,12 +2616,12 @@ final: prev:

26042616

26052617 lsp_signature-nvim = buildVimPluginFrom2Nix {

26062618 pname = "lsp_signature-nvim";

2607− version = "2021-06-08";

2619+ version = "2021-06-10";

26082620 src = fetchFromGitHub {

26092621 owner = "ray-x";

26102622 repo = "lsp_signature.nvim";

2611− rev = "88272b6d89e8140a35099ea563978172f2776dc9";

2612− sha256 = "013ffydnhjwzj0y106m0x65zx31kabsxrs86ndq2vik3pc6vyslq";

2623+ rev = "3c80042ce8d9aa378698f80ea24742122ac529d7";

2624+ sha256 = "0rrmi7q8f8s208zbbdvfr0ysag8x0xkc8j9cpljc2n8a4pyn6z0z";

26132625 };

26142626 meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";

26152627 };

@@ -3060,12 +3072,12 @@ final: prev:

30603072

30613073 neogit = buildVimPluginFrom2Nix {

30623074 pname = "neogit";

3063− version = "2021-06-07";

3075+ version = "2021-06-15";

30643076 src = fetchFromGitHub {

30653077 owner = "TimUntersberger";

30663078 repo = "neogit";

3067− rev = "55dcb4206324e3f90dd9dd41bed22fc6d4887098";

3068− sha256 = "0iiblvqmn7xg3mpyppzng081wgpdfrdn9jpa3ijr2ly6w5jg0yqa";

3079+ rev = "c5c39a18b5415da175e37ce8c5c4fb8648edc9f4";

3080+ sha256 = "1ixidbf996nrwmw81h2j5bg2npai4w5dsr2507w436ic04s9dn59";

30693081 };

30703082 meta.homepage = "https://github.com/TimUntersberger/neogit/";

30713083 };

@@ -3264,12 +3276,12 @@ final: prev:

32643276

32653277 nlua-nvim = buildVimPluginFrom2Nix {

32663278 pname = "nlua-nvim";

3267− version = "2021-04-22";

3279+ version = "2021-06-15";

32683280 src = fetchFromGitHub {

32693281 owner = "tjdevries";

32703282 repo = "nlua.nvim";

3271− rev = "31e3430acb84368c0933a3e765d834e897dfca2f";

3272− sha256 = "0h8908x2pf139q6mxckcglb5w7zxvhp0vj97za0g8343lvlhf0v1";

3283+ rev = "a0722bd2f6fdf54f85aaf8dcd6a1032f64c83905";

3284+ sha256 = "1j3350hs5dhbksi7wbzaq5p2268544virj0hj41bs5iv078pjj45";

32733285 };

32743286 meta.homepage = "https://github.com/tjdevries/nlua.nvim/";

32753287 };

@@ -3288,12 +3300,12 @@ final: prev:

32883300

32893301 nord-vim = buildVimPluginFrom2Nix {

32903302 pname = "nord-vim";

3291− version = "2020-07-06";

3303+ version = "2021-06-09";

32923304 src = fetchFromGitHub {

32933305 owner = "arcticicestudio";

32943306 repo = "nord-vim";

3295− rev = "57dffa746907e8ce5c4b520146ed0d89d3c29a51";

3296− sha256 = "0xpz71rj74514789v6x9wrg95n8bsag8f5ygd7js40qrwpxq6b4j";

3307+ rev = "537c66ca7c1308430b00dab41d9ad9c4201555f7";

3308+ sha256 = "18v7xgag87czxnm2mvxg273z88gc8bh4jgzl1rh10y6kbbyv9c82";

32973309 };

32983310 meta.homepage = "https://github.com/arcticicestudio/nord-vim/";

32993311 };

@@ -3348,24 +3360,24 @@ final: prev:

33483360

33493361 nvim-autopairs = buildVimPluginFrom2Nix {

33503362 pname = "nvim-autopairs";

3351− version = "2021-06-07";

3363+ version = "2021-06-16";

33523364 src = fetchFromGitHub {

33533365 owner = "windwp";

33543366 repo = "nvim-autopairs";

3355− rev = "34a02b4f37a99b80eff03dff90c675b7374af54b";

3356− sha256 = "0vz610ifrzzish5qysz8pz7w0zcfhm0q0xvya3r48fgs12ipahmq";

3367+ rev = "5a5c14e492638856fcd57d867be419829f158278";

3368+ sha256 = "1pyw0y2lhhaid3ggzlnxmc3c0xhs2vgsx3pfgwm46mi5v6xl2h2l";

33573369 };

33583370 meta.homepage = "https://github.com/windwp/nvim-autopairs/";

33593371 };

33603372

33613373 nvim-base16 = buildVimPluginFrom2Nix {

33623374 pname = "nvim-base16";

3363− version = "2021-06-07";

3375+ version = "2021-06-15";

33643376 src = fetchFromGitHub {

33653377 owner = "RRethy";

33663378 repo = "nvim-base16";

3367− rev = "b53dbb4d33a77e1b9b16672565749d6990e84cf0";

3368− sha256 = "1fwb797jcp5xkrfcqqljlhpnggkj3wfrc6zb0h662i35yhbhnin8";

3379+ rev = "8715d4db49706e7c50958a56e5b14791d539c10c";

3380+ sha256 = "1as567f3apgb9i2rh6j6d3gk6ipwm3kz694rbxzy2rpzmk4ic93h";

33693381 };

33703382 meta.homepage = "https://github.com/RRethy/nvim-base16/";

33713383 };

@@ -3384,12 +3396,12 @@ final: prev:

33843396

33853397 nvim-bufferline-lua = buildVimPluginFrom2Nix {

33863398 pname = "nvim-bufferline-lua";

3387− version = "2021-06-08";

3399+ version = "2021-06-15";

33883400 src = fetchFromGitHub {

33893401 owner = "akinsho";

33903402 repo = "nvim-bufferline.lua";

3391− rev = "7b510d5241fb29f5a5e985e02c4cfa046ec4ee3e";

3392− sha256 = "1ahy4v7z08l0z6c7v19dik8icw943kc243vlzhs1bfa4aj13nncs";

3403+ rev = "2db4a3c2c42816a31db391f30a708d976a8c679c";

3404+ sha256 = "0az2hn4h6cjrr55l56jm3la78lip4c6frz82d731pxqypnynqg84";

33933405 };

33943406 meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/";

33953407 };

@@ -3420,12 +3432,12 @@ final: prev:

34203432

34213433 nvim-compe = buildVimPluginFrom2Nix {

34223434 pname = "nvim-compe";

3423− version = "2021-06-08";

3435+ version = "2021-06-14";

34243436 src = fetchFromGitHub {

34253437 owner = "hrsh7th";

34263438 repo = "nvim-compe";

3427− rev = "c459c3f3a18c7ff7a312593c481af2b90fa01655";

3428− sha256 = "148k41db7ncri3mgdhc13mi4xk7chdchbgf42zldhcrf05y3xd58";

3439+ rev = "9c123d662715f1346d7b51f37fc78df33fe75e2d";

3440+ sha256 = "0zgwma3wvhq3h64apy06wpnz3gq7dgfzf4yb6llxsqb0qj032f3f";

34293441 };

34303442 meta.homepage = "https://github.com/hrsh7th/nvim-compe/";

34313443 };

@@ -3444,36 +3456,36 @@ final: prev:

34443456

34453457 nvim-dap = buildVimPluginFrom2Nix {

34463458 pname = "nvim-dap";

3447− version = "2021-06-07";

3459+ version = "2021-06-15";

34483460 src = fetchFromGitHub {

34493461 owner = "mfussenegger";

34503462 repo = "nvim-dap";

3451− rev = "dfacc1fb7aeb0789c4fd27004e312cf363becba5";

3452− sha256 = "058kjgngg7l37q9zbfz0xfqajx526m4cp85i3chcsfrvp99c7mzv";

3463+ rev = "d5e57dc263ab14ec5d99049f66f5a069b63837dc";

3464+ sha256 = "02gjplbgc2lxbgvirhvk4qp0ns1xk73wf7v4iw6v9bcr6sr95iqn";

34533465 };

34543466 meta.homepage = "https://github.com/mfussenegger/nvim-dap/";

34553467 };

34563468

34573469 nvim-dap-ui = buildVimPluginFrom2Nix {

34583470 pname = "nvim-dap-ui";

3459− version = "2021-06-08";

3471+ version = "2021-06-16";

34603472 src = fetchFromGitHub {

34613473 owner = "rcarriga";

34623474 repo = "nvim-dap-ui";

3463− rev = "9190b4a625a449927ffc3777b45db6cb392dc8f6";

3464− sha256 = "1gai54z6w4dw17irwnwfd35k8zy2aiws2ia9vqamzicaf0n8axr8";

3475+ rev = "40160a6d6b090339c0337c0c538f670bf9387d63";

3476+ sha256 = "17s0l7xc9080ssv6lk0lhjvj002ccqw7p0k8xb0ps5wacndkm81v";

34653477 };

34663478 meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";

34673479 };

34683480

34693481 nvim-dap-virtual-text = buildVimPluginFrom2Nix {

34703482 pname = "nvim-dap-virtual-text";

3471− version = "2021-05-16";

3483+ version = "2021-06-12";

34723484 src = fetchFromGitHub {

34733485 owner = "theHamsta";

34743486 repo = "nvim-dap-virtual-text";

3475− rev = "29a79b7c15e7e15a416bcaa0efddfe67928b7bdd";

3476− sha256 = "0wl9dl83cx2hlik7yx6kknb7spsaqlzri2kybf3xcna44mqfq688";

3487+ rev = "c07c23f52e1019b237927f9520c691e57adb9e6a";

3488+ sha256 = "0pa1xjp6h5ny7lnql8nsqszx0gpzc1fa9xiksq3k1k5yjjj4wm1z";

34773489 };

34783490 meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/";

34793491 };

@@ -3492,24 +3504,24 @@ final: prev:

34923504

34933505 nvim-highlite = buildVimPluginFrom2Nix {

34943506 pname = "nvim-highlite";

3495− version = "2021-05-29";

3507+ version = "2021-06-14";

34963508 src = fetchFromGitHub {

34973509 owner = "Iron-E";

34983510 repo = "nvim-highlite";

3499− rev = "9c15a789df5af1d3c83c0d680154ca226253eb26";

3500− sha256 = "0dz3bbyrwgxvsdmix2h6xbgj7wv9zbj08wgy46sjhzdhaxdfjx4z";

3511+ rev = "d0bdf0cb2d11064ac09d57bcfd48b53f0ee77124";

3512+ sha256 = "0smkmaz36zjisnlfzjmqgvljb0xk7j07xja69va3bf7k4kcg326y";

35013513 };

35023514 meta.homepage = "https://github.com/Iron-E/nvim-highlite/";

35033515 };

35043516

35053517 nvim-hlslens = buildVimPluginFrom2Nix {

35063518 pname = "nvim-hlslens";

3507− version = "2021-06-06";

3519+ version = "2021-06-12";

35083520 src = fetchFromGitHub {

35093521 owner = "kevinhwang91";

35103522 repo = "nvim-hlslens";

3511− rev = "081fac590588ce0f6bcf54699658ba960a514172";

3512− sha256 = "05sw210pfsb4nfcix978x1mrnmjz5yv1rmv1501mqla8xq18cskv";

3523+ rev = "dd688e37458a6fdeb050942da8c1260389c2a99a";

3524+ sha256 = "0q4bmp3wy0miaysldpfm6646r8c0llygfnlbmk5brs4la321hjld";

35133525 };

35143526 meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";

35153527 };

@@ -3528,12 +3540,12 @@ final: prev:

35283540

35293541 nvim-jdtls = buildVimPluginFrom2Nix {

35303542 pname = "nvim-jdtls";

3531− version = "2021-06-06";

3543+ version = "2021-06-15";

35323544 src = fetchFromGitHub {

35333545 owner = "mfussenegger";

35343546 repo = "nvim-jdtls";

3535− rev = "89fdc14457f2b18eebebeb226df9f6d5e464e318";

3536− sha256 = "09rd1hq8rzp84aiplvp0w4j1wykycrb55z1qwk83d9fv006sqvcl";

3547+ rev = "a26e1818fa62cfbcbd9728ad11bc3fc312d6e50e";

3548+ sha256 = "00w6jdpqfzxi9kfvwig052g8c0184pq71fs9p2dryx9klcxkcjnb";

35373549 };

35383550 meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";

35393551 };

@@ -3552,12 +3564,12 @@ final: prev:

35523564

35533565 nvim-lspconfig = buildVimPluginFrom2Nix {

35543566 pname = "nvim-lspconfig";

3555− version = "2021-06-08";

3567+ version = "2021-06-16";

35563568 src = fetchFromGitHub {

35573569 owner = "neovim";

35583570 repo = "nvim-lspconfig";

3559− rev = "f95be0c947237edb88df148dd61790988ab3a23e";

3560− sha256 = "1cddnkil9xid7xq3k0iszk12ma9pi396khqx6dzh2z9p7nkhk2rg";

3571+ rev = "f81570d1288fd974098e0f311f728469ca919155";

3572+ sha256 = "162j51rw1gv0gwip4d82qvmgpk7ky22xhhb2sjqm43zhjv3hqy0g";

35613573 };

35623574 meta.homepage = "https://github.com/neovim/nvim-lspconfig/";

35633575 };

@@ -3636,24 +3648,24 @@ final: prev:

36363648

36373649 nvim-tree-lua = buildVimPluginFrom2Nix {

36383650 pname = "nvim-tree-lua";

3639− version = "2021-06-09";

3651+ version = "2021-06-15";

36403652 src = fetchFromGitHub {

36413653 owner = "kyazdani42";

36423654 repo = "nvim-tree.lua";

3643− rev = "906a35cd0e7520eaff369688cb0a090240d7c2b9";

3644− sha256 = "18nw0xm4dp45v9s9kn0cmjwxdwydgr5f1v2kgm6h6kc1wvvd5scj";

3655+ rev = "bfeaf4c8ef5ff24e93005da2561407a13ba69d4d";

3656+ sha256 = "0sqydjvcjrqzw91b7sk7y9rrcs0l2j34hshcbwwwz8nrilfk6ak7";

36453657 };

36463658 meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";

36473659 };

36483660

36493661 nvim-treesitter = buildVimPluginFrom2Nix {

36503662 pname = "nvim-treesitter";

3651− version = "2021-06-06";

3663+ version = "2021-06-15";

36523664 src = fetchFromGitHub {

36533665 owner = "nvim-treesitter";

36543666 repo = "nvim-treesitter";

3655− rev = "37ed50f28f8350de8dc70b56d8ac198aac9b1178";

3656− sha256 = "16mmjpk0pqqshlw1qj3zxx197iv4g7mscgfya17c7r03rybz0q19";

3667+ rev = "84015ac3c7e3f6a05482a26b78a072f8242e62c7";

3668+ sha256 = "170ldagz7d3fnd050jpz0dxjm64lr9biqr7qixc8gfgav664b5ib";

36573669 };

36583670 meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";

36593671 };

@@ -3696,24 +3708,24 @@ final: prev:

36963708

36973709 nvim-treesitter-textobjects = buildVimPluginFrom2Nix {

36983710 pname = "nvim-treesitter-textobjects";

3699− version = "2021-06-02";

3711+ version = "2021-06-09";

37003712 src = fetchFromGitHub {

37013713 owner = "nvim-treesitter";

37023714 repo = "nvim-treesitter-textobjects";

3703− rev = "cadb8110817884fff506043497c0f2b92026aacb";

3704− sha256 = "01f1913r1q1x1qwp6l6xrqxfc9lffngnc8js5n37r7naszc9r7w8";

3715+ rev = "6cea13039db901afb75c8efa587274ebd94c875a";

3716+ sha256 = "16bi6lzb4dl6m5kcp7z2q26a9w6sb0lb3y39wd3ai5ir3p7alix4";

37053717 };

37063718 meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";

37073719 };

37083720

37093721 nvim-ts-rainbow = buildVimPluginFrom2Nix {

37103722 pname = "nvim-ts-rainbow";

3711− version = "2021-06-04";

3723+ version = "2021-06-10";

37123724 src = fetchFromGitHub {

37133725 owner = "p00f";

37143726 repo = "nvim-ts-rainbow";

3715− rev = "0fffdcb37cf7d43bc138c89eb002957819c748af";

3716− sha256 = "0xd79f7a7zyqj6yzkjanli8r4wjhy17gsp1wl7p7vws6axrbgvjl";

3727+ rev = "8b9def16536e459eafa9e216e05929a02244760b";

3728+ sha256 = "0y958rn62xz2smb1z3ckf3l4pgnd6lph9wdbw52z77yj2bskcgf3";

37173729 };

37183730 meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";

37193731 };

@@ -3792,12 +3804,12 @@ final: prev:

37923804

37933805 one-nvim = buildVimPluginFrom2Nix {

37943806 pname = "one-nvim";

3795− version = "2021-06-02";

3807+ version = "2021-06-10";

37963808 src = fetchFromGitHub {

37973809 owner = "Th3Whit3Wolf";

37983810 repo = "one-nvim";

3799− rev = "d6e62bc7cdfae97d1ffc4f508a43955664ad5b73";

3800− sha256 = "0bna2kpvaxvwglgmdgp1g93bcygvnc1c25w4isawlgmsclzz9cc6";

3811+ rev = "faf6fb3f98fccbe009c3466f657a8fff84a5f956";

3812+ sha256 = "1ajg3vlrms2jy23sd2my0yrrng6wfjklq8fkpnkgxypd4gy6k9rv";

38013813 };

38023814 meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/";

38033815 };

@@ -3852,12 +3864,12 @@ final: prev:

38523864

38533865 packer-nvim = buildVimPluginFrom2Nix {

38543866 pname = "packer-nvim";

3855− version = "2021-06-07";

3867+ version = "2021-06-13";

38563868 src = fetchFromGitHub {

38573869 owner = "wbthomason";

38583870 repo = "packer.nvim";

3859− rev = "d21e0e2c157af0fad6c6752ca07a274632202710";

3860− sha256 = "0zww9975x8wkmcdxzg4b51v94iy9644lb1miaz9ra2nwzz4ljqzj";

3871+ rev = "4012bd40af350a38696a6ba92a5df9bd99b48527";

3872+ sha256 = "0w3glp57wm7fkh0x3mqalckf8kw3x0rpbwvnafvfpsaapvmfci4h";

38613873 };

38623874 meta.homepage = "https://github.com/wbthomason/packer.nvim/";

38633875 };

@@ -3960,12 +3972,12 @@ final: prev:

39603972

39613973 plenary-nvim = buildVimPluginFrom2Nix {

39623974 pname = "plenary-nvim";

3963− version = "2021-06-02";

3975+ version = "2021-06-09";

39643976 src = fetchFromGitHub {

39653977 owner = "nvim-lua";

39663978 repo = "plenary.nvim";

3967− rev = "3834d42236c155bb4240fb4008ea6e62c4a21dae";

3968− sha256 = "1y9aqpb6j36873kcp8dbv5mm04qccjicrs0z0z9cy53s8sgfx558";

3979+ rev = "c4dd6e7b29e77d7d795c0f7c67a8ca9673a7b50f";

3980+ sha256 = "1bq5myxd91pbs2malh4zglmj6bqa3jrjg4allrn9zbkvwxhylygi";

39693981 };

39703982 meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";

39713983 };

@@ -4009,12 +4021,12 @@ final: prev:

40094021

40104022 presence-nvim = buildVimPluginFrom2Nix {

40114023 pname = "presence-nvim";

4012− version = "2021-06-08";

4024+ version = "2021-06-14";

40134025 src = fetchFromGitHub {

40144026 owner = "andweeb";

40154027 repo = "presence.nvim";

4016− rev = "f4c1e227be0a0c863c2de201155401950eda572e";

4017− sha256 = "08s4az1gv6r5sl0jqkaf4yzibglibb7n2sivh7qccj8dz8id3883";

4028+ rev = "65a16b25f98891e2832daa437cdd682e546a494e";

4029+ sha256 = "0fwxxrwad3y69bczs7rxa0brff4vp139w2ylv8rfh0v2dgx2gmay";

40184030 };

40194031 meta.homepage = "https://github.com/andweeb/presence.nvim/";

40204032 };

@@ -4201,12 +4213,12 @@ final: prev:

42014213

42024214 registers-nvim = buildVimPluginFrom2Nix {

42034215 pname = "registers-nvim";

4204− version = "2021-05-28";

4216+ version = "2021-06-16";

42054217 src = fetchFromGitHub {

42064218 owner = "tversteeg";

42074219 repo = "registers.nvim";

4208− rev = "34bbf868da6ef0225739e7977a4063872cd2b1e8";

4209− sha256 = "0ghy760dc07xwjaf5ci2di8qfq0qip8jyrp7x0rsl820ryy7rggy";

4220+ rev = "a80e199ad4e6e7027f2822fcbf92428606127893";

4221+ sha256 = "0xssz0vhylxhsbr7fm5gbagp23xcbl1nv16845nmahawab6ir9ks";

42104222 };

42114223 meta.homepage = "https://github.com/tversteeg/registers.nvim/";

42124224 };

@@ -4297,12 +4309,12 @@ final: prev:

42974309

42984310 rust-tools-nvim = buildVimPluginFrom2Nix {

42994311 pname = "rust-tools-nvim";

4300− version = "2021-06-03";

4312+ version = "2021-06-15";

43014313 src = fetchFromGitHub {

43024314 owner = "simrat39";

43034315 repo = "rust-tools.nvim";

4304− rev = "177507f1443be150250ce90c18f5f6fb8d798543";

4305− sha256 = "0wj6pccjbcvj42i4516y6wjrssyl3p060454yjxhgqnnnzxc2dh4";

4316+ rev = "493202aa28b5b9e4aa378ad04de50162ec1f353c";

4317+ sha256 = "11azahjqg6wvahchds8hanbs8qrx2kjz7g5vcxcfyajfpns1ck6r";

43064318 };

43074319 meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";

43084320 };

@@ -4550,12 +4562,12 @@ final: prev:

45504562

45514563 Spacegray-vim = buildVimPluginFrom2Nix {

45524564 pname = "Spacegray-vim";

4553− version = "2021-01-02";

4565+ version = "2021-06-15";

45544566 src = fetchFromGitHub {

45554567 owner = "ackyshake";

45564568 repo = "Spacegray.vim";

4557− rev = "012ff0065eac2c149084d59e1272ec0d740051ab";

4558− sha256 = "0y0jlycgsc8ll5gnqmjc9blyn9ynnzrgnp280k49h4lh5b689y5m";

4569+ rev = "0aa4e5c973413add9766689385bf9137d8c6cbc9";

4570+ sha256 = "12lwvcm2ahwvr8gj1sdlgf42cd2f4xxjmiir68f09yimzajip7yi";

45594571 };

45604572 meta.homepage = "https://github.com/ackyshake/Spacegray.vim/";

45614573 };

@@ -4900,12 +4912,12 @@ final: prev:

49004912

49014913 telescope-symbols-nvim = buildVimPluginFrom2Nix {

49024914 pname = "telescope-symbols-nvim";

4903− version = "2021-02-04";

4915+ version = "2021-06-15";

49044916 src = fetchFromGitHub {

49054917 owner = "nvim-telescope";

49064918 repo = "telescope-symbols.nvim";

4907− rev = "5139fdf31fdffdac75209362409d62d2b6033a20";

4908− sha256 = "0va4czhncw7jhirbqr7wdap4qg3i5x7g6ic8migpmv57ym2py0m9";

4919+ rev = "e211b6aeed1f94ca660c407f3052f83ab8f4b2a9";

4920+ sha256 = "0nd02akh5nmcnv8mqih6xpzc4pbhys6rva7v60p38kxx50ycfkvw";

49094921 };

49104922 meta.homepage = "https://github.com/nvim-telescope/telescope-symbols.nvim/";

49114923 };

@@ -4924,12 +4936,12 @@ final: prev:

49244936

49254937 telescope-nvim = buildVimPluginFrom2Nix {

49264938 pname = "telescope-nvim";

4927− version = "2021-06-06";

4939+ version = "2021-06-14";

49284940 src = fetchFromGitHub {

49294941 owner = "nvim-telescope";

49304942 repo = "telescope.nvim";

4931− rev = "feaed4b6e23bd56906089154f293f2b1ecb68c7e";

4932− sha256 = "0kx9xmlv6smpqgf2mdz0n6r4cwrsldw9d92xk5m1pdsmpi1b61sa";

4943+ rev = "6ac5ee0854fe02d651cadf2fc97a2463ff92f322";

4944+ sha256 = "1k2glya8cd000kzfvx5fif9fcqvcq1k2vrkwyzhfm4yngz7bxm1p";

49334945 };

49344946 meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";

49354947 };

@@ -5020,12 +5032,12 @@ final: prev:

50205032

50215033 todo-comments-nvim = buildVimPluginFrom2Nix {

50225034 pname = "todo-comments-nvim";

5023− version = "2021-05-26";

5035+ version = "2021-06-14";

50245036 src = fetchFromGitHub {

50255037 owner = "folke";

50265038 repo = "todo-comments.nvim";

5027− rev = "8560546c466d1f555573d37e062e95e7ae94bbab";

5028− sha256 = "1g0ypjdcj7sp433n933n3qazp7301b2q7p968v57mgmlh5saq6kb";

5039+ rev = "014959e82aabc07a16739c771bf40e7fd6de3fe9";

5040+ sha256 = "031jyzykn9i32h8pq89571p2yrwp1d30qh2616h978l8a7bp8cyq";

50295041 };

50305042 meta.homepage = "https://github.com/folke/todo-comments.nvim/";

50315043 };

@@ -5045,12 +5057,12 @@ final: prev:

50455057

50465058 traces-vim = buildVimPluginFrom2Nix {

50475059 pname = "traces-vim";

5048− version = "2021-01-23";

5060+ version = "2021-06-16";

50495061 src = fetchFromGitHub {

50505062 owner = "markonm";

50515063 repo = "traces.vim";

5052− rev = "0f29f8e53503b8ce0bb43467064b2401cf34acd1";

5053− sha256 = "1xx2b59wcnbh5662j7b68maz5ccxj5xpfpnjn2r669aiv0a5snhw";

5064+ rev = "e36a2e45791ef9078de781a781fec70e160044b0";

5065+ sha256 = "1qndaqs38mgkl15n895nzjc98h2cy4gjgr3r72cpwhn9qmzhi5zc";

50545066 };

50555067 meta.homepage = "https://github.com/markonm/traces.vim/";

50565068 };

@@ -5081,12 +5093,12 @@ final: prev:

50815093

50825094 trouble-nvim = buildVimPluginFrom2Nix {

50835095 pname = "trouble-nvim";

5084− version = "2021-06-04";

5096+ version = "2021-06-14";

50855097 src = fetchFromGitHub {

50865098 owner = "folke";

50875099 repo = "trouble.nvim";

5088− rev = "a7dca6204316b9be7c95d056088c67371151c8ab";

5089− sha256 = "0b2wha4qmn9gb5fmj57ymhn3jrajq71yk48m8gddr1hx244adknh";

5100+ rev = "36b6813a2103d85b469a61721b030903ddd8b3b3";

5101+ sha256 = "1wbnwa420xa9ypwr6fgfvms7f2kpk3ya0221i6vfifyx37skjkra";

50905102 };

50915103 meta.homepage = "https://github.com/folke/trouble.nvim/";

50925104 };

@@ -5129,12 +5141,12 @@ final: prev:

51295141

51305142 ultisnips = buildVimPluginFrom2Nix {

51315143 pname = "ultisnips";

5132− version = "2021-06-08";

5144+ version = "2021-06-15";

51335145 src = fetchFromGitHub {

51345146 owner = "SirVer";

51355147 repo = "ultisnips";

5136− rev = "b6c9a814a4fdfcad3ea53d8888746803a7218a9e";

5137− sha256 = "0iqirp8pmsrgrk3i0hkk1a66igc5ydi96scp62yl97nazhz45xxr";

5148+ rev = "aec91caefec10741722927cf073703a528fe7a8f";

5149+ sha256 = "1a5527adkaawgcj1pm5qp0qiq084x70ljj7a35abjil20f3s7y85";

51385150 };

51395151 meta.homepage = "https://github.com/SirVer/ultisnips/";

51405152 };

@@ -5765,12 +5777,12 @@ final: prev:

57655777

57665778 vim-clap = buildVimPluginFrom2Nix {

57675779 pname = "vim-clap";

5768− version = "2021-06-08";

5780+ version = "2021-06-15";

57695781 src = fetchFromGitHub {

57705782 owner = "liuchengxu";

57715783 repo = "vim-clap";

5772− rev = "c7e013cb273597e37eb65b481cbeb7d1b92b01b7";

5773− sha256 = "1i33y3jqjqbrg2mgnz4sxvsckl1ggdg3aymxxz4l3qivnbn1fni5";

5784+ rev = "47eb68fc714de966b385b679d50e1c6e324a0ed4";

5785+ sha256 = "110fvacvn0r68y4c3p07vi4iv34jjywykpmssvjzclqsia6v758h";

57745786 };

57755787 meta.homepage = "https://github.com/liuchengxu/vim-clap/";

57765788 };

@@ -6269,12 +6281,12 @@ final: prev:

62696281

62706282 vim-elixir = buildVimPluginFrom2Nix {

62716283 pname = "vim-elixir";

6272− version = "2021-05-16";

6284+ version = "2021-06-16";

62736285 src = fetchFromGitHub {

62746286 owner = "elixir-editors";

62756287 repo = "vim-elixir";

6276− rev = "6dc61ad4dcfa520d56f3a4373bd507f529a25382";

6277− sha256 = "1rqr16wcwzrs6w9iwg4wghqm7nb1jgzwjmfimvclnkbqpp8ssaq6";

6288+ rev = "58084475c1e523caeac97ffff62c154f7f8fcc66";

6289+ sha256 = "09nv87iqjnwpfkvbspgwxibjlf1aj4syw0nv885fyw8fjpbhf06l";

62786290 };

62796291 meta.homepage = "https://github.com/elixir-editors/vim-elixir/";

62806292 };

@@ -6533,12 +6545,12 @@ final: prev:

65336545

65346546 vim-fugitive = buildVimPluginFrom2Nix {

65356547 pname = "vim-fugitive";

6536− version = "2021-06-06";

6548+ version = "2021-06-11";

65376549 src = fetchFromGitHub {

65386550 owner = "tpope";

65396551 repo = "vim-fugitive";

6540− rev = "41960996e0c532069533072b3fd820fafe9ce0b3";

6541− sha256 = "0lzjwjbdq90b39561yp7qs1l69iw4jlxcjrsi5yvh1rbhv7gpy1i";

6552+ rev = "be9ff95f27d12b7bd46ab5d36f7149cb0864c329";

6553+ sha256 = "1j8lgf5ppp28qqqvvw2isbg4cb00l83np5y7vkqfy9346awwhwq7";

65426554 };

65436555 meta.homepage = "https://github.com/tpope/vim-fugitive/";

65446556 };

@@ -6653,12 +6665,12 @@ final: prev:

66536665

66546666 vim-go = buildVimPluginFrom2Nix {

66556667 pname = "vim-go";

6656− version = "2021-06-04";

6668+ version = "2021-06-12";

66576669 src = fetchFromGitHub {

66586670 owner = "fatih";

66596671 repo = "vim-go";

6660− rev = "edd8c160e54c2861a617777192a48d0a64704192";

6661− sha256 = "1xdggzasvv3x1h61yqp2rl30r6kppf6aqdjqsrpzihz809w5zgry";

6672+ rev = "57e01d258804fa8a0a2f2e62b33130ecd7d1b57f";

6673+ sha256 = "18hn9x2yfr3h1ji13rkp65lgpcljlp7agkhj3argyymzwid5bxzm";

66626674 };

66636675 meta.homepage = "https://github.com/fatih/vim-go/";

66646676 };

@@ -6701,12 +6713,12 @@ final: prev:

67016713

67026714 vim-gruvbox8 = buildVimPluginFrom2Nix {

67036715 pname = "vim-gruvbox8";

6704− version = "2021-05-28";

6716+ version = "2021-06-13";

67056717 src = fetchFromGitHub {

67066718 owner = "lifepillar";

67076719 repo = "vim-gruvbox8";

6708− rev = "66d58b569fdbe0ec389acb66eb4a585f3110e43e";

6709− sha256 = "0bggkq2p109vc67s0idplrf4sy4j12smwkx2wvsc626bzflzc2fb";

6720+ rev = "73bd562267d3dea92b6e8dd1f0e3caca024927ad";

6721+ sha256 = "01x0y5ma7wz2yjcq12zzlmkn8x4yz4gcmxmkyrcy127pnhjn8a23";

67106722 };

67116723 meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/";

67126724 };

@@ -6737,12 +6749,12 @@ final: prev:

67376749

67386750 vim-hardtime = buildVimPluginFrom2Nix {

67396751 pname = "vim-hardtime";

6740− version = "2020-05-01";

6752+ version = "2021-06-11";

67416753 src = fetchFromGitHub {

67426754 owner = "takac";

67436755 repo = "vim-hardtime";

6744− rev = "ef06cf30fd3843e7857fdb79c6868660220b9391";

6745− sha256 = "0yhai27zqkdmgck1iy64fw9yy2vghmqvj4g2lbh21h50df1sa8cf";

6756+ rev = "00fde0a5e3fe15e329bdeac5331e4b439b6972a8";

6757+ sha256 = "1c66q7bcg0m19zjd3yz5ywhm094cr48yr6rxp8zhlavaswwx8wz7";

67466758 };

67476759 meta.homepage = "https://github.com/takac/vim-hardtime/";

67486760 };

@@ -6954,12 +6966,12 @@ final: prev:

69546966

69556967 vim-illuminate = buildVimPluginFrom2Nix {

69566968 pname = "vim-illuminate";

6957− version = "2021-06-03";

6969+ version = "2021-06-12";

69586970 src = fetchFromGitHub {

69596971 owner = "RRethy";

69606972 repo = "vim-illuminate";

6961− rev = "daa49da1e7a6d8c8dcbd3a40f91046d1505fd645";

6962− sha256 = "1qvnij7z48g1m6n2qz5lbgbiwwaqnb626sz6qvhkd5jh556pmfah";

6973+ rev = "8fe150bd775f659da7e40ea2d3ad7473e6d29494";

6974+ sha256 = "1y8bhfcbk5062nrscihr24p8b955c09hnbii5grb4x16jir06cbg";

69636975 };

69646976 meta.homepage = "https://github.com/RRethy/vim-illuminate/";

69656977 };

@@ -7351,12 +7363,12 @@ final: prev:

73517363

73527364 vim-lsp = buildVimPluginFrom2Nix {

73537365 pname = "vim-lsp";

7354− version = "2021-06-08";

7366+ version = "2021-06-16";

73557367 src = fetchFromGitHub {

73567368 owner = "prabirshrestha";

73577369 repo = "vim-lsp";

7358− rev = "516fd7ce956bdfa2fa6ee8ac6d77ad8a57616811";

7359− sha256 = "0anfwxq93ddmymdna692xz74h3kimwmw1ii6pq8ci08i3pkqjrf7";

7370+ rev = "fb0a72306e1fc42c1ce8909aa1e420ddfccf6fbf";

7371+ sha256 = "0dzy7cvpmzvx6z5pifzj4y7biln5gcn4iic35ha58ixwgwcw784m";

73607372 };

73617373 meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";

73627374 };

@@ -7460,12 +7472,12 @@ final: prev:

74607472

74617473 vim-matchup = buildVimPluginFrom2Nix {

74627474 pname = "vim-matchup";

7463− version = "2021-06-02";

7475+ version = "2021-06-16";

74647476 src = fetchFromGitHub {

74657477 owner = "andymass";

74667478 repo = "vim-matchup";

7467− rev = "fd9f3c09b04725c8042149bfe3fd080b6f6962cb";

7468− sha256 = "08cqh4b01jl0iqd1nj2sw2jcwxp48m9rdh50sdnfjgdvynnpagik";

7479+ rev = "be396a2abce5bf564e53c8a1cbef78ea37602ce9";

7480+ sha256 = "0kn6qqry2x9s4i813bglvdpwcq6223m8zay2p77wqds2g8xxz5dk";

74697481 };

74707482 meta.homepage = "https://github.com/andymass/vim-matchup/";

74717483 };

@@ -7844,12 +7856,12 @@ final: prev:

78447856

78457857 vim-pandoc = buildVimPluginFrom2Nix {

78467858 pname = "vim-pandoc";

7847− version = "2021-04-30";

7859+ version = "2021-06-09";

78487860 src = fetchFromGitHub {

78497861 owner = "vim-pandoc";

78507862 repo = "vim-pandoc";

7851− rev = "587399591a9e9b8da9846c0d724a84a3bd1ce98e";

7852− sha256 = "1xghmq15i8wqfwx7gib8j54c5s3an9q4idy6c6mbywd75s4384m5";

7863+ rev = "1c56693951ce81f344cff0d7c8a6f7ea62a06981";

7864+ sha256 = "017g2cq05pfxjmcdm42qz6pv2cf2v18lnnrfnizm1cd388r9byll";

78537865 };

78547866 meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/";

78557867 };

@@ -7988,12 +8000,12 @@ final: prev:

79888000

79898001 vim-polyglot = buildVimPluginFrom2Nix {

79908002 pname = "vim-polyglot";

7991− version = "2021-06-04";

8003+ version = "2021-06-09";

79928004 src = fetchFromGitHub {

79938005 owner = "sheerun";

79948006 repo = "vim-polyglot";

7995− rev = "c312d30231f136d2fbb32a2cfea554af5066e6b0";

7996− sha256 = "1apd860v2xfi3fjgl15j7mgn6nczx10vj324w1vf1ic5nyy4b594";

8007+ rev = "4899585281beab51e5dff1d9ae4d3159244a8275";

8008+ sha256 = "1518dvxf99nvky0mrvgv65if0wjhpiv3021rddhn52j04vri4pdd";

79978009 };

79988010 meta.homepage = "https://github.com/sheerun/vim-polyglot/";

79998011 };

@@ -8252,12 +8264,12 @@ final: prev:

82528264

82538265 vim-ruby = buildVimPluginFrom2Nix {

82548266 pname = "vim-ruby";

8255− version = "2021-02-03";

8267+ version = "2021-06-12";

82568268 src = fetchFromGitHub {

82578269 owner = "vim-ruby";

82588270 repo = "vim-ruby";

8259− rev = "4788a08433c3c90e131fc7d110d82577e1234a86";

8260− sha256 = "1sq1li4s40xgy8ww4krsxqdqlwhcd9l67551iadccvsvjka16ynw";

8271+ rev = "a006f67d18ce0ed6ff75c98b266eaa606dfcec30";

8272+ sha256 = "0dhkyfignmcv9jwrszk37k7l8h2ivbv3krz5xwk17fbdd2y7jwz2";

82618273 };

82628274 meta.homepage = "https://github.com/vim-ruby/vim-ruby/";

82638275 };

@@ -8528,12 +8540,12 @@ final: prev:

85288540

85298541 vim-snippets = buildVimPluginFrom2Nix {

85308542 pname = "vim-snippets";

8531− version = "2021-04-19";

8543+ version = "2021-06-15";

85328544 src = fetchFromGitHub {

85338545 owner = "honza";

85348546 repo = "vim-snippets";

8535− rev = "2a28fc35f6848ad38681d4b509ae3f5962276b5d";

8536− sha256 = "05xywkyh809g7zax4wdw5vn29xcs1wg3ylbsdi9rz18phm6im41k";

8547+ rev = "3cee4da7ef73b1c22551d00ac1fdf7f61b71d7cc";

8548+ sha256 = "1xg6kd5nh76bq45q1za4nlmasa8plz57kvqd5ag89samdmzsjny9";

85378549 };

85388550 meta.homepage = "https://github.com/honza/vim-snippets/";

85398551 };

@@ -8744,12 +8756,12 @@ final: prev:

87448756

87458757 vim-terraform = buildVimPluginFrom2Nix {

87468758 pname = "vim-terraform";

8747− version = "2021-05-08";

8759+ version = "2021-06-09";

87488760 src = fetchFromGitHub {

87498761 owner = "hashivim";

87508762 repo = "vim-terraform";

8751− rev = "9166d42e5dc9bc0ef7e1b9e93d52bb4c5b923560";

8752− sha256 = "1wr1sqxjy1dqyvkvii8jrxwagfph52z2ij8p1nz5b1kpyzvvpg7b";

8763+ rev = "814a21db89f742c3ea492c69c5a2bfecded1aeb3";

8764+ sha256 = "0acdq2m16mhm3g6n4saqf9fljz5qfdalw88h126z2f6mm731y6pi";

87538765 };

87548766 meta.homepage = "https://github.com/hashivim/vim-terraform/";

87558767 };

@@ -8937,12 +8949,12 @@ final: prev:

89378949

89388950 vim-tpipeline = buildVimPluginFrom2Nix {

89398951 pname = "vim-tpipeline";

8940− version = "2021-06-03";

8952+ version = "2021-06-09";

89418953 src = fetchFromGitHub {

89428954 owner = "vimpostor";

89438955 repo = "vim-tpipeline";

8944− rev = "683cf4f2e16149c477a8f5c96b7429932a68d801";

8945− sha256 = "0gr5k4bzzzvn00plimpkjiavya04jvcgg322k8yblzmm01r6vcr2";

8956+ rev = "3b0050c1079804633494c1b498bf84838c91e97c";

8957+ sha256 = "0vmxjmpih7424k064vjnfpdb417l9gyccd1jmwa4vx33v0mlxzhj";

89468958 };

89478959 meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";

89488960 };

@@ -8997,12 +9009,12 @@ final: prev:

89979009

89989010 vim-ultest = buildVimPluginFrom2Nix {

89999011 pname = "vim-ultest";

9000− version = "2021-06-07";

9012+ version = "2021-06-16";

90019013 src = fetchFromGitHub {

90029014 owner = "rcarriga";

90039015 repo = "vim-ultest";

9004− rev = "d864a6b2b0f394b9371246cad226adac7507e13d";

9005− sha256 = "0bvdhbla38mvq9x595h5mcvib13sb84mz3z9f7sqf4m3c9v9376m";

9016+ rev = "4d6d02bf940401ee103df8110b412d9ff95be2d2";

9017+ sha256 = "12dz6r6fz3pvd62fxyl8smna88l7k8f60n9s1xnyf573xms5ka5w";

90069018 };

90079019 meta.homepage = "https://github.com/rcarriga/vim-ultest/";

90089020 };

@@ -9069,12 +9081,12 @@ final: prev:

90699081

90709082 vim-visual-multi = buildVimPluginFrom2Nix {

90719083 pname = "vim-visual-multi";

9072− version = "2021-06-01";

9084+ version = "2021-06-11";

90739085 src = fetchFromGitHub {

90749086 owner = "mg979";

90759087 repo = "vim-visual-multi";

9076− rev = "2b9d104c57aeb612d7f00e1d071d712ed8671949";

9077− sha256 = "17f92pka2flwnhx8yg7skbp8kyhbb6gmvm0mni2jm7w3iq68nbmw";

9088+ rev = "8566a3137bd51ca2f6d12a06dbc70ce831dd2d1c";

9089+ sha256 = "0krdc2d6dxpfsy50xk3cq9m9fcmcc5bng7k6yz3qpwz05n4pbgii";

90789090 };

90799091 meta.homepage = "https://github.com/mg979/vim-visual-multi/";

90809092 };

@@ -9225,12 +9237,12 @@ final: prev:

92259237

92269238 vim-xtabline = buildVimPluginFrom2Nix {

92279239 pname = "vim-xtabline";

9228− version = "2021-06-08";

9240+ version = "2021-06-10";

92299241 src = fetchFromGitHub {

92309242 owner = "mg979";

92319243 repo = "vim-xtabline";

9232− rev = "5e67677a4815bbf474b52f8aefcfa2090fe43768";

9233− sha256 = "17pb39zhzsmmibxmsbrsd3znky88sar2sl0h7b1418qqkaakx4p9";

9244+ rev = "1dbf84a3095eff9bd0d1e49824dddac56c378ed9";

9245+ sha256 = "16qwp8kk3c2lzfnmzkzi71ilrcssga17kjiphskph5kl35igr16v";

92349246 };

92359247 meta.homepage = "https://github.com/mg979/vim-xtabline/";

92369248 };

@@ -9417,12 +9429,12 @@ final: prev:

94179429

94189430 vimspector = buildVimPluginFrom2Nix {

94199431 pname = "vimspector";

9420− version = "2021-06-07";

9432+ version = "2021-06-09";

94219433 src = fetchFromGitHub {

94229434 owner = "puremourning";

94239435 repo = "vimspector";

9424− rev = "1cbb400d426760a63d5383e2574e9d8905bebe51";

9425− sha256 = "172kryvxphsvbh2f60ka21rjsrq4abgdh1ijyxp57p1qbbv9fhcc";

9436+ rev = "bab81953d76f4027e78a9f85ae2ea360597588ef";

9437+ sha256 = "0fbqayfg8pdivdg0fa4q42vb59vvwb1llq73kzh65zgwfs1k1zr1";

94269438 fetchSubmodules = true;

94279439 };

94289440 meta.homepage = "https://github.com/puremourning/vimspector/";

@@ -9430,12 +9442,12 @@ final: prev:

94309442

94319443 vimtex = buildVimPluginFrom2Nix {

94329444 pname = "vimtex";

9433− version = "2021-06-06";

9445+ version = "2021-06-16";

94349446 src = fetchFromGitHub {

94359447 owner = "lervag";

94369448 repo = "vimtex";

9437− rev = "fef77c8edf655d947e4d9c78d7bd2740ccda70cd";

9438− sha256 = "06hdz4rwwnmm1hhhjhvcd50r04qnvmksriaw4csv3gfnkfkm5v9r";

9449+ rev = "4d3ba03b6a592c44547e3aef92489f7fb3a491ef";

9450+ sha256 = "0kxg9kkfbfwcrpfg2vdzzgy2yy6b66y6jcym94g4q3nlj2gg130b";

94399451 };

94409452 meta.homepage = "https://github.com/lervag/vimtex/";

94419453 };

@@ -9478,12 +9490,12 @@ final: prev:

94789490

94799491 vista-vim = buildVimPluginFrom2Nix {

94809492 pname = "vista-vim";

9481− version = "2021-05-28";

9493+ version = "2021-06-13";

94829494 src = fetchFromGitHub {

94839495 owner = "liuchengxu";

94849496 repo = "vista.vim";

9485− rev = "19cad968d2cd759e7f9de1d662ec680bd93ebebc";

9486− sha256 = "0r01b6mml6qgyybi6i59bflgqi03w0fnl0wfgwac96ixs2wdvl1l";

9497+ rev = "d4f9bd468deaa9abf665288c9e179701728128bd";

9498+ sha256 = "1v2r5vbqafrg5ay140p4z2vl1lwy6vz16zv6skwz1in0gaicwgxv";

94879499 };

94889500 meta.homepage = "https://github.com/liuchengxu/vista.vim/";

94899501 };

@@ -9708,12 +9720,12 @@ final: prev:

97089720

97099721 zig-vim = buildVimPluginFrom2Nix {

97109722 pname = "zig-vim";

9711− version = "2021-05-12";

9723+ version = "2021-06-15";

97129724 src = fetchFromGitHub {

97139725 owner = "ziglang";

97149726 repo = "zig.vim";

9715− rev = "9ec189bc76ed2850f916394ed8d6127290f51338";

9716− sha256 = "0xl2pxgmam5ls7a59bdvx3gyzcgsq3wvgby2c5667627kcq05j6s";

9727+ rev = "c339f13d9e840a9b4e392d104f9a0a2960f4a49a";

9728+ sha256 = "1w8127zhzz74gzclg5bv4kl11cwhi48wqqc1x176rsrlac7qfpp1";

97179729 };

97189730 meta.homepage = "https://github.com/ziglang/zig.vim/";

97199731 };

pkgs/misc/vim-plugins/overrides.nix+1−1

@@ -621,7 +621,7 @@ self: super: {

621621 libiconv

622622 ];

623623

624− cargoSha256 = "sha256-/ALOjJayCmLpMV8zC9ryEofUxYdvqj4Cn+sY1qRuqcs=";

624+ cargoSha256 = "sha256-IKSnXNFdtykuajOxpw5CYsw2q/mkVLkRtPC49hiXsPc=";

625625 };

626626 in

627627 ''

pkgs/misc/vim-plugins/vim-plugin-names+2−1

@@ -20,7 +20,7 @@ AndrewRadev/sideways.vim@main

2020AndrewRadev/splitjoin.vim@main

2121andsild/peskcolor.vim

2222andviro/flake8-vim

23−andweeb/presence.nvim

23+andweeb/presence.nvim@main

2424andymass/vim-matchup

2525andys8/vim-elm-syntax

2626antoinemadec/coc-fzf

@@ -158,6 +158,7 @@ gennaro-tedesco/nvim-peekup

158158gentoo/gentoo-syntax

159159GEverding/vim-hocon

160160gfanto/fzf-lsp.nvim@main

161+ggandor/lightspeed.nvim@main

161162gibiansky/vim-textobj-haskell

162163gioele/vim-autoswap

163164gleam-lang/gleam.vim

pkgs/misc/vscode-extensions/default.nix+10−4

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

1−{ config, lib, buildEnv, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq }:

1+{ config, lib, buildEnv, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq, shellcheck }:

33let

44 inherit (vscode-utils) buildVscodeMarketplaceExtension;

@@ -120,7 +120,6 @@ let

120120 sha256 = "sha256-vz2kU36B1xkLci2QwLpl/SBEhfSWltIDJ1r7SorHcr8=";

121121 };

122122 nativeBuildInputs = [ jq ];

123− buildInputs = [ nixpkgs-fmt ];

124123 postInstall = ''

125124 cd "$out/$installPrefix"

126125 tmp_package_json=$(mktemp)

@@ -1165,9 +1164,16 @@ let

11651164 mktplcRef = {

11661165 name = "shellcheck";

11671166 publisher = "timonwong";

1168− version = "0.12.3";

1169− sha256 = "1i9rszgnac2z1kyahmgxmz05ib7z14s458fvvjlzmvl64fa1fdvf";

1167+ version = "0.14.1";

1168+ sha256 = "sha256-X3ihMxANcqNLWl9oTZjCgwRt1uBsSN2BmC2D4dPRFLE=";

11701169 };

1170+ nativeBuildInputs = [ jq ];

1171+ postInstall = ''

1172+ cd "$out/$installPrefix"

1173+ tmp_package_json=$(mktemp)

1174+ jq '.contributes.configuration.properties."shellcheck.executablePath".default = "${shellcheck}/bin/shellcheck"' package.json > "$tmp_package_json"

1175+ mv "$tmp_package_json" package.json

1176+ '';

11711177 meta = {

11721178 license = lib.licenses.mit;

11731179 };

pkgs/os-specific/linux/ell/default.nix+2−2

@@ -7,14 +7,14 @@

88stdenv.mkDerivation rec {

99 pname = "ell";

10− version = "0.40";

10+ version = "0.41";

1111

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

1313

1414 src = fetchgit {

1515 url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git";

1616 rev = version;

17− sha256 = "sha256-Yr08Kb8YU7xqBnhhS8rn+GFXAV68Hgj4aY26eptb9/8=";

17+ sha256 = "sha256-UCE+PgGmbePlOoAc8jXxCX6fHr16qf1AQMKxizfSTJM=";

1818 };

1919

2020 nativeBuildInputs = [

pkgs/os-specific/linux/iwd/default.nix+2−2

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

1212

1313stdenv.mkDerivation rec {

1414 pname = "iwd";

15− version = "1.14";

15+ version = "1.15";

1616

1717 src = fetchgit {

1818 url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";

1919 rev = version;

20− sha256 = "sha256-uGe4TO1/bs8k2z3wOJqaZgT6u6yX/7wx4HMSS2hN4XE=";

20+ sha256 = "sha256-qGQDIzJfeBT9VLwr9Ci9vXcM0ZvFvjL2E9PcKoZ8E94=";

2121 };

2222

2323 outputs = [ "out" "man" ]

pkgs/servers/home-assistant/component-packages.nix+7−7

@@ -45,7 +45,7 @@

4545 "aprs" = ps: with ps; [ aprslib geopy ];

4646 "aqualogic" = ps: with ps; [ aqualogic ];

4747 "aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc

48− "arcam_fmj" = ps: with ps; [ ]; # missing inputs: arcam-fmj

48+ "arcam_fmj" = ps: with ps; [ arcam-fmj ];

4949 "arduino" = ps: with ps; [ ]; # missing inputs: PyMata

5050 "arest" = ps: with ps; [ ];

5151 "arlo" = ps: with ps; [ ha-ffmpeg pyarlo ];

@@ -94,7 +94,7 @@

9494 "bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense

9595 "bme680" = ps: with ps; [ bme680 smbus-cffi ];

9696 "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280

97− "bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected

97+ "bmw_connected_drive" = ps: with ps; [ bimmer-connected ];

9898 "bond" = ps: with ps; [ bond-api ];

9999 "bosch_shc" = ps: with ps; [ aiohttp-cors boschshcpy ifaddr zeroconf ];

100100 "braviatv" = ps: with ps; [ bravia-tv ];

@@ -130,7 +130,7 @@

130130 "cmus" = ps: with ps; [ ]; # missing inputs: pycmus

131131 "co2signal" = ps: with ps; [ ]; # missing inputs: co2signal

132132 "coinbase" = ps: with ps; [ ]; # missing inputs: coinbase

133− "color_extractor" = ps: with ps; [ ]; # missing inputs: colorthief

133+ "color_extractor" = ps: with ps; [ colorthief ];

134134 "comed_hourly_pricing" = ps: with ps; [ ];

135135 "comfoconnect" = ps: with ps; [ pycomfoconnect ];

136136 "command_line" = ps: with ps; [ ];

@@ -138,9 +138,9 @@

138138 "concord232" = ps: with ps; [ ]; # missing inputs: concord232

139139 "config" = ps: with ps; [ aiohttp-cors ];

140140 "configurator" = ps: with ps; [ ];

141− "control4" = ps: with ps; [ ]; # missing inputs: pyControl4

141+ "control4" = ps: with ps; [ pycontrol4 ];

142142 "conversation" = ps: with ps; [ aiohttp-cors ];

143− "coolmaster" = ps: with ps; [ ]; # missing inputs: pycoolmasternet-async

143+ "coolmaster" = ps: with ps; [ pycoolmasternet-async ];

144144 "coronavirus" = ps: with ps; [ coronavirus ];

145145 "counter" = ps: with ps; [ ];

146146 "cover" = ps: with ps; [ ];

@@ -278,7 +278,7 @@

278278 "foobot" = ps: with ps; [ foobot-async ];

279279 "forked_daapd" = ps: with ps; [ ]; # missing inputs: pyforked-daapd pylibrespot-java

280280 "fortios" = ps: with ps; [ fortiosapi ];

281− "foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam

281+ "foscam" = ps: with ps; [ libpyfoscam ];

282282 "foursquare" = ps: with ps; [ aiohttp-cors ];

283283 "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms

284284 "freebox" = ps: with ps; [ freebox-api ];

@@ -312,7 +312,7 @@

312312 "glances" = ps: with ps; [ glances-api ];

313313 "gntp" = ps: with ps; [ gntp ];

314314 "goalfeed" = ps: with ps; [ ]; # missing inputs: pysher

315− "goalzero" = ps: with ps; [ ]; # missing inputs: goalzero

315+ "goalzero" = ps: with ps; [ goalzero ];

316316 "gogogate2" = ps: with ps; [ ismartgate ];

317317 "google" = ps: with ps; [ google-api-python-client httplib2 oauth2client ];

318318 "google_assistant" = ps: with ps; [ aiohttp-cors ];

pkgs/servers/home-assistant/default.nix+7

@@ -292,6 +292,7 @@ in with py.pkgs; buildPythonApplication rec {

292292 "apple_tv"

293293 "apprise"

294294 "aprs"

295+ "arcam_fmj"

295296 "arlo"

296297 "asuswrt"

297298 "atag"

@@ -310,6 +311,7 @@ in with py.pkgs; buildPythonApplication rec {

310311 "blink"

311312 "blueprint"

312313 "bluetooth_le_tracker"

314+ "bmw_connected_drive"

313315 "bond"

314316 "bosch_shc"

315317 "braviatv"

@@ -327,12 +329,15 @@ in with py.pkgs; buildPythonApplication rec {

327329 "climate"

328330 "cloud"

329331 "cloudflare"

332+ "color_extractor"

330333 "comfoconnect"

331334 "command_line"

332335 "compensation"

333336 "config"

334337 "configurator"

338+ "control4"

335339 "conversation"

340+ "coolmaster"

336341 "coronavirus"

337342 "counter"

338343 "cover"

@@ -386,6 +391,7 @@ in with py.pkgs; buildPythonApplication rec {

386391 "folder"

387392 "folder_watcher"

388393 "foobot"

394+ "foscam"

389395 "freebox"

390396 "freedns"

391397 "fritz"

@@ -405,6 +411,7 @@ in with py.pkgs; buildPythonApplication rec {

405411 "geonetnz_volcano"

406412 "gios"

407413 "glances"

414+ "goalzero"

408415 "gogogate2"

409416 "google"

410417 "google_assistant"

pkgs/tools/misc/hdf4/darwin-aarch64.patchnew file+11

@@ -0,0 +1,11 @@

1+--- a/hdf/src/hdfi.h 2021-06-16 16:31:31.000000000 +1200

2++++ b/hdf/src/hdfi.h 2021-06-16 16:42:26.000000000 +1200

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

4+ #endif /* IA64 */

6+ /* Linux AArch64 */

7+-#if defined __aarch64__

8++#if defined __aarch64__ && !defined __APPLE__

10+ #ifdef GOT_MACHINE

11+ If you get an error on this line more than one machine type has been defined.

pkgs/tools/misc/hdf4/default.nix+1

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

4444 url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-aarch64.patch";

4545 sha256 = "112svcsilk16ybbsi8ywnxfl2p1v44zh3rfn4ijnl8z08vfqrvvs";

4646 })

47+ ./darwin-aarch64.patch

4748 ];

4849

4950 nativeBuildInputs = [

pkgs/tools/misc/lf/default.nix+4−4

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

33buildGoModule rec {

44 pname = "lf";

5− version = "22";

5+ version = "23";

77 src = fetchFromGitHub {

88 owner = "gokcehan";

99 repo = "lf";

1010 rev = "r${version}";

11− sha256 = "10zmac9xza2v7l13zkavmc34ppcpmb82v8dxvrv4ggm261ns1abr";

11+ sha256 = "sha256-rwKTumletIN4OzvA2VzYh++vioUftvtKYAZoaEL5P7U=";

1212 };

1313

14− vendorSha256 = "1yjsig2x6zrxdjnds6nqqq3r3g5lq8g9dvmz60nbifqhcx112bcw";

14+ vendorSha256 = "sha256-ujQh4aE++K/fn3PJqkAbTtwRyJPSI9TJQ1DvwLF9etU=";

1515

1616 nativeBuildInputs = [ installShellFiles ];

1717

@@ -35,6 +35,6 @@ buildGoModule rec {

3535 changelog = "https://github.com/gokcehan/lf/releases/tag/r${version}";

3636 license = licenses.mit;

3737 platforms = platforms.unix;

38− maintainers = with maintainers; [ ];

38+ maintainers = with maintainers; [ dotlambda ];

3939 };

4040}

pkgs/tools/misc/tfk8s/default.nix+13−5

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

33buildGoModule rec {

44 pname = "tfk8s";

5− version = "0.1.3";

5+ version = "0.1.4";

6+ tag = "v${version}";

78 src = fetchFromGitHub {

89 owner = "jrhouston";

910 repo = "tfk8s";

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

11− sha256 = "sha256-3iI5gYfpkxfVylBgniaMeQ73uR8dAjVrdg/eBLRxUR4";

11+ rev = tag;

12+ sha256 = "sha256-Ha/F8rCGZqFYqJzfemmKRyEBI5khaSIerJxvf2Pf2ao=";

1213 };

1314

1415 vendorSha256 = "sha256-wS5diDQFkt8IAp13d8Yeh8ihLvKWdR0Mbw0fMZpqqKE=";

@@ -18,12 +19,19 @@ buildGoModule rec {

1819 "-ldflags="

1920 "-s"

2021 "-w"

21− "-X main.toolVersion=${version}"

22+ "-X main.toolVersion=${tag}"

2223 "-X main.builtBy=nixpkgs"

2324 ];

2425

26+ doCheck = true;

27+

28+ doInstallCheck = true;

29+ installCheckPhase = ''

30+ $out/bin/tfk8s --version | grep ${tag} > /dev/null

31+ '';

32+

2533 meta = with lib; {

26− description = "An utility to convert Kubernetes YAML manifests to Terraform's HCL format.";

34+ description = "An utility to convert Kubernetes YAML manifests to Terraform's HCL format";

2735 license = licenses.mit;

2836 longDescription = ''

2937 tfk8s is a tool that makes it easier to work with the Terraform Kubernetes Provider.

pkgs/tools/package-management/libdnf/default.nix+2−2

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

44gcc9Stdenv.mkDerivation rec {

55 pname = "libdnf";

6− version = "0.62.0";

6+ version = "0.63.0";

88 src = fetchFromGitHub {

99 owner = "rpm-software-management";

1010 repo = pname;

1111 rev = version;

12− sha256 = "sha256-Se15VmBbzt/NASjrA25RdpHDVIG/GOSqn6ibpBe752g=";

12+ sha256 = "sha256-+D1KosfeoEzRgAE6WheO0Vo/1oq7+1tWPa7rRemyZYo=";

1313 };

1414

1515 nativeBuildInputs = [

pkgs/tools/package-management/reuse/default.nix+2−2

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

33python3Packages.buildPythonApplication rec {

44 pname = "reuse";

5− version = "0.12.1";

5+ version = "0.13.0";

77 src = fetchFromGitHub {

88 owner = "fsfe";

99 repo = "reuse-tool";

1010 rev = "v${version}";

11− sha256 = "0ql0krnz0fmq405r2qrm9ysm3cvmqfw14j06pny6na7qshibj78z";

11+ sha256 = "0didqsbvrn06aylp71jl3hqb4rd95d8s613xz6jw6mngyjqv0hq2";

1212 };

1313

1414 propagatedBuildInputs = with python3Packages; [

pkgs/tools/security/kubesec/default.nix+4−3

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

66buildGoModule rec {

77 pname = "kubesec";

8− version = "2.11.1";

8+ version = "2.11.2";

1010 src = fetchFromGitHub {

1111 owner = "controlplaneio";

1212 repo = pname;

1313 rev = "v${version}";

14− sha256 = "sha256-vT+SiSt9QoOkGbnPdKkzE8yehNJMa/3jYC+4h4QeNmw=";

14+ sha256 = "sha256-W9c3L8lYjF1W0kwSODhMldlqX1h+2mZIRtElZ20skn4=";

1515 };

1616

1717 vendorSha256 = "sha256-zfQu1EdwvR+LGmsbE8RA4pcOGgsukG1TMTCgPyNoVsc=";

1818

19− # Tests wants to download additional files

19+ # Tests wants to download the kubernetes schema for use with kubeval

2020 doCheck = false;

2121

2222 meta = with lib; {

2323 description = "Security risk analysis tool for Kubernetes resources";

2424 homepage = "https://github.com/controlplaneio/kubesec";

25+ changelog = "https://github.com/controlplaneio/kubesec/blob/v${version}/CHANGELOG.md";

2526 license = with licenses; [ asl20 ];

2627 maintainers = with maintainers; [ fab ];

2728 };

pkgs/top-level/all-packages.nix+11−3

@@ -946,9 +946,7 @@ in

946946 flavour = "git";

947947 };

948948

949− logseq = callPackage ../applications/misc/logseq {

950− electron = electron_12;

951− };

949+ logseq = callPackage ../applications/misc/logseq { };

952950

953951 lxterminal = callPackage ../applications/terminal-emulators/lxterminal { };

954952

@@ -13654,6 +13652,8 @@ in

1365413652

1365513653 litecli = callPackage ../development/tools/database/litecli {};

1365613654

13655+ litestream = callPackage ../development/tools/database/litestream {};

13656+

1365713657 lsof = callPackage ../development/tools/misc/lsof { };

1365813658

1365913659 ltrace = callPackage ../development/tools/misc/ltrace { };

@@ -15282,6 +15282,8 @@ in

1528215282

1528315283 qtstyleplugin-kvantum-qt4 = callPackage ../development/libraries/qtstyleplugin-kvantum-qt4 { };

1528415284

15285+ qxmpp = libsForQt5.callPackage ../development/libraries/qxmpp {};

15286+

1528515287 gnet = callPackage ../development/libraries/gnet { };

1528615288

1528715289 gnu-config = callPackage ../development/libraries/gnu-config { };

@@ -16217,6 +16219,8 @@ in

1621716219

1621816220 libsecret = callPackage ../development/libraries/libsecret { };

1621916221

16222+ libserdes = callPackage ../development/libraries/libserdes { };

16223+

1622016224 libserialport = callPackage ../development/libraries/libserialport { };

1622116225

1622216226 libsignal-protocol-c = callPackage ../development/libraries/libsignal-protocol-c { };

@@ -24770,6 +24774,8 @@ in

2477024774

2477124775 kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { };

2477224776

24777+ kaidan = libsForQt5.callPackage ../applications/networking/instant-messengers/kaidan { };

24778+

2477324779 kdeltachat = libsForQt5.callPackage ../applications/networking/instant-messengers/kdeltachat { };

2477424780

2477524781 kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { };

@@ -30629,6 +30635,8 @@ in

3062930635

3063030636 j2cli = with python3Packages; toPythonApplication j2cli;

3063130637

30638+ jquake = callPackage ../applications/misc/jquake { };

30639+

3063230640 jstest-gtk = callPackage ../tools/misc/jstest-gtk { };

3063330641

3063430642 keynav = callPackage ../tools/X11/keynav { };

pkgs/top-level/ocaml-packages.nix+2

@@ -1144,6 +1144,8 @@ let

11441144

11451145 reason = callPackage ../development/compilers/reason { };

11461146

1147+ reason-native = lib.recurseIntoAttrs (callPackage ../development/ocaml-modules/reason-native { });

1148+

11471149 rope = callPackage ../development/ocaml-modules/rope { };

11481150

11491151 rpclib = callPackage ../development/ocaml-modules/rpclib { };

pkgs/top-level/python-packages.nix+14

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

499499

500500 arabic-reshaper = callPackage ../development/python-modules/arabic-reshaper { };

501501

502+ arcam-fmj = callPackage ../development/python-modules/arcam-fmj { };

503+

502504 archinfo = callPackage ../development/python-modules/archinfo { };

503505

504506 area = callPackage ../development/python-modules/area { };

@@ -1055,6 +1057,8 @@ in {

10551057

10561058 billiard = callPackage ../development/python-modules/billiard { };

10571059

1060+ bimmer-connected = callPackage ../development/python-modules/bimmer-connected { };

1061+

10581062 binaryornot = callPackage ../development/python-modules/binaryornot { };

10591063

10601064 binho-host-adapter = callPackage ../development/python-modules/binho-host-adapter { };

@@ -1563,6 +1567,8 @@ in {

15631567

15641568 colorspacious = callPackage ../development/python-modules/colorspacious { };

15651569

1570+ colorthief = callPackage ../development/python-modules/colorthief { };

1571+

15661572 colour = callPackage ../development/python-modules/colour { };

15671573

15681574 commandparse = callPackage ../development/python-modules/commandparse { };

@@ -2866,6 +2872,8 @@ in {

28662872

28672873 gnureadline = callPackage ../development/python-modules/gnureadline { };

28682874

2875+ goalzero = callPackage ../development/python-modules/goalzero { };

2876+

28692877 goobook = callPackage ../development/python-modules/goobook { };

28702878

28712879 goocalendar = callPackage ../development/python-modules/goocalendar { };

@@ -3962,6 +3970,8 @@ in {

39623970

39633971 libpurecool = callPackage ../development/python-modules/libpurecool { };

39643972

3973+ libpyfoscam = callPackage ../development/python-modules/libpyfoscam { };

3974+

39653975 libredwg = toPythonModule (pkgs.libredwg.override {

39663976 enablePython = true;

39673977 inherit (self) python libxml2;

@@ -5222,6 +5232,10 @@ in {

52225232

52235233 pyatag = callPackage ../development/python-modules/pyatag { };

52245234

5235+ pycontrol4 = callPackage ../development/python-modules/pycontrol4 { };

5236+

5237+ pycoolmasternet-async = callPackage ../development/python-modules/pycoolmasternet-async { };

5238+

52255239 pyfireservicerota = callPackage ../development/python-modules/pyfireservicerota { };

52265240

52275241 pyflick = callPackage ../development/python-modules/pyflick { };