8a0e129 · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

Merge master into staging-next

commit8a0e129af2d0bef4c48df7155b00a39954f47390 authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> dateThu 6 Jan 2022, 06:01 (5 years ago) parent10ea3f9 ae35b93

34 files changed+355−254

compare with master

unifiedsplit

doc/languages-frameworks/go.section.md+1−2 pkgs/applications/audio/bucklespring/default.nix+3−3 pkgs/applications/audio/gnome-podcasts/default.nix+1 pkgs/applications/blockchains/dashpay/default.nix+1−1 pkgs/applications/blockchains/erigon.nix+2−2 pkgs/applications/misc/gpxsee/default.nix+2−2 pkgs/applications/misc/hugo/default.nix+2−2 pkgs/applications/misc/mob/default.nix+21−4 pkgs/applications/networking/mailreaders/aerc/default.nix+2−2 pkgs/data/icons/gnome-icon-theme/default.nix+1 pkgs/development/go-modules/generic/default.nix+7−6 pkgs/development/libraries/LASzip/LASzip2.nix+6−4 pkgs/development/libraries/graphene-hardened-malloc/default.nix+6−4 pkgs/development/libraries/grib-api/default.nix−71 pkgs/development/libraries/keybinder/default.nix+6−5 pkgs/development/libraries/libcangjie/default.nix+7−5 pkgs/development/libraries/libcec/default.nix+6−4 pkgs/development/libraries/libcrafter/default.nix+6−4 pkgs/development/python-modules/optax/default.nix+55 pkgs/development/tools/go-task/default.nix+3−3 pkgs/games/widelands/default.nix+9−1 pkgs/misc/vim-plugins/generated.nix+159−87 pkgs/misc/vim-plugins/vim-plugin-names+6 pkgs/os-specific/linux/kernel/hardened/patches.json+25−25 pkgs/servers/hydron/default.nix+2−2 pkgs/servers/livepeer/default.nix+2−2 pkgs/servers/nosql/rethinkdb/default.nix+3−3 pkgs/tools/package-management/nix-top/default.nix+2−2 pkgs/tools/security/terrascan/default.nix+3−3 pkgs/tools/system/gotop/default.nix+2−2 pkgs/tools/text/icdiff/default.nix+1−1 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix−2 pkgs/top-level/python-packages.nix+2

doc/languages-frameworks/go.section.md+1−2

@@ -12,8 +12,7 @@ The function `buildGoModule` builds Go programs managed with Go modules. It buil

1212In the following is an example expression using `buildGoModule`, the following arguments are of special significance to the function:

1313

1414- `vendorSha256`: is the hash of the output of the intermediate fetcher derivation. `vendorSha256` can also take `null` as an input. When `null` is used as a value, rather than fetching the dependencies and vendoring them, we use the vendoring included within the source repo. If you'd like to not have to update this field on dependency changes, run `go mod vendor` in your source repo and set `vendorSha256 = null;`

15−- `runVend`: runs the vend command to generate the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build.

16−- `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if any dependency has case-insensitive conflicts which will produce platform dependant `vendorSha256` checksums.

15+- `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build or if any dependency has case-insensitive conflicts which will produce platform dependant `vendorSha256` checksums.

1716

