Merge master into staging-next
This commit is contained in:
commit
8a0e129af2
|
@ -12,8 +12,7 @@ The function `buildGoModule` builds Go programs managed with Go modules. It buil
|
|||
In the following is an example expression using `buildGoModule`, the following arguments are of special significance to the function:
|
||||
|
||||
- `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;`
|
||||
- `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.
|
||||
- `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.
|
||||
- `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.
|
||||
|
||||
```nix
|
||||
pet = buildGoModule rec {
|
||||
|
|
|
@ -19,13 +19,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bucklespring";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zevv";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "114dib4npb7r1z2zd1fwsx71xbf9r6psxqd7n7590cwz1w3r51mz";
|
||||
rev = "v${version}";
|
||||
sha256 = "0prhqibivxzmz90k79zpwx3c97h8wa61rk5ihi9a5651mnc46mna";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
|
|
@ -79,5 +79,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl3Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gnome-podcasts.x86_64-darwin
|
||||
};
|
||||
}
|
||||
|
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "dashpay";
|
||||
repo= "dash";
|
||||
rev = "v${version}";
|
||||
sha256 = "0l1gcj2xf2bal9ph9y11x8yd28fd25f55f48xbm45bfw3ij7nbaa";
|
||||
sha256 = "sha256-DMoiUX8Q0HcBHA6ZIN58uPsTnHjEJMi8eGG2DW8z17Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
|
|
|
@ -11,8 +11,8 @@ buildGoModule rec {
|
|||
sha256 = "0l0w1badhvlh1rgqzvlmy5k7xhb1nf4f5dmhkl935a5ila08aak3";
|
||||
};
|
||||
|
||||
vendorSha256 = "1hbfmq76zm50zwmlh3jblriwq2k1mp99d8lg8xzxwy56hncgfj8k";
|
||||
runVend = true;
|
||||
vendorSha256 = "sha256-kA7pOSP4wkzKuFmUqhZmjXJ0ao64cIgZMrQtQ0bQ++U=";
|
||||
proxyVendor = true;
|
||||
|
||||
# Build errors in mdbx when format hardening is enabled:
|
||||
# cc1: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gpxsee";
|
||||
version = "10.0";
|
||||
version = "10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tumic0";
|
||||
repo = "GPXSee";
|
||||
rev = version;
|
||||
sha256 = "sha256-XACexj91TLd/i2GoFr0zZ3Yqcg+KjKoWWPfCGsEIR04=";
|
||||
sha256 = "sha256-tU37dKBxzz+sxe4R7xbscpD28if8QOm6xpZEOdhK8lE=";
|
||||
};
|
||||
|
||||
patches = (substituteAll {
|
||||
|
|
|
@ -11,11 +11,11 @@ buildGoModule rec {
|
|||
sha256 = "sha256-6bqtw0hUrRBhTwEDURaTjgl3aVVCbfxjoPRfhSd3LK8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-CO+7WgoTsFCd9vkcALKcJP6Kj3CIWr5FF75/WgbK04g=";
|
||||
vendorSha256 = "sha256-M4pKAxNd8rqluVm+c+X+nxC/vcaVclebo9HP17yEpfo=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
runVend = true;
|
||||
proxyVendor = true;
|
||||
|
||||
tags = [ "extended" ];
|
||||
|
||||
|
|
|
@ -1,9 +1,15 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub}:
|
||||
{ lib
|
||||
, buildGoPackage
|
||||
, fetchFromGitHub
|
||||
|
||||
, withSpeech ? true
|
||||
, makeWrapper
|
||||
, espeak-ng
|
||||
}:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "mob";
|
||||
version = "2.1.0";
|
||||
goPackagePath = "github.com/remotemobprogramming/mob";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
|
@ -12,11 +18,22 @@ buildGoPackage rec {
|
|||
sha256 = "sha256-K8ID8cetzCaMc/PVRNMyIhrshtEUiD6U/jI4e0TcOO4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
goPackagePath = "github.com/remotemobprogramming/mob";
|
||||
|
||||
preFixup = lib.optionalString withSpeech ''
|
||||
wrapProgram $out/bin/mob \
|
||||
--set MOB_VOICE_COMMAND "${lib.getBin espeak-ng}/bin/espeak"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool for swift git handover";
|
||||
description = "Tool for smooth git handover";
|
||||
homepage = "https://github.com/remotemobprogramming/mob";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.ericdallo ];
|
||||
maintainers = with maintainers; [ ericdallo ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -14,8 +14,8 @@ buildGoModule rec {
|
|||
sha256 = "sha256-RaHigTp1YGkjQ46gFLhKcJuajekcCgfozu0ndCNq5Ac=";
|
||||
};
|
||||
|
||||
runVend = true;
|
||||
vendorSha256 = "sha256-A2MZzTYzGuZLFENn9OBIBBreJan+b3RKOEu5bQcDwS8=";
|
||||
proxyVendor = true;
|
||||
vendorSha256 = "sha256-ZFs2CXmNZpGae7bD15yTh3w6b00C7AgOwGuz72d2wHs=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gnome-icon-theme.x86_64-darwin
|
||||
};
|
||||
}
|
||||
|
|
|
@ -26,12 +26,10 @@
|
|||
, vendorSha256
|
||||
# Whether to delete the vendor folder supplied with the source.
|
||||
, deleteVendor ? false
|
||||
# Whether to run the vend tool to regenerate the vendor directory.
|
||||
# This is useful if any dependency contain C files.
|
||||
, runVend ? false
|
||||
# Whether to fetch (go mod download) and proxy the vendor directory.
|
||||
# This is useful if any dependency has case-insensitive conflicts
|
||||
# which will produce platform dependant `vendorSha256` checksums.
|
||||
# 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.
|
||||
, proxyVendor ? false
|
||||
|
||||
# We want parallel builds by default
|
||||
|
@ -43,6 +41,9 @@
|
|||
|
||||
, meta ? {}
|
||||
|
||||
# disabled
|
||||
, runVend ? false
|
||||
|
||||
# Not needed with buildGoModule
|
||||
, goPackagePath ? ""
|
||||
|
||||
|
@ -54,7 +55,7 @@
|
|||
|
||||
with builtins;
|
||||
|
||||
assert (runVend == true && proxyVendor == true) -> throw "can't use `runVend` and `proxyVendor` together";
|
||||
assert runVend != false -> throw "`runVend` has been replaced by `proxyVendor`";
|
||||
|
||||
assert goPackagePath != "" -> throw "`goPackagePath` is not needed with `buildGoModule`";
|
||||
|
||||
|
|
|
@ -1,12 +1,14 @@
|
|||
{ lib, stdenv, fetchurl, cmake }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.2.0";
|
||||
pname = "LASzip";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LASzip/LASzip/archive/v${version}.tar.gz";
|
||||
sha256 = "b8e8cc295f764b9d402bc587f3aac67c83ed8b39f1cb686b07c168579c61fbb2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "LASzip";
|
||||
repo = "LASzip";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TXzse4oLjNX5R2xDR721iV+gW/rP5z3Zciv4OgxfeqA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
@ -1,12 +1,14 @@
|
|||
{ lib, stdenv, fetchurl, python3, runCommand, makeWrapper, stress-ng }:
|
||||
{ lib, stdenv, fetchFromGitHub, python3, runCommand, makeWrapper, stress-ng }:
|
||||
|
||||
lib.fix (self: stdenv.mkDerivation rec {
|
||||
pname = "graphene-hardened-malloc";
|
||||
version = "8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/GrapheneOS/hardened_malloc/archive/${version}.tar.gz";
|
||||
sha256 = "0lipyd2pb1bmghkyv9zmg25jwcglj7m281f01zlh3ghz3xlfh0ym";
|
||||
src = fetchFromGitHub {
|
||||
owner = "GrapheneOS";
|
||||
repo = "hardened_malloc";
|
||||
rev = version;
|
||||
sha256 = "sha256-+5kJb3hhuFTto7zsIymIXl3tpKUOm3v1DCY4EkAOCgo=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
@ -1,71 +0,0 @@
|
|||
{ fetchurl, fetchpatch, lib, stdenv,
|
||||
cmake, netcdf, gfortran, libpng, openjpeg,
|
||||
enablePython ? false, pythonPackages ? null }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grib-api";
|
||||
version = "1.28.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-${version}-Source.tar.gz";
|
||||
sha256 = "0qbj12ap7yy2rl1pq629chnss2jl73wxdj1lwzv0xp87r6z5qdfl";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/science-team/grib-api/raw/debian/1.28.0-2/debian/patches/openjpeg2.patch";
|
||||
sha256 = "05faxh51vlidiazxq1ssd3k4cjivk1adyn30k94mxqa1xnb2r2pc";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
# Fix "no member named 'inmem_' in 'jas_image_t'"
|
||||
substituteInPlace "src/grib_jasper_encoding.c" --replace "image.inmem_ = 1;" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake gfortran ];
|
||||
buildInputs = [ netcdf
|
||||
libpng
|
||||
openjpeg
|
||||
] ++ lib.optionals enablePython [
|
||||
pythonPackages.python
|
||||
];
|
||||
|
||||
propagatedBuildInputs = lib.optionals enablePython [
|
||||
pythonPackages.numpy
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DENABLE_PYTHON=${if enablePython then "ON" else "OFF"}"
|
||||
"-DENABLE_PNG=ON"
|
||||
"-DENABLE_FORTRAN=ON"
|
||||
"-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/${openjpeg.incDir}"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# Only do tests that don't require downloading 120MB of testdata
|
||||
# We fix the darwin checkPhase, which searches for libgrib_api.dylib
|
||||
# in /nix/store by setting DYLD_LIBRARY_PATH
|
||||
checkPhase = lib.optionalString (stdenv.isDarwin) ''
|
||||
substituteInPlace "tests/include.sh" --replace "set -ea" "set -ea; export DYLD_LIBRARY_PATH=$(pwd)/lib"
|
||||
'' + ''
|
||||
ctest -R "t_definitions|t_calendar|t_unit_tests" -VV
|
||||
'';
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://software.ecmwf.int/wiki/display/GRIB/Home";
|
||||
license = licenses.asl20;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
description = "ECMWF Library for the GRIB file format -- DEPRECATED";
|
||||
longDescription = ''
|
||||
The ECMWF GRIB API is an application program interface accessible from C,
|
||||
FORTRAN and Python programs developed for encoding and decoding WMO FM-92
|
||||
GRIB edition 1 and edition 2 messages.
|
||||
|
||||
Please note: GRIB-API support is being discontinued at the end of 2018.
|
||||
After which there will be no further releases. Please upgrade to ecCodes
|
||||
'';
|
||||
maintainers = with maintainers; [ knedlsepp ];
|
||||
};
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config, gnome
|
||||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome
|
||||
, gtk-doc, gtk2, python2Packages, lua, gobject-introspection
|
||||
}:
|
||||
|
||||
|
@ -8,10 +8,11 @@ in stdenv.mkDerivation rec {
|
|||
pname = "keybinder";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
name = "${pname}-${version}.tar.gz";
|
||||
url = "https://github.com/engla/keybinder/archive/v${version}.tar.gz";
|
||||
sha256 = "0kkplz5snycik5xknwq1s8rnmls3qsp32z09mdpmaacydcw7g3cf";
|
||||
src = fetchFromGitHub {
|
||||
owner = "engla";
|
||||
repo = "keybinder";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-q/+hqhvXIknT+/5oENcWSr1OuF00kaZlXFUP1fdCMlk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
@ -1,13 +1,15 @@
|
|||
{ lib, stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkg-config, sqlite }:
|
||||
{ lib, stdenv, autoconf, automake, libtool, m4, fetchFromGitLab, bash, pkg-config, sqlite }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcangjie";
|
||||
version = "1.4_rev_${rev}";
|
||||
rev = "a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Cangjians/libcangjie/archive/${rev}.tar.gz";
|
||||
sha256 = "0i5svvcx099fc9hh5dvr3gpb1041v6vn5fnylxy82zjy239114lg";
|
||||
src = fetchFromGitLab {
|
||||
owner = "Cangjians";
|
||||
repo = "libcangjie";
|
||||
inherit rev;
|
||||
sha256 = "sha256-R7WqhxciaTxhTiwPp2EUNTOh477gi/Pj3VpMtat5qXw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
@ -26,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
longDescription = ''
|
||||
libcangjie is a library implementing the Cangjie input method.
|
||||
'';
|
||||
homepage = "http://cangjians.github.io/projects/libcangjie/";
|
||||
homepage = "https://gitlab.freedesktop.org/cangjie/libcangjie";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
|
||||
maintainers = [ lib.maintainers.linquize ];
|
||||
|
|
|
@ -1,12 +1,14 @@
|
|||
{ lib, stdenv, fetchurl, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcec";
|
||||
version = "6.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz";
|
||||
sha256 = "0xrkrcgfgr5r8r0854bw3i9jbq4jmf8nzc5vrrx2sxzvlkbrc1h9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Pulse-Eight";
|
||||
repo = "libcec";
|
||||
rev = "libcec-${version}";
|
||||
sha256 = "sha256-OWqCn7Z0KG8sLlfMWd0btJIFJs79ET3Y1AV/y/Kj2TU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
|
|
|
@ -1,12 +1,14 @@
|
|||
{ lib, stdenv, fetchzip, autoconf, automake, libtool, libpcap }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, libpcap }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcrafter";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/pellegre/libcrafter/archive/version-${version}.zip";
|
||||
sha256 = "1d2vgxawdwk2zg3scxclxdby1rhghmivly8azdjja89kw7gls9xl";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pellegre";
|
||||
repo = "libcrafter";
|
||||
rev = "version-${version}";
|
||||
sha256 = "sha256-tCdN3+EzISVl+wp5umOFD+bgV+uUdabH+2LyxlV/W7Q=";
|
||||
};
|
||||
|
||||
preConfigure = "cd libcrafter";
|
||||
|
|
55
pkgs/development/python-modules/optax/default.nix
Normal file
55
pkgs/development/python-modules/optax/default.nix
Normal file
|
@ -0,0 +1,55 @@
|
|||
{ absl-py
|
||||
, buildPythonPackage
|
||||
, chex
|
||||
, dm-haiku
|
||||
, fetchFromGitHub
|
||||
, jaxlib
|
||||
, lib
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "optax";
|
||||
# As of 2022-01-06, the latest stable version (0.1.0) has broken tests that are fixed
|
||||
# in https://github.com/deepmind/optax/commit/d6633365d84eb6f2c0df0c52b630481a349ce562
|
||||
version = "unstable-2022-01-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deepmind";
|
||||
repo = pname;
|
||||
rev = "5ec5541b3486224b22e950480ff639ceaf5098f7";
|
||||
sha256 = "1q8cxc42a5xais2ll1l238cnn3l7w28savhgiz0lg01ilz2ysbli";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
absl-py
|
||||
chex
|
||||
jaxlib
|
||||
numpy
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
dm-haiku
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"optax"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Requires `flax` which depends on `optax` creating circular dependency.
|
||||
"optax/_src/equivalence_test.py"
|
||||
# Require `tensorflow_datasets` which isn't packaged in `nixpkgs`.
|
||||
"examples/datasets_test.py"
|
||||
"examples/lookahead_mnist_test.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Optax is a gradient processing and optimization library for JAX.";
|
||||
homepage = "https://github.com/deepmind/optax";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ndl ];
|
||||
};
|
||||
}
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "go-task";
|
||||
version = "3.9.2";
|
||||
version = "3.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "task";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nlIgX7TV3bWi8vaYQ9kXmNzGlVLgRUDNkNApwrAw3EQ=";
|
||||
sha256 = "sha256-E0wMFdLK8lA8oluFQuq7hPMWh4t6OsoJ14d7ErDjAdA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Dmn3LJ+TBO/F3N5lgrNXXrFJ5KTp6r45ZwU11LxvQSg=";
|
||||
vendorSha256 = "sha256-ClMvbxDKwwoVUC9+AJPZfBxJ26KKuLueUn9Nz/gh4Fs=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, SDL2
|
||||
, SDL2_image
|
||||
, SDL2_mixer
|
||||
|
@ -32,7 +33,14 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-gNumYoeKePaxiAzrqEPKibMxFwv9vyBrCSoua+MKhcM=";
|
||||
};
|
||||
|
||||
patches = [ ./bincmake.patch ];
|
||||
patches = [
|
||||
./bincmake.patch
|
||||
# fix for building with Boost 1.77, https://github.com/widelands/widelands/pull/5025
|
||||
(fetchpatch {
|
||||
url = "https://github.com/widelands/widelands/commit/33981fda8c319c9feafc958f5f0b1670c48666ef.patch";
|
||||
sha256 = "sha256-FjxxCTPpg/Zp01XpNfgRXMMLJBfxAptkLpsLmnFXm2Q=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace xdg/org.widelands.Widelands.desktop \
|
||||
|
|
|
@ -45,8 +45,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "stevearc";
|
||||
repo = "aerial.nvim";
|
||||
rev = "351b9693f1e0af0b0bbb05a8aef294bce1365e3c";
|
||||
sha256 = "0f7ni7y3l3w01jyhp35n023dc0213794ds79p2lmlsdqbqs3p03f";
|
||||
rev = "0f26a8d2c63c7050aea9b19982b5402595126bd7";
|
||||
sha256 = "118vv5g918r9zcbjrlm9df6q4vban8jkc9xa40bbfkghgccadbjf";
|
||||
};
|
||||
meta.homepage = "https://github.com/stevearc/aerial.nvim/";
|
||||
};
|
||||
|
@ -161,12 +161,12 @@ final: prev:
|
|||
|
||||
async-vim = buildVimPluginFrom2Nix {
|
||||
pname = "async.vim";
|
||||
version = "2021-03-21";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "prabirshrestha";
|
||||
repo = "async.vim";
|
||||
rev = "0fb846e1eb3c2bf04d52a57f41088afb3395212e";
|
||||
sha256 = "1glzg0i53wkm383y1vbddbyp1ivlsx2hivjchiw60sr9gccn8f8l";
|
||||
rev = "f20569020d65bec3249222606c073c0943045b5e";
|
||||
sha256 = "0lff0v2vd06amcjirnpa4wc4l4nsbngcrdqcv34kszyqgzd7phka";
|
||||
};
|
||||
meta.homepage = "https://github.com/prabirshrestha/async.vim/";
|
||||
};
|
||||
|
@ -473,12 +473,12 @@ final: prev:
|
|||
|
||||
chadtree = buildVimPluginFrom2Nix {
|
||||
pname = "chadtree";
|
||||
version = "2022-01-03";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "chadtree";
|
||||
rev = "cd5b7c77fb69b5ec7a2aa917234af17a4277db5e";
|
||||
sha256 = "1api1vxlwlxw5j8m2hhkpiryr24hcx9lb0z64ajig04aak3pznk0";
|
||||
rev = "09fb16e9c07c45f05951d939bb8b89e2e31dcea1";
|
||||
sha256 = "0acsac6wmyxhcgwav7gzgcjabqi37c9gcxph6x87xw8cmlbbpx81";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||
};
|
||||
|
@ -581,12 +581,12 @@ final: prev:
|
|||
|
||||
cmp-buffer = buildVimPluginFrom2Nix {
|
||||
pname = "cmp-buffer";
|
||||
version = "2021-12-24";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "cmp-buffer";
|
||||
rev = "a01cfeca70594f505b2f086501e90fb6c2f2aaaa";
|
||||
sha256 = "0qsicv28kyg3rrj1b7g7x2dhhhrs9i577bnvv4972riii544wjra";
|
||||
rev = "f83773e2f433a923997c5faad7ea689ec24d1785";
|
||||
sha256 = "0z1c0x60hz3khgpp7nfj0i579sgi4vsnhhcqb02i7a8jx685qwrd";
|
||||
};
|
||||
meta.homepage = "https://github.com/hrsh7th/cmp-buffer/";
|
||||
};
|
||||
|
@ -1182,12 +1182,12 @@ final: prev:
|
|||
|
||||
crates-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "crates.nvim";
|
||||
version = "2022-01-01";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "saecki";
|
||||
repo = "crates.nvim";
|
||||
rev = "31a4bc8ae519020edf315f8d98380e7659c1d621";
|
||||
sha256 = "1hh942nczxgljy95c6788qmkqd9gql05fk9c3ddhbrci6mmjhwcj";
|
||||
rev = "a43f8a467b091329ff59be52c06012a0c614fc9b";
|
||||
sha256 = "059h4fxx92rv78i1gpvvsnydkbr0fr1np0b7vkanhbqm37xz1b09";
|
||||
};
|
||||
meta.homepage = "https://github.com/saecki/crates.nvim/";
|
||||
};
|
||||
|
@ -2015,12 +2015,12 @@ final: prev:
|
|||
|
||||
friendly-snippets = buildVimPluginFrom2Nix {
|
||||
pname = "friendly-snippets";
|
||||
version = "2022-01-02";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rafamadriz";
|
||||
repo = "friendly-snippets";
|
||||
rev = "7ef21c9daa6f47ad0ce6907232c94bcb99f23a11";
|
||||
sha256 = "0g466ddc0jk9mrv7lq4dpxgc5cpqy89w1jx5l0x0c339sijacsgb";
|
||||
rev = "9f04462bcabfd108341a6e47ed742b09a6a5b975";
|
||||
sha256 = "0j8cb1k66x0xnqa9rf20lic9v3byw0r93kcznnjxv8arg82zpc2k";
|
||||
};
|
||||
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
|
||||
};
|
||||
|
@ -2039,12 +2039,12 @@ final: prev:
|
|||
|
||||
FTerm-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "FTerm.nvim";
|
||||
version = "2021-11-13";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "numToStr";
|
||||
repo = "FTerm.nvim";
|
||||
rev = "0911ab93b488fdd8032e695ab56d14357e14e836";
|
||||
sha256 = "0pbfg66fd8ff1b2wshlb9c58sb8zq3ckm7yjg6vv43dk4kcnjf1i";
|
||||
rev = "eabb65f23ba48ec9e8abb9a2514f99b77b3bc6f2";
|
||||
sha256 = "0bk1lh9i584ysj5yvmb7945nkighrc8blw28y6npqaf6mvma31n6";
|
||||
};
|
||||
meta.homepage = "https://github.com/numToStr/FTerm.nvim/";
|
||||
};
|
||||
|
@ -2159,12 +2159,12 @@ final: prev:
|
|||
|
||||
ghcid = buildVimPluginFrom2Nix {
|
||||
pname = "ghcid";
|
||||
version = "2021-10-10";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ndmitchell";
|
||||
repo = "ghcid";
|
||||
rev = "b18ad1643f753f39e924909ecd957cb6b5a5fa89";
|
||||
sha256 = "1swwz4kzc1d41nbvvar3a2c71xy524fsyf5kjyrbbivrghcifpl8";
|
||||
rev = "dc20c97a8f9ee36cbcdcd824e3c42140059af759";
|
||||
sha256 = "0in5hryli9iiww4wvakd3q82m65zwplahnqxxfyppjps2q534dkm";
|
||||
};
|
||||
meta.homepage = "https://github.com/ndmitchell/ghcid/";
|
||||
};
|
||||
|
@ -2195,12 +2195,12 @@ final: prev:
|
|||
|
||||
git-blame-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "git-blame.nvim";
|
||||
version = "2021-06-14";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "f-person";
|
||||
repo = "git-blame.nvim";
|
||||
rev = "125f09f3e09091fa9cc6585156e199d08989dc0e";
|
||||
sha256 = "1d6al5yrwv0wfmy39k8ky5ha1x0a6mz6djscibwz13fvgqka2730";
|
||||
rev = "f94cd83f7fd15805c3b145ff63fdb9390b18585a";
|
||||
sha256 = "1qdb3xg7fmb5fid288h3jyaj2rl6vbcc8d7pn0gk5bshli02bp4q";
|
||||
};
|
||||
meta.homepage = "https://github.com/f-person/git-blame.nvim/";
|
||||
};
|
||||
|
@ -2952,12 +2952,12 @@ final: prev:
|
|||
|
||||
lean-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lean.nvim";
|
||||
version = "2022-01-03";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Julian";
|
||||
repo = "lean.nvim";
|
||||
rev = "1696419d2d8acc8f34ba9b81c5e91b8782369530";
|
||||
sha256 = "05a002zykm9xkqp5x6lpbwp46fyk7lz85fc2dnkq38hjyzp6h9sh";
|
||||
rev = "a99fc6963510dd481953f71683e98a4559518825";
|
||||
sha256 = "1826ixb15k9s0rqiw1ynhf6j6w9cxxciskvyiyp7wgd2i6rwf42g";
|
||||
};
|
||||
meta.homepage = "https://github.com/Julian/lean.nvim/";
|
||||
};
|
||||
|
@ -3154,6 +3154,54 @@ final: prev:
|
|||
meta.homepage = "https://github.com/tami5/lispdocs.nvim/";
|
||||
};
|
||||
|
||||
litee-calltree-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "litee-calltree.nvim";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ldelossa";
|
||||
repo = "litee-calltree.nvim";
|
||||
rev = "518d9e9e82e8480a81cf3e76c46ba7880a0c0034";
|
||||
sha256 = "0ai2pj4ggjcrl3z0azwrjashqazim51crzk1f5gsbpd4j1r572iv";
|
||||
};
|
||||
meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/";
|
||||
};
|
||||
|
||||
litee-filetree-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "litee-filetree.nvim";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ldelossa";
|
||||
repo = "litee-filetree.nvim";
|
||||
rev = "fe7e87130ac73c60247c61d71a7479a696766c22";
|
||||
sha256 = "0scak2xdcq0vxhb21d7sm59b3hhccwwkrn5wcl7cd0akxg5xpp3s";
|
||||
};
|
||||
meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/";
|
||||
};
|
||||
|
||||
litee-symboltree-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "litee-symboltree.nvim";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ldelossa";
|
||||
repo = "litee-symboltree.nvim";
|
||||
rev = "1c857aa75a0f011fa62cfc8ccd11a3d4e14fc552";
|
||||
sha256 = "19xl6yfnyc30mgqqg15mfawj1cw78h59amb32r7zhwxsh1p4qvsg";
|
||||
};
|
||||
meta.homepage = "https://github.com/ldelossa/litee-symboltree.nvim/";
|
||||
};
|
||||
|
||||
litee-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "litee.nvim";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ldelossa";
|
||||
repo = "litee.nvim";
|
||||
rev = "db4bbde5f90c3a9ca82ffe5e5dca63ecf5a8bd7c";
|
||||
sha256 = "0d5dlnxn0swrvj7i2kn6nxc8msl6z632ichabls53y1b3xps20jw";
|
||||
};
|
||||
meta.homepage = "https://github.com/ldelossa/litee.nvim/";
|
||||
};
|
||||
|
||||
lsp-colors-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lsp-colors.nvim";
|
||||
version = "2021-10-22";
|
||||
|
@ -3204,12 +3252,12 @@ final: prev:
|
|||
|
||||
lsp_signature-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lsp_signature.nvim";
|
||||
version = "2022-01-03";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ray-x";
|
||||
repo = "lsp_signature.nvim";
|
||||
rev = "d15c7445dc896a146b670b6ceab4bb1619384062";
|
||||
sha256 = "0bb2hmfp43khn592zxddyvllim873phqzpma2q2hvk9hdl0hz1ry";
|
||||
rev = "44a5bde409922a0019f3c25011be11fb20705f47";
|
||||
sha256 = "0g93khmivnrr02avd3nb88hh8bcyj9y7gq5l8fgjjq2cppbw03a1";
|
||||
};
|
||||
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
|
||||
};
|
||||
|
@ -3264,12 +3312,12 @@ final: prev:
|
|||
|
||||
lualine-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lualine.nvim";
|
||||
version = "2022-01-02";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-lualine";
|
||||
repo = "lualine.nvim";
|
||||
rev = "b18b7ee8acf877a603c21b28b9a4d9c08bbd9594";
|
||||
sha256 = "0zp02m1xhqa5rbqp5wjfjaasmyd50w9782wm0k7lnyakf8akg8jn";
|
||||
rev = "4b68b8dd2aa5bb74fe8cd058797322d81df1f455";
|
||||
sha256 = "17csrd2hbqdrim9aq948zd5vy6babjh9c8z4zw2q8xskvkkbiww8";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/";
|
||||
};
|
||||
|
@ -3412,8 +3460,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "jose-elias-alvarez";
|
||||
repo = "minsnip.nvim";
|
||||
rev = "8edc84c4896e72a85a474930af82656773ac82b0";
|
||||
sha256 = "1m7w5xz5j0brqx7ravwqjnran9g2zr3nsckmgmpahva7287db9hz";
|
||||
rev = "190eefab6335d8d803e49c14a15c9dd0a947f972";
|
||||
sha256 = "083yskdn9jhzk1qpyhak4rdm5r0ryjr9swscxp77df6sfnbixvf5";
|
||||
};
|
||||
meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/";
|
||||
};
|
||||
|
@ -3804,12 +3852,12 @@ final: prev:
|
|||
|
||||
neorg = buildVimPluginFrom2Nix {
|
||||
pname = "neorg";
|
||||
version = "2022-01-02";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-neorg";
|
||||
repo = "neorg";
|
||||
rev = "36e4ba5b49d5e01b1910db8ebc7c1963e51600a4";
|
||||
sha256 = "0wgzhxrx034m2rn2sp7gs5bi6wwdmr73qddbn3fxfn69y8h1m41n";
|
||||
rev = "ff085fbaf095ea07f5e35404747281ad3d40772e";
|
||||
sha256 = "1l0lmhm4wdc5b30vbc4715gggm9xx6y5hkvzb1xrrvkx0dp6kj0c";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-neorg/neorg/";
|
||||
};
|
||||
|
@ -4032,12 +4080,12 @@ final: prev:
|
|||
|
||||
nnn-vim = buildVimPluginFrom2Nix {
|
||||
pname = "nnn.vim";
|
||||
version = "2021-12-04";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mcchrish";
|
||||
repo = "nnn.vim";
|
||||
rev = "32d106a121eb4c88a8f4d0c6d779065b731c9fcb";
|
||||
sha256 = "12n3i813019q4j1lhgkpigjbi6yjywhhdib0xhw9qsjw2s7nvpk8";
|
||||
rev = "169951733371abd152d76d1ce65e2dd867156e2d";
|
||||
sha256 = "15prh70imjikmgnk4b161phcfqqz8jfqdq3l3nzhz80b597d6sv5";
|
||||
};
|
||||
meta.homepage = "https://github.com/mcchrish/nnn.vim/";
|
||||
};
|
||||
|
@ -4104,12 +4152,12 @@ final: prev:
|
|||
|
||||
null-ls-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "null-ls.nvim";
|
||||
version = "2022-01-03";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jose-elias-alvarez";
|
||||
repo = "null-ls.nvim";
|
||||
rev = "5d37e35938862f1642ef94206bec9a6f184ec798";
|
||||
sha256 = "157246yhf7za5aw7v0g0wk6kbcdpz7bwngg45l7xxh0p4c57j0y2";
|
||||
rev = "8c59fd5ec84e1c90c3982a40d699ebe62b243592";
|
||||
sha256 = "0lix5ambsmldvajb5dcwcyb8cy2g6v1iq92dbw0v11l5wcddr75f";
|
||||
};
|
||||
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
|
||||
};
|
||||
|
@ -4152,12 +4200,12 @@ final: prev:
|
|||
|
||||
nvim-autopairs = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-autopairs";
|
||||
version = "2021-12-26";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "windwp";
|
||||
repo = "nvim-autopairs";
|
||||
rev = "3909fc7912f4349ee8b8891056ad807abc7221d3";
|
||||
sha256 = "1awx0pzkgw1c07dghcfrspj4vl7s0rkb23jhz9sd0zi9cbrqczpc";
|
||||
rev = "96858723f1cba6a3eb004373a20c315d90584ea6";
|
||||
sha256 = "11zmf2dwd9fxgdargjbkh70d89ii7qf00mh3v8v8dm89fd6ap0xy";
|
||||
};
|
||||
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
|
||||
};
|
||||
|
@ -4380,12 +4428,12 @@ final: prev:
|
|||
|
||||
nvim-highlite = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-highlite";
|
||||
version = "2021-11-30";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Iron-E";
|
||||
repo = "nvim-highlite";
|
||||
rev = "639c167541202fcbf41ed5cec619ce0fcf1d5ab8";
|
||||
sha256 = "1dcwbzw6rfh5h2yxl17jy5szqp2fmjcss3sfcznis1ccdggh9wnr";
|
||||
rev = "03f0100dd52125a968e3bda4dacc3ab2003049d9";
|
||||
sha256 = "0wqlsys0z2hq9mlqb631v84fd35fznvkkq3nbzq6xyr3d8wmp0fk";
|
||||
};
|
||||
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
|
||||
};
|
||||
|
@ -4476,12 +4524,12 @@ final: prev:
|
|||
|
||||
nvim-lspconfig = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lspconfig";
|
||||
version = "2022-01-02";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "nvim-lspconfig";
|
||||
rev = "486d51cbf492ea769ff563f86bf84ae4a51ccb02";
|
||||
sha256 = "1zhfs2s5c63i3hvs4d558zxjd4ckr5811qhmrxwb6ry3lvp2dq4j";
|
||||
rev = "1917a52a7ccb517f76d6a6e732fb349f381fc927";
|
||||
sha256 = "0s4wcnn4d0wjr02307fbwz2f0yp77ibzadp4lcvsd7im9kxiczna";
|
||||
};
|
||||
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
||||
};
|
||||
|
@ -4560,12 +4608,12 @@ final: prev:
|
|||
|
||||
nvim-scrollview = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-scrollview";
|
||||
version = "2021-12-16";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dstein64";
|
||||
repo = "nvim-scrollview";
|
||||
rev = "5f35322499bc789b44d19f35ee4c23fbed5a3a89";
|
||||
sha256 = "1nc3czp7grb9db52d2cvj81pqipk0x4918560v11b9g2kmvp34g2";
|
||||
rev = "4313cbb75a966aa461ef179fbcda23ba21d64c65";
|
||||
sha256 = "15zwii6bwz488xwj9397fgbxv723vxvmqhkx3kfq412rlb5aadx5";
|
||||
};
|
||||
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
|
||||
};
|
||||
|
@ -4620,12 +4668,12 @@ final: prev:
|
|||
|
||||
nvim-treesitter = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-treesitter";
|
||||
version = "2021-12-29";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter";
|
||||
rev = "fa2a6b68aaa6df0187b5bbebe6cbadc120d4a65a";
|
||||
sha256 = "1yfvx0nmz76cl7d8zmzgmkpxkjn12ddk7sdglcqmvy32iil3bksw";
|
||||
rev = "479fde3471ad6833d950abf645c0ebece15eaea4";
|
||||
sha256 = "072l6m04z83rb9f6sp4rvziyk3i2r20i5vhn0c9djkdhy7x2bj9h";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
||||
};
|
||||
|
@ -4678,6 +4726,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
|
||||
};
|
||||
|
||||
nvim-ts-autotag = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-ts-autotag";
|
||||
version = "2021-12-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "windwp";
|
||||
repo = "nvim-ts-autotag";
|
||||
rev = "0ceb4ef342bf1fdbb082ad4fa1fcfd0f864e1cba";
|
||||
sha256 = "0bbjhjngn0wv6f28z437bx9743w366665ygz6pz81059whfp93g7";
|
||||
};
|
||||
meta.homepage = "https://github.com/windwp/nvim-ts-autotag/";
|
||||
};
|
||||
|
||||
nvim-ts-context-commentstring = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-ts-context-commentstring";
|
||||
version = "2021-12-13";
|
||||
|
@ -5354,12 +5414,12 @@ final: prev:
|
|||
|
||||
renamer-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "renamer.nvim";
|
||||
version = "2021-12-19";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "filipdutescu";
|
||||
repo = "renamer.nvim";
|
||||
rev = "814ddbb11602e3c8b2af166b4d1e029272ab796f";
|
||||
sha256 = "067mn0wzvin7zbbzd8svshi5ga38r5d7nw8kqbyn3aakggpnylm3";
|
||||
rev = "6d4e3066bbf5725d15b082a7a188a3aca16ce217";
|
||||
sha256 = "1yfkpjjkhkhkqf543is1y2r44kz9py20rl5j34lwd2zz8ldibmca";
|
||||
};
|
||||
meta.homepage = "https://github.com/filipdutescu/renamer.nvim/";
|
||||
};
|
||||
|
@ -5390,12 +5450,12 @@ final: prev:
|
|||
|
||||
rnvimr = buildVimPluginFrom2Nix {
|
||||
pname = "rnvimr";
|
||||
version = "2022-01-02";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kevinhwang91";
|
||||
repo = "rnvimr";
|
||||
rev = "d91ea7e21a2e3e0c4ff58abcdee0a4804c15cdc6";
|
||||
sha256 = "1hlrny63nn9836w4g4ia4niygq8pwwv0g9hsway589xpgj0kgadz";
|
||||
rev = "b876914f4c0fef926bed50876c3da16c15adc81c";
|
||||
sha256 = "0n5y4ysm0inki1sxxa7w59b682xjy7ykflydiphwf5m1w0fhpkin";
|
||||
};
|
||||
meta.homepage = "https://github.com/kevinhwang91/rnvimr/";
|
||||
};
|
||||
|
@ -5498,12 +5558,12 @@ final: prev:
|
|||
|
||||
SchemaStore-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "SchemaStore.nvim";
|
||||
version = "2022-01-01";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "b0o";
|
||||
repo = "SchemaStore.nvim";
|
||||
rev = "efa83a65c646ff7a1deda77aaae3703f5e0cba0d";
|
||||
sha256 = "1rla73samh16x6yvw3qd9s36vh400k3rz4gid550msvxym3inq0y";
|
||||
rev = "8cec6ac01fbeba4efd91ab9f991bbd56fb5002a7";
|
||||
sha256 = "069hn6px0a83bpj6332n9gwn82145d98pdvadhsnj89dkmf4gdcj";
|
||||
};
|
||||
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
|
||||
};
|
||||
|
@ -5823,12 +5883,12 @@ final: prev:
|
|||
|
||||
splitjoin-vim = buildVimPluginFrom2Nix {
|
||||
pname = "splitjoin.vim";
|
||||
version = "2021-11-03";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "AndrewRadev";
|
||||
repo = "splitjoin.vim";
|
||||
rev = "0f45bfd7d6a8acb7d6ac126001a27190851bf3f5";
|
||||
sha256 = "1a5y8qj8gyrmaxh4si3k30v19yh8chws4h9k41ra1jzslrilm9ai";
|
||||
rev = "ed71635666356d9dc8950ecc177ed7eaa0d939ec";
|
||||
sha256 = "1fjg1zxl4sbibr658962iqk0lgcrggxwffmscr5v4n3x41v0xnrd";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
|
||||
|
@ -5942,6 +6002,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/ervandew/supertab/";
|
||||
};
|
||||
|
||||
surround-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "surround.nvim";
|
||||
version = "2021-12-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "blackCauldron7";
|
||||
repo = "surround.nvim";
|
||||
rev = "81f997bd71590f21f717e24bae72edf8e8b7b0f6";
|
||||
sha256 = "06mdbpka2z17hyi3p7b9ksyz79ppwybhr4h9829qba8xr2gpd465";
|
||||
};
|
||||
meta.homepage = "https://github.com/blackCauldron7/surround.nvim/";
|
||||
};
|
||||
|
||||
sved = buildVimPluginFrom2Nix {
|
||||
pname = "sved";
|
||||
version = "2021-10-22";
|
||||
|
@ -6149,12 +6221,12 @@ final: prev:
|
|||
|
||||
telescope-coc-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope-coc.nvim";
|
||||
version = "2021-12-23";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fannheyward";
|
||||
repo = "telescope-coc.nvim";
|
||||
rev = "2617983a9f0f70b578bbd290f2502d1bc91219ff";
|
||||
sha256 = "0ycvhvvy954vhi5jidwz37xkmdk3i8cnwx7aasgmpkwrcgpaqq43";
|
||||
rev = "5d806a0de91abfbdad967028627e8f300946f463";
|
||||
sha256 = "0b2497s3zdan81fslxpxpcr495wcvj1kdi5dzwl13102gd2mqn59";
|
||||
};
|
||||
meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/";
|
||||
};
|
||||
|
@ -7927,12 +7999,12 @@ final: prev:
|
|||
|
||||
vim-eunuch = buildVimPluginFrom2Nix {
|
||||
pname = "vim-eunuch";
|
||||
version = "2021-10-01";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpope";
|
||||
repo = "vim-eunuch";
|
||||
rev = "7a48f9ff0ef5f21447b2354ee52dc18b5567e05c";
|
||||
sha256 = "1mwalnbp8pigpvai22zhzg52m25qbl7hl7r8vr8vhs277gc0lx8m";
|
||||
rev = "7fb5aef524808d6ba67d6d986d15a2e291194edf";
|
||||
sha256 = "1yil4g5wym2a41isb6cdqcmccwrggy255frwxlb3rvffnl9b22m7";
|
||||
};
|
||||
meta.homepage = "https://github.com/tpope/vim-eunuch/";
|
||||
};
|
||||
|
@ -8985,12 +9057,12 @@ final: prev:
|
|||
|
||||
vim-lsp = buildVimPluginFrom2Nix {
|
||||
pname = "vim-lsp";
|
||||
version = "2022-01-02";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "prabirshrestha";
|
||||
repo = "vim-lsp";
|
||||
rev = "420143420d929d6bc9e98102b5828e0bbc5c9052";
|
||||
sha256 = "0dkvcsd3jmkmg3by4jz1a5lj17blqm6zb1w7n9bccc2gy232sx6y";
|
||||
rev = "40b155512b142f2111195d85d4c19de2c424a4f2";
|
||||
sha256 = "1pxdc0f66hgikwnwddhlwriaribbsxddyki33a5pn7z2sbhd8c9g";
|
||||
};
|
||||
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
|
||||
};
|
||||
|
@ -9434,8 +9506,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "jceb";
|
||||
repo = "vim-orgmode";
|
||||
rev = "03561775e295d8546a95e04f9a2f1a246ad80354";
|
||||
sha256 = "1xn4k29s6psn0jbmbj1nymrkjky10ny9nylzpm5zz3rbad1c0k26";
|
||||
rev = "7882e202a3115a07be5300fd596194c94d622911";
|
||||
sha256 = "1idmlrgjvarsv620rkhpnknbqvrw372mjzxi3jrk3i2d6d9phsnb";
|
||||
};
|
||||
meta.homepage = "https://github.com/jceb/vim-orgmode/";
|
||||
};
|
||||
|
@ -11184,12 +11256,12 @@ final: prev:
|
|||
|
||||
vimtex = buildVimPluginFrom2Nix {
|
||||
pname = "vimtex";
|
||||
version = "2022-01-02";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lervag";
|
||||
repo = "vimtex";
|
||||
rev = "84bc5aeb1d6c07f892b39ae99e356d7ab7012476";
|
||||
sha256 = "17k6dcycv2n0zklb23nx9bzr4cmxgp1np3py3ci4s6fznn64yymn";
|
||||
rev = "d9fa252426343bd6f3e6cb134b41e674ad0e39d3";
|
||||
sha256 = "190kpl2ng8i1fkw6pzgx32aw6c1zw8w10aikwvdrz8f7g691kf7f";
|
||||
};
|
||||
meta.homepage = "https://github.com/lervag/vimtex/";
|
||||
};
|
||||
|
|
|
@ -49,6 +49,7 @@ benizi/vim-automkdir
|
|||
bhurlow/vim-parinfer
|
||||
bitc/vim-hdevtools
|
||||
bkad/camelcasemotion
|
||||
blackCauldron7/surround.nvim
|
||||
bling/vim-bufferline
|
||||
blueballs-theme/blueballs-neovim
|
||||
blueyed/vim-diminactive
|
||||
|
@ -388,6 +389,10 @@ lambdalisue/vim-gista
|
|||
lambdalisue/vim-manpager
|
||||
lambdalisue/vim-pager
|
||||
latex-box-team/latex-box
|
||||
ldelossa/litee-calltree.nvim
|
||||
ldelossa/litee-filetree.nvim
|
||||
ldelossa/litee-symboltree.nvim
|
||||
ldelossa/litee.nvim
|
||||
leafgarland/typescript-vim
|
||||
leanprover/lean.vim
|
||||
ledger/vim-ledger
|
||||
|
@ -932,6 +937,7 @@ wincent/command-t
|
|||
wincent/ferret
|
||||
wincent/terminus
|
||||
windwp/nvim-autopairs
|
||||
windwp/nvim-ts-autotag
|
||||
winston0410/cmd-parser.nvim
|
||||
winston0410/range-highlight.nvim
|
||||
wlangstroth/vim-racket
|
||||
|
|
|
@ -2,51 +2,51 @@
|
|||
"4.14": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.14.258-hardened1.patch",
|
||||
"sha256": "0rni42mbvyw0f9032i6bkgcwnzfw472vimd5l1q7rp52m63z6vbk",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.258-hardened1/linux-hardened-4.14.258-hardened1.patch"
|
||||
"name": "linux-hardened-4.14.260-hardened1.patch",
|
||||
"sha256": "13r6lx3rcbaz2wvhwa950gsjharzq1n61bl9l3nm8v66j7gab3l0",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.260-hardened1/linux-hardened-4.14.260-hardened1.patch"
|
||||
},
|
||||
"sha256": "162bzhm0k8kipgk0ma745rjcl33rqhpwxdfdz3q6rkp48b82kbvi",
|
||||
"version": "4.14.258"
|
||||
"sha256": "1bylxn6hsq17cann2w02ggz6xz3b3synrapcwlwfcfydf71hzj9f",
|
||||
"version": "4.14.260"
|
||||
},
|
||||
"4.19": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.19.221-hardened1.patch",
|
||||
"sha256": "0lw4lysiv5h1vlkwlz2z1kv78wsszj1xc383i2qkzfsb4l9vsm7h",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.221-hardened1/linux-hardened-4.19.221-hardened1.patch"
|
||||
"name": "linux-hardened-4.19.223-hardened1.patch",
|
||||
"sha256": "1jrg8fkb8kc3m1zcgyw99mnmgvyxi3yp33x9jh1s4babxcr7w4g3",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.223-hardened1/linux-hardened-4.19.223-hardened1.patch"
|
||||
},
|
||||
"sha256": "1yg1cibyn53gpjnxfgj2qxxi8k3l7gv1ri6kywvp6sk5bygx8jd3",
|
||||
"version": "4.19.221"
|
||||
"sha256": "1cnjk49g8sxsbzk375ji47lnx36drqh1x2pbfiqdwgrbjcb043sz",
|
||||
"version": "4.19.223"
|
||||
},
|
||||
"5.10": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.10.87-hardened1.patch",
|
||||
"sha256": "1r1vyf9wy49s7pfskxlng17n0khi1dpxg5cm4yfnbbq0gdisnh1f",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.87-hardened1/linux-hardened-5.10.87-hardened1.patch"
|
||||
"name": "linux-hardened-5.10.89-hardened1.patch",
|
||||
"sha256": "0gpfyykm66h4hdazqw1xkg514cglin6zmd754xala924kj6x0k8b",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.89-hardened1/linux-hardened-5.10.89-hardened1.patch"
|
||||
},
|
||||
"sha256": "0jz6xhph7x0x11cjmypaw5gh8z4d53dcgx2gmg7k6d06ydq8n4h3",
|
||||
"version": "5.10.87"
|
||||
"sha256": "0c5v8fsv9sazdmdw4m1canm54x2p8777yavxq2gcpw8q98d8n8cj",
|
||||
"version": "5.10.89"
|
||||
},
|
||||
"5.15": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.15.10-hardened1.patch",
|
||||
"sha256": "1fn37pg10w1m4cr4g0ibs5fvqs1yx3y776daxv836naffl1001fm",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.10-hardened1/linux-hardened-5.15.10-hardened1.patch"
|
||||
"name": "linux-hardened-5.15.12-hardened1.patch",
|
||||
"sha256": "1xxyh87pbk7961zc5554f3gwr65n5msaxyxbi1kpd4q19gcw86xz",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.12-hardened1/linux-hardened-5.15.12-hardened1.patch"
|
||||
},
|
||||
"sha256": "0jsv8lialjwp91qg9c9rh8rhn49a70ryyhzl19bxq3fhz1fwyks8",
|
||||
"version": "5.15.10"
|
||||
"sha256": "182iwy2288layl2290cxla0k6y436lxlx43yaa8par325dviksbx",
|
||||
"version": "5.15.12"
|
||||
},
|
||||
"5.4": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.4.167-hardened1.patch",
|
||||
"sha256": "03mj8nncfpqf5j6l66239saxv251rh5infhl0jjyx1znhfzavg0p",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.167-hardened1/linux-hardened-5.4.167-hardened1.patch"
|
||||
"name": "linux-hardened-5.4.169-hardened1.patch",
|
||||
"sha256": "19mghwh66rmbjd7i0hxhysabarpz8l4wadw8schwc8q9kxy33py4",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.169-hardened1/linux-hardened-5.4.169-hardened1.patch"
|
||||
},
|
||||
"sha256": "19x5f3s5f4nqzjb61g22rs0hnmk43q4b7sm7mc4j1q3y44b33r5l",
|
||||
"version": "5.4.167"
|
||||
"sha256": "068sw1p50vcygi422bfjpahf2fxy3ifyp4ljnkwxbbvibzcq4hsm",
|
||||
"version": "5.4.169"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -13,8 +13,8 @@ buildGoModule rec {
|
|||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
vendorSha256 = "1ngig5zw0gf1mkjjsfvvn09rncb36rg274cbi3glp8wzfcr8aip3";
|
||||
runVend = true;
|
||||
vendorSha256 = "sha256-TxeHfO5IUVsKmKZ1e0/KXi+6dk2nn6AoNG0eB3jyGkY=";
|
||||
proxyVendor = true;
|
||||
|
||||
buildInputs = [ ffmpeg ];
|
||||
|
||||
|
|
|
@ -6,8 +6,8 @@ buildGoModule rec {
|
|||
pname = "livepeer";
|
||||
version = "0.5.20";
|
||||
|
||||
runVend = true;
|
||||
vendorSha256 = "sha256-iFVScV3arPkBjMi8sCHIja4G2QeQDb2sgBrbTFyxKyw=";
|
||||
proxyVendor = true;
|
||||
vendorSha256 = "sha256-pyPxONcWniJoA0qYusHktF3/taYda2StaMiMhyRYEm4=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "livepeer";
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, which, m4
|
||||
, protobuf, boost, zlib, curl, openssl, icu, jemalloc, libtool
|
||||
, protobuf, boost170, zlib, curl, openssl, icu, jemalloc, libtool
|
||||
, python2Packages, makeWrapper
|
||||
}:
|
||||
|
||||
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
makeFlags = [ "rethinkdb" ];
|
||||
|
||||
buildInputs = [ protobuf boost zlib curl openssl icu ]
|
||||
buildInputs = [ protobuf boost170 zlib curl openssl icu ]
|
||||
++ lib.optional (!stdenv.isDarwin) jemalloc
|
||||
++ lib.optional stdenv.isDarwin libtool;
|
||||
|
||||
|
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
|
|||
query language that supports really useful queries like table
|
||||
joins and group by, and is easy to setup and learn.
|
||||
'';
|
||||
homepage = "http://www.rethinkdb.com";
|
||||
homepage = "https://rethinkdb.com";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ thoughtpolice bluescreen303 ];
|
||||
|
|
|
@ -16,13 +16,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nix-top";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "samueldr";
|
||||
repo = "nix-top";
|
||||
rev = "v${version}";
|
||||
sha256 = "0560a9g8n4p764r3va1nn95iv4bg71g8h0wws1af2p5g553j4zps";
|
||||
sha256 = "sha256-w/TKzbZmMt4CX2KnLwPvR1ydp5NNlp9nNx78jJvhp54=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terrascan";
|
||||
version = "1.12.0";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "accurics";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DYWp7D2CQxasEYkoCEa0KdFQDvo4rNgRcTKzxYLsYFg=";
|
||||
sha256 = "sha256-HV9WOJ8bWu8Uk1tXMZWqvo3ZvFiWLMGKmw6HzHBxSBY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0vx406y3kj1qmgr1y9vg3rprwjpm5g8p9shmhq28gp7sxz3j82ry";
|
||||
vendorSha256 = "sha256-MB3/iIStqNBM9YnNaRpV4hbs1gZzWm+7B+qHHm0kOmU=";
|
||||
|
||||
# Tests want to download a vulnerable Terraform project
|
||||
doCheck = false;
|
||||
|
|
|
@ -11,8 +11,8 @@ buildGoModule rec {
|
|||
sha256 = "15bsxaxqxp17wsr0p9fkpvgfyqnhhwm3j8jxkvcs4cdw73qaxdsy";
|
||||
};
|
||||
|
||||
runVend = true;
|
||||
vendorSha256 = "06hl1npwmy9dvpf4kljvw8lwwiigm52wf106lmf9k6k2gi5ikprz";
|
||||
proxyVendor = true;
|
||||
vendorSha256 = "sha256-c+9IZEKiW95JIh6krs9NhdBohUatTTEIYBU13kj9zB8=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.Version=v${version}" ];
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://www.jefftk.com/icdiff";
|
||||
description = "Side-by-side highlighted command line diffs";
|
||||
maintainers = with maintainers; [ aneeshusa ];
|
||||
maintainers = with maintainers; [ ];
|
||||
license = licenses.psfl;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -349,6 +349,7 @@ mapAliases ({
|
|||
graalvm8 = throw "graalvm8-ce has been removed by upstream."; # added 2021-10-19
|
||||
graalvm8-ce = throw "graalvm8-ce has been removed by upstream."; # added 2021-10-19
|
||||
graalvm11 = graalvm11-ce;
|
||||
grib-api = throw "grib-api has been replaced by ecCodes => https://confluence.ecmwf.int/display/ECC/GRIB-API+migration"; # added 2022-01-05
|
||||
gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25
|
||||
gtk_doc = gtk-doc; # added 2018-02-25
|
||||
gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # added 2022-01-01
|
||||
|
|
|
@ -16818,8 +16818,6 @@ with pkgs;
|
|||
|
||||
grab-site = callPackage ../tools/backup/grab-site { };
|
||||
|
||||
grib-api = callPackage ../development/libraries/grib-api { };
|
||||
|
||||
grilo = callPackage ../development/libraries/grilo { };
|
||||
|
||||
grilo-plugins = callPackage ../development/libraries/grilo-plugins { };
|
||||
|
|
|
@ -5600,6 +5600,8 @@ in {
|
|||
|
||||
opt-einsum = callPackage ../development/python-modules/opt-einsum { };
|
||||
|
||||
optax = callPackage ../development/python-modules/optax { };
|
||||
|
||||
optuna = callPackage ../development/python-modules/optuna { };
|
||||
|
||||
opuslib = callPackage ../development/python-modules/opuslib { };
|
||||
|
|
Loading…
Reference in a new issue