diff --git a/nixos/tests/bcachefs.nix b/nixos/tests/bcachefs.nix index 146225e72ce..211195586ed 100644 --- a/nixos/tests/bcachefs.nix +++ b/nixos/tests/bcachefs.nix @@ -18,13 +18,13 @@ import ./make-test-python.nix ({ pkgs, ... }: { "mkdir /tmp/mnt", "udevadm settle", "parted --script /dev/vdb mklabel msdos", - "parted --script /dev/vdb -- mkpart primary 1024M -1s", + "parted --script /dev/vdb -- mkpart primary 1024M 50% mkpart primary 50% -1s", "udevadm settle", # Due to #32279, we cannot use encryption for this test yet - # "echo password | bcachefs format --encrypted /dev/vdb1", + # "echo password | bcachefs format --encrypted --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2", # "echo password | bcachefs unlock /dev/vdb1", - "bcachefs format /dev/vdb1", - "mount -t bcachefs /dev/vdb1 /tmp/mnt", + "bcachefs format --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2", + "mount -t bcachefs /dev/vdb1:/dev/vdb2 /tmp/mnt", "udevadm settle", "bcachefs fs usage /tmp/mnt", "umount /tmp/mnt", diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index 77812f88ad1..a40f4cb2f57 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "vnstat"; - version = "2.8"; + version = "2.9"; src = fetchFromGitHub { owner = "vergoh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-r+dmsL3bPgCDdBje7uzg+ArhMkqj+R/hepNLMDqe350="; + sha256 = "sha256-AEpq3Pn/WUiPDxYk6WKb1Uur5tD+OBfFAzLUDWnZH/0="; }; postPatch = '' diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 12c455d2fc0..6d38d2a650e 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -46,7 +46,7 @@ let "8.13.2".sha256 = "1884vbmwmqwn9ngibax6dhnqh4cc02l0s2ajc6jb1xgr0i60whjk"; "8.14.0".sha256 = "04y2z0qyvag66zanfyc3f9agvmzbn4lsr0p1l7ck6yjhqx7vbm17"; "8.14.1".sha256 = "0sx78pgx0qw8v7v2r32zzy3l161zipzq95iacda628girim7psnl"; - "8.15+rc1".sha256 = "sha256:0v9vnx5z2mbsmhdx08rpg0n8jn0d82mimpghn55vkwsscxmcrgnm"; + "8.15.0".sha256 = "sha256:1ma76wfrpfsl72yh10w1ys2a0vi0mdc2jc79kdc8nrmxkhpw1nxx"; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix index 2c130bf02d3..70ff4a4555d 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix @@ -2,6 +2,7 @@ , libX11, libXt, libXft, libXrender , ncurses, fontconfig, freetype , pkg-config, gdk-pixbuf, perl +, libptytty , perlSupport ? true , gdkPixbufSupport ? true , unicode3Support ? true @@ -9,7 +10,7 @@ let pname = "rxvt-unicode"; - version = "9.26"; + version = "9.30"; description = "A clone of the well-known terminal emulator rxvt"; desktopItem = makeDesktopItem { @@ -31,12 +32,13 @@ stdenv.mkDerivation { src = fetchurl { url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2"; - sha256 = "12y9p32q0v7n7rhjla0j2g9d5rj2dmwk20c9yhlssaaxlawiccb4"; + sha256 = "0badnkjsn3zps24r5iggj8k5v4f00npc77wqg92pcn1q5z8r677y"; }; buildInputs = [ libX11 libXt libXft ncurses # required to build the terminfo file fontconfig freetype pkg-config libXrender + libptytty ] ++ optional perlSupport perl ++ optional gdkPixbufSupport gdk-pixbuf; diff --git a/pkgs/development/coq-modules/corn/default.nix b/pkgs/development/coq-modules/corn/default.nix index ee4a39dbd5e..d3ac8332c11 100644 --- a/pkgs/development/coq-modules/corn/default.nix +++ b/pkgs/development/coq-modules/corn/default.nix @@ -5,7 +5,7 @@ with lib; mkCoqDerivation rec { inherit version; defaultVersion = switch coq.coq-version [ { case = "8.6"; out = "8.8.1"; } - { case = (versions.range "8.7" "8.13"); out = "8.13.0"; } + { case = (versions.range "8.7" "8.15"); out = "8.13.0"; } ] null; release = { "8.8.1".sha256 = "0gh32j0f18vv5lmf6nb87nr5450w6ai06rhrnvlx2wwi79gv10wp"; diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index e61019b91c6..0a78191d8b7 100644 --- a/pkgs/development/coq-modules/math-classes/default.nix +++ b/pkgs/development/coq-modules/math-classes/default.nix @@ -4,10 +4,10 @@ with lib; mkCoqDerivation { pname = "math-classes"; inherit version; - defaultVersion = if versions.range "8.11" "8.13" coq.coq-version then "8.13.0" else - if versions.range "8.6" "8.10" coq.coq-version then "8.12.0" else null; + defaultVersion = if versions.range "8.6" "8.15" coq.coq-version then "8.15.0" else null; release."8.12.0".sha256 = "14nd6a08zncrl5yg2gzk0xf4iinwq4hxnsgm4fyv07ydbkxfb425"; release."8.13.0".sha256 = "1ln7ziivfbxzbdvlhbvyg3v30jgblncmwcsam6gg3d1zz6r7cbby"; + release."8.15.0".sha256 = "10w1hm537k6jx8a8vghq1yx12rsa0sjk2ipv3scgir71ln30hllw"; extraBuildInputs = [ bignums ]; diff --git a/pkgs/development/libraries/libptytty/default.nix b/pkgs/development/libraries/libptytty/default.nix new file mode 100644 index 00000000000..63f50de287c --- /dev/null +++ b/pkgs/development/libraries/libptytty/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, lib +, fetchurl +, cmake +}: + +stdenv.mkDerivation rec { + pname = "libptytty"; + version = "2.0"; + + src = fetchurl { + url = "http://dist.schmorp.de/libptytty/${pname}-${version}.tar.gz"; + sha256 = "1xrikmrsdkxhdy9ggc0ci6kg5b1hn3bz44ag1mk5k1zjmlxfscw0"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "OS independent and secure pty/tty and utmp/wtmp/lastlog"; + homepage = "http://dist.schmorp.de/libptytty"; + maintainers = with maintainers; [ rnhmjoj ]; + platforms = platforms.unix; + license = licenses.gpl2; + }; + +} diff --git a/pkgs/development/ocaml-modules/bigarray-compat/default.nix b/pkgs/development/ocaml-modules/bigarray-compat/default.nix index 487249ce5ae..83c35edcc41 100644 --- a/pkgs/development/ocaml-modules/bigarray-compat/default.nix +++ b/pkgs/development/ocaml-modules/bigarray-compat/default.nix @@ -6,6 +6,8 @@ buildDunePackage rec { useDune2 = true; + minimalOCamlVersion = "4.03"; + src = fetchFromGitHub { owner = "mirage"; repo = pname; diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index f1c0c7fb262..d227f34192f 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "1.0.7"; + version = "1.0.8"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "1jx2m03c8f76nn8r14vk0v7qq2kijgjhqcqwl95kih50cgmj0yzf"; + sha256 = "0l6qhgpzg082zk9134w2psnzkzf5zr0jyvrkxnhhz5lx9q5k94pc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-cleanup/default.nix b/pkgs/development/python-modules/django-cleanup/default.nix index 240598cf184..9a399ed6ed9 100644 --- a/pkgs/development/python-modules/django-cleanup/default.nix +++ b/pkgs/development/python-modules/django-cleanup/default.nix @@ -3,10 +3,10 @@ buildPythonPackage rec { pname = "django-cleanup"; - version = "5.2.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "909d10ff574f5ce1a40fa63bd5c94c9ed866fd7ae770994c46cdf66c3db3e846"; + sha256 = "922e06ef8839c92bd3ab37a84db6058b8764f3fe44dbb4487bbca941d288280a"; }; checkInputs = [ django ]; diff --git a/pkgs/development/python-modules/flake8-length/default.nix b/pkgs/development/python-modules/flake8-length/default.nix index 34e226bd463..6f82b8dd50b 100644 --- a/pkgs/development/python-modules/flake8-length/default.nix +++ b/pkgs/development/python-modules/flake8-length/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "flake8-length"; - version = "0.2.2"; + version = "0.3.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3536fee1d2a19c01f56ebb909c4d81f686f8181091a9bc3ddf3a5621c464760a"; + sha256 = "6e3c068005b0b3b5c8345923fe3e9a107c980baa1354dd19d820018f87409427"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index 0b84726d5a5..73ddb17cac1 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "manimpango"; - version = "0.4.0.post0"; + version = "0.4.0.post1"; src = fetchFromGitHub { owner = "ManimCommunity"; repo = pname; rev = "v${version}"; - sha256 = "1avlh6wk6a2mq6fl2idqk2z5bncglyla8p9m7az0430k9vdv4qks"; + sha256 = "1in9ibis91rlqmd7apbdp9c8y1mgnpm5bg6ldad8whx62nkkvwa3"; }; postPatch = '' @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/ManimCommunity/ManimPango"; - license = licenses.gpl3Plus; + license = licenses.mit; description = "Binding for Pango"; maintainers = [ maintainers.angustrau ]; }; diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix similarity index 57% rename from pkgs/development/tools/documentation/mkdocs/default.nix rename to pkgs/development/python-modules/mkdocs/default.nix index f7774cc7127..7d4f1cc66c6 100644 --- a/pkgs/development/tools/documentation/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -1,22 +1,47 @@ -{ lib -, python3 +{ + # eval time deps + lib +, buildPythonPackage , fetchFromGitHub +, fetchpatch +, pythonOlder + # runtime deps +, click +, ghp-import +, importlib-metadata +, jinja2 +, markdown +, mergedeep +, packaging +, pyyaml +, pyyaml-env-tag +, watchdog + # testing deps +, Babel +, mock +, pytestCheckHook }: -with python3.pkgs; - -buildPythonApplication rec { +buildPythonPackage rec { pname = "mkdocs"; - version = "1.2.1"; + version = "1.2.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-JF3Zz1ObxeKsIF0pa8duJxqjLgMvmWsWMApHT43Z+EY="; + sha256 = "sha256-LBw2ftGyeNvARQ8xiYUho8BiQh+aIEqROP51gKvNxEo="; }; + patches = [ + (fetchpatch { + url = "https://github.com/mkdocs/mkdocs/commit/c93fc91e4dc0ef33e2ea418aaa32b0584a8d354a.patch"; + sha256 = "sha256-7uLIuQOt6KU/+iS9cwhXkWPAHzZkQdMyNBxSMut5WK4="; + excludes = [ "tox.ini" ]; + }) + ]; + propagatedBuildInputs = [ click jinja2 @@ -33,21 +58,19 @@ buildPythonApplication rec { checkInputs = [ Babel mock - pytestCheckHook ]; - postPatch = '' - # Remove test due to missing requirement - rm mkdocs/tests/theme_tests.py + + checkPhase = '' + set -euo pipefail + + runHook preCheck + + python -m unittest discover -v -p '*tests.py' mkdocs --top-level-directory . + + runHook postCheck ''; - pytestFlagsArray = [ "mkdocs/tests/*.py" ]; - - disabledTests = [ - # Don't start a test server - "testing_server" - ]; - pythonImportsCheck = [ "mkdocs" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index bd80fb725c3..387853ad28c 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "8.9.0"; + version = "8.10.0"; src = fetchPypi { inherit pname version; - sha256 = "ba2021812835bfeb19ad6d32a1afeb41cb01e45f4fd2b8145ae162800e4bc87f"; + sha256 = "8930949bd43e3126289f50e927d1acacf53c57ec3227c764e0c1feb72bbb61a3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index 8c0bd2d07e8..4a21cebcabd 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.8.0"; + version = "4.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "sha256-e+nZi84mF9Z/gbFyhmE9TlntkTyrfoNr3U/fwH55fjw="; + sha256 = "0c0zhbq6ggn5ck4cgbr92440xhfk3iz5a8fm25909idlx8vw0s3q"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylaunches/default.nix b/pkgs/development/python-modules/pylaunches/default.nix index 552d30c70f3..56e93af84a0 100644 --- a/pkgs/development/python-modules/pylaunches/default.nix +++ b/pkgs/development/python-modules/pylaunches/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pylaunches"; - version = "1.2.1"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-WwtNgKP5YM9i7au02taOfJuKQy6DDmmBrE34EPvJYmA="; + sha256 = "16fh901qlcxwycq6gqgqn076dybjnj432hb596i28avaplml4qzx"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylibftdi/default.nix b/pkgs/development/python-modules/pylibftdi/default.nix index c001594d625..d4dd2d6781b 100644 --- a/pkgs/development/python-modules/pylibftdi/default.nix +++ b/pkgs/development/python-modules/pylibftdi/default.nix @@ -3,15 +3,19 @@ , fetchPypi , libftdi1 , libusb1 +, pythonOlder }: buildPythonPackage rec { pname = "pylibftdi"; - version = "0.19.0"; + version = "0.20.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "bb0ec74df292ef884aa37bf1e98fb9df4d338718e1559eebda363317a792123e"; + sha256 = "f4a87fc4af2c9c7d42badd4192ca9b529f32c9d96fdc8daea7e29c509226df5f"; }; propagatedBuildInputs = [ @@ -25,11 +29,13 @@ buildPythonPackage rec { --replace "self._load_library('libftdi')" "cdll.LoadLibrary('${libftdi1.out}/lib/libftdi1.so')" ''; - pythonImportsCheck = [ "pylibftdi" ]; + pythonImportsCheck = [ + "pylibftdi" + ]; meta = with lib; { - homepage = "https://bitbucket.org/codedstructure/pylibftdi/src/default/"; - description = "Minimal pythonic wrapper to Intra2net's libftdi driver for FTDI's USB devices"; + homepage = "https://pylibftdi.readthedocs.io/"; + description = "Wrapper to Intra2net's libftdi driver for FTDI's USB devices"; license = licenses.mit; maintainers = with maintainers; [ matthuszagh ]; }; diff --git a/pkgs/development/python-modules/pytest-subprocess/default.nix b/pkgs/development/python-modules/pytest-subprocess/default.nix index 74f1e7cddce..f095cbb9973 100644 --- a/pkgs/development/python-modules/pytest-subprocess/default.nix +++ b/pkgs/development/python-modules/pytest-subprocess/default.nix @@ -6,11 +6,14 @@ , pytestCheckHook , docutils , pygments +, pytest-rerunfailures +, pytest-asyncio +, anyio }: buildPythonPackage rec { pname = "pytest-subprocess"; - version = "1.3.2"; + version = "1.4.0"; disabled = pythonOlder "3.6"; @@ -18,7 +21,7 @@ buildPythonPackage rec { owner = "aklajnert"; repo = "pytest-subprocess"; rev = version; - sha256 = "sha256-auPpqoPeYxmkWTVbbKhEZI6gJGH9Pf1D9YLkuD3FaX0="; + hash = "sha256-+bsxoOsY0yf77EivImrfqxgVW0T/VnFIJXvy8X5pmEY="; }; buildInputs = [ @@ -29,6 +32,9 @@ buildPythonPackage rec { pytestCheckHook docutils pygments + pytest-rerunfailures + pytest-asyncio + anyio ]; meta = with lib; { diff --git a/pkgs/development/python-modules/rtoml/default.nix b/pkgs/development/python-modules/rtoml/default.nix index 9ff43bce084..2d2aef6f722 100644 --- a/pkgs/development/python-modules/rtoml/default.nix +++ b/pkgs/development/python-modules/rtoml/default.nix @@ -1,16 +1,17 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder -, setuptools-rust -, rustPlatform -, pytestCheckHook , libiconv +, pytestCheckHook +, pythonOlder +, rustPlatform +, setuptools-rust }: buildPythonPackage rec { pname = "rtoml"; version = "0.7"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { @@ -33,17 +34,29 @@ buildPythonPackage rec { cargoSetupHook ]; - buildInputs = [ libiconv ]; + buildInputs = [ + libiconv + ]; - pythonImportsCheck = [ "rtoml" ]; + pythonImportsCheck = [ + "rtoml" + ]; + + checkInputs = [ + pytestCheckHook + ]; - checkInputs = [ pytestCheckHook ]; preCheck = '' cd tests ''; + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" + ]; + meta = with lib; { - description = "Rust based TOML library for python"; + description = "Rust based TOML library for Python"; homepage = "https://github.com/samuelcolvin/rtoml"; license = licenses.mit; maintainers = with maintainers; [ evils ]; diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index f80fabedebe..c55aae7878e 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.9.1"; + version = "2.9.2"; src = fetchurl { - url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "09lzq04b642iy0ljp59p32lgk3q8iphjh8fkdp69q29l5frgwx5k"; + url = "https://github.com/ocaml/dune/releases/download/${version}/dune-site-${version}.tbz"; + sha256 = "sha256-uOfMUH+5eLRfb9yDnysyAdLB5hHkqOlyyMjP2FIudEc="; }; nativeBuildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix index 6abb1ac1b3a..3375e5ac5a0 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix @@ -7,5 +7,7 @@ buildDunePackage { inherit (js_of_ocaml-compiler) version src meta useDune2; + minimalOCamlVersion = "4.03"; + propagatedBuildInputs = [ ocamlbuild ]; } diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index fa706c5e00b..c3599c908ad 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -471,6 +471,18 @@ final: prev: meta.homepage = "https://github.com/bkad/camelcasemotion/"; }; + catppuccin-nvim = buildVimPluginFrom2Nix { + pname = "catppuccin-nvim"; + version = "2022-01-23"; + src = fetchFromGitHub { + owner = "catppuccin"; + repo = "nvim"; + rev = "c63ad901576729c46f443630a1fb61e4a7e93a0f"; + sha256 = "1w90zb46fdvpp0b1i559yj3dvijfskl9dlqjkgn7fr8513fgblrz"; + }; + meta.homepage = "https://github.com/catppuccin/nvim/"; + }; + caw-vim = buildVimPluginFrom2Nix { pname = "caw.vim"; version = "2021-09-20"; @@ -485,12 +497,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2022-01-22"; + version = "2022-01-24"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "e6fe7bcc3d354f7da68bea64c612eb2f78e959d1"; - sha256 = "0rq82dz1s7xshbdydah50vpzhakbzcbxkx4j5mgg5pwgbglaj9xj"; + rev = "7f1b916fabbae134b37c0a5ac09f0bfc555ab010"; + sha256 = "0xmm0fikqj95m836nv8y6cyvqkn3p0iklqhqj32cxqfrvh0mbnb6"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -905,12 +917,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-01-21"; + version = "2022-01-22"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "6a510523b0bf697bffe5ba77d0e404532fd92e65"; - sha256 = "1xp8zvj1wbywfgy2kgvqmxpw675wlmpjdgbqzmb53rjjhsb9w107"; + rev = "5b8cc589540e82e6862b2948924f06461261a09a"; + sha256 = "0j1v9nckv86b4z2pz6b9kssp59fl3da9hyadjplnqgilbbcqplxm"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1122,12 +1134,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2021-12-23"; + version = "2022-01-22"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "2717348d1a0687327f59880914fa260e4ad9c685"; - sha256 = "1fgn5j0sswnncbdkd5283rn2lfrszq00m7ilarm4ks006yxin3hq"; + rev = "93a668527b203a3353ef2bd5337f6c55119bb7e6"; + sha256 = "1a5w1wmc5vx3y32rci5km73wj6vq6cjgc4ss4w0w95s7sk8kaggn"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -1170,24 +1182,24 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-01-17"; + version = "2022-01-24"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "9546c14f6664df71b9427b38fcebb7800b69799e"; - sha256 = "0nr2w65mirbrpr7iyimwjq7l5vyi4qr46ncic3whwlmyi2amkrjk"; + rev = "c878e9f1886f86a0210753fa9c146b2e863d84bc"; + sha256 = "1nhzj0pslfzzski3z0synv5vpacfbx359ggsq1z5d9cyapsxchkx"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-01-21"; + version = "2022-01-23"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "cbe08b44bf2cba835c541f4b7eddc9f533dbe584"; - sha256 = "1g32297zkvdrmvjacwf6ig2q7whvzj8wzrxb71vzr9qskp0qx81v"; + rev = "a036b5e3c15baeda71bd76f4b7e9d3de9a057e42"; + sha256 = "1i2yygw4j6g7zihcbja58k2qh0sdn3mqbx277k91bdkf4y1hjdxd"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1772,24 +1784,24 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2022-01-19"; + version = "2022-01-24"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "8ddb984be3eb2b087c5a621513c8f1f9cc191f4f"; - sha256 = "1amhf4csmp10ry3g7qqp4cgzz06011fkgncazpfp1l7gd5d3x1as"; + rev = "840bbfd5158976ae6e0f0b79d110e40bdabd084c"; + sha256 = "16gs2jfqwn081f12gmdgzkjxxha278rm57p95dsf752374gkn5v5"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2021-07-25"; + version = "2022-01-22"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "3078cd10b28904e57d878c0d0dab42aa0a9fdc89"; - sha256 = "1zjwhg3g56skqi9lndjhn9fh8hr478yvns8xz9xpnzcgzdaqbi1w"; + rev = "a8e3e66deefb6122f476c27cee505aaae93f7109"; + sha256 = "19k6nii3p6a4vfyf7xxrkhj7wfamjivdp22bn1mhx4zcw8h01lkn"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -2063,12 +2075,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-01-20"; + version = "2022-01-23"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "35bacce3c903dff2852e87a13196cad0dd166093"; - sha256 = "0inq7d48j4ck3zfkbvmi76xvis1sybk15mda23zfnm6zj0k3hjh1"; + rev = "a8efb538f4be58b4f4586bc964f9f10496c05e31"; + sha256 = "0yj7ijr091jsd8rny4zx34427w8v87iywysig5pgrz7iz421wib4"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -2147,24 +2159,24 @@ final: prev: fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp.nvim"; - version = "2022-01-13"; + version = "2022-01-23"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "bd55968ff9e62a1760a7bc96126b021cc34d0449"; - sha256 = "0znnwgdpkhnd029ybfyyh3jj3l11a20g5zynw33xjdwkh4w68nrc"; + rev = "74a8b7d3f39dbcbcb920a99b63adc4867363e8c3"; + sha256 = "0c80shgzxz90213qhx7bvd1fkzkdq9g79m157dnwvzh121jmpdap"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; fzf-vim = buildVimPluginFrom2Nix { pname = "fzf.vim"; - version = "2022-01-16"; + version = "2022-01-24"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "66cb8b826477671fba81c2db5fbb080c7b89f955"; - sha256 = "1gi83az726817chmrhp8agzn111m2qp76khw5ycnjmba3j9666zy"; + rev = "91332acb1c48e7080539c5b5cd131816341c738c"; + sha256 = "0s8695m25v2j5hpp80g3hd28g7ja17yxih5cd71jqmqvl3zwmqrg"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -2303,12 +2315,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-01-20"; + version = "2022-01-22"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "ddffc618ea9e11ae57129549e0eccf832cb8b37d"; - sha256 = "0mkv3pl08i4920px3k1ffy65lnmycv717n65fmv94fyqa98al3zb"; + rev = "f43cee333fdfeb27aae86bab73a38c5885d5c7f4"; + sha256 = "1rxx8abg4kx6n6xbg2fyw3cjixcnynkg4l00xjh4yk44bi0f65f8"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2447,12 +2459,12 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2022-01-19"; + version = "2022-01-24"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "74cad39cb9abdf89fd55b377bd814a913fcc4141"; - sha256 = "0myf5qhb1bbdp8n3xwj1aa3p4rv0xq998arnparnzi5mxlvmjarz"; + rev = "d043cd49c344e41cd07b19c5252ee31e356c8ebf"; + sha256 = "10m7wk8p6kwc8zgfl64r901vkxrsfv9bwnzxi4cx3s03vvkq1c00"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; @@ -2699,12 +2711,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2022-01-14"; + version = "2022-01-22"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "5a04e47278344326578a3d8717f1fc44f7834b2f"; - sha256 = "19jij8i9a4n9cb2dkak9155p99yp68nx2k0dx1bw1k9rf7fwm4il"; + rev = "2e35f7dcdc72f39b37c21e43cdb538d7a41c7e07"; + sha256 = "1hgj7k3ml7n11nqn7cmn7bpls0rm6xh5z4sgrsgjyvrdnw6wckla"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2892,12 +2904,12 @@ final: prev: kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2022-01-21"; + version = "2022-01-23"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "e308a9e5e8b527d646bf485b9148db894a617560"; - sha256 = "07hky7mqz8zj21y0cvb7fadiv0fmxzkm6f2i490d85dj3i3njijv"; + rev = "7a3442f416174665e9114d617a9a366438bc9f3b"; + sha256 = "12nilfk56va7y93yvi6nkh2fqw1a4w7bhzh085ir0kss66nma1bp"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -3012,12 +3024,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-01-20"; + version = "2022-01-24"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "8dc39f1ce00cf50890e7a55c3bc24017531338f7"; - sha256 = "18aywn1hkhpxc3fgy9xys5fjh0l69nrgdwaiy9fzfqy8d6fk3ssf"; + rev = "4d613c6aea73be9b8882d5710b11f502ef8692db"; + sha256 = "16lcr9bbiq33agd9p1cwrrxmzsj3xmva1lva8ay4zrm1v2v45jn5"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3228,12 +3240,12 @@ final: prev: litee-filetree-nvim = buildVimPluginFrom2Nix { pname = "litee-filetree.nvim"; - version = "2022-01-20"; + version = "2022-01-24"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-filetree.nvim"; - rev = "e3cbf471d1c721c202cef17060c8b4737a73875b"; - sha256 = "1003ib2ldgi6zansdlhbvaiylywiazvjy8dlmd0rs0chlqqd4g36"; + rev = "15014fe3855848ebe48431c789d8e8ec2e9efe34"; + sha256 = "1xwysily6lh8z9wd8g983102lfj4543dpqzfk7cr7zqd864qj951"; }; meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/"; }; @@ -3323,12 +3335,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2022-01-14"; + version = "2022-01-23"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "68de04e557acdce7cf0a77defbef7ca9f0c6a457"; - sha256 = "00amvq05cr2y6kb63a2z5xnbj5vp7hb1ycl98y5ikm61rbi2d60b"; + rev = "64eb5cc8961e54b2888d363bb94d551203080b45"; + sha256 = "0v3dza9mp351715i87x75zxkm0d5i7v77a5zq8c8mlhz1v31z0vx"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3383,24 +3395,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-01-12"; + version = "2022-01-24"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "70691ae350fdbe1f15758e3b8e2973742a7967a9"; - sha256 = "02djs872iy9w675yrh2777d5rbb9maz26y8nfwdw9j2xm182xm6y"; + rev = "9208bae98fd5d1ab6145868a8c48bfee53c1a499"; + sha256 = "1dz4kg3l79d128jgqs6cs8ikvr108z46ijv36wq7pw3dam4ybnaw"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-01-13"; + version = "2022-01-24"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "0222ee63c9e4b80e6000d064f8efd8edcc6d0c48"; - sha256 = "1hjzzrxlq0h59mvd0ids62k5ps1invvawdj60q8my3arrlfbnb4v"; + rev = "59576a5cf28556a393eedfe38467e998288fc905"; + sha256 = "1bwmzvsm9d6ilq616697rwk3j29i0q3nzwdyapjyxdyhp9rivgsj"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3515,12 +3527,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-01-20"; + version = "2022-01-23"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "91969103413bb2e29e4b4d7841e68a8a65959ccd"; - sha256 = "1r74vs6kxdy2329xiqqczk1i1zpfiplrxk2pahmw06jf2ff6y3qn"; + rev = "a89d87667eec94915121d8f5caf199f63f9ff81d"; + sha256 = "0l6k5djgvhkl7y86g7wmaxs0yq5nv0g6aa46kjjc81lvycj9qg3m"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -3947,12 +3959,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-01-21"; + version = "2022-01-24"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "e8b8cb0a75a4ca2da6b5a9bec79cd2002ef03882"; - sha256 = "1nf74v4147jyc1cb3scvja49160wcjqvgppiq7whgili1ic8s1d6"; + rev = "02b185ff04083df22d8d1f957eaee9d1d50c6684"; + sha256 = "1kqcnyk8hb80w4ngggjmhnqnpmks3bzb8l0sqh3vdxzpz2d8bpj1"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4247,24 +4259,24 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2022-01-20"; + version = "2022-01-23"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "3d4e81891ae0dfa7afcd1f2b5e96c69ec1e36072"; - sha256 = "1hdrq6v9dyrx79f0cqqp7b8w1snbwvmr562g1lmi94jv636agmg5"; + rev = "0d603c19171fb2e127bc128e9229d48340a6beeb"; + sha256 = "1d6j3syv86afj0cpfqy8jcwj8pxm53wa1xjl76f1j5h7y6ba1237"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-01-21"; + version = "2022-01-23"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "5213916f51a178287cf5162354f2f7c2c4e204bb"; - sha256 = "0v34s75srr2ds3jw100hjr2mwbycwhvrv6y02ddzmgw0bsqfgw9c"; + rev = "0adceda4fb3fdd25ff015e68ebe176268b12bb2c"; + sha256 = "1nczxn4mxnl5qylzg0kmd7jbybf856x554xv83kwhjv4zzwpaj84"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4293,18 +4305,6 @@ final: prev: meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; - catppuccin-nvim = buildVimPluginFrom2Nix { - pname = "catppuccin-nvim"; - version = "2022-01-21"; - src = fetchFromGitHub { - owner = "catppuccin"; - repo = "nvim"; - rev = "baf9a2c5d81f4336b0504e35c148482535dc2ac9"; - sha256 = "00nma5a4jybncm3dj388p03nd4kkpj11l1cmd1dfmnzd41iaia99"; - }; - meta.homepage = "https://github.com/catppuccin/nvim/"; - }; - nvim-ale-diagnostic = buildVimPluginFrom2Nix { pname = "nvim-ale-diagnostic"; version = "2021-11-06"; @@ -4379,12 +4379,12 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-01-20"; + version = "2022-01-24"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "1797f9e1acd2e0b5b4b6805928aebc1dcc0ecbff"; - sha256 = "122il3siyyqpb0bshg0mx7mi6ykjqf261hkci8pg0ybqwzjvz231"; + rev = "27123b1297e37109bdb2fd0cd4638621b0eab65a"; + sha256 = "0wn1jb9pfq541k7lq6qm6434p5vgd6bj7f374rn56x93nxlll1g1"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -4451,24 +4451,24 @@ final: prev: nvim-cursorline = buildVimPluginFrom2Nix { pname = "nvim-cursorline"; - version = "2021-09-28"; + version = "2022-01-22"; src = fetchFromGitHub { owner = "yamatsum"; repo = "nvim-cursorline"; - rev = "e4fa1d90c2c6169c18f7ea3275845a2de9335dbf"; - sha256 = "06jvagrdvizygr1l4d6dbb0nrri6c2zv09xrzxysxmi3hjvf6zx8"; + rev = "88232dd52f186e3bff9aa594aa9c3a062f400642"; + sha256 = "1lgcfwkc3kq9jyh7r19v6rpmbflq2nplg46kvb79l07212pz64s0"; }; meta.homepage = "https://github.com/yamatsum/nvim-cursorline/"; }; nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-01-19"; + version = "2022-01-22"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "675e13a3f4dba3c33f04d4cf3b575d72bb7b8a4a"; - sha256 = "0irczvrvq3r2g43bxxh07plj0264z6rabwc9iivgb93wqv67w3dz"; + rev = "c9a58267524f560112ecb6faa36ab2b5bc2f78a3"; + sha256 = "0sga5dv5zrm5cyxk0s3dp9avpx7j9nag8d8jv6bgzbq772szbfwf"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -4631,12 +4631,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-01-20"; + version = "2022-01-24"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "187c70ffc6d1eb093bf1c9c102555565f53c100b"; - sha256 = "15n1j8vjy5q9nf716zcxmycfiy9fxcgqljj7wbi42q6h4xgxnpm7"; + rev = "e83f80295737e8f470329d768f6ae325bcd0bb23"; + sha256 = "12b78p8lw94ixwgcl71chwssi6li7q46aj0ahdna9v77hk2mlvc8"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -4655,12 +4655,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-01-21"; + version = "2022-01-24"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "58d2ba6b968539a20d701be0bf98ae154456e265"; - sha256 = "04l70b5sl1c98gmk9s9zwa39gbp1w46ivwmyryr96g0znidh3ryk"; + rev = "12a0d3a81af173a330c957ca51b81e5f66144ef8"; + sha256 = "06qxdr8dzc7i9fvn9yyjnb1yypdgj35dppivx8752c8czd5bmshw"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4751,12 +4751,12 @@ final: prev: nvim-solarized-lua = buildVimPluginFrom2Nix { pname = "nvim-solarized-lua"; - version = "2022-01-18"; + version = "2022-01-22"; src = fetchFromGitHub { owner = "ishan9299"; repo = "nvim-solarized-lua"; - rev = "a391200d79c6342ce311ac57959565f4521a3da0"; - sha256 = "00ay49rxx98jw4dy34751l05i2iwj7hn29d4hqi4akq24n2dwllf"; + rev = "995ae7e0baa4b5d42c094ffa7d6b3fe9459397c3"; + sha256 = "01dsbdlizckvw34hwzq7jkdhsv5008jzj9p140c177zv4qps2kll"; }; meta.homepage = "https://github.com/ishan9299/nvim-solarized-lua/"; }; @@ -4799,12 +4799,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-01-21"; + version = "2022-01-24"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "3c462d362f49611c295e6c4870c97e2ae7f530cd"; - sha256 = "1sqr8q9mdggcwd2nm2wwdviad7nf9pzwxmv3wj7asnmw271a1n7b"; + rev = "91fdda9b5c3896b4b630d98292d657afa00bba2d"; + sha256 = "0qknkalnsjbyqfi9kgmscswwwck40vpwwx6cbrrk4pgkwykabi21"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4835,24 +4835,24 @@ final: prev: nvim-treesitter-refactor = buildVimPluginFrom2Nix { pname = "nvim-treesitter-refactor"; - version = "2022-01-15"; + version = "2022-01-22"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-refactor"; - rev = "7470880adf8b6fd20936aad33f24ce8fecdb6799"; - sha256 = "1137n2nyvlwhaksd2syb7s4kq635da3xxm4dqj4d70irzx75bqmh"; + rev = "0dc8069641226904f9757de786a6ab2273eb73ea"; + sha256 = "193fk657wjxz7hfbkjw566bng62vv7432cjhb5rwcig04xd5izqm"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/"; }; nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-01-21"; + version = "2022-01-23"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "5681ed6e8754efd3de748fadd14ce9b8f06c1fd7"; - sha256 = "0c3vj1lxp942qs0ghdp8m5ih1dxmnj8l14qjnh46dn5xrfxh73ss"; + rev = "1ce9933a1be6e16f788d51dcaa9602accfa25030"; + sha256 = "120gqzh205sx26gadilwawx761s6ibyzkbhwybfdd2f1fq832pag"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -4883,12 +4883,12 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2022-01-21"; + version = "2022-01-24"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "5470a3bb6e7ad316d63fab0951fd181ccfdc5716"; - sha256 = "1648zm3baqi9711r0ywpnj7a7c8giwy6bazbxhcwv0qsjnnm5n70"; + rev = "38eb126412723fa4c3bfd137c1a3a811faf67eb5"; + sha256 = "13igbd268z0533bsrz0r8s69lbryh0h4w33cpywmacghxy672jjl"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -4931,12 +4931,12 @@ final: prev: nvim_context_vt = buildVimPluginFrom2Nix { pname = "nvim_context_vt"; - version = "2022-01-21"; + version = "2022-01-22"; src = fetchFromGitHub { owner = "haringsrob"; repo = "nvim_context_vt"; - rev = "9cf62516d16114c935eeb9bbe57b02e39c3bfbd7"; - sha256 = "1fvsjfcfm83kvcfgps39j845pkh89s4vq2wk49a0qi5g8a8mjphx"; + rev = "47afb03249e36cd740bda79907c0f279f4e28544"; + sha256 = "18pbdp7ci5gb7i0als4rgcr151rbm8j3mc0pxc9h4x9cvxdl8x5f"; }; meta.homepage = "https://github.com/haringsrob/nvim_context_vt/"; }; @@ -4979,12 +4979,12 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2022-01-20"; + version = "2022-01-23"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "c2ea3cba7d34ce9bce9d1e1d9710ab4b2be7e651"; - sha256 = "126fq92v72ljmdxrdh384yck3kd4avmss37rcyfryzhzfrjj2gcj"; + rev = "33224362e20e1b3e87eb7ef2d669de6c60e727db"; + sha256 = "0z163sfxly71bypskxnph9rwqamgp3h01i24va9n41wbbfvr0pw3"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; @@ -5653,12 +5653,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2022-01-01"; + version = "2022-01-24"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "7eb435069b307f55bdc3aa27bd3fe4ad704e66db"; - sha256 = "1lc730wyv77yfgvcpwvc5h51g4abarxyk6si6q1bly368ms52dlc"; + rev = "876089969aa8ccf8784039f7d6e6b4cab6d4a2b1"; + sha256 = "0j3gi150gpj5m0i4kklcwjgrqk6fqv1ha8wh9mlhpjp26i68ylb6"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -5701,12 +5701,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-01-20"; + version = "2022-01-23"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "4d03a1db6d00e4a413e15d1e5f5b090a7bc5f4b6"; - sha256 = "1zwc9n3rwsq7cqz0mryl05zggzdgir8kwsgpvd64lxmf92xzs1mv"; + rev = "c9d7de2dc3dc23d2bd6d3f1d147f40ee4c016f79"; + sha256 = "1va0zbhr7j2hym6arg4nfdgk30ypsw2k8nb6j3lfi1fj41l3lmr4"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -5918,12 +5918,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2022-01-19"; + version = "2022-01-24"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "237c85d3f6c12581a675f29b7f45bee35aae48b0"; - sha256 = "1ji6yggmhpdvrsl6ky0680br9wbxzwmwk3bbrd3sjajnvj9567pz"; + rev = "9a2ac50100b22599ac625484a76f192dfd80e2ce"; + sha256 = "09qn6f898qvpxpn3xy0z4l7j5b84v7pd1b237g1xh3lkyy3xvmzg"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -6147,12 +6147,12 @@ final: prev: surround-nvim = buildVimPluginFrom2Nix { pname = "surround.nvim"; - version = "2022-01-21"; + version = "2022-01-23"; src = fetchFromGitHub { owner = "blackCauldron7"; repo = "surround.nvim"; - rev = "bc07f9d15535b76e464bc4e9e94702136a60b785"; - sha256 = "1j0jq44a5kqfpca3hwhx1jzwl79d3apii0j5b3l4kwhgjgvjwjdm"; + rev = "b0105011437ab148261b5c4ed6b84c735c54cd61"; + sha256 = "1bs0ba29pfxvvz8j5qpam6mxch4b40idlpq7l39rsanrxyxl81yf"; }; meta.homepage = "https://github.com/blackCauldron7/surround.nvim/"; }; @@ -6353,12 +6353,12 @@ final: prev: tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2021-09-07"; + version = "2022-01-24"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "5c5c31121ec607011c1e382163c0bce207ac2966"; - sha256 = "1cbalg696gcw1bbvclacrg081w1ygb7xfpv6y2w969b50m17l2lc"; + rev = "3729ae43318faca94b0a1e878f9c6717b171d55e"; + sha256 = "07dhmfqrk6806648a0n9y98ngzk59b55j9nnsvvka0hl27q1mkl9"; }; meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; @@ -6486,12 +6486,12 @@ final: prev: telescope-project-nvim = buildVimPluginFrom2Nix { pname = "telescope-project.nvim"; - version = "2021-11-20"; + version = "2022-01-23"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-project.nvim"; - rev = "ad33c9eb67de635ded67069af7552d5162497b1e"; - sha256 = "1m46h973wvr6bkb69msd9sj6413315qw2nndpr6rgk8vl2hd1vrr"; + rev = "d317c3cef6917d650d9a638c627b54d3e1173031"; + sha256 = "0kg2jh23cgbwjmvrc1cxvjka4y2j0qpi4r8dzzw0gs2nmdjmmic7"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; }; @@ -6823,12 +6823,12 @@ final: prev: ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2022-01-21"; + version = "2022-01-24"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "bc480c1aac4cb6237aa3316ab576e7a674f064ca"; - sha256 = "1xkw1m70fr4cqc4wjawzbrkkankbyi7ma61d727sqrigzaqk1zjh"; + rev = "e12dd76d4a4d9d18c985bbafe8b6a55f7f8ea917"; + sha256 = "0i64rrg3q8w80hskwxsbs1a1nzbkbbwz5vs62dpd6vbi02ghkkzg"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -9285,12 +9285,12 @@ final: prev: vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; - version = "2020-07-14"; + version = "2022-01-24"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-markdown"; - rev = "8e5d86f7b85234d3d1b4207dceebc43a768ed5d4"; - sha256 = "013vh2rnfifm5j56imar03rvchz68ll4lbgy9y8fbw7s9a0k6yaa"; + rev = "9156bba66350d4c0c32b4ac783550c3e132d6a88"; + sha256 = "0ghlswpc0qdxidc38y9xy22293nf0hjxqwvln71gzmxjlxj3rdgk"; }; meta.homepage = "https://github.com/preservim/vim-markdown/"; }; @@ -9586,12 +9586,12 @@ final: prev: vim-ocaml = buildVimPluginFrom2Nix { pname = "vim-ocaml"; - version = "2021-10-25"; + version = "2022-01-24"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "2ebddd0ef575193e2aac31172f8f3a5f543f530f"; - sha256 = "1n2k6picc99j5vs036mp2ws6v8iyal812k7s653zxv8qgvn676mi"; + rev = "9485f5aa3aa8e3d8505fce9a70efecc38dfee329"; + sha256 = "13lwc63iavqpwr25knrzs5f5mn7yrq8lhmm8p1d99vd5j7ngyy5x"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -9658,12 +9658,12 @@ final: prev: vim-orgmode = buildVimPluginFrom2Nix { pname = "vim-orgmode"; - version = "2022-01-03"; + version = "2022-01-23"; src = fetchFromGitHub { owner = "jceb"; repo = "vim-orgmode"; - rev = "7882e202a3115a07be5300fd596194c94d622911"; - sha256 = "1idmlrgjvarsv620rkhpnknbqvrw372mjzxi3jrk3i2d6d9phsnb"; + rev = "66cd7ee69a9cddc73f65566e32da159f1e51401f"; + sha256 = "1ywf5vcn3b8isfw4gxqfplchn94jvbqvaap15w1yk5ljmp46gxgk"; }; meta.homepage = "https://github.com/jceb/vim-orgmode/"; }; @@ -9886,12 +9886,12 @@ final: prev: vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2022-01-01"; + version = "2022-01-23"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "c96947b1c64c56f70125a9bac9c006f69e45d5d3"; - sha256 = "1f2mgzp24ib5c1yjvnlsy0wlzrz79m4417p42vdblpfhgy3nd4ld"; + rev = "2c5af8f89d3e61e04e761c07a1f043b0f35203c6"; + sha256 = "1aajyfcxw7d9dfhakz6jzkhc6dvb6dckwv3q77f5cfnc5s6rfnz3"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -10498,12 +10498,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2022-01-16"; + version = "2022-01-22"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "00a1e5e66813ac83d21a2836b00b3493980f8f82"; - sha256 = "0j7biq2xipk5msg3bikqk0rds4838dxq98l2m236cpzyc9lva09a"; + rev = "cbad57e5d0304198503648b5416ea28d2d1d437a"; + sha256 = "08ayp2p840fri3yc0lydic2w9gzjxvnpydrr9fifmmf3sw9fbdcd"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -10739,12 +10739,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2022-01-07"; + version = "2022-01-22"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "1efc3def36eff8ac12ddb1f25837ef6101531047"; - sha256 = "0cfx8wq6hq3kdd49vymqj595i5l16xfi55ngn8k2rq6wrd76y5f4"; + rev = "2ace9a12253140f1bdf4318a46ca9076658dd147"; + sha256 = "04bnymydy84z4gqnyjkkddvacmsqccbxiwm8p5hinlnyp6ahjjjd"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -10919,12 +10919,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2022-01-22"; + version = "2022-01-24"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "4190d800ec8e29e446c61011fee0dcec61f20199"; - sha256 = "0mq9mjypq101y593ji7biwvvqzbf5argwcdnpqzphk1ikldq3xh0"; + rev = "72b956f668237a4cd9b020b2c173d013699b38b5"; + sha256 = "1f0kkxclpa9x3qc81yzagl1qili13ihbicb6d84pnpycy482k0sj"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -11399,12 +11399,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-01-21"; + version = "2022-01-22"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "2588e4c8dec5bd6a6803d1c86b9e7354409b7d8b"; - sha256 = "07yv643amq7q8bpdqd5m806bw28yzjgpb2hrhnjnh0bj0fqxhkqb"; + rev = "f0b135d091a2b78945ea46695fd8c667a92457c0"; + sha256 = "01lsplkqv6h71z09p5sy0xmadd0gwn20nl94az7hb1igvlrangc4"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -11412,12 +11412,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-01-19"; + version = "2022-01-22"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "700c40d018b25cc367c26ba348127fe4c6d87638"; - sha256 = "1j4vdslrbkw9zswpcgsvxgwxanjxa8vm3j5513p2ignag8pmdfc6"; + rev = "c7c084a5215c9402f1cdfdaa662a7eaa9b67d81b"; + sha256 = "0mcd8wzq9xhidfyyir689050j2nfvwhgjp1ypnp3nib0m10n7kb8"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; diff --git a/pkgs/os-specific/linux/sgx/sdk/default.nix b/pkgs/os-specific/linux/sgx/sdk/default.nix index 18876f927e8..93c12da94ac 100644 --- a/pkgs/os-specific/linux/sgx/sdk/default.nix +++ b/pkgs/os-specific/linux/sgx/sdk/default.nix @@ -46,6 +46,11 @@ stdenv.mkDerivation rec { ''; patches = [ + # Fix missing pthread_compat.h, see https://github.com/intel/linux-sgx/pull/784 + (fetchpatch { + url = "https://github.com/intel/linux-sgx/commit/254b58f922a6bd49c308a4f47f05f525305bd760.patch"; + sha256 = "sha256-sHU++K7NJ+PdITx3y0PwstA9MVh10rj2vrLn01N9F4w="; + }) # Commit to add missing sgx_ippcp.h not yet part of this release (fetchpatch { name = "add-missing-sgx_ippcp-header.patch"; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index e8a887fa93c..68f6150496c 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.50.1"; + version = "1.50.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fdO+HJ1+fk+s65jLkPDiG+Ei89x5Fbkh9BUUFQ3NJ3M="; + sha256 = "sha256-dy5VCrrmZjWAAkcyfCzUaPLDGSyA0zlP6n8vhS0V8N0="; }; buildInputs = [ openssl ]; diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 440a21a6b6a..59ccf2c8059 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.33.0"; + version = "1.34.1"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-3b0hlRjPXrMjFhXi8j4VvKJyRGicIk9FZUBRsBUp+Xo="; + sha256 = "sha256-poD7cuOxrNhhyW/GRxBjlJlRle38aYrQJ/g1d8TZ5o0="; }; - vendorSha256 = "sha256-MVDb4JN2QqZNxANDLUZywgoBc2NpcaPB8TkR1xrq+Yk="; + vendorSha256 = "sha256-1ogMI8Aw1xBd2PQ2QRiDLifQL3Z3kU4PbbCgHLHtp6A="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 99d6a0100e5..e1b96d97177 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "8.1.2"; + version = "8.2.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2ID3VVT4cQ1yZAD2WVKqkoE7qbe2nNMp1nlwfTxmlZo="; + sha256 = "sha256-WyiEKC5WUwIGCaxXqiqNyOcGVZgfd2lVFMxQxhgJhMc="; }; - cargoSha256 = "sha256-o1V6u7FmP+p+ApL0AmaqTQTZ2f0sZTpx2ro4lR/DFi8="; + cargoSha256 = "sha256-ZcOSHEZHGa1XhGQlW4pR5hBJ2SpSbkKuRS6OSHGg9Lo="; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index 62810606755..2fb3196b1f4 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -12,19 +12,19 @@ stdenv.mkDerivation rec { pname = "uutils-coreutils"; - version = "0.0.8"; + version = "0.0.12"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; rev = version; - sha256 = "0hx5ypy58d182gxpgs0dxcw03pdgvrcikbhczg6yqpdjjh7163as"; + sha256 = "01zwvadfd570vbsy52svp0vi5r2p873c33vn2h4mr7868myl6q9g"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256:1ynw97dr40yg18jaqgvz3shs0s0j6pvvlkrbka2ganiv8c9fvbyw"; + hash = "sha256:19li3gmb5dmrmiiiy9ihr1rl68lz14j2gsgqpjcsn52rkcy17dzh"; }; nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ]; diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix index fffcbbb528b..8a5440f6b07 100644 --- a/pkgs/tools/networking/godns/default.nix +++ b/pkgs/tools/networking/godns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "godns"; - version = "2.5.3"; + version = "2.6"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "v${version}"; - sha256 = "sha256-C2Auk0BJLhW8r4cnmoZiUddb8rcZqND5fER9L+3ooH4="; + sha256 = "sha256-U8fmjcPeTcKlf721UIbA4/JYeM4l+OIyAPGNp8IPvSk="; }; - vendorSha256 = "sha256-/egdqQCkbmrxuQ3vPfHOtHxAgW143Y2eZEzKAsBVmaI="; + vendorSha256 = "sha256-8fluCDKrMNnIAlJFlDAisk/P+IYHBCdl7hkSbQtgy1A="; # Some tests require internet access, broken in sandbox doCheck = false; diff --git a/pkgs/tools/networking/proxychains-ng/default.nix b/pkgs/tools/networking/proxychains-ng/default.nix index 6a131af0311..35a6c7d7f87 100644 --- a/pkgs/tools/networking/proxychains-ng/default.nix +++ b/pkgs/tools/networking/proxychains-ng/default.nix @@ -1,29 +1,19 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch }: stdenv.mkDerivation rec { pname = "proxychains-ng"; - version = "4.15"; + version = "4.16"; src = fetchFromGitHub { owner = "rofl0r"; repo = pname; rev = "v${version}"; - sha256 = "128d502y8pn7q2ls6glx9bvibwzfh321sah5r5li6b6iywh2zqlc"; + sha256 = "sha256-uu/zN6W0ue526/3a9QeYg6J4HLaovZJVOYXksjouYok="; }; - patches = [ - # Fix build on aarch64-darwin, should be removed in v4.16 - # https://github.com/rofl0r/proxychains-ng/issues/400 - (fetchpatch { - url = "https://github.com/rofl0r/proxychains-ng/commit/7de7dd0de1ff387a627620ac3482b4cd9b3fba95.patch?full_index=1"; - sha256 = "sha256-m3a4Jal8L7w+xA0OJTPU68ILTaKgiITgsM1WVxuMce0="; - }) - ]; - meta = with lib; { description = "A preloader which hooks calls to sockets in dynamically linked programs and redirects it through one or more socks/http proxies"; homepage = "https://github.com/rofl0r/proxychains-ng"; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 4cf6ef23b65..cfcc3c68c30 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -225,79 +225,71 @@ common = sha256 = "sha256-SPnam4xNIjbMgnq6IP1AaM1V62X0yZNo4DEVmI8sHOo="; }; -in rec { + buildNix = + { version, suffix ? "" + , src ? null, sha256 ? null + , boehmgc ? boehmgc_nix, patches ? [ ] + }: + assert (src == null) -> (sha256 != null); + assert (sha256 == null) -> (src != null); + callPackage common { + pname = "nix"; + version = "${version}${suffix}"; + inherit suffix; + src = + if src != null + then src + else fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + rev = version; + inherit sha256; + }; + + inherit boehmgc patches; + inherit storeDir stateDir confDir; + }; + +in rec { nix = nixStable; nixStable = nix_2_5; - nix_2_3 = callPackage common (rec { - pname = "nix"; + nix_2_3 = buildNix rec { version = "2.3.16"; src = fetchurl { - url = "https://nixos.org/releases/nix/${pname}-${version}/${pname}-${version}.tar.xz"; + url = "https://nixos.org/releases/nix/nix-${version}/nix-${version}.tar.xz"; sha256 = "sha256-fuaBtp8FtSVJLSAsO+3Nne4ZYLuBj2JpD2xEk7fCqrw="; }; - boehmgc = boehmgc_nix_2_3; + }; - inherit storeDir stateDir confDir; - }); - - nix_2_4 = callPackage common (rec { - pname = "nix"; + nix_2_4 = buildNix { version = "2.4"; - - src = fetchFromGitHub { - owner = "NixOS"; - repo = "nix"; - rev = version; - sha256 = "sha256-op48CCDgLHK0qV1Batz4Ln5FqBiRjlE6qHTiZgt3b6k="; - }; - - boehmgc = boehmgc_nix; - + sha256 = "sha256-op48CCDgLHK0qV1Batz4Ln5FqBiRjlE6qHTiZgt3b6k="; patches = [ installNlohmannJsonPatch ]; + }; - inherit storeDir stateDir confDir; - }); - - nix_2_5 = callPackage common (rec { - pname = "nix"; + nix_2_5 = buildNix { version = "2.5.1"; + sha256 = "sha256-GOsiqy9EaTwDn2PLZ4eFj1VkXcBUbqrqHehRE9GuGdU="; + patches = [ installNlohmannJsonPatch ]; + }; + nix_2_6 = buildNix { + version = "2.6.0"; + sha256 = "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg="; + }; + + nixUnstable = lib.lowPrio (buildNix rec { + version = "2.7"; + suffix = "pre20220124_${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = version; - sha256 = "sha256-GOsiqy9EaTwDn2PLZ4eFj1VkXcBUbqrqHehRE9GuGdU="; + rev = "0a70b37b5694c769fb855c1afe7642407d1db64f"; + sha256 = "sha256-aOM9MPNlnWNMobx4CuD4JIXH2poRlG8AKkuxY7FysWg="; }; - - boehmgc = boehmgc_nix; - - patches = [ installNlohmannJsonPatch ]; - - inherit storeDir stateDir confDir; }); - - nixUnstable = lib.lowPrio (callPackage common rec { - pname = "nix"; - version = "2.6${suffix}"; - suffix = "pre20211217_${lib.substring 0 7 src.rev}"; - - src = fetchFromGitHub { - owner = "NixOS"; - repo = "nix"; - rev = "6e6e998930f0d7361d64644eb37d9134e74e8501"; - sha256 = "sha256-RZSWOJUPkXIlMNYMC5a+WNrOjpqAHyhzyqD57BGfNY8="; - }; - - boehmgc = boehmgc_nix; - - patches = [ installNlohmannJsonPatch ]; - - inherit storeDir stateDir confDir; - - }); - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36e464dc192..fa26774ead8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15123,7 +15123,7 @@ with pkgs; mkcert = callPackage ../development/tools/misc/mkcert { }; - mkdocs = callPackage ../development/tools/documentation/mkdocs { }; + mkdocs = with python3Packages; toPythonApplication mkdocs; mmtf-cpp = callPackage ../development/libraries/science/chemistry/mmtf-cpp { }; @@ -18438,6 +18438,8 @@ with pkgs; libpst = callPackage ../development/libraries/libpst { }; + libptytty = callPackage ../development/libraries/libptytty { }; + libpwquality = callPackage ../development/libraries/libpwquality { }; libqalculate = callPackage ../development/libraries/libqalculate { @@ -33124,6 +33126,7 @@ with pkgs; nix_2_3 nix_2_4 nix_2_5 + nix_2_6 nixUnstable; nixStatic = pkgsStatic.nix; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7ade4995d1c..b0b71fec287 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5039,6 +5039,8 @@ in { mizani = callPackage ../development/python-modules/mizani { }; + mkdocs = callPackage ../development/python-modules/mkdocs { }; + mkl-service = callPackage ../development/python-modules/mkl-service { }; ml-collections = callPackage ../development/python-modules/ml-collections { };