1817```nix

1918pet = buildGoModule rec {

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

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

1919in

2020stdenv.mkDerivation rec {

2121 pname = "bucklespring";

22− version = "1.5.0";

22+ version = "1.5.1";

2323

2424 src = fetchFromGitHub {

2525 owner = "zevv";

2626 repo = pname;

27− rev = version;

28− sha256 = "114dib4npb7r1z2zd1fwsx71xbf9r6psxqd7n7590cwz1w3r51mz";

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

28+ sha256 = "0prhqibivxzmz90k79zpwx3c97h8wa61rk5ihi9a5651mnc46mna";

2929 };

3030

3131 nativeBuildInputs = [ pkg-config makeWrapper ];

pkgs/applications/audio/gnome-podcasts/default.nix+1

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

7979 license = licenses.gpl3Plus;

8080 maintainers = teams.gnome.members;

8181 platforms = platforms.unix;

82+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gnome-podcasts.x86_64-darwin

8283 };

8384}

pkgs/applications/blockchains/dashpay/default.nix+1−1

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

1515 owner = "dashpay";

1616 repo= "dash";

1717 rev = "v${version}";

18− sha256 = "0l1gcj2xf2bal9ph9y11x8yd28fd25f55f48xbm45bfw3ij7nbaa";

18+ sha256 = "sha256-DMoiUX8Q0HcBHA6ZIN58uPsTnHjEJMi8eGG2DW8z17Q=";

1919 };

2020

2121 nativeBuildInputs = [ pkg-config autoreconfHook ];

pkgs/applications/blockchains/erigon.nix+2−2

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

1111 sha256 = "0l0w1badhvlh1rgqzvlmy5k7xhb1nf4f5dmhkl935a5ila08aak3";

1212 };

1313

14− vendorSha256 = "1hbfmq76zm50zwmlh3jblriwq2k1mp99d8lg8xzxwy56hncgfj8k";

15− runVend = true;

14+ vendorSha256 = "sha256-kA7pOSP4wkzKuFmUqhZmjXJ0ao64cIgZMrQtQ0bQ++U=";

15+ proxyVendor = true;

1616

1717 # Build errors in mdbx when format hardening is enabled:

1818 # cc1: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]

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

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

33stdenv.mkDerivation rec {

44 pname = "gpxsee";

5− version = "10.0";

5+ version = "10.1";

77 src = fetchFromGitHub {

88 owner = "tumic0";

99 repo = "GPXSee";

1010 rev = version;

11− sha256 = "sha256-XACexj91TLd/i2GoFr0zZ3Yqcg+KjKoWWPfCGsEIR04=";

11+ sha256 = "sha256-tU37dKBxzz+sxe4R7xbscpD28if8QOm6xpZEOdhK8lE=";

1212 };

1313

1414 patches = (substituteAll {

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

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

1111 sha256 = "sha256-6bqtw0hUrRBhTwEDURaTjgl3aVVCbfxjoPRfhSd3LK8=";

1212 };

1313

14− vendorSha256 = "sha256-CO+7WgoTsFCd9vkcALKcJP6Kj3CIWr5FF75/WgbK04g=";

14+ vendorSha256 = "sha256-M4pKAxNd8rqluVm+c+X+nxC/vcaVclebo9HP17yEpfo=";

1515

1616 doCheck = false;

1717

18− runVend = true;

18+ proxyVendor = true;

1919

2020 tags = [ "extended" ];

2121

pkgs/applications/misc/mob/default.nix+21−4

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

1−{ lib, buildGoPackage, fetchFromGitHub}:

1+{ lib

2+, buildGoPackage

3+, fetchFromGitHub

5+, withSpeech ? true

6+, makeWrapper

7+, espeak-ng

8+}:

310buildGoPackage rec {

411 pname = "mob";

512 version = "2.1.0";

6− goPackagePath = "github.com/remotemobprogramming/mob";

713

814 src = fetchFromGitHub {

915 rev = "v${version}";

@@ -12,11 +18,22 @@ buildGoPackage rec {

1218 sha256 = "sha256-K8ID8cetzCaMc/PVRNMyIhrshtEUiD6U/jI4e0TcOO4=";

1319 };

1420

21+ nativeBuildInputs = [

22+ makeWrapper

23+ ];

24+

25+ goPackagePath = "github.com/remotemobprogramming/mob";

26+

27+ preFixup = lib.optionalString withSpeech ''

28+ wrapProgram $out/bin/mob \

29+ --set MOB_VOICE_COMMAND "${lib.getBin espeak-ng}/bin/espeak"

30+ '';

31+

1532 meta = with lib; {

16− description = "Tool for swift git handover";

33+ description = "Tool for smooth git handover";

1734 homepage = "https://github.com/remotemobprogramming/mob";

1835 license = licenses.mit;

19− maintainers = [ maintainers.ericdallo ];

36+ maintainers = with maintainers; [ ericdallo ];

2037 platforms = platforms.linux ++ platforms.darwin;

2138 };

2239}

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

@@ -14,8 +14,8 @@ buildGoModule rec {

1414 sha256 = "sha256-RaHigTp1YGkjQ46gFLhKcJuajekcCgfozu0ndCNq5Ac=";

1515 };

1616

17− runVend = true;

18− vendorSha256 = "sha256-A2MZzTYzGuZLFENn9OBIBBreJan+b3RKOEu5bQcDwS8=";

17+ proxyVendor = true;

18+ vendorSha256 = "sha256-ZFs2CXmNZpGae7bD15yTh3w6b00C7AgOwGuz72d2wHs=";

1919

2020 doCheck = false;

2121

pkgs/data/icons/gnome-icon-theme/default.nix+1

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

2929 license = licenses.gpl3Plus;

3030 platforms = platforms.unix;

3131 maintainers = [ maintainers.romildo ];

32+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gnome-icon-theme.x86_64-darwin

3233 };

3334}

pkgs/development/go-modules/generic/default.nix+7−6

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

2626, vendorSha256

2727# Whether to delete the vendor folder supplied with the source.

2828, deleteVendor ? false

29−# Whether to run the vend tool to regenerate the vendor directory.

30−# This is useful if any dependency contain C files.

31−, runVend ? false

3229# Whether to fetch (go mod download) and proxy the vendor directory.

33−# This is useful if any dependency has case-insensitive conflicts

34−# which will produce platform dependant `vendorSha256` checksums.

30+# This is useful if your code depends on c code and go mod tidy does not

31+# include the needed sources to build or if any dependency has case-insensitive

32+# conflicts which will produce platform dependant `vendorSha256` checksums.

3533, proxyVendor ? false

3634

3735# We want parallel builds by default

@@ -43,6 +41,9 @@

4341

4442, meta ? {}

4543

44+# disabled

45+, runVend ? false

46+

4647# Not needed with buildGoModule

4748, goPackagePath ? ""

4849

@@ -54,7 +55,7 @@

5455

5556with builtins;

5657

57−assert (runVend == true && proxyVendor == true) -> throw "can't use `runVend` and `proxyVendor` together";

58+assert runVend != false -> throw "`runVend` has been replaced by `proxyVendor`";

5859

5960assert goPackagePath != "" -> throw "`goPackagePath` is not needed with `buildGoModule`";

6061

pkgs/development/libraries/LASzip/LASzip2.nix+6−4

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

1−{ lib, stdenv, fetchurl, cmake }:

1+{ lib, stdenv, fetchFromGitHub, cmake }:

33stdenv.mkDerivation rec {

44 version = "2.2.0";

55 pname = "LASzip";

7− src = fetchurl {

8− url = "https://github.com/LASzip/LASzip/archive/v${version}.tar.gz";

9− sha256 = "b8e8cc295f764b9d402bc587f3aac67c83ed8b39f1cb686b07c168579c61fbb2";

7+ src = fetchFromGitHub {

8+ owner = "LASzip";

9+ repo = "LASzip";

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

11+ sha256 = "sha256-TXzse4oLjNX5R2xDR721iV+gW/rP5z3Zciv4OgxfeqA=";

1012 };

1113

1214 nativeBuildInputs = [ cmake ];

pkgs/development/libraries/graphene-hardened-malloc/default.nix+6−4

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

1−{ lib, stdenv, fetchurl, python3, runCommand, makeWrapper, stress-ng }:

1+{ lib, stdenv, fetchFromGitHub, python3, runCommand, makeWrapper, stress-ng }:

33lib.fix (self: stdenv.mkDerivation rec {

44 pname = "graphene-hardened-malloc";

55 version = "8";

7− src = fetchurl {

8− url = "https://github.com/GrapheneOS/hardened_malloc/archive/${version}.tar.gz";

9− sha256 = "0lipyd2pb1bmghkyv9zmg25jwcglj7m281f01zlh3ghz3xlfh0ym";

7+ src = fetchFromGitHub {

8+ owner = "GrapheneOS";

9+ repo = "hardened_malloc";

10+ rev = version;

11+ sha256 = "sha256-+5kJb3hhuFTto7zsIymIXl3tpKUOm3v1DCY4EkAOCgo=";

1012 };

1113

1214 doCheck = true;

pkgs/development/libraries/grib-api/default.nixdeleted−71

@@ -1,71 +0,0 @@

1−{ fetchurl, fetchpatch, lib, stdenv,

2− cmake, netcdf, gfortran, libpng, openjpeg,

3− enablePython ? false, pythonPackages ? null }:

4−

5−stdenv.mkDerivation rec {

6− pname = "grib-api";

7− version = "1.28.0";

8−

9− src = fetchurl {

10− url = "https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-${version}-Source.tar.gz";

11− sha256 = "0qbj12ap7yy2rl1pq629chnss2jl73wxdj1lwzv0xp87r6z5qdfl";

12− };

13−

14− patches = [

15− (fetchpatch {

16− url = "https://salsa.debian.org/science-team/grib-api/raw/debian/1.28.0-2/debian/patches/openjpeg2.patch";

17− sha256 = "05faxh51vlidiazxq1ssd3k4cjivk1adyn30k94mxqa1xnb2r2pc";

18− })

19− ];

20−

21− preConfigure = ''

22− # Fix "no member named 'inmem_' in 'jas_image_t'"

23− substituteInPlace "src/grib_jasper_encoding.c" --replace "image.inmem_ = 1;" ""

24− '';

25−

26− nativeBuildInputs = [ cmake gfortran ];

27− buildInputs = [ netcdf

28− libpng

29− openjpeg

30− ] ++ lib.optionals enablePython [

31− pythonPackages.python

32− ];

33−

34− propagatedBuildInputs = lib.optionals enablePython [

35− pythonPackages.numpy

36− ];

37−

38− cmakeFlags = [ "-DENABLE_PYTHON=${if enablePython then "ON" else "OFF"}"

39− "-DENABLE_PNG=ON"

40− "-DENABLE_FORTRAN=ON"

41− "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/${openjpeg.incDir}"

42− ];

43−

44− doCheck = true;

45−

46− # Only do tests that don't require downloading 120MB of testdata

47− # We fix the darwin checkPhase, which searches for libgrib_api.dylib

48− # in /nix/store by setting DYLD_LIBRARY_PATH

49− checkPhase = lib.optionalString (stdenv.isDarwin) ''

50− substituteInPlace "tests/include.sh" --replace "set -ea" "set -ea; export DYLD_LIBRARY_PATH=$(pwd)/lib"

51− '' + ''

52− ctest -R "t_definitions|t_calendar|t_unit_tests" -VV

53− '';

54−

55−

56− meta = with lib; {

57− homepage = "https://software.ecmwf.int/wiki/display/GRIB/Home";

58− license = licenses.asl20;

59− platforms = with platforms; linux ++ darwin;

60− description = "ECMWF Library for the GRIB file format -- DEPRECATED";

61− longDescription = ''

62− The ECMWF GRIB API is an application program interface accessible from C,

63− FORTRAN and Python programs developed for encoding and decoding WMO FM-92

64− GRIB edition 1 and edition 2 messages.

65−

66− Please note: GRIB-API support is being discontinued at the end of 2018.

67− After which there will be no further releases. Please upgrade to ecCodes

68− '';

69− maintainers = with maintainers; [ knedlsepp ];

70− };

71−}

pkgs/development/libraries/keybinder/default.nix+6−5

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

1−{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config, gnome

1+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome

22, gtk-doc, gtk2, python2Packages, lua, gobject-introspection

33}:

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

88 pname = "keybinder";

99 version = "0.3.0";

1010

11− src = fetchurl {

12− name = "${pname}-${version}.tar.gz";

13− url = "https://github.com/engla/keybinder/archive/v${version}.tar.gz";

14− sha256 = "0kkplz5snycik5xknwq1s8rnmls3qsp32z09mdpmaacydcw7g3cf";

11+ src = fetchFromGitHub {

12+ owner = "engla";

13+ repo = "keybinder";

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

15+ sha256 = "sha256-q/+hqhvXIknT+/5oENcWSr1OuF00kaZlXFUP1fdCMlk=";

1516 };

1617

1718 nativeBuildInputs = [ pkg-config ];

pkgs/development/libraries/libcangjie/default.nix+7−5

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

1−{ lib, stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkg-config, sqlite }:

1+{ lib, stdenv, autoconf, automake, libtool, m4, fetchFromGitLab, bash, pkg-config, sqlite }:

33stdenv.mkDerivation rec {

44 pname = "libcangjie";

55 version = "1.4_rev_${rev}";

66 rev = "a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d";

8− src = fetchurl {

9− url = "https://github.com/Cangjians/libcangjie/archive/${rev}.tar.gz";

10− sha256 = "0i5svvcx099fc9hh5dvr3gpb1041v6vn5fnylxy82zjy239114lg";

8+ src = fetchFromGitLab {

9+ owner = "Cangjians";

10+ repo = "libcangjie";

11+ inherit rev;

12+ sha256 = "sha256-R7WqhxciaTxhTiwPp2EUNTOh477gi/Pj3VpMtat5qXw=";

1113 };

1214

1315 nativeBuildInputs = [ pkg-config ];

@@ -26,7 +28,7 @@ stdenv.mkDerivation rec {

2628 longDescription = ''

2729 libcangjie is a library implementing the Cangjie input method.

2830 '';

29− homepage = "http://cangjians.github.io/projects/libcangjie/";

31+ homepage = "https://gitlab.freedesktop.org/cangjie/libcangjie";

3032 license = lib.licenses.lgpl3Plus;

3133

3234 maintainers = [ lib.maintainers.linquize ];

pkgs/development/libraries/libcec/default.nix+6−4

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

1−{ lib, stdenv, fetchurl, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }:

1+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }:

33stdenv.mkDerivation rec {

44 pname = "libcec";

55 version = "6.0.2";

7− src = fetchurl {

8− url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz";

9− sha256 = "0xrkrcgfgr5r8r0854bw3i9jbq4jmf8nzc5vrrx2sxzvlkbrc1h9";

7+ src = fetchFromGitHub {

8+ owner = "Pulse-Eight";

9+ repo = "libcec";

10+ rev = "libcec-${version}";

11+ sha256 = "sha256-OWqCn7Z0KG8sLlfMWd0btJIFJs79ET3Y1AV/y/Kj2TU=";

1012 };

1113

1214 nativeBuildInputs = [ pkg-config cmake ];

pkgs/development/libraries/libcrafter/default.nix+6−4

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

1−{ lib, stdenv, fetchzip, autoconf, automake, libtool, libpcap }:

1+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, libpcap }:

33stdenv.mkDerivation rec {

44 pname = "libcrafter";

55 version = "1.0";

7− src = fetchzip {

8− url = "https://github.com/pellegre/libcrafter/archive/version-${version}.zip";

9− sha256 = "1d2vgxawdwk2zg3scxclxdby1rhghmivly8azdjja89kw7gls9xl";

7+ src = fetchFromGitHub {

8+ owner = "pellegre";

9+ repo = "libcrafter";

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

11+ sha256 = "sha256-tCdN3+EzISVl+wp5umOFD+bgV+uUdabH+2LyxlV/W7Q=";

1012 };

1113

1214 preConfigure = "cd libcrafter";

pkgs/development/python-modules/optax/default.nixnew file+55

@@ -0,0 +1,55 @@

1+{ absl-py

2+, buildPythonPackage

3+, chex

4+, dm-haiku

5+, fetchFromGitHub

6+, jaxlib

7+, lib

8+, numpy

9+, pytestCheckHook

10+}:

11+

12+buildPythonPackage rec {

13+ pname = "optax";

14+ # As of 2022-01-06, the latest stable version (0.1.0) has broken tests that are fixed

15+ # in https://github.com/deepmind/optax/commit/d6633365d84eb6f2c0df0c52b630481a349ce562

16+ version = "unstable-2022-01-05";

17+

18+ src = fetchFromGitHub {

19+ owner = "deepmind";

20+ repo = pname;

21+ rev = "5ec5541b3486224b22e950480ff639ceaf5098f7";

22+ sha256 = "1q8cxc42a5xais2ll1l238cnn3l7w28savhgiz0lg01ilz2ysbli";

23+ };

24+

25+ propagatedBuildInputs = [

26+ absl-py

27+ chex

28+ jaxlib

29+ numpy

30+ ];

31+

32+ checkInputs = [

33+ dm-haiku

34+ pytestCheckHook

35+ ];

36+

37+ pythonImportsCheck = [

38+ "optax"

39+ ];

40+

41+ disabledTestPaths = [

42+ # Requires `flax` which depends on `optax` creating circular dependency.

43+ "optax/_src/equivalence_test.py"

44+ # Require `tensorflow_datasets` which isn't packaged in `nixpkgs`.

45+ "examples/datasets_test.py"

46+ "examples/lookahead_mnist_test.py"

47+ ];

48+

49+ meta = with lib; {

50+ description = "Optax is a gradient processing and optimization library for JAX.";

51+ homepage = "https://github.com/deepmind/optax";

52+ license = licenses.asl20;

53+ maintainers = with maintainers; [ ndl ];

54+ };

55+}

pkgs/development/tools/go-task/default.nix+3−3

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

33buildGoModule rec {

44 pname = "go-task";

5− version = "3.9.2";

5+ version = "3.10.0";

77 src = fetchFromGitHub {

88 owner = pname;

99 repo = "task";

1010 rev = "v${version}";

11− sha256 = "sha256-nlIgX7TV3bWi8vaYQ9kXmNzGlVLgRUDNkNApwrAw3EQ=";

11+ sha256 = "sha256-E0wMFdLK8lA8oluFQuq7hPMWh4t6OsoJ14d7ErDjAdA=";

1212 };

1313

14− vendorSha256 = "sha256-Dmn3LJ+TBO/F3N5lgrNXXrFJ5KTp6r45ZwU11LxvQSg=";

14+ vendorSha256 = "sha256-ClMvbxDKwwoVUC9+AJPZfBxJ26KKuLueUn9Nz/gh4Fs=";

1515

1616 doCheck = false;

1717

pkgs/games/widelands/default.nix+9−1

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

11{ lib

22, stdenv

33, fetchFromGitHub

4+, fetchpatch

45, SDL2

56, SDL2_image

67, SDL2_mixer

@@ -32,7 +33,14 @@ stdenv.mkDerivation rec {

3233 sha256 = "sha256-gNumYoeKePaxiAzrqEPKibMxFwv9vyBrCSoua+MKhcM=";

3334 };

3435

35− patches = [ ./bincmake.patch ];

36+ patches = [

37+ ./bincmake.patch

38+ # fix for building with Boost 1.77, https://github.com/widelands/widelands/pull/5025

39+ (fetchpatch {

40+ url = "https://github.com/widelands/widelands/commit/33981fda8c319c9feafc958f5f0b1670c48666ef.patch";

41+ sha256 = "sha256-FjxxCTPpg/Zp01XpNfgRXMMLJBfxAptkLpsLmnFXm2Q=";

42+ })

43+ ];

3644

3745 postPatch = ''

3846 substituteInPlace xdg/org.widelands.Widelands.desktop \

pkgs/misc/vim-plugins/generated.nix+159−87

@@ -45,8 +45,8 @@ final: prev:

4545 src = fetchFromGitHub {

4646 owner = "stevearc";

4747 repo = "aerial.nvim";

48− rev = "351b9693f1e0af0b0bbb05a8aef294bce1365e3c";

49− sha256 = "0f7ni7y3l3w01jyhp35n023dc0213794ds79p2lmlsdqbqs3p03f";

48+ rev = "0f26a8d2c63c7050aea9b19982b5402595126bd7";

49+ sha256 = "118vv5g918r9zcbjrlm9df6q4vban8jkc9xa40bbfkghgccadbjf";

5050 };

5151 meta.homepage = "https://github.com/stevearc/aerial.nvim/";

5252 };

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

161161

162162 async-vim = buildVimPluginFrom2Nix {

163163 pname = "async.vim";

164− version = "2021-03-21";

164+ version = "2022-01-04";

165165 src = fetchFromGitHub {

166166 owner = "prabirshrestha";

167167 repo = "async.vim";

168− rev = "0fb846e1eb3c2bf04d52a57f41088afb3395212e";

169− sha256 = "1glzg0i53wkm383y1vbddbyp1ivlsx2hivjchiw60sr9gccn8f8l";

168+ rev = "f20569020d65bec3249222606c073c0943045b5e";

169+ sha256 = "0lff0v2vd06amcjirnpa4wc4l4nsbngcrdqcv34kszyqgzd7phka";

170170 };

171171 meta.homepage = "https://github.com/prabirshrestha/async.vim/";

172172 };

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

473473

474474 chadtree = buildVimPluginFrom2Nix {

475475 pname = "chadtree";

476− version = "2022-01-03";

476+ version = "2022-01-04";

477477 src = fetchFromGitHub {

478478 owner = "ms-jpq";

479479 repo = "chadtree";

480− rev = "cd5b7c77fb69b5ec7a2aa917234af17a4277db5e";

481− sha256 = "1api1vxlwlxw5j8m2hhkpiryr24hcx9lb0z64ajig04aak3pznk0";

480+ rev = "09fb16e9c07c45f05951d939bb8b89e2e31dcea1";

481+ sha256 = "0acsac6wmyxhcgwav7gzgcjabqi37c9gcxph6x87xw8cmlbbpx81";

482482 };

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

484484 };

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

581581

582582 cmp-buffer = buildVimPluginFrom2Nix {

583583 pname = "cmp-buffer";

584− version = "2021-12-24";

584+ version = "2022-01-04";

585585 src = fetchFromGitHub {

586586 owner = "hrsh7th";

587587 repo = "cmp-buffer";

588− rev = "a01cfeca70594f505b2f086501e90fb6c2f2aaaa";

589− sha256 = "0qsicv28kyg3rrj1b7g7x2dhhhrs9i577bnvv4972riii544wjra";

588+ rev = "f83773e2f433a923997c5faad7ea689ec24d1785";

589+ sha256 = "0z1c0x60hz3khgpp7nfj0i579sgi4vsnhhcqb02i7a8jx685qwrd";

590590 };

591591 meta.homepage = "https://github.com/hrsh7th/cmp-buffer/";

592592 };

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

11821182

11831183 crates-nvim = buildVimPluginFrom2Nix {

11841184 pname = "crates.nvim";

1185− version = "2022-01-01";

1185+ version = "2022-01-04";

11861186 src = fetchFromGitHub {

11871187 owner = "saecki";

11881188 repo = "crates.nvim";

1189− rev = "31a4bc8ae519020edf315f8d98380e7659c1d621";

1190− sha256 = "1hh942nczxgljy95c6788qmkqd9gql05fk9c3ddhbrci6mmjhwcj";

1189+ rev = "a43f8a467b091329ff59be52c06012a0c614fc9b";

1190+ sha256 = "059h4fxx92rv78i1gpvvsnydkbr0fr1np0b7vkanhbqm37xz1b09";

11911191 };

11921192 meta.homepage = "https://github.com/saecki/crates.nvim/";

11931193 };

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

20152015

20162016 friendly-snippets = buildVimPluginFrom2Nix {

20172017 pname = "friendly-snippets";

2018− version = "2022-01-02";

2018+ version = "2022-01-03";

20192019 src = fetchFromGitHub {

20202020 owner = "rafamadriz";

20212021 repo = "friendly-snippets";

2022− rev = "7ef21c9daa6f47ad0ce6907232c94bcb99f23a11";

2023− sha256 = "0g466ddc0jk9mrv7lq4dpxgc5cpqy89w1jx5l0x0c339sijacsgb";

2022+ rev = "9f04462bcabfd108341a6e47ed742b09a6a5b975";

2023+ sha256 = "0j8cb1k66x0xnqa9rf20lic9v3byw0r93kcznnjxv8arg82zpc2k";

20242024 };

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

20262026 };

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

20392039

20402040 FTerm-nvim = buildVimPluginFrom2Nix {

20412041 pname = "FTerm.nvim";

2042− version = "2021-11-13";

2042+ version = "2022-01-04";

20432043 src = fetchFromGitHub {

20442044 owner = "numToStr";

20452045 repo = "FTerm.nvim";

2046− rev = "0911ab93b488fdd8032e695ab56d14357e14e836";

2047− sha256 = "0pbfg66fd8ff1b2wshlb9c58sb8zq3ckm7yjg6vv43dk4kcnjf1i";

2046+ rev = "eabb65f23ba48ec9e8abb9a2514f99b77b3bc6f2";

2047+ sha256 = "0bk1lh9i584ysj5yvmb7945nkighrc8blw28y6npqaf6mvma31n6";

20482048 };

20492049 meta.homepage = "https://github.com/numToStr/FTerm.nvim/";

20502050 };

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

21592159

21602160 ghcid = buildVimPluginFrom2Nix {

21612161 pname = "ghcid";

2162− version = "2021-10-10";

2162+ version = "2022-01-03";

21632163 src = fetchFromGitHub {

21642164 owner = "ndmitchell";

21652165 repo = "ghcid";

2166− rev = "b18ad1643f753f39e924909ecd957cb6b5a5fa89";

2167− sha256 = "1swwz4kzc1d41nbvvar3a2c71xy524fsyf5kjyrbbivrghcifpl8";

2166+ rev = "dc20c97a8f9ee36cbcdcd824e3c42140059af759";

2167+ sha256 = "0in5hryli9iiww4wvakd3q82m65zwplahnqxxfyppjps2q534dkm";

21682168 };

21692169 meta.homepage = "https://github.com/ndmitchell/ghcid/";

21702170 };

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

21952195

21962196 git-blame-nvim = buildVimPluginFrom2Nix {

21972197 pname = "git-blame.nvim";

2198− version = "2021-06-14";

2198+ version = "2022-01-03";

21992199 src = fetchFromGitHub {

22002200 owner = "f-person";

22012201 repo = "git-blame.nvim";

2202− rev = "125f09f3e09091fa9cc6585156e199d08989dc0e";

2203− sha256 = "1d6al5yrwv0wfmy39k8ky5ha1x0a6mz6djscibwz13fvgqka2730";

2202+ rev = "f94cd83f7fd15805c3b145ff63fdb9390b18585a";

2203+ sha256 = "1qdb3xg7fmb5fid288h3jyaj2rl6vbcc8d7pn0gk5bshli02bp4q";

22042204 };

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

22062206 };

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

29522952

29532953 lean-nvim = buildVimPluginFrom2Nix {

29542954 pname = "lean.nvim";

2955− version = "2022-01-03";

2955+ version = "2022-01-04";

29562956 src = fetchFromGitHub {

29572957 owner = "Julian";

29582958 repo = "lean.nvim";

2959− rev = "1696419d2d8acc8f34ba9b81c5e91b8782369530";

2960− sha256 = "05a002zykm9xkqp5x6lpbwp46fyk7lz85fc2dnkq38hjyzp6h9sh";

2959+ rev = "a99fc6963510dd481953f71683e98a4559518825";

2960+ sha256 = "1826ixb15k9s0rqiw1ynhf6j6w9cxxciskvyiyp7wgd2i6rwf42g";

29612961 };

29622962 meta.homepage = "https://github.com/Julian/lean.nvim/";

29632963 };

@@ -3154,6 +3154,54 @@ final: prev:

31543154 meta.homepage = "https://github.com/tami5/lispdocs.nvim/";

31553155 };

31563156

3157+ litee-calltree-nvim = buildVimPluginFrom2Nix {

3158+ pname = "litee-calltree.nvim";

3159+ version = "2022-01-03";

3160+ src = fetchFromGitHub {

3161+ owner = "ldelossa";

3162+ repo = "litee-calltree.nvim";

3163+ rev = "518d9e9e82e8480a81cf3e76c46ba7880a0c0034";

3164+ sha256 = "0ai2pj4ggjcrl3z0azwrjashqazim51crzk1f5gsbpd4j1r572iv";

3165+ };

3166+ meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/";

3167+ };

3168+

3169+ litee-filetree-nvim = buildVimPluginFrom2Nix {

3170+ pname = "litee-filetree.nvim";

3171+ version = "2022-01-03";

3172+ src = fetchFromGitHub {

3173+ owner = "ldelossa";

3174+ repo = "litee-filetree.nvim";

3175+ rev = "fe7e87130ac73c60247c61d71a7479a696766c22";

3176+ sha256 = "0scak2xdcq0vxhb21d7sm59b3hhccwwkrn5wcl7cd0akxg5xpp3s";

3177+ };

3178+ meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/";

3179+ };

3180+

3181+ litee-symboltree-nvim = buildVimPluginFrom2Nix {

3182+ pname = "litee-symboltree.nvim";

3183+ version = "2022-01-03";

3184+ src = fetchFromGitHub {

3185+ owner = "ldelossa";

3186+ repo = "litee-symboltree.nvim";

3187+ rev = "1c857aa75a0f011fa62cfc8ccd11a3d4e14fc552";

3188+ sha256 = "19xl6yfnyc30mgqqg15mfawj1cw78h59amb32r7zhwxsh1p4qvsg";

3189+ };

3190+ meta.homepage = "https://github.com/ldelossa/litee-symboltree.nvim/";

3191+ };

3192+

3193+ litee-nvim = buildVimPluginFrom2Nix {

3194+ pname = "litee.nvim";

3195+ version = "2022-01-03";

3196+ src = fetchFromGitHub {

3197+ owner = "ldelossa";

3198+ repo = "litee.nvim";

3199+ rev = "db4bbde5f90c3a9ca82ffe5e5dca63ecf5a8bd7c";

3200+ sha256 = "0d5dlnxn0swrvj7i2kn6nxc8msl6z632ichabls53y1b3xps20jw";

3201+ };

3202+ meta.homepage = "https://github.com/ldelossa/litee.nvim/";

3203+ };

3204+

31573205 lsp-colors-nvim = buildVimPluginFrom2Nix {

31583206 pname = "lsp-colors.nvim";

31593207 version = "2021-10-22";

@@ -3204,12 +3252,12 @@ final: prev:

32043252

32053253 lsp_signature-nvim = buildVimPluginFrom2Nix {

32063254 pname = "lsp_signature.nvim";

3207− version = "2022-01-03";

3255+ version = "2022-01-04";

32083256 src = fetchFromGitHub {

32093257 owner = "ray-x";

32103258 repo = "lsp_signature.nvim";

3211− rev = "d15c7445dc896a146b670b6ceab4bb1619384062";

3212− sha256 = "0bb2hmfp43khn592zxddyvllim873phqzpma2q2hvk9hdl0hz1ry";

3259+ rev = "44a5bde409922a0019f3c25011be11fb20705f47";

3260+ sha256 = "0g93khmivnrr02avd3nb88hh8bcyj9y7gq5l8fgjjq2cppbw03a1";

32133261 };

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

32153263 };

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

32643312

32653313 lualine-nvim = buildVimPluginFrom2Nix {

32663314 pname = "lualine.nvim";

3267− version = "2022-01-02";

3315+ version = "2022-01-04";

32683316 src = fetchFromGitHub {

32693317 owner = "nvim-lualine";

32703318 repo = "lualine.nvim";

3271− rev = "b18b7ee8acf877a603c21b28b9a4d9c08bbd9594";

3272− sha256 = "0zp02m1xhqa5rbqp5wjfjaasmyd50w9782wm0k7lnyakf8akg8jn";

3319+ rev = "4b68b8dd2aa5bb74fe8cd058797322d81df1f455";

3320+ sha256 = "17csrd2hbqdrim9aq948zd5vy6babjh9c8z4zw2q8xskvkkbiww8";

32733321 };

32743322 meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/";

32753323 };

@@ -3412,8 +3460,8 @@ final: prev:

34123460 src = fetchFromGitHub {

34133461 owner = "jose-elias-alvarez";

34143462 repo = "minsnip.nvim";

3415− rev = "8edc84c4896e72a85a474930af82656773ac82b0";

3416− sha256 = "1m7w5xz5j0brqx7ravwqjnran9g2zr3nsckmgmpahva7287db9hz";

3463+ rev = "190eefab6335d8d803e49c14a15c9dd0a947f972";

3464+ sha256 = "083yskdn9jhzk1qpyhak4rdm5r0ryjr9swscxp77df6sfnbixvf5";

34173465 };

34183466 meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/";

34193467 };

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

38043852

38053853 neorg = buildVimPluginFrom2Nix {

38063854 pname = "neorg";

3807− version = "2022-01-02";

3855+ version = "2022-01-03";

38083856 src = fetchFromGitHub {

38093857 owner = "nvim-neorg";

38103858 repo = "neorg";

3811− rev = "36e4ba5b49d5e01b1910db8ebc7c1963e51600a4";

3812− sha256 = "0wgzhxrx034m2rn2sp7gs5bi6wwdmr73qddbn3fxfn69y8h1m41n";

3859+ rev = "ff085fbaf095ea07f5e35404747281ad3d40772e";

3860+ sha256 = "1l0lmhm4wdc5b30vbc4715gggm9xx6y5hkvzb1xrrvkx0dp6kj0c";

38133861 };

38143862 meta.homepage = "https://github.com/nvim-neorg/neorg/";

38153863 };

@@ -4032,12 +4080,12 @@ final: prev:

40324080

40334081 nnn-vim = buildVimPluginFrom2Nix {

40344082 pname = "nnn.vim";

4035− version = "2021-12-04";

4083+ version = "2022-01-03";

40364084 src = fetchFromGitHub {

40374085 owner = "mcchrish";

40384086 repo = "nnn.vim";

4039− rev = "32d106a121eb4c88a8f4d0c6d779065b731c9fcb";

4040− sha256 = "12n3i813019q4j1lhgkpigjbi6yjywhhdib0xhw9qsjw2s7nvpk8";

4087+ rev = "169951733371abd152d76d1ce65e2dd867156e2d";

4088+ sha256 = "15prh70imjikmgnk4b161phcfqqz8jfqdq3l3nzhz80b597d6sv5";

40414089 };

40424090 meta.homepage = "https://github.com/mcchrish/nnn.vim/";

40434091 };

@@ -4104,12 +4152,12 @@ final: prev:

41044152

41054153 null-ls-nvim = buildVimPluginFrom2Nix {

41064154 pname = "null-ls.nvim";

4107− version = "2022-01-03";

4155+ version = "2022-01-04";

41084156 src = fetchFromGitHub {

41094157 owner = "jose-elias-alvarez";

41104158 repo = "null-ls.nvim";

4111− rev = "5d37e35938862f1642ef94206bec9a6f184ec798";

4112− sha256 = "157246yhf7za5aw7v0g0wk6kbcdpz7bwngg45l7xxh0p4c57j0y2";

4159+ rev = "8c59fd5ec84e1c90c3982a40d699ebe62b243592";

4160+ sha256 = "0lix5ambsmldvajb5dcwcyb8cy2g6v1iq92dbw0v11l5wcddr75f";

41134161 };

41144162 meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";

41154163 };

@@ -4152,12 +4200,12 @@ final: prev:

41524200

41534201 nvim-autopairs = buildVimPluginFrom2Nix {

41544202 pname = "nvim-autopairs";

4155− version = "2021-12-26";

4203+ version = "2022-01-04";

41564204 src = fetchFromGitHub {

41574205 owner = "windwp";

41584206 repo = "nvim-autopairs";

4159− rev = "3909fc7912f4349ee8b8891056ad807abc7221d3";

4160− sha256 = "1awx0pzkgw1c07dghcfrspj4vl7s0rkb23jhz9sd0zi9cbrqczpc";

4207+ rev = "96858723f1cba6a3eb004373a20c315d90584ea6";

4208+ sha256 = "11zmf2dwd9fxgdargjbkh70d89ii7qf00mh3v8v8dm89fd6ap0xy";

41614209 };

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

41634211 };

@@ -4380,12 +4428,12 @@ final: prev:

43804428

43814429 nvim-highlite = buildVimPluginFrom2Nix {

43824430 pname = "nvim-highlite";

4383− version = "2021-11-30";

4431+ version = "2022-01-03";

43844432 src = fetchFromGitHub {

43854433 owner = "Iron-E";

43864434 repo = "nvim-highlite";

4387− rev = "639c167541202fcbf41ed5cec619ce0fcf1d5ab8";

4388− sha256 = "1dcwbzw6rfh5h2yxl17jy5szqp2fmjcss3sfcznis1ccdggh9wnr";

4435+ rev = "03f0100dd52125a968e3bda4dacc3ab2003049d9";

4436+ sha256 = "0wqlsys0z2hq9mlqb631v84fd35fznvkkq3nbzq6xyr3d8wmp0fk";

43894437 };

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

43914439 };

@@ -4476,12 +4524,12 @@ final: prev:

44764524

44774525 nvim-lspconfig = buildVimPluginFrom2Nix {

44784526 pname = "nvim-lspconfig";

4479− version = "2022-01-02";

4527+ version = "2022-01-04";

44804528 src = fetchFromGitHub {

44814529 owner = "neovim";

44824530 repo = "nvim-lspconfig";

4483− rev = "486d51cbf492ea769ff563f86bf84ae4a51ccb02";

4484− sha256 = "1zhfs2s5c63i3hvs4d558zxjd4ckr5811qhmrxwb6ry3lvp2dq4j";

4531+ rev = "1917a52a7ccb517f76d6a6e732fb349f381fc927";

4532+ sha256 = "0s4wcnn4d0wjr02307fbwz2f0yp77ibzadp4lcvsd7im9kxiczna";

44854533 };

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

44874535 };

@@ -4560,12 +4608,12 @@ final: prev:

45604608

45614609 nvim-scrollview = buildVimPluginFrom2Nix {

45624610 pname = "nvim-scrollview";

4563− version = "2021-12-16";

4611+ version = "2022-01-03";

45644612 src = fetchFromGitHub {

45654613 owner = "dstein64";

45664614 repo = "nvim-scrollview";

4567− rev = "5f35322499bc789b44d19f35ee4c23fbed5a3a89";

4568− sha256 = "1nc3czp7grb9db52d2cvj81pqipk0x4918560v11b9g2kmvp34g2";

4615+ rev = "4313cbb75a966aa461ef179fbcda23ba21d64c65";

4616+ sha256 = "15zwii6bwz488xwj9397fgbxv723vxvmqhkx3kfq412rlb5aadx5";

45694617 };

45704618 meta.homepage = "https://github.com/dstein64/nvim-scrollview/";

45714619 };

@@ -4620,12 +4668,12 @@ final: prev:

46204668

46214669 nvim-treesitter = buildVimPluginFrom2Nix {

46224670 pname = "nvim-treesitter";

4623− version = "2021-12-29";

4671+ version = "2022-01-04";

46244672 src = fetchFromGitHub {

46254673 owner = "nvim-treesitter";

46264674 repo = "nvim-treesitter";

4627− rev = "fa2a6b68aaa6df0187b5bbebe6cbadc120d4a65a";

4628− sha256 = "1yfvx0nmz76cl7d8zmzgmkpxkjn12ddk7sdglcqmvy32iil3bksw";

4675+ rev = "479fde3471ad6833d950abf645c0ebece15eaea4";

4676+ sha256 = "072l6m04z83rb9f6sp4rvziyk3i2r20i5vhn0c9djkdhy7x2bj9h";

46294677 };

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

46314679 };

@@ -4678,6 +4726,18 @@ final: prev:

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

46794727 };

46804728

4729+ nvim-ts-autotag = buildVimPluginFrom2Nix {

4730+ pname = "nvim-ts-autotag";

4731+ version = "2021-12-19";

4732+ src = fetchFromGitHub {

4733+ owner = "windwp";

4734+ repo = "nvim-ts-autotag";

4735+ rev = "0ceb4ef342bf1fdbb082ad4fa1fcfd0f864e1cba";

4736+ sha256 = "0bbjhjngn0wv6f28z437bx9743w366665ygz6pz81059whfp93g7";

4737+ };

4738+ meta.homepage = "https://github.com/windwp/nvim-ts-autotag/";

4739+ };

4740+

46814741 nvim-ts-context-commentstring = buildVimPluginFrom2Nix {

46824742 pname = "nvim-ts-context-commentstring";

46834743 version = "2021-12-13";

@@ -5354,12 +5414,12 @@ final: prev:

53545414

53555415 renamer-nvim = buildVimPluginFrom2Nix {

53565416 pname = "renamer.nvim";

5357− version = "2021-12-19";

5417+ version = "2022-01-03";

53585418 src = fetchFromGitHub {

53595419 owner = "filipdutescu";

53605420 repo = "renamer.nvim";

5361− rev = "814ddbb11602e3c8b2af166b4d1e029272ab796f";

5362− sha256 = "067mn0wzvin7zbbzd8svshi5ga38r5d7nw8kqbyn3aakggpnylm3";

5421+ rev = "6d4e3066bbf5725d15b082a7a188a3aca16ce217";

5422+ sha256 = "1yfkpjjkhkhkqf543is1y2r44kz9py20rl5j34lwd2zz8ldibmca";

53635423 };

53645424 meta.homepage = "https://github.com/filipdutescu/renamer.nvim/";

53655425 };

@@ -5390,12 +5450,12 @@ final: prev:

53905450

53915451 rnvimr = buildVimPluginFrom2Nix {

53925452 pname = "rnvimr";

5393− version = "2022-01-02";

5453+ version = "2022-01-04";

53945454 src = fetchFromGitHub {

53955455 owner = "kevinhwang91";

53965456 repo = "rnvimr";

5397− rev = "d91ea7e21a2e3e0c4ff58abcdee0a4804c15cdc6";

5398− sha256 = "1hlrny63nn9836w4g4ia4niygq8pwwv0g9hsway589xpgj0kgadz";

5457+ rev = "b876914f4c0fef926bed50876c3da16c15adc81c";

5458+ sha256 = "0n5y4ysm0inki1sxxa7w59b682xjy7ykflydiphwf5m1w0fhpkin";

53995459 };

54005460 meta.homepage = "https://github.com/kevinhwang91/rnvimr/";

54015461 };

@@ -5498,12 +5558,12 @@ final: prev:

54985558

54995559 SchemaStore-nvim = buildVimPluginFrom2Nix {

55005560 pname = "SchemaStore.nvim";

5501− version = "2022-01-01";

5561+ version = "2022-01-03";

55025562 src = fetchFromGitHub {

55035563 owner = "b0o";

55045564 repo = "SchemaStore.nvim";

5505− rev = "efa83a65c646ff7a1deda77aaae3703f5e0cba0d";

5506− sha256 = "1rla73samh16x6yvw3qd9s36vh400k3rz4gid550msvxym3inq0y";

5565+ rev = "8cec6ac01fbeba4efd91ab9f991bbd56fb5002a7";

5566+ sha256 = "069hn6px0a83bpj6332n9gwn82145d98pdvadhsnj89dkmf4gdcj";

55075567 };

55085568 meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";

55095569 };

@@ -5823,12 +5883,12 @@ final: prev:

58235883

58245884 splitjoin-vim = buildVimPluginFrom2Nix {

58255885 pname = "splitjoin.vim";

5826− version = "2021-11-03";

5886+ version = "2022-01-03";

58275887 src = fetchFromGitHub {

58285888 owner = "AndrewRadev";

58295889 repo = "splitjoin.vim";

5830− rev = "0f45bfd7d6a8acb7d6ac126001a27190851bf3f5";

5831− sha256 = "1a5y8qj8gyrmaxh4si3k30v19yh8chws4h9k41ra1jzslrilm9ai";

5890+ rev = "ed71635666356d9dc8950ecc177ed7eaa0d939ec";

5891+ sha256 = "1fjg1zxl4sbibr658962iqk0lgcrggxwffmscr5v4n3x41v0xnrd";

58325892 fetchSubmodules = true;

58335893 };

58345894 meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";

@@ -5942,6 +6002,18 @@ final: prev:

59426002 meta.homepage = "https://github.com/ervandew/supertab/";

59436003 };

59446004

6005+ surround-nvim = buildVimPluginFrom2Nix {

6006+ pname = "surround.nvim";

6007+ version = "2021-12-29";

6008+ src = fetchFromGitHub {

6009+ owner = "blackCauldron7";

6010+ repo = "surround.nvim";

6011+ rev = "81f997bd71590f21f717e24bae72edf8e8b7b0f6";

6012+ sha256 = "06mdbpka2z17hyi3p7b9ksyz79ppwybhr4h9829qba8xr2gpd465";

6013+ };

6014+ meta.homepage = "https://github.com/blackCauldron7/surround.nvim/";

6015+ };

6016+

59456017 sved = buildVimPluginFrom2Nix {

59466018 pname = "sved";

59476019 version = "2021-10-22";

@@ -6149,12 +6221,12 @@ final: prev:

61496221

61506222 telescope-coc-nvim = buildVimPluginFrom2Nix {

61516223 pname = "telescope-coc.nvim";

6152− version = "2021-12-23";

6224+ version = "2022-01-04";

61536225 src = fetchFromGitHub {

61546226 owner = "fannheyward";

61556227 repo = "telescope-coc.nvim";

6156− rev = "2617983a9f0f70b578bbd290f2502d1bc91219ff";

6157− sha256 = "0ycvhvvy954vhi5jidwz37xkmdk3i8cnwx7aasgmpkwrcgpaqq43";

6228+ rev = "5d806a0de91abfbdad967028627e8f300946f463";

6229+ sha256 = "0b2497s3zdan81fslxpxpcr495wcvj1kdi5dzwl13102gd2mqn59";

61586230 };

61596231 meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/";

61606232 };

@@ -7927,12 +7999,12 @@ final: prev:

79277999

79288000 vim-eunuch = buildVimPluginFrom2Nix {

79298001 pname = "vim-eunuch";

7930− version = "2021-10-01";

8002+ version = "2022-01-03";

79318003 src = fetchFromGitHub {

79328004 owner = "tpope";

79338005 repo = "vim-eunuch";

7934− rev = "7a48f9ff0ef5f21447b2354ee52dc18b5567e05c";

7935− sha256 = "1mwalnbp8pigpvai22zhzg52m25qbl7hl7r8vr8vhs277gc0lx8m";

8006+ rev = "7fb5aef524808d6ba67d6d986d15a2e291194edf";

8007+ sha256 = "1yil4g5wym2a41isb6cdqcmccwrggy255frwxlb3rvffnl9b22m7";

79368008 };

79378009 meta.homepage = "https://github.com/tpope/vim-eunuch/";

79388010 };

@@ -8985,12 +9057,12 @@ final: prev:

89859057

89869058 vim-lsp = buildVimPluginFrom2Nix {

89879059 pname = "vim-lsp";

8988− version = "2022-01-02";

9060+ version = "2022-01-04";

89899061 src = fetchFromGitHub {

89909062 owner = "prabirshrestha";

89919063 repo = "vim-lsp";

8992− rev = "420143420d929d6bc9e98102b5828e0bbc5c9052";

8993− sha256 = "0dkvcsd3jmkmg3by4jz1a5lj17blqm6zb1w7n9bccc2gy232sx6y";

9064+ rev = "40b155512b142f2111195d85d4c19de2c424a4f2";

9065+ sha256 = "1pxdc0f66hgikwnwddhlwriaribbsxddyki33a5pn7z2sbhd8c9g";

89949066 };

89959067 meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";

89969068 };

@@ -9434,8 +9506,8 @@ final: prev:

94349506 src = fetchFromGitHub {

94359507 owner = "jceb";

94369508 repo = "vim-orgmode";

9437− rev = "03561775e295d8546a95e04f9a2f1a246ad80354";

9438− sha256 = "1xn4k29s6psn0jbmbj1nymrkjky10ny9nylzpm5zz3rbad1c0k26";

9509+ rev = "7882e202a3115a07be5300fd596194c94d622911";

9510+ sha256 = "1idmlrgjvarsv620rkhpnknbqvrw372mjzxi3jrk3i2d6d9phsnb";

94399511 };

94409512 meta.homepage = "https://github.com/jceb/vim-orgmode/";

94419513 };

@@ -11184,12 +11256,12 @@ final: prev:

1118411256

1118511257 vimtex = buildVimPluginFrom2Nix {

1118611258 pname = "vimtex";

11187− version = "2022-01-02";

11259+ version = "2022-01-04";

1118811260 src = fetchFromGitHub {

1118911261 owner = "lervag";

1119011262 repo = "vimtex";

11191− rev = "84bc5aeb1d6c07f892b39ae99e356d7ab7012476";

11192− sha256 = "17k6dcycv2n0zklb23nx9bzr4cmxgp1np3py3ci4s6fznn64yymn";

11263+ rev = "d9fa252426343bd6f3e6cb134b41e674ad0e39d3";

11264+ sha256 = "190kpl2ng8i1fkw6pzgx32aw6c1zw8w10aikwvdrz8f7g691kf7f";

1119311265 };

1119411266 meta.homepage = "https://github.com/lervag/vimtex/";

1119511267 };

pkgs/misc/vim-plugins/vim-plugin-names+6

@@ -49,6 +49,7 @@ benizi/vim-automkdir

4949bhurlow/vim-parinfer

5050bitc/vim-hdevtools

5151bkad/camelcasemotion

52+blackCauldron7/surround.nvim

5253bling/vim-bufferline

5354blueballs-theme/blueballs-neovim

5455blueyed/vim-diminactive

@@ -388,6 +389,10 @@ lambdalisue/vim-gista

388389lambdalisue/vim-manpager

389390lambdalisue/vim-pager

390391latex-box-team/latex-box

392+ldelossa/litee-calltree.nvim

393+ldelossa/litee-filetree.nvim

394+ldelossa/litee-symboltree.nvim

395+ldelossa/litee.nvim

391396leafgarland/typescript-vim

392397leanprover/lean.vim

393398ledger/vim-ledger

@@ -932,6 +937,7 @@ wincent/command-t

932937wincent/ferret

933938wincent/terminus

934939windwp/nvim-autopairs

940+windwp/nvim-ts-autotag

935941winston0410/cmd-parser.nvim

936942winston0410/range-highlight.nvim

937943wlangstroth/vim-racket

pkgs/os-specific/linux/kernel/hardened/patches.json+25−25

@@ -2,51 +2,51 @@

22 "4.14": {

33 "patch": {

44 "extra": "-hardened1",

5− "name": "linux-hardened-4.14.258-hardened1.patch",

6− "sha256": "0rni42mbvyw0f9032i6bkgcwnzfw472vimd5l1q7rp52m63z6vbk",

7− "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.258-hardened1/linux-hardened-4.14.258-hardened1.patch"

5+ "name": "linux-hardened-4.14.260-hardened1.patch",

6+ "sha256": "13r6lx3rcbaz2wvhwa950gsjharzq1n61bl9l3nm8v66j7gab3l0",

7+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.260-hardened1/linux-hardened-4.14.260-hardened1.patch"

88 },

9− "sha256": "162bzhm0k8kipgk0ma745rjcl33rqhpwxdfdz3q6rkp48b82kbvi",

10− "version": "4.14.258"

9+ "sha256": "1bylxn6hsq17cann2w02ggz6xz3b3synrapcwlwfcfydf71hzj9f",

10+ "version": "4.14.260"

1111 },

1212 "4.19": {

1313 "patch": {

1414 "extra": "-hardened1",

15− "name": "linux-hardened-4.19.221-hardened1.patch",

16− "sha256": "0lw4lysiv5h1vlkwlz2z1kv78wsszj1xc383i2qkzfsb4l9vsm7h",

17− "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.221-hardened1/linux-hardened-4.19.221-hardened1.patch"

15+ "name": "linux-hardened-4.19.223-hardened1.patch",

16+ "sha256": "1jrg8fkb8kc3m1zcgyw99mnmgvyxi3yp33x9jh1s4babxcr7w4g3",

17+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.223-hardened1/linux-hardened-4.19.223-hardened1.patch"

1818 },

19− "sha256": "1yg1cibyn53gpjnxfgj2qxxi8k3l7gv1ri6kywvp6sk5bygx8jd3",

20− "version": "4.19.221"

19+ "sha256": "1cnjk49g8sxsbzk375ji47lnx36drqh1x2pbfiqdwgrbjcb043sz",

20+ "version": "4.19.223"

2121 },

2222 "5.10": {

2323 "patch": {

2424 "extra": "-hardened1",

25− "name": "linux-hardened-5.10.87-hardened1.patch",

26− "sha256": "1r1vyf9wy49s7pfskxlng17n0khi1dpxg5cm4yfnbbq0gdisnh1f",

27− "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.87-hardened1/linux-hardened-5.10.87-hardened1.patch"

25+ "name": "linux-hardened-5.10.89-hardened1.patch",

26+ "sha256": "0gpfyykm66h4hdazqw1xkg514cglin6zmd754xala924kj6x0k8b",

27+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.89-hardened1/linux-hardened-5.10.89-hardened1.patch"

2828 },

29− "sha256": "0jz6xhph7x0x11cjmypaw5gh8z4d53dcgx2gmg7k6d06ydq8n4h3",

30− "version": "5.10.87"

29+ "sha256": "0c5v8fsv9sazdmdw4m1canm54x2p8777yavxq2gcpw8q98d8n8cj",

30+ "version": "5.10.89"

3131 },

3232 "5.15": {

3333 "patch": {

3434 "extra": "-hardened1",

35− "name": "linux-hardened-5.15.10-hardened1.patch",

36− "sha256": "1fn37pg10w1m4cr4g0ibs5fvqs1yx3y776daxv836naffl1001fm",

37− "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.10-hardened1/linux-hardened-5.15.10-hardened1.patch"

35+ "name": "linux-hardened-5.15.12-hardened1.patch",

36+ "sha256": "1xxyh87pbk7961zc5554f3gwr65n5msaxyxbi1kpd4q19gcw86xz",

37+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.12-hardened1/linux-hardened-5.15.12-hardened1.patch"

3838 },

39− "sha256": "0jsv8lialjwp91qg9c9rh8rhn49a70ryyhzl19bxq3fhz1fwyks8",

40− "version": "5.15.10"

39+ "sha256": "182iwy2288layl2290cxla0k6y436lxlx43yaa8par325dviksbx",

40+ "version": "5.15.12"

4141 },

4242 "5.4": {

4343 "patch": {

4444 "extra": "-hardened1",

45− "name": "linux-hardened-5.4.167-hardened1.patch",

46− "sha256": "03mj8nncfpqf5j6l66239saxv251rh5infhl0jjyx1znhfzavg0p",

47− "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.167-hardened1/linux-hardened-5.4.167-hardened1.patch"

45+ "name": "linux-hardened-5.4.169-hardened1.patch",

46+ "sha256": "19mghwh66rmbjd7i0hxhysabarpz8l4wadw8schwc8q9kxy33py4",

47+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.169-hardened1/linux-hardened-5.4.169-hardened1.patch"

4848 },

49− "sha256": "19x5f3s5f4nqzjb61g22rs0hnmk43q4b7sm7mc4j1q3y44b33r5l",

50− "version": "5.4.167"

49+ "sha256": "068sw1p50vcygi422bfjpahf2fxy3ifyp4ljnkwxbbvibzcq4hsm",

50+ "version": "5.4.169"

5151 }

5252}

pkgs/servers/hydron/default.nix+2−2

@@ -13,8 +13,8 @@ buildGoModule rec {

1313

1414 nativeBuildInputs = [ pkg-config ];

1515

16− vendorSha256 = "1ngig5zw0gf1mkjjsfvvn09rncb36rg274cbi3glp8wzfcr8aip3";

17− runVend = true;

16+ vendorSha256 = "sha256-TxeHfO5IUVsKmKZ1e0/KXi+6dk2nn6AoNG0eB3jyGkY=";

17+ proxyVendor = true;

1818

1919 buildInputs = [ ffmpeg ];

2020

pkgs/servers/livepeer/default.nix+2−2

@@ -6,8 +6,8 @@ buildGoModule rec {

66 pname = "livepeer";

77 version = "0.5.20";

9− runVend = true;

10− vendorSha256 = "sha256-iFVScV3arPkBjMi8sCHIja4G2QeQDb2sgBrbTFyxKyw=";

9+ proxyVendor = true;

10+ vendorSha256 = "sha256-pyPxONcWniJoA0qYusHktF3/taYda2StaMiMhyRYEm4=";

1111

1212 src = fetchFromGitHub {

1313 owner = "livepeer";

pkgs/servers/nosql/rethinkdb/default.nix+3−3

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

11{ lib, stdenv, fetchurl, which, m4

2−, protobuf, boost, zlib, curl, openssl, icu, jemalloc, libtool

2+, protobuf, boost170, zlib, curl, openssl, icu, jemalloc, libtool

33, python2Packages, makeWrapper

44}:

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

3131

3232 makeFlags = [ "rethinkdb" ];

3333

34− buildInputs = [ protobuf boost zlib curl openssl icu ]

34+ buildInputs = [ protobuf boost170 zlib curl openssl icu ]

3535 ++ lib.optional (!stdenv.isDarwin) jemalloc

3636 ++ lib.optional stdenv.isDarwin libtool;

3737

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

5252 query language that supports really useful queries like table

5353 joins and group by, and is easy to setup and learn.

5454 '';

55− homepage = "http://www.rethinkdb.com";

55+ homepage = "https://rethinkdb.com";

5656 license = lib.licenses.asl20;

5757 platforms = lib.platforms.linux;

5858 maintainers = with lib.maintainers; [ thoughtpolice bluescreen303 ];

pkgs/tools/package-management/nix-top/default.nix+2−2

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

1616in

1717stdenv.mkDerivation rec {

1818 pname = "nix-top";

19− version = "0.2.0";

19+ version = "0.3.0";

2020

2121 src = fetchFromGitHub {

2222 owner = "samueldr";

2323 repo = "nix-top";

2424 rev = "v${version}";

25− sha256 = "0560a9g8n4p764r3va1nn95iv4bg71g8h0wws1af2p5g553j4zps";

25+ sha256 = "sha256-w/TKzbZmMt4CX2KnLwPvR1ydp5NNlp9nNx78jJvhp54=";

2626 };

2727

2828 nativeBuildInputs = [

pkgs/tools/security/terrascan/default.nix+3−3

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

66buildGoModule rec {

77 pname = "terrascan";

8− version = "1.12.0";

8+ version = "1.13.0";

1010 src = fetchFromGitHub {

1111 owner = "accurics";

1212 repo = pname;

1313 rev = "v${version}";

14− sha256 = "sha256-DYWp7D2CQxasEYkoCEa0KdFQDvo4rNgRcTKzxYLsYFg=";

14+ sha256 = "sha256-HV9WOJ8bWu8Uk1tXMZWqvo3ZvFiWLMGKmw6HzHBxSBY=";

1515 };

1616

17− vendorSha256 = "0vx406y3kj1qmgr1y9vg3rprwjpm5g8p9shmhq28gp7sxz3j82ry";

17+ vendorSha256 = "sha256-MB3/iIStqNBM9YnNaRpV4hbs1gZzWm+7B+qHHm0kOmU=";

1818

1919 # Tests want to download a vulnerable Terraform project

2020 doCheck = false;

pkgs/tools/system/gotop/default.nix+2−2

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

1111 sha256 = "15bsxaxqxp17wsr0p9fkpvgfyqnhhwm3j8jxkvcs4cdw73qaxdsy";

1212 };

1313

14− runVend = true;

15− vendorSha256 = "06hl1npwmy9dvpf4kljvw8lwwiigm52wf106lmf9k6k2gi5ikprz";

14+ proxyVendor = true;

15+ vendorSha256 = "sha256-c+9IZEKiW95JIh6krs9NhdBohUatTTEIYBU13kj9zB8=";

1616

1717 ldflags = [ "-s" "-w" "-X main.Version=v${version}" ];

1818

pkgs/tools/text/icdiff/default.nix+1−1

@@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {

2828 meta = with lib; {

2929 homepage = "https://www.jefftk.com/icdiff";

3030 description = "Side-by-side highlighted command line diffs";

31− maintainers = with maintainers; [ aneeshusa ];

31+ maintainers = with maintainers; [ ];

3232 license = licenses.psfl;

3333 };

3434}

pkgs/top-level/aliases.nix+1

@@ -349,6 +349,7 @@ mapAliases ({

349349 graalvm8 = throw "graalvm8-ce has been removed by upstream."; # added 2021-10-19

350350 graalvm8-ce = throw "graalvm8-ce has been removed by upstream."; # added 2021-10-19

351351 graalvm11 = graalvm11-ce;

352+ grib-api = throw "grib-api has been replaced by ecCodes => https://confluence.ecmwf.int/display/ECC/GRIB-API+migration"; # added 2022-01-05

352353 gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25

353354 gtk_doc = gtk-doc; # added 2018-02-25

354355 gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # added 2022-01-01

pkgs/top-level/all-packages.nix−2

@@ -16818,8 +16818,6 @@ with pkgs;

1681816818

1681916819 grab-site = callPackage ../tools/backup/grab-site { };

1682016820

16821− grib-api = callPackage ../development/libraries/grib-api { };

16822−

1682316821 grilo = callPackage ../development/libraries/grilo { };

1682416822

1682516823 grilo-plugins = callPackage ../development/libraries/grilo-plugins { };

pkgs/top-level/python-packages.nix+2

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

56005600

56015601 opt-einsum = callPackage ../development/python-modules/opt-einsum { };

56025602

5603+ optax = callPackage ../development/python-modules/optax { };

5604+

56035605 optuna = callPackage ../development/python-modules/optuna { };

56045606

56055607 opuslib = callPackage ../development/python-modules/opuslib { };