From 159af50269a077d3bbd61d050d083761baee2f0e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Jan 2022 00:44:17 +0100 Subject: [PATCH 01/68] zsh-powerlevel10k: 1.15.0 -> 1.16.0 --- pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 419863044b5d..18315d879c96 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "v${version}"; - sha256 = "1b3j2riainx3zz4irww72z0pb8l8ymnh1903zpsy5wmjgb0wkcwq"; + sha256 = "sha256-gSPCNLK733+9NWdalqUJ8nzkhoQxurXAYX9t4859j2s="; }; patches = [ From e779f3dee4640e44c2e5995afc1ee0559e045ec5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 26 Jan 2022 17:14:23 +0100 Subject: [PATCH 02/68] nixos/tests/wine: fix disksize type --- nixos/tests/wine.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/wine.nix b/nixos/tests/wine.nix index 18ad759b5515..cc449864c762 100644 --- a/nixos/tests/wine.nix +++ b/nixos/tests/wine.nix @@ -17,7 +17,7 @@ let machine = { pkgs, ... }: { environment.systemPackages = [ pkgs."${packageSet}"."${variant}" ]; - virtualisation.diskSize = "800"; + virtualisation.diskSize = 800; }; testScript = '' From 12a589244e53bf99e764c3cef57f3a2e835f6d90 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Fri, 28 Jan 2022 00:50:33 -0800 Subject: [PATCH 03/68] phosh: 0.14.1 -> 0.15.0 --- pkgs/applications/window-managers/phosh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index e1f805662c67..2c01a37aa43c 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "phosh"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects - sha256 = "sha256-FILSNVBYpWSPXeDb1Vc4jZ7zJMg0Gj6EY5yoc81gUr0="; + sha256 = "sha256-ZEfYjgSaj4vVdfgdIcg0PWwlFX90PIm5wvdn9P/8tvo="; }; nativeBuildInputs = [ From 7b48f61bff90ebc37dfb0cf97827f480a427888a Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Fri, 28 Jan 2022 00:50:33 -0800 Subject: [PATCH 04/68] phoc: 0.11.0 -> 0.12.0 --- pkgs/applications/misc/phoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index 67e7407225b8..7acdcdf02c45 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -43,7 +43,7 @@ let }); in stdenv.mkDerivation rec { pname = "phoc"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { owner = "Phosh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oUZtJzclVRSbLG3flF3ryLuvp1kPUtYNsmCG0csSC2A="; + sha256 = "sha256-kfMM/YjgAktpOKHNcxxl1FPVbgATPDNRhEJ/sVT1LYs="; }; nativeBuildInputs = [ From 37c4bacf4c62d956a570bfe0420ae39932046b8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 1 Feb 2022 15:16:44 -0300 Subject: [PATCH 05/68] xfce.xfce4-cpufreq-plugin: 1.2.5 -> 1.2.6 --- .../xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix index e382e8024dad..4743099506c6 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix @@ -3,8 +3,8 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-cpufreq-plugin"; - version = "1.2.5"; - sha256 = "sha256-r783SIGbVKxmLjCxexrMWjYdK7EgbgcHDFTG8KGjWMc="; + version = "1.2.6"; + sha256 = "sha256-HS+9pBCHy0NmDVUwL8QFDPeVpKyKib8YCwV8fZDL5Uc="; buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; From 2bbe6d7b8a63f27a910dbff85fc5e3382bb6143c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 4 Feb 2022 15:58:06 +0100 Subject: [PATCH 06/68] minetest: remove version 4 --- pkgs/games/minetest/default.nix | 9 --------- pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 7ffa361da559..b4ff6b35899f 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -69,12 +69,6 @@ let }; }; - v4 = { - version = "0.4.17.1"; - sha256 = "19sfblgh9mchkgw32n7gdvm7a8a9jxsl9cdlgmxn9bk9m939a2sg"; - dataSha256 = "1g8iw2pya32ifljbdx6z6rpcinmzm81i9minhi2bi1d500ailn7s"; - }; - v5 = { version = "5.4.1"; sha256 = "062ilb7s377q3hwfhl8q06vvcw2raydz5ljzlzwy2dmyzmdcndb8"; @@ -82,9 +76,6 @@ let }; in { - minetestclient_4 = generic (v4 // { buildClient = true; buildServer = false; }); - minetestserver_4 = generic (v4 // { buildClient = false; buildServer = true; }); - minetestclient_5 = generic (v5 // { buildClient = true; buildServer = false; }); minetestserver_5 = generic (v5 // { buildClient = false; buildServer = true; }); } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d836172adb87..a4466bb0ba06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31204,10 +31204,11 @@ with pkgs; inherit (darwin) libiconv; inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa; }) - minetestclient_4 minetestserver_4 minetestclient_5 minetestserver_5; - minetest = minetestclient_5; + minetest = minetestclient; + minetestclient = minetestclient_5; + minetestserver = minetestserver_5; mnemosyne = callPackage ../games/mnemosyne { python = python3; From 6e78755eaf3b86980ae094c761c2f6e82f392f66 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 4 Feb 2022 15:58:32 +0100 Subject: [PATCH 07/68] minetest: 5.4.1 -> 5.5.0 --- pkgs/games/minetest/default.nix | 46 ++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index b4ff6b35899f..b51c65f340a9 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp , libjpeg, libXxf86vm, libGLU, libGL, openal, libvorbis, sqlite, luajit , freetype, gettext, doxygen, ncurses, graphviz, xorg, gmp, libspatialindex -, leveldb, postgresql, hiredis, libiconv, OpenGL, OpenAL ? openal, Carbon, Cocoa +, leveldb, postgresql, hiredis, libiconv, zlib, libXrandr, libX11, ninja, prometheus-cpp +, OpenGL, OpenAL ? openal, Carbon, Cocoa }: with lib; @@ -9,6 +10,21 @@ with lib; let boolToCMake = b: if b then "ON" else "OFF"; + irrlichtMt = stdenv.mkDerivation rec { + pname = "irrlichtMt"; + version = "1.9.0mt4"; + src = fetchFromGitHub { + owner = "minetest"; + repo = "irrlicht"; + rev = version; + sha256 = "sha256-YlXn9LrfGkjdb8+zQGDgrInolUYj9nVSF2AXWFpEEkw="; + }; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib libjpeg libpng libGLU libGL libXrandr libX11 libXxf86vm ]; + outputs = [ "out" "dev" ]; + meta = irrlicht.meta; + }; + generic = { version, rev ? version, sha256, dataRev ? version, dataSha256, buildClient ? true, buildServer ? false }: let sources = { src = fetchFromGitHub { @@ -30,29 +46,41 @@ let src = sources.src; cmakeFlags = [ + "-G Ninja" "-DBUILD_CLIENT=${boolToCMake buildClient}" "-DBUILD_SERVER=${boolToCMake buildServer}" - "-DENABLE_FREETYPE=1" "-DENABLE_GETTEXT=1" + "-DENABLE_SPATIAL=1" "-DENABLE_SYSTEM_JSONCPP=1" - "-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht" + "-DIRRLICHT_INCLUDE_DIR=${irrlichtMt.dev}/include/irrlicht" + + # Remove when https://github.com/NixOS/nixpkgs/issues/144170 is fixed + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_DATADIR=share" + "-DCMAKE_INSTALL_DOCDIR=share/doc" + "-DCMAKE_INSTALL_DOCDIR=share/doc" + "-DCMAKE_INSTALL_MANDIR=share/man" + "-DCMAKE_INSTALL_LOCALEDIR=share/locale" + ] ++ optionals buildClient [ "-DOpenGL_GL_PREFERENCE=GLVND" + ] ++ optionals buildServer [ + "-DENABLE_PROMETHEUS=1" ]; NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 - nativeBuildInputs = [ cmake doxygen graphviz ]; + nativeBuildInputs = [ cmake doxygen graphviz ninja ]; buildInputs = [ - irrlicht luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses + irrlichtMt luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses gmp libspatialindex ] ++ optionals stdenv.isDarwin [ libiconv OpenGL OpenAL Carbon Cocoa ] ++ optionals buildClient [ libpng libjpeg libGLU libGL openal libogg libvorbis xorg.libX11 libXxf86vm ] ++ optionals buildServer [ - leveldb postgresql hiredis + leveldb postgresql hiredis prometheus-cpp ]; postInstall = '' @@ -70,9 +98,9 @@ let }; v5 = { - version = "5.4.1"; - sha256 = "062ilb7s377q3hwfhl8q06vvcw2raydz5ljzlzwy2dmyzmdcndb8"; - dataSha256 = "0i45lbnikvgj9kxdp0yphpjjwjcgp4ibn49xkj78j5ic1s9n8jd4"; + version = "5.5.0"; + sha256 = "sha256-V+ggqvZibSQrJbrtNCEkmRYHhgSKTQsdBh3c8+t6WeA="; + dataSha256 = "sha256-6ZS3EET3nm09eL0czCGadwzon35/EBfAg2KjPX3ZP/0="; }; in { From 267fad119fd4486b3a773b48affbd37284e61c68 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 4 Feb 2022 16:21:28 +0100 Subject: [PATCH 08/68] minetest: remove unused patches --- pkgs/games/minetest/disable_fixup.patch | 10 ---------- pkgs/games/minetest/fix_wordsize_confusion.patch | 10 ---------- 2 files changed, 20 deletions(-) delete mode 100644 pkgs/games/minetest/disable_fixup.patch delete mode 100644 pkgs/games/minetest/fix_wordsize_confusion.patch diff --git a/pkgs/games/minetest/disable_fixup.patch b/pkgs/games/minetest/disable_fixup.patch deleted file mode 100644 index 1c378d7f83fc..000000000000 --- a/pkgs/games/minetest/disable_fixup.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -802,7 +802,6 @@ - install(CODE " - set(BU_CHMOD_BUNDLE_ITEMS ON) - include(BundleUtilities) -- fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/${BUNDLE_PATH}\" \"\" \"\${CMAKE_INSTALL_PREFIX}/${BINDIR}\") - " COMPONENT Runtime) - endif() - diff --git a/pkgs/games/minetest/fix_wordsize_confusion.patch b/pkgs/games/minetest/fix_wordsize_confusion.patch deleted file mode 100644 index 9540a434dafe..000000000000 --- a/pkgs/games/minetest/fix_wordsize_confusion.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -17,6 +17,7 @@ - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -+#include - #include "irrlicht.h" // createDevice - #include "irrlichttypes_extrabloated.h" - #include "chat_interface.h" From 74b1a3d6e26f22f51107f5c652685311a76a7949 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Feb 2022 01:11:43 +0100 Subject: [PATCH 09/68] python3Packages.pytorch: 1.9.0 -> 1.10.2 --- pkgs/development/python-modules/pytorch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 564087769acd..c370eaf6a942 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -117,7 +117,7 @@ let in buildPythonPackage rec { pname = "pytorch"; # Don't forget to update pytorch-bin to the same version. - version = "1.9.0"; + version = "1.10.2"; disabled = !isPy3k; @@ -132,7 +132,7 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-gZmEhV1zzfr/5T2uNfS+8knzyJIxnv2COWVyiAzU9jM="; + sha256 = "sha256-QcvoJqpZJXPSc9HLCJHetrp/hMESuC5kYl90d7Id0ZU="; }; patches = lib.optionals stdenv.isDarwin [ @@ -304,7 +304,7 @@ in buildPythonPackage rec { passthru = { inherit cudaSupport; cudaArchList = final_cudaArchList; - # At least for 1.9.0 `torch.fft` is unavailable unless BLAS provider is MKL. This attribute allows for easy detection of its availability. + # At least for 1.10.2 `torch.fft` is unavailable unless BLAS provider is MKL. This attribute allows for easy detection of its availability. blasProvider = blas.provider; }; From 6e7aebd89d833cb0a4d5d487a57ba54e97c83323 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Feb 2022 01:42:23 +0100 Subject: [PATCH 10/68] python3Packages.torchvision: 0.11.2 -> 0.11.3 --- pkgs/development/python-modules/torchvision/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 4774e09f0b6e..7b6384966ab1 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -24,13 +24,13 @@ let cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" pytorch.cudaArchList; in buildPythonPackage rec { pname = "torchvision"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "pytorch"; repo = "vision"; rev = "v${version}"; - sha256 = "136w9pqyfdsxxc7337q3x42gsr17gs0i0af2swfhzqhz6hd5139i"; + sha256 = "sha256-nJV0Jr6Uc+ALodAiekM6YpM6IbmIb4w+Jlc3bJRqayI="; }; nativeBuildInputs = [ libpng ninja which ] From b1b19bcf9b16a3515c6d6f2870f52eab3932142a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sat, 22 Jan 2022 06:58:55 -0300 Subject: [PATCH 11/68] graphite-gtk-theme: unstable-2022-01-07 -> unstable-2022-02-04 - Update to unstable-2022-02-04 - Optionally install grub theme - Move to pkgs/data/themes/graphite-gtk-theme, as there is also graphite-kde-theme in nixpkgs --- .../default.nix | 21 ++++++++++++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 19 insertions(+), 4 deletions(-) rename pkgs/data/themes/{graphite => graphite-gtk-theme}/default.nix (76%) diff --git a/pkgs/data/themes/graphite/default.nix b/pkgs/data/themes/graphite-gtk-theme/default.nix similarity index 76% rename from pkgs/data/themes/graphite/default.nix rename to pkgs/data/themes/graphite-gtk-theme/default.nix index 7f3ee33c039c..0c9bae8ac31e 100644 --- a/pkgs/data/themes/graphite/default.nix +++ b/pkgs/data/themes/graphite-gtk-theme/default.nix @@ -10,6 +10,8 @@ , sizeVariants ? [] # default: standard , tweaks ? [] , wallpapers ? false +, withGrub ? false +, grubScreens ? [] # default: 1080p }: let @@ -20,16 +22,17 @@ lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "midblack" "rimless" "normal" ] tweaks +lib.checkListOfEnum "${pname}: grub screens" [ "1080p" "2k" "4k" ] grubScreens stdenvNoCC.mkDerivation { inherit pname; - version = "unstable-2022-01-07"; + version = "unstable-2022-02-04"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = "78e5421fee63b4c2a2a3d2e321538367b01a24ec"; - sha256 = "1vfvv1gfbr9yr9mz0kb7c7ij6pxcryni1fjs87gn4hpyzns431wk"; + rev = "7ab6a1b7eda81e914405a9931408b1d5c73e6891"; + sha256 = "09xixd6cz2iyyyg6vskyk0wj2mahfsg21dlfcvi862h8w01hg9lr"; }; nativeBuildInputs = [ @@ -65,6 +68,18 @@ stdenvNoCC.mkDerivation { ''} ''} + ${lib.optionalString withGrub '' + ( + cd other/grub2 + + patchShebangs install.sh + + ./install.sh --justcopy --dest $out/share/grub/themes \ + ${lib.optionalString (builtins.elem "nord" tweaks) "--theme nord"} \ + ${lib.optionalString (grubScreens != []) "--screen " + builtins.toString grubScreens} + ) + ''} + jdupes -L -r $out/share runHook postInstall diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index edd721a9f2a5..cefe027a651b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23738,7 +23738,7 @@ with pkgs; go-font = callPackage ../data/fonts/go-font { }; - graphite-gtk-theme = callPackage ../data/themes/graphite { }; + graphite-gtk-theme = callPackage ../data/themes/graphite-gtk-theme { }; graphite-kde-theme = callPackage ../data/themes/graphite-kde-theme { }; From 3de881ec50d3dd4dc34903f6fcd993e0c8cef0e1 Mon Sep 17 00:00:00 2001 From: Renaud Date: Sat, 5 Feb 2022 21:24:34 +0100 Subject: [PATCH 12/68] deskew: 1.25 -> 1.30 and update homepage --- pkgs/applications/graphics/deskew/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/deskew/default.nix b/pkgs/applications/graphics/deskew/default.nix index 66309ebf7acf..c19b5de2b69c 100644 --- a/pkgs/applications/graphics/deskew/default.nix +++ b/pkgs/applications/graphics/deskew/default.nix @@ -3,33 +3,35 @@ stdenv.mkDerivation rec { pname = "deskew"; - version = "1.25"; + version = "1.30"; src = fetchFromGitHub { owner = "galfar"; repo = pname; rev = "v${version}"; - sha256 = "0zjjj66qhgqkmfxl3q7p78dv4xl4ci918pgl4d5259pqdj1bfgc8"; + hash = "sha256-xghVOEMkQ/mXpOzJqMaT3SII7xneMNoFqRlqjtzmDnA="; }; nativeBuildInputs = [ fpc ]; buildInputs = [ libtiff ]; buildPhase = '' - rm -r Bin # Remove pre-compiled binary - mkdir Bin - chmod +x compile.sh - ./compile.sh + runHook preBuild + patchShebangs ./Scripts + pushd Scripts && ./compile.sh && popd + runHook postBuild ''; installPhase = '' - install -Dt $out/bin Bin/* + runHook preInstall + install -Dt $out/bin Bin/deskew + runHook postInstall ''; meta = with lib; { description = "A command line tool for deskewing scanned text documents"; - homepage = "https://bitbucket.org/galfar/app-deskew/overview"; - license = licenses.mit; + homepage = "https://galfar.vevb.net/deskew"; + license = with licenses; [ mit mpl11 ]; maintainers = with maintainers; [ryantm]; platforms = platforms.all; }; From 8c77a3fc029b6a07f5feb2d0c8be47fcca0e5074 Mon Sep 17 00:00:00 2001 From: Renaud Date: Sun, 6 Feb 2022 12:19:53 +0100 Subject: [PATCH 13/68] ipaexfont: 003.01 -> 004.01 and update homepage --- pkgs/data/fonts/ipaexfont/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/ipaexfont/default.nix b/pkgs/data/fonts/ipaexfont/default.nix index cafd3c16fd4d..5223bc499d5c 100644 --- a/pkgs/data/fonts/ipaexfont/default.nix +++ b/pkgs/data/fonts/ipaexfont/default.nix @@ -1,16 +1,16 @@ { lib, fetchzip }: fetchzip { - name = "ipaexfont-003.01"; + name = "ipaexfont-004.01"; - url = "https://web.archive.org/web/20160616003021/http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip"; + url = "https://moji.or.jp/wp-content/ipafont/IPAexfont/IPAexfont00401.zip"; postFetch = '' mkdir -p $out/share/fonts unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype ''; - sha256 = "02a6sj990cnig5lq0m54nmbmfkr3s57jpxl9fiyzrjmigvd1qmhj"; + sha256 = "0wp369kri33kb1mmiq4lpl9i4xnacw9fj63ycmkmlkq64s8qnjnx"; meta = with lib; { description = "Japanese font package with Mincho and Gothic fonts"; @@ -21,7 +21,7 @@ fetchzip { This is the successor to the IPA fonts. ''; - homepage = "http://ipafont.ipa.go.jp/"; + homepage = "https://moji.or.jp/ipafont/"; license = licenses.ipa; maintainers = with maintainers; [ gebner ]; }; From 0955a4fa354ffb5b7b341826a533c9453058d00e Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Thu, 3 Feb 2022 12:00:00 +0000 Subject: [PATCH 14/68] collectd: don't build with xen plugin by default xen was marked as insecure --- pkgs/tools/system/collectd/plugins.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index de8948db6c91..1455feb1c32f 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -41,8 +41,8 @@ , xen , yajl , IOKit -# Defaults to `null` for all supported plugins, -# list of plugin names for a custom build +# Defaults to `null` for all supported plugins (except xen, which is marked as +# insecure), otherwise a list of plugin names for a custom build , enabledPlugins ? null , ... }: @@ -136,7 +136,7 @@ let buildInputs = if enabledPlugins == null then builtins.concatMap pluginBuildInputs - (builtins.attrNames plugins) + (builtins.attrNames (builtins.removeAttrs plugins ["xencpu"])) else builtins.concatMap pluginBuildInputs enabledPlugins; in { inherit configureFlags buildInputs; From 699c09cbdadf608dc328c6cce0367dbe8f450639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 6 Feb 2022 17:47:46 -0300 Subject: [PATCH 15/68] xfce.xfce4-cpugraph-plugin: 1.2.5 -> 1.2.6 --- .../xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix index 0d0bf49161d2..dd74a0653b8d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix @@ -20,11 +20,11 @@ let category = "panel-plugins"; in stdenv.mkDerivation rec { pname = "xfce4-cpugraph-plugin"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-wvbb1/g8ebY7g8mCMsedBQ4YZA6CRkueyNNkOpLDobA="; + sha256 = "sha256-dzJG9XwYJKhUaNQRnBeusHFw7R66zo+kBsf7z1tHr5k="; }; nativeBuildInputs = [ From af8869b94024a58fd09dc8b176b898da9b63a38f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 6 Feb 2022 17:54:29 -0300 Subject: [PATCH 16/68] xfce.xfce4-sensors-plugin: 1.4.2 -> 1.4.3 --- .../xfce/panel-plugins/xfce4-sensors-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix index fa221e65ea1a..c45fba5ebd79 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix @@ -8,11 +8,11 @@ in stdenv.mkDerivation rec { pname = "xfce4-sensors-plugin"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-2pDxLmrplbzRyBvjVHmnqdMjCMZezWTlaLqMlZLTn8s="; + sha256 = "sha256-FxwCNfcMZfD/7lh+lg2dp5soSFXfIhMCOerCYnLsBsk="; }; nativeBuildInputs = [ From 9f67b1d450c2a5abfd303a2abd2a8f6122057538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 6 Feb 2022 18:08:46 -0300 Subject: [PATCH 17/68] mate.mate-tweak: 22.04.0 -> 22.04.1 --- pkgs/desktops/mate/mate-tweak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/desktops/mate/mate-tweak/default.nix index 5fedc9d9ca11..ebac46692c01 100644 --- a/pkgs/desktops/mate/mate-tweak/default.nix +++ b/pkgs/desktops/mate/mate-tweak/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "mate-tweak"; - version = "22.04.0"; + version = "22.04.1"; src = fetchFromGitHub { owner = "ubuntu-mate"; repo = pname; rev = version; - sha256 = "yCML+RdN7/dCCx5x1m8fUIkBrnfKztwqplpu1wXwDvY="; + sha256 = "FcXJc8tlpP9RCrO6EVGvHPFF6qXorImzi9UccgZU+co="; }; nativeBuildInputs = [ From 1c22d6c0c9e5490732d3fb1103d42e95e9f8a7c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Feb 2022 23:23:32 +0100 Subject: [PATCH 18/68] python3Packages.async-upnp-client: 0.23.4 -> 0.23.5 --- .../python-modules/async-upnp-client/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 12d1e3d098a0..1c818d2724ea 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -14,14 +14,16 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.23.4"; - disabled = pythonOlder "3.6"; + version = "0.23.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "sha256-FrH5PwNpXZpNk7mUnMBGA9MQUPBqBEOoMd9T5ond2WA="; + sha256 = "sha256-fMlP8LX+OFiw6o1rpz8J0sEsACk5x9dQko1oGEaZFuc="; }; propagatedBuildInputs = [ @@ -59,7 +61,9 @@ buildPythonPackage rec { "test_deferred_callback_url" ]; - pythonImportsCheck = [ "async_upnp_client" ]; + pythonImportsCheck = [ + "async_upnp_client" + ]; meta = with lib; { description = "Asyncio UPnP Client library for Python"; From 12f343da4c24a3d7ca22e4f2e55fbd50d79d0662 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 6 Feb 2022 23:35:27 +0100 Subject: [PATCH 19/68] treewide: rename name to pname&version --- pkgs/development/ocaml-modules/functory/default.nix | 4 ++-- pkgs/development/ocaml-modules/inotify/default.nix | 2 +- pkgs/development/ocaml-modules/jsonm/default.nix | 7 +++---- pkgs/development/ocaml-modules/lablgtk-extras/default.nix | 2 +- pkgs/development/ocaml-modules/labltk/default.nix | 2 +- pkgs/development/ocaml-modules/lwt_react/default.nix | 4 ++-- pkgs/development/ocaml-modules/mlgmpidl/default.nix | 2 +- pkgs/development/ocaml-modules/mtime/default.nix | 3 ++- pkgs/development/ocaml-modules/nocrypto/default.nix | 2 +- pkgs/development/ocaml-modules/notty/default.nix | 2 +- pkgs/development/ocaml-modules/num/default.nix | 2 +- pkgs/development/ocaml-modules/ocamlnet/default.nix | 2 +- pkgs/development/ocaml-modules/ocp-ocamlres/default.nix | 2 +- pkgs/development/ocaml-modules/pprint/default.nix | 4 ++-- pkgs/development/ocaml-modules/process/default.nix | 2 +- pkgs/development/ocaml-modules/ptime/default.nix | 2 +- pkgs/development/ocaml-modules/rope/default.nix | 3 ++- pkgs/development/ocaml-modules/rresult/default.nix | 2 +- pkgs/development/ocaml-modules/sosa/default.nix | 2 +- pkgs/development/ocaml-modules/topkg/default.nix | 2 +- pkgs/development/ocaml-modules/wasm/default.nix | 2 +- 21 files changed, 28 insertions(+), 27 deletions(-) diff --git a/pkgs/development/ocaml-modules/functory/default.nix b/pkgs/development/ocaml-modules/functory/default.nix index 2f11001874f1..959963c4752a 100644 --- a/pkgs/development/ocaml-modules/functory/default.nix +++ b/pkgs/development/ocaml-modules/functory/default.nix @@ -13,8 +13,8 @@ let param = in stdenv.mkDerivation { - - name = "ocaml${ocaml.version}-functory-${param.version}"; + pname = "ocaml${ocaml.version}-functory"; + inherit (param) version; src = fetchurl { url = "https://www.lri.fr/~filliatr/functory/download/functory-${param.version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/inotify/default.nix b/pkgs/development/ocaml-modules/inotify/default.nix index 8910b720a847..e8289d929637 100644 --- a/pkgs/development/ocaml-modules/inotify/default.nix +++ b/pkgs/development/ocaml-modules/inotify/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.3"; - name = "ocaml${ocaml.version}-inotify-${version}"; + pname = "ocaml${ocaml.version}-inotify"; src = fetchFromGitHub { owner = "whitequark"; diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix index 78a081619b27..c228242fda9e 100644 --- a/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/pkgs/development/ocaml-modules/jsonm/default.nix @@ -1,9 +1,8 @@ { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf }: -let version = "1.0.1"; in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-jsonm-${version}"; +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-jsonm"; + version = "1.0.1"; src = fetchurl { url = "https://erratique.ch/software/jsonm/releases/jsonm-${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix index 373e5ded952a..d97f2f5bffd2 100644 --- a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix @@ -7,7 +7,7 @@ else stdenv.mkDerivation rec { version = "1.6"; - name = "ocaml${ocaml.version}-lablgtk-extras-${version}"; + pname = "ocaml${ocaml.version}-lablgtk-extras"; src = fetchFromGitLab { domain = "framagit.org"; owner = "zoggy"; diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index bef06975ac55..971668ce0e11 100644 --- a/pkgs/development/ocaml-modules/labltk/default.nix +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { inherit (param) version src; - name = "ocaml${ocaml.version}-labltk-${version}"; + pname = "ocaml${ocaml.version}-labltk"; buildInputs = [ ocaml findlib tcl tk makeWrapper ]; diff --git a/pkgs/development/ocaml-modules/lwt_react/default.nix b/pkgs/development/ocaml-modules/lwt_react/default.nix index 5513935133e8..8b06045445b6 100644 --- a/pkgs/development/ocaml-modules/lwt_react/default.nix +++ b/pkgs/development/ocaml-modules/lwt_react/default.nix @@ -2,9 +2,9 @@ stdenv.mkDerivation rec { version = "1.0.1"; - name = "ocaml${ocaml.version}-lwt_react-${version}"; + pname = "ocaml${ocaml.version}-lwt_react"; src = fetchzip { - url = "https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_react-1.0.1.tar.gz"; + url = "https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_react-${version}.tar.gz"; sha256 = "1bbz7brvdskf4angzn3q2s2s6qdnx7x8m8syayysh23gwv4c7v31"; }; diff --git a/pkgs/development/ocaml-modules/mlgmpidl/default.nix b/pkgs/development/ocaml-modules/mlgmpidl/default.nix index a0026e3a8ca8..4e27c8ff3bb7 100644 --- a/pkgs/development/ocaml-modules/mlgmpidl/default.nix +++ b/pkgs/development/ocaml-modules/mlgmpidl/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, perl, ocaml, findlib, camlidl, gmp, mpfr }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-mlgmpidl-${version}"; + pname = "ocaml${ocaml.version}-mlgmpidl"; version = "1.2.12"; src = fetchFromGitHub { owner = "nberth"; diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index 9fa302947e92..3e4438f6da58 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -16,7 +16,8 @@ let param = in stdenv.mkDerivation { - name = "ocaml${ocaml.version}-mtime-${param.version}"; + pname = "ocaml${ocaml.version}-mtime"; + inherit (param) version; src = fetchurl { url = "https://erratique.ch/software/mtime/releases/mtime-${param.version}.tbz"; diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index 055e6db3a645..fdd24094c17b 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -20,7 +20,7 @@ then throw "nocrypto is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-nocrypto-${version}"; + pname = "ocaml${ocaml.version}-nocrypto"; version = "0.5.4"; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix index 8e1c5f38cb5d..94342bb31282 100644 --- a/pkgs/development/ocaml-modules/notty/default.nix +++ b/pkgs/development/ocaml-modules/notty/default.nix @@ -12,7 +12,7 @@ let withLwt = lwt != null; in stdenv.mkDerivation rec { version = "0.2.2"; - name = "ocaml${ocaml.version}-notty-${version}"; + pname = "ocaml${ocaml.version}-notty"; src = fetchurl { url = "https://github.com/pqwy/notty/releases/download/v${version}/notty-${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/num/default.nix b/pkgs/development/ocaml-modules/num/default.nix index e2c7b439c69e..b1293a2ab553 100644 --- a/pkgs/development/ocaml-modules/num/default.nix +++ b/pkgs/development/ocaml-modules/num/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.1"; - name = "ocaml${ocaml.version}-num-${version}"; + pname = "ocaml${ocaml.version}-num"; src = fetchFromGitHub { owner = "ocaml"; repo = "num"; diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 5c3ca95bb0d8..d6e8f83968aa 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -7,7 +7,7 @@ then throw "ocamlnet is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-ocamlnet-${version}"; + pname = "ocaml${ocaml.version}-ocamlnet"; version = "4.1.9"; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix index be217812834f..7635f3a686cd 100644 --- a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix +++ b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix @@ -5,7 +5,7 @@ then throw "ocp-ocamlres is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-ocp-ocamlres-${version}"; + pname = "ocaml${ocaml.version}-ocp-ocamlres"; version = "0.4"; src = fetchFromGitHub { owner = "OCamlPro"; diff --git a/pkgs/development/ocaml-modules/pprint/default.nix b/pkgs/development/ocaml-modules/pprint/default.nix index 0cdde114709c..8e5a8109d652 100644 --- a/pkgs/development/ocaml-modules/pprint/default.nix +++ b/pkgs/development/ocaml-modules/pprint/default.nix @@ -13,8 +13,8 @@ let param = }; in stdenv.mkDerivation { - - name = "ocaml${ocaml.version}-pprint-${param.version}"; + inherit (param) version; + pname = "ocaml${ocaml.version}-pprint"; src = fetchurl { url = "http://gallium.inria.fr/~fpottier/pprint/pprint-${param.version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/process/default.nix b/pkgs/development/ocaml-modules/process/default.nix index aecf03987ab1..89faf40c3be5 100644 --- a/pkgs/development/ocaml-modules/process/default.nix +++ b/pkgs/development/ocaml-modules/process/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-process-${version}"; + pname = "ocaml${ocaml.version}-process"; version = "0.2.1"; src = fetchFromGitHub { diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix index d99ec7ed3208..7015c6058b4f 100644 --- a/pkgs/development/ocaml-modules/ptime/default.nix +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.8.5"; - name = "ocaml${ocaml.version}-ptime-${version}"; + pname = "ocaml${ocaml.version}-ptime"; src = fetchurl { url = "https://erratique.ch/software/ptime/releases/ptime-${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/rope/default.nix b/pkgs/development/ocaml-modules/rope/default.nix index f29219e30c24..9410ab21ea34 100644 --- a/pkgs/development/ocaml-modules/rope/default.nix +++ b/pkgs/development/ocaml-modules/rope/default.nix @@ -23,7 +23,8 @@ let param = in stdenv.mkDerivation ({ - name = "ocaml${ocaml.version}-rope-${param.version}"; + pname = "ocaml${ocaml.version}-rope"; + inherit (param) version; src = fetchurl { inherit (param) url sha256; diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix index 04631cc3b4bc..1198ca957f01 100644 --- a/pkgs/development/ocaml-modules/rresult/default.nix +++ b/pkgs/development/ocaml-modules/rresult/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-rresult-${version}"; + pname = "ocaml${ocaml.version}-rresult"; version = "0.6.0"; src = fetchurl { url = "https://erratique.ch/software/rresult/releases/rresult-${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/sosa/default.nix b/pkgs/development/ocaml-modules/sosa/default.nix index f244ad550bf1..1605a15bea8e 100644 --- a/pkgs/development/ocaml-modules/sosa/default.nix +++ b/pkgs/development/ocaml-modules/sosa/default.nix @@ -7,7 +7,7 @@ then throw "sosa is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-sosa-${version}"; + pname = "ocaml${ocaml.version}-sosa"; version = "0.3.0"; src = fetchFromGitHub { diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix index 97052115da6b..9e1369a8567b 100644 --- a/pkgs/development/ocaml-modules/topkg/default.nix +++ b/pkgs/development/ocaml-modules/topkg/default.nix @@ -27,7 +27,7 @@ let in stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-topkg-${version}"; + pname = "ocaml${ocaml.version}-topkg"; inherit (param) version; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix index 4befff2721b9..bf7fcb66fe5c 100644 --- a/pkgs/development/ocaml-modules/wasm/default.nix +++ b/pkgs/development/ocaml-modules/wasm/default.nix @@ -5,7 +5,7 @@ then throw "wasm is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-wasm-${version}"; + pname = "ocaml${ocaml.version}-wasm"; version = "1.1.1"; src = fetchFromGitHub { From 875fde78de099f986f954154f40d53213b7b9b16 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 17 Sep 2021 17:33:56 +0200 Subject: [PATCH 20/68] orjail: init at 1.1 --- pkgs/tools/security/orjail/default.nix | 55 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/tools/security/orjail/default.nix diff --git a/pkgs/tools/security/orjail/default.nix b/pkgs/tools/security/orjail/default.nix new file mode 100644 index 000000000000..adcbf5ae4f9f --- /dev/null +++ b/pkgs/tools/security/orjail/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, fetchFromGitHub +, tor +, firejail +, iptables +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "orjail"; + version = "1.1"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "06bwqb3l7syy4c1d8xynxwakmdxvm3qfm8r834nidsknvpdckd9z"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + postPatch = '' + patchShebangs make-helper.bsh + mkdir bin + mv usr/sbin/orjail bin/orjail + rm -r usr + ''; + + makeFlags = [ + "DESTDIR=${placeholder "out"}" + ]; + + postInstall = '' + # Specify binary paths: tor, firejail, iptables + # mktemp fails with /tmp path prefix, will work without it anyway + # https://github.com/orjail/orjail/issues/78 + # firejail will fail reading /etc/hosts, therefore remove --hostname arg + # https://github.com/netblue30/firejail/issues/2758 + substituteInPlace $out/bin/orjail \ + --replace ''$'TORBIN=\n' ''$'TORBIN=${tor}/bin/tor\n' \ + --replace ''$'FIREJAILBIN=\n' ''$'FIREJAILBIN=${firejail}/bin/firejail\n' \ + --replace 'iptables -' '${iptables}/bin/iptables -' \ + --replace 'mktemp /tmp/' 'mktemp ' \ + --replace '--hostname=host ' "" + ''; + + meta = with lib; { + description = "Force programs to exclusively use tor network"; + homepage = "https://github.com/orjail/orjail"; + license = licenses.wtfpl; + maintainers = with maintainers; [ onny ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e9f41a0506b..ef8a486032bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3591,6 +3591,8 @@ with pkgs; oneshot = callPackage ../tools/networking/oneshot { }; + orjail = callPackage ../tools/security/orjail { }; + online-judge-tools = with python3.pkgs; toPythonApplication online-judge-tools; xkbd = callPackage ../applications/misc/xkbd { }; From f5f6dab7122ba1620c38e657a4519e265f47517b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 8 Feb 2022 08:36:05 -0300 Subject: [PATCH 21/68] graphite-kde-theme: unstable-2022-01-22 -> 2022-02-08 --- pkgs/data/themes/graphite-kde-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/graphite-kde-theme/default.nix b/pkgs/data/themes/graphite-kde-theme/default.nix index b402c29922b0..dd3a215a0385 100644 --- a/pkgs/data/themes/graphite-kde-theme/default.nix +++ b/pkgs/data/themes/graphite-kde-theme/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "graphite-kde-theme"; - version = "unstable-2022-01-22"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = "d60a26533b104d6d2251c5187a402f3f35ecbdf7"; - sha256 = "0cry5s3wr0frpchc0hx97r9v6r3v6rvln7l1hb3znn8npkr4mssi"; + rev = version; + sha256 = "0pnn5s1vfdgkpsy5sc838731ly1imi8pbyd4asibw4zi238l0nvf"; }; installPhase = '' From 57c751e81257d8fb7262be3552a61b425e7e02c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 8 Feb 2022 09:01:34 -0300 Subject: [PATCH 22/68] tela-circle-icon-theme: unstable-2021-12-24 -> 2022-02-08 --- pkgs/data/icons/tela-circle-icon-theme/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/icons/tela-circle-icon-theme/default.nix b/pkgs/data/icons/tela-circle-icon-theme/default.nix index 3ed389569bdc..d19dcba69fd8 100644 --- a/pkgs/data/icons/tela-circle-icon-theme/default.nix +++ b/pkgs/data/icons/tela-circle-icon-theme/default.nix @@ -16,13 +16,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brow stdenvNoCC.mkDerivation rec { inherit pname; - version = "unstable-2021-12-24"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = "aa1f1446b6dbc6acfe3ee247e6841369c68e1495"; - sha256 = "03f79h6kv5vbf92fhpi1wivzvcrfvvdvkhbmy805x4b4wl7qynki"; + rev = version; + sha256 = "08a1jhirvn2x9hhjr0lqqqayhsf446cddapprxpsnsn9q6x2j2gp"; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation rec { dontDropIconThemeCache = true; # These fixup steps are slow and unnecessary for this package. - # Package may installs almost 400 000 small files. + # Package may install almost 400 000 small files. dontPatchELF = true; dontRewriteSymlinks = true; From 91948945a1373cef73f8d512d55b7279e00abb4b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 15 Dec 2021 18:42:02 +0000 Subject: [PATCH 23/68] gogoclient: drop --- .../linux/gogoclient/config-paths.patch | 39 ------------------ pkgs/os-specific/linux/gogoclient/default.nix | 41 ------------------- .../linux/gogoclient/gcc46-include-fix.patch | 22 ---------- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 4 -- 5 files changed, 2 insertions(+), 106 deletions(-) delete mode 100644 pkgs/os-specific/linux/gogoclient/config-paths.patch delete mode 100644 pkgs/os-specific/linux/gogoclient/default.nix delete mode 100644 pkgs/os-specific/linux/gogoclient/gcc46-include-fix.patch diff --git a/pkgs/os-specific/linux/gogoclient/config-paths.patch b/pkgs/os-specific/linux/gogoclient/config-paths.patch deleted file mode 100644 index 88358038bc7e..000000000000 --- a/pkgs/os-specific/linux/gogoclient/config-paths.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -urN gogoc-1_2-RELEASE/gogoc-tsp/conf/gogoc.conf.in gogoc-1_2-RELEASE-fix/gogoc-tsp/conf/gogoc.conf.in ---- gogoc-1_2-RELEASE/gogoc-tsp/conf/gogoc.conf.in 2009-11-20 17:53:12.000000000 +0100 -+++ gogoc-1_2-RELEASE-fix/gogoc-tsp/conf/gogoc.conf.in 2012-02-25 15:16:12.758849219 +0100 -@@ -224,7 +224,7 @@ - # - # broker_list= - # --broker_list=tsp-broker-list.txt -+broker_list=/var/lib/gogoc/tsp-broker-list.txt - - # - # Last Server Used File Name: -@@ -234,7 +234,7 @@ - # - # last_server= - # --last_server=tsp-last-server.txt -+last_server=/var/lib/gogoc/tsp-last-server.txt - - # - # Always Use Last Known Working Server: -@@ -294,7 +294,7 @@ - # - # log_filename= - # --log_filename=gogoc.log -+log_filename=/var/log/gogoc.log - - # - # Log File Rotation: -@@ -313,7 +313,7 @@ - # - # log_rotation= - # --log_rotation=yes -+log_rotation=no - - # - # Log File Rotation Size: diff --git a/pkgs/os-specific/linux/gogoclient/default.nix b/pkgs/os-specific/linux/gogoclient/default.nix deleted file mode 100644 index 75c0f1c3d1bc..000000000000 --- a/pkgs/os-specific/linux/gogoclient/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{lib, stdenv, fetchurl, openssl, nettools, iproute2, sysctl}: - -stdenv.mkDerivation rec { - pname = "gogoclient"; - version = "1.2"; - - src = fetchurl { - #url = "http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz"; - url = "https://src.fedoraproject.org/repo/pkgs/gogoc/gogoc-1_2-RELEASE.tar.gz/41177ed683cf511cc206c7782c37baa9/gogoc-1_2-RELEASE.tar.gz"; - sha256 = "a0ef45c0bd1fc9964dc8ac059b7d78c12674bf67ef641740554e166fa99a2f49"; - }; - patches = [./gcc46-include-fix.patch ./config-paths.patch ]; - makeFlags = ["target=linux"]; - installFlags = ["installdir=$(out)"]; - - hardeningDisable = [ "format" ]; - - buildInputs = [openssl]; - - preFixup = '' - mkdir -p $out/share/gogoclient-${version} - chmod 444 $out/bin/gogoc.conf - mv $out/bin/gogoc.conf $out/share/gogoclient-${version}/gogoc.conf.sample - rm $out/bin/gogoc.conf.sample - - substituteInPlace "$out/template/linux.sh" \ - --replace "/sbin/ifconfig" "${nettools}/bin/ifconfig" \ - --replace "/sbin/route" "${nettools}/bin/route" \ - --replace "/sbin/ip" "${iproute2}/sbin/ip" \ - --replace "/sbin/sysctl" "${sysctl}/bin/sysctl" - sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh - ''; - - meta = with lib; { - homepage = "https://ipv6.ernet.in/Tunnel_broker"; - description = "Client to connect to the Freenet6 IPv6 tunnel broker service"; - maintainers = [ maintainers.bluescreen303 ]; - license = licenses.bsd3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/gogoclient/gcc46-include-fix.patch b/pkgs/os-specific/linux/gogoclient/gcc46-include-fix.patch deleted file mode 100644 index 22ecad187d62..000000000000 --- a/pkgs/os-specific/linux/gogoclient/gcc46-include-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -urN gogoc-1_2-RELEASE/gogoc-messaging/src/clientmsgsender.cc gogoc-1_2-RELEASE-fix/gogoc-messaging/src/clientmsgsender.cc ---- gogoc-1_2-RELEASE/gogoc-messaging/src/clientmsgsender.cc 2009-11-20 17:34:55.000000000 +0100 -+++ gogoc-1_2-RELEASE-fix/gogoc-messaging/src/clientmsgsender.cc 2012-02-25 15:06:20.764698284 +0100 -@@ -15,6 +15,7 @@ - // ************************************************************************** - #include - #include -+#include - - - namespace gogocmessaging -diff -urN gogoc-1_2-RELEASE/gogoc-messaging/src/servermsgsender.cc gogoc-1_2-RELEASE-fix/gogoc-messaging/src/servermsgsender.cc ---- gogoc-1_2-RELEASE/gogoc-messaging/src/servermsgsender.cc 2009-11-20 17:34:56.000000000 +0100 -+++ gogoc-1_2-RELEASE-fix/gogoc-messaging/src/servermsgsender.cc 2012-02-25 15:06:36.722740288 +0100 -@@ -15,6 +15,7 @@ - // ************************************************************************** - #include - #include -+#include - - - namespace gogocmessaging diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 52e02f762ea2..8fa8d8ab8fc7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -367,9 +367,11 @@ mapAliases ({ gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12 gnuvd = throw "gnuvd was removed because the backend service is missing"; # added 2020-01-14 gmock = gtest; # moved from top-level 2021-03-14 + go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26 go-pup = pup; # added 2017-12-19 gobby5 = gobby; # added 2021-02-01 gobjectIntrospection = gobject-introspection; # added 2018-12-02 + gogoclient = throw "gogoclient has been removed, because it was unmaintained"; # added 2021-12-15 goimports = gotools; # added 2018-09-16 gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # added 2020-04-23 google-gflags = gflags; # added 2019-07-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04f8419182e4..09468a97abc1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22807,10 +22807,6 @@ with pkgs; quicktemplate = callPackage ../development/tools/quicktemplate { }; - gogoclient = callPackage ../os-specific/linux/gogoclient { - openssl = openssl_1_0_2; - }; - linux-pam = callPackage ../os-specific/linux/pam { }; nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; From d34a4653279524056bcfbda2b58d36c4dd8fd604 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 8 Feb 2022 20:02:22 +0100 Subject: [PATCH 24/68] passExtensions.pass-audit: 1.1 -> 1.2 ChangeLog: https://github.com/roddhjav/pass-audit/blob/v1.2/CHANGELOG.md#12---2022-01-30 --- .../0001-Set-base-to-an-empty-value.patch | 43 +++++++++++++++++++ .../pass/extensions/audit/default.nix | 8 ++-- 2 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/security/pass/extensions/audit/0001-Set-base-to-an-empty-value.patch diff --git a/pkgs/tools/security/pass/extensions/audit/0001-Set-base-to-an-empty-value.patch b/pkgs/tools/security/pass/extensions/audit/0001-Set-base-to-an-empty-value.patch new file mode 100644 index 000000000000..ce6849d677f8 --- /dev/null +++ b/pkgs/tools/security/pass/extensions/audit/0001-Set-base-to-an-empty-value.patch @@ -0,0 +1,43 @@ +From a2d5d973f53efb11bdcaecbd0099df9714bc287f Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Tue, 8 Feb 2022 19:35:35 +0100 +Subject: [PATCH] Set `base` to an empty value + +`DESTDIR` ensures that everything lands in the correct location (i.e. +the target store-path on Nix), within this path, everything should be +moved into `/lib` and `/share`. +--- + setup.py | 17 ++--------------- + 1 file changed, 2 insertions(+), 15 deletions(-) + +diff --git a/setup.py b/setup.py +index 1f0a58b..f7baa41 100644 +--- a/setup.py ++++ b/setup.py +@@ -8,21 +8,8 @@ from pathlib import Path + + from setuptools import setup + +-share = Path(sys.prefix, 'share') +-base = '/usr' +-if os.uname().sysname == 'Darwin': +- base = '/usr/local' +-lib = Path(base, 'lib', 'password-store', 'extensions') +- +-if '--user' in sys.argv: +- if 'PASSWORD_STORE_EXTENSIONS_DIR' in os.environ: +- lib = Path(os.environ['PASSWORD_STORE_EXTENSIONS_DIR']) +- else: +- lib = Path.home() / '.password-store' / '.extensions' +- if 'XDG_DATA_HOME' in os.environ: +- share = Path(os.environ['XDG_DATA_HOME']) +- else: +- share = Path.home() / '.local' / 'share' ++share = Path('share') ++lib = Path('lib', 'password-store', 'extensions') + + setup( + data_files=[ +-- +2.33.1 + diff --git a/pkgs/tools/security/pass/extensions/audit/default.nix b/pkgs/tools/security/pass/extensions/audit/default.nix index 415a4b9e79d1..c4c16b8ff848 100644 --- a/pkgs/tools/security/pass/extensions/audit/default.nix +++ b/pkgs/tools/security/pass/extensions/audit/default.nix @@ -5,16 +5,17 @@ let in stdenv.mkDerivation rec { pname = "pass-audit"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "roddhjav"; repo = "pass-audit"; rev = "v${version}"; - sha256 = "1vapymgpab91kh798mirgs1nb7j9qln0gm2d3321cmsghhb7xs45"; + sha256 = "sha256-xigP8LxRXITLF3X21zhWx6ooFNSTKGv46yFSt1dd4vs="; }; patches = [ + ./0001-Set-base-to-an-empty-value.patch ./0002-Fix-audit.bash-setup.patch ]; @@ -40,7 +41,8 @@ in stdenv.mkDerivation rec { installFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ]; postInstall = '' wrapProgram $out/lib/password-store/extensions/audit.bash \ - --prefix PYTHONPATH : "$out/lib/${pythonEnv.libPrefix}/site-packages" + --prefix PYTHONPATH : "$out/lib/${pythonEnv.libPrefix}/site-packages" \ + --run "export COMMAND" ''; meta = with lib; { From d282f448ff74243ed1a1661c09ae27f010096cef Mon Sep 17 00:00:00 2001 From: Johannes Arnold Date: Sat, 5 Feb 2022 00:50:11 +0100 Subject: [PATCH 25/68] nixos/retroarch: add RetroArch as a desktop session --- .../services/x11/desktop-managers/default.nix | 2 +- .../x11/desktop-managers/retroarch.nix | 40 +++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/retroarch.nix | 49 +++++++++++++++++++ 4 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/x11/desktop-managers/retroarch.nix create mode 100644 nixos/tests/retroarch.nix diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 6ee5b0fc54f7..8247a7e381c9 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -19,7 +19,7 @@ in # E.g., if Plasma 5 is enabled, it supersedes xterm. imports = [ ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix - ./lxqt.nix ./enlightenment.nix ./gnome.nix ./kodi.nix + ./lxqt.nix ./enlightenment.nix ./gnome.nix ./retroarch.nix ./kodi.nix ./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix ./cinnamon.nix ]; diff --git a/nixos/modules/services/x11/desktop-managers/retroarch.nix b/nixos/modules/services/x11/desktop-managers/retroarch.nix new file mode 100644 index 000000000000..d471673d4521 --- /dev/null +++ b/nixos/modules/services/x11/desktop-managers/retroarch.nix @@ -0,0 +1,40 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let cfg = config.services.xserver.desktopManager.retroarch; + +in { + options.services.xserver.desktopManager.retroarch = { + enable = mkEnableOption "RetroArch"; + + package = mkOption { + type = types.package; + default = pkgs.retroarch; + defaultText = literalExpression "pkgs.retroarch"; + example = literalExpression "pkgs.retroarch-full"; + description = "RetroArch package to use."; + }; + + extraArgs = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "--verbose" "--host" ]; + description = "Extra arguments to pass to RetroArch."; + }; + }; + + config = mkIf cfg.enable { + services.xserver.desktopManager.session = [{ + name = "RetroArch"; + start = '' + ${cfg.package}/bin/retroarch -f ${escapeShellArgs cfg.extraArgs} & + waitPID=$! + ''; + }]; + + environment.systemPackages = [ cfg.package ]; + }; + + meta.maintainers = with maintainers; [ j0hax ]; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e49d7e9ab379..9340bf3af176 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -439,6 +439,7 @@ in resolv = handleTest ./resolv.nix {}; restartByActivationScript = handleTest ./restart-by-activation-script.nix {}; restic = handleTest ./restic.nix {}; + retroarch = handleTest ./retroarch.nix {}; riak = handleTest ./riak.nix {}; robustirc-bridge = handleTest ./robustirc-bridge.nix {}; roundcube = handleTest ./roundcube.nix {}; diff --git a/nixos/tests/retroarch.nix b/nixos/tests/retroarch.nix new file mode 100644 index 000000000000..4c96f9eabc82 --- /dev/null +++ b/nixos/tests/retroarch.nix @@ -0,0 +1,49 @@ +import ./make-test-python.nix ({ pkgs, ... }: + + { + name = "retroarch"; + meta = with pkgs.lib.maintainers; { maintainers = [ j0hax ]; }; + + machine = { ... }: + + { + imports = [ ./common/user-account.nix ]; + services.xserver.enable = true; + services.xserver.desktopManager.retroarch = { + enable = true; + package = pkgs.retroarchFull; + }; + services.xserver.displayManager = { + sddm.enable = true; + defaultSession = "RetroArch"; + autoLogin = { + enable = true; + user = "alice"; + }; + }; + }; + + testScript = { nodes, ... }: + let + user = nodes.machine.config.users.users.alice; + xdo = "${pkgs.xdotool}/bin/xdotool"; + in '' + with subtest("Wait for login"): + start_all() + machine.wait_for_file("${user.home}/.Xauthority") + machine.succeed("xauth merge ${user.home}/.Xauthority") + + with subtest("Check RetroArch started"): + machine.wait_until_succeeds("pgrep retroarch") + machine.wait_for_window("^RetroArch ") + + with subtest("Check configuration created"): + machine.wait_for_file("${user.home}/.config/retroarch/retroarch.cfg") + + with subtest("Wait to get a screenshot"): + machine.execute( + "${xdo} key Alt+F1 sleep 10" + ) + machine.screenshot("screen") + ''; + }) From 18c0cca770e290dd885b5aa21000be2b910617d1 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Tue, 8 Feb 2022 23:57:15 +0300 Subject: [PATCH 26/68] maintainers: update azahi --- maintainers/maintainer-list.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ca162d3ddba7..50e91d3068ad 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1179,14 +1179,14 @@ name = "Artturi N"; }; azahi = { - email = "azahi@teknik.io"; - matrix = "@azahi:matrix.org"; + name = "Azat Bahawi"; + email = "azat@bahawi.net"; + matrix = "@azahi:azahi.cc"; github = "azahi"; githubId = 22211000; - name = "Azat Bahawi"; keys = [{ - longkeyid = "rsa2048/0xB40FCB6608BBE3B6"; - fingerprint = "E9F3 483F 31C7 29B4 4CA2 7C38 B40F CB66 08BB E3B6"; + longkeyid = "rsa4096/0xC8C6BDDB3847F72B"; + fingerprint = "2688 0377 C31D 9E81 9BDF 83A8 C8C6 BDDB 3847 F72B"; }]; }; ayazhafiz = { From 4304bd2154031b3bbb3e87c2082fe777054e4215 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Wed, 9 Feb 2022 00:01:05 +0300 Subject: [PATCH 27/68] werf: 1.2.60 -> 1.2.65 --- pkgs/applications/networking/cluster/werf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 3127a94421c0..30966deb0caf 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -11,15 +11,15 @@ buildGoModule rec { pname = "werf"; - version = "1.2.60"; + version = "1.2.65"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-EEceAIlbwfKD2K0pJxmCRn6+yc5RVBassENuMS48794="; + sha256 = "sha256-uQO8zJ3+eAu/F5vmaGCd2qqwK8GRlensqypRlK6CXSk="; }; - vendorSha256 = "sha256-3hNqCIx6S1pEzLMRVmr04pmQrrc3T/Q/FsB/DCAVRCY="; + vendorSha256 = "sha256-dRevwdLiSsM2zzNQ913ytXf2XxZOfLWAUiJjk04mY28="; proxyVendor = true; nativeBuildInputs = [ pkg-config ]; From 1189d2c1f1492fc2cc75083a3b8cd6a96522ac60 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 8 Feb 2022 22:07:34 +0100 Subject: [PATCH 28/68] microcodeIntel: 20210608 -> 20220207 https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20220207 --- pkgs/os-specific/linux/microcode/intel.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index 1f5fd889578c..923047ead11a 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20210608"; + version = "20220207"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - sha256 = "08nk353z2lcqsjbm2qdsfapfgrvlfw0rj7r9scr9pllzkjj5n9x3"; + sha256 = "sha256-yNHYAf8AX8C8iSaFWa6u7knUryaUgvI6nIH9jkD4jjw="; }; nativeBuildInputs = [ iucode-tool libarchive ]; From 884b8ebc8e577a951f4d67274c2fee0ab17c1f43 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Tue, 8 Feb 2022 23:39:42 +0100 Subject: [PATCH 29/68] imagemagick: 7.1.0-22 -> 7.1.0-23 --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 0ceeb899f086..5c9de939dec4 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-22"; + version = "7.1.0-23"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "sha256-Pd/b3lmFpOis8z+ITFScBUNALIKJY4ZOx2VOBwM0Bh4="; + sha256 = "sha256-NNdtJvgExAFPgJxkSDq8N/UqCbuMRw2N5hPnWGszJtI="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From 69e2db3900c0d94c7fc3cf09038cbe45e3d38d32 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 8 Feb 2022 23:50:19 +0100 Subject: [PATCH 30/68] epson-escpr2: 1.1.45 -> 1.1.46 --- pkgs/misc/drivers/epson-escpr2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 44c6e8a4c610..6f17bcbf412b 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.1.45"; + version = "1.1.46"; src = fetchurl { # To find new versions, visit # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for # some printer like for instance "WF-7210" to get to the most recent # version. - url = "https://download3.ebz.epson.net/dsc/f/03/00/13/38/11/01e244e8529c5cbcec8d39220a9512d5e6c08eec/epson-inkjet-printer-escpr2-1.1.45-1lsb3.2.src.rpm"; - sha256 = "sha256-MZXn1fsD3D6W5vlX+NwRkwLtaBRqQwe9lwnJC2L9Lfk="; + url = "https://download3.ebz.epson.net/dsc/f/03/00/13/43/83/99e36ae2747bfae54a5dd32dacaf189a073278aa/epson-inkjet-printer-escpr2-1.1.46-1lsb3.2.src.rpm"; + sha256 = "sha256-7AeDULD/BB+swLBOwijilcM+yJi5slOMw2lEtquLyYw="; }; unpackPhase = '' From 71dad3047930d9222c343cdc9a91173423647854 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 9 Feb 2022 09:11:08 +0800 Subject: [PATCH 31/68] grim: 1.3.2 -> 1.4.0 --- pkgs/tools/graphics/grim/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/grim/default.nix b/pkgs/tools/graphics/grim/default.nix index f678b2bcae98..43824e169047 100644 --- a/pkgs/tools/graphics/grim/default.nix +++ b/pkgs/tools/graphics/grim/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, cairo, libjpeg, meson, ninja, wayland, pkg-config, scdoc, wayland-protocols }: +{ lib, stdenv, fetchFromGitHub, pixman, libpng, libjpeg, meson, ninja, wayland, pkg-config, scdoc, wayland-protocols }: stdenv.mkDerivation rec { pname = "grim"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "sha256-71dmYENfPX8YHcTlR2F67EheoewicePMKm9/wPbmj9A="; + sha256 = "sha256-lwJn1Lysv1qLauqmrduUlzdoKUrUM5uBjv+dWSsrM6w="; }; nativeBuildInputs = [ @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - cairo + pixman + libpng libjpeg wayland wayland-protocols From 30d7dbc2be0b13b17e40b1e556f511f99c2a6bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 9 Feb 2022 08:20:31 +0100 Subject: [PATCH 32/68] nixos/rsyncd: fix module eval --- nixos/modules/services/network-filesystems/rsyncd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix index edac86eb0e30..e72f9b54cd6f 100644 --- a/nixos/modules/services/network-filesystems/rsyncd.nix +++ b/nixos/modules/services/network-filesystems/rsyncd.nix @@ -79,7 +79,7 @@ in { in { services.rsync = { enable = !cfg.socketActivated; - aliases = [ "rsyncd" ]; + aliases = [ "rsyncd.service" ]; description = "fast remote file copy program daemon"; after = [ "network.target" ]; From 3e75cee1989ac1f24c88c85436523dfb6e97d777 Mon Sep 17 00:00:00 2001 From: Will Date: Wed, 9 Feb 2022 08:59:17 +0000 Subject: [PATCH 33/68] spidermonkey_91: 91.5.0 -> 91.6.0 --- pkgs/development/interpreters/spidermonkey/91.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/91.nix b/pkgs/development/interpreters/spidermonkey/91.nix index c3e198361aab..6be61a1210b6 100644 --- a/pkgs/development/interpreters/spidermonkey/91.nix +++ b/pkgs/development/interpreters/spidermonkey/91.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "spidermonkey"; - version = "91.5.1"; + version = "91.6.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha256 = "sha256-NgSWlFBf9e3RoIZIDlo9Kf7dPwsNSoononGmbo/GzR8="; + sha512 = "3dd1929f93cdd087a93fc3597f32d9005c986b59832954e01a8c2472b179c92ad611eaa73d3fc000a08b838a0b70da73ff5ba82d6009160655ba6894cf04520e"; }; outputs = [ "out" "dev" ]; From ca54a649b6675cc3625527717d22b0bcc8d6682e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 9 Feb 2022 09:14:44 +0100 Subject: [PATCH 34/68] thunderbird: 91.5.1 -> 91.6.0 This also fixes build after firefox-esr update (commit 38219f7cc) https://www.thunderbird.net/en-US/thunderbird/91.6.0/releasenotes/ --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index e373c443ea57..033e55575890 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.5.1"; + version = "91.6.0"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "5939e09b143e440efa906d95cda06826bd3a73b2edde5eed86229b8a0e4d1434519059f37d319d26978d7eea9b3906c5e1c1543a2bc2465625d5ab5438855717"; + sha512 = "a11eafe1390141ee3508eea06ba8ab135d0725513977a3b37b3b35f413a1f825dc14fef530b9ac961840804be59291c7f5cba3c93b12726605d4a7255660f749"; }; patches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. From 86aef2a8c7ad3753ed51ca5f4175f6a50a2b41e4 Mon Sep 17 00:00:00 2001 From: Josh Cooper Date: Fri, 19 Nov 2021 19:57:48 +0900 Subject: [PATCH 35/68] maintainers: add jc --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ca162d3ddba7..19cdd164c408 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5462,6 +5462,12 @@ githubId = 221929; name = "Jean-Baptiste Giraudeau"; }; + jc = { + name = "Josh Cooper"; + email = "josh@cooper.is"; + github = "joshua-cooper"; + githubId = 35612334; + }; jceb = { name = "jceb"; email = "jceb@e-jc.de"; From 1389f383e9d8df4809a8a220b1ba90cc9fd2e123 Mon Sep 17 00:00:00 2001 From: Josh Cooper Date: Fri, 19 Nov 2021 20:04:14 +0900 Subject: [PATCH 36/68] pinentry-bemenu: init at 0.9.0 --- .../security/pinentry-bemenu/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/security/pinentry-bemenu/default.nix diff --git a/pkgs/tools/security/pinentry-bemenu/default.nix b/pkgs/tools/security/pinentry-bemenu/default.nix new file mode 100644 index 000000000000..afe1d03fff0b --- /dev/null +++ b/pkgs/tools/security/pinentry-bemenu/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, libassuan +, libgpg-error, popt, bemenu }: + +stdenv.mkDerivation rec { + pname = "pinentry-bemenu"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "t-8ch"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-AFS4T7VqPga53/3rG8be9Q//6/2JJIe7+Ata33ewySg="; + }; + + nativeBuildInputs = [ meson ninja pkg-config ]; + buildInputs = [ libassuan libgpg-error popt bemenu ]; + + meta = with lib; { + description = "Pinentry implementation based on bemenu"; + homepage = "https://github.com/t-8ch/pinentry-bemenu"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jc ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 637462d344f8..e36c29ba409d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8794,6 +8794,8 @@ with pkgs; xcbuildHook = if stdenv.targetPlatform.isAarch64 then xcbuildHook else xcbuild6Hook; }; + pinentry-bemenu = callPackage ../tools/security/pinentry-bemenu { }; + pingtcp = callPackage ../tools/networking/pingtcp { }; pinnwand = callPackage ../servers/pinnwand { }; From 5ccceaccdc9192d298391c9eb841edc026418ba3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Feb 2022 09:45:24 +0000 Subject: [PATCH 37/68] python310Packages.slack-sdk: 3.14.0 -> 3.14.1 --- pkgs/development/python-modules/slack-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index bf9e021cf1af..3c88cc9e7fad 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.14.0"; + version = "3.14.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "sha256-CRE5ghYJzo/w7d2zGh3IYUb2pl8we1XcoTo2ZKWxUZ8="; + sha256 = "sha256-KhEfD8k7qQMfY2ErqApn1K1lhIJgBiVBjjWKL2DjNdg="; }; propagatedBuildInputs = [ From d881ad34758b147bea90b3d4419e900ca2e586f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Feb 2022 09:48:38 +0000 Subject: [PATCH 38/68] typos: 1.3.7 -> 1.4.0 --- pkgs/development/tools/typos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index 6958a7b11d94..b6f6dd2abb6d 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.3.7"; + version = "1.4.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bsPwyTucFJdKp+r8uJ2XLOzvbTM4i5EmSY+3VgyAFuE="; + sha256 = "sha256-XFx8M9cQ7uXm4LS983FOZ6hz3zffLahhwrBjytbwEWk="; }; - cargoSha256 = "sha256-2wJXx8xHPrjzKupuen3XfRMSviYEwYK3nbL5/uTDIzE="; + cargoSha256 = "sha256-ngWvbNx41K3PfGbzJfH8uBUl0cuI/Abj6EbX8YANk6Q="; meta = with lib; { description = "Source code spell checker"; From 43ff5d91b57260213d057e598642282fc5930337 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Feb 2022 11:42:45 +0000 Subject: [PATCH 39/68] python310Packages.pywizlight: 0.5.2 -> 0.5.3 --- pkgs/development/python-modules/pywizlight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix index 7c94f232de65..94b89bcb3795 100644 --- a/pkgs/development/python-modules/pywizlight/default.nix +++ b/pkgs/development/python-modules/pywizlight/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pywizlight"; - version = "0.5.2"; + version = "0.5.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sbidy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/euT77CAcfM9gMBV4SQsJWn6+JWcmqGNN8NGGX93xSg="; + sha256 = "sha256-CbbnCNHmc2yoKX8hDUCD8gIvDX5HNL3HYKpbJjLgQwk="; }; propagatedBuildInputs = [ From 6b9adcbbe1a5cf12e1d115092fe8282d8a4fc0bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Feb 2022 20:20:30 +0100 Subject: [PATCH 40/68] python39Packages.pytest-celery: switch to correct versioned github tarball --- .../python-modules/pytest-celery/default.nix | 27 ++++++++++++------- .../pytest-celery/no-celery.patch | 9 ------- 2 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 pkgs/development/python-modules/pytest-celery/no-celery.patch diff --git a/pkgs/development/python-modules/pytest-celery/default.nix b/pkgs/development/python-modules/pytest-celery/default.nix index 77de2d9698ba..9efd9f49f2b4 100644 --- a/pkgs/development/python-modules/pytest-celery/default.nix +++ b/pkgs/development/python-modules/pytest-celery/default.nix @@ -1,21 +1,30 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { pname = "pytest-celery"; - version = "0.0.0"; + version = "0.1.0"; - src = fetchPypi { - inherit pname version; - sha256 = "cfd060fc32676afa1e4f51b2938f903f7f75d952186b8c6cf631628c4088f406"; + format = "flit"; + + src = fetchFromGitHub { + owner = "celery"; + repo = "pytest-celery"; + rev = "v${version}"; + sha256 = "sha256-vzWwkOS3BLOInaFDk+PegvEmC88ZZ1sG1CmHwhn7r9w="; }; - patches = [ ./no-celery.patch ]; + postPatch = '' + # avoid infinite recursion with celery + substituteInPlace pyproject.toml \ + --replace '"celery >= 4.4.0"' "" + ''; - doCheck = false; # This package has nothing to test or import. + # This package has nothing to test or import. + doCheck = false; meta = with lib; { - description = "pytest plugin for unittest subTest() support and subtests fixture"; - homepage = "https://github.com/pytest-dev/pytest-subtests"; + description = "Pytest plugin to enable celery.contrib.pytest"; + homepage = "https://github.com/celery/pytest-celery"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/pytest-celery/no-celery.patch b/pkgs/development/python-modules/pytest-celery/no-celery.patch deleted file mode 100644 index 65337489883c..000000000000 --- a/pkgs/development/python-modules/pytest-celery/no-celery.patch +++ /dev/null @@ -1,9 +0,0 @@ -This plugin is needed to test celery itself, so it can't depend on celery. - ---- a/setup.py -+++ b/setup.py -@@ -6,3 +6,3 @@ from distutils.core import setup - install_requires = \ --['celery >= 4.4.0'] -+[] - From 381d870fa382af666f4342e12617369fc27532a2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 9 Feb 2022 13:42:36 +0100 Subject: [PATCH 41/68] matrix-synapse.tools.synadm: 0.32 -> 0.33.1 --- pkgs/servers/matrix-synapse/tools/synadm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/tools/synadm.nix b/pkgs/servers/matrix-synapse/tools/synadm.nix index 68099e50b139..46c9add3d88e 100644 --- a/pkgs/servers/matrix-synapse/tools/synadm.nix +++ b/pkgs/servers/matrix-synapse/tools/synadm.nix @@ -4,12 +4,12 @@ with python3Packages; buildPythonApplication rec { pname = "synadm"; - version = "0.32"; + version = "0.33.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "e3fc0db4920d36092a00080fe5b6dac867a6d19f630f69822c8544568f5885e2"; + sha256 = "sha256-eIpRyx1iErZuB3n+Sl231BE47ckIXYzaelod7OtdSF8="; }; postPatch = '' From ea5dd0974d1e74d7338a8763b0f313bb09fa5ed9 Mon Sep 17 00:00:00 2001 From: luhuaei Date: Wed, 9 Feb 2022 21:13:25 +0800 Subject: [PATCH 42/68] mupdf: 1.18 -> 1.19 --- pkgs/applications/misc/mupdf/default.nix | 32 ++---------------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index f23ca82074f6..7bb9a89b8b39 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -31,42 +31,14 @@ let in stdenv.mkDerivation rec { - version = "1.18.0"; + version = "1.19.0"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - sha256 = "0rljl44y8p8hgaqializlyrgpij1wbnrzyp0ll5kcg7w05nylq48"; + sha256 = "1vfyhlqq1a0k0drcggly4bgsjasmf6lmpfbdi5xcrwdbzkagrbr1"; }; - patches = lib.optional stdenv.isDarwin ./darwin.patch ++ [ - (fetchpatch { - name = "pdfocr.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a507b139adf37d2c742e039815601cdc2aa00a84"; - sha256 = "1fx6pdgwrbk3bqsx53764d61llfj9s5q8lxqkna7mjnp7mg4krj3"; - }) - (fetchpatch { - name = "pdf-layer.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=b82e9b6d6b46877e5c3763cc3bc641c66fa7eb54"; - sha256 = "0ma8jq8d9a0mf26qjklgi4gdaflpjik1br1nhafzvjz7ccl56ksm"; - }) - (fetchpatch { - name = "pixmap.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=32e4e8b4bcbacbf92af7c88337efae21986d9603"; - sha256 = "1zqkxgwrhcwsdya98pcmpq2815jjmv3fwsp0sba9f5nq5xi6whbj"; - }) - (fetchpatch { - name = "CVE-2021-3407.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=cee7cefc610d42fd383b3c80c12cbc675443176a"; - sha256 = "18g9jsj90jnqibaff8pqi70a7x8ygc3sh4jl4xnvlv8vr7fxxbh6"; - }) - (fetchpatch { - name = "CVE-2021-37220.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=f5712c9949d026e4b891b25837edd2edc166151f"; - sha256 = "1zyw6w6zr7k2akpzkyycj2zzw3y5qc7afsn1ysklfj2rvb6cnsx3"; - }) - ]; - postPatch = '' sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c ''; From 94c73cb74fa6e873a0861a23b44f61a8f5fad760 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 9 Feb 2022 14:37:09 +0100 Subject: [PATCH 43/68] grafana: 8.3.4 -> 8.3.5 https://grafana.com/blog/2022/02/08/grafana-7.5.15-and-8.3.5-released-with-moderate-severity-security-fixes Fixes CVE-2022-21702, CVE-2022-21703, CVE-2022-21713. --- pkgs/servers/monitoring/grafana/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index c842f4462370..21620c63548b 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "8.3.4"; + version = "8.3.5"; excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-Ikvl8jsStMGDIc0y4cKWwyXJHTu4V4nCKiLUyERjRsw="; + sha256 = "sha256-frkrYDiPxP3zDpZyYp/9MbNthaJlBF4Z+DdBs2G4jE8="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-UI+NouSRwQVmAgx19OHhWcoDLj9KD05xh57/1gLvWmA="; + sha256 = "sha256-1gk9MK110K5bV3hIPAE2dSS8wgH12dxvmNu3Ku/42e0="; }; - vendorSha256 = "sha256-gaY6liueEmngxjPSegmycrLpfsB0p1YWWrNGbzpHHOc="; + vendorSha256 = "sha256-Wg4VELJyrR/VbaFNamoziRU66GTVJxBUZ1vluKjn0O8="; nativeBuildInputs = [ wire ]; From a581263556e862474ad9c446d65f0d50cfbb6dae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Feb 2022 01:01:29 +0000 Subject: [PATCH 44/68] python310Packages.pywayland: 0.4.9 -> 0.4.10 --- pkgs/development/python-modules/pywayland/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywayland/default.nix b/pkgs/development/python-modules/pywayland/default.nix index f1dbd72cef0f..c115174b6e45 100644 --- a/pkgs/development/python-modules/pywayland/default.nix +++ b/pkgs/development/python-modules/pywayland/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pywayland"; - version = "0.4.9"; + version = "0.4.10"; src = fetchPypi { inherit pname version; - sha256 = "EJ/Ul1ZpIQa5Mw6UmkRi7GC+b+mCMqhto6EsfNjpCdg="; + sha256 = "sha256-3fVAJXiIS6sFUj8riHg7LJ4VLLpjZEK8qTJNYSaXtOw="; }; nativeBuildInputs = [ pkg-config ]; From e1b74dce5cceeb550c301c2de94397dc445a9fe9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Feb 2022 09:35:59 +0000 Subject: [PATCH 45/68] python310Packages.ufoLib2: 0.13.0 -> 0.13.1 --- pkgs/development/python-modules/ufoLib2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ufoLib2/default.nix b/pkgs/development/python-modules/ufoLib2/default.nix index 6697e0b705f1..21894203d1ad 100644 --- a/pkgs/development/python-modules/ufoLib2/default.nix +++ b/pkgs/development/python-modules/ufoLib2/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "ufoLib2"; - version = "0.13.0"; + version = "0.13.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "xJfvyNE+30BgNirX8u1xhKcD8pM3owRAVC4WX+qFqEM="; + sha256 = "sha256-MnWi2mI+bUt+4pyYTNs6W4a7wj8KHOlEhti7XDCKpHs="; }; propagatedBuildInputs = [ From 7bb11f2950c8ffe666141faa80a8fe0ea4067d6e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Feb 2022 08:37:04 +0000 Subject: [PATCH 46/68] python310Packages.pip-tools: 6.5.0 -> 6.5.1 --- pkgs/development/python-modules/pip-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index cd7d8f0cce72..307e99c04d80 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "6.5.0"; + version = "6.5.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0U6k/CwRjbKmr2WkNFqLmzVeeSrtrWv2TdPrl8X8X+4="; + sha256 = "sha256-gPViqmmfx2pCRTlpfgvvQeSQoFDlemohRoUxmBqdQZ4="; }; checkInputs = [ From 641899248d329de7cedbf9ddc377c58e0de6a6d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Feb 2022 06:58:02 +0000 Subject: [PATCH 47/68] webkitgtk: 2.34.4 -> 2.34.5 https://webkitgtk.org/2022/02/09/webkitgtk2.34.5-released.html https://webkitgtk.org/security/WSA-2022-0002.html Fixes: CVE-2022-22589, CVE-2022-22590, CVE-2022-22592 --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index e9026d46bc69..0894457f9816 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -64,7 +64,7 @@ assert enableGeoLocation -> geoclue2 != null; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.34.4"; + version = "2.34.5"; outputs = [ "out" "dev" ]; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-l19QGRmbp2mRkYNc914BoYuU47zQEH2nOJ1N3LGrpAY="; + sha256 = "sha256-aJMGQ696R6OvBfRtZueEQiQzdT2rM10ygvMZqFpWKbQ="; }; patches = lib.optionals stdenv.isLinux [ From 5efa1bce1707f93be859fcf378842aba2e3849e4 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 25 Jan 2022 02:20:26 +0100 Subject: [PATCH 48/68] prometheus-alertmanager: 0.21.0 -> 0.23.0 --- .../monitoring/prometheus/alertmanager.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 251c977bd4df..db9443fc04a9 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -1,20 +1,22 @@ -{ lib, go, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, go, buildGoModule, fetchFromGitHub, installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "alertmanager"; - version = "0.21.0"; + version = "0.23.0"; rev = "v${version}"; - goPackagePath = "github.com/prometheus/alertmanager"; - src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "alertmanager"; - sha256 = "0zrzyaqs73pz4rmj4xaj15x4n1542m0nb7jqm2j77k07j75r5w41"; + sha256 = "sha256-06mKgWUyw5jsjKiRXQ9/oqHvFdkY2nS9Z3eW60lTNbU="; }; - ldflags = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in [ + vendorSha256 = "sha256-zJvzCC7Vn5repWssyDuGtoUSZC2ojQhMqDX5Orr0ST0="; + + subPackages = [ "cmd/alertmanager" "cmd/amtool" ]; + + ldflags = let t = "github.com/prometheus/common/version"; in [ "-X ${t}.Version=${version}" "-X ${t}.Revision=${src.rev}" "-X ${t}.Branch=unknown" @@ -28,6 +30,8 @@ buildGoPackage rec { postInstall = '' $out/bin/amtool --completion-script-bash > amtool.bash installShellCompletion amtool.bash + $out/bin/amtool --completion-script-zsh > amtool.zsh + installShellCompletion amtool.zsh ''; meta = with lib; { From b63e6649a6fab8192eae9826482f0c301addc997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 9 Feb 2022 18:44:36 +0100 Subject: [PATCH 49/68] systemd: add myself as maintainer, drop eelco --- pkgs/os-specific/linux/systemd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index c2879ed939ed..3a3a419093b7 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -616,6 +616,6 @@ stdenv.mkDerivation { license = licenses.lgpl21Plus; platforms = platforms.linux; priority = 10; - maintainers = with maintainers; [ eelco flokli kloenk ]; + maintainers = with maintainers; [ flokli kloenk mic92 ]; }; } From f5be6f48ff8ec879a23f8fea68725767c7fc2326 Mon Sep 17 00:00:00 2001 From: Nelson Jeppesen <50854675+NelsonJeppesen@users.noreply.github.com> Date: Tue, 4 Jan 2022 10:40:25 -0800 Subject: [PATCH 50/68] glooctl: init at 1.10.6 --- .../networking/cluster/glooctl/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/networking/cluster/glooctl/default.nix diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix new file mode 100644 index 000000000000..6920c11dcae5 --- /dev/null +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -0,0 +1,36 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "glooctl"; + version = "1.10.6"; + + src = fetchFromGitHub { + owner = "solo-io"; + repo = "gloo"; + rev = "v${version}"; + sha256 = "sha256-t63tK0hwbVnUP9UxS8g3uzL3rBvKR10vu1E85mNV3E0="; + }; + + subPackages = [ "projects/gloo/cli/cmd" ]; + vendorSha256 = "sha256-IBuAUKbX1esx2p4Q/b3UxQH9S3VVNYZcn5vRKtmhO0A="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + mv $out/bin/cmd $out/bin/glooctl + + export HOME=$TMP + installShellCompletion --cmd glooctl \ + --bash <($out/bin/glooctl completion bash) \ + --zsh <($out/bin/glooctl completion zsh) + ''; + + ldflags = [ "-s" "-w" "-X github.com/solo-io/gloo/pkg/version.Version=${version}" ]; + + meta = with lib; { + description = "glooctl is the unified CLI for Gloo"; + homepage = "https://docs.solo.io/gloo-edge/latest/reference/cli/glooctl/"; + license = licenses.asl20; + maintainers = with maintainers; [ nelsonjeppesen ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 316808c52af6..ac593b9220fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1013,6 +1013,8 @@ with pkgs; gfshare = callPackage ../tools/security/gfshare { }; + glooctl = callPackage ../applications/networking/cluster/glooctl { }; + gobgp = callPackage ../tools/networking/gobgp { }; gofu = callPackage ../applications/misc/gofu { }; From 90afb85ad3f18a3c912c0f84003aeee05e714566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 9 Feb 2022 19:04:54 +0100 Subject: [PATCH 51/68] radare2: 5.5.4 -> 5.6.0 --- pkgs/development/tools/analysis/radare2/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index c50f75c154ea..a55a5f09b7d8 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -44,13 +44,13 @@ let in stdenv.mkDerivation rec { pname = "radare2"; - version = "5.5.4"; + version = "5.6.0"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - sha256 = "sha256-zELmNpbT1JCt0UAzHwzcTDN9QZTLQY0+rG9zVRWxiFg="; + sha256 = "sha256-AhO7Ev/4M9dtogNIMWOc03ARD5H2gdlRXR4Qpnkf7bw="; }; preBuild = '' @@ -67,10 +67,6 @@ stdenv.mkDerivation rec { done ''; - postInstall = '' - install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm - ''; - WITHOUT_PULL = "1"; makeFlags = [ "GITTAP=${version}" From e73edac05b9923433515b42b4282f66f2590ebf7 Mon Sep 17 00:00:00 2001 From: Renaud Date: Wed, 9 Feb 2022 19:22:32 +0100 Subject: [PATCH 52/68] chef-dk: install all binaries When using pname+version all binaries other than `chef` are missing Fixes #70171 --- pkgs/development/tools/chefdk/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index 9e0e40b69f4b..93af8815fb3a 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -1,8 +1,9 @@ { lib, bundlerEnv, bundlerUpdateScript, ruby, perl, autoconf }: bundlerEnv { - pname = "chef-dk"; - version = "4.13.3"; + name = "chef-dk-4.13.3"; + # Do not change this to pname & version until underlying issues with Ruby + # packaging are resolved ; see https://github.com/NixOS/nixpkgs/issues/70171 inherit ruby; gemdir = ./.; From b59150949cc48faa1d924a3dc825343684cd14aa Mon Sep 17 00:00:00 2001 From: Savanni D'Gerinel Date: Tue, 8 Feb 2022 12:57:29 -0500 Subject: [PATCH 53/68] 1password-gui: 8.3.0 -> 8.5.0 --- pkgs/applications/misc/1password-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index ac3922e17d4b..6de089ba58c5 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -33,11 +33,11 @@ }: stdenv.mkDerivation rec { pname = "1password"; - version = "8.3.0"; + version = "8.5.0"; src = fetchurl { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "1cakv316ipwyw6s3x4a6qhl0nmg17bxhh08c969gma3svamh1grw"; + sha256 = "tnZr+qjUcJ9Fhk6RP8iwu+/JsvYSE03NHhBfhedyCTQ="; }; nativeBuildInputs = [ makeWrapper ]; From aa0ff15bf54478d9f6544afaceda6daece3da3eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 9 Feb 2022 22:06:22 +0000 Subject: [PATCH 54/68] radicale: 3.1.4 -> 3.1.5 https://github.com/Kozea/Radicale/blob/v3.1.5/CHANGELOG.md --- pkgs/servers/radicale/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/radicale/3.x.nix b/pkgs/servers/radicale/3.x.nix index 939061c6a6e7..d0ed5cc97a64 100644 --- a/pkgs/servers/radicale/3.x.nix +++ b/pkgs/servers/radicale/3.x.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "radicale"; - version = "3.1.4"; + version = "3.1.5"; src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; rev = "v${version}"; - hash = "sha256-vX6lYiDqpQeWVLotyt2ODwcjskWB6EuCky3/V8m1m7Q="; + hash = "sha256-PGPUV0oOWmzc7Lih6D0sCwIuUB8FOyOrYUEIvMpr4HE="; }; postPatch = '' From 464e9792ff3e472944043d5c88cc455e5df70256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20B=C3=BChler?= Date: Thu, 10 Feb 2022 01:28:00 +0100 Subject: [PATCH 55/68] treewide: rename name to pname&version (#158454) Co-authored-by: Sandro --- pkgs/development/ocaml-modules/apron/default.nix | 2 +- pkgs/development/ocaml-modules/astring/default.nix | 2 +- pkgs/development/ocaml-modules/bap/default.nix | 6 +++--- pkgs/development/ocaml-modules/batteries/default.nix | 7 +++---- pkgs/development/ocaml-modules/benchmark/default.nix | 7 +++---- pkgs/development/ocaml-modules/bos/default.nix | 3 ++- pkgs/development/ocaml-modules/camlpdf/default.nix | 3 ++- pkgs/development/ocaml-modules/cpdf/default.nix | 7 +++---- pkgs/development/ocaml-modules/dum/default.nix | 2 +- pkgs/development/ocaml-modules/elina/default.nix | 2 +- pkgs/development/ocaml-modules/erm_xmpp/default.nix | 2 +- pkgs/development/ocaml-modules/expat/default.nix | 2 +- pkgs/development/ocaml-modules/farfadet/default.nix | 2 +- pkgs/development/ocaml-modules/frontc/default.nix | 4 ++-- 14 files changed, 25 insertions(+), 26 deletions(-) diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix index 959a7203dfa9..c9edfd62e06d 100644 --- a/pkgs/development/ocaml-modules/apron/default.nix +++ b/pkgs/development/ocaml-modules/apron/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, perl, gmp, mpfr, ppl, ocaml, findlib, camlidl, mlgmpidl }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-apron-${version}"; + pname = "ocaml${ocaml.version}-apron"; version = "0.9.13"; src = fetchFromGitHub { owner = "antoinemine"; diff --git a/pkgs/development/ocaml-modules/astring/default.nix b/pkgs/development/ocaml-modules/astring/default.nix index ba8cd98327fa..8ecac1c124d6 100644 --- a/pkgs/development/ocaml-modules/astring/default.nix +++ b/pkgs/development/ocaml-modules/astring/default.nix @@ -14,7 +14,7 @@ let in stdenv.mkDerivation { - name = "ocaml${ocaml.version}-astring-${param.version}"; + pname = "ocaml${ocaml.version}-astring"; inherit (param) version; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index c1cb7de2d188..6723ad0c1c81 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -15,7 +15,7 @@ then throw "BAP is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-bap-${version}"; + pname = "ocaml${ocaml.version}-bap"; version = "2.2.0"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; setupHook = writeText "setupHook.sh" '' - export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/" - export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}-llvm-plugins/" + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/ocaml${ocaml.version}-bap-${version}/" + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/ocaml${ocaml.version}-bap-${version}-llvm-plugins/" ''; nativeBuildInputs = [ which makeWrapper ]; diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index d2edb69e1b94..69e8289df2cd 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -6,10 +6,9 @@ if !lib.versionAtLeast ocaml.version "4.02" then throw "batteries is not available for OCaml ${ocaml.version}" else -let version = "3.4.0"; in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-batteries-${version}"; +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-batteries"; + version = "3.4.0"; src = fetchFromGitHub { owner = "ocaml-batteries-team"; diff --git a/pkgs/development/ocaml-modules/benchmark/default.nix b/pkgs/development/ocaml-modules/benchmark/default.nix index 07432dd7c6e7..3397821319e3 100644 --- a/pkgs/development/ocaml-modules/benchmark/default.nix +++ b/pkgs/development/ocaml-modules/benchmark/default.nix @@ -1,9 +1,8 @@ { stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, ocaml_pcre }: -let version = "1.4"; in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-benchmark-${version}"; +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-benchmark"; + version = "1.4"; src = fetchzip { url = "https://github.com/Chris00/ocaml-benchmark/releases/download/${version}/benchmark-${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/bos/default.nix b/pkgs/development/ocaml-modules/bos/default.nix index 62438526d703..17a0185829e9 100644 --- a/pkgs/development/ocaml-modules/bos/default.nix +++ b/pkgs/development/ocaml-modules/bos/default.nix @@ -3,8 +3,9 @@ }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-bos-${version}"; + pname = "ocaml${ocaml.version}-bos"; version = "0.2.0"; + src = fetchurl { url = "https://erratique.ch/software/bos/releases/bos-${version}.tbz"; sha256 = "1s10iqx8rgnxr5n93lf4blwirjf8nlm272yg5sipr7lsr35v49wc"; diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix index 3d79fa377a53..42c27f15a5b1 100644 --- a/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -6,7 +6,8 @@ else stdenv.mkDerivation rec { version = "2.5"; - name = "ocaml${ocaml.version}-camlpdf-${version}"; + pname = "ocaml${ocaml.version}-camlpdf"; + src = fetchFromGitHub { owner = "johnwhitington"; repo = "camlpdf"; diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index 2da2b12b5b3b..632430fe4f7f 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -4,10 +4,9 @@ if !lib.versionAtLeast ocaml.version "4.10" then throw "cpdf is not available for OCaml ${ocaml.version}" else -let version = "2.5"; in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-cpdf-${version}"; +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-cpdf"; + version = "2.5"; src = fetchFromGitHub { owner = "johnwhitington"; diff --git a/pkgs/development/ocaml-modules/dum/default.nix b/pkgs/development/ocaml-modules/dum/default.nix index d8aa1f371f3b..7bdaf2dfad90 100644 --- a/pkgs/development/ocaml-modules/dum/default.nix +++ b/pkgs/development/ocaml-modules/dum/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-dum-${version}"; + pname = "ocaml${ocaml.version}-dum"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/pkgs/development/ocaml-modules/elina/default.nix b/pkgs/development/ocaml-modules/elina/default.nix index 4eff6c2957de..2ddef0f40529 100644 --- a/pkgs/development/ocaml-modules/elina/default.nix +++ b/pkgs/development/ocaml-modules/elina/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.1"; - name = "ocaml${ocaml.version}-elina-${version}"; + pname = "ocaml${ocaml.version}-elina"; src = fetchurl { url = "http://files.sri.inf.ethz.ch/elina-${version}.tar.gz"; sha256 = "1nymykskq1yx87y4xl6hl9i4q6kv0qaq25rniqgl1bfn883p1ysc"; diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix index 9eaad7575ec3..3447d590ea23 100644 --- a/pkgs/development/ocaml-modules/erm_xmpp/default.nix +++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.3+20200317"; - name = "ocaml${ocaml.version}-erm_xmpp-${version}"; + pname = "ocaml${ocaml.version}-erm_xmpp"; src = fetchFromGitHub { owner = "hannesm"; diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix index 1812473e78bf..e951acaa71a5 100644 --- a/pkgs/development/ocaml-modules/expat/default.nix +++ b/pkgs/development/ocaml-modules/expat/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, expat, ocaml, findlib, ounit }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-expat-${version}"; + pname = "ocaml${ocaml.version}-expat"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/ocaml-modules/farfadet/default.nix b/pkgs/development/ocaml-modules/farfadet/default.nix index 77eef7f29a98..79b742da575d 100644 --- a/pkgs/development/ocaml-modules/farfadet/default.nix +++ b/pkgs/development/ocaml-modules/farfadet/default.nix @@ -7,7 +7,7 @@ then throw "farfadet is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-farfadet-${version}"; + pname = "ocaml${ocaml.version}-farfadet"; version = "0.3"; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/frontc/default.nix b/pkgs/development/ocaml-modules/frontc/default.nix index e68f6a28cb47..bc74a5b58a08 100644 --- a/pkgs/development/ocaml-modules/frontc/default.nix +++ b/pkgs/development/ocaml-modules/frontc/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-FrontC-${version}"; + pname = "ocaml${ocaml.version}-FrontC"; version = "3.4.1"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "FrontC"; - rev = "V_3_4_1"; + rev = "V_${lib.replaceStrings ["."] ["_"] version}"; sha256 = "1dq5nks0c9gsbr1m8k39m1bniawr5hqcy1r8x5px7naa95ch06ak"; }; From e646b64ebbfd11f901e6a601a1ad422cd71f2da3 Mon Sep 17 00:00:00 2001 From: Jean-Francois Chevrette Date: Wed, 9 Feb 2022 18:03:04 -0500 Subject: [PATCH 56/68] jless: init at 0.7.1 --- pkgs/development/tools/jless/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/tools/jless/default.nix diff --git a/pkgs/development/tools/jless/default.nix b/pkgs/development/tools/jless/default.nix new file mode 100644 index 000000000000..563002e9fcb9 --- /dev/null +++ b/pkgs/development/tools/jless/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "jless"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "PaulJuliusMartinez"; + repo = "jless"; + rev = "v${version}"; + sha256 = "sha256-gBqyo/N/qF6HCTUrSKNVLiL1fc/JTfip1kNpNCBzRT8="; + }; + + cargoSha256 = "sha256-PbX61RVbrI2kTuyXK+LhQdJDvNo3KjIQH5eBbL6iUBM="; + + meta = with lib; { + description = "A command-line pager for JSON data"; + homepage = "https://github.com/PaulJuliusMartinez/jless"; + license = licenses.mit; + maintainers = with maintainers; [ jfchevrette ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49065aa070dc..fd006e86a982 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6770,6 +6770,8 @@ with pkgs; jl = haskellPackages.callPackage ../development/tools/jl { }; + jless = callPackage ../development/tools/jless { }; + jmespath = callPackage ../development/tools/jmespath { }; jmtpfs = callPackage ../tools/filesystems/jmtpfs { }; From 359687c5b0ea6c2509c013693d51360bf0c90fe3 Mon Sep 17 00:00:00 2001 From: Jean-Francois Chevrette Date: Wed, 9 Feb 2022 18:03:59 -0500 Subject: [PATCH 57/68] add jfchevrette to maintainers --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ca162d3ddba7..5cbd2fabac52 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5590,6 +5590,16 @@ githubId = 143075; name = "James Felix Black"; }; + jfchevrette = { + email = "jfchevrette@gmail.com"; + github = "jfchevrette"; + githubId = 3001; + name = "Jean-Francois Chevrette"; + keys = [{ + longkeyid = "rsa4096/0x67A0585801290DC6"; + fingerprint = "B612 96A9 498E EECD D5E9 C0F0 67A0 5858 0129 0DC6"; + }]; + }; jflanglois = { email = "yourstruly@julienlanglois.me"; github = "jflanglois"; From 564d59b339e29a5728fd295f45a42d8bcc1e2baa Mon Sep 17 00:00:00 2001 From: Congee Date: Wed, 9 Feb 2022 13:57:57 -0500 Subject: [PATCH 58/68] maintainers: add congee --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 418898814f87..12485241da79 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2382,6 +2382,13 @@ githubId = 11145016; name = "J.C."; }; + congee = { + email = "changshengwu@pm.me"; + matrix = "@congeec:matrix.org"; + github = "congee"; + name = "Changsheng Wu"; + githubId = 2083950; + }; contrun = { email = "uuuuuu@protonmail.com"; github = "contrun"; From 3b93e99c670e311a86ebf702e34322c8aeb04828 Mon Sep 17 00:00:00 2001 From: Congee Date: Tue, 8 Feb 2022 18:45:07 -0500 Subject: [PATCH 59/68] leetcode-cli: init at 0.3.10 --- .../misc/leetcode-cli/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/misc/leetcode-cli/default.nix diff --git a/pkgs/applications/misc/leetcode-cli/default.nix b/pkgs/applications/misc/leetcode-cli/default.nix new file mode 100644 index 000000000000..03f25588682d --- /dev/null +++ b/pkgs/applications/misc/leetcode-cli/default.nix @@ -0,0 +1,41 @@ +{ lib +, fetchCrate +, rustPlatform +, pkg-config +, openssl +, dbus +, sqlite +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "leetcode-cli"; + version = "0.3.10"; + + src = fetchCrate { + inherit pname version; + sha256 = "SkJLA49AXNTpiWZByII2saYLyN3bAAJTlCvhamlOEXA="; + }; + + cargoSha256 = "xhKF4qYOTdt8iCSPY5yT8tH3l54HdkOAIS2SBGzqsdo="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + dbus + sqlite + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + + meta = with lib; { + description = "May the code be with you 👻"; + longDescription = "Use leetcode.com in command line"; + homepage = "https://github.com/clearloop/leetcode-cli"; + license = licenses.mit; + maintainers = with maintainers; [ congee ]; + mainProgram = "leetcode"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce47fbb70353..7f466073b098 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1903,6 +1903,8 @@ with pkgs; lastpass-cli = callPackage ../tools/security/lastpass-cli { }; + leetcode-cli = callPackage ../applications/misc/leetcode-cli { }; + lesspass-cli = callPackage ../tools/security/lesspass-cli { }; lsix = callPackage ../tools/graphics/lsix { }; From 0fbe6cb466e9402ff9a440e891ae3866ac1b2ef0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Feb 2022 01:21:18 +0000 Subject: [PATCH 60/68] python310Packages.diagrams: 0.21.0 -> 0.21.1 --- pkgs/development/python-modules/diagrams/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/diagrams/default.nix b/pkgs/development/python-modules/diagrams/default.nix index d6173494e8dc..84d98d091356 100644 --- a/pkgs/development/python-modules/diagrams/default.nix +++ b/pkgs/development/python-modules/diagrams/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "diagrams"; - version = "0.21.0"; + version = "0.21.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mingrammer"; repo = pname; rev = "v${version}"; - sha256 = "1vj14kqffpafykyr9x5dcfhmqqvxq08lrp94lhqpdzikh6a0a0jx"; + sha256 = "sha256-YoXV5ikkBCSVyGmzEqp+7JLy82d7z9sbwS+U/EN3BFk="; }; postPatch = '' From c65dea71411175638ef4bb8ec994021c18d41efd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 18 Jan 2022 19:05:05 +0000 Subject: [PATCH 61/68] python3Packages.pyrfxtrx: 0.27.0 -> 0.27.1 https://github.com/Danielhiversen/pyRFXtrx/releases/tag/0.27.1 --- pkgs/development/python-modules/pyrfxtrx/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrfxtrx/default.nix b/pkgs/development/python-modules/pyrfxtrx/default.nix index 6b63ac8f9fe2..7e1fb8876cb0 100644 --- a/pkgs/development/python-modules/pyrfxtrx/default.nix +++ b/pkgs/development/python-modules/pyrfxtrx/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pyrfxtrx"; - version = "0.27.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyRFXtrx"; rev = version; - sha256 = "0nzgy56b2v3bnn9idlb67qkzj4cj5j9v1436ri1y305fqwjy48nm"; + hash = "sha256-JBU/ApBumdW87fQqMAopzv+UV0f6VsHMiyNqG7BRLgo="; }; propagatedBuildInputs = [ @@ -24,6 +24,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = [ + # https://github.com/Danielhiversen/pyRFXtrx/issues/130 + "tests/test_rollertrol.py" + ]; + meta = with lib; { description = "Library to communicate with the RFXtrx family of devices"; homepage = "https://github.com/Danielhiversen/pyRFXtrx"; From f78a083dddec6e14eae842655f6f01a45ff2113a Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 9 Feb 2022 16:09:55 -0800 Subject: [PATCH 62/68] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 240 ++++++++++++++-------------- 1 file changed, 120 insertions(+), 120 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 414ffc47805a..210aa3e817cb 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-02-08"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "82a3e444b299cff3127809b02ea63c819486f285"; - sha256 = "0y18dpf5c5xria1wxxgsqf0wb5cmkm1k3ydyk885mcyjkzy9s8yk"; + rev = "47470eddc277e0a141e6e36a1e2a19045e051d1c"; + sha256 = "1wrhi9gwr5wjl7jdvqvldrl4480qcx6ry9gkl41dhiz643g28pvk"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -425,12 +425,12 @@ final: prev: bufexplorer = buildVimPluginFrom2Nix { pname = "bufexplorer"; - version = "2022-01-28"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "jlanzarotta"; repo = "bufexplorer"; - rev = "b3a24722bea9029b4c37eb0547b87152d514c66f"; - sha256 = "14114786fkqjzpl3aqsk2lmfnlhxzdkkanv6ls6q0cwvpqdng6wc"; + rev = "4b1d3adca7e968ebc619cf2f6f3e197ef78c8342"; + sha256 = "0imyzav898hzx4d669rxx7qyac6b8csp04am2j85rr31rywylpn0"; }; meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; }; @@ -509,12 +509,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2022-02-08"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "aa250cb8dbe80792e32d45d1bd4d63850652f771"; - sha256 = "1ykj74ysla1vqq6qjdb593w7r26rapffv2jav6kipigna71bg6j8"; + rev = "95920369e18ea64bb5e1e5f1a3161c822681f325"; + sha256 = "1jd0vqmlwm9x28bdflbfcg3xgsff0mh011cwi1sq30llwja1jhf2"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -929,12 +929,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-02-07"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "86fa3b18144aaeaa06bf5a7150c8d676ef1acca3"; - sha256 = "0ppjxkh8nqhrypl46rfs4bgfmci9idbc589js6i2waqxzha7a9jf"; + rev = "6116a010e18b7adcca024d95891da9af4e0dcd27"; + sha256 = "06sc3rr4dxk1j6glb6vyxkw8k9m90g7gd1zdgsj5pw7mxfk9xbik"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1194,12 +1194,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-02-08"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "47988a87e9dc594b590f820250784ebc2f7cd4fb"; - sha256 = "0qsdwvr518vlm3w5xhayh7ahdnazxh7xyvjcmljby3scdcdsfjfn"; + rev = "81aea6abdf8467b79fd8fe506d28f60391d30ac4"; + sha256 = "1fjjkwz9q91xfyph19hix9610s7g331mwq15wmpcr86vrmjvjbbj"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -1314,12 +1314,12 @@ final: prev: ctrlp-vim = buildVimPluginFrom2Nix { pname = "ctrlp.vim"; - version = "2022-01-14"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "ctrlpvim"; repo = "ctrlp.vim"; - rev = "ed04d2ec91c78748f0d8ddf69df2f6e5cffa7bb8"; - sha256 = "1336bk2w4ll1vq6vwd0pq77021i13hcrm3mqzynznvhxwwxrk4dy"; + rev = "d5b092036bc651912474f64277913be8502f8f09"; + sha256 = "12nmcam301h69181hznsh19p9sl42srp98dfa56ghy4iyrcg2d34"; }; meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; @@ -1796,12 +1796,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2022-02-04"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "4078d2bb859fbb907880dca5f2bcb4815b30351d"; - sha256 = "036lnw87dw2rrx2r2nb4yplwrhy5dhdi44crbmfrpq34iqw97yzr"; + rev = "40ea50a854175d65f4ce9ea84fff39ba572e3f67"; + sha256 = "0wwp0hdvlri3kbq2b6glckyrbs4dbqynh25hgj3j77pc4zkjmjla"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -1966,12 +1966,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2022-01-11"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "b6204ec4e04732d7b4ba73a3e4af48cba3576d67"; - sha256 = "0ndddww8ciwil7bpn77yahb7fcn5i59sq91syqy3qr0wwmfc7mwc"; + rev = "d415fcee2634b6c9bb4fad223c4e909498c6dcb8"; + sha256 = "0vs8nhhmpnp5jnqkmn5dz3mkhp894hyhv0v32j9qqsvdrllzsyjz"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -1990,12 +1990,12 @@ final: prev: fidget-nvim = buildVimPluginFrom2Nix { pname = "fidget.nvim"; - version = "2022-02-06"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "a4ff3c978c6b4740143223bf090a7acf7444e2f8"; - sha256 = "0v8vnr10hvxg4izniaaj3awf8c30qbcjs4wzrd25lbx6didvmx56"; + rev = "2a69ee6d17cd264eb10b33170df4cfce4cc4f4f3"; + sha256 = "0l7ir0fky6czmjkkhd13di4x39jhy70i0s0wjiiyqn9cdfm0xw14"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -2075,12 +2075,12 @@ final: prev: formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter.nvim"; - version = "2021-11-03"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "0cdce2da8762ee01ee7d8df047b6e569d58c1ba3"; - sha256 = "1169xj5k04l7gfhxqa4afq9khf6yv5bcihir21sgzpym4z69axh7"; + rev = "80a14fae599dfd200c805c345a7515266abf3438"; + sha256 = "1d42mbxhry3scycykxh381xdykm225sg5v02f9lfv9r2r3ay81jf"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -2483,12 +2483,12 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2022-02-04"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "2a4f998b65fe39f6a762a7d261249a93c848dac9"; - sha256 = "09q7dh46dbajdd5hfc88jdfwxsv7c8zm1hmm3wjfjfwb5bln06dq"; + rev = "591ca7fa71449b0e6ffe27f4525c3ceecc0b5684"; + sha256 = "1i5yq5lj4ws8j3v4pc459ls69fgcgfh8a4fr98gnj4z650nprkpg"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; @@ -2916,12 +2916,12 @@ final: prev: julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2021-12-08"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "e4972997fb5aee1c180e9840586a09553865cc20"; - sha256 = "11v9fhd7i9si5psnsrvdgrih64rgjjy7ypjlfz9ys74rcryfyy5x"; + rev = "a630e12de13db03313b88d6983cbbb81398eadcd"; + sha256 = "08rlj48cw7c9cslrkpiw63fic5yw8vvls7ifcw48m1bhpibxfmnh"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -3192,12 +3192,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2022-02-07"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "0c01dc2e2cad214614352d372ed9d7438240488f"; - sha256 = "05ybrag1gkhapr1yvs7zz2qfqibnpf2h4lg3x6f0ag9g0khhh96c"; + rev = "b04fc4e129512ce5ccd15acfe8388a898daa0a2a"; + sha256 = "0a7bz8v0lh8myj39vk553gkglmk83smqc3nylfabqyxkij1gmdqx"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -3359,12 +3359,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2022-01-30"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "30c7cf023782f50cfa8f65d0508163d6ebfd2442"; - sha256 = "1qnzy258giqxkhmbvfv8fph5k3f2r313mj0rqsans2v8bq6ay6g0"; + rev = "42eb06b5903dc212acb03f276e6e3fd24f92593c"; + sha256 = "0mh2glx9fmf56znpnxn8y8n185pdl8hxiy00pymc5r2g2q8gjrlb"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3431,12 +3431,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-02-08"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "132eff7cb39d9aeeceb80c816ccbda5bca2d60bb"; - sha256 = "1day60kqq1fgdwcvwm3nx9y2ibkv33c5s75ndv22ajk8cmdrrzdw"; + rev = "b993af2bd38a60c815768c6ddb250010ed8a1a4f"; + sha256 = "0bwmink8j8pgnxs2csskcbry46h5hl5iaqcdmm6c01ds6dcj1wql"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3995,12 +3995,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-02-07"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "27578af8581ca109ac51f0f5d215d12bf6933be1"; - sha256 = "1bc0s8c9lbdzyycncz2cqkspb353h72hnqcd5v0vb19zbxvnhsqp"; + rev = "d3473a9bfdebbd042428d895c84545bc85124159"; + sha256 = "0ahijwjp21v79svgx44dlx5x69g6nh0qv9xi0x9markxj86660yz"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4307,12 +4307,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-02-08"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "b1dbbc3807fcb82d6f562145debe6321610bef98"; - sha256 = "1jbi3lxpbky9y0k7c80shq451l5l3pbbr4wwaqrr76mjwrh49vq7"; + rev = "f8f3932fb2abaa22e2536b5ac6ef1253a76647c7"; + sha256 = "0h5q16i2n1rssml9ws5rvkmg9gslsdfw69asdq6rmr11w5kihyf9"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4379,12 +4379,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-02-07"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "3cace9658fa504e2090b668f6652cf86ba4e81ab"; - sha256 = "1ly17jywj4idwq52x471imj7b1xm7q0j8xak3khr5jc8n7mnwydg"; + rev = "aaa160d4423c6c0029f91af85a7e1f092b1aa966"; + sha256 = "07n78gwj8q7mnw6rnzsmnl6cl51g5harrzn2g3fz6rhpr2f1hlwz"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -4583,12 +4583,12 @@ final: prev: nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2022-02-05"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "6d6e936db0ad936039ef1a503c4b0bd0fe6286de"; - sha256 = "020ln7aq3h0rh5aslrgbdvjlbyvpyjxz9fa9lvsxx9bwcx6f1ci5"; + rev = "6afd8f7a69e7008dabe048d4fb1ee8e467a72fdf"; + sha256 = "13pgq09sxhfxxmrrqzc1f8b119f6d7yyx30lzbgr2vx59bh69ph2"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; @@ -4727,12 +4727,12 @@ final: prev: nvim-neoclip-lua = buildVimPluginFrom2Nix { pname = "nvim-neoclip.lua"; - version = "2022-02-07"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-neoclip.lua"; - rev = "80d363113355e431016bd0a477b3bd56c7d82d95"; - sha256 = "1jgg0zkwfbxyfqlq5xd4vhzklmgs5p3xi8amn9vmga7zkx33cy63"; + rev = "841021836ee00e7da6dbad819508e384f4e2362a"; + sha256 = "1qjwyicpvbp8396lby62jd9fj8yh2dak5kk1vf64ppjvdf038hpd"; }; meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; @@ -4751,12 +4751,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-02-05"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "2edf33d0eb3c358716d4474d6081d361c80f7aa3"; - sha256 = "07hc9v9whyxxmnsf95a5fmmdxaw800ppaj0d588lnbnx1hs3dmpm"; + rev = "27f3176b950dc803b61c29bd007e140c232544e5"; + sha256 = "1b4s7vcr1d2d6jnkbsnybc55fmwgk52cdfqsm8x5m37fbwn4k6dq"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -4823,24 +4823,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-02-07"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "ea92e7bf7ccd1815b60342706356c373bb7df216"; - sha256 = "0dj0kcawslqv6iczgkr4b31449zplpz8k4xw5vw327mh9ciyb0xm"; + rev = "b54de4b48a2e0481da8fc502e6e2a5cf5e4b0ba2"; + sha256 = "0svlmm58w8c6mcqlx8gb47j6sn0z2i4rx9fpgihhhkk7pvjhinwc"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-02-08"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "c867d483a5daee60ba6fb7ec9151c5578e4e96ed"; - sha256 = "03m6wljyh4rqzjzir22q71hmcrijvk6rylyqmz088fsh214mss5l"; + rev = "4990db79a87f49e56a3a1bb8507926ebd52ec4cc"; + sha256 = "0c2wpk1bc3ga1m54s4kjmlskv3l2rkgf83xj1alm1rfgzwhl38vv"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4895,12 +4895,12 @@ final: prev: nvim-ts-autotag = buildVimPluginFrom2Nix { pname = "nvim-ts-autotag"; - version = "2022-02-06"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "5bbdfdaa303c698f060035f37a91eaad8d2f8e27"; - sha256 = "1gw1r3w9largx945lblbfacr3kc6pgx4qf1lhsgvp11i5v7qj1z5"; + rev = "5149f0c6557fa4a492d82895a564f4cd4a9c7715"; + sha256 = "0zyx4qkm6gq2lw75f2b1k974dv3bz12gd4f6j76dr805b8kq6l5m"; }; meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; @@ -4919,12 +4919,12 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2022-02-03"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "ece7deac8f4dfa643f17f3ed5bd85359e2e05f78"; - sha256 = "1625rcsyvailnrflvbrcizj8llqd47frynj4a1s3pdxg4m6d113q"; + rev = "c6c26c4def0e9cd82f371ba677d6fc9baa0038af"; + sha256 = "0q0awc93l6cafbvb3wghrmvsn0qqg8hgkhfy5r86bvr0prwbvxga"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -5015,12 +5015,12 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2022-02-02"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "d21c5cc8e2a28c58a28eee353dbab81c74e76382"; - sha256 = "13lzq4py15szsr3ii3nq8xdy7vcqa0fkzsz18c84yvyy0k38q7d1"; + rev = "9b7902d28c6d50c481e5b46209ef0ebe5b78990f"; + sha256 = "1gqrr9kc7l3ibdwacmfwqz7vb80wdrxzsv73g59l8vhp3q6m7q7a"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; @@ -5063,12 +5063,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-01-16"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "55846471df3c6257cc2b4c7ad6001a55d52e2c34"; - sha256 = "179wwb7b65yyh345a5hnhdc10kxchddzicdlpiqkvy77rbrxc65a"; + rev = "579f0a552154677ebe5a2f4a7e97f551967da998"; + sha256 = "1g9zbylx8dvall19yxlymrqqp6bk24h5xs3z5a5i0dkwjvnaxx8v"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -5135,12 +5135,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2022-02-05"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "e5c8c01374350b4fcfd56da2afc87434c51b3972"; - sha256 = "07ai0kwh5i6ka4kxfzz25rgi2f13s7cb24wk7swpasfxllsjypqp"; + rev = "8551feef9030edf364188c26a6db797f827cda77"; + sha256 = "060wjn7l518fhg35jqvx0m526qkvhrvc9n778hb3blnm19fj7p55"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -5304,12 +5304,12 @@ final: prev: presence-nvim = buildVimPluginFrom2Nix { pname = "presence.nvim"; - version = "2022-02-05"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "andweeb"; repo = "presence.nvim"; - rev = "9aeb8e0cf3df82090955d609c9d64d74bf6b9afd"; - sha256 = "0qha4byqx0g048n2k9l1p066w0cps17nd77ij9mj79pdl9az1ylg"; + rev = "ebdf23b9b180c7f162e3afb4a250c313ca2b7271"; + sha256 = "0wygl17k2adbsy3pjyyb6amsrx14r11ldbqj21kmkjq289n58f6n"; }; meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; @@ -5557,12 +5557,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2022-02-04"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "23340bf6b19ab50504165462676f87a3e1bd4870"; - sha256 = "04kgaf2fay2gi82fwpl6nhjk7r2zw4nkv2dkm71gd7l6b3idx8k3"; + rev = "1c77bd656b4802d890ec3382e438e45109e2b862"; + sha256 = "0s1zhrnrkzb1xc3mb95930w31kad0vwff78z8ag2liawq10s2yhb"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -5737,12 +5737,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-02-01"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "058575f0bd94b115604bef9c4c48c5d02e21ffef"; - sha256 = "1mh2lf6lr6js9p8mqxs7pr97nczk8skxric3sw2z0vd9sf3pj2kk"; + rev = "73c15bf820f1a94b3f1e52484ff102667bc1f987"; + sha256 = "0n2q41k69ljca5vj2kapgwffrxk478lgd7l2yg8rsd54jsav5w7q"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -5954,12 +5954,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2022-02-04"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "8cd458541338cb7c71707cf9189ed9a27cfcdc15"; - sha256 = "16xldhfgpx0jjcsqpszjdq8mp4jqb3vwxcyh9wp3mpadbylyb8vv"; + rev = "73622eaf3764237d32395b2b589fa9231eb44b83"; + sha256 = "0xd6kzc043bmf27bs653d8q8vkdlr33ja0k63vmikz9vk91w3czb"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -6280,12 +6280,12 @@ final: prev: tabnine-vim = buildVimPluginFrom2Nix { pname = "tabnine-vim"; - version = "2022-01-20"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "codota"; repo = "tabnine-vim"; - rev = "251ab5f24cc376daf488b68e2d46a219854dcf5f"; - sha256 = "0v7jdrsyx754y13zwc6cjwqmwc4ic63ala55sxpa0bvsyx63cvdh"; + rev = "bcb474cafade81a7fc1ecab4bd2ceda6fe359e66"; + sha256 = "0mpawhqhnva3xqpxq27amd6hr0nls3zsxxwzb7bsrkzk4lc2p1kj"; fetchSubmodules = true; }; meta.homepage = "https://github.com/codota/tabnine-vim/"; @@ -6413,12 +6413,12 @@ final: prev: telescope-coc-nvim = buildVimPluginFrom2Nix { pname = "telescope-coc.nvim"; - version = "2022-02-07"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "b6e2f29a9af35c141bf95a751e1cf628333efcb2"; - sha256 = "1mrbrnb8r0am34wbpkanka47aanw87yan6ykzs97mym5w101krpj"; + rev = "0481789b0ba59d0b13f32a33f6b1b844f829f412"; + sha256 = "0mnxy4fvk2n5qqvqhblnflyqzjd6z8w9ifnajfilzzrdfbny87jf"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; @@ -7615,12 +7615,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-02-05"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "40a748c201d44d1b910159f201754adfd88b52c2"; - sha256 = "098hf2b0p7csr4b4fwfn2772xpj1m2c0zg9zf8ysgrf20lqw31a2"; + rev = "936edac04920196b331edf3a056c42e5b926c0aa"; + sha256 = "153503q7rfb58ga3hislhbn98hh7gcycwmdmdq22dagxd16zrr31"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -7687,12 +7687,12 @@ final: prev: vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2021-12-24"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "605dc002cabfec67eded553298aba21ab392ea78"; - sha256 = "1zlmibs23nyxkaj95h7z2m2p8xizvdr0i3477zs4y3lm6g0rqs23"; + rev = "27e5ac299a0714025cc46fc1da11694a8662b058"; + sha256 = "06zp45w1mxq075lrw1x2p87l4gdc5fijgag4mj7j61jd2x92xsx7"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -8563,12 +8563,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2022-02-06"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "d1e3a60213fba8ca4a6050ca3c71410960a77591"; - sha256 = "1igik71zcl70mi6fqsf55pk4g0sc891zfp0pnk086cy5klf6854v"; + rev = "f7a4509fc1d1434daf922894f0aee140c9fa3f1a"; + sha256 = "1g0v9miazm9z9nbi3s8k5imh75kp4d1mz5q95y2aqm12bi5a7890"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -9357,12 +9357,12 @@ final: prev: vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; - version = "2022-01-29"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-markdown"; - rev = "50d42082819cfa91745b6eff6e28ad5cbc8b27fa"; - sha256 = "1582y2cyqywbgf4pg8m5m2s0nd6wwgnm1nxy5kmrfcn1119hn639"; + rev = "b4dc23e2b0c4ce1ed77eb630bf04238ee2871e2e"; + sha256 = "1b4dz229a5qlfdigc4h0chrdb368bkskq11g6a6mc0fhnzm20j1i"; }; meta.homepage = "https://github.com/preservim/vim-markdown/"; }; @@ -9670,12 +9670,12 @@ final: prev: vim-ocaml = buildVimPluginFrom2Nix { pname = "vim-ocaml"; - version = "2022-01-24"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "9485f5aa3aa8e3d8505fce9a70efecc38dfee329"; - sha256 = "13lwc63iavqpwr25knrzs5f5mn7yrq8lhmm8p1d99vd5j7ngyy5x"; + rev = "335ebc6e433afb972aa797be0587895a11dddab5"; + sha256 = "079pfc897zz36mb36as7vq38b9njy42phjvmgarqlyqrwgjc0win"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -11520,12 +11520,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-02-06"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "becbae7acad2fd80eeeb266ddb29f4cb1cc7846a"; - sha256 = "0ckf7ypq6cdzpcs1cknqccdx3vx3cydq19jsh83znmc1qs6zr4ab"; + rev = "950f9e5ea26cf7f63cd9f0bf71bbae87e70c2158"; + sha256 = "0gc7zh1h60mnds2xgsliblxg951swcnafxxla1w74yjjsn9cmsbd"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; From b7b8e9574ff305e85be4e64e3d20286ce818fa58 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 9 Feb 2022 16:19:50 -0800 Subject: [PATCH 63/68] tree-sitter: fix update script's prefetch It was including the quotes from jq into the tag name, which is incorrect --- pkgs/development/tools/parsing/tree-sitter/update.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 166154f7481a..246574895e3c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -376,7 +376,7 @@ let if [[ "$(printf "%s" "$res" | ${jq}/bin/jq '.message?')" =~ "rate limit" ]]; then echo "rate limited" >&2 fi - release=$(printf "%s" "$res" | ${jq}/bin/jq '.tag_name') + release="$(printf "%s" "$res" | ${jq}/bin/jq -r '.tag_name')" # github sometimes returns an empty list even tough there are releases if [ "$release" = "null" ]; then echo "uh-oh, latest for ${orga + "/" + repo} is not there, using HEAD" >&2 From 1de14c4ebe121a47d3346095b4ff1427eb1105ea Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 9 Feb 2022 16:27:30 -0800 Subject: [PATCH 64/68] tree-sitter: update grammars --- .../parsing/tree-sitter/grammars/tree-sitter-cmake.json | 8 ++++---- .../tree-sitter/grammars/tree-sitter-commonlisp.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-elm.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-heex.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-latex.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-norg.json | 8 ++++---- .../tree-sitter/grammars/tree-sitter-org-nvim.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-php.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-python.json | 8 ++++---- .../tools/parsing/tree-sitter/grammars/tree-sitter-r.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-rust.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-scss.json | 8 ++++---- .../tree-sitter/grammars/tree-sitter-supercollider.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-tlaplus.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-vim.json | 8 ++++---- 15 files changed, 60 insertions(+), 60 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json index 61e0ee43fc7a..9e5bce1b0a43 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json @@ -1,9 +1,9 @@ { "url": "https://github.com/uyha/tree-sitter-cmake", - "rev": "f6616f1e417ee8b62daf251aa1daa5d73781c596", - "date": "2021-10-13T08:19:43+02:00", - "path": "/nix/store/p13qh130n5741wdfk2fbmy7ifd1z1zb2-tree-sitter-cmake", - "sha256": "1b5cc84d0gjm8nb73gdvfjxbk9fjrfkd5aay3b0qvk6gar59pcj6", + "rev": "5020572408a386d5d2dfac3516584f5edda7a49b", + "date": "2022-01-26T22:53:15+01:00", + "path": "/nix/store/in8jrkjf5vca2azpnyq2dgmzz9jcvjy6-tree-sitter-cmake", + "sha256": "0y49x8d36vdq2lcj67f3ms53qxym3578b3aw9gs2ckibwzrbfbgy", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json index cefe88d8be12..ed62f80e237d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/thehamsta/tree-sitter-commonlisp", - "rev": "4fd115d3bb7046cd094f21bfe5766c302dbf64cd", - "date": "2021-12-06T20:34:14+01:00", - "path": "/nix/store/vmyfmgyhnx0ipi16d1w7sxsdkprybzk7-tree-sitter-commonlisp", - "sha256": "1kmxmx93f34lba5g7kqa5fcijfak9zc9qydbid9dcqxw6kf65ncg", + "rev": "c7e814975ab0d0d04333d1f32391c41180c58919", + "date": "2022-01-28T21:33:11+01:00", + "path": "/nix/store/1696bj1f92y8vqfk71cha8bzk9cx9rls-tree-sitter-commonlisp", + "sha256": "1hq3pwrp8509scgn983g0mi8pjy2q21pms30xlc3q7yyjxvpsw7b", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json index 3618413500e1..19129d053a05 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json @@ -1,9 +1,9 @@ { "url": "https://github.com/elm-tooling/tree-sitter-elm", - "rev": "bd50ccf66b42c55252ac8efc1086af4ac6bab8cd", - "date": "2021-12-27T23:25:02+01:00", - "path": "/nix/store/l5b9nhvrnq4a105rpmfi59dpg2xqs5nr-tree-sitter-elm", - "sha256": "1ls9l81nkcyym92n6h983m3jjjxdlr27nxa21p9l6czwf34564ky", + "rev": "5128296ba8542853d59e6b7c8dfe3d1fb9a637ea", + "date": "2022-02-04T13:10:25+01:00", + "path": "/nix/store/8brpvn8y88x3f3dsbgqql57kp9bygj3w-tree-sitter-elm", + "sha256": "10hbi4vyj4hjixqswdcbvzl60prldczz29mlp02if61wvwiwvqrw", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json index b6ff0d8a3260..654a89b5979b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json @@ -1,9 +1,9 @@ { "url": "https://github.com/connorlay/tree-sitter-heex", - "rev": "d8b5b9f016cd3c7b0ee916cf031d9a2188c0fc44", - "date": "2022-01-23T20:01:08-08:00", - "path": "/nix/store/iv3vxp8cdnfhpr75gvqvm8hmvfw8hw51-tree-sitter-heex", - "sha256": "0dx6l9k6l5ibvrdb7x13lqnpj5nmjz8f5lc8j8wh4cq2jdabfw0k", + "rev": "592e22292a367312c35e13de7fdb888f029981d6", + "date": "2022-01-30T14:04:04-08:00", + "path": "/nix/store/21n6sqyvkfd0q5ass9nj2wgicm9ljmgv-tree-sitter-heex", + "sha256": "1k4nhlbbn7lqrjmkz8rr81rsrfkl9qfwm9q7qd2b18ygzr52payh", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json index bfa5df37337e..5cf20f27968f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json @@ -1,9 +1,9 @@ { "url": "https://github.com/latex-lsp/tree-sitter-latex", - "rev": "6f796b700c69a8af28132e84ed6d0c8f0c17a5e2", - "date": "2022-01-11T19:20:05+01:00", - "path": "/nix/store/48rdm71qngr9szsfhr85708srwn6b4ra-tree-sitter-latex", - "sha256": "0rbaql6jh3kwa4fap3b438l1733h2pbiazdbjzv38bbigkirad0n", + "rev": "323b609de40b7729073482a3c59de76cfba7744f", + "date": "2022-02-08T21:23:53+01:00", + "path": "/nix/store/f6kvr0x41rbb64s36ii6bj30fqaallz4-tree-sitter-latex", + "sha256": "1qsw5wcqs65ip0qq17vq6bf2snnpvw61iq2ahgwl9842ir15hrbr", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json index 189301c7293e..1743d2252cd6 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json @@ -1,9 +1,9 @@ { "url": "https://github.com/nvim-neorg/tree-sitter-norg", - "rev": "c4be6addec0a8ada234684ced6c928189fd399af", - "date": "2022-01-22T17:12:52+01:00", - "path": "/nix/store/x73fgsrav1fg0vzydcy4ayrawn0cw7w2-tree-sitter-norg", - "sha256": "14wf53p6lkf4xknzb4bngh9fsas6hnr8iv73xnalyf8mqq1977pc", + "rev": "b7f879eaf9f20852f6b670439154b0128fbb6558", + "date": "2022-02-08T12:24:02+01:00", + "path": "/nix/store/q02py98zm9cmalzc5a0yqw8lg73ybx9g-tree-sitter-norg", + "sha256": "07hm5sysb25ivlz52ijnbka02hlqksha259w7v03awap85i9ydk6", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json index 23df3b743c7e..67e75cd60ee2 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json @@ -1,9 +1,9 @@ { "url": "https://github.com/milisims/tree-sitter-org", - "rev": "f110024d539e676f25b72b7c80b0fd43c34264ef", - "date": "2021-11-28T23:04:31-05:00", - "path": "/nix/store/8vc7ddhd2wzrin3cj14zrw5mmi58f8sl-tree-sitter-org", - "sha256": "1gvqvdapqfac1ny1a0l590h1w617wczwv234fsnal6amfdyganxc", + "rev": "1c3eb533a9cf6800067357b59e03ac3f91fc3a54", + "date": "2022-02-05T14:19:52-05:00", + "path": "/nix/store/n51rx6d005iibpvb1bb2d7az1l6p6vlq-tree-sitter-org", + "sha256": "06xkhhdlkikvxadp7wnk8riz51mjq9ks1jchdy9x3fmq6bj72y1p", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index e64e3f6bff36..856d6bbb7e5c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "57f855461aeeca73bd4218754fb26b5ac143f98f", - "date": "2021-11-19T17:22:11+01:00", - "path": "/nix/store/lxl3r0lykb9b3r0sdqb3sqixlnaf6015-tree-sitter-php", - "sha256": "1v7xzc8w8nilmgnx6whdvq03dbi1z8j57aarwwzx9xbb86z2qhvc", + "rev": "0ce134234214427b6aeb2735e93a307881c6cd6f", + "date": "2022-01-31T19:53:17+01:00", + "path": "/nix/store/kdddnbbsik9wvnjh1wnbyzzr1x8v64ps-tree-sitter-php", + "sha256": "0gg3p1zpwfhf0qz0isnca0zi5zkxs5j5bmjix99dv3rkw911vk17", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json index 548764811a55..e724e7bbebc4 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-python", - "rev": "24b530ca158d2782ea9046e756057a412e16b52f", - "date": "2021-11-11T20:37:43-08:00", - "path": "/nix/store/1fqgxgb3l6wxvsvzaa2f26h5ywiyxz5h-tree-sitter-python", - "sha256": "1d8d66v64jwwk73y8q94n80w0f0cs7wjnww49b0sbmpa9d3hsfl6", + "rev": "78c4e9b6b2f08e1be23b541ffced47b15e2972ad", + "date": "2022-02-07T12:53:14-08:00", + "path": "/nix/store/9i5fh21cwa6w2zq9fkcn46207pbk2fzn-tree-sitter-python", + "sha256": "09xq6ymwa2ap4432yln5qs0y41iaxbrpp4m07pvydgcmyk3blxvv", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json index dc339fe1fd65..f77e92922533 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json @@ -1,9 +1,9 @@ { "url": "https://github.com/r-lib/tree-sitter-r", - "rev": "d9868735e401e4870a3d4422790b585fea3faec8", - "date": "2022-01-10T10:12:40-05:00", - "path": "/nix/store/b2dp06sk8s3ksm382gndshhd1mxmd6n6-tree-sitter-r", - "sha256": "1pl38gksb4cwdgrb92rbmkanxn65m99i6c8w8xldhs0q97d1v5k0", + "rev": "c19e54de252d5573cc2a762a030957074526fe99", + "date": "2022-01-27T09:41:27-05:00", + "path": "/nix/store/b2h3khs1x0j4j2fvs2sbkx1dp3d8fx4g-tree-sitter-r", + "sha256": "1zan8dhjpxrn7vy7mvbc85hcdd5lls3vzpk6nchvn3j0i1ach85h", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index 1479f09e0673..87cc40f83b89 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "eeb0702ebdac504b97196577b1dac43c80913d7b", - "date": "2022-01-10T13:05:56-08:00", - "path": "/nix/store/sh170d6b589l16rhlygz6hvn1dmfhlb1-tree-sitter-rust", - "sha256": "1npx8kc4qdjj1fszqx6ks1d0x0pklmzm3gkxracs7y28lh2whrvq", + "rev": "a250c4582510ff34767ec3b7dcdd3c24e8c8aa68", + "date": "2022-02-04T13:11:35-08:00", + "path": "/nix/store/i1f2zyrqghy98pl7dfnvcpbs3jsnmhay-tree-sitter-rust", + "sha256": "174j5pxwf80c4xniri39l3a6bb7nq96g2s8hh5sgv4i7xvbpfsmg", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json index 03644c839c3c..0b2637a14389 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json @@ -1,9 +1,9 @@ { "url": "https://github.com/serenadeai/tree-sitter-scss", - "rev": "f3174d3d131eb776f86dfa3d90fe6f7325c0ad9a", - "date": "2021-11-08T17:21:33-08:00", - "path": "/nix/store/qpmqd6a3rnrp451b5jjmqqwark276smj-tree-sitter-scss", - "sha256": "0c8mx5fxcfn8wn361i7pnr3xga7vm2jjj99ilkqljir71nl6bm11", + "rev": "c478c6868648eff49eb04a4df90d703dc45b312a", + "date": "2022-02-03T21:48:21+00:00", + "path": "/nix/store/s49l3jbhjni3l1d0m3xrpzml39aq9yr3-tree-sitter-scss", + "sha256": "15r3jiv36hzx2pmjmp63am3pbc01s52z36xfraa1aw4wlx7lqnq4", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json index 7dcf59de2ff0..24f577629497 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json @@ -1,9 +1,9 @@ { "url": "https://github.com/madskjeldgaard/tree-sitter-supercollider", - "rev": "a7201b61779be59ac0fc0d118746c886dbc3edbd", - "date": "2022-01-14T01:11:12+01:00", - "path": "/nix/store/rgy05854am625shbs13gjx0yggbb6awh-tree-sitter-supercollider", - "sha256": "118mbv8d5n2lb4w5cbjy657g9z9z910gvjjj41a2rkx971vgb6w3", + "rev": "0f0e5b5a96dd3e048a9c3db648ed969c44068bff", + "date": "2022-02-01T13:46:31+01:00", + "path": "/nix/store/5rzm6vnqvpwxwakrjyy93hg0glfvcx93-tree-sitter-supercollider", + "sha256": "0nxl43j7ddsddqcq56p921h1r5jkx8v49zxjzr6mcj6y1ljzndm2", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json index 86e9a86bbcc0..2ffc311fd943 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tlaplus-community/tree-sitter-tlaplus", - "rev": "ffa98bbbd80e425f07e92bf511e64c8b0dffc1c7", - "date": "2022-01-23T09:32:54-05:00", - "path": "/nix/store/rbxa4biim19pwiz6gmh0ag5cz68rws3k-tree-sitter-tlaplus", - "sha256": "0j8bwxdvdhfhvpiahbf0hr9hfkbg75p7qpxx2i1rgvidavflbpiv", + "rev": "dde405e5128c3c47ab8aa014d21b6e5296ca450f", + "date": "2022-02-03T12:27:54-05:00", + "path": "/nix/store/vwmr9wd4agmym5ryrchl470qa46j8ymr-tree-sitter-tlaplus", + "sha256": "06g5pbx4rydfryfxfqjq37akhqn2465xwh90r5yc5rdv0kppvbhq", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json index bb57181f00f6..12322fe82b40 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json @@ -1,9 +1,9 @@ { "url": "https://github.com/vigoux/tree-sitter-viml", - "rev": "274b004d226a6686546ef83231f0f836b91700ae", - "date": "2022-01-21T14:12:20+01:00", - "path": "/nix/store/lpl3kbb5kwawr71m6qhqrwj1adkll540-tree-sitter-viml", - "sha256": "01bmn3l3fsi1r36ak72ly0v8fr62wchida965c60244bfg2s4r2c", + "rev": "bc573ef552adf8bed9e36eb687a0cccf43158634", + "date": "2022-01-24T16:13:56+01:00", + "path": "/nix/store/2i9n2fvjk0ymxv32ziq5z9ykv95svi7d-tree-sitter-viml", + "sha256": "0ckx9jh9fqfw5x9yb0sljczb0xsgxs8j6v2qbqywh5z6fcqx8sjc", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, From 2770c2f25ae2e8f6ab6204a1ac3f050fbe093642 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 9 Feb 2022 16:36:04 -0800 Subject: [PATCH 65/68] vimPlugins.vim-clap: fix cargoSha256 --- pkgs/misc/vim-plugins/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 5c4c92a1c596..85a41d2e5147 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -815,7 +815,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-y4yQ8Zv9bpfOyQrBX/TAuVYHhDsXdj0rh8nHJonxgcU="; + cargoSha256 = "sha256-JKi51kzCHMctUX6tT8K2Rq1slV3Ek67dCgbPjBkwPTE="; }; in '' From 4fc58aa24cd526658a1b4c95f4f247f28532d2cc Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 9 Feb 2022 17:04:58 -0800 Subject: [PATCH 66/68] difftastic: 0.12.0 -> 0.19.0 This also removes our fiddling with the vendored tree-sitter grammars. It seems like difftastic is _really_ peculiar about the exact version of the grammar it must use, so let's just leave it to use its vendored ones. --- pkgs/tools/text/difftastic/default.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index ee86bcd635e3..729a0900f851 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -2,27 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.12.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-A6Z3g6fbYBynyN4OhRrZNO0ZghvT3XnIahdUQ8SE8tU="; + sha256 = "sha256-pZyQnPIdyS8XkzP9KwGKRjF21YWGgCVNeQSie9g5NcE="; }; - cargoSha256 = "sha256-6/JwrPymtpj/CXqx3Pe43v+MJTNONArU2WEo/zgJhT4="; - - postPatch = '' - pushd vendor - for grammar in */; do - if [ -d "${tree-sitter.grammars}/$grammar" ]; then - rm -r "$grammar" - ln -s "${tree-sitter.grammars}/$grammar" - fi - done - popd - ''; + cargoSha256 = "sha256-VXbCrhoGF6bCzQ02Y1LQkbEVrmIfDIKFWF9vx43tt94="; meta = with lib; { description = "A syntax-aware diff"; From d1d326627049a156a800b46d3e36005d4e3411af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 10 Feb 2022 03:12:57 +0000 Subject: [PATCH 67/68] python3Packages.pytest-subprocess: 1.4.0 -> 1.4.1 https://github.com/aklajnert/pytest-subprocess/releases/tag/1.4.1 --- pkgs/development/python-modules/pytest-subprocess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-subprocess/default.nix b/pkgs/development/python-modules/pytest-subprocess/default.nix index f095cbb99734..cc890096f796 100644 --- a/pkgs/development/python-modules/pytest-subprocess/default.nix +++ b/pkgs/development/python-modules/pytest-subprocess/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytest-subprocess"; - version = "1.4.0"; + version = "1.4.1"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "aklajnert"; repo = "pytest-subprocess"; rev = version; - hash = "sha256-+bsxoOsY0yf77EivImrfqxgVW0T/VnFIJXvy8X5pmEY="; + hash = "sha256-xNkOXBCQ4AH/JVmxFzI3VSouA6jkCbUom7AdckfjGiE="; }; buildInputs = [ From 02197c4b5e61f73152c807cd5b8ebdafeab0cdbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 10 Feb 2022 03:18:36 +0000 Subject: [PATCH 68/68] python3Packages.pyrogram: 1.3.7 -> 1.4.3 --- pkgs/development/python-modules/pyrogram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index 982b83eb52b0..dc453e86c702 100644 --- a/pkgs/development/python-modules/pyrogram/default.nix +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "1.3.7"; + version = "1.4.3"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "Pyrogram"; inherit version; - hash = "sha256-OwjlZIuwbrmaCe/2lz+flr8sAyJZYXixjhtPylgExKQ="; + hash = "sha256-5twH9ZfwtP6gi50K8nqXOmCPSFkHO5Hitd7XaDP0EQg="; }; propagatedBuildInputs = [