From 61d404a7933c1c4ef201e9e1bedb519717c11b74 Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Sun, 17 Apr 2022 14:31:27 +1000 Subject: [PATCH 001/166] squeekboard: 1.16.0 -> 1.17.0 https://gitlab.gnome.org/World/Phosh/squeekboard/-/tags/v1.17.0 https://gitlab.gnome.org/World/Phosh/squeekboard/-/commit/c912b73c4b229b61ce30d2923988e3277f3fe5a8 --- pkgs/applications/accessibility/squeekboard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix index 94129d05288..b2586ef76c2 100644 --- a/pkgs/applications/accessibility/squeekboard/default.nix +++ b/pkgs/applications/accessibility/squeekboard/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "squeekboard"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "Phosh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-51Grkn6NSR6azTRuq1vdbDg7d3HuQQ+ZJCsM2mSrSHk="; + sha256 = "sha256-U46OQ0bXkXv6za8vUZxtbxJKqiF/X/xxJsqQGpnRIpg="; }; cargoDeps = rustPlatform.fetchCargoTarball { @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { cat Cargo.toml.in Cargo.deps > Cargo.toml ''; name = "${pname}-${version}"; - sha256 = "sha256-vQaiEENxaQxBGYP1br03wSkU7OGOYkJvMBUAOeb3jGk="; + sha256 = "sha256-4q8MW1n/xu538+R5ZlA+p/hd6pOQPKj7jOFwnuMc7sk="; }; nativeBuildInputs = [ From 04e104bc018a877dffcdcfac95710197a3d7586f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Apr 2022 02:25:34 +0000 Subject: [PATCH 002/166] diffoscope: 210 -> 211 --- pkgs/tools/misc/diffoscope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 92fc69be7b5..d0d54470491 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -11,11 +11,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "210"; + version = "211"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-KaECH995scVdBbxQ4YhZUFmm04ptgi4yx14oDFX+zSw="; + sha256 = "sha256-B2Ll1N9JJkBM32eGHBtTscq6MR4T+yB98LTpjz094zo="; }; outputs = [ "out" "man" ]; From b123419b91b91afce08491861a6dd7069e2ba949 Mon Sep 17 00:00:00 2001 From: ckie Date: Thu, 28 Apr 2022 04:41:56 +0300 Subject: [PATCH 003/166] gpt-2-simple: init at 0.8.1 --- .../python-modules/gpt-2-simple/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/gpt-2-simple/default.nix diff --git a/pkgs/development/python-modules/gpt-2-simple/default.nix b/pkgs/development/python-modules/gpt-2-simple/default.nix new file mode 100644 index 00000000000..68f8cba8dc4 --- /dev/null +++ b/pkgs/development/python-modules/gpt-2-simple/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchFromGitHub, regex, requests, tqdm, numpy +, toposort, tensorflow }: + +buildPythonPackage rec { + pname = "gpt-2-simple"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "minimaxir"; + repo = "gpt-2-simple"; + rev = "v${version}"; + sha256 = "sha256-WwD4sDcc28zXEOISJsq8e+rgaNrrgIy79Wa4J3E7Ovc="; + }; + + propagatedBuildInputs = [ regex requests tqdm numpy toposort tensorflow ]; + + dontCheck = true; # no tests in upstream + + meta = with lib; { + description = + "Easily retrain OpenAI's GPT-2 text-generating model on new texts"; + homepage = "https://github.com/minimaxir/gpt-2-simple"; + license = licenses.mit; + maintainers = with maintainers; [ ckie ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 82eb6664871..0b78bd2706f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3566,6 +3566,8 @@ in { gpy = callPackage ../development/python-modules/gpy { }; + gpt-2-simple = callPackage ../development/python-modules/gpt-2-simple { }; + gpyopt = callPackage ../development/python-modules/gpyopt { }; gql = callPackage ../development/python-modules/gql { }; From 13ca8e47f045bb54444aec6bc99205d62351d066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 29 Apr 2022 22:12:57 +0200 Subject: [PATCH 004/166] python3.pkgs.flask-compress: 1.11 -> 1.12 --- pkgs/development/python-modules/flask-compress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index 26e5feca03e..2825e41a081 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "1.11"; + version = "1.12"; pname = "Flask-Compress"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9WnzLERtayXKjjR9UAOgUxgR73MmeABbADb8HJ6xwhw="; + sha256 = "sha256-4hWUmfOdYYpNVroEhOe1i1eVa5osbTUQ8JX1uxS3r8U="; }; nativeBuildInputs = [ From b9a93b91db0cb2a9ad3728bbdcf3e02797844b4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 29 Apr 2022 22:14:03 +0200 Subject: [PATCH 005/166] gdbgui: 0.14.0.2 -> 0.15.0.1 --- .../development/tools/misc/gdbgui/default.nix | 57 ++----------------- 1 file changed, 6 insertions(+), 51 deletions(-) diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index a82ff178c9e..e953fa0ba40 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -2,80 +2,35 @@ , buildPythonApplication , fetchPypi , gdb -, flask -, six -, bidict -, python-engineio -, python-socketio , flask-socketio , flask-compress , pygdbmi , pygments -, gevent -, gevent-websocket -, eventlet , }: -let - # gdbgui only works with the latest previous major version of flask-socketio, - # which depends itself on the latest previous major versions of dependencies. - python-engineio' = python-engineio.overridePythonAttrs (old: rec { - version = "3.14.2"; - src = fetchPypi { - inherit (old) pname; - inherit version; - sha256 = "119halljynqsgswlhlh750qv56js1p7j52sc0nbwxh8450zmbd7a"; - }; - propagatedBuildInputs = [ six ]; - doCheck = false; - }); - python-socketio' = python-socketio.overridePythonAttrs (old: rec { - version = "4.6.1"; - src = fetchPypi { - inherit (old) pname; - inherit version; - sha256 = "047syhrrxh327p0fnab0d1zy25zijnj3gs1qg3kjpsy1jaj5l7yd"; - }; - propagatedBuildInputs = [ bidict python-engineio' ]; - doCheck = false; - }); - flask-socketio' = flask-socketio.overridePythonAttrs (old: rec { - version = "4.3.2"; - src = fetchPypi { - inherit (old) pname; - inherit version; - sha256 = "0s2xs9kv9cbwy8bcxszhdwlcb9ldv0fj33lwilf5vypj0wsin01p"; - }; - propagatedBuildInputs = [ flask python-socketio' ]; - doCheck = false; - }); -in buildPythonApplication rec { pname = "gdbgui"; - version = "0.14.0.2"; + + version = "0.15.0.1"; + buildInputs = [ gdb ]; propagatedBuildInputs = [ - flask - flask-socketio' + flask-socketio flask-compress pygdbmi pygments - gevent - gevent-websocket - eventlet ]; src = fetchPypi { inherit pname version; - sha256 = "1v6wwsncgnhlg5c7gsmzcp52hfblfnz5kf5pk4d0zybflsxak02d"; + sha256 = "sha256-bwrleLn3GBx4Mie2kujtaUo+XCALM+hRLySIZERlBg0="; }; postPatch = '' echo ${version} > gdbgui/VERSION.txt # remove upper version bound - sed -ie 's!, <.*"!"!' setup.py - sed -i 's/greenlet==/greenlet>=/' setup.py + sed -ie 's!,.*<.*!!' requirements.in ''; postInstall = '' From 444e767071083cbebfe6bd11ed33b9ba2ab8e63e Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Mon, 2 May 2022 19:55:14 +0200 Subject: [PATCH 006/166] ryujinx: set makeWrapperArgs as an attribute --- pkgs/applications/emulators/ryujinx/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index e235b2c80fb..60aa9debfb0 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -58,6 +58,10 @@ buildDotnetModule rec { pulseaudio ]; + makeWrapperArgs = [ + "--suffix PATH : ${lib.getBin ffmpeg}" + ]; + patches = [ ./appdir.patch # Ryujinx attempts to write to the nix store. This patch redirects it to "~/.config/Ryujinx" on Linux. ]; @@ -66,11 +70,6 @@ buildDotnetModule rec { # workaround for https://github.com/Ryujinx/Ryujinx/issues/2349 mkdir -p $out/lib/sndio-6 ln -s ${sndio}/lib/libsndio.so $out/lib/sndio-6/libsndio.so.6 - - # Ryujinx tries to use ffmpeg from PATH - makeWrapperArgs+=( - --suffix PATH : ${lib.makeBinPath [ ffmpeg ]} - ) ''; preFixup = '' From 4d4615583541f1338165dcbc7cfedc66948c7bee Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Mon, 2 May 2022 20:22:21 +0200 Subject: [PATCH 007/166] osu-lazer: set dotnetFlags as an attribute --- pkgs/games/osu-lazer/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index bb006abad57..268090a4e5d 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -31,11 +31,9 @@ buildDotnetModule rec { nativeBuildInputs = [ copyDesktopItems ]; - preConfigure = '' - dotnetFlags+=( - --runtime linux-x64 - ) - ''; + dotnetFlags = [ + "--runtime linux-x64" + ]; runtimeDeps = [ ffmpeg From 0081b479c4183c80cf80a28662210a2dd8affd46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 May 2022 09:55:34 +0000 Subject: [PATCH 008/166] gtkmm3: 3.24.5 -> 3.24.6 --- pkgs/development/libraries/gtkmm/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 2d0921cf097..420dee6cbaa 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "3.24.5"; + version = "3.24.6"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ri2msp3cmzi6r65ghwb8gfavfaxv0axpwi3q60nm7v8hvg36qw5"; + sha256 = "Sz4ULpROFjO7oAiQBgXDQak8/XVaf6KgCwXQQTQfEdY="; }; outputs = [ "out" "dev" ]; From a52bf037d8f53684de1ebc9505d8940437e810bf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 May 2022 13:06:14 +0200 Subject: [PATCH 009/166] dpdk: 21.11 -> 22.03 https://doc.dpdk.org/guides/rel_notes/release_22_03.html https://www.openwall.com/lists/oss-security/2022/05/05/1 https://www.openwall.com/lists/oss-security/2022/05/05/2 Fixes: CVE-2021-3839, CVE-2022-0669 --- pkgs/os-specific/linux/dpdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 1e4f50e42df..2f06401d49a 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -9,14 +9,14 @@ let mod = kernel != null; - dpdkVersion = "21.11"; + dpdkVersion = "22.03"; in stdenv.mkDerivation rec { pname = "dpdk"; version = "${dpdkVersion}" + lib.optionalString mod "-${kernel.version}"; src = fetchurl { url = "https://fast.dpdk.org/rel/dpdk-${dpdkVersion}.tar.xz"; - sha256 = "sha256-Mkbj7WjuKzaaXYviwGzxCKZp4Vf01Bxby7sha/Wr06E="; + sha256 = "sha256-st5fCLzVcz+Q1NfmwDJRWQja2PyNJnrGolNELZuDp8U="; }; nativeBuildInputs = [ From ab785b231b0cd0e83495b92299196c0313436c65 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 29 Apr 2022 09:48:53 +0200 Subject: [PATCH 010/166] wine{Unstable,Staging}: 7.4 -> 7.5 --- pkgs/applications/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 23538a237e4..3f9d5a5aca5 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -46,9 +46,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "7.4"; + version = "7.5"; url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz"; - sha256 = "sha256-co6GbW5JzpKioMUUMz6f8Ivb9shvXvTmGAFDuNK31BY="; + sha256 = "sha256-Riwxha7e7IUQZ6UWXWSPVJn7k8G2VfRrgl9LwRkU4oE="; inherit (stable) gecko32 gecko64 patches; mono = fetchurl rec { @@ -61,7 +61,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "0vlj3b8bnidyhlgkjrnlbah3878zjy3s557vbp16qka42zjaa51q"; + sha256 = "sha256-BGfQqy4UMUfpc1XX4MXKrygHeffHsKuFZpeA4LHwzPg="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From 8752039f03d5544b663403e8ae234fa72e05dd87 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 29 Apr 2022 09:56:02 +0200 Subject: [PATCH 011/166] wine{Unstable,Staging}: 7.5 -> 7.6 --- pkgs/applications/emulators/wine/sources.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 3f9d5a5aca5..1d9115ea175 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -46,22 +46,22 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "7.5"; + version = "7.6"; url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz"; - sha256 = "sha256-Riwxha7e7IUQZ6UWXWSPVJn7k8G2VfRrgl9LwRkU4oE="; + sha256 = "sha256-7qt3LwkTKKP7nbiarKtr4IfD1ZwWjvK0GvXsUBDPAyg="; inherit (stable) gecko32 gecko64 patches; mono = fetchurl rec { - version = "7.1.1"; + version = "7.2.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - sha256 = "sha256-ncjlYDt7xkNU65SuTqD2ghQkdno/9E/w0Z40akkMEeo="; + sha256 = "sha256-Xwbq+646SezDHfzqd3B1vUTwzBJuT7Tijs76ButDYyM="; }; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-BGfQqy4UMUfpc1XX4MXKrygHeffHsKuFZpeA4LHwzPg="; + sha256 = "sha256-0RbfCC8pjjVoWppaa+tQyO/l7ZafbNKA6V2Ea4hNehI="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From 22b127cd4f8425a04e3715c8eb9031c768d9d007 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 29 Apr 2022 09:57:04 +0200 Subject: [PATCH 012/166] winetricks: 20210825 -> 20220411 --- pkgs/applications/emulators/wine/sources.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 1d9115ea175..30f19927ca1 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -84,8 +84,8 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases - version = "20210825"; - sha256 = "sha256-exMhj3dS8uXCEgOaWbftaq94mBOmtZIXsXb9xNX5ha8="; + version = "20220411"; + sha256 = "sha256-FjH10nZDYbqXI6/vKpZJKfv2maXSVkahNDf5UTU3eyU="; owner = "Winetricks"; repo = "winetricks"; rev = version; From 131a5676d10422194cb265062597f235f048792d Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 29 Apr 2022 10:01:58 +0200 Subject: [PATCH 013/166] wine{Unstable,Staging}: 7.6 -> 7.7 --- pkgs/applications/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 30f19927ca1..a8c1e3b3d34 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -46,9 +46,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "7.6"; + version = "7.7"; url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz"; - sha256 = "sha256-7qt3LwkTKKP7nbiarKtr4IfD1ZwWjvK0GvXsUBDPAyg="; + sha256 = "sha256-UqTQa6dwgN9KSwIr+cLMBc+h15vUuwjGuI98OuCdFGQ="; inherit (stable) gecko32 gecko64 patches; mono = fetchurl rec { @@ -61,7 +61,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-0RbfCC8pjjVoWppaa+tQyO/l7ZafbNKA6V2Ea4hNehI="; + sha256 = "sha256-+aR5+pJD+uDo4wITgs7njYUHxB9FwqUtgS+aXC0PLQ0="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From 416f2c1af6357ad6092d2f2446e227217cad1ebd Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 6 May 2022 23:27:21 +0200 Subject: [PATCH 014/166] wine{Unstable,Staging}: 7.7 -> 7.8 --- pkgs/applications/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index a8c1e3b3d34..febbece46f5 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -46,9 +46,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "7.7"; + version = "7.8"; url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz"; - sha256 = "sha256-UqTQa6dwgN9KSwIr+cLMBc+h15vUuwjGuI98OuCdFGQ="; + sha256 = "sha256-j3bpyWtQ8qyOJOXe7fo+DZWWpXBnCSJvZalMahYAGbg="; inherit (stable) gecko32 gecko64 patches; mono = fetchurl rec { @@ -61,7 +61,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-+aR5+pJD+uDo4wITgs7njYUHxB9FwqUtgS+aXC0PLQ0="; + sha256 = "sha256-payP+lx/aGZErGbkpogNMgsE393e7F2VGrllDKu/Lws="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From fc2445eb1068a15af1afe671a242b9d74e4fa335 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 May 2022 13:46:54 +0000 Subject: [PATCH 015/166] python310Packages.pytelegrambotapi: 4.5.0 -> 4.5.1 --- pkgs/development/python-modules/pyTelegramBotAPI/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 36f25fce9d1..13678edc865 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "4.5.0"; + version = "4.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Jonbb26MbK/LKztFkB7IlaHQm98DPYn4lYK4ikDPpaE="; + hash = "sha256-ClzdkvH1uz1qh/q3prfn8n0eosY3y3mUscbb4EKbmJQ="; }; propagatedBuildInputs = [ From 6eba03800ef47d9011d39a72a26ad0853fcacb05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 10 May 2022 08:11:21 +0200 Subject: [PATCH 016/166] spdk: build against old dpdk 21.11 --- pkgs/development/libraries/spdk/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index e4884b85b4a..23464990d86 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -10,9 +10,19 @@ , libuuid , numactl , openssl +, fetchurl }: -stdenv.mkDerivation rec { +let + # The old version has some CVEs howver they should not affect SPDK's usage of the framework: https://github.com/NixOS/nixpkgs/pull/171648#issuecomment-1121964568 + dpdk' = dpdk.overrideAttrs (old: rec { + name = "dpdk-21.11"; + src = fetchurl { + url = "https://fast.dpdk.org/rel/${name}.tar.xz"; + sha256 = "sha256-Mkbj7WjuKzaaXYviwGzxCKZp4Vf01Bxby7sha/Wr06E="; + }; + }); +in stdenv.mkDerivation rec { pname = "spdk"; version = "21.10"; @@ -40,7 +50,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - cunit dpdk libaio libbsd libuuid numactl openssl ncurses + cunit dpdk' libaio libbsd libuuid numactl openssl ncurses ]; postPatch = '' @@ -49,7 +59,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = [ "--with-dpdk=${dpdk}" ]; + configureFlags = [ "--with-dpdk=${dpdk'}" ]; NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile. # otherwise does not find strncpy when compiling From 69a98c2869c1d0f5ca429a77168cc2bdf7e0d8ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 May 2022 06:46:09 +0000 Subject: [PATCH 017/166] python310Packages.stripe: 2.76.0 -> 3.0.0 --- pkgs/development/python-modules/stripe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index b47f3917b92..3e21c225ed8 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.76.0"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/T/Gk1w7YYmWcZFge2846+SQAFpZC00NQ/vjq6Rd7Kg="; + hash = "sha256-/rQA1woPv6VN9+Y3bI+bh2Ud7Zd81qAu4yxmGmB+JZo="; }; propagatedBuildInputs = [ From c95a1d47240ca4808186d941b4e08a28a957bb08 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 10 May 2022 07:47:15 +0100 Subject: [PATCH 018/166] cataract: add -fcommon workaround Without the change -fno-common toolchains like upstream gcc-10 fail to build as: ld: stats.o:/build/cataract-675e647/src/stats.h:24: multiple definition of `stats_images'; cgg.o:/build/cataract-675e647/src/stats.h:24: first defined here --- pkgs/applications/misc/cataract/build.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index 0adab84830d..2c369e64b5d 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -26,6 +26,12 @@ stdenv.mkDerivation { sed -i 's|#include |#include |' src/jpeg-utils.cpp ''; + # Add workaround for -fno-common toolchains like upstream gcc-10 to + # avoid build failures like: + # ld: stats.o:/build/cataract-675e647/src/stats.h:24: multiple definition of + # `stats_images'; cgg.o:/build/cataract-675e647/src/stats.h:24: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + installPhase = '' mkdir $out/{bin,share} -p cp src/cgg{,-dirgen} $out/bin/ From 6e6b908a9092b4582e63c2c5f01d9b67c22eead5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 May 2022 11:41:08 +0000 Subject: [PATCH 019/166] python310Packages.chiavdf: 1.0.6 -> 1.0.7 --- pkgs/development/python-modules/chiavdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chiavdf/default.nix b/pkgs/development/python-modules/chiavdf/default.nix index a4bd20f9cd6..819b6fdcda3 100644 --- a/pkgs/development/python-modules/chiavdf/default.nix +++ b/pkgs/development/python-modules/chiavdf/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "chiavdf"; - version = "1.0.6"; + version = "1.0.7"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Ri7j/T0nnZFml4kC0qIQkyYRJBPZMhTYxolW/A25030="; + hash = "sha256-956517eGqRSLg+Y4ybmASiZoypgpYn/D9lbPA4Rcfts="; }; patches = [ From f716f305eeb753993c5c07814253bc68f0f4a653 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 May 2022 11:55:17 +0000 Subject: [PATCH 020/166] python310Packages.tensorflow-metadata: 1.7.0 -> 1.8.0 --- .../python-modules/tensorflow-metadata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix index b39f1211d0c..bdf6cc08aa6 100644 --- a/pkgs/development/python-modules/tensorflow-metadata/default.nix +++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "tensorflow-metadata"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "tensorflow"; repo = "metadata"; - rev = "v${version}"; - sha256 = "sha256-CQlLEVNcD9u2pojz8r1eLzYzc9i2hjdZfzfYSQ/8Q4k="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-IaLr6XYEy1EcyWi5GWzDFa7TeVZ59v8Wj5qkNdVbOqw="; }; patches = [ From 611be96fd91496423cc48718e6d2e795ed2aa073 Mon Sep 17 00:00:00 2001 From: gbtb Date: Tue, 10 May 2022 22:45:41 +1000 Subject: [PATCH 021/166] dotnet: fixed runtime error for dotnet 3.1 after icu update --- pkgs/development/compilers/dotnet/build-dotnet.nix | 3 +-- pkgs/development/compilers/dotnet/default.nix | 11 ++++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index 4a30107bbec..67ce79ca575 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -1,6 +1,7 @@ { type , version , srcs +, icu #passing icu as an argument, because dotnet 3.1 has troubles with icu71 }: assert builtins.elem type [ "aspnetcore" "runtime" "sdk"]; @@ -11,7 +12,6 @@ assert builtins.elem type [ "aspnetcore" "runtime" "sdk"]; , writeText , libunwind , openssl -, icu , libuuid , zlib , curl @@ -38,7 +38,6 @@ in stdenv.mkDerivation rec { rpath = lib.makeLibraryPath ([ stdenv.cc.cc zlib - curl icu libunwind diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 87256e95b02..dc3564f6003 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -5,7 +5,7 @@ dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_3_1 sdk_5_0 aspn Hashes and urls below are retrieved from: https://dotnet.microsoft.com/download/dotnet */ -{ callPackage }: +{ callPackage, icu70, icu }: let buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) {}; buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; }); @@ -22,6 +22,7 @@ rec { # v3.1 (lts) aspnetcore_3_1 = buildAspNetCore { + icu = icu70; version = "3.1.21"; srcs = { x86_64-linux = { @@ -40,6 +41,7 @@ rec { }; runtime_3_1 = buildNetRuntime { + icu = icu70; version = "3.1.21"; srcs = { x86_64-linux = { @@ -58,6 +60,7 @@ rec { }; sdk_3_1 = buildNetSdk { + icu = icu70; version = "3.1.415"; srcs = { x86_64-linux = { @@ -77,6 +80,7 @@ rec { # v5.0 (current) aspnetcore_5_0 = buildAspNetCore { + inherit icu; version = "5.0.12"; srcs = { x86_64-linux = { @@ -95,6 +99,7 @@ rec { }; runtime_5_0 = buildNetRuntime { + inherit icu; version = "5.0.12"; srcs = { x86_64-linux = { @@ -113,6 +118,7 @@ rec { }; sdk_5_0 = buildNetSdk { + inherit icu; version = "5.0.403"; srcs = { x86_64-linux = { @@ -132,6 +138,7 @@ rec { # v6.0 (lts) aspnetcore_6_0 = buildAspNetCore { + inherit icu; version = "6.0.4"; srcs = { x86_64-linux = { @@ -154,6 +161,7 @@ rec { }; runtime_6_0 = buildNetRuntime { + inherit icu; version = "6.0.4"; srcs = { x86_64-linux = { @@ -176,6 +184,7 @@ rec { }; sdk_6_0 = buildNetSdk { + inherit icu; version = "6.0.202"; srcs = { x86_64-linux = { From 48534468e56dca69771c82ae1635b683e00256da Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 10 May 2022 21:57:39 +0800 Subject: [PATCH 022/166] all-cabal-hashes: 2022-05-05T15:07:55Z -> 2022-05-10T13:45:20Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 3c200d6cd8c..06bdca4f111 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "78324aa49909392e169c86bbfd204694523907e8", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/78324aa49909392e169c86bbfd204694523907e8.tar.gz", - "sha256": "15k5ag36asswwv8yazq53lkj9blnz4hzlq23cznvvk5pkjpdm0ni", - "msg": "Update from Hackage at 2022-05-05T15:07:55Z" + "commit": "38aa99a1623af5371157721c2a4b033b828e9938", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/38aa99a1623af5371157721c2a4b033b828e9938.tar.gz", + "sha256": "0phak7cjg3nrj5i3ih2k95hcwx25s6zijbp81ycqd0yb108gvw34", + "msg": "Update from Hackage at 2022-05-10T13:45:20Z" } From 16a8fdd1f809b3607651d61f97a2af3bd6945b7f Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 10 May 2022 21:58:30 +0800 Subject: [PATCH 023/166] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 1059 ++++++++++++++--- 1 file changed, 883 insertions(+), 176 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 799882c1fff..acfb2647ae4 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -770,8 +770,8 @@ self: { }: mkDerivation { pname = "AesonBson"; - version = "0.4.0"; - sha256 = "08ffz1fr8x5z3ipvk99wc5n363ghxrq1z0cv1yh57wx18ialk1cx"; + version = "0.4.1"; + sha256 = "0nyl0a3814163dxpmiadmmjdhd9cycmihwmsz7f0316hbm30lg7z"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson attoparsec base bson scientific text unordered-containers @@ -1131,15 +1131,16 @@ self: { }) {}; "AspectAG" = callPackage - ({ mkDerivation, base, containers, mtl, poly-rec, requirements - , tagged, template-haskell + ({ mkDerivation, base, containers, ghc-prim, loch-th, mtl, poly-rec + , requirements, template-haskell }: mkDerivation { pname = "AspectAG"; - version = "0.6.0.0"; - sha256 = "09lm1hs9l3h6ndv385adhh0kf9id10fjf0n1bczgzqgxmiykx2kn"; + version = "0.7.0.0"; + sha256 = "1w5zfx5vgvkys84vdrdd3rv39ly25wbn9izlir19irniqsbf6z6v"; libraryHaskellDepends = [ - base containers mtl poly-rec requirements tagged template-haskell + base containers ghc-prim loch-th mtl poly-rec requirements + template-haskell ]; description = "Strongly typed Attribute Grammars implemented using type-level programming"; license = lib.licenses.gpl3Only; @@ -14419,6 +14420,8 @@ self: { pname = "Naperian"; version = "0.1.1.0"; sha256 = "1i9hc1pdp9mg9x1xd4wrv06cbhjxw0yhyk2xhsm8jz6rgksa22j7"; + revision = "1"; + editedCabalFile = "0njjyn54cda1j2rmxhmz9hnbg5rwd5f8qcdgfk2z9bq1aiv3h61q"; libraryHaskellDepends = [ base containers ghc-prim vector ]; description = "Naperian Functors for APL-like programming"; license = "unknown"; @@ -24435,6 +24438,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "adjunctions_4_4_1" = callPackage + ({ mkDerivation, array, base, comonad, containers, contravariant + , distributive, free, generic-deriving, hspec, hspec-discover, mtl + , profunctors, semigroupoids, semigroups, tagged, transformers + , transformers-compat, void + }: + mkDerivation { + pname = "adjunctions"; + version = "4.4.1"; + sha256 = "0hqm86v5in7xp31wv3wvr1h7gsim96fpl0si0xrpv8060qalzwww"; + libraryHaskellDepends = [ + array base comonad containers contravariant distributive free mtl + profunctors semigroupoids semigroups tagged transformers + transformers-compat void + ]; + testHaskellDepends = [ base distributive generic-deriving hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Adjunctions and representable functors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "adler32" = callPackage ({ mkDerivation, base, bytestring, hspec, zlib }: mkDerivation { @@ -24725,6 +24750,8 @@ self: { pname = "aeson-better-errors"; version = "0.9.1.1"; sha256 = "05yibq9kqbjb8rh84n12sbax05amvd8jccpja0hyadz58pjy4jnk"; + revision = "1"; + editedCabalFile = "0wzvrmhn5q2x1mcv43cyxhlck815ldkhx7c7gz5ijjyva1iicgn2"; libraryHaskellDepends = [ aeson base bytestring dlist mtl scientific text transformers transformers-compat unordered-containers vector void @@ -25122,18 +25149,12 @@ self: { }) {}; "aeson-iproute" = callPackage - ({ mkDerivation, aeson, base, doctest, iproute, text - , unordered-containers - }: + ({ mkDerivation, aeson, base, doctest, iproute, text }: mkDerivation { pname = "aeson-iproute"; - version = "0.2.1"; - sha256 = "1130mr5fqwi4d74xg6nkvpqycc0vvd6rsiahm1pdhbrx3wvra8p2"; - revision = "1"; - editedCabalFile = "1q9yr42mvvcqy20ww1xcsy2q6jji0mrqng2clq8yd5diyy7kqx1a"; - libraryHaskellDepends = [ - aeson base iproute text unordered-containers - ]; + version = "0.3.0"; + sha256 = "027mmmjlfld6mncn0k8v0i2lg4xkgymaakl5nqs7jw7apgy83x2z"; + libraryHaskellDepends = [ aeson base iproute text ]; testHaskellDepends = [ base doctest ]; description = "Aeson instances for iproute types"; license = lib.licenses.bsd3; @@ -33293,8 +33314,8 @@ self: { }: mkDerivation { pname = "arduino-copilot"; - version = "1.7.0"; - sha256 = "073l9fmg1i83whdfbplpshz2695ls7bb4kf4c40446q0cpccpnrc"; + version = "1.7.1"; + sha256 = "1w42y0avx032i7s208p1rkc24c7hy7lbjia5qjgixzv8qcc0693b"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language directory filepath mtl optparse-applicative sketch-frp-copilot temporary @@ -40891,6 +40912,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "benchpress_0_2_2_20" = callPackage + ({ mkDerivation, base, bytestring, mtl, time }: + mkDerivation { + pname = "benchpress"; + version = "0.2.2.20"; + sha256 = "0yh44hdk7gh6ygdlys2mrij2gphdv5da8hmc7rnyf6cr5509ynn8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl time ]; + executableHaskellDepends = [ base bytestring time ]; + description = "Micro-benchmarking with detailed statistics"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bencode" = callPackage ({ mkDerivation, base, binary, bytestring, containers, hspec , parsec, QuickCheck, transformers, transformers-compat @@ -41422,6 +41458,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "bifunctors_5_5_12" = callPackage + ({ mkDerivation, base, base-orphans, comonad, containers, hspec + , hspec-discover, QuickCheck, tagged, template-haskell + , th-abstraction, transformers, transformers-compat + }: + mkDerivation { + pname = "bifunctors"; + version = "5.5.12"; + sha256 = "0pbidsv1w3bvzs8w6sv8g1iqf0l9r1y0b1fmvd67cwlp01r7f1n6"; + libraryHaskellDepends = [ + base base-orphans comonad containers tagged template-haskell + th-abstraction transformers + ]; + testHaskellDepends = [ + base hspec QuickCheck template-haskell transformers + transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + description = "Bifunctors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bighugethesaurus" = callPackage ({ mkDerivation, base, HTTP, split }: mkDerivation { @@ -44196,6 +44255,8 @@ self: { pname = "bits"; version = "0.6"; sha256 = "18s2aa99cwcshcws2zl2ll7xgqn9dpznpkv1nplamc9h4vmqqs93"; + revision = "1"; + editedCabalFile = "1f118vwwskai74l6wn5sfy002k241qv1rhpsahphfr58llzgvv50"; libraryHaskellDepends = [ base bytes mtl transformers ]; description = "Various bit twiddling and bitwise serialization primitives"; license = lib.licenses.bsd3; @@ -45082,6 +45143,18 @@ self: { broken = true; }) {}; + "blaze-htmx" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup }: + mkDerivation { + pname = "blaze-htmx"; + version = "0.1.0.0"; + sha256 = "18bl1bnf5z3p9pa12hjd2j53hi1qigya8bbpsj9jczgn4cbvx5q6"; + libraryHaskellDepends = [ base blaze-html blaze-markup ]; + testHaskellDepends = [ base blaze-html ]; + description = "Blaze integration of the htmx library"; + license = lib.licenses.bsd3; + }) {}; + "blaze-json" = callPackage ({ mkDerivation, aeson, base, bytestring, bytestring-builder , containers, data-default-class, doctest, QuickCheck, scientific @@ -46758,6 +46831,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "bound_2_0_5" = callPackage + ({ mkDerivation, base, bifunctors, binary, bytes, cereal, comonad + , deepseq, deriving-compat, hashable, mmorph, profunctors + , template-haskell, th-abstraction, transformers + , transformers-compat, vector, void + }: + mkDerivation { + pname = "bound"; + version = "2.0.5"; + sha256 = "1cnw0q97bys7jcpjds2fb6zkq9pyqxcb8v0b5dvkckqmlp8agn4v"; + libraryHaskellDepends = [ + base bifunctors binary bytes cereal comonad deepseq hashable mmorph + profunctors template-haskell th-abstraction transformers + transformers-compat + ]; + testHaskellDepends = [ + base deriving-compat transformers transformers-compat vector void + ]; + description = "Making de Bruijn Succ Less"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bound-extras" = callPackage ({ mkDerivation, adjunctions, base, bound, containers, deepseq , filepath, hashable, pretty, tasty, tasty-golden, text-short @@ -49057,6 +49153,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "bytes_0_17_2" = callPackage + ({ mkDerivation, base, binary, binary-orphans, bytestring, cereal + , containers, hashable, mtl, scientific, text, time, transformers + , transformers-compat, unordered-containers, void + }: + mkDerivation { + pname = "bytes"; + version = "0.17.2"; + sha256 = "06kqqk19qjhrwdqi6pyd1lwqfnj2sw3b3s49lc5vr2fmv8gg8mdw"; + libraryHaskellDepends = [ + base binary binary-orphans bytestring cereal containers hashable + mtl scientific text time transformers transformers-compat + unordered-containers void + ]; + description = "Sharing code for serialization between binary and cereal"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "byteset" = callPackage ({ mkDerivation, base, binary }: mkDerivation { @@ -52492,16 +52607,16 @@ self: { "cantor-pairing" = callPackage ({ mkDerivation, base, containers, hspec, hspec-discover - , integer-gmp, integer-logarithms, integer-roots, mtl + , integer-gmp, integer-logarithms, integer-roots }: mkDerivation { pname = "cantor-pairing"; - version = "0.2.0.1"; - sha256 = "12wfm27gwhar7djd459yc86bv29818xdyc8glkhgn4q1kx7nda90"; + version = "0.2.0.2"; + sha256 = "1h95xbc1lhwd40qk64qw2cmr7prwygli1q2wy5hscny7jyah95c2"; libraryHaskellDepends = [ base containers integer-gmp integer-logarithms integer-roots ]; - testHaskellDepends = [ base containers hspec mtl ]; + testHaskellDepends = [ base containers hspec ]; testToolDepends = [ hspec-discover ]; description = "Convert data to and from a natural number representation"; license = lib.licenses.mit; @@ -66315,8 +66430,8 @@ self: { }: mkDerivation { pname = "copilot"; - version = "3.8"; - sha256 = "0lqr2ns6jg7m36pynl6i442d8x4kdlwlxqf59a0gspn8zgidwaii"; + version = "3.9"; + sha256 = "0kryqpk4sn5gbpjpvzcdhd5yp5045cfr2c112df5vagd7gp4a4gd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66335,8 +66450,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.8"; - sha256 = "0bpak9kd23j8bmc8x7ksb84gggmxplax4wj00c39mrvh5cb5wlwx"; + version = "3.9"; + sha256 = "1m915j72b6axbwnls4kcjcdpixxlrjxw4zpvdzq34jym5h2kpd78"; libraryHaskellDepends = [ base containers copilot-core directory filepath language-c99 language-c99-simple language-c99-util mtl pretty @@ -66369,8 +66484,8 @@ self: { }: mkDerivation { pname = "copilot-core"; - version = "3.8"; - sha256 = "0vv3p9a0c3pa856yx8zmr4d5ag8mym9gbpz5bgi17a7cgfc682cz"; + version = "3.9"; + sha256 = "0haqyci12b44dn1hpfqp9hfyw949gl61yzxic8kznb0hl1h1sl5a"; libraryHaskellDepends = [ base dlist mtl pretty ]; testHaskellDepends = [ base HUnit pretty QuickCheck test-framework test-framework-hunit @@ -66407,8 +66522,8 @@ self: { }: mkDerivation { pname = "copilot-language"; - version = "3.8"; - sha256 = "1wnv7xkgalxd7p7bm2zrsbg2r2wip9an8m5m3fc63wxvk9wcabj6"; + version = "3.9"; + sha256 = "1041mm4c8zf7wlrcnfp97lsnr8qsmclr7y3qcawx9pmarwk8arg8"; libraryHaskellDepends = [ array base containers copilot-core copilot-theorem data-reify mtl ]; @@ -66427,8 +66542,8 @@ self: { }: mkDerivation { pname = "copilot-libraries"; - version = "3.8"; - sha256 = "1sx8bl10j7qwqi91dbl9dahy9l2n17qfbyni73az2fx9rq3q1jkz"; + version = "3.9"; + sha256 = "12h121zlq4xbkh947lkxdsjykf061rlmxkyhzyc2s2520fhkapx3"; libraryHaskellDepends = [ array base containers copilot-language data-reify mtl parsec ]; @@ -66461,8 +66576,8 @@ self: { }: mkDerivation { pname = "copilot-theorem"; - version = "3.8"; - sha256 = "18287hs36lhf1g6l740vkynccy1d87lrr9rcjpgzfn03s9y3d58n"; + version = "3.9"; + sha256 = "1gnr6rd88gxs5wxkh6j28hqm81bj8b585n6ywm6s5p2wxgx0wzbn"; libraryHaskellDepends = [ ansi-terminal base bimap bv-sized containers copilot-core data-default directory filepath libBF mtl panic parameterized-utils @@ -76246,6 +76361,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "deriving-compat_0_6_1" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, containers + , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged + , template-haskell, th-abstraction, transformers + , transformers-compat, void + }: + mkDerivation { + pname = "deriving-compat"; + version = "0.6.1"; + sha256 = "09lxms6220saycra4kpxihwa7zh253zmv1zpa41dbnhgffxs3zbb"; + libraryHaskellDepends = [ + base containers ghc-boot-th ghc-prim template-haskell + th-abstraction transformers transformers-compat + ]; + testHaskellDepends = [ + base base-compat base-orphans hspec QuickCheck tagged + template-haskell transformers transformers-compat void + ]; + testToolDepends = [ hspec-discover ]; + description = "Backports of GHC deriving extensions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "deriving-show-simple" = callPackage ({ mkDerivation, base, HUnit }: mkDerivation { @@ -77678,8 +77817,8 @@ self: { }: mkDerivation { pname = "diagnose"; - version = "1.9.0"; - sha256 = "0w3mzk50pzf5rr2k8lfkmmlsr8kmvgx1jcszla4khx0an5bsafnf"; + version = "2.0.0"; + sha256 = "1rb2fm0bx1rmb63xc56v19adi9f0iy72j0h8rvrvw0lvcwp398xk"; libraryHaskellDepends = [ base data-default hashable prettyprinter prettyprinter-ansi-terminal unordered-containers wcwidth @@ -86016,6 +86155,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "either_5_0_2" = callPackage + ({ mkDerivation, base, bifunctors, mtl, profunctors, QuickCheck + , semigroupoids, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "either"; + version = "5.0.2"; + sha256 = "1gl748ia68bldbqb2fl7vjv44g0y8ivn659fjmy1qyypgyb5p95z"; + libraryHaskellDepends = [ + base bifunctors mtl profunctors semigroupoids + ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + ]; + description = "Combinators for working with sums"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "either-both" = callPackage ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck }: mkDerivation { @@ -90852,17 +91010,15 @@ self: { broken = true; }) {}; - "exceptions_0_10_4" = callPackage + "exceptions_0_10_5" = callPackage ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell , test-framework, test-framework-hunit, test-framework-quickcheck2 , transformers }: mkDerivation { pname = "exceptions"; - version = "0.10.4"; - sha256 = "1kw4pmx7j7zwbdwm0dyn9rcs6kp4byfxy48861yxdz6gam1zn2sd"; - revision = "3"; - editedCabalFile = "0b9bml5j46zz62ik2827ndsd5293dh8630086x1mngb80gnrml3y"; + version = "0.10.5"; + sha256 = "12xz2x16pv1a6csz64bpl22v40vykjwvdaiz39i8f8nkwasc1qv6"; libraryHaskellDepends = [ base mtl stm template-haskell transformers ]; @@ -97950,8 +98106,8 @@ self: { pname = "foldl"; version = "1.4.12"; sha256 = "0zf4yljh3s2ddxa7dhzdglmylj14kfldhkclc44g37zvjq6kcnag"; - revision = "2"; - editedCabalFile = "0ggl6djyqrc56j8iy56f61jki7v3ym35ykd944z045gpjzbaq3c6"; + revision = "3"; + editedCabalFile = "1xijnq8qkmrj2w7h6gr2vy8a0ajhiapzi2fain5pgcllli2fny2r"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable primitive profunctors random semigroupoids text transformers @@ -99455,6 +99611,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "free_5_1_8" = callPackage + ({ mkDerivation, base, comonad, containers, distributive + , exceptions, indexed-traversable, mtl, profunctors, semigroupoids + , template-haskell, th-abstraction, transformers, transformers-base + }: + mkDerivation { + pname = "free"; + version = "5.1.8"; + sha256 = "0h43a7w6yjnvqp3rl8qvcjl9a0hg86l0h7zxkikd0mw8n65l8xvr"; + libraryHaskellDepends = [ + base comonad containers distributive exceptions indexed-traversable + mtl profunctors semigroupoids template-haskell th-abstraction + transformers transformers-base + ]; + description = "Monads for free"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "free-algebras" = callPackage ({ mkDerivation, base, containers, data-fix, dlist, free, groups , hedgehog, kan-extensions, mtl, transformers @@ -101678,7 +101853,7 @@ self: { "futhark" = callPackage ({ mkDerivation, aeson, alex, ansi-terminal, array, base , base16-bytestring, binary, blaze-html, bmp, bytestring - , bytestring-to-vector, cmark-gfm, containers, cryptohash-md5 + , bytestring-to-vector, cmark-gfm, containers, cryptohash-md5, Diff , directory, directory-tree, dlist, file-embed, filepath, free , futhark-data, futhark-manifest, futhark-server, githash, half , happy, haskeline, hslogger, language-c-quote, lens, lsp @@ -101690,23 +101865,23 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.21.10"; - sha256 = "0mm0awd1sf5sfb6i1yjbcm67j2nhqpfnn11q8p61z3b2py6lnzzf"; + version = "0.21.11"; + sha256 = "1n8id7h0qpgifbmkdh3ma72kpv6hn6siyfjd62day3zywrjfxd61"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal array base base16-bytestring binary blaze-html bmp bytestring bytestring-to-vector cmark-gfm containers - cryptohash-md5 directory directory-tree dlist file-embed filepath - free futhark-data futhark-manifest futhark-server githash half - haskeline hslogger language-c-quote lens lsp mainland-pretty + cryptohash-md5 Diff directory directory-tree dlist file-embed + filepath free futhark-data futhark-manifest futhark-server githash + half haskeline hslogger language-c-quote lens lsp mainland-pretty megaparsec mtl mwc-random neat-interpolation parallel process process-extras random regex-tdfa srcloc statistics template-haskell temporary terminal-size text time transformers vector versions zip-archive zlib ]; libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ base text ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ base containers megaparsec mtl parser-combinators QuickCheck tasty tasty-hunit tasty-quickcheck text @@ -103548,6 +103723,8 @@ self: { pname = "generic-lens"; version = "2.2.1.0"; sha256 = "17an4669igzs6pwzqxnpkx9gmxwz64p32d1zcinhh5agd56y70pa"; + revision = "1"; + editedCabalFile = "1wzxvfi9kzhbglih1syqhx42kcsvlinnfc338fl731k6hc95hmlm"; libraryHaskellDepends = [ base generic-lens-core profunctors text ]; @@ -103564,6 +103741,8 @@ self: { pname = "generic-lens-core"; version = "2.2.1.0"; sha256 = "08i4c9yb6z84iknrnl9f3f343121j7ilp0a679v81nsjm9xz3rlf"; + revision = "1"; + editedCabalFile = "1dbjhd6k7ypqa9f4h9v2xndgb4mjhfli3n1vjm8r8ga0kfndbqfn"; libraryHaskellDepends = [ base indexed-profunctors text ]; description = "Generically derive traversals, lenses and prisms"; license = lib.licenses.bsd3; @@ -103664,6 +103843,8 @@ self: { pname = "generic-optics"; version = "2.2.1.0"; sha256 = "1bw7bbkrd1sfshzx7v1nbdnkxc82krw96x7vnl7myz9748m4472z"; + revision = "1"; + editedCabalFile = "13wkbs8x0clkqzi4xqin89qywpky8jkpz9cxgwsglbpcyw11jvgq"; libraryHaskellDepends = [ base generic-lens-core optics-core text ]; @@ -105036,15 +105217,21 @@ self: { "geomancy" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, hedgehog - , linear + , linear, mono-traversable, simple-affine-space }: mkDerivation { pname = "geomancy"; - version = "0.2.3.0"; - sha256 = "1li0411y725c5k6zmkki0brz4w4yksxfdbk2ggq31yirmdihc5al"; - libraryHaskellDepends = [ base containers deepseq ]; - testHaskellDepends = [ base deepseq hedgehog linear ]; - benchmarkHaskellDepends = [ base criterion deepseq linear ]; + version = "0.2.4.0"; + sha256 = "1wc9fza03afha1ni7jh9gpm39k20d6n5kmjgkpd06aqpf6yaqfcl"; + libraryHaskellDepends = [ + base containers deepseq mono-traversable simple-affine-space + ]; + testHaskellDepends = [ + base deepseq hedgehog linear simple-affine-space + ]; + benchmarkHaskellDepends = [ + base criterion deepseq linear simple-affine-space + ]; description = "Geometry and matrix manipulation"; license = lib.licenses.bsd3; }) {}; @@ -105503,19 +105690,19 @@ self: { }) {}; "ghc-debug-brick" = callPackage - ({ mkDerivation, base, brick, containers, cursor, directory + ({ mkDerivation, base, brick, containers, deepseq, directory , exceptions, filepath, ghc-debug-client, ghc-debug-common , ghc-debug-convention, microlens, microlens-platform, text, time , unordered-containers, vty }: mkDerivation { pname = "ghc-debug-brick"; - version = "0.2.0.0"; - sha256 = "1jv2n0bxy37whsxs4drajs0mx83qng82qr62igicfnlqsvd5sk36"; + version = "0.2.1.0"; + sha256 = "02zkfndppp386va6vp6mamsv195sdvvwa3dj0ff2kp3kb4gbny7n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base brick containers cursor directory exceptions filepath + base brick containers deepseq directory exceptions filepath ghc-debug-client ghc-debug-common ghc-debug-convention microlens microlens-platform text time unordered-containers vty ]; @@ -105555,10 +105742,8 @@ self: { }: mkDerivation { pname = "ghc-debug-common"; - version = "0.2.0.0"; - sha256 = "1fw9whgh2zayvaagn1f7x1qkwvznpjhpn4zkfnfav24pkmpf5ijy"; - revision = "2"; - editedCabalFile = "1cq2bgq9n6295912p8bfwkrg9jqx36x4zxzj468pkr3dsfhjqr23"; + version = "0.2.1.0"; + sha256 = "1p895vq31ijkp8lgscxrvpiq2z97l9wx8rcji4nf8kc3bkprk8kl"; libraryHaskellDepends = [ array base binary bytestring containers cpu deepseq directory dom-lt filepath ghc-debug-convention ghc-heap hashable transformers @@ -105588,10 +105773,8 @@ self: { }: mkDerivation { pname = "ghc-debug-stub"; - version = "0.2.0.0"; - sha256 = "1zi388jwdad9qlj1v0ihrv67abknbhh7scr1fymc808xmkkwk701"; - revision = "1"; - editedCabalFile = "0irnhf32ghxch8r0p2vd7afj3282a1r9lval2an2mj99kcllhl6d"; + version = "0.2.1.0"; + sha256 = "1wjmlm9m6iwpn7bz3bjww7vlbp5jac5a8adzzfcxsgw4dz47n221"; libraryHaskellDepends = [ base directory filepath ghc-debug-convention ghc-prim ]; @@ -115852,6 +116035,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "graphs_0_7_2" = callPackage + ({ mkDerivation, array, base, containers, transformers + , transformers-compat, void + }: + mkDerivation { + pname = "graphs"; + version = "0.7.2"; + sha256 = "1isdy8qx3q00pb3jinvvmfvzhwblr3yhj4dzmlv0hdj0yi9j8bly"; + libraryHaskellDepends = [ + array base containers transformers transformers-compat void + ]; + description = "A simple monadic graph library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "graphted" = callPackage ({ mkDerivation, base, indexed }: mkDerivation { @@ -119766,14 +119965,15 @@ self: { ({ mkDerivation, base, containers, deepseq, fgl, hashable, HUnit , monad-primitive, primitive, QuickCheck, ref-tf, test-framework , test-framework-hunit, test-framework-quickcheck2, vector + , vector-th-unbox }: mkDerivation { pname = "haggle"; - version = "0.1.0.1"; - sha256 = "1j598hcjw0p9iac4h91w47k4rh9k0h2r9gk3rrfkklvw84aznkrz"; + version = "0.2"; + sha256 = "1n7rg63bz283d938vr2w7ghza2qmljw04bg1wr4zhpylw6jjy2b7"; libraryHaskellDepends = [ base containers deepseq hashable monad-primitive primitive ref-tf - vector + vector vector-th-unbox ]; testHaskellDepends = [ base containers fgl HUnit QuickCheck test-framework @@ -122089,6 +122289,8 @@ self: { pname = "happy"; version = "1.19.12"; sha256 = "03xlmq6qmdx4zvzw8bp33kd9g7yvcq5cz4wg50xilw812kj276pv"; + revision = "1"; + editedCabalFile = "13wydw1mmdry4l9r63vxjk4h55ci9hgwzn1a842qqk1m2rb4xiln"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -122105,6 +122307,8 @@ self: { pname = "happy"; version = "1.20.0"; sha256 = "1346r2x5ravs5fqma65bzjragqbb2g6v41wz9maknwm2jf7kl79v"; + revision = "1"; + editedCabalFile = "16dy1cv942rizxp8slnnbwi5l24ggsmy38madbin9scz38idqisx"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -133608,8 +133812,8 @@ self: { }: mkDerivation { pname = "higgledy"; - version = "0.4.1.1"; - sha256 = "1aqln8y055ysnzw3sqfdi6rm63a4a8c3n3f4fgv1rqmx76vsvsaz"; + version = "0.4.2.0"; + sha256 = "01hl63wq6rb2wgml850wawq07sn9vl8d2hv1jc3m366dxdqqhy8j"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ barbies base generic-lens generic-lens-core named QuickCheck @@ -135843,8 +136047,8 @@ self: { pname = "hlrdb"; version = "0.3.2.0"; sha256 = "1k4dsd4h3fv1ag753gwxvirfrj53ra4ik948pyacq31c16mz1l2p"; - revision = "2"; - editedCabalFile = "15z6f2qqis3qi1cfq43hhcqgcsinx58ha3bghh0pfybqysvbjmmd"; + revision = "3"; + editedCabalFile = "1r8dmsfbsm4lhak2hskid03bad2fvnb71v779grzf5hy6y46jc42"; libraryHaskellDepends = [ base base64-bytestring bytestring cryptonite hashable hedis hlrdb-core memory random store time unordered-containers zstd @@ -135862,6 +136066,8 @@ self: { pname = "hlrdb-core"; version = "0.1.6.2"; sha256 = "19pnwjlcg504kpvxq8r1hwb533adi2d919vgb1lr25c9bdyxc32n"; + revision = "1"; + editedCabalFile = "0d6bwxk390f00qsmhn71sssw47f53j2wgrwwarhs8vvz6kyvncmp"; libraryHaskellDepends = [ base bytestring hashable hedis lens mtl profunctors random time unordered-containers @@ -147800,6 +148006,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "http-reverse-proxy_0_6_0_1" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive + , conduit, conduit-extra, containers, hspec, http-client + , http-conduit, http-types, network, resourcet, streaming-commons + , text, transformers, unliftio, wai, wai-logger, warp, word8 + }: + mkDerivation { + pname = "http-reverse-proxy"; + version = "0.6.0.1"; + sha256 = "0a0fc9rqr1crbb1sbq3gzbkwjcfff662d4bgmy3vzspk7ky697ld"; + libraryHaskellDepends = [ + base blaze-builder bytestring case-insensitive conduit + conduit-extra containers http-client http-types network resourcet + streaming-commons text transformers unliftio wai wai-logger word8 + ]; + testHaskellDepends = [ + base blaze-builder bytestring conduit conduit-extra hspec + http-conduit http-types network resourcet streaming-commons + transformers unliftio wai warp + ]; + description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "http-rfc7807" = callPackage ({ mkDerivation, aeson, base, call-stack, hspec-expectations-json , http-media, http-types, HUnit, servant, servant-server, tasty @@ -155811,19 +156042,19 @@ self: { "intricacy" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , cryptonite, directory, exceptions, filepath, hscurses, memory - , mtl, ncurses, network-fancy, random, safe, SDL, SDL-gfx + , mtl, ncurses, network-simple, random, safe, SDL, SDL-gfx , SDL-mixer, SDL-ttf, stm, time, transformers, vector }: mkDerivation { pname = "intricacy"; - version = "0.8.0.1"; - sha256 = "0kyhswgg8iyxvicgpf0f5rn3gk4k620crk02xd4bn797xws5bzzs"; + version = "0.8.1"; + sha256 = "0jpg3rvngsil7zii57inax3im92n1ahv6lcrb3swikahbli0d8wc"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ array base binary bytestring containers cryptonite directory - exceptions filepath hscurses memory mtl network-fancy random safe + exceptions filepath hscurses memory mtl network-simple random safe SDL SDL-gfx SDL-mixer SDL-ttf stm time transformers vector ]; executablePkgconfigDepends = [ ncurses ]; @@ -155984,6 +156215,29 @@ self: { license = lib.licenses.bsd2; }) {}; + "invariant_0_5_6" = callPackage + ({ mkDerivation, array, base, bifunctors, comonad, containers + , contravariant, ghc-prim, hspec, hspec-discover, profunctors + , QuickCheck, StateVar, stm, tagged, template-haskell + , th-abstraction, transformers, transformers-compat + , unordered-containers + }: + mkDerivation { + pname = "invariant"; + version = "0.5.6"; + sha256 = "1l73wlnmh09187w8y61qyjjycpljds9lydy16ifa08bmmbxgkzcw"; + libraryHaskellDepends = [ + array base bifunctors comonad containers contravariant ghc-prim + profunctors StateVar stm tagged template-haskell th-abstraction + transformers transformers-compat unordered-containers + ]; + testHaskellDepends = [ base hspec QuickCheck template-haskell ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell98 invariant functors"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "inventory" = callPackage ({ mkDerivation, appendmap, array, base, bytestring, containers , directory, filepath, ghc, ghc-paths, mtl, tasty, tasty-hunit @@ -158152,8 +158406,8 @@ self: { }: mkDerivation { pname = "ixset-typed"; - version = "0.5"; - sha256 = "07n7qfi8slmrlgzvrkddr17b792phhb140q9gb5pm68kk1im4izs"; + version = "0.5.1.0"; + sha256 = "033rm2sik1qz4dmqlabjzwwqw38vj3hrwlkmhm554yvk1n3v9dq8"; libraryHaskellDepends = [ base containers deepseq safecopy syb template-haskell ]; @@ -160914,8 +161168,8 @@ self: { }: mkDerivation { pname = "jsonrpc-conduit"; - version = "0.3.8"; - sha256 = "196w8jmb8107shbrdhr17axl6x2sx088hdys2yfpqmrcsxc77z45"; + version = "0.3.9"; + sha256 = "0qj3rlh695nbs3kxix2r7h4np99q6pn7x8x86j4785d6d2gly1ik"; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit conduit-extra mtl text transformers unordered-containers @@ -161725,6 +161979,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "kan-extensions_5_2_4" = callPackage + ({ mkDerivation, adjunctions, array, base, comonad, containers + , contravariant, distributive, free, invariant, mtl, profunctors + , semigroupoids, tagged, transformers, transformers-compat + }: + mkDerivation { + pname = "kan-extensions"; + version = "5.2.4"; + sha256 = "0qnds0vwhsqznirqalm8f4c0qsmp1awfhc4fn2rx5agl5az3zip8"; + libraryHaskellDepends = [ + adjunctions array base comonad containers contravariant + distributive free invariant mtl profunctors semigroupoids tagged + transformers transformers-compat + ]; + description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "kangaroo" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -163307,8 +163580,8 @@ self: { pname = "keys"; version = "3.12.3"; sha256 = "0ik6wsff306dnbz0v3gpiajlj5b558hrk9176fzcb2fclf4447nm"; - revision = "1"; - editedCabalFile = "18fapd53nby46p5103y1m2hwpixn5p12mbyvb8va71pk4b77qlcy"; + revision = "2"; + editedCabalFile = "1sb7ii9mhx77rhviqbmdc5r6wlimkmadxi1pyk7k3imdqcdzgjlp"; libraryHaskellDepends = [ array base comonad containers free hashable semigroupoids semigroups tagged transformers transformers-compat @@ -163933,8 +164206,8 @@ self: { }: mkDerivation { pname = "koji-tool"; - version = "0.8.3"; - sha256 = "17xd1755yr2acf6brwbxn3yzbndv982s7jgxbj9dmd7my6v1d9i2"; + version = "0.8.5"; + sha256 = "1zkvw8fibav9n8x7dvw7mcns6zc00il5ajcwsvb1ycbb3pqj82ps"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -168722,14 +168995,14 @@ self: { license = lib.licenses.mit; }) {}; - "lens-aeson_1_2" = callPackage + "lens-aeson_1_2_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, lens , scientific, text, text-short, unordered-containers, vector }: mkDerivation { pname = "lens-aeson"; - version = "1.2"; - sha256 = "1hi0y3bn3xny7w2cjzxn9j5hmfg6l7kbsji5skbj32zfrqlhkkwi"; + version = "1.2.1"; + sha256 = "08x0vbkay8d6s24fzy2iria0hl9pmq891cnzm6zl0j9j53z9jw9l"; libraryHaskellDepends = [ aeson attoparsec base bytestring lens scientific text text-short unordered-containers vector @@ -169174,6 +169447,8 @@ self: { pname = "lentil"; version = "1.5.4.0"; sha256 = "0xfsf7g9r2w30qkp4829w77hsja562jvx4n9i880j9qngi2ms2h1"; + revision = "1"; + editedCabalFile = "15dr5jlb6b18j2brxji4k1g12zwvhpjq96nqb27pjkznm59c4x19"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -170819,8 +171094,8 @@ self: { pname = "lift-generics"; version = "0.2.1"; sha256 = "1qkzq8hcb6j15cslv577bmhjcxmljzsrryysdgd7r99kr3q445b4"; - revision = "1"; - editedCabalFile = "0i0qxm2fi34bnpnwk5k61yjx72pc9j8jhbx44xk176pw7y2pinxd"; + revision = "2"; + editedCabalFile = "1q6lviqfvyis3ss9w6r6j5d35is50r2favj9lkdagcmczw9c4706"; libraryHaskellDepends = [ base generic-deriving ghc-prim template-haskell th-compat ]; @@ -171824,6 +172099,29 @@ self: { license = lib.licenses.publicDomain; }) {}; + "linkcheck" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , http-client, http-client-tls, http-types, lrucache, monad-logger + , mtl, network-uri, optparse-applicative, path, path-io, retry, stm + , tagsoup, text, unliftio + }: + mkDerivation { + pname = "linkcheck"; + version = "0.1.0.0"; + sha256 = "18wb2naxqhvnvyjjmgbsa0ky98ikgrdhrcra9bxy1vfizhrpwhfn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers http-client + http-client-tls http-types lrucache monad-logger mtl network-uri + optparse-applicative path path-io retry stm tagsoup text unliftio + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Check for broken links in CI"; + license = lib.licenses.mit; + }) {}; + "linkchk" = callPackage ({ mkDerivation, base, gtk, haskell98, popenhs, regex-compat, unix }: @@ -172779,6 +173077,25 @@ self: { license = lib.licenses.mit; }) {}; + "list-t_1_0_5_2" = callPackage + ({ mkDerivation, base, base-prelude, foldl, HTF, logict, mmorph + , monad-control, mtl, mtl-prelude, semigroups, transformers + , transformers-base + }: + mkDerivation { + pname = "list-t"; + version = "1.0.5.2"; + sha256 = "0478iigfrkinhkjyq9zc4xvrbzcfvq46s6k0bj4a2sy8j41jzgww"; + libraryHaskellDepends = [ + base foldl logict mmorph monad-control mtl semigroups transformers + transformers-base + ]; + testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; + description = "ListT done right"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "list-t-attoparsec" = callPackage ({ mkDerivation, attoparsec, base-prelude, either, hspec, list-t , list-t-text, text, transformers @@ -172889,6 +173206,20 @@ self: { maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; + "list-transformer_1_0_8" = callPackage + ({ mkDerivation, base, doctest, mtl }: + mkDerivation { + pname = "list-transformer"; + version = "1.0.8"; + sha256 = "03rqs8hrddlbq4v3pzh42z7lh11z3klpgbmyp85i926shpm5qibh"; + libraryHaskellDepends = [ base mtl ]; + testHaskellDepends = [ base doctest ]; + description = "List monad transformer"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Gabriel439 ]; + }) {}; + "list-tries" = callPackage ({ mkDerivation, base, binary, ChasingBottoms, containers, dlist , HUnit, QuickCheck, template-haskell, test-framework @@ -174815,6 +175146,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "logict_0_8_0_0" = callPackage + ({ mkDerivation, async, base, mtl, tasty, tasty-hunit }: + mkDerivation { + pname = "logict"; + version = "0.8.0.0"; + sha256 = "0mpv50ifb3x9vfmgi1p9piwcgz8d19x0wdj789wxyhxwjpr6v4py"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl ]; + testHaskellDepends = [ async base mtl tasty tasty-hunit ]; + description = "A backtracking logic-programming monad"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "logict-sequence" = callPackage ({ mkDerivation, base, logict, mtl, sequence, type-aligned }: mkDerivation { @@ -175311,20 +175657,23 @@ self: { }) {}; "looper" = callPackage - ({ mkDerivation, aeson, base, hspec, optparse-applicative, text + ({ mkDerivation, aeson, autodocodec, autodocodec-yaml, base + , envparse, optparse-applicative, sydtest, sydtest-discover, text , time, unliftio }: mkDerivation { pname = "looper"; - version = "0.0.0.2"; - sha256 = "0w4aancb0lbfgmk2drnbc1w6bxlbdkhg0zy1qj7xp3kvgc76vqli"; + version = "0.2.0.1"; + sha256 = "0nqkqbna1fivf0ziilqrlg38hxpkhll4yv42p8r5g87d7r33jmc2"; libraryHaskellDepends = [ - aeson base optparse-applicative text time unliftio + aeson autodocodec base envparse optparse-applicative text time + unliftio ]; testHaskellDepends = [ - aeson base hspec optparse-applicative text time unliftio + autodocodec-yaml base optparse-applicative sydtest unliftio ]; - license = lib.licenses.bsd3; + testToolDepends = [ sydtest-discover ]; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -176075,8 +176424,8 @@ self: { pname = "lucid"; version = "2.11.0"; sha256 = "1m1f13vxn3pwc7wvhx0czzxlx2ws8lzdgxlxd1707cx79jyib5sl"; - revision = "1"; - editedCabalFile = "0ai0rxiyni9cxzad3ix50vkxqqmgxfd1vpqzfrmmll1swxpicd8q"; + revision = "2"; + editedCabalFile = "01vqjqpng0wkf8955vrdwd499y9h2mlh4jqbnmzp5598iswgq15c"; libraryHaskellDepends = [ base blaze-builder bytestring containers hashable mmorph mtl text transformers unordered-containers @@ -176091,6 +176440,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "lucid_2_11_1" = callPackage + ({ mkDerivation, base, bifunctors, blaze-builder, bytestring + , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph + , mtl, parsec, text, transformers + }: + mkDerivation { + pname = "lucid"; + version = "2.11.1"; + sha256 = "13krwrvv0w24rnl7pc7qhv18c6030fkxpx7sxkffdm8sr9173xfw"; + libraryHaskellDepends = [ + base blaze-builder bytestring containers hashable mmorph mtl text + transformers + ]; + testHaskellDepends = [ + base bifunctors hspec HUnit mtl parsec text + ]; + benchmarkHaskellDepends = [ + base blaze-builder bytestring criterion deepseq text transformers + ]; + description = "Clear to write, read and edit DSL for HTML"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lucid-alpine" = callPackage ({ mkDerivation, base, lucid, text }: mkDerivation { @@ -176217,6 +176590,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "lucid2" = callPackage + ({ mkDerivation, base, bifunctors, blaze-builder, bytestring + , containers, hspec, HUnit, mtl, parsec, text, transformers + }: + mkDerivation { + pname = "lucid2"; + version = "0.0.20220509"; + sha256 = "0d38gic3xjqj5in97sbfzjb696011bl47sshzh0377md5j02yc85"; + libraryHaskellDepends = [ + base blaze-builder bytestring containers mtl text transformers + ]; + testHaskellDepends = [ + base bifunctors hspec HUnit mtl parsec text + ]; + description = "Clear to write, read and edit DSL for HTML"; + license = lib.licenses.bsd3; + }) {}; + "lucienne" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-html, bson , bytestring, compact-string-fix, feed, happstack, happstack-server @@ -179777,8 +180168,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "50200.15.0"; - sha256 = "0hn3d1fifzls714a0hsvhbf7wxhg0q60igpr2jcd76yqnzax1mda"; + version = "50200.16.0"; + sha256 = "1hjb408dznls8r6k89jv0zvliv259xj2gzl03f4ypwacihmr3qiw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -179813,8 +180204,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "50200.11.0"; - sha256 = "0knrc00377wx8j4ly8d2nxqswybp3782j7qig6mrzlww6nbd68j7"; + version = "50200.12.0"; + sha256 = "12mmpyw1lcmyxh73rgzckww7dd6lxc6m81h2xa9rpd8mxwx0n17n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179838,8 +180229,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "50200.11.0"; - sha256 = "0crz0nc8qbsjyq3fllbj50d01axgwfas76bmr6xnz83sic2s1yw1"; + version = "50200.12.0"; + sha256 = "00fgr80xanrni835n7wgazq6900f040cwnhbsz99936azx125nx4"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -180745,8 +181136,28 @@ self: { pname = "megaparsec"; version = "9.2.0"; sha256 = "1whjn3n14h2q3ja1v7zllzmj28ai7lqwfbif22c08rl00wpwmwhd"; - revision = "1"; - editedCabalFile = "1jv3j59fvykvplj3c653c9rk5wiwg6x0jnljhi2vknzxxmxkjj02"; + revision = "2"; + editedCabalFile = "1f82q0v5iaqnl6f3pjgrwin2lg7w5zykgn6vpds08pjgwfg39va1"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers deepseq mtl + parser-combinators scientific text transformers + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq text weigh + ]; + description = "Monadic parser combinators"; + license = lib.licenses.bsd2; + }) {}; + + "megaparsec_9_2_1" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , criterion, deepseq, mtl, parser-combinators, scientific, text + , transformers, weigh + }: + mkDerivation { + pname = "megaparsec"; + version = "9.2.1"; + sha256 = "1zz92mkwyhvvh8c8nc7cfz8cw2g9374na11k2gb6dbm4pabq69vb"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -180756,6 +181167,7 @@ self: { ]; description = "Monadic parser combinators"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; }) {}; "megaparsec-tests" = callPackage @@ -180782,6 +181194,31 @@ self: { license = lib.licenses.bsd2; }) {}; + "megaparsec-tests_9_2_1" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , hspec, hspec-discover, hspec-expectations, hspec-megaparsec + , megaparsec, mtl, parser-combinators, QuickCheck, scientific, text + , transformers + }: + mkDerivation { + pname = "megaparsec-tests"; + version = "9.2.1"; + sha256 = "1w9maxfld3by01kl8z0a4v64y2vm5rmsdss6n57mr3j43ng2isr9"; + libraryHaskellDepends = [ + base bytestring containers hspec hspec-expectations + hspec-megaparsec megaparsec mtl QuickCheck text transformers + ]; + testHaskellDepends = [ + base bytestring case-insensitive containers hspec + hspec-expectations hspec-megaparsec megaparsec mtl + parser-combinators QuickCheck scientific text transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "Test utilities and the test suite of Megaparsec"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "meldable-heap" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -182020,6 +182457,8 @@ self: { pname = "mfsolve"; version = "0.3.2.1"; sha256 = "190dszcnvy5j5bs3n0kya8a9nq0vdhrpgpndjpsxw7x70y3hc9d2"; + revision = "1"; + editedCabalFile = "0938ji6l1bx787lxcw6rzjwskm9vxm615cvx7hxpbwp0hbxrj5sa"; libraryHaskellDepends = [ base hashable mtl mtl-compat unordered-containers ]; @@ -184191,8 +184630,8 @@ self: { pname = "mmorph"; version = "1.2.0"; sha256 = "1022d8mm523dihkf85mqsqxpm9rnyicmv91c8rm4csv7xdc80cv1"; - revision = "1"; - editedCabalFile = "13j6znh33pnnk8yfxnndqiiwal1w6rs2jigs7fgpa26883ff2788"; + revision = "2"; + editedCabalFile = "00jrrmns4w77l06kcpr7798wcbc8abmhlivy12fxajs3x1ycb3hn"; libraryHaskellDepends = [ base mtl transformers transformers-compat ]; @@ -185834,8 +186273,8 @@ self: { pname = "monad-par"; version = "0.3.5"; sha256 = "1a8m99g9x1ivch4vhksk7fdzygbil3d33w8gdqngxbmwdikdafl2"; - revision = "1"; - editedCabalFile = "17l7zjykf5iqjmw1pq4iwls7v9x9d3in94iikxabx43q5l2iccsm"; + revision = "2"; + editedCabalFile = "1q4npp0vrsjpxk7n7rcf3lgqg1sf2qx628ciiw48al9y9xlznsaz"; libraryHaskellDepends = [ abstract-deque abstract-par array base containers deepseq monad-par-extras mtl mwc-random parallel @@ -187036,6 +187475,8 @@ self: { pname = "monoidal-containers"; version = "0.6.2.0"; sha256 = "0rnhlm77zrql42z3zsn3ag279q0vrz2idygc0x4p50q3780670p3"; + revision = "1"; + editedCabalFile = "07l42gkixdpamqqzdwqfcd62yga5cvhbxz5l0jpgs8kgf6prna4p"; libraryHaskellDepends = [ aeson base containers deepseq hashable lens newtype semialign these unordered-containers witherable @@ -189077,14 +189518,14 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "mtl_2_2_2" = callPackage + "mtl_2_3" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "mtl"; - version = "2.2.2"; - sha256 = "1xmy5741h8cyy0d91ahvqdz2hykkk20l8br7lg1rccnkis5g80w8"; + version = "2.3"; + sha256 = "0krx6bl7xd5n2v9775igv4p8723w6ilshmpljryzfsv4gp74dsy7"; libraryHaskellDepends = [ base transformers ]; - description = "Monad classes, using functional dependencies"; + description = "Monad classes for transformers, using functional dependencies"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -195783,8 +196224,8 @@ self: { }: mkDerivation { pname = "niv"; - version = "0.2.20"; - sha256 = "1bspaz1a1vy50336d264b6wv7wrfb4a758ghcv6j437lhinjjbf9"; + version = "0.2.21"; + sha256 = "1i4n706nrrd0mk34wrjgg597gsd95xslg8aqrhp3ijh4j4h2b8n2"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -201281,8 +201722,8 @@ self: { }: mkDerivation { pname = "opentracing"; - version = "0.2.1"; - sha256 = "0p2y996cl5hfw85kdr0majymxccv2d1ka15wbyc2qxgskz3dy9cq"; + version = "0.2.2"; + sha256 = "0d2zxq6y943kwpis9nbbj7cn8amy315bxy56mjj54bkg3jm43jn7"; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring case-insensitive clock containers http-types iproute lens mtl mwc-random network @@ -201297,8 +201738,8 @@ self: { ({ mkDerivation, base, http-client, lens, mtl, opentracing, text }: mkDerivation { pname = "opentracing-http-client"; - version = "0.2.0"; - sha256 = "19mwl69ggyd7zf1dvx5yjzsq5mlw5l94h989hgwc4ryvp8zqwv4n"; + version = "0.2.2"; + sha256 = "03adv17m82imw7bq618zm6x79gq6avvhcz3i0jak4157f3lwdq6b"; libraryHaskellDepends = [ base http-client lens mtl opentracing text ]; @@ -201314,8 +201755,8 @@ self: { }: mkDerivation { pname = "opentracing-jaeger"; - version = "0.2.0"; - sha256 = "0ffcbmg8qzvyhm7vzk2zkk5czli4ndrp18cc328i7600gzv1gr81"; + version = "0.2.2"; + sha256 = "1wy8n4ci3hs2glwahhgzzl6g4dw370ay2dg8bf1af8a27sl3dhjn"; libraryHaskellDepends = [ base bytestring exceptions hashable http-client http-types lens mtl network opentracing pinch QuickCheck safe-exceptions text @@ -201329,8 +201770,8 @@ self: { ({ mkDerivation, base, lens, opentracing, text, wai }: mkDerivation { pname = "opentracing-wai"; - version = "0.2.0"; - sha256 = "178xxgg0rw94gld5jlvix6czsvg66q60h06nj2b1x7rnd0pjryc6"; + version = "0.2.2"; + sha256 = "1yfbh7pp2rp16xm5bqij9f6m0cm23zrd0jsndkngl1mxjkv6l24i"; libraryHaskellDepends = [ base lens opentracing text wai ]; description = "Middleware adding OpenTracing tracing for WAI applications"; license = lib.licenses.asl20; @@ -201340,8 +201781,8 @@ self: { ({ mkDerivation, aeson, base, opentracing, text }: mkDerivation { pname = "opentracing-zipkin-common"; - version = "0.2.0"; - sha256 = "0yngiz8135v844wcx28izwhx18iz06di3dl8bm5xqh47ir43wdw6"; + version = "0.2.2"; + sha256 = "1vridakdz07yfiyr92byd8kab2zc68izpv1j8dh4a0xnks8910wk"; libraryHaskellDepends = [ aeson base opentracing text ]; description = "Zipkin OpenTracing Backend Commons"; license = lib.licenses.asl20; @@ -201355,8 +201796,8 @@ self: { }: mkDerivation { pname = "opentracing-zipkin-v1"; - version = "0.2.0"; - sha256 = "15n9m7affy81fr80zw7l54lch7gr6bvhcqpga797x7rvdxqqjv9j"; + version = "0.2.2"; + sha256 = "0z263yksbcgyfzsb6fj6id3bdsbhb0b92bfjm0myclj8f703hxbj"; libraryHaskellDepends = [ base bytestring exceptions hashable http-client http-types iproute lens opentracing opentracing-zipkin-common pinch QuickCheck text @@ -201373,8 +201814,8 @@ self: { }: mkDerivation { pname = "opentracing-zipkin-v2"; - version = "0.2.0"; - sha256 = "1ykssjhknfyiw02abjpz38zmlw8l03zb8c3y3ic5njmsg23nxfzb"; + version = "0.2.2"; + sha256 = "1hqbr4ifabyg6sr40jw9hqi2xq00wqy8srw9q6hj5qxqnvl39110"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring exceptions http-client http-types lens opentracing opentracing-zipkin-common text @@ -205787,12 +206228,12 @@ self: { broken = true; }) {}; - "parsec_3_1_15_0" = callPackage + "parsec_3_1_15_1" = callPackage ({ mkDerivation, base, bytestring, mtl, tasty, tasty-hunit, text }: mkDerivation { pname = "parsec"; - version = "3.1.15.0"; - sha256 = "1v8zs8zv1rk16lag2yqaxfwanjpgnh4gxw1vd70py0n04d20z0lq"; + version = "3.1.15.1"; + sha256 = "1pcqgxzhzlyaxrkgdixsl0jh7jfcg66kwqqf6va0am8q64ar1r5b"; libraryHaskellDepends = [ base bytestring mtl text ]; testHaskellDepends = [ base mtl tasty tasty-hunit ]; description = "Monadic parser combinators"; @@ -206170,6 +206611,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "parsers_0_12_11" = callPackage + ({ mkDerivation, attoparsec, base, base-orphans, binary, bytestring + , charset, containers, mtl, parsec, QuickCheck + , quickcheck-instances, scientific, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "parsers"; + version = "0.12.11"; + sha256 = "068k7fm0s13z0jkkffc149cqcxnzpk1m066lp4ccdfcb41km1zwi"; + libraryHaskellDepends = [ + attoparsec base base-orphans binary charset containers mtl parsec + scientific text transformers unordered-containers + ]; + testHaskellDepends = [ + attoparsec base bytestring parsec QuickCheck quickcheck-instances + ]; + description = "Parsing combinators"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "parsers-megaparsec" = callPackage ({ mkDerivation, base, fail, megaparsec, mtl, parsers, semigroups , text, transformers @@ -207200,6 +207663,8 @@ self: { pname = "pattern-arrows"; version = "0.0.2"; sha256 = "13q7bj19hd60rnjfc05wxlyck8llxy11z3mns8kxg197wxrdkhkg"; + revision = "1"; + editedCabalFile = "0vngc3mlyj52fl6cdrbwngpcyzp0gahq2h1sy1ysga62mv76wpc9"; libraryHaskellDepends = [ base mtl ]; description = "Arrows for Pretty Printing"; license = lib.licenses.mit; @@ -211392,8 +211857,8 @@ self: { }: mkDerivation { pname = "pinboard"; - version = "0.10.2.0"; - sha256 = "12hwfgqkn7sym9hig0b0afnzf0an6wcwdw9bc166y3539r3v13ck"; + version = "0.10.3.0"; + sha256 = "0j0isf2539b3fj393766wlrpgdpi39cqjqzw5jxihn7b67cvblyp"; libraryHaskellDepends = [ aeson base bytestring containers http-client http-client-tls http-types monad-logger mtl network profunctors random text time @@ -214117,6 +214582,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "pointed_5_0_4" = callPackage + ({ mkDerivation, base, comonad, containers, data-default-class + , hashable, kan-extensions, semigroupoids, semigroups, stm, tagged + , transformers, transformers-compat, unordered-containers + }: + mkDerivation { + pname = "pointed"; + version = "5.0.4"; + sha256 = "1mv06x2hscs220w4acm5jwg96vi4faky6ir9hnljfry3n2r2xix3"; + libraryHaskellDepends = [ + base comonad containers data-default-class hashable kan-extensions + semigroupoids semigroups stm tagged transformers + transformers-compat unordered-containers + ]; + description = "Pointed and copointed data"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pointedalternative" = callPackage ({ mkDerivation, base, mtl, semigroups, transformers }: mkDerivation { @@ -214590,8 +215074,8 @@ self: { ({ mkDerivation, base, requirements }: mkDerivation { pname = "poly-rec"; - version = "0.6.0.0"; - sha256 = "1csi81i0j3hk2gsc3c0rx939i67b0mj2pi064giw20yspqqjrp27"; + version = "0.7.0.0"; + sha256 = "0ayaz87l2rgpm4ddc7bidss042xhfcwa3sk7685ypssqvp02k5r0"; libraryHaskellDepends = [ base requirements ]; description = "Polykinded extensible records"; license = lib.licenses.gpl3Only; @@ -215856,10 +216340,8 @@ self: { }: mkDerivation { pname = "popkey"; - version = "0.1.0.1"; - sha256 = "1nlbd54q7npxm9hk4f289md6rch0sqnl236iimwsrwllpq6rbxbz"; - revision = "2"; - editedCabalFile = "1wpbwyya9fcdiyqs6lrbcxw7d64vn12kc7n63h2wjxrizjhfs6n6"; + version = "0.1.0.2"; + sha256 = "0ibk4qwcizsqvyvb8lgad5c0szgw7571bi2c54b5r3rrm7vzpx05"; libraryHaskellDepends = [ base bitvec bytestring containers hw-bits hw-prim hw-rankselect hw-rankselect-base store text vector @@ -219091,8 +219573,8 @@ self: { }: mkDerivation { pname = "prettyprinter-combinators"; - version = "0.1.0.1"; - sha256 = "0plnan8dvxl1y9h5vazszhdrf47862jqbhyx1ibldak19bibp367"; + version = "0.1.1"; + sha256 = "1m6338w6cd7fsib00zs8dk16b4mxfa1vswg5bmkzafas1db6qbcg"; libraryHaskellDepends = [ base bimap bytestring containers dlist pretty-show prettyprinter syb template-haskell text unordered-containers vector @@ -225791,8 +226273,8 @@ self: { ({ mkDerivation, base, mtl, template-haskell, th-compat }: mkDerivation { pname = "quotet"; - version = "0.0.1.0"; - sha256 = "1ajxvhh2zl99ddvmvicsjq775l0k3d8lh433v1z6z6i7zra5hg4g"; + version = "0.0.1.1"; + sha256 = "16fwbf9q2ivpi3j7y26lsbqvwwk7vidjn6q9iz4x6sq8adhy45rz"; libraryHaskellDepends = [ base mtl template-haskell th-compat ]; description = "Monad transformer for Quote from template-haskell"; license = lib.licenses.cc0; @@ -226474,6 +226956,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "random_1_2_1_1" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , mtl, primitive, rdtsc, smallcheck, split, splitmix, stm, tasty + , tasty-bench, tasty-hunit, tasty-inspection-testing + , tasty-smallcheck, time, transformers + }: + mkDerivation { + pname = "random"; + version = "1.2.1.1"; + sha256 = "0xlv1k4sj87akwvj54kq4nrfkzi6qcz1941bf78pnkbaxpvp44iy"; + libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ]; + testHaskellDepends = [ + base bytestring containers doctest smallcheck stm tasty tasty-hunit + tasty-inspection-testing tasty-smallcheck transformers + ]; + benchmarkHaskellDepends = [ + base mtl primitive rdtsc split splitmix tasty-bench time + ]; + description = "Pseudo-random number generation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "random-access-file" = callPackage ({ mkDerivation, base, bytestring, concurrent-extra, containers , criterion, directory, lrucaching, mwc-random, random, stm, unix @@ -227436,14 +227941,14 @@ self: { broken = true; }) {}; - "rattletrap_11_2_6" = callPackage + "rattletrap_11_2_7" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , containers, filepath, http-client, http-client-tls, text }: mkDerivation { pname = "rattletrap"; - version = "11.2.6"; - sha256 = "1y8g39vjnn3lywhg389ql0hqrzpgcj0j76wzhrzsh7ymj87vvirk"; + version = "11.2.7"; + sha256 = "19vgqkyxvv9y3yyb42p075nmdm7338f9ln6g0d7sgy9w9zd2vy0d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -233252,8 +233757,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "requirements"; - version = "0.6.0.0"; - sha256 = "1s0s3p0dy07222ks83w3spfw9df33q5lggqv3dw4m9hd5x16a6zi"; + version = "0.7.0.0"; + sha256 = "030vwfasxjdgdadcf5i68i3dc436dj6gi3ql4k8qh09yf8q1mm63"; libraryHaskellDepends = [ base ]; description = "Abstraction to manage user defined Type Errors"; license = lib.licenses.gpl3Only; @@ -233627,6 +234132,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "resourcet_1_2_5" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec, mtl + , primitive, transformers, unliftio-core + }: + mkDerivation { + pname = "resourcet"; + version = "1.2.5"; + sha256 = "0bj98srdlz2yx3nx030m0nzv6yyz1ry50v6bwdff5a6xi256jz7n"; + libraryHaskellDepends = [ + base containers exceptions mtl primitive transformers unliftio-core + ]; + testHaskellDepends = [ base exceptions hspec transformers ]; + description = "Deterministic allocation and freeing of scarce resources"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "resourcet-pool" = callPackage ({ mkDerivation, base, resource-pool, resourcet }: mkDerivation { @@ -236936,6 +237458,19 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "rpm-nvr_0_1_2" = callPackage + ({ mkDerivation, base, extra, filepath, hspec }: + mkDerivation { + pname = "rpm-nvr"; + version = "0.1.2"; + sha256 = "0g4fpay6rry9mnvy6mk793my1fkvpdxx40b5hn6gjr0vr1mvg2yp"; + libraryHaskellDepends = [ base extra filepath ]; + testHaskellDepends = [ base filepath hspec ]; + description = "RPM package name-version-release data types"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "rpmbuild-order" = callPackage ({ mkDerivation, base, case-insensitive, containers, directory , extra, fgl, filepath, graphviz, hspec, optparse-applicative @@ -242835,6 +243370,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "seocheck" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit + , containers, html-conduit, http-client, http-client-tls + , http-types, monad-logger, network-uri, optparse-applicative, path + , path-io, pretty-show, rainbow, stm, text, unliftio, validity + , xml-conduit + }: + mkDerivation { + pname = "seocheck"; + version = "0.1.0.0"; + sha256 = "065hs3y4mkl4l49qa6n7i441aax8y5zyxcpf0zpl9rz6w6llc3g7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive conduit containers + html-conduit http-client http-client-tls http-types monad-logger + network-uri optparse-applicative path path-io pretty-show rainbow + stm text unliftio validity xml-conduit + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Check for common SEO mistakes on CI"; + license = lib.licenses.mit; + }) {}; + "seonbi" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , bytestring-trie, Cabal, case-insensitive, cases, cassava, cmark @@ -251315,13 +251875,13 @@ self: { }: mkDerivation { pname = "sketch-frp-copilot"; - version = "1.0.1"; - sha256 = "0hm4bvlj7g9j6k2mc0s426s17nj4w1jpi0v052i2c7b0g7ahdxj8"; + version = "1.0.2"; + sha256 = "10r4j3plg70vawczk9fr388ljjqnjn08apv8s9am754g59fnwrd3"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language mtl optparse-applicative ]; - description = "FRP sketch programming with Copilot"; + description = "Sketch programming with Copilot"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -256528,6 +257088,18 @@ self: { license = lib.licenses.isc; }) {}; + "splint_1_0_1_5" = callPackage + ({ mkDerivation, base, containers, ghc, hlint, stm }: + mkDerivation { + pname = "splint"; + version = "1.0.1.5"; + sha256 = "1mvkd5jcrivc57g6dw6iwss6682q7wyi6zb2k3nd3vywm1a0c8ql"; + libraryHaskellDepends = [ base containers ghc hlint stm ]; + description = "HLint as a GHC source plugin"; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + }) {}; + "split" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -261893,6 +262465,25 @@ self: { license = lib.licenses.mit; }) {}; + "strict-list_0_1_7" = callPackage + ({ mkDerivation, base, deepseq, hashable, QuickCheck + , quickcheck-instances, rerebase, semigroupoids, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "strict-list"; + version = "0.1.7"; + sha256 = "0dhfnb5zvwnnbsy0c9lyymfq223zw9jgwv3wn1rq5xp1np68mkbh"; + libraryHaskellDepends = [ base deepseq hashable semigroupoids ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "Strict linked list"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "strict-optics" = callPackage ({ mkDerivation, base, optics-core, strict }: mkDerivation { @@ -264305,18 +264896,19 @@ self: { }) {}; "svgsym" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , filepattern, optparse-applicative, regex-tdfa, xml + ({ mkDerivation, array, base, bytestring, containers, directory + , filepath, filepattern, optparse-applicative, regex-base + , regex-tdfa, xml }: mkDerivation { pname = "svgsym"; - version = "0.1.0.0"; - sha256 = "0wiy03v3sdw8mzn3kibgjzjp6m50nnc31nld9zvr86fcrsl7bdgl"; + version = "0.1.1.0"; + sha256 = "014vand8zag2b9ll2g6xn0s91bav7x2v2l4xdvidc0rs6m8s5fx5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring containers directory filepath filepattern - optparse-applicative regex-tdfa xml + array base bytestring containers directory filepath filepattern + optparse-applicative regex-base regex-tdfa xml ]; description = "A tool to prune unused symbols from icon SVG files"; license = lib.licenses.gpl3Plus; @@ -267177,6 +267769,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "tagged-transformer_0_8_2" = callPackage + ({ mkDerivation, base, comonad, contravariant, distributive + , exceptions, mtl, reflection, semigroupoids, tagged + }: + mkDerivation { + pname = "tagged-transformer"; + version = "0.8.2"; + sha256 = "10wlwqxzm1xdyzxl6xyfsrb40zmvh7g0y3w0a69b1lw2rp6v4vyy"; + libraryHaskellDepends = [ + base comonad contravariant distributive exceptions mtl reflection + semigroupoids tagged + ]; + description = "Monad transformer carrying an extra phantom type tag"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "tagging" = callPackage ({ mkDerivation, base, bytestring, pcre-light }: mkDerivation { @@ -267899,10 +268508,25 @@ self: { pname = "tardis"; version = "0.4.3.0"; sha256 = "1ffmpdvnmr1s3rh3kpqqscsbz2rq4s7k8nfc93zw9m4mchg37waw"; + revision = "1"; + editedCabalFile = "1krk42qgdg10s6pxp805zv7z4c7mlhbhk15l07v9i750im1k73v3"; + libraryHaskellDepends = [ base mmorph mtl ]; + testHaskellDepends = [ base ]; + description = "Bidirectional state monad transformer"; + license = lib.licenses.bsd3; + }) {}; + + "tardis_0_4_4_0" = callPackage + ({ mkDerivation, base, mmorph, mtl }: + mkDerivation { + pname = "tardis"; + version = "0.4.4.0"; + sha256 = "0frm9kffdsia22rwyr8295n9xwhca1d6w04yz4l4cfjav6bgczfs"; libraryHaskellDepends = [ base mmorph mtl ]; testHaskellDepends = [ base ]; description = "Bidirectional state monad transformer"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "target" = callPackage @@ -268101,14 +268725,32 @@ self: { pname = "tasty"; version = "1.4.2.1"; sha256 = "0ki3gdzfsqvk9mwzzvgj18ck1sbkwac06gcc128wpwh9g8c4bzqr"; - revision = "1"; - editedCabalFile = "1fm1yx9dqikspw3a6ygnwj61vx1zwgjxm84zpkydbhcf6hgab5sg"; + revision = "2"; + editedCabalFile = "134sp1sjyx5hh1vwraxdfs98yx9gf19zp9kpfzqvvajfgy9i37jv"; + libraryHaskellDepends = [ + ansi-terminal base clock containers mtl optparse-applicative stm + tagged unbounded-delays unix wcwidth + ]; + description = "Modern and extensible testing framework"; + license = lib.licenses.mit; + }) {}; + + "tasty_1_4_2_2" = callPackage + ({ mkDerivation, ansi-terminal, base, clock, containers, mtl + , optparse-applicative, stm, tagged, unbounded-delays, unix + , wcwidth + }: + mkDerivation { + pname = "tasty"; + version = "1.4.2.2"; + sha256 = "1qqzrvmfnh2s0b3356wil1flzvvyrh5bvx3v65k9807wp9r5pxrq"; libraryHaskellDepends = [ ansi-terminal base clock containers mtl optparse-applicative stm tagged unbounded-delays unix wcwidth ]; description = "Modern and extensible testing framework"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "tasty-ant-xml" = callPackage @@ -268799,6 +269441,8 @@ self: { pname = "tasty-silver"; version = "3.3.1"; sha256 = "1pd83mzx0iv3f396m09rxmgcpcfaya0a9818dl3h4vgw0hnqkmav"; + revision = "1"; + editedCabalFile = "1gsjspgy9li9lsk7sqikm44mr3cjsxkrhvql6rabk5x9nb5ajrnr"; libraryHaskellDepends = [ ansi-terminal async base bytestring containers deepseq directory filepath mtl optparse-applicative process process-extras regex-tdfa @@ -268812,6 +269456,30 @@ self: { license = lib.licenses.mit; }) {}; + "tasty-silver_3_3_1_1" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring, containers + , deepseq, directory, filepath, mtl, optparse-applicative, process + , process-extras, regex-tdfa, silently, stm, tagged, tasty + , tasty-hunit, temporary, text, transformers + }: + mkDerivation { + pname = "tasty-silver"; + version = "3.3.1.1"; + sha256 = "13j0zs0ciijv9q2nncna1gbgsgw2g7xc228hzmqic1750n3ybz9m"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring containers deepseq directory + filepath mtl optparse-applicative process process-extras regex-tdfa + silently stm tagged tasty temporary text transformers + ]; + testHaskellDepends = [ + base directory filepath process silently tasty tasty-hunit + temporary transformers + ]; + description = "A fancy test runner, including support for golden tests"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-smallcheck" = callPackage ({ mkDerivation, base, optparse-applicative, smallcheck, tagged , tasty @@ -269604,7 +270272,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "telegram-bot-simple_0_5" = callPackage + "telegram-bot-simple_0_5_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cron , filepath, hashable, http-api-data, http-client, http-client-tls , monad-control, mtl, pretty-show, profunctors, servant @@ -269614,10 +270282,8 @@ self: { }: mkDerivation { pname = "telegram-bot-simple"; - version = "0.5"; - sha256 = "0mzzq7lfl56h1i9dr617h5vcv47j2nsf77pkq18s8wk5zrc67r2w"; - revision = "1"; - editedCabalFile = "0nz2g3jfb3l66ixrxlz257pmg2qbg7l6wsi0q38iv8fl4483md2s"; + version = "0.5.1"; + sha256 = "0vkvnxfa9lmp6j2wc2s3yxvq6ilwjbb1xnrwk5kysrlsklvc86bs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -273012,6 +273678,8 @@ self: { pname = "th-compat"; version = "0.1.3"; sha256 = "1il1hs5yjfkb417c224pw1vrh4anyprasfwmjbd4fkviyv55jl3b"; + revision = "1"; + editedCabalFile = "1ax5yz41sfy9klif7j3ihahvdi08alb56l4y9nr45vbc9kvijn7n"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base base-compat hspec mtl template-haskell @@ -280401,6 +281069,31 @@ self: { maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; + "turtle_1_5_25" = callPackage + ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock + , containers, directory, doctest, exceptions, foldl, hostname + , managed, optional-args, optparse-applicative, process, stm + , streaming-commons, system-fileio, system-filepath, tasty-bench + , temporary, text, time, transformers, unix, unix-compat + }: + mkDerivation { + pname = "turtle"; + version = "1.5.25"; + sha256 = "1hh2rbwk3m4iklk67f1l1a8shsng9qzs9132j6lpag7cgqkrmqdk"; + libraryHaskellDepends = [ + ansi-wl-pprint async base bytestring clock containers directory + exceptions foldl hostname managed optional-args + optparse-applicative process stm streaming-commons system-fileio + system-filepath temporary text time transformers unix unix-compat + ]; + testHaskellDepends = [ base doctest system-filepath temporary ]; + benchmarkHaskellDepends = [ base tasty-bench text ]; + description = "Shell programming, Haskell-style"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Gabriel439 ]; + }) {}; + "turtle-options" = callPackage ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle }: @@ -282054,6 +282747,8 @@ self: { pname = "typed-process"; version = "0.2.8.0"; sha256 = "1af0g34sws7fppziv7firr9r2wrnly4y6sr9nyqa8bvbbmadly45"; + revision = "1"; + editedCabalFile = "1m017nqbaqishii32gwhxa1849h0qnn06w7k1rn8c9d8w71m4vqm"; libraryHaskellDepends = [ async base bytestring process stm transformers unliftio-core ]; @@ -291019,7 +291714,7 @@ self: { license = lib.licenses.mit; }) {}; - "wai-extra_3_1_11" = callPackage + "wai-extra_3_1_12" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring , bytestring, call-stack, case-insensitive, containers, cookie , data-default-class, directory, fast-logger, hspec, http-types @@ -291029,8 +291724,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.1.11"; - sha256 = "0z9hl0a8vh6049m4pvnqjm7fibp60qc3jrcz0vpqbscncr59l7h5"; + version = "3.1.12"; + sha256 = "1i6gh02sprdbkwg92pzm6rwxcm3k8286vazziwjq05xln3vckd1n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -293323,8 +294018,8 @@ self: { }: mkDerivation { pname = "web-inv-route"; - version = "0.1.3.1"; - sha256 = "1l10rgrhcqld8znw6akxjlsm1h8z76l9yxa4yik11lk2l0g9anb2"; + version = "0.1.3.2"; + sha256 = "0gmbj6c6c8gqz9xfxv0d4134d7c2wfla3zg3bgqvvzsqjjmrg81v"; libraryHaskellDepends = [ base bytestring case-insensitive containers happstack-server hashable http-types invertible network-uri snap-core text @@ -295735,6 +296430,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "witness_0_6" = callPackage + ({ mkDerivation, base, constraints, countable }: + mkDerivation { + pname = "witness"; + version = "0.6"; + sha256 = "1y8scf6a061s8gnx38sfwn88ramakjr0h54qwlwcjrjpf0y6024l"; + libraryHaskellDepends = [ base constraints countable ]; + description = "values that witness types"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "witty" = callPackage ({ mkDerivation, base, bytestring, network, unix }: mkDerivation { @@ -304939,8 +305646,8 @@ self: { }: mkDerivation { pname = "zephyr-copilot"; - version = "1.0.1"; - sha256 = "0d489krxzj30gl8j8idwfi10k82w0p4kr30f0h78qvl9ikzinhvk"; + version = "1.0.2"; + sha256 = "01dvqzh97bw423kwhmgdr8l913p4miq69frv3nkjs889ps16faz0"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language directory filepath mtl optparse-applicative sketch-frp-copilot temporary From e530db9baf4e4571321ae527b0bf3bab93f75aff Mon Sep 17 00:00:00 2001 From: ash lea Date: Sun, 10 Apr 2022 16:48:41 -0400 Subject: [PATCH 024/166] buildDotnetModule: fix args --- .../dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh | 4 ++-- .../build-dotnet-module/hooks/dotnet-configure-hook.sh | 4 ++-- .../build-dotnet-module/hooks/dotnet-install-hook.sh | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh index 0e2650da51c..cd1c401735d 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh @@ -28,8 +28,8 @@ dotnetBuildHook() { --configuration "@buildType@" \ --no-restore \ ${versionFlag-} \ - "${dotnetBuildFlags[@]}" \ - "${dotnetFlags[@]}" + ${dotnetBuildFlags[@]} \ + ${dotnetFlags[@]} done runHook postBuild diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh index f8ba8b8df2e..1686c15d269 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh @@ -20,8 +20,8 @@ dotnetConfigureHook() { -p:Deterministic=true \ --source "@nugetSource@/lib" \ ${parallelFlag-} \ - "${dotnetRestoreFlags[@]}" \ - "${dotnetFlags[@]}" + ${dotnetRestoreFlags[@]} \ + ${dotnetFlags[@]} done runHook postConfigure diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh index ac9bc873ee9..fcd3e745900 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh @@ -15,8 +15,8 @@ dotnetInstallHook() { --configuration "@buildType@" \ --no-build \ --no-self-contained \ - "${dotnetInstallFlags[@]}" \ - "${dotnetFlags[@]}" + ${dotnetInstallFlags[@]} \ + ${dotnetFlags[@]} done if [[ "${packNupkg-}" ]]; then @@ -28,8 +28,8 @@ dotnetInstallHook() { --output "$out/share" \ --configuration "@buildType@" \ --no-build \ - "${dotnetPackFlags[@]}" \ - "${dotnetFlags[@]}" + ${dotnetPackFlags[@]} \ + ${dotnetFlags[@]} done fi From c91d063512fb95d6a184a1cb082f9d9852b6f746 Mon Sep 17 00:00:00 2001 From: Nicola Squartini Date: Tue, 10 May 2022 21:41:49 +0200 Subject: [PATCH 025/166] cocogitto: 4.1.0 -> 5.1.0 --- pkgs/development/tools/cocogitto/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/development/tools/cocogitto/default.nix index 127aebccf5a..793beb43b99 100644 --- a/pkgs/development/tools/cocogitto/default.nix +++ b/pkgs/development/tools/cocogitto/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cocogitto"; - version = "4.1.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "oknozor"; repo = pname; rev = version; - sha256 = "sha256-g7NBtqr7Mx7ALzij4hfoVXN3izbu4ShXYhHPYw9qnWk="; + sha256 = "sha256-q2WJKAXpIO+VsOFrjdyEx06yis8f2SkCuB0blUgqq0M="; }; - cargoSha256 = "sha256-kXspbXySY5ridLUvAjv49Rm0RGt1fNsfNw9a3vd4hyI="; + cargoSha256 = "sha256-UArYBcUkXPYlNRLQBMwNhsd3bNgLeEwtJdzepMTt2no="; # Test depend on git configuration that would likly exist in a normal user enviroment # and might be failing to create the test repository it works in. @@ -29,8 +29,6 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/cog \ --prefix PATH : "${lib.makeBinPath [ git ]}" - wrapProgram $out/bin/coco \ - --prefix PATH : "${lib.makeBinPath [ git ]}" ''; meta = with lib; { From 08b6ad0ea504ff34e58638319ea717ef7fac09a4 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 29 Apr 2022 12:05:37 +0200 Subject: [PATCH 026/166] buildVimPlugin: check that neovim can require the module. Add: ``` doInstallCheck = true; nvimRequireCheck = "toto"; ``` to your vimPluginCall. --- .../editors/vim/plugins/build-vim-plugin.nix | 3 ++- .../vim/plugins/neovim-require-check-hook.sh | 21 +++++++++++++++++++ .../editors/vim/plugins/overrides.nix | 3 +++ .../editors/vim/plugins/vim-utils.nix | 12 ++++++++++- 4 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh diff --git a/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix index 187c068c0f0..e0978db4527 100644 --- a/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix +++ b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix @@ -3,6 +3,7 @@ , vim , vimCommandCheckHook , vimGenDocHook +, neovimRequireCheckHook }: rec { @@ -31,7 +32,7 @@ rec { forceShare= [ "man" "info" ]; nativeBuildInputs = attrs.nativeBuildInputs or [] - ++ [ vimCommandCheckHook ] + ++ [ vimCommandCheckHook neovimRequireCheckHook ] ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) vimGenDocHook; inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; diff --git a/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh b/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh new file mode 100644 index 00000000000..590f530954d --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh @@ -0,0 +1,21 @@ +# Setup hook for checking whether Python imports succeed +echo "Sourcing neovim-require-check-hook.sh" + +neovimRequireCheckHook () { + echo "Executing neovimRequireCheckHook" + + if [ -n "$nvimRequireCheck" ]; then + echo "Check whether the following module can be imported: $nvimRequireCheck" + + # editorconfig-checker-disable + export HOME="$TMPDIR" + @nvimBinary@ -es -n -u NONE -i NONE --clean -V1 \ + --cmd "set rtp+=$out" \ + --cmd "lua require('$nvimRequireCheck')" + fi +} + +echo "Using neovimRequireCheckHook" +preDistPhases+=" neovimRequireCheckHook" + + diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index e294ea0b5a2..078989406a8 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -321,6 +321,9 @@ self: super: { sed -Ei lua/plenary/curl.lua \ -e 's@(command\s*=\s*")curl(")@\1${curl}/bin/curl\2@' ''; + + doInstallCheck = true; + nvimRequireCheck = "plenary"; }); gruvbox-nvim = super.gruvbox-nvim.overrideAttrs (old: { diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index e685e398fc2..69633d24c3c 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -531,8 +531,18 @@ rec { }; } ./vim-command-check-hook.sh) {}; + neovimRequireCheckHook = callPackage ({ neovim-unwrapped }: + makeSetupHook { + name = "neovim-require-check-hook"; + deps = [ neovim-unwrapped ]; + substitutions = { + nvimBinary = "${neovim-unwrapped}/bin/nvim"; + inherit rtpPath; + }; + } ./neovim-require-check-hook.sh) {}; + inherit (import ./build-vim-plugin.nix { - inherit lib stdenv rtpPath vim vimGenDocHook vimCommandCheckHook; + inherit lib stdenv rtpPath vim vimGenDocHook vimCommandCheckHook neovimRequireCheckHook; }) buildVimPlugin buildVimPluginFrom2Nix; From 0dbca90d4129b6c4296b66899fd2750584b24c4f Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 10 May 2022 14:30:50 +0200 Subject: [PATCH 027/166] buildNeovimPluginFrom2Nix: use neovimRequireCheckHook and removed the addRtp call that was breaking overrideAttrs --- .../editors/vim/plugins/build-vim-plugin.nix | 9 ++------- .../editors/vim/plugins/neovim-require-check-hook.sh | 2 +- pkgs/applications/editors/vim/plugins/vim-utils.nix | 4 +++- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix index e0978db4527..9dc5344ed28 100644 --- a/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix +++ b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix @@ -7,11 +7,6 @@ }: rec { - addRtp = path: attrs: derivation: - derivation // { rtp = "${derivation}"; } // { - overrideAttrs = f: buildVimPlugin (attrs // f attrs); - }; - buildVimPlugin = attrs@{ name ? "${attrs.pname}-${attrs.version}", namePrefix ? "vimplugin-", @@ -25,14 +20,14 @@ rec { addonInfo ? null, ... }: - addRtp "${rtpPath}/${path}" attrs (stdenv.mkDerivation (attrs // { + (stdenv.mkDerivation (attrs // { name = namePrefix + name; # dont move the doc folder since vim expects it forceShare= [ "man" "info" ]; nativeBuildInputs = attrs.nativeBuildInputs or [] - ++ [ vimCommandCheckHook neovimRequireCheckHook ] + ++ [ vimCommandCheckHook ] ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) vimGenDocHook; inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; diff --git a/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh b/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh index 590f530954d..5b454e0ff01 100644 --- a/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh +++ b/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh @@ -9,7 +9,7 @@ neovimRequireCheckHook () { # editorconfig-checker-disable export HOME="$TMPDIR" - @nvimBinary@ -es -n -u NONE -i NONE --clean -V1 \ + @nvimBinary@ -es --headless -n -u NONE -i NONE --clean -V1 \ --cmd "set rtp+=$out" \ --cmd "lua require('$nvimRequireCheck')" fi diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index 69633d24c3c..9511e4da195 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -548,7 +548,9 @@ rec { # TODO placeholder to ease working on automatic plugin detection # this should be a luarocks "flat" install with appropriate vim hooks - buildNeovimPluginFrom2Nix = buildVimPluginFrom2Nix; + buildNeovimPluginFrom2Nix = attrs: let drv = (buildVimPluginFrom2Nix attrs); in drv.overrideAttrs(oa: { + nativeBuildInputs = oa.nativeBuildInputs ++ [ neovimRequireCheckHook ]; + }); # used to figure out which python dependencies etc. neovim needs requiredPlugins = { From da8a322e7314ec27f24b50304bf5b0fe1f0c9897 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 11 May 2022 11:31:47 +0200 Subject: [PATCH 028/166] buildLuaPlugin: convert the addRtp call since it was breaking overrideAttrs. --- pkgs/applications/editors/vim/plugins/build-vim-plugin.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix index 9dc5344ed28..4773cfb9e43 100644 --- a/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix +++ b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix @@ -20,7 +20,7 @@ rec { addonInfo ? null, ... }: - (stdenv.mkDerivation (attrs // { + let drv = stdenv.mkDerivation (attrs // { name = namePrefix + name; # dont move the doc folder since vim expects it @@ -40,7 +40,10 @@ rec { runHook postInstall ''; - })); + }); + in drv.overrideAttrs(oa: { + rtp = "${drv}"; + }); buildVimPluginFrom2Nix = attrs: buildVimPlugin ({ # vim plugins may override this From 4a4026080860b59eb46ee260e991c90196a1bfcd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 May 2022 13:07:43 +0000 Subject: [PATCH 029/166] python310Packages.django-auth-ldap: 4.0.0 -> 4.1.0 --- pkgs/development/python-modules/django-auth-ldap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index ffd4796f2a5..b3596e1e444 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "django-auth-ldap"; - version = "4.0.0"; + version = "4.1.0"; format = "pyproject"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "276f79e624ce083ce13f161387f65ff1c0efe83ef8a42f2b9830d43317b15239"; + sha256 = "sha256-d/dJ07F4B86OtWqcnI5XRv8xZWf4HVumE0ldnHSVqUk="; }; nativeBuildInputs = [ From 7f68e42883580ebc53e5089fa46252ffe2e8d2cb Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 11 May 2022 11:13:16 -0500 Subject: [PATCH 030/166] vyper: 0.3.1 -> 0.3.3 https://github.com/vyperlang/vyper/releases/tag/v0.3.3 --- pkgs/development/compilers/vyper/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index 518b230c838..ee24cc646e4 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , pythonOlder -, pythonAtLeast , pythonRelaxDepsHook , writeText , asttokens @@ -13,6 +12,7 @@ , sphinx_rtd_theme , pytest-runner , setuptools-scm +, git }: let @@ -27,17 +27,21 @@ let in buildPythonPackage rec { pname = "vyper"; - version = "0.3.1"; + version = "0.3.3"; format = "setuptools"; - disabled = pythonOlder "3.7" || pythonAtLeast "3.10"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fXug5v3zstz19uexMWokHBVsfcl2ZCdIOIXKeLVyh/Q="; + sha256 = "sha256-BAnNj27B1HAb9VVDA69bFGbQjeOpl0g5EB2juajqBAw="; }; nativeBuildInputs = [ + # Git is used in setup.py to compute version information during building + # ever since https://github.com/vyperlang/vyper/pull/2816 + git + pythonRelaxDepsHook pytest-runner setuptools-scm From e98f71d47777d1f49d8d7f2d218cac6761cffd32 Mon Sep 17 00:00:00 2001 From: Yu-Chen Ding <8792460+res0Nanz@users.noreply.github.com> Date: Thu, 12 May 2022 01:29:53 +0800 Subject: [PATCH 031/166] wolfram-engine: fix quotes in installation script --- pkgs/applications/science/math/wolfram-engine/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/wolfram-engine/default.nix b/pkgs/applications/science/math/wolfram-engine/default.nix index 8b531b2c885..cf9364ffac1 100644 --- a/pkgs/applications/science/math/wolfram-engine/default.nix +++ b/pkgs/applications/science/math/wolfram-engine/default.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { # Fix the installation script patchShebangs MathInstaller substituteInPlace MathInstaller \ - --replace "`hostname`" "" \ + --replace '`hostname`' "" \ --replace "chgrp" "# chgrp" \ --replace "chown" ": # chown" From 3e0a894e95272bd551821871f595d594f8652f13 Mon Sep 17 00:00:00 2001 From: ash lea Date: Sun, 17 Apr 2022 18:41:03 -0400 Subject: [PATCH 032/166] xivlauncher: init at 1.0.0.4 --- pkgs/games/xivlauncher/default.nix | 73 +++++++++++ pkgs/games/xivlauncher/deps.nix | 197 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 272 insertions(+) create mode 100644 pkgs/games/xivlauncher/default.nix create mode 100644 pkgs/games/xivlauncher/deps.nix diff --git a/pkgs/games/xivlauncher/default.nix b/pkgs/games/xivlauncher/default.nix new file mode 100644 index 00000000000..3c7d7d3eea9 --- /dev/null +++ b/pkgs/games/xivlauncher/default.nix @@ -0,0 +1,73 @@ +{ lib, buildDotnetModule, fetchFromGitHub, dotnetCorePackages, SDL2, libsecret, glib, gnutls, aria2, steam-run +, copyDesktopItems, makeDesktopItem +, useSteamRun ? true }: + +let + rev = "e6412d9b837bfd71bb413b4c6e5fa52c9ce60a57"; +in + buildDotnetModule rec { + pname = "XIVLauncher"; + version = "1.0.0.4"; + + src = fetchFromGitHub { + owner = "goatcorp"; + repo = "FFXIVQuickLauncher"; + inherit rev; + sha256 = "sha256-seHO/NNJdWhxWRnyjBN7+m1X0JP/qWAMfF86XMhYN/4="; + }; + + nativeBuildInputs = [ copyDesktopItems ]; + + projectFile = "src/XIVLauncher.Core/XIVLauncher.Core.csproj"; + nugetDeps = ./deps.nix; # File generated with `nuget-to-nix path/to/src > deps.nix` + + dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-runtime = dotnetCorePackages.runtime_6_0; + + dotnetFlags = [ + "--runtime linux-x64" + "-p:BuildHash=${rev}" + ]; + + dotnetBuildFlags = [ + "--no-self-contained" + ]; + + postPatch = '' + substituteInPlace src/XIVLauncher.Common/Game/Patch/Acquisition/Aria/AriaHttpPatchAcquisition.cs \ + --replace 'ariaPath = "aria2c"' 'ariaPath = "${aria2}/bin/aria2c"' + ''; + + postInstall = '' + mkdir -p $out/share/pixmaps + cp src/XIVLauncher.Core/Resources/logo.png $out/share/pixmaps/xivlauncher.png + ''; + + postFixup = lib.optionalString useSteamRun '' + substituteInPlace $out/bin/XIVLauncher.Core \ + --replace 'exec' 'exec ${steam-run}/bin/steam-run' + ''; + + executables = [ "XIVLauncher.Core" ]; + + runtimeDeps = [ SDL2 libsecret glib gnutls ]; + + desktopItems = [ + (makeDesktopItem { + name = "xivlauncher"; + exec = "XIVLauncher.Core"; + icon = "xivlauncher"; + desktopName = "XIVLauncher"; + comment = meta.description; + categories = [ "Game" ]; + }) + ]; + + meta = with lib; { + description = "Custom launcher for FFXIV"; + homepage = "https://github.com/goatcorp/FFXIVQuickLauncher"; + license = licenses.gpl3; + maintainers = with maintainers; [ ashkitten ]; + platforms = [ "x86_64-linux" ]; + }; + } diff --git a/pkgs/games/xivlauncher/deps.nix b/pkgs/games/xivlauncher/deps.nix new file mode 100644 index 00000000000..41f2efdf958 --- /dev/null +++ b/pkgs/games/xivlauncher/deps.nix @@ -0,0 +1,197 @@ +{ fetchNuGet }: [ + (fetchNuGet { pname = "Castle.Core"; version = "4.4.1"; sha256 = "13dja1jxl5zwhi0ghkgvgmqdrixn57f9hk52jy5vpaaakzr550r7"; }) + (fetchNuGet { pname = "CheapLoc"; version = "1.1.6"; sha256 = "1m6cgx9yh7h3vrq2d4f99xyvsxc9jvz8zjq1q14qgylfmyq4hx4l"; }) + (fetchNuGet { pname = "Config.Net"; version = "4.19.0"; sha256 = "17iv0vy0693s6d8626lbz3w1ppn5abn77aaki7h4qi4izysizgim"; }) + (fetchNuGet { pname = "Downloader"; version = "2.2.8"; sha256 = "0farwh3pc6m8hsgqywigdpcb4gr2m9myyxm2idzjmhhkzfqghj28"; }) + (fetchNuGet { pname = "Facepunch.Steamworks"; version = "2.3.3"; sha256 = "1r3m7cyzfy8ms9xxfa13xcwha02yk22givkaamw166im89m8wqyc"; }) + (fetchNuGet { pname = "goaaats.NativeLibraryLoader"; version = "4.9.0-beta1-g70f642e82e"; sha256 = "1bjjgsw4ry9cz8dzsgwx428hn06wms194pqz8nclwrqcwfx7gmxk"; }) + (fetchNuGet { pname = "goaaats.Veldrid"; version = "4.9.0-beta1-g70f642e82e"; sha256 = "0b35bn4190hxbvrwsygpbpg00gnrj6crxyk8b0d7ian611v4jj0m"; }) + (fetchNuGet { pname = "goaaats.Veldrid.ImageSharp"; version = "4.9.0-beta1-g70f642e82e"; sha256 = "1zihi2n9qz18kfkz4qnj3412bfsqvx49809hqkknixdrgn8323i2"; }) + (fetchNuGet { pname = "goaaats.Veldrid.MetalBindings"; version = "4.9.0-beta1-g70f642e82e"; sha256 = "13cs5jr8bpkrkzziz8b71l3npr14shxryrpsiw0zm7jcx69vg2qf"; }) + (fetchNuGet { pname = "goaaats.Veldrid.OpenGLBindings"; version = "4.9.0-beta1-g70f642e82e"; sha256 = "1p7gv2234r3f1pskcr1ah7p3ak6zn1rrmvxy5xqc9d5y4zdrnzlb"; }) + (fetchNuGet { pname = "goaaats.Veldrid.SDL2"; version = "4.9.0-beta1-g70f642e82e"; sha256 = "14xj3z0yc25vq17bvv2193cbqxj7k9iimxbaqk2rpvlpmrbg20xi"; }) + (fetchNuGet { pname = "goaaats.Veldrid.StartupUtilities"; version = "4.9.0-beta1-g70f642e82e"; sha256 = "03r3x9h0fyb07d6d28ny6r5s688m50xc0lgc6zf2cy684kfnvmp5"; }) + (fetchNuGet { pname = "ImGui.NET"; version = "1.87.2"; sha256 = "0rv0n18fvz1gbh45crhzn1f8xw8zkc8qyiyj91vajjcry8mq1x7q"; }) + (fetchNuGet { pname = "KeySharp"; version = "1.0.4"; sha256 = "1xkgrsm0h4ycbc7qnj0dzknx0rqlx3168vrdrdgsi30xki02z323"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.4"; sha256 = "1fvv5ri32pbl43628zqnim6fbv6hjxf66p0v793xdh57dzkdyh0j"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.3"; sha256 = "1z6x0d8lpcfjr3sxy25493i17vvcg5bsay6c03qan6mnj5aqzw2k"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.0.1"; sha256 = "0axjv1nhk1z9d4c51d9yxdp09l8yqqnqaifhqcwnxnv0r4y5cka9"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.0.1"; sha256 = "1h6jfifg7pw2vacpdds4v4jqnaydg9b108irf315wzx6rh8yv9cb"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.NetAnalyzers"; version = "6.0.0"; sha256 = "06zy947m5lrbwb684g42ijb07r5jsqycvfnphc6cqfdrfnzqv6k9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.4"; sha256 = "1gibwhplbanv6bz3l71w8vhzlgqsh21bms30dbf1n60v7p02fl3h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "6.0.0-preview.5.21301.5"; sha256 = "02712s86n2i8s5j6vxdayqwcc7r538yw3frhf1gfrc6ah6hvqnzc"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) + (fetchNuGet { pname = "Mono.Cecil"; version = "0.9.6.1"; sha256 = "1fr7969h5q611l5227xw6nvv5rzap76vbpk0wg9hxbcxk3hn7szf"; }) + (fetchNuGet { pname = "Mono.Nat"; version = "3.0.1"; sha256 = "1xy3c9wsiz8k3rx8v60y6gnps337rsb5jpyj0r6g384prg6z4vh0"; }) + (fetchNuGet { pname = "MonoTorrent"; version = "2.0.0"; sha256 = "016cbjsy1gp60g6w0mdya11ky3lfr3scg20k1p7lglbnzv7ixycq"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.2"; sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; }) + (fetchNuGet { pname = "ReusableTasks"; version = "2.0.0"; sha256 = "0qag69n8kx164minz3h50g6f7cdq15r89vikcd1llbkdwq4qldaa"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) + (fetchNuGet { pname = "Serilog"; version = "2.10.0"; sha256 = "08bih205i632ywryn3zxkhb15dwgyaxbhmm1z3b5nmby9fb25k7v"; }) + (fetchNuGet { pname = "Serilog"; version = "2.9.0"; sha256 = "0z0ib82w9b229a728bbyhzc2hnlbl0ki7nnvmgnv3l741f2vr4i6"; }) + (fetchNuGet { pname = "Serilog.Enrichers.Thread"; version = "3.1.0"; sha256 = "1y75aiv2k1sxnh012ixkx92fq1yl8srqggy8l439igg4p223hcqi"; }) + (fetchNuGet { pname = "Serilog.Sinks.Async"; version = "1.4.0"; sha256 = "00kqrn3xmfzg469y155vihsiby8dbbs382fi6qg8p2zg3i5dih1d"; }) + (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "3.1.1"; sha256 = "0j99as641y1k6havwwkhyr0n08vibiblmfjj6nz051mz8g3864fn"; }) + (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.0.1"; sha256 = "080vh9kcyn9lx4j7p34146kp9byvhqlaz5jn9wzx70ql9cwd0hlz"; }) + (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "1.0.1"; sha256 = "0969mb254kr59bgkq01ybyzca89z3f4n9ng5mdj8m53d5653zf22"; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "4.1.0"; sha256 = "1ry7p9hf1zlnai1j5zjhjp4dqm2agsbpq6cvxgpf5l8m26x6mgca"; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) + (fetchNuGet { pname = "SharedMemory"; version = "2.3.2"; sha256 = "078qaab0j8p2fjcc9n7r4sr5pr7567a9bspfiikkc85bsx7vfm8w"; }) + (fetchNuGet { pname = "SharpGen.Runtime"; version = "2.0.0-beta.10"; sha256 = "0yxq0b4m96z71afc7sywfrlwz2pgr5nilacmssjk803v70f0ydr1"; }) + (fetchNuGet { pname = "SharpGen.Runtime.COM"; version = "2.0.0-beta.10"; sha256 = "1qvpphja72x9r3yi96bnmwwy30b1n155v2yy2gzlxjil6qg3xjmb"; }) + (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "1.0.4"; sha256 = "0fmgn414my76gjgp89qlc210a0lqvnvkvk2fcwnpwxdhqpfvyilr"; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.4.0"; sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) + (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) + (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) + (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) + (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) + (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; sha256 = "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) + (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.7.0"; sha256 = "0l8jpxhpgjlf1nkz5lvp61r4kfdbhr29qi8aapcxn3izd9wd0j8r"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.7.0"; sha256 = "0mbjfajmafkca47zr8v36brvknzks5a7pgb49kfq2d188pyv6iap"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0-preview.5.21301.5"; sha256 = "131f3z3ikv3n8442chr11nj4x46amq00mb53pb2ds42dabldkdgy"; }) + (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "6.0.0-preview.5.21301.5"; sha256 = "1q3iikvjcfrm5p89p1j7qlw1szvryq680qypk023wgy9phmlwi57"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) + (fetchNuGet { pname = "Vk"; version = "1.0.25"; sha256 = "18kx3g088215803yznnmf6621wgwvgakj8hlmrb726b7zwb3x53l"; }) + (fetchNuGet { pname = "Vortice.D3DCompiler"; version = "2.1.0"; sha256 = "1ikw4k40m1vhl6q3v4lacbvmz09prqkk8zz0dms49hxjrpi0gfdh"; }) + (fetchNuGet { pname = "Vortice.Direct3D11"; version = "2.1.0"; sha256 = "05hzmkk32agbk2617yhv3wm1zjkv25w57395an4vkp14rvsz82vf"; }) + (fetchNuGet { pname = "Vortice.DirectX"; version = "2.1.0"; sha256 = "0mv3p7rs2p9rh4vylz24gmiqj0q63rmfa7mjvsqk1j1zlrkyyhlk"; }) + (fetchNuGet { pname = "Vortice.DXGI"; version = "2.1.0"; sha256 = "1d7rmqf7q287w3l7clfvp66kd0giy4n6087n9r8jj0w5r65416ls"; }) + (fetchNuGet { pname = "Vortice.Mathematics"; version = "1.3.24"; sha256 = "1fqni3lhaxddpdz060zbjjhkn5fgg7458ajxfrj3df3wjbld3bc3"; }) +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2ec4e7668d..d12287021ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34890,6 +34890,8 @@ with pkgs; xboxdrv = callPackage ../misc/drivers/xboxdrv { }; + xivlauncher = callPackage ../games/xivlauncher { }; + xortool = python3Packages.callPackage ../tools/security/xortool { }; xorex = callPackage ../tools/security/xorex { }; From eedc6b083e460f53c68cd4648ce834aeca39b994 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 11 May 2022 22:59:21 +0200 Subject: [PATCH 033/166] minio: 2022-03-22T02-05-10Z -> 2022-05-08T23-50-31Z --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index afa537bddd4..3349f0cf3a0 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2022-03-22T02-05-10Z"; + version = "2022-05-08T23-50-31Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-N0ua+XHkLr33PElSdOzVQF3POPU+lx4/M6LJzxtkisI="; + sha256 = "sha256-Ssuqk/ax6MWdXtbJqWeTTtsIiTK4FmYSR5rOqxh+IaU="; }; - vendorSha256 = "sha256-Ql3J2r489Hzhy6E9uZwQXJIw/njb5oafCYjOyWGzbXs="; + vendorSha256 = "sha256-JoI3B3rDzlY0lDHF3rjrzv8/Rq+XCFRs35bWVZqfAKA="; doCheck = false; From d9ee32ecaf2ae87dad827e1ad0592b7825967bfd Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 11 May 2022 23:09:15 +0200 Subject: [PATCH 034/166] minio-client: 2022-03-17T20-25-06Z -> 2022-05-09T04-08-26Z --- pkgs/tools/networking/minio-client/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index b0a689db7bf..9ca4dfa27b3 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "minio-client"; - version = "2022-03-17T20-25-06Z"; + version = "2022-05-09T04-08-26Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-+MfRosEyIaQ5RndpAeK5AXm8EHX2ND7VJcr1NVFs5TI="; + sha256 = "sha256-a7zpvumsMijMmJthg4EZgOUymDC4GrbDjAwN4sXxE6g="; }; - vendorSha256 = "sha256-Wdw9mZ3UupoJ4yDwS4f3mOmCn+7TvHmx4aRu+96pHM4="; + vendorSha256 = "sha256-OkcQxTDKhuFCjNs5TNBBMde+M6vCfPSR5IuVbCaqWJg="; subPackages = [ "." ]; @@ -26,6 +26,8 @@ buildGoModule rec { $out/bin/mc --version | grep ${version} > /dev/null ''; + passthru.tests.minio = nixosTests.minio; + meta = with lib; { homepage = "https://github.com/minio/mc"; description = "A replacement for ls, cp, mkdir, diff and rsync commands for filesystems and object storage"; From 69cf5e5b7767e0be48503caa9b8b3b1b9afd914a Mon Sep 17 00:00:00 2001 From: Andrei Pampu Date: Thu, 12 May 2022 00:29:17 +0300 Subject: [PATCH 035/166] sonarr: 3.0.7.1477 -> 3.0.8.1507 --- pkgs/servers/sonarr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index fcab3a8e560..b944154631e 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sonarr"; - version = "3.0.7.1477"; + version = "3.0.8.1507"; src = fetchurl { url = "https://download.sonarr.tv/v3/main/${version}/Sonarr.main.${version}.linux.tar.gz"; - sha256 = "sha256-xB7kWWxx+ymBxyxBzwY7gZfw9kMHi2MSsrUp8GIOiws="; + sha256 = "sha256-O2UvU1juO54gb9LVnEuIXhT0Ux2rEIq2WdmsoWVDh1w="; }; nativeBuildInputs = [ makeWrapper ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = "./update.sh"; + updateScript = ./update.sh; tests.smoke-test = nixosTests.sonarr; }; From c19b3473ccc5adde48998dcc8d14ae8f0a0c38b5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 12 May 2022 04:20:00 +0000 Subject: [PATCH 036/166] sops: 3.7.2 -> 3.7.3 https://github.com/mozilla/sops/releases/tag/v3.7.3 --- pkgs/tools/security/sops/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index 9752d78a183..9c6263c5c85 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "sops"; - version = "3.7.2"; + version = "3.7.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "mozilla"; repo = pname; - sha256 = "sha256-NMuYMvaBSxKHvpqFkMfnMDvcXxTstqzracuSTT1VB1A="; + sha256 = "sha256-wN1ksLwD4G+fUhvCe+jahh1PojPk6L6tnx1rsc7dz+M="; }; - vendorSha256 = "sha256-00/7O9EcGojUExJPtYWndb16VqrNby/5GsVs8Ak/Isc="; + vendorSha256 = "sha256-8IaE+vhVZkc9QDR6+/3eOSsuf3SYF2upNcCifbqtx14="; + + ldflags = [ "-s" "-w" ]; doCheck = false; From eb452cce057013fce2bed299749985403eec3e9a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 12 May 2022 04:20:00 +0000 Subject: [PATCH 037/166] postgresqlPackages.plpgsql_check: 2.1.3 -> 2.1.5 --- pkgs/servers/sql/postgresql/ext/plpgsql_check.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index dae53882238..17e2294598e 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "2.1.3"; + version = "2.1.5"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hVbx1eUrVQ35UzcokoqYCi6RFI5Dn7t9XH8q9VbyDbQ="; + sha256 = "sha256-DYdZuHraecQZ33xHX6ugiUJVfFVAayD2spIQt2Qqa5U="; }; buildInputs = [ postgresql ]; From c1922f2381caac34c5ecb8799989923813a639f8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 12 May 2022 04:20:00 +0000 Subject: [PATCH 038/166] recoll: 1.31.0 -> 1.32.0 https://www.lesbonscomptes.com/recoll/pages/release-1.32.html --- pkgs/applications/search/recoll/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 4c8a4b7850b..78b1901be4c 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -35,14 +35,14 @@ mkDerivation rec { pname = "recoll"; - version = "1.31.0"; + version = "1.32.0"; src = fetchurl { url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-TtkfohzeT0HO6ywCMNxrODW1DnJg5KMFkx9AbDfQt+c="; + sha256 = "sha256-4kt6g5MVZTyYLSH7q2z72nzAsU6fatC0vTebEKhSA6E="; }; - configureFlags = [ "--enable-recollq" "--disable-webkit" ] + configureFlags = [ "--enable-recollq" "--disable-webkit" "--without-systemd" ] ++ lib.optionals (!withGui) [ "--disable-qtgui" "--disable-x11mon" ] ++ (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]); @@ -87,6 +87,9 @@ mkDerivation rec { done '' + lib.optionalString stdenv.isLinux '' substituteInPlace $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"' + '' + lib.optionalString (stdenv.isDarwin && withGui) '' + mkdir $out/Applications + mv $out/bin/recoll.app $out/Applications ''; enableParallelBuilding = true; From 1a658da843905a21eee930ee33bb0118f1a0f29d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 12 May 2022 04:20:00 +0000 Subject: [PATCH 039/166] sile: fix build f3100dd4e0072cf641d52ae3dc9da959e5335bf9 changed the default interpreter of Sile to Lua 5.4. Unfortunately, multiple Lua dependencies fail when building with lua5_4, making Sile to fail to build. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54d17be1214..cb9a4cbe90e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10281,7 +10281,7 @@ with pkgs; silc_server = callPackage ../servers/silc-server { }; sile = callPackage ../tools/typesetting/sile { - lua = lua5_4; + lua = lua5_3; }; silver-searcher = callPackage ../tools/text/silver-searcher { }; From 47a3dd15114bd2d780323c5c07670b93a094c353 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 May 2022 14:11:12 +0000 Subject: [PATCH 040/166] python310Packages.huggingface-hub: 0.4.0 -> 0.6.0 --- pkgs/development/python-modules/huggingface-hub/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index 3bbc8ad2669..eaffd69ca0c 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.4.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "huggingface"; repo = "huggingface_hub"; - rev = "v${version}"; - sha256 = "sha256-rrkubNy60e/1VcGacYQang4yWxUzIBGySxZyq6G1arw="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-jR4aqMAAQJ5a7pOe3RpCtLgdm5JVVSPsBQtube6FeqM="; }; nativeBuildInputs = [ packaging ]; From 85d792a92894ded8346ae3b775cca47d23d37b73 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 12 May 2022 15:17:51 +0000 Subject: [PATCH 041/166] nixos: don't put non-firmware in hardware.firmware These two packages don't have a lib/firmware directory, so putting them in hardware.firmware has no effect. This will become a hard error once firmware compression is implemented. (In the case of Linux, the firmware was all moved to linux-firmware.) --- nixos/modules/hardware/all-firmware.nix | 1 - nixos/modules/system/boot/kernel.nix | 3 --- 2 files changed, 4 deletions(-) diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index da2bc8ffef4..89a1217dfb3 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -83,7 +83,6 @@ in { broadcom-bt-firmware b43Firmware_5_1_138 b43Firmware_6_30_163_46 - b43FirmwareCutter xow_dongle-firmware ] ++ optionals pkgs.stdenv.hostPlatform.isx86 [ facetimehd-calibration diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index fad00e39497..b2c92a85f7a 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -273,9 +273,6 @@ in boot.kernelModules = [ "loop" "atkbd" ]; - # The Linux kernel >= 2.6.27 provides firmware. - hardware.firmware = [ kernel ]; - # Create /etc/modules-load.d/nixos.conf, which is read by # systemd-modules-load.service to load required kernel modules. environment.etc = From 7b488d1fc95def61e1da768d4a2c78676d57cdb0 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 12 May 2022 15:19:04 +0000 Subject: [PATCH 042/166] b43Firmware_6_30_163_46: use the right location hardware.firmware only considers lib/firmware, so this firmware was being completely ignored. --- pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix index 622b89b1bae..92c179726d2 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { sourceRoot = "."; installPhase = '' - mkdir $out - b43-fwcutter -w $out *.wl_apsta.o + mkdir -p $out/lib/firmware + b43-fwcutter -w $out/lib/firmware *.wl_apsta.o ''; meta = with lib; { From 94880867466073f28eecd6a7858dab6ec67b6a0b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 12 May 2022 15:21:04 +0000 Subject: [PATCH 043/166] linux: support loading compressed firmware Supported since Linux 5.3. --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index fdf54d302bf..d25e20bac8b 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -883,6 +883,8 @@ let # Disable the firmware helper fallback, udev doesn't implement it any more FW_LOADER_USER_HELPER_FALLBACK = option no; + FW_LOADER_COMPRESS = option yes; + HOTPLUG_PCI_ACPI = yes; # PCI hotplug using ACPI HOTPLUG_PCI_PCIE = yes; # PCI-Expresscard hotplug support From f854f80bc7c2d28a18a85c27da0d973a920e40fd Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 12 May 2022 18:08:30 +0200 Subject: [PATCH 044/166] haskell.packages.ghc884.exceptions: reflect 0.10.5 release --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index d7b049b205b..a6fad258cf8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -118,7 +118,7 @@ self: super: { liquidhaskell = markBroken super.liquidhaskell; # This became a core library in ghc 8.10., so we don‘t have an "exception" attribute anymore. - exceptions = super.exceptions_0_10_4; + exceptions = super.exceptions_0_10_5; # ghc versions which don‘t match the ghc-lib-parser-ex version need the # additional dependency to compile successfully. From 9bee4489da18df037507f28c062bc089aec14375 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Thu, 12 May 2022 18:30:42 +0300 Subject: [PATCH 045/166] python310Packages.datatable: break only for py310 --- pkgs/development/python-modules/datatable/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/datatable/default.nix b/pkgs/development/python-modules/datatable/default.nix index 3d3279bb2b3..2ebb488aba7 100644 --- a/pkgs/development/python-modules/datatable/default.nix +++ b/pkgs/development/python-modules/datatable/default.nix @@ -6,6 +6,7 @@ , llvm , pytestCheckHook , typesentry +, isPy310 }: buildPythonPackage rec { @@ -63,6 +64,6 @@ buildPythonPackage rec { maintainers = with maintainers; [ abbradar ]; # uses custom build system and adds -Wunused-variable -Werror # warning: ‘dt::expr::doc_first’ defined but not used [-Wunused-variable] - broken = true; + broken = isPy310; }; } From 38d8148d11dab44040e4f42c09de008bf89fa278 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 12 May 2022 22:33:10 +0100 Subject: [PATCH 046/166] cuneiform: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: cgminer-driver-modminer.o:/build/source/miner.h:285: multiple definition of `bitforce_drv'; cgminer-cgminer.o:/build/source/miner.h:285: first defined here --- pkgs/tools/graphics/cuneiform/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index beaf2c1f213..ac777051d10 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -20,6 +20,12 @@ stdenv.mkDerivation { }) ]; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: CMakeFiles/rbal.dir/src/statsearchbl.cpp.o:(.bss+0x0): + # multiple definition of `minrow'; CMakeFiles/rbal.dir/src/linban.c.o:(.bss+0xa3a): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + postPatch = '' rm cuneiform_src/Kern/hhh/tigerh/h/strings.h ''; From d949097fcd7c4a2f33523244d6af9ed38be90daa Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 12 May 2022 23:34:01 +0200 Subject: [PATCH 047/166] rtl_433: patch for CVE-2022-27419 --- pkgs/applications/radio/rtl_433/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix index 54dfe21ce04..e4e04728bcd 100644 --- a/pkgs/applications/radio/rtl_433/default.nix +++ b/pkgs/applications/radio/rtl_433/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, fetchpatch , libusb1, rtl-sdr, soapysdr-with-plugins }: @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-KoDKyI7KDdGSe79ZTuL9ObKnOJsqTN4wrMq+/cvQ/Xk="; }; + patches = [( fetchpatch { + name = "CVE-2022-27419"; + url = "https://github.com/merbanan/rtl_433/commit/37455483889bd1c641bdaafc493d1cc236b74904.patch"; + sha256 = "172jndh8x5nlcbx2jp5y8fgfxsawwfz95037pcjp170gf93ijy88"; + })]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libusb1 rtl-sdr soapysdr-with-plugins ]; From 48592503c0b53587fc83338d85c81a198bdb96af Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 12 May 2022 23:35:09 +0200 Subject: [PATCH 048/166] rtl_433: add markuskowa as maintainer --- pkgs/applications/radio/rtl_433/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix index e4e04728bcd..e04a8a907d1 100644 --- a/pkgs/applications/radio/rtl_433/default.nix +++ b/pkgs/applications/radio/rtl_433/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "Decode traffic from devices that broadcast on 433.9 MHz, 868 MHz, 315 MHz, 345 MHz and 915 MHz"; homepage = "https://github.com/merbanan/rtl_433"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ earldouglas ]; + maintainers = with maintainers; [ earldouglas markuskowa ]; platforms = platforms.all; }; From cff57430daf7a859fd98f75ebcb2760d633ac04e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anselm=20Sch=C3=BCler?= Date: Fri, 13 May 2022 01:44:35 +0200 Subject: [PATCH 049/166] dart: 2.15.1 -> 2.17.0 --- pkgs/development/interpreters/dart/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index 0891bfd2d8f..bf5ab2dc98f 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , unzip -, version ? "2.15.1" +, version ? "2.17.0" , sources ? let base = "https://storage.googleapis.com/dart-archive/channels"; x86_64 = "x64"; @@ -10,28 +10,28 @@ aarch64 = "arm64"; # Make sure that if the user overrides version parameter they're # also need to override sources, to avoid mistakes - version = "2.15.1"; + version = "2.17.0"; in { "${version}-aarch64-darwin" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${aarch64}-release.zip"; - sha256 = "sha256-DDE4DpA2m8wKkUZuQDn4NpXVvtaJ6sIHeKNjk3RbpYE="; + sha256 = "sha256-WXf0SdSEHMaJRfVFgKzb9SY4LBjf1xO5Oki/dzKMEMY="; }; "${version}-x86_64-darwin" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; - sha256 = "sha256-s6bkwh2m5KdRr/WxWXwItO9YaDpp/HI3xjnS2UHmN+I="; + sha256 = "sha256-PwaxUQHIUhRWCOy3IVdGtRyP9LtscqoUJPOZfevN7xs="; }; "${version}-x86_64-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "sha256-D0XcqlO0CQtpsne4heqaTLOkFYnJEZET4bl4rVXOM18="; + sha256 = "sha256-V7j9lk5HyB1GeuuVsJmmcKt+j1ShzXTUW80f3HeRPYY="; }; "${version}-i686-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; - sha256 = "sha256-SRq5TtxS+bwCqVxa0U2Zhn8J1Wtm4Onq+3uQS+951sw="; + sha256 = "sha256-YWxFwbcGvssOSL4S5O4jqLzxdUHvbVd9i4cLNyFn/cs="; }; "${version}-aarch64-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; - sha256 = "sha256-iDbClCNDUsxT6K6koc4EQuu7dppTbOfzCVedpQIKI5U="; + sha256 = "sha256-BaHbD9hFhYd9YYCFg0bXxTx++JQzZn2zuF8/Ll+nA2s="; }; } }: From 697f9a7453f22d49bf0fbe4876eeb103e5f60f6c Mon Sep 17 00:00:00 2001 From: squalus Date: Thu, 12 May 2022 16:56:24 -0700 Subject: [PATCH 050/166] librewolf: 100.0-2 -> 100.0-3 --- pkgs/applications/networking/browsers/librewolf/src.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 8f36d68e7f2..5bad3f1ed7f 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,8 +1,8 @@ { - "packageVersion": "100.0-2", + "packageVersion": "100.0-3", "source": { - "rev": "100.0-2", - "sha256": "0pr7fb91zw5qlnfvaavzksd3c2xzgn1344mmfnz9yx2g42vcyi7d" + "rev": "100.0-3", + "sha256": "1n99amk6ngxa7wipc402gffqjv4qmgbaahpz3xydfarxw8gk37pl" }, "firefox": { "version": "100.0", From dfeb273bfa4189b5d6ce08a89b78a5a4a6f0a21a Mon Sep 17 00:00:00 2001 From: midchildan Date: Fri, 13 May 2022 10:39:02 +0900 Subject: [PATCH 051/166] epgstation: fix build --- .../applications/video/epgstation/default.nix | 23 ++----------------- pkgs/development/node-packages/default.nix | 1 + 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/applications/video/epgstation/default.nix index b8919361727..c93c0f94fa9 100644 --- a/pkgs/applications/video/epgstation/default.nix +++ b/pkgs/applications/video/epgstation/default.nix @@ -23,18 +23,6 @@ let sha256 = "K1cAvmqWEfS6EY4MKAtjXb388XLYHtouxNM70PWgFig="; }; - workaround-opencollective-buildfailures = stdenv.mkDerivation { - # FIXME: This should be removed when a complete fix is available - # https://github.com/svanderburg/node2nix/issues/145 - name = "workaround-opencollective-buildfailures"; - dontUnpack = true; - installPhase = '' - mkdir -p $out/bin - touch $out/bin/opencollective-postinstall - chmod +x $out/bin/opencollective-postinstall - ''; - }; - client = nodePackages.epgstation-client.override (drv: { # FIXME: remove this option if possible # @@ -49,21 +37,14 @@ let server = nodePackages.epgstation.override (drv: { inherit src; - bypassCache = false; - # This is set to false to keep devDependencies at build time. Build time # dependencies are pruned afterwards. production = false; buildInputs = [ bash ]; - nativeBuildInputs = [ - nodejs - workaround-opencollective-buildfailures + nativeBuildInputs = drv.nativeBuildInputs ++ [ makeWrapper - ] ++ (with nodePackages; [ - node-pre-gyp - node-gyp-build - ]); + ]; preRebuild = '' # Fix for not being able to connect to mysql using domain sockets. diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index b2da0f16eb5..e65802f6833 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -119,6 +119,7 @@ let # NOTE: this is a stub package to fetch npm dependencies for # ../../applications/video/epgstation epgstation = super."epgstation-../../applications/video/epgstation".override (drv: { + nativeBuildInputs = [ self.node-pre-gyp self.node-gyp-build ]; meta = drv.meta // { platforms = pkgs.lib.platforms.none; }; From 557019af9103345347d7e7797bbd7df3a7f9bf1b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 13 May 2022 04:20:00 +0000 Subject: [PATCH 052/166] python39Packages.huggingface-hub: fix changelog url --- pkgs/development/python-modules/huggingface-hub/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index eaffd69ca0c..d0eba93fb85 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/huggingface/huggingface_hub"; description = "Download and publish models and other files on the huggingface.co hub"; - changelog = "https://github.com/huggingface/huggingface_hub/releases/tag/${version}"; + changelog = "https://github.com/huggingface/huggingface_hub/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; From ebd2f4dea30d09fbeb7bf37d6c37cf1242c01527 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 13 May 2022 04:20:00 +0000 Subject: [PATCH 053/166] lapce: 0.0.12 -> 0.1.0 https://github.com/lapce/lapce/releases/tag/v0.1.0 --- pkgs/applications/editors/lapce/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix index d13b4c05302..49c3d5559aa 100644 --- a/pkgs/applications/editors/lapce/default.nix +++ b/pkgs/applications/editors/lapce/default.nix @@ -28,16 +28,16 @@ rustPlatform.buildRustPackage rec { pname = "lapce"; - version = "0.0.12"; + version = "0.1.0"; src = fetchFromGitHub { owner = "lapce"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZFQjQ5+G0b0Fgg3+du/drt+62rC/TCNR5MIdJXAkTrE="; + sha256 = "sha256-KSumy7M7VNUib4CZ0ikBboEFMzDQt4xW+aUFHOi+0pA="; }; - cargoSha256 = "sha256-sMTootPsenaWzLLFImo6HWC1pcm2uFupPhVWsUJp1Ak="; + cargoSha256 = "sha256-7SVTcH9/Ilq8HcpJJI0KFiQA076lR2CAIBwmTVgmnjE="; nativeBuildInputs = [ cmake From f7a21b7d2c62e2c38590e2413b7991ba839c4ebd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 May 2022 08:47:22 +0000 Subject: [PATCH 054/166] python310Packages.pyglet: 1.5.23 -> 1.5.24 --- pkgs/development/python-modules/pyglet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index db436983f3a..029061b8010 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -18,13 +18,13 @@ }: buildPythonPackage rec { - version = "1.5.23"; + version = "1.5.24"; pname = "pyglet"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3ukgIDzzBhWcUDurti84eHJocIl39clF0oM3WUt5fEY="; + sha256 = "sha256-W0pNXlrVSUbjFJLqxn9ykuUaZXckRkGidxgPkKAZKo4="; extension = "zip"; }; From 74e705c3df979bd405af767607a4d716188c9627 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 13 May 2022 12:57:15 +0200 Subject: [PATCH 055/166] wine: Disable parallel building until dlltool is fixed --- pkgs/applications/emulators/wine/base.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 7788b13b4ec..47852d69e3b 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -175,7 +175,9 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { done ''; - enableParallelBuilding = true; + # Until https://github.com/NixOS/nixpkgs/pull/172617 is applied, + # parallel builds do not always work because of a bug in dlltool. + enableParallelBuilding = false; # https://bugs.winehq.org/show_bug.cgi?id=43530 # https://github.com/NixOS/nixpkgs/issues/31989 From 363c5dc7f2879ddcf895cbfdc5d2d3ca4d07a1fc Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 13 May 2022 13:30:44 +0200 Subject: [PATCH 056/166] rr-unstable: unstable-2021-07-06 -> unstable-2022-05-12 --- pkgs/development/tools/analysis/rr/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/rr/unstable.nix b/pkgs/development/tools/analysis/rr/unstable.nix index 35098c1bcfc..8ffdbc88e4d 100644 --- a/pkgs/development/tools/analysis/rr/unstable.nix +++ b/pkgs/development/tools/analysis/rr/unstable.nix @@ -11,12 +11,12 @@ let in rr.overrideAttrs (old: { - version = "unstable-2021-07-06"; + version = "unstable-2022-05-12"; src = fetchFromGitHub { owner = "mozilla"; repo = "rr"; - rev = "0fc21a8d654dabc7fb1991d76343824cb7951ea0"; - sha256 = "0s851rflxmvxcfw97zmplcwzhv86xmd3my78pi4c7gkj18d621i5"; + rev = "c96cb688106634ad09af6214aa91252c3a4f74b1"; + sha256 = "sha256-K4cEQnvBXr/j9qXCgIHLqMrRzm96ushTO5STivRj+Mk="; }; }) From 044d65e6e9622e5a75a9de2cb5cf7ea04c702a61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 May 2022 11:44:30 +0000 Subject: [PATCH 057/166] python310Packages.apispec: 5.2.1 -> 5.2.2 --- pkgs/development/python-modules/apispec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index 0c145848810..9ad41715a23 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "apispec"; - version = "5.2.1"; + version = "5.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-z3VMQ5pW3xLwFJ/FaQpCJ3TprDOV+2eYiCwX+8OinS0="; + hash = "sha256-bqZULh6//p/ZW6Ae8/UTUerGwgCpdFYsdHMFm5zSCqc="; }; propagatedBuildInputs = [ From e40670371ee119441cfc299f564809caffc2280c Mon Sep 17 00:00:00 2001 From: gbtb Date: Fri, 13 May 2022 21:50:26 +1000 Subject: [PATCH 058/166] dotnet: added icu attributes to hash auto-generation script --- pkgs/development/compilers/dotnet/default.nix | 2 ++ pkgs/development/compilers/dotnet/print-hashes.sh | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index dc3564f6003..0740802ca4a 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -20,6 +20,8 @@ rec { sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)"; sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)"; + ##### Following attributes with urls and hashes should be auto-generated by print-hashes.sh ##### + # v3.1 (lts) aspnetcore_3_1 = buildAspNetCore { icu = icu70; diff --git a/pkgs/development/compilers/dotnet/print-hashes.sh b/pkgs/development/compilers/dotnet/print-hashes.sh index 966f0a9c061..162f1af70ec 100755 --- a/pkgs/development/compilers/dotnet/print-hashes.sh +++ b/pkgs/development/compilers/dotnet/print-hashes.sh @@ -84,6 +84,11 @@ Examples: aspnetcore_files="$(release_files "$release_content" "aspnetcore-runtime")" runtime_files="$(release_files "$release_content" "runtime")" sdk_files="$(release_files "$release_content" "sdk")" + if [ $major_minor = "3.1" ]; then + icu_attr="icu = icu70;" + else + icu_attr="inherit icu;" + fi major_minor_underscore=${major_minor/./_} channel_version=$(jq -r '."channel-version"' <<< "$content") @@ -91,16 +96,19 @@ Examples: echo " # v$channel_version ($support_phase) aspnetcore_$major_minor_underscore = buildAspNetCore { + $icu_attr version = \"${aspnetcore_version}\"; $(platform_sources "$aspnetcore_files") }; runtime_$major_minor_underscore = buildNetRuntime { + $icu_attr version = \"${runtime_version}\"; $(platform_sources "$runtime_files") }; sdk_$major_minor_underscore = buildNetSdk { + $icu_attr version = \"${sdk_version}\"; $(platform_sources "$sdk_files") }; " From bce3f0cba98fb70f328f8eb20971f33fd702856d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 May 2022 12:59:09 +0000 Subject: [PATCH 059/166] python310Packages.django-jinja: 2.10.0 -> 2.10.2 --- pkgs/development/python-modules/django-jinja2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-jinja2/default.nix b/pkgs/development/python-modules/django-jinja2/default.nix index 039a75aacee..305e153ce60 100644 --- a/pkgs/development/python-modules/django-jinja2/default.nix +++ b/pkgs/development/python-modules/django-jinja2/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "django-jinja"; - version = "2.10.0"; + version = "2.10.2"; meta = { description = "Simple and nonobstructive jinja2 integration with Django"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "ae6a3fdf1ffa7a9ef6fd2f0a59c1a68c96b29f7f00f5166375658ef392f1ed32"; + sha256 = "sha256-v9+7VcH1pnnWmtV11VDEcH04ZjQAkVLv4BQInzxNFBI="; }; buildInputs = [ django pytz tox ]; From 69626979493cf104ef3f33f48c60d644915b54aa Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Fri, 13 May 2022 10:33:43 -0400 Subject: [PATCH 060/166] python3Packages.cirq-core: 0.13.1 -> 0.14.1 --- .../python-modules/cirq-core/default.nix | 27 +++++-------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix index 92045eb3e3e..74f8e488fd9 100644 --- a/pkgs/development/python-modules/cirq-core/default.nix +++ b/pkgs/development/python-modules/cirq-core/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "cirq-core"; - version = "0.13.1"; + version = "0.14.1"; disabled = pythonOlder "3.6"; @@ -38,32 +38,17 @@ buildPythonPackage rec { owner = "quantumlib"; repo = "cirq"; rev = "v${version}"; - sha256 = "sha256-MVfJ8iEeW8gFvCNTqrWfYpNNYuDAufHgcjd7Nh3qp8U="; + sha256 = "sha256-cIDwV3IBXrTJ4jC1/HYmduY3tLe/f6wj8CWZ4cnThG8="; }; sourceRoot = "source/${pname}"; - patches = [ - # present in upstream master - remove after 0.13.1 - (fetchpatch { - name = "fix-test-tolerances.part-1.patch"; - url = "https://github.com/quantumlib/Cirq/commit/eb1d9031e55d3c8801ea44abbb6a4132b2fc5126.patch"; - sha256 = "0ka24v6dfxnap9p07ni32z9zccbmw0lbrp5mcknmpsl12hza98xm"; - stripLen = 1; - }) - (fetchpatch { - name = "fix-test-tolerances.part-2.patch"; - url = "https://github.com/quantumlib/Cirq/commit/a28d601b2bcfc393336375c53e5915fd16455395.patch"; - sha256 = "0k2dqsm4ydn6556d40kc8j04jgjn59z4wqqg1jn1r916a7yxw493"; - stripLen = 1; - }) - ]; - postPatch = '' substituteInPlace requirements.txt \ --replace "matplotlib~=3.0" "matplotlib" \ --replace "networkx~=2.4" "networkx" \ - --replace "numpy~=1.16" "numpy" + --replace "numpy~=1.16" "numpy" \ + --replace "sympy<1.10" "sympy" ''; propagatedBuildInputs = [ @@ -93,9 +78,9 @@ buildPythonPackage rec { freezegun ]; - pytestFlagsArray = lib.optionals (!withContribRequires) [ + disabledTestPaths = lib.optionals (!withContribRequires) [ # requires external (unpackaged) libraries, so untested. - "--ignore=cirq/contrib/" + "cirq/contrib/" ]; disabledTests = [ "test_metadata_search_path" # tries to import flynt, which isn't in Nixpkgs From 8aa8e0ce7f137fe329608efcbb3494a5e6a63f42 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 12 May 2022 15:23:12 +0000 Subject: [PATCH 061/166] nixos/udev: compress all firmware if supported This should be a significant disk space saving for most NixOS installations. This method is a bit more complicated than doing it in the postInstall for the firmware derivations, but this way it's automatic, so each firmware package doesn't have to separately implement its compression. Currently, only xz compression is supported, but it's likely that future versions of Linux will additionally support zstd, so I've written the code in such a way that it would be very easy to implement zstd compression for those kernels when they arrive, falling back to xz for older (current) kernels. I chose the highest possible level of compression (xz -9) because even at this level, decompression time is negligible. Here's how long it took to decompress every firmware file my laptop uses: i915/kbl_dmc_ver1_04.bin 2ms regulatory.db 4ms regulatory.db.p7s 3ms iwlwifi-7265D-29.ucode 62ms 9d71-GOOGLE-EVEMAX-0-tplg.bin 22ms intel/dsp_fw_kbl.bin 65ms dsp_lib_dsm_core_spt_release.bin 6ms intel/ibt-hw-37.8.10-fw-22.50.19.14.f.bseq 7ms And since booting NixOS is a parallel process, it's unlikely (but difficult to measure) that the time to user interaction was held up at all by most of these. Fixes (partially?) #148197 --- nixos/modules/services/hardware/udev.nix | 7 ++++++- .../kernel/compress-firmware-xz.nix | 16 ++++++++++++++++ pkgs/build-support/kernel/modules-closure.sh | 8 ++++++-- pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 pkgs/build-support/kernel/compress-firmware-xz.nix diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 2f386617187..2e9deebbb74 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -171,6 +171,11 @@ let mv etc/udev/hwdb.bin $out ''; + compressFirmware = if config.boot.kernelPackages.kernelAtLeast "5.3" then + pkgs.compressFirmwareXz + else + id; + # Udev has a 512-character limit for ENV{PATH}, so create a symlink # tree to work around this. udevPath = pkgs.buildEnv { @@ -267,7 +272,7 @@ in ''; apply = list: pkgs.buildEnv { name = "firmware"; - paths = list; + paths = map compressFirmware list; pathsToLink = [ "/lib/firmware" ]; ignoreCollisions = true; }; diff --git a/pkgs/build-support/kernel/compress-firmware-xz.nix b/pkgs/build-support/kernel/compress-firmware-xz.nix new file mode 100644 index 00000000000..56595131c89 --- /dev/null +++ b/pkgs/build-support/kernel/compress-firmware-xz.nix @@ -0,0 +1,16 @@ +{ runCommand }: + +firmware: + +runCommand "${firmware.name}-xz" {} '' + mkdir -p $out/lib + (cd ${firmware} && find lib/firmware -type d -print0) | + (cd $out && xargs -0 mkdir -v --) + (cd ${firmware} && find lib/firmware -type f -print0) | + (cd $out && xargs -0tP "$NIX_BUILD_CORES" -n1 \ + sh -c 'xz -9c -T1 -C crc32 --lzma2=dict=2MiB "${firmware}/$1" > "$1.xz"' --) + (cd ${firmware} && find lib/firmware -type l) | while read link; do + target="$(readlink "${firmware}/$link")" + ln -vs -- "''${target/^${firmware}/$out}.xz" "$out/$link.xz" + done +'' diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index 3b3a38ea1d3..74bc490eb15 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -81,8 +81,12 @@ for module in $(cat closure); do for i in $(modinfo -b $kernel --set-version "$version" -F firmware $module | grep -v '^name:'); do mkdir -p "$out/lib/firmware/$(dirname "$i")" echo "firmware for $module: $i" - cp "$firmware/lib/firmware/$i" "$out/lib/firmware/$i" 2>/dev/null \ - || echo "WARNING: missing firmware $i for module $module" + for name in "$i" "$i.xz" ""; do + [ -z "$name" ] && echo "WARNING: missing firmware $i for module $module" + if cp "$firmware/lib/firmware/$name" "$out/lib/firmware/$name" 2>/dev/null; then + break + fi + done done done diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e89aa5c04a8..f1170aae20d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -808,6 +808,8 @@ with pkgs; sanitizers = [ ]; }; + compressFirmwareXz = callPackage ../build-support/kernel/compress-firmware-xz.nix { }; + makeModulesClosure = { kernel, firmware, rootModules, allowMissing ? false }: callPackage ../build-support/kernel/modules-closure.nix { inherit kernel firmware rootModules allowMissing; From 9a8b76f789c541234bb88561af219190a49587f8 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Fri, 13 May 2022 10:41:41 -0400 Subject: [PATCH 062/166] python3Packages.cirq: fix build Build was failing because it attempted to find top-level packages. See https://github.com/quantumlib/Cirq/issues/5291 --- pkgs/development/python-modules/cirq/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix index 6e428eeb4ef..17623817e7b 100644 --- a/pkgs/development/python-modules/cirq/default.nix +++ b/pkgs/development/python-modules/cirq/default.nix @@ -1,4 +1,5 @@ { buildPythonPackage +, fetchpatch , cirq-aqt , cirq-core , cirq-google @@ -14,6 +15,14 @@ buildPythonPackage rec { pname = "cirq"; inherit (cirq-core) version src meta; + patches = [ + (fetchpatch { + url = "https://github.com/quantumlib/Cirq/commit/b832db606e5f1850b1eda168a6d4a8e77d8ec711.patch"; + name = "pr-5330-prevent-implicit-packages.patch"; + sha256 = "sha256-HTEH3fFxPiBedaz5GxZjXayvoiazwHysKZIOzqwZmbg="; + }) + ]; + propagatedBuildInputs = [ cirq-aqt cirq-core From 03651228c4bc8aa860f64cda233fab722a06d9ee Mon Sep 17 00:00:00 2001 From: Julius de Bruijn Date: Wed, 11 May 2022 14:21:27 +0200 Subject: [PATCH 063/166] nodePackages.prisma: package tests to validate binary interop --- pkgs/development/node-packages/default.nix | 6 ++ .../node-packages/package-tests/prisma.nix | 56 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/node-packages/package-tests/prisma.nix diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index b2da0f16eb5..d9b6626e72b 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -339,6 +339,12 @@ let --set PRISMA_INTROSPECTION_ENGINE_BINARY ${prisma-engines}/bin/introspection-engine \ --set PRISMA_FMT_BINARY ${prisma-engines}/bin/prisma-fmt ''; + + passthru.tests = { + simple-execution = pkgs.callPackage ./package-tests/prisma.nix { + inherit (self) prisma; + }; + }; }; pulp = super.pulp.override { diff --git a/pkgs/development/node-packages/package-tests/prisma.nix b/pkgs/development/node-packages/package-tests/prisma.nix new file mode 100644 index 00000000000..35a5516a3b5 --- /dev/null +++ b/pkgs/development/node-packages/package-tests/prisma.nix @@ -0,0 +1,56 @@ +{ lib, pkgs, runCommand, prisma }: + +let + inherit (prisma) packageName; + prismaMajorVersion = lib.versions.majorMinor prisma.version; + enginesMajorVersion = lib.versions.majorMinor pkgs.prisma-engines.version; +in + +runCommand "${packageName}-tests" { + nativeBuildInputs = with pkgs; [ prisma sqlite-interactive ]; + meta.timeout = 60; +} + '' + mkdir $out + cd $out + + if [ "${prismaMajorVersion}" != "${enginesMajorVersion}" ]; then + echo "nodePackages.prisma in version ${prismaMajorVersion} and prisma-engines in ${enginesMajorVersion}. Major versions must match." + exit 1 + fi + + # Ensure CLI runs + prisma --help > /dev/null + + # Init a new project + prisma init > /dev/null + + # Create a simple data model + cat << EOF > prisma/schema.prisma + datasource db { + provider = "sqlite" + url = "file:test.db" + } + + generator js { + provider = "prisma-client-js" + } + + model A { + id Int @id @default(autoincrement()) + b String @default("foo") + } + EOF + + # Format + prisma format > /dev/null + + # Create the database + prisma db push --skip-generate > /dev/null + + # The database file should exist and be a SQLite database + sqlite3 prisma/test.db "SELECT id, b FROM A" > /dev/null + + # Introspect the database + prisma db pull > /dev/null + '' From 354b731b63ba1ca5fbd5faf1291c314d3d31d9cd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 11 May 2022 23:38:15 +0200 Subject: [PATCH 064/166] dump_syms: init at unstable-2022-05-05 --- pkgs/development/tools/dump_syms/default.nix | 46 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/tools/dump_syms/default.nix diff --git a/pkgs/development/tools/dump_syms/default.nix b/pkgs/development/tools/dump_syms/default.nix new file mode 100644 index 00000000000..a8c6821f27f --- /dev/null +++ b/pkgs/development/tools/dump_syms/default.nix @@ -0,0 +1,46 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +}: + +let + pname = "dump_syms"; + version = "unstable-2022-05-05"; +in +rustPlatform.buildRustPackage { + inherit pname version; + + src = fetchFromGitHub { + owner = "mozilla"; + repo = pname; + rev = "c2743d59b5aa321ade698f84b90f86b3d35a1b06"; + hash = "sha256-hWK9KrYqbfrF8b7i33InlTa/XkoZs+h49kUsKeSaAok="; + }; + + cargoSha256 = "sha256:0vsr867nl156wpxpw01bv9fxsp6rhj9vvpz2i2yhx4kjgr1qk1kw"; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + checkFlags = [ + # Disable tests that require network access + # ConnectError("dns error", Custom { kind: Uncategorized, error: "failed to lookup address information: Temporary failure in name resolution" })) }', src/windows/pdb.rs:725:56 + "--skip windows::pdb::tests::test_ntdll" + "--skip windows::pdb::tests::test_oleaut32" + ]; + + meta = with lib; { + changelog = "https://github.com/mozilla/dump_syms/releases/tag/v${version}"; + description = "Command-line utility for parsing the debugging information the compiler provides in ELF or stand-alone PDB files"; + license = licenses.asl20; + homepage = "https://github.com/mozilla/dump_syms/"; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fe1c79cf7e..98d943b716a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5306,6 +5306,8 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; + dump_syms = callPackage ../development/tools/dump_syms { }; + dumptorrent = callPackage ../tools/misc/dumptorrent { }; duo-unix = callPackage ../tools/security/duo-unix { }; From a373324120a271fdbff202b61895e06aecf98923 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 May 2022 14:40:21 +0200 Subject: [PATCH 065/166] buildMozillaMach: create symbols output Thie zip bundle in this output is used in the dumps sent by the crashreporter. For this to happen we need to upload this zip file to https://symbols.mozilla.org, which is a separate effort. --- .../networking/browsers/firefox/common.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 9321e491099..5fda096ee1d 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -23,6 +23,7 @@ # build time , autoconf , cargo +, dump_syms , makeWrapper , nodejs , perl @@ -168,6 +169,11 @@ buildStdenv.mkDerivation ({ inherit src unpackPhase meta; + outputs = [ + "out" + "symbols" + ]; + # Add another configure-build-profiling run before the final configure phase if we build with pgo preConfigurePhases = lib.optionals pgoSupport [ "configurePhase" @@ -196,6 +202,7 @@ buildStdenv.mkDerivation ({ nativeBuildInputs = [ autoconf cargo + dump_syms llvmPackages.llvm # llvm-objdump makeWrapper nodejs @@ -408,7 +415,13 @@ buildStdenv.mkDerivation ({ # tests were disabled in configureFlags doCheck = false; + # Generate build symbols once after the final build + # https://firefox-source-docs.mozilla.org/crash-reporting/uploading_symbol.html preInstall = '' + ./mach buildsymbols + mkdir -p $symbols/ + cp mozobj/dist/*.crashreporter-symbols.zip $symbols/ + cd mozobj ''; From a179998a0609adb6bd92cfc5d5f4324b99ce2871 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 May 2022 15:16:44 +0200 Subject: [PATCH 066/166] buildMozillaMach: Update native python env var With Firefox 100.0 the following deprecation warning comes up: > The "MACH_USE_SYSTEM_PYTHON" environment variable is deprecated, > please unset it or replace it with either > "MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system" or > "MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none" And since we want to continue using our own python we're going for the system value when the version is at least 100.0. --- .../networking/browsers/firefox/common.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 5fda096ee1d..25eb34c95e8 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -238,13 +238,17 @@ buildStdenv.mkDerivation ({ # Set consistent remoting name to ensure wmclass matches with desktop file export MOZ_APP_REMOTINGNAME="${binaryName}" - # Use our own python - export MACH_USE_SYSTEM_PYTHON=1 - # AS=as in the environment causes build failure # https://bugzilla.mozilla.org/show_bug.cgi?id=1497286 unset AS + '' + lib.optionalString (lib.versionAtLeast version "100.0") '' + # Use our own python + export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system + '' + lib.optionalString (lib.versionOlder version "100.0") '' + # Use our own python + export MACH_USE_SYSTEM_PYTHON=1 + '' + lib.optionalString (lib.versionAtLeast version "95.0") '' # RBox WASM Sandboxing export WASM_CC=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}cc From 834477e4d43f45bf34f52804015783298e4e2ff1 Mon Sep 17 00:00:00 2001 From: midchildan Date: Sat, 14 May 2022 00:17:11 +0900 Subject: [PATCH 067/166] epgstation: move node-pre-gyp and node-gyp-build to buildInputs --- pkgs/applications/video/epgstation/default.nix | 2 +- pkgs/development/node-packages/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/applications/video/epgstation/default.nix index c93c0f94fa9..323b22c7883 100644 --- a/pkgs/applications/video/epgstation/default.nix +++ b/pkgs/applications/video/epgstation/default.nix @@ -42,7 +42,7 @@ let production = false; buildInputs = [ bash ]; - nativeBuildInputs = drv.nativeBuildInputs ++ [ + nativeBuildInputs = (drv.nativeBuildInputs or [ ]) ++ [ makeWrapper ]; diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index e65802f6833..afeb5e35f2c 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -119,7 +119,7 @@ let # NOTE: this is a stub package to fetch npm dependencies for # ../../applications/video/epgstation epgstation = super."epgstation-../../applications/video/epgstation".override (drv: { - nativeBuildInputs = [ self.node-pre-gyp self.node-gyp-build ]; + buildInputs = [ self.node-pre-gyp self.node-gyp-build ]; meta = drv.meta // { platforms = pkgs.lib.platforms.none; }; From cb1ae7f1c43ebb7eb23383d9208a56780ac75b6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 13 May 2022 17:30:35 +0200 Subject: [PATCH 068/166] sptlrx: add updateScript --- pkgs/applications/audio/sptlrx/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/sptlrx/default.nix b/pkgs/applications/audio/sptlrx/default.nix index ffe4741d179..40d43d207fb 100644 --- a/pkgs/applications/audio/sptlrx/default.nix +++ b/pkgs/applications/audio/sptlrx/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, sptlrx }: +{ lib, buildGoModule, fetchFromGitHub, nix-update-script, testers, sptlrx }: buildGoModule rec { pname = "sptlrx"; @@ -15,10 +15,13 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - passthru.tests.version = testers.testVersion { - package = sptlrx; - # TODO Wrong version in `0.2.0`. Has been fixed upstream. - version = "v0.1.0"; + passthru = { + updateScript = nix-update-script { attrPath = pname; }; + tests.version = testers.testVersion { + package = sptlrx; + # TODO Wrong version in `0.2.0`. Has been fixed upstream. + version = "v0.1.0"; + }; }; meta = with lib; { From f6abbe3b3276888b387a2efa5732cf515830c64f Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Tue, 10 May 2022 10:31:14 +0300 Subject: [PATCH 069/166] python3Packages.py-deprecate: init at 0.3.2 ...needed for pytorch-lightning --- .../python-modules/py-deprecate/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/py-deprecate/default.nix diff --git a/pkgs/development/python-modules/py-deprecate/default.nix b/pkgs/development/python-modules/py-deprecate/default.nix new file mode 100644 index 00000000000..12ea2b7ce9e --- /dev/null +++ b/pkgs/development/python-modules/py-deprecate/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, scikit-learn +, pytorch +}: + +let + pname = "py-deprecate"; + version = "0.3.2"; +in +buildPythonPackage { + inherit pname version; + + src = fetchFromGitHub { + owner = "Borda"; + repo = "pyDeprecate"; + rev = "v${version}"; + hash = "sha256-84RmQvLxwtLPQk3hX7Q6eeJeejhrO3t+mc95W1E85Fg="; + }; + + checkInputs = [ + pytestCheckHook + scikit-learn + ]; + + pythonImportsCheck = [ "deprecate" ]; + + meta = with lib; { + description = "A python module for marking deprecated functions or classes and re-routing to the new successors' instance. Used by torchmetrics"; + homepage = "https://borda.github.io/pyDeprecate/"; + license = licenses.asl20; + maintainers = with maintainers; [ + SomeoneSerge + ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2a95daf3a55..a5607542ac6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5841,6 +5841,8 @@ in { python-nvd3 = callPackage ../development/python-modules/python-nvd3 { }; + py-deprecate = callPackage ../development/python-modules/py-deprecate { }; + nwdiag = callPackage ../development/python-modules/nwdiag { }; oasatelematics = callPackage ../development/python-modules/oasatelematics { }; From defebc5bb9a74a9abc27150f4990713e67f9713a Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Tue, 10 May 2022 10:31:59 +0300 Subject: [PATCH 070/166] python3Packages.torchmetrics: init at 0.8.1 ...needed for pytorch-lightning --- .../python-modules/py-deprecate/default.nix | 2 +- .../python-modules/torchmetrics/default.nix | 76 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/torchmetrics/default.nix diff --git a/pkgs/development/python-modules/py-deprecate/default.nix b/pkgs/development/python-modules/py-deprecate/default.nix index 12ea2b7ce9e..ff921789bbf 100644 --- a/pkgs/development/python-modules/py-deprecate/default.nix +++ b/pkgs/development/python-modules/py-deprecate/default.nix @@ -28,7 +28,7 @@ buildPythonPackage { pythonImportsCheck = [ "deprecate" ]; meta = with lib; { - description = "A python module for marking deprecated functions or classes and re-routing to the new successors' instance. Used by torchmetrics"; + description = "A module for marking deprecated functions or classes and re-routing to the new successors' instance. Used by torchmetrics"; homepage = "https://borda.github.io/pyDeprecate/"; license = licenses.asl20; maintainers = with maintainers; [ diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix new file mode 100644 index 00000000000..fc2f6cf7535 --- /dev/null +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -0,0 +1,76 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cloudpickle +, scikit-learn +, scikitimage +, packaging +, psutil +, py-deprecate +, pytorch +, pytestCheckHook +, torchmetrics +}: + +let + pname = "torchmetrics"; + version = "0.8.1"; +in +buildPythonPackage { + inherit pname version; + + src = fetchFromGitHub { + owner = "PyTorchLightning"; + repo = "metrics"; + rev = "v${version}"; + hash = "sha256-AryEhYAeC97dO2pgHoz0Y9F//DVdX6RfCa80gI56iz4="; + }; + + propagatedBuildInputs = [ + packaging + py-deprecate + ]; + + # Let the user bring their own instance + buildInputs = [ + pytorch + ]; + + checkInputs = [ + scikit-learn + scikitimage + cloudpickle + psutil + pytestCheckHook + ]; + + # A cyclic dependency in: integrations/test_lightning.py + doCheck = false; + passthru.tests.check = torchmetrics.overridePythonAttrs (_: { + doCheck = true; + }); + + disabledTestPaths = [ + # These require too many "leftpad-level" dependencies + "tests/text" + "tests/audio" + "tests/image" + + # A few non-deterministic things like test_check_compute_groups_is_faster + "tests/bases/test_collections.py" + ]; + + pythonImportsCheck = [ + "torchmetrics" + ]; + + meta = with lib; { + description = "Machine learning metrics for distributed, scalable PyTorch applications (used in pytorch-lightning)"; + homepage = "https://torchmetrics.readthedocs.io"; + license = licenses.asl20; + maintainers = with maintainers; [ + SomeoneSerge + ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a5607542ac6..e96811a0207 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10362,6 +10362,8 @@ in { torchgpipe = callPackage ../development/python-modules/torchgpipe { }; + torchmetrics = callPackage ../development/python-modules/torchmetrics { }; + torchinfo = callPackage ../development/python-modules/torchinfo { }; torchvision = callPackage ../development/python-modules/torchvision { }; From 291a12d9a77cf516afb0749cdb84389d95379e81 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Tue, 10 May 2022 10:35:09 +0300 Subject: [PATCH 071/166] python3Packages.pytorch-lightning: unbreak ...torchmetrics dependency was missing --- .../python-modules/pytorch-lightning/default.nix | 11 +++++++++++ .../python-modules/torchmetrics/default.nix | 2 ++ 2 files changed, 13 insertions(+) diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index d3c9a965515..4e32226fe79 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -3,10 +3,13 @@ , fetchFromGitHub , isPy27 , future +, fsspec +, packaging , pytestCheckHook , pytorch , pyyaml , tensorboard +, torchmetrics , tqdm }: buildPythonPackage rec { @@ -22,11 +25,19 @@ buildPythonPackage rec { sha256 = "sha256-GP6/VZuRv8dS5wKQW7RbtOSa2vV9Af2Jp+ioEW3bIgc="; }; + postPatch = '' + sed -i '/setuptools==/d' requirements.txt + sed -i 's/pyDeprecate==/pyDeprecate>=/' requirements.txt + ''; + propagatedBuildInputs = [ + packaging future + fsspec pytorch pyyaml tensorboard + torchmetrics tqdm ]; diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index fc2f6cf7535..ddccb4d7865 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -10,6 +10,7 @@ , pytorch , pytestCheckHook , torchmetrics +, pytorch-lightning }: let @@ -37,6 +38,7 @@ buildPythonPackage { ]; checkInputs = [ + pytorch-lightning scikit-learn scikitimage cloudpickle From 4c5412135318bbc7411e264ef5302b33d3d2f031 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Thu, 12 May 2022 11:06:54 +0300 Subject: [PATCH 072/166] python3Packages.pytorch-lightning: 1.5.10 -> 1.6.3 --- .../python-modules/pytorch-lightning/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index 4e32226fe79..0b562f4b5a2 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "1.5.10"; + version = "1.6.3"; disabled = isPy27; @@ -22,14 +22,9 @@ buildPythonPackage rec { owner = "PyTorchLightning"; repo = pname; rev = version; - sha256 = "sha256-GP6/VZuRv8dS5wKQW7RbtOSa2vV9Af2Jp+ioEW3bIgc="; + hash = "sha256-MEUFrj84y5lQfwbC9s9fJNOKo+Djeh+E/eDc8KeX7V4="; }; - postPatch = '' - sed -i '/setuptools==/d' requirements.txt - sed -i 's/pyDeprecate==/pyDeprecate>=/' requirements.txt - ''; - propagatedBuildInputs = [ packaging future From 28fe7ec76c5cf0958c86f98eecb18dc90436a029 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Fri, 13 May 2022 10:03:46 -0400 Subject: [PATCH 073/166] python3Packages.fastjsonschema: fix Darwin build Test was failing on hydra build, with this error: ``` ModuleNotFoundError: No module named 'temp.schema_3' tests/test_compile_to_code.py:95: ModuleNotFoundError ``` --- pkgs/development/python-modules/fastjsonschema/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/fastjsonschema/default.nix b/pkgs/development/python-modules/fastjsonschema/default.nix index 23a552a9b4c..f4551b65bd3 100644 --- a/pkgs/development/python-modules/fastjsonschema/default.nix +++ b/pkgs/development/python-modules/fastjsonschema/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , pytestCheckHook @@ -31,6 +32,8 @@ buildPythonPackage rec { # these tests require network access "remote ref" "definitions" + ] ++ lib.optionals stdenv.isDarwin [ + "test_compile_to_code_custom_format" # cannot import temporary module created during test ]; pythonImportsCheck = [ From b7a15b888509889e6d6b1178a81704b5da4e4313 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Fri, 13 May 2022 11:33:20 -0500 Subject: [PATCH 074/166] axoloti: remove --- pkgs/applications/audio/axoloti/default.nix | 101 ------------------- pkgs/applications/audio/axoloti/dfu-util.nix | 31 ------ pkgs/applications/audio/axoloti/libusb1.nix | 39 ------- pkgs/top-level/aliases.nix | 3 + pkgs/top-level/all-packages.nix | 11 -- 5 files changed, 3 insertions(+), 182 deletions(-) delete mode 100644 pkgs/applications/audio/axoloti/default.nix delete mode 100644 pkgs/applications/audio/axoloti/dfu-util.nix delete mode 100644 pkgs/applications/audio/axoloti/libusb1.nix diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix deleted file mode 100644 index df885c90371..00000000000 --- a/pkgs/applications/audio/axoloti/default.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, unzip -, gnumake, gcc-arm-embedded, binutils-arm-embedded -, dfu-util-axoloti, jdk, ant, libfaketime }: - -stdenv.mkDerivation rec { - version = "1.0.12-2"; - pname = "axoloti"; - - src = fetchFromGitHub { - owner = "axoloti"; - repo = "axoloti"; - rev = version; - sha256 = "1qffis277wshldr3i939b0r2x3a2mlr53samxqmr2nk1sfm2b4w9"; - }; - - chibi_version = "2.6.9"; - chibi_name = "ChibiOS_${chibi_version}"; - - chibios = fetchurl { - url = "mirror://sourceforge/project/chibios/ChibiOS_RT%20stable/Version%20${chibi_version}/${chibi_name}.zip"; - sha256 = "0lb5s8pkj80mqhsy47mmq0lqk34s2a2m3xagzihalvabwd0frhlj"; - }; - - nativeBuildInputs = [ - makeWrapper - unzip - gcc-arm-embedded - binutils-arm-embedded - dfu-util-axoloti - ant - ]; - buildInputs = [jdk libfaketime ]; - - patchPhase = '' - unzip ${chibios} - mv ${chibi_name} chibios - (cd chibios/ext; unzip -q -o fatfs-0.9-patched.zip) - - # Remove source of non-determinism in ChibiOS - substituteInPlace "chibios/os/various/shell.c" \ - --replace "#ifdef __DATE__" "#if 0" - - # Hardcode path to "make" - for f in "firmware/compile_firmware_linux.sh" \ - "firmware/compile_patch_linux.sh"; do - substituteInPlace "$f" \ - --replace "make" "${gnumake}/bin/make" - done - - # Hardcode dfu-util path - substituteInPlace "platform_linux/upload_fw_dfu.sh" \ - --replace "/bin/dfu-util" "" - substituteInPlace "platform_linux/upload_fw_dfu.sh" \ - --replace "./dfu-util" "${dfu-util-axoloti}/bin/dfu-util" - - # Fix build version - substituteInPlace "build.xml" \ - --replace "(git missing)" "${version}" - - # Remove build time - substituteInPlace "build.xml" \ - --replace "" "" - substituteInPlace "build.xml" \ - --replace \ - '' \ - '' - substituteInPlace "build.xml" \ - --replace "" "" - substituteInPlace "build.xml" \ - --replace \ - '{line.separator}' \ - '{line.separator} ' - ''; - - buildPhase = '' - find . -exec touch -d '1970-01-01 00:00' {} \; - (cd platform_linux; sh compile_firmware.sh) - faketime "1970-01-01 00:00:00" ant -Dbuild.runtime=true - ''; - - installPhase = '' - mkdir -p $out/bin $out/share/axoloti - - cp -r doc firmware chibios platform_linux CMSIS *.txt $out/share/axoloti/ - install -vD dist/Axoloti.jar $out/share/axoloti/ - - makeWrapper ${jdk}/bin/java $out/bin/axoloti --add-flags "-Daxoloti_release=$out/share/axoloti -Daxoloti_runtime=$out/share/axoloti -jar $out/share/axoloti/Axoloti.jar" - ''; - - meta = with lib; { - homepage = "http://www.axoloti.com"; - description = '' - Sketching embedded digital audio algorithms. - - To fix permissions of the Axoloti USB device node, add a similar udev rule to services.udev.extraRules: - SUBSYSTEM=="usb", ATTR{idVendor}=="16c0", ATTR{idProduct}=="0442", OWNER="someuser", GROUP="somegroup" - ''; - license = licenses.gpl3; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/applications/audio/axoloti/dfu-util.nix b/pkgs/applications/audio/axoloti/dfu-util.nix deleted file mode 100644 index a8a2f8813af..00000000000 --- a/pkgs/applications/audio/axoloti/dfu-util.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libusb1-axoloti }: - -stdenv.mkDerivation rec { - pname = "dfu-util"; - version = "0.8"; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libusb1-axoloti ]; - - src = fetchurl { - url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz"; - sha256 = "0n7h08avlzin04j93m6hkq9id6hxjiiix7ff9gc2n89aw6dxxjsm"; - }; - - meta = with lib; { - description = "Device firmware update (DFU) USB programmer"; - longDescription = '' - dfu-util is a program that implements the host (PC) side of the USB - DFU 1.0 and 1.1 (Universal Serial Bus Device Firmware Upgrade) protocol. - - DFU is intended to download and upload firmware to devices connected over - USB. It ranges from small devices like micro-controller boards up to mobile - phones. With dfu-util you are able to download firmware to your device or - upload firmware from it. - ''; - homepage = "http://dfu-util.sourceforge.net"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/audio/axoloti/libusb1.nix b/pkgs/applications/audio/axoloti/libusb1.nix deleted file mode 100644 index 820a8998f0b..00000000000 --- a/pkgs/applications/audio/axoloti/libusb1.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, lib, fetchurl, pkg-config, systemd, libobjc, IOKit, fetchpatch }: - -stdenv.mkDerivation rec { - pname = "libusb"; - version = "1.0.19"; - - src = fetchurl { - url = "mirror://sourceforge/libusb/libusb-${version}.tar.bz2"; - sha256 = "0h38p9rxfpg9vkrbyb120i1diq57qcln82h5fr7hvy82c20jql3c"; - }; - - outputs = [ "out" "dev" ]; # get rid of propagating systemd closure - - buildInputs = [ pkg-config ]; - propagatedBuildInputs = lib.optional stdenv.isLinux systemd - ++ lib.optionals stdenv.isDarwin [ libobjc IOKit ]; - - patches = [ - (fetchpatch { - name = "libusb.stdfu.patch"; - url = "https://raw.githubusercontent.com/axoloti/axoloti/1.0.12/platform_linux/src/libusb.stdfu.patch"; - sha256 = "194j7j61i4q6x0ihm9ms8dxd4vliw20n2rj6cm9h17qzdl9xr33d"; - }) - ]; - - NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; - - preFixup = lib.optionalString stdenv.isLinux '' - sed 's,-ludev,-L${lib.getLib systemd}/lib -ludev,' -i $out/lib/libusb-1.0.la - ''; - - meta = with lib; { - homepage = "http://www.libusb.info"; - description = "User-space USB library"; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; - license = licenses.lgpl21; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9bd5066863d..d4878bfeb46 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -94,6 +94,7 @@ mapAliases ({ avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18 awesome-4-0 = awesome; # Added 2022-05-05 aws-okta = throw "aws-okta is on indefinite hiatus. See https://github.com/segmentio/aws-okta/issues/278"; # Added 2022-04-05; + axoloti = throw "axoloti has been removed: abandoned by upstream"; # Added 2022-05-13 azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # Added 2021-08-02 ### B ### @@ -315,6 +316,7 @@ mapAliases ({ demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18 desktop_file_utils = throw "'desktop_file_utils' has been renamed to/replaced by 'desktop-file-utils'"; # Converted to throw 2022-02-22 devicemapper = throw "'devicemapper' has been renamed to/replaced by 'lvm2'"; # Converted to throw 2022-02-22 + dfu-util-axoloti = throw "dfu-util-axoloti has been removed: abandoned by upstream"; # Added 2022-05-13 dhall-text = throw "'dhall-text' has been deprecated in favor of the 'dhall text' command from 'dhall'"; # Added 2022-03-26 digikam5 = throw "'digikam5' has been renamed to/replaced by 'digikam'"; # Converted to throw 2022-02-22 disper = throw "disper has been removed: abandoned by upstream"; # Added 2022-03-18 @@ -695,6 +697,7 @@ mapAliases ({ libudev = throw "'libudev' has been renamed to/replaced by 'udev'"; # Converted to throw 2022-02-22 libungif = giflib; # Added 2020-02-12 libusb = libusb1; # Added 2020-04-28 + libusb1-axoloti = throw "libusb1-axoloti has been removed: axoloti has been removed"; # Added 2022-05-13 libva-full = throw "'libva-full' has been renamed to/replaced by 'libva'"; # Converted to throw 2022-02-22 libva1-full = throw "'libva1-full' has been renamed to/replaced by 'libva1'"; # Converted to throw 2022-02-22 libwnck3 = libwnck; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad3b1001f18..35948c740db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2560,17 +2560,6 @@ with pkgs; libssl = openssl; }; - axoloti = callPackage ../applications/audio/axoloti { - gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; - binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - dfu-util-axoloti = callPackage ../applications/audio/axoloti/dfu-util.nix { }; - libusb1-axoloti = callPackage ../applications/audio/axoloti/libusb1.nix { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) IOKit; - }; - b3sum = callPackage ../tools/security/b3sum {}; backblaze-b2 = callPackage ../development/tools/backblaze-b2 { }; From 13d40c02cfb48bd8ee9ab3e3cb642c14e181a9fc Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Thu, 12 May 2022 18:44:04 -0400 Subject: [PATCH 075/166] netperf: 20180613 -> 20210121 Upstream diff is just the license change. --- pkgs/applications/networking/netperf/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix index fe5588d81f8..880ebdd2d4e 100644 --- a/pkgs/applications/networking/netperf/default.nix +++ b/pkgs/applications/networking/netperf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "netperf"; - version = "20180613"; + version = "20210121"; src = fetchFromGitHub { owner = "HewlettPackard"; repo = "netperf"; - rev = "bcb868bde7f0203bbab69609f65d4088ba7398db"; - sha256 = "1wbbgdvhadd3qs3afv6i777argdpcyxkwz4yv6aqp223n8ki6dm8"; + rev = "3bc455b23f901dae377ca0a558e1e32aa56b31c4"; + sha256 = "s4G1ZN+6LERdEMDkc+12ZQgTi6K+ppUYUCGn4faCS9c="; }; buildInputs = lib.optional (with stdenv.hostPlatform; isx86 && isLinux) libsmbios; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Benchmark to measure the performance of many different types of networking"; homepage = "http://www.netperf.org/netperf/"; - license = "Hewlett-Packard BSD-like license"; + license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.mmlb ]; From 7db78758fa6bb3d61012ce6f548ff008641d14e4 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Fri, 13 May 2022 20:07:10 +0300 Subject: [PATCH 076/166] xorg: Mark several drivers as broken on Darwin Several drivers are built for Darwin on Hydra even though they never worked and probably never will work there. Mark them as broken to avoid wasted cycles. --- pkgs/servers/x11/xorg/overrides.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index b583a72c281..3b670f6b64e 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -15,6 +15,10 @@ let malloc0ReturnsNullCrossFlag = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-malloc0returnsnull"; + + brokenOnDarwin = pkg: pkg.overrideAttrs (attrs: { + meta = attrs.meta // { broken = isDarwin; }; + }); in self: super: { @@ -388,14 +392,22 @@ self: super: configureFlags = [ "--with-sdkdir=${placeholder "out"}/include/xorg" ]; + meta = attrs.meta // { + broken = isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86inputmouse.x86_64-darwin + }; }); xf86inputjoystick = super.xf86inputjoystick.overrideAttrs (attrs: { configureFlags = [ "--with-sdkdir=${placeholder "out"}/include/xorg" ]; + meta = attrs.meta // { + broken = isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86inputjoystick.x86_64-darwin + }; }); + xf86inputkeyboard = brokenOnDarwin super.xf86inputkeyboard; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86inputkeyboard.x86_64-darwin + xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; configureFlags = [ @@ -423,6 +435,12 @@ self: super: }; }); + xf86inputvoid = brokenOnDarwin super.xf86inputvoid; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86inputvoid.x86_64-darwin + xf86videodummy = brokenOnDarwin super.xf86videodummy; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videodummy.x86_64-darwin + xf86videosuncg6 = brokenOnDarwin super.xf86videosuncg6; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosuncg6.x86_64-darwin + xf86videosunffb = brokenOnDarwin super.xf86videosunffb; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunffb.x86_64-darwin + xf86videosunleo = brokenOnDarwin super.xf86videosunleo; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunleo.x86_64-darwin + # Obsolete drivers that don't compile anymore. xf86videoark = super.xf86videoark.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); xf86videogeode = super.xf86videogeode.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); From c83cee0d4d5f4c5fdc279040ab0ce3a73bbc7715 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Fri, 13 May 2022 12:18:06 -0500 Subject: [PATCH 077/166] bibletime: fix --- pkgs/applications/misc/bibletime/default.nix | 46 ++++++++++++++------ 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index 17617223620..f55b6ef7914 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -1,29 +1,49 @@ -{ lib, mkDerivation, fetchurl, cmake, pkg-config, sword, boost, clucene_core -, qtbase, qttools, qtsvg, perlPackages, docbook_xml_dtd_45 -, docbook_xsl_ns }: +{ lib, mkDerivation +, fetchFromGitHub +, cmake +, docbook_xml_dtd_45 +, pkg-config +, wrapQtAppsHook +, boost +, clucene_core_2 +, docbook_xsl_ns +, perlPackages +, qtbase +, qtsvg +, qttools +, sword +}: mkDerivation rec { pname = "bibletime"; version = "3.0.2"; - src = fetchurl { - url = "https://github.com/bibletime/bibletime/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-/JNjnU/DGD4YRtrKzX7t6MgNCZYihdgTJc+Jbr9IYJ4="; + src = fetchFromGitHub { + owner = "bibletime"; + repo = "bibletime"; + rev = "v${version}"; + hash = "sha256-8X5LkquALFnG0yRayZYjeymHDcOzINBv0MXeVBsOnfI="; }; - nativeBuildInputs = [ cmake pkg-config docbook_xml_dtd_45 ]; + nativeBuildInputs = [ + cmake + docbook_xml_dtd_45 + pkg-config + wrapQtAppsHook + ]; + buildInputs = [ - sword boost - clucene_core + clucene_core_2 + perlPackages.Po4a qtbase - qttools qtsvg - perlPackages.Po4a + qttools + sword ]; preConfigure = '' - export CLUCENE_HOME=${clucene_core}; + export CLUCENE_HOME=${clucene_core_2}; export SWORD_HOME=${sword}; ''; @@ -35,7 +55,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A Qt4 Bible study tool"; + description = "A powerful cross platform Bible study tool"; homepage = "http://www.bibletime.info/"; platforms = platforms.linux; license = licenses.gpl2Plus; From c8644338cfc63059044ac9a4939afed587dd45e1 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Fri, 13 May 2022 12:35:03 -0500 Subject: [PATCH 078/166] blackmagic: unstable-2020-08-05 -> unstable-2022-04-16 --- .../embedded/blackmagic/default.nix | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/pkgs/development/embedded/blackmagic/default.nix b/pkgs/development/embedded/blackmagic/default.nix index f3b3b0b2d04..abb5e19f8bf 100644 --- a/pkgs/development/embedded/blackmagic/default.nix +++ b/pkgs/development/embedded/blackmagic/default.nix @@ -1,40 +1,37 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch -, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkg-config +{ stdenv, lib +, fetchFromGitHub +, gcc-arm-embedded +, pkg-config , python3 +, hidapi +, libftdi1 +, libusb1 }: -with lib; - stdenv.mkDerivation rec { pname = "blackmagic"; - version = "unstable-2020-08-05"; + version = "unstable-2022-04-16"; # `git describe --always` - firmwareVersion = "v1.6.1-539-gdd74ec8"; + firmwareVersion = "v1.7.1-415-gc4869a5"; src = fetchFromGitHub { owner = "blacksphere"; repo = "blackmagic"; - rev = "dd74ec8e6f734302daa1ee361af88dfb5043f166"; - sha256 = "18w8y64fs7wfdypa4vm3migk5w095z8nbd8qp795f322mf2bz281"; + rev = "c4869a54733ae92099a7316954e34d1ab7b6097c"; + hash = "sha256-0MC1v/5u/txSshxkOI5TErMRRrYCcHly3qbVTAk9Vc0="; fetchSubmodules = true; }; - patches = [ - # Fix deprecation warning with libftdi 1.5 - (fetchpatch { - url = "https://github.com/blacksphere/blackmagic/commit/dea4be2539c5ea63836ec78dca08b52fa8b26ab5.patch"; - sha256 = "0f81simij1wdhifsxaavalc6yxzagfbgwry969dbjmxqzvrsrds5"; - }) - ]; - nativeBuildInputs = [ - gcc-arm-embedded pkg-config + gcc-arm-embedded + pkg-config python3 ]; buildInputs = [ + hidapi libftdi1 - libusb-compat-0_1 + libusb1 ]; strictDeps = true; @@ -50,12 +47,17 @@ stdenv.mkDerivation rec { done ''; - buildPhase = "${stdenv.shell} ${./helper.sh}"; + buildPhase = '' + runHook preBuild + ${stdenv.shell} ${./helper.sh} + runHook postBuild + ''; + dontInstall = true; enableParallelBuilding = true; - meta = { + meta = with lib; { description = "In-application debugger for ARM Cortex microcontrollers"; longDescription = '' The Black Magic Probe is a modern, in-application debugging tool From 8399907be3c008b6e12863364d6f7848f52034b1 Mon Sep 17 00:00:00 2001 From: Karl Hallsby Date: Fri, 13 May 2022 10:33:14 -0500 Subject: [PATCH 079/166] octave: add patch for octave incorrectly failing on package builds Patch comes from https://savannah.gnu.org/bugs/?func=detailitem&item_id=62436 --- .../interpreters/octave/default.nix | 5 ++++ .../octave/patches/bug62436.patch | 27 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/interpreters/octave/patches/bug62436.patch diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 2fcdab95509..ab2b6af9d5f 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -119,6 +119,11 @@ let sha256 = "sha256-1KnYHz9ntKbgfLeoDcsQrV6RdvzDB2LHCoFYCmS4sLY="; }; + patches = [ + # https://savannah.gnu.org/bugs/?func=detailitem&item_id=62436 + ./patches/bug62436.patch + ]; + buildInputs = [ readline ncurses diff --git a/pkgs/development/interpreters/octave/patches/bug62436.patch b/pkgs/development/interpreters/octave/patches/bug62436.patch new file mode 100644 index 00000000000..d9d7cfc3040 --- /dev/null +++ b/pkgs/development/interpreters/octave/patches/bug62436.patch @@ -0,0 +1,27 @@ +# HG changeset patch +# User John Donoghue +# Date 1652358904 14400 +# Thu May 12 08:35:04 2022 -0400 +# Branch stable +# Node ID 8c940cfcce257369677c09154da2aab2c56eaa79 +# Parent 63710f3bd9811c2d206ac9e7b4f47cf06c47e153 +* scripts/pkg/private/build.m: check configure and Makefile exist before trying to unlink them (Bug #62436) + +diff -r 63710f3bd981 -r 8c940cfcce25 scripts/pkg/private/build.m +--- a/scripts/pkg/private/build.m Wed May 11 09:44:55 2022 -0700 ++++ b/scripts/pkg/private/build.m Thu May 12 08:35:04 2022 -0400 +@@ -77,8 +77,12 @@ + else + arch_abi = getarch (); + configure_make (desc, build_root, verbose); +- unlink (fullfile (build_root, "src", "configure")); +- unlink (fullfile (build_root, "src", "Makefile")); ++ if exist (fullfile (build_root, "src", "configure"), "file") ++ unlink (fullfile (build_root, "src", "configure")); ++ endif ++ if exist (fullfile (build_root, "src", "Makefile"), "file") ++ unlink (fullfile (build_root, "src", "Makefile")); ++ endif + endif + tar_name = [desc.name "-" desc.version "-" arch_abi ".tar"]; + tar_path = fullfile (builddir, tar_name); From 128644de072fd63470da19d417e759819bcf59c5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 13 May 2022 20:09:47 +0200 Subject: [PATCH 080/166] grafana: 8.5.1 -> 8.5.2 ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.5.2 --- pkgs/servers/monitoring/grafana/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 652f203460b..c8cde641723 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,8 +1,8 @@ -{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }: +{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire, fetchpatch }: buildGoModule rec { pname = "grafana"; - version = "8.5.1"; + version = "8.5.2"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" ]; @@ -10,14 +10,22 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-GwvJA+lcbUuVbzniDW6gYbxQO5uXSP6rjzgmcJ5YYxk="; + sha256 = "sha256-9m6fu+wwmKpw/ehAIfgLe5YzOqTP3BC6/9mUgLL9XS0="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "030zl5k8b4hcay06a2lvlmq8swbix88ii4gz9yd4kywcjy5vhnyf"; + sha256 = "1gq0wyqpgc7crbz8cd4dnwixhx7chnmbl2di4zcqs26g8y30q7rj"; }; + patches = [ + # skip a flaky test, remove on the next update + (fetchpatch { + url = "https://github.com/grafana/grafana/commit/9e3a01a1bea3f4d5d99e53d55128d79160610349.patch"; + sha256 = "sha256-rzZxNLn074JBb4DW3QC1zWNGe1uLGIlXvnjh60e8B3Q="; + }) + ]; + vendorSha256 = "sha256-ZL+A6Sz0uHg7ZzYHmA4EU5ZxfRXBLyKglk135iQT600="; nativeBuildInputs = [ wire ]; From b999c1f8a05397b7b03a72f3c06518c02fdda6cf Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 13 May 2022 13:13:44 -0500 Subject: [PATCH 081/166] twtxt: disable test_tweet_relative_datetime --- pkgs/applications/networking/twtxt/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/networking/twtxt/default.nix b/pkgs/applications/networking/twtxt/default.nix index 27420f8bd33..792c13aa23f 100644 --- a/pkgs/applications/networking/twtxt/default.nix +++ b/pkgs/applications/networking/twtxt/default.nix @@ -23,6 +23,11 @@ buildPythonApplication rec { checkInputs = [ pytestCheckHook tox ]; + disabledTests = [ + # Disable test using relative date and time + "test_tweet_relative_datetime" + ]; + meta = with lib; { description = "Decentralised, minimalist microblogging service for hackers"; homepage = "https://github.com/buckket/twtxt"; From ea9188a98957259a4c9252e17c31b58d0e44686f Mon Sep 17 00:00:00 2001 From: midchildan Date: Sat, 14 May 2022 02:20:54 +0900 Subject: [PATCH 082/166] trafficserver: 9.1.1 -> 9.1.2 --- pkgs/servers/http/trafficserver/default.nix | 13 +++--- .../fix-catch2-version-incompatibility.patch | 43 +++++++++++++++++++ 2 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 pkgs/servers/http/trafficserver/fix-catch2-version-incompatibility.patch diff --git a/pkgs/servers/http/trafficserver/default.nix b/pkgs/servers/http/trafficserver/default.nix index 06d640a5bc0..083d165d5ba 100644 --- a/pkgs/servers/http/trafficserver/default.nix +++ b/pkgs/servers/http/trafficserver/default.nix @@ -50,11 +50,11 @@ stdenv.mkDerivation rec { pname = "trafficserver"; - version = "9.1.1"; + version = "9.1.2"; src = fetchzip { url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2"; - sha256 = "sha256-oicRqKFE6hOpcNG9o3BmrMujtEzi4hrPhBWaljOW+VI="; + sha256 = "sha256-eRpyTdwwO5EzrVpt9fF6VEYGZjHb905nQJd065wY5RU="; }; patches = [ @@ -65,12 +65,7 @@ stdenv.mkDerivation rec { sha256 = "0z1ikgpp00rzrrcqh97931586yn9wbksgai9xlkcjd5cg8gq0150"; }) - # Fix build against ncurses-6.3: - # https://github.com/apache/trafficserver/pull/8437 - (fetchpatch { - url = "https://github.com/apache/trafficserver/commit/66c86c6b082903a92b9db33c60e3ed947e77d540.patch"; - sha256 = "1hgpp80xnnjr4k5i6gcllrb7dw4q4xcdrkwxpc1xk2np5cbyxd16"; - }) + ./fix-catch2-version-incompatibility.patch ]; # NOTE: The upstream README indicates that flex is needed for some features, @@ -115,6 +110,8 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace '/usr/bin/file' '${file}/bin/file' + # TODO: remove after the following change has been released + # https://github.com/apache/trafficserver/pull/8683 cp ${catch2}/include/catch2/catch.hpp tests/include/catch.hpp '' + lib.optionalString stdenv.isLinux '' substituteInPlace configure \ diff --git a/pkgs/servers/http/trafficserver/fix-catch2-version-incompatibility.patch b/pkgs/servers/http/trafficserver/fix-catch2-version-incompatibility.patch new file mode 100644 index 00000000000..248f9d4ef31 --- /dev/null +++ b/pkgs/servers/http/trafficserver/fix-catch2-version-incompatibility.patch @@ -0,0 +1,43 @@ +diff --git a/src/tscore/unit_tests/test_History.cc b/src/tscore/unit_tests/test_History.cc +index 3e699139da0..7505f10aa4c 100644 +--- a/src/tscore/unit_tests/test_History.cc ++++ b/src/tscore/unit_tests/test_History.cc +@@ -59,10 +59,10 @@ TEST_CASE("History", "[libts][History]") + REQUIRE(history[2].reentrancy == static_cast(NO_REENTRANT)); + + history[0].location.str(buf, sizeof(buf)); +- REQUIRE(string_view{buf} == "test_History.cc:48 (____C_A_T_C_H____T_E_S_T____0)"); ++ REQUIRE(string_view{buf} == "test_History.cc:48 (C_A_T_C_H_T_E_S_T_0)"); + + history[1].location.str(buf, sizeof(buf)); +- REQUIRE(string_view{buf} == "test_History.cc:49 (____C_A_T_C_H____T_E_S_T____0)"); ++ REQUIRE(string_view{buf} == "test_History.cc:49 (C_A_T_C_H_T_E_S_T_0)"); + + ts::LocalBufferWriter<128> w; + SM *sm = new SM; +@@ -71,10 +71,10 @@ TEST_CASE("History", "[libts][History]") + SM_REMEMBER(sm, 3, NO_REENTRANT); + + w.print("{}", sm->history[0].location); +- REQUIRE(w.view() == "test_History.cc:69 (____C_A_T_C_H____T_E_S_T____0)"); ++ REQUIRE(w.view() == "test_History.cc:69 (C_A_T_C_H_T_E_S_T_0)"); + + w.reset().print("{}", sm->history[1].location); +- REQUIRE(w.view() == "test_History.cc:70 (____C_A_T_C_H____T_E_S_T____0)"); ++ REQUIRE(w.view() == "test_History.cc:70 (C_A_T_C_H_T_E_S_T_0)"); + + REQUIRE(sm->history[0].event == 1); + REQUIRE(sm->history[0].reentrancy == 1); +@@ -106,10 +106,10 @@ TEST_CASE("History", "[libts][History]") + REQUIRE(sm2->history.overflowed() == true); + + w.reset().print("{}", sm2->history[0].location); +- REQUIRE(w.view() == "test_History.cc:103 (____C_A_T_C_H____T_E_S_T____0)"); ++ REQUIRE(w.view() == "test_History.cc:103 (C_A_T_C_H_T_E_S_T_0)"); + + w.reset().print("{}", sm2->history[1].location); +- REQUIRE(w.view() == "test_History.cc:98 (____C_A_T_C_H____T_E_S_T____0)"); ++ REQUIRE(w.view() == "test_History.cc:98 (C_A_T_C_H_T_E_S_T_0)"); + + sm2->history.clear(); + REQUIRE(sm2->history.size() == 0); From dbe426b7a977b106bada4597dc84954f61bc80f9 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Fri, 13 May 2022 13:23:56 -0500 Subject: [PATCH 083/166] bonnie: fix --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad3b1001f18..8989f25c5b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1996,7 +1996,9 @@ with pkgs; bonnmotion = callPackage ../development/tools/misc/bonnmotion { }; - bonnie = callPackage ../tools/filesystems/bonnie { }; + bonnie = callPackage ../tools/filesystems/bonnie { + stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + }; botamusique = callPackage ../tools/audio/botamusique { }; From ed0c3a7497126b47395869429fdb2eaae6c49dd0 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Fri, 13 May 2022 13:30:00 -0500 Subject: [PATCH 084/166] boolstuff: 0.1.16 -> 0.1.17 --- pkgs/development/libraries/boolstuff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix index b49355f60e9..c54cffb5285 100644 --- a/pkgs/development/libraries/boolstuff/default.nix +++ b/pkgs/development/libraries/boolstuff/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, pkg-config }: stdenv.mkDerivation rec { pname = "boolstuff"; - version = "0.1.16"; + version = "0.1.17"; src = fetchurl { - url = "https://perso.b2b2c.ca/~sarrazip/dev/${pname}-${version}.tar.gz"; - sha256 = "10qynbyw723gz2vrvn4xk2var172kvhlz3l3l80qbdsfb3d12wn0"; + url = "http://perso.b2b2c.ca/~sarrazip/dev/${pname}-${version}.tar.gz"; + hash = "sha256-WPFUoTUofigPxTRo6vUbVTEVWMeEPDWszCA05toOX0I="; }; nativeBuildInputs = [ pkg-config ]; From 46a14c6a370f36c395261c59af356976145482b3 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 13 May 2022 20:30:37 +0200 Subject: [PATCH 085/166] chromiumBeta: 102.0.5005.40 -> 102.0.5005.49 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index f73f171b750..888f45abb0c 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "102.0.5005.40", - "sha256": "1max5ndvl59j2hlv9k88dmadr4q05q1clzlc6zba0gcbvqx5q9jb", - "sha256bin64": "1byqx9w0hqwk3vizdas3dylbm69108bnq4xlm0mp1p1gh37h1642", + "version": "102.0.5005.49", + "sha256": "16r9mrsagy8lspr4pcrzfpw0vw0ym9m7n41a9yipjhm2arlhw5b2", + "sha256bin64": "0lyk6rd9c1gyvxsmq1bl7asr7carzyaan306ddvwxsy5rfh53jxa", "deps": { "gn": { "version": "2022-04-14", From e1fb27152d5d107f54dedc616ee4adbd6e7ae890 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 13 May 2022 20:30:37 +0200 Subject: [PATCH 086/166] chromiumDev: 103.0.5042.0 -> 103.0.5056.0 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index f73f171b750..6ec39aa0888 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,15 +32,15 @@ } }, "dev": { - "version": "103.0.5042.0", - "sha256": "0wm8m1mff8gb0x7whif16gvmhibgc8ndygnawkwq3g4fvninb65h", - "sha256bin64": "0vzmpi36a86kgxhdxvbqbn7i1wf2annar1mi15gra1cjpz3lf9kh", + "version": "103.0.5056.0", + "sha256": "1mvi7yc38cxn39wqm8ybrn862gaw293rb6lwcszc6rmzwd9jmd29", + "sha256bin64": "06371adaz8llzfjykc72vjvpy3xrgvqzz9kdrr82jdx1pjdbv29d", "deps": { "gn": { - "version": "2022-05-02", + "version": "2022-05-09", "url": "https://gn.googlesource.com/gn", - "rev": "53ef169800760fdc09f0773bf380fe99eaeab339", - "sha256": "08i7qc4qvf8gb3vryajvww75wk653fybf1bb2k40r8i07znhy78r" + "rev": "bf4e17dc67b2a2007475415e3f9e1d1cf32f6e35", + "sha256": "0d2lb4alsx32zsdw3jxpxbzal350mim237p2y984h4r6fd1ddzyi" } } }, From d304bc8612a76b2a2e58ee8a5c31c8ae3bf30767 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Fri, 13 May 2022 14:03:56 -0500 Subject: [PATCH 087/166] btcdeb: 200806 -> unstable-2022-04-03 --- pkgs/applications/blockchains/btcdeb/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/blockchains/btcdeb/default.nix b/pkgs/applications/blockchains/btcdeb/default.nix index 7f4e438173b..4f8a08333a8 100644 --- a/pkgs/applications/blockchains/btcdeb/default.nix +++ b/pkgs/applications/blockchains/btcdeb/default.nix @@ -7,14 +7,14 @@ with lib; stdenv.mkDerivation rec { - pname = "btcdeb-unstable"; - version = "200806"; + pname = "btcdeb"; + version = "unstable-2022-04-03"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "btcdeb"; - rev = "f6708c397c64894c9f9e31bea2d22285d9462de7"; - sha256 = "0qkmf89z2n7s95vhw3n9vh9dbi14zy4vqw3ffdh1w911jwm5ry3z"; + rev = "3ba1ec7f4d37f7d2ff0544403465004c6e12036e"; + hash = "sha256-l/PGXXX288mnoSFZ32t2Xd13dC6JCU5wDHoDxb+fcp0="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Bitcoin Script Debugger"; - homepage = "https://github.com/kallewoof/btcdeb"; + homepage = "https://github.com/bitcoin-core/btcdeb"; license = licenses.mit; maintainers = with maintainers; [ akru ]; platforms = platforms.unix; From 4b28e6bcbcd792e60799759ef1a3cac354f6b5e1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 12 May 2022 14:10:11 +0000 Subject: [PATCH 088/166] virtiofsd: 1.1.0 -> 1.2.0 --- pkgs/servers/misc/virtiofsd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/misc/virtiofsd/default.nix b/pkgs/servers/misc/virtiofsd/default.nix index d8ae7ca61d9..2af8752a8fb 100644 --- a/pkgs/servers/misc/virtiofsd/default.nix +++ b/pkgs/servers/misc/virtiofsd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "virtiofsd"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitLab { owner = "virtio-fs"; repo = "virtiofsd"; rev = "v${version}"; - sha256 = "sha256-WB0zu2M/5enBOoOUUSXnNAkbsA+JzDgtoLncE1YcDLs="; + sha256 = "161z88nx2x2j4q8fbxryv7v63f9aw7wpvl6vg6x4xzllnrw6p607"; }; - cargoSha256 = "sha256-uRPmZE/xc0yeurBZ4rnrZua5d4lbPwStMUacFgbquuk="; + cargoSha256 = "0ma3kaaa4bl11015gxijwzyxhixz947k8byaypmmw0dj9m1vhv77"; buildInputs = [ libcap_ng libseccomp ]; From 3ab458c39af4f52ec08e7b64183ac41691983301 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 12 May 2022 16:04:30 +0000 Subject: [PATCH 089/166] virtiofsd: fix static --- pkgs/servers/misc/virtiofsd/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/misc/virtiofsd/default.nix b/pkgs/servers/misc/virtiofsd/default.nix index 2af8752a8fb..0c60281b0d7 100644 --- a/pkgs/servers/misc/virtiofsd/default.nix +++ b/pkgs/servers/misc/virtiofsd/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitLab, libcap_ng, libseccomp }: +{ lib, stdenv, rustPlatform, fetchFromGitLab, libcap_ng, libseccomp }: rustPlatform.buildRustPackage rec { pname = "virtiofsd"; @@ -13,6 +13,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0ma3kaaa4bl11015gxijwzyxhixz947k8byaypmmw0dj9m1vhv77"; + LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib"; + LIBCAPNG_LINK_TYPE = + if stdenv.hostPlatform.isStatic then "static" else "dylib"; + buildInputs = [ libcap_ng libseccomp ]; meta = with lib; { From 4054681f96458525444bdabac650991289ea9779 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 13 May 2022 20:17:58 +0100 Subject: [PATCH 090/166] dirmngr: remove dirmngr was merged into gnupg long ago. nixpkgs does not use it as a dependency anywhere. On top of that it fails to build on upstream gcc-10 as: ld: validate.o:/build/dirmngr-1.1.1/src/dirmngr.h:123: multiple definition of `opt'; dirmngr.o:/build/dirmngr-1.1.1/src/dirmngr.h:123: first defined here Let's remove the package. --- pkgs/tools/security/dirmngr/default.nix | 18 ------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 pkgs/tools/security/dirmngr/default.nix diff --git a/pkgs/tools/security/dirmngr/default.nix b/pkgs/tools/security/dirmngr/default.nix deleted file mode 100644 index b7aeed2ace1..00000000000 --- a/pkgs/tools/security/dirmngr/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, stdenv, fetchurl, libgpg-error, libgcrypt, libassuan, libksba, pth, openldap -, libiconv}: - -stdenv.mkDerivation rec { - pname = "dirmngr"; - version = "1.1.1"; - src = fetchurl { - url = "mirror://gnupg/dirmngr/dirmngr-${version}.tar.bz2"; - sha256 = "1zz6m87ca55nq5f59hzm6qs48d37h93il881y7d0rf2d6660na6j"; - }; - buildInputs = [ libgpg-error libgcrypt libassuan libksba - pth openldap libiconv ]; - - meta = { - platforms = lib.platforms.unix; - license = lib.licenses.gpl2Plus; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9bd5066863d..18db345b258 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -317,6 +317,7 @@ mapAliases ({ devicemapper = throw "'devicemapper' has been renamed to/replaced by 'lvm2'"; # Converted to throw 2022-02-22 dhall-text = throw "'dhall-text' has been deprecated in favor of the 'dhall text' command from 'dhall'"; # Added 2022-03-26 digikam5 = throw "'digikam5' has been renamed to/replaced by 'digikam'"; # Converted to throw 2022-02-22 + dirmngr = throw "dirmngr has been removed: merged into gnupg"; # Added 2022-05-13 disper = throw "disper has been removed: abandoned by upstream"; # Added 2022-03-18 displaycal = throw "displaycal has been removed from nixpkgs, as it hasn't migrated to python3"; # Added 2022-01-12 dmtx = throw "'dmtx' has been renamed to/replaced by 'dmtx-utils'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 142c98c5d93..8f6c76e1d55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5210,8 +5210,6 @@ with pkgs; wgetpaste = callPackage ../tools/text/wgetpaste { }; - dirmngr = callPackage ../tools/security/dirmngr { }; - dismap = callPackage ../tools/security/dismap { }; dirvish = callPackage ../tools/backup/dirvish { }; From 5205b3a91fdceaf664d495eb281997052d06e309 Mon Sep 17 00:00:00 2001 From: "Berk D. Demir" Date: Fri, 13 May 2022 12:22:42 -0700 Subject: [PATCH 091/166] restic-rest-server: remove vars from patch url addresses feedback from #172817. style only. no functional changes. --- pkgs/tools/backup/restic/rest-server.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/backup/restic/rest-server.nix b/pkgs/tools/backup/restic/rest-server.nix index 6296103c1c2..0e9a72381ba 100644 --- a/pkgs/tools/backup/restic/rest-server.nix +++ b/pkgs/tools/backup/restic/rest-server.nix @@ -3,11 +3,10 @@ buildGoModule rec { pname = "restic-rest-server"; version = "0.11.0"; - owner = "restic"; - repo = "rest-server"; src = fetchFromGitHub { - inherit owner repo; + owner = "restic"; + repo = "rest-server"; rev = "v${version}"; hash = "sha256-ninPODztNzvB2js9cuNAuExQLK/OGOu80ZNW0BPrdds="; }; @@ -17,7 +16,7 @@ buildGoModule rec { patches = [ (fetchpatch { name = "backport_rest-server_tests_os.TempDir.patch"; - url = "https://github.com/${owner}/${repo}/commit/a87a50ad114bdaddc895413396438df6ea0affbb.patch"; + url = "https://github.com/restic/rest-server/commit/a87a50ad114bdaddc895413396438df6ea0affbb.patch"; sha256 = "sha256-O6ENxTK2fCVTZZKTFHrvZ+3dT8TbgbIE0o3sYE/RUqc="; }) From 712ded5f7ad69f8c02772d3f5fd96e7de7f5c8fd Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Fri, 13 May 2022 14:33:17 -0500 Subject: [PATCH 092/166] cdogs-sdl: fix --- pkgs/games/cdogs-sdl/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/games/cdogs-sdl/default.nix b/pkgs/games/cdogs-sdl/default.nix index 2b072a44752..474fd735f73 100644 --- a/pkgs/games/cdogs-sdl/default.nix +++ b/pkgs/games/cdogs-sdl/default.nix @@ -26,7 +26,10 @@ stdenv.mkDerivation rec { patchShebangs src/proto/nanopb/generator/* ''; - cmakeFlags = [ "-DCDOGS_DATA_DIR=${placeholder "out"}/" ]; + cmakeFlags = [ + "-DCDOGS_DATA_DIR=${placeholder "out"}/" + "-DCMAKE_C_FLAGS=-Wno-error=array-bounds" + ]; nativeBuildInputs = [ pkg-config From bf3a80753a1adbfb88088cf9a764fd4136332cff Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Fri, 13 May 2022 14:58:23 -0500 Subject: [PATCH 093/166] clfft: fix --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3226537e8b..3007301097c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16827,7 +16827,9 @@ with pkgs; classads = callPackage ../development/libraries/classads { }; - clfft = callPackage ../development/libraries/clfft { }; + clfft = callPackage ../development/libraries/clfft { + stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + }; clipp = callPackage ../development/libraries/clipp { }; From e7721a34179edb6a424a6464ff66e8ddf334c7ca Mon Sep 17 00:00:00 2001 From: Niklas <44636701+MayNiklas@users.noreply.github.com> Date: Fri, 13 May 2022 22:20:55 +0200 Subject: [PATCH 094/166] rpiboot: add aarch64-darwin and x86_64-darwin to the list of supported platforms --- pkgs/development/misc/rpiboot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/misc/rpiboot/default.nix b/pkgs/development/misc/rpiboot/default.nix index 941c7ce904e..35fb41d0a8d 100644 --- a/pkgs/development/misc/rpiboot/default.nix +++ b/pkgs/development/misc/rpiboot/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { description = "Utility to boot a Raspberry Pi CM/CM3/CM4/Zero over USB"; license = licenses.asl20; maintainers = with maintainers; [ cartr ]; - platforms = [ "aarch64-linux" "armv7l-linux" "armv6l-linux" "x86_64-linux" ]; + platforms = [ "aarch64-linux" "aarch64-darwin" "armv7l-linux" "armv6l-linux" "x86_64-linux" "x86_64-darwin" ]; }; } From ff22bc1ff6f899d131e6ad1d1545dfb53c5de620 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 13 May 2022 21:28:46 +0100 Subject: [PATCH 095/166] chemtool: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: inout.o:/build/chemtool-1.6.14/ct1.h:279: multiple definition of `outtype'; draw.o:/build/chemtool-1.6.14/ct1.h:279: first defined here --- pkgs/applications/science/chemistry/chemtool/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/science/chemistry/chemtool/default.nix b/pkgs/applications/science/chemistry/chemtool/default.nix index bf78aeb825d..37057e1c604 100644 --- a/pkgs/applications/science/chemistry/chemtool/default.nix +++ b/pkgs/applications/science/chemistry/chemtool/default.nix @@ -24,6 +24,12 @@ stdenv.mkDerivation rec { fig2dev ]; + # Workaround build on -fno-common toolchains like upstream gcc-10. + # Otherwise built fails as: + # ld: inout.o:/build/chemtool-1.6.14/ct1.h:279: multiple definition of + # `outtype'; draw.o:/build/chemtool-1.6.14/ct1.h:279: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + preFixup = '' gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ fig2dev ]}") ''; From 38e27b009d99d2e6fb2a0a422539e93ab73d197a Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 13 May 2022 15:28:30 -0500 Subject: [PATCH 096/166] cln: fix build on darwin See https://github.com/NixOS/nixpkgs/pull/162265#issuecomment-1100467765 --- pkgs/development/libraries/cln/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix index 23bbd84a209..e630cb4dda6 100644 --- a/pkgs/development/libraries/cln/default.nix +++ b/pkgs/development/libraries/cln/default.nix @@ -1,10 +1,14 @@ -{ lib, stdenv, fetchurl, gmp }: +{ lib, stdenv, fetchurl, fetchgit, gmp }: stdenv.mkDerivation rec { pname = "cln"; version = "1.3.6"; - src = fetchurl { + src = if stdenv.isDarwin then fetchgit { + url = "git://www.ginac.de/cln.git"; + rev = "cln_${builtins.replaceStrings [ "." ] [ "-" ] version}"; + sha256 = "sha256-P32F4TIDhE2Dwzydq8iFK6ch3kICJcXeeXHs5PBQG88="; + } else fetchurl { url = "${meta.homepage}${pname}-${version}.tar.bz2"; sha256 = "0jlq9l4hphk7qqlgqj9ihjp4m3rwjbhk6q4v00lsbgbri07574pl"; }; From f721daad250d50a2a744925eed140e10447486db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 13 May 2022 20:11:28 +0200 Subject: [PATCH 097/166] delta: 0.12.1 -> 0.13.0 --- .../version-management/git-and-tools/delta/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index c1f2c281c7a..92914f45496 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "sha256-khW+Ri+MZytMZcd2tRXhc/D6kOOhk+LP6MsS+GijjQM="; + sha256 = "sha256-5h4epV3RORZiynW1fkFLImqPunC3PZ/YzLiSrzescww="; }; - cargoSha256 = "sha256-SD1y+l86wqlJUUaG4ae4PXXSMS+4CPth3F4pLYbXMVc="; + cargoSha256 = "sha256-4dPTcrT8Gx3WfT0sauqnCSmcGE9LrgIqgHrY5l503ZA="; nativeBuildInputs = [ installShellFiles ]; From 4b82f3bccda083a6566377c3f33bf05fd5aa5b2b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 14 May 2022 07:11:28 +1000 Subject: [PATCH 098/166] talosctl: 1.0.4 -> 1.0.5 https://github.com/siderolabs/talos/releases/tag/v1.0.5 --- .../networking/cluster/talosctl/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 7eb4f43e479..8476fc810ba 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles }: let # look for GO_LDFLAGS getting set in the Makefile - version = "1.0.4"; - sha256 = "sha256-kO48MRQDQGDUvFfsxAt+CAHn2EGU44NMpSKDWnNwAdk="; - vendorSha256 = "sha256-QcD5MKQO51ZZ/NvVIiAmDsN6wLI2N8YkhA387KB77W8="; - pkgsVersion = "v1.0.0-10-gbf81bd2"; - extrasVersion = "v1.0.0-2-gc5d3ab0"; + version = "1.0.5"; + sha256 = "sha256-xgzIbhgV1AAUa0tooYtzUMqK4Co3PvWQ0YbZuf0JgFE="; + vendorSha256 = "sha256-Gp30qCGV+EaJ1lvfleZHRWVL6rdSj0mvpumWsqr9IT0="; + pkgsVersion = "v1.0.0-17-g7567bf4"; + extrasVersion = "v1.0.0-3-g6327c36"; in buildGoModule rec { pname = "talosctl"; From 6eb4f210a5b7871329f4dda239110fb840fbb1d6 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 13 May 2022 16:08:25 +0200 Subject: [PATCH 099/166] http-parser: fix i686 build --- pkgs/development/libraries/http-parser/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index aff5b1ea3c1..146262a4258 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error"; patches = [ ./build-shared.patch + ] ++ lib.optionals stdenv.isAarch32 [ # https://github.com/nodejs/http-parser/pull/510 (fetchpatch { url = "https://github.com/nodejs/http-parser/commit/4f15b7d510dc7c6361a26a7c6d2f7c3a17f8d878.patch"; From db872e62b3fcaa63654476fa4280d9f2a865e233 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sat, 14 May 2022 00:58:30 +0300 Subject: [PATCH 100/166] sile: Note exta dependencies when built with older Luas --- pkgs/tools/typesetting/sile/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 4bff8ab3ae3..32374149190 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -18,7 +18,6 @@ let luaEnv = lua.withPackages(ps: with ps; [ cassowary cosmo - compat53 linenoise lpeg lua-zlib @@ -33,6 +32,10 @@ let penlight stdlib vstruct + ] ++ lib.optionals (lib.versionOlder lua.luaversion "5.2") [ + bit32 + ] ++ lib.optionals (lib.versionOlder lua.luaversion "5.3") [ + compat53 ]); in From d912addd5ab0c365e3dc7dcfc7dae6a6881eea57 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Fri, 13 May 2022 17:18:09 -0500 Subject: [PATCH 101/166] alliance: unstable-2021-09-15 -> unstable-2022-01-13 --- pkgs/applications/science/electronics/alliance/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/applications/science/electronics/alliance/default.nix index cf135b9469a..f4333be8475 100644 --- a/pkgs/applications/science/electronics/alliance/default.nix +++ b/pkgs/applications/science/electronics/alliance/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "alliance"; - version = "unstable-2021-09-15"; + version = "unstable-2022-01-13"; src = fetchFromGitLab { domain = "gitlab.lip6.fr"; owner = "vlsi-eda"; repo = "alliance"; - rev = "5e83c92d0307cce9d599f7099fb0023f81d26d65"; - sha256 = "Vd3MTT4eKn4FMt0/F4fQUPcWq25kH0FpeGxQUOetKPY="; + rev = "ebece102e15c110fc79f1da50524c68fd9523f0c"; + hash = "sha256-NGtE3ZmN9LrgXG4NIKrp7dFRVzrKMoudlPUtYYKrZjY="; }; prePatch = "cd alliance/src"; From 2b36595596e3b9063c356f5081d0c53c12d01259 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Fri, 13 May 2022 13:12:09 -0500 Subject: [PATCH 102/166] blightmud-tts: mark as broken --- pkgs/games/blightmud/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/games/blightmud/default.nix b/pkgs/games/blightmud/default.nix index 2e177f169fa..43feb8b7c2a 100644 --- a/pkgs/games/blightmud/default.nix +++ b/pkgs/games/blightmud/default.nix @@ -75,5 +75,7 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ cpu ]; platforms = platforms.linux; + # See https://github.com/NixOS/nixpkgs/pull/160120 + broken = withTTS; }; } From 6320198329195f49dfd3a9b6dd7e7ae93e16114b Mon Sep 17 00:00:00 2001 From: Shane Sveller Date: Tue, 10 May 2022 13:28:36 -0500 Subject: [PATCH 103/166] gfold: 3.0.0 -> 4.0.0 https://github.com/nickgerace/gfold/blob/4.0.0/CHANGELOG.md --- .../git-and-tools/gfold/default.nix | 37 +++++++++++++------ pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gfold/default.nix b/pkgs/applications/version-management/git-and-tools/gfold/default.nix index ee280c6620c..d3b960208fc 100644 --- a/pkgs/applications/version-management/git-and-tools/gfold/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gfold/default.nix @@ -1,28 +1,43 @@ -{ lib, fetchFromGitHub, gitMinimal, makeWrapper, rustPlatform }: +{ fetchFromGitHub +, gitMinimal +, gfold +, lib +, libiconv +, makeWrapper +, rustPlatform +, Security +, stdenv +, testVersion +}: -rustPlatform.buildRustPackage rec { +let pname = "gfold"; - version = "3.0.0"; + version = "4.0.0"; +in +rustPlatform.buildRustPackage { + inherit pname version; src = fetchFromGitHub { owner = "nickgerace"; repo = pname; rev = version; - sha256 = "0ss6vfrc6h3jlh5qilh82psd3vdnfawf1wl4cf64mfm4hm9dda63"; + sha256 = "1yh5173qhi9bd41zss9k21nm0xnr2sa918kvlyr5xvzhq47rrwz5"; }; - cargoSha256 = "09ywwgxm8l1p0jypp65zpqryjnb2g4gririf1dmqb9148dsj29x2"; + cargoSha256 = "sha256-o2fMIlj+veTmhfqi7BVpxr3520SOwWLmVS2UU83EVjo="; - nativeBuildInputs = [ makeWrapper ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; - postInstall = '' - wrapProgram "$out/bin/gfold" --prefix PATH : "${gitMinimal}/bin" - ''; + passthru.tests.version = testVersion { + package = gfold; + command = "gfold --version"; + inherit version; + }; meta = with lib; { - inherit (src.meta) homepage; description = - "A tool to help keep track of your Git repositories, written in Rust"; + "CLI tool to help keep track of your Git repositories, written in Rust"; + homepage = "https://github.com/nickgerace/gfold"; license = licenses.asl20; maintainers = [ maintainers.shanesveller ]; platforms = platforms.unix; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb1ed2c4b0d..8c5d5ac7277 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6161,7 +6161,9 @@ with pkgs; gfbgraph = callPackage ../development/libraries/gfbgraph { }; - gfold = callPackage ../applications/version-management/git-and-tools/gfold { }; + gfold = callPackage ../applications/version-management/git-and-tools/gfold { + inherit (darwin.apple_sdk.frameworks) Security; + }; ggobi = callPackage ../tools/graphics/ggobi { }; From 5421bf0ed95e5d0a521db177b9ff1dd29aef0bf9 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Fri, 13 May 2022 18:35:46 -0500 Subject: [PATCH 104/166] arc_unpacker: unstable-2021-05-17 -> unstable-2021-08-06 --- pkgs/tools/archivers/arc_unpacker/default.nix | 9 +++------ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/archivers/arc_unpacker/default.nix b/pkgs/tools/archivers/arc_unpacker/default.nix index 7fbd9302397..561567f8b15 100644 --- a/pkgs/tools/archivers/arc_unpacker/default.nix +++ b/pkgs/tools/archivers/arc_unpacker/default.nix @@ -3,16 +3,13 @@ stdenv.mkDerivation rec { pname = "arc_unpacker"; - version = "unstable-2021-05-17"; + version = "unstable-2021-08-06"; src = fetchFromGitHub { owner = "vn-tools"; repo = "arc_unpacker"; - # Since the latest release (0.11) doesn't build, we've opened an upstream - # issue in https://github.com/vn-tools/arc_unpacker/issues/187 to ask if a - # a new release is upcoming - rev = "9c2781fcf3ead7641e873b65899f6abeeabb2fc8"; - sha256 = "1xxrc9nww0rla3yh10z6glv05ax4rynwwbd0cdvkp7gyqzrv97xp"; + rev = "456834ecf2e5686813802c37efd829310485c57d"; + hash = "sha256-STbdWH7Mr3gpOrZvujblYrIIKEWBHzy1/BaNuh4teI8="; }; nativeBuildInputs = [ cmake makeWrapper catch2 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3226537e8b..bd591a92266 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -997,6 +997,7 @@ with pkgs; arc_unpacker = callPackage ../tools/archivers/arc_unpacker { boost = boost16x; # checkPhase fails with Boost 1.77 + stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; }; adminer = callPackage ../servers/adminer { }; From 7c2e6fb71ee40cae273a9f030c117040c33f7b4b Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Fri, 13 May 2022 17:39:42 -0600 Subject: [PATCH 105/166] signal-desktop: 5.42.0 -> 5.43.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 96c6809b045..d63c87ee5da 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.42.0"; # Please backport all updates to the stable channel. + version = "5.43.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-xjSj7eKaDV8WB0SiPb4orxKK8mV2a2EWiMBK7BE8mgU="; + sha256 = "sha256-DYJ3WZbaalKhQXhVQO3qhJiGj92Cc+pwRDx/YBIi6gg="; }; nativeBuildInputs = [ From be92c8ae8a0e0322a3cd70daf008b287fabd65a0 Mon Sep 17 00:00:00 2001 From: Alex Wied Date: Thu, 12 May 2022 19:07:15 -0400 Subject: [PATCH 106/166] zcash: 4.7.0 -> 5.0.0 --- .../blockchains/zcash/default.nix | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index a69393c2d2b..5a72462b142 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -1,18 +1,19 @@ { rust, rustPlatform, stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook -, makeWrapper, cargo, pkg-config, curl, coreutils, boost178, db62, hexdump -, libsodium, libevent, utf8cpp, util-linux, withDaemon ? true, withMining ? true -, withUtils ? true, withWallet ? true, withZmq ? true, zeromq +, makeWrapper, cargo, pkg-config, curl, coreutils, boost179, db62, hexdump +, libsodium, libevent, testers, utf8cpp, util-linux, withDaemon ? true +, withMining ? true, withUtils ? true, withWallet ? true, withZmq ? true, zcash +, zeromq }: rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { pname = "zcash"; - version = "4.7.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "zcash"; repo = "zcash"; rev = "v${version}"; - sha256 = "sha256-yF+/QepSiZwsdZydWjvxDIFeFyJbJyqZmCdMyQHmrzI="; + sha256 = "sha256-5PlqFs2njqNeZgmNz0VKMWcRY5lPaF9oTsoh/uLEWi8="; }; prePatch = lib.optionalString stdenv.isAarch64 '' @@ -21,17 +22,10 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { --replace "linker = \"aarch64-linux-gnu-gcc\"" "" ''; - cargoPatches = [ - (fetchpatch { - url = "https://github.com/zcash/zcash/commit/61cd19a52d41d60c1987ecf269f7aa8e4d527310.diff"; - sha256 = "sha256-/7T2yCSVlRN7qfFjrZlfBNMlbVHb/KRjtUBY2xFr0mo="; - }) - ]; - - cargoSha256 = "sha256-+BLfO5OnCBqQTIqMXKJdoPCRgtENa+m0WOHKG9gkdMk="; + cargoSha256 = "sha256-eRRRjUbOieRC88wf+f1jAYvqGFmogBEla67NnImicEc="; nativeBuildInputs = [ autoreconfHook cargo hexdump makeWrapper pkg-config ]; - buildInputs = [ boost178 libevent libsodium utf8cpp ] + buildInputs = [ boost179 libevent libsodium utf8cpp ] ++ lib.optional withWallet db62 ++ lib.optional withZmq zeromq; @@ -50,7 +44,7 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { configureFlags = [ "--disable-tests" - "--with-boost-libdir=${lib.getLib boost178}/lib" + "--with-boost-libdir=${lib.getLib boost179}/lib" "CXXFLAGS=-I${lib.getDev utf8cpp}/include/utf8cpp" "RUST_TARGET=${rust.toRustTargetSpec stdenv.hostPlatform}" ] ++ lib.optional (!withWallet) "--disable-wallet" @@ -63,6 +57,12 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { # Requires hundreds of megabytes of zkSNARK parameters. doCheck = false; + passthru.tests.version = testers.testVersion { + package = zcash; + command = "zcashd --version"; + version = "v${zcash.version}"; + }; + postInstall = '' wrapProgram $out/bin/zcash-fetch-params \ --set PATH ${lib.makeBinPath [ coreutils curl util-linux ]} From 55f51ff7c11ee02f625fb140617ff6e7cf72fbf7 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 14 May 2022 01:01:08 +0100 Subject: [PATCH 107/166] mruby: 3.0.0 -> 3.1.0 --- pkgs/development/compilers/mruby/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix index 6651df5a2f0..f4b1c48d229 100644 --- a/pkgs/development/compilers/mruby/default.nix +++ b/pkgs/development/compilers/mruby/default.nix @@ -1,24 +1,16 @@ -{ lib, stdenv, ruby, bison, rake, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, ruby, bison, rake, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "mruby"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "mruby"; repo = "mruby"; rev = version; - sha256 = "sha256-C3K7ZooaOMa+V2HjxwiKxrrMb7ffl4QAgPsftRtb60c="; + sha256 = "0gnzip7qfadnl0r1k8bpc9a6796sy503h77ggds02wrz7mpq32nf"; }; - patches = [ - (fetchpatch { - name = "CVE-2022-1212.patch"; - url = "https://github.com/mruby/mruby/commit/3cf291f72224715942beaf8553e42ba8891ab3c6.patch"; - sha256 = "1bl8wm6v7v18zgxqvm4kbn8g97a75phzrdah279xqw1qvplbd2w7"; - }) - ]; - nativeBuildInputs = [ ruby bison rake ]; # Necessary so it uses `gcc` instead of `ld` for linking. From 44f965f56452a4703def4936f55381e0d132aa2f Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 14 May 2022 00:21:10 +0000 Subject: [PATCH 108/166] buildkite-agent: clean up --- .../buildkite-agent/generic.nix | 46 ------------------- 1 file changed, 46 deletions(-) delete mode 100644 pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix deleted file mode 100644 index 3b9de427bde..00000000000 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep -, src, version, hasBootstrapScript, postPatch ? "" -, ... }: -let - goPackagePath = "github.com/buildkite/agent"; -in -buildGoPackage { - pname = "buildkite-agent"; - inherit version; - - inherit goPackagePath src postPatch; - - nativeBuildInputs = [ makeWrapper ]; - - postInstall = '' - ${lib.optionalString hasBootstrapScript '' - # Install bootstrap.sh - mkdir -p $out/libexec/buildkite-agent - cp $NIX_BUILD_TOP/go/src/${goPackagePath}/templates/bootstrap.sh $out/libexec/buildkite-agent - sed -e "s|#!/bin/bash|#!${bash}/bin/bash|g" -i $out/libexec/buildkite-agent/bootstrap.sh - ''} - - # Fix binary name - mv $out/bin/{agent,buildkite-agent} - - # These are runtime dependencies - wrapProgram $out/bin/buildkite-agent \ - ${lib.optionalString hasBootstrapScript "--set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $out/libexec/buildkite-agent/bootstrap.sh"} \ - --prefix PATH : '${lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' - ''; - - meta = with lib; { - description = "Build runner for buildkite.com"; - longDescription = '' - The buildkite-agent is a small, reliable, and cross-platform build runner - that makes it easy to run automated builds on your own infrastructure. - It’s main responsibilities are polling buildkite.com for work, running - build jobs, reporting back the status code and output log of the job, - and uploading the job's artifacts. - ''; - homepage = "https://buildkite.com/docs/agent"; - license = licenses.mit; - maintainers = with maintainers; [ pawelpacana zimbatm rvl ]; - platforms = platforms.unix; - }; -} From be2ceab96f3aee5e586a427a2d28331ccbd4c7da Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Sat, 14 May 2022 03:21:39 +0300 Subject: [PATCH 109/166] v8: Mark as broken on Darwin (#172943) --- pkgs/development/libraries/v8/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 1d2911c1313..2b56d2e5dcf 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -165,5 +165,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ]; platforms = platforms.unix; license = licenses.bsd3; + # Fails to build on Darwin, see https://github.com/NixOS/nixpkgs/issues/158076 + broken = stdenv.isDarwin; }; } From 1b74650e6141e73cc5acd53525662900f35a6422 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 14 May 2022 00:47:55 +0000 Subject: [PATCH 110/166] govc: 0.25.0 -> 0.28.0 --- pkgs/tools/virtualization/govc/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index 00330f7d1a4..32cfb4aa662 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -1,10 +1,8 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "govc"; - version = "0.25.0"; - - goPackagePath = "github.com/vmware/govmomi"; + version = "0.28.0"; subPackages = [ "govc" ]; @@ -12,9 +10,17 @@ buildGoPackage rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "sha256-Ri8snbmgcAZmdumKzBl3P6gf/eZgwdgg7V+ijyeZjks="; + sha256 = "sha256-uK1JsBJC9O8dEJbAnyeMoolKZ2WhEPsDo/is/I+gfHg="; }; + vendorSha256 = "sha256-jbGqQITAhyBLoDa3cKU5gK+4WGgoGSCyFtzeoXx8e7k="; + + ldflags = [ + "-s" + "-w" + "-X github.com/vmware/govmomi/govc/flags.BuildVersion=${version}" + ]; + meta = { description = "A vSphere CLI built on top of govmomi"; homepage = "https://github.com/vmware/govmomi/tree/master/govc"; From a8465b73790a90c8460fb1040f2a2c9fedb9a70b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 May 2022 01:03:20 +0000 Subject: [PATCH 111/166] blocksat-cli: 0.4.2 -> 0.4.3 --- pkgs/development/python-modules/blocksat-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blocksat-cli/default.nix b/pkgs/development/python-modules/blocksat-cli/default.nix index 4c5b96bce53..8652dbdc544 100644 --- a/pkgs/development/python-modules/blocksat-cli/default.nix +++ b/pkgs/development/python-modules/blocksat-cli/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "blocksat-cli"; - version = "0.4.2"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hz5BGE+gqOrPiXvmeOTOecm2RUrTvM/xxvV3cnO2QSc="; + sha256 = "sha256-HHalq64pgjobnPwjXMi57OumHxOuf7wjuw0d6arMoAI="; }; propagatedBuildInputs = [ From c97dbbd63aec62d6d19ea7e1a55b184476b746e3 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Sat, 14 May 2022 09:12:54 +0800 Subject: [PATCH 112/166] haskellPackages.matterhorn: remove out of date scope overrides --- .../haskell-modules/configuration-common.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 38ed06e44ce..109ab8b9fe8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -334,15 +334,7 @@ self: super: { matplotlib = dontCheck super.matplotlib; # https://github.com/matterhorn-chat/matterhorn/issues/679 they do not want to be on stackage - matterhorn = doJailbreak (super.matterhorn.overrideScope (self: super: { - brick = self.brick_0_64_2; - # Doesn't support aeson 2.0 - # https://github.com/matterhorn-chat/matterhorn/issues/759 - aeson = self.aeson_1_5_6_0; - })); - mattermost-api = super.mattermost-api.override { - aeson = self.aeson_1_5_6_0; - }; + matterhorn = doJailbreak super.matterhorn; memcache = dontCheck super.memcache; metrics = dontCheck super.metrics; From d1ab438dbf75d4061857b5a15cc01a0f93fb9f22 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Sat, 14 May 2022 09:14:31 +0800 Subject: [PATCH 113/166] haskellPackages.brick: Remove unused version from package set --- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 66bdbe8f78f..9990e493bba 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -118,7 +118,6 @@ extra-packages: - ghc-lib-parser == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 - ghc-lib-parser-ex == 8.10.* # 2022-02-17: preserve for GHC 8.10.7 - doctest == 0.18.* # 2021-11-19: closest to stackage version for GHC 9.* - - brick == 0.64.* # 2021-12-03: matterhorn depends on brick < 0.65 - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2 - ormolu == 0.2.* # 2022-02-21: For ghc 8.8 and 8.10 - ShellCheck == 0.7.2 # 2022-02-20: haskell-ci 0.14 needs this From 6ef94b5f0eaefff40e943124f36b5f2f9205da92 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Sat, 14 May 2022 09:13:40 +0800 Subject: [PATCH 114/166] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 23b4cfb7846..cdabe961442 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -47249,33 +47249,6 @@ self: { broken = true; }) {}; - "brick_0_64_2" = callPackage - ({ mkDerivation, base, bytestring, config-ini, containers - , contravariant, data-clist, deepseq, directory, dlist, exceptions - , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm - , template-haskell, text, text-zipper, transformers, unix, vector - , vty, word-wrap - }: - mkDerivation { - pname = "brick"; - version = "0.64.2"; - sha256 = "058kpghx5s559z5l9hav44s8vb5lizn8j7v7l4lmvpqx3a6cisn7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring config-ini containers contravariant data-clist - deepseq directory dlist exceptions filepath microlens microlens-mtl - microlens-th stm template-haskell text text-zipper transformers - unix vector vty word-wrap - ]; - testHaskellDepends = [ - base containers microlens QuickCheck vector - ]; - description = "A declarative terminal user interface library"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "brick" = callPackage ({ mkDerivation, base, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, dlist, exceptions From dbc631bb9caffb3650a27f868af5c11fc8f198f9 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 14 May 2022 01:20:13 +0000 Subject: [PATCH 115/166] gohai: 2018-05-23 -> unstable-2022-04-12 --- pkgs/tools/system/gohai/default.nix | 34 +++++++++++++++-------------- pkgs/tools/system/gohai/deps.nix | 30 ------------------------- 2 files changed, 18 insertions(+), 46 deletions(-) delete mode 100644 pkgs/tools/system/gohai/deps.nix diff --git a/pkgs/tools/system/gohai/default.nix b/pkgs/tools/system/gohai/default.nix index a4b07f112ae..40fc48b8ffa 100644 --- a/pkgs/tools/system/gohai/default.nix +++ b/pkgs/tools/system/gohai/default.nix @@ -1,26 +1,28 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "gohai"; - version = "2018-05-23"; - rev = "60e13eaed98afa238ad6dfc98224c04fbb7b19b1"; + version = "unstable-2022-04-12"; - goPackagePath = "github.com/DataDog/gohai"; - - src = fetchgit { - inherit rev; - url = "https://github.com/DataDog/gohai"; - sha256 = "15hdw195f6ayrmj1nbyfpfswdai1r1z3qjw927mbma7rwql24dkr"; + src = fetchFromGitHub { + owner = "DataDog"; + repo = "gohai"; + rev = "c614f513e87f04d3d19b2d4ae853cc5703f3a9bc"; + sha256 = "sha256-vdzGGTg9SHYS0OQUn3VvrQGpKxzqxBRXDKOm0c7FvYY="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-aN1fwGbBm45e6qdRu+4wnv2ZI7SOsIPONB4vF9o2vlI="; + + ldflags = [ "-s" "-w" ]; + + doCheck = false; meta = with lib; { - description = "System information collector"; - homepage = "https://github.com/DataDog/gohai"; - license = licenses.mit; - maintainers = [ maintainers.tazjin ]; - platforms = platforms.unix; + description = "System information collector"; + homepage = "https://github.com/DataDog/gohai"; + license = licenses.mit; + maintainers = with maintainers; [ tazjin ]; + platforms = platforms.unix; longDescription = '' Gohai is a tool which collects an inventory of system diff --git a/pkgs/tools/system/gohai/deps.nix b/pkgs/tools/system/gohai/deps.nix deleted file mode 100644 index f6d63e46024..00000000000 --- a/pkgs/tools/system/gohai/deps.nix +++ /dev/null @@ -1,30 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/cihub/seelog"; - fetch = { - type = "git"; - url = "https://github.com/cihub/seelog"; - rev = "f561c5e57575bb1e0a2167028b7339b3a8d16fb4"; - sha256 = "0r3228hvgljgpaggj6b9mvxfsizfw25q2c1761wsvcif8gz49cvl"; - }; - } - { - goPackagePath = "github.com/shirou/gopsutil"; - fetch = { - type = "git"; - url = "https://github.com/shirou/gopsutil"; - rev = "eeb1d38d69593f121e060d24d17f7b1f0936b203"; - sha256 = "01qsznk599225gf4pld7p2m30p61y77mvzhrs6raxpk6wf7icp4w"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "77b0e4315053a57ed2962443614bdb28db152054"; - sha256 = "1024gcv1b40i2rgvpgyw2hgy1k5g7473pn29yavwysj37m1rrplp"; - }; - } -] From 6046ff237c5abc0668dd0618b9771877732bb99b Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Fri, 13 May 2022 18:28:12 -0700 Subject: [PATCH 116/166] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 850 +++++++++--------- .../editors/vim/plugins/overrides.nix | 4 +- .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 428 insertions(+), 427 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index d491bb7f805..51d065e89a8 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -53,12 +53,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-04-21"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "0b8f2408f96481a373f336b4405af03008e39a4e"; - sha256 = "1v36ndpx8jaipav30ailxpadvzk5qxmgphd1p0hck50mdngpynki"; + rev = "ba1659dc1e3e38cd59d5bef19a51bdcf704abce5"; + sha256 = "1zqj4j3y970kpr29kp2lx6ggd49d03dv6hxffg58v8kc1v3ibf14"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -149,12 +149,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2022-04-26"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "2817a561495f19a37369c72a1685e3e1e4c3c09d"; - sha256 = "1xxsm1b2v5wdy4psjcggm4ssgdq2j8q9ds98j1ky8l7carj0qfwn"; + rev = "f1da1ca2a4a71e79f4a625f62d8973de5cd2fab9"; + sha256 = "1jny8r8fs0z1gdcb75r3in7jp9gl9mwc4wvjslb8qp8yh1ja0ddv"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -269,12 +269,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-05-02"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "24e03a0e7c100336efdef5035eb6e59ac3f7ed4a"; - sha256 = "0hjysfszcaw2i2awkv0sbhnj0x5jcl7s6jmb279m7gcf7giwvghk"; + rev = "dc964c3caecd8f8fc477fc308187d47147b33d81"; + sha256 = "1z8g04d7hd4qxag2b9rqyzvxvg8xya98zsxyd2rll51n2hw22bk1"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -329,12 +329,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-05-02"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "97b010245f42bda351fd050a3c6ccf7806b9b007"; - sha256 = "1plfcrigk1s2l8ig0y6vf7awidbdj3p985pzjl19nrv93g49d71f"; + rev = "48c57041f9b7ceeff3e3d476f4ddf2cfc8a9f321"; + sha256 = "0qfh948fykmbhvhlqs5zq1qglfl09wrnnrzssqfi8j8h64yqajnh"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-05-02"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "8d2ef96e44768250a652826c6586005f40eeac7f"; - sha256 = "0lgn1p381bxr69j1bb2hfj1y51x941p9yjqfg8nd84ka1qy4hjyx"; + rev = "19e739139283c8ac5e2c147f870d2a038496688e"; + sha256 = "16h1kkyczqifw0d4lwfaq3smx5scsap1d2pv00kcmwvs56ws5sx9"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -522,12 +522,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-05-02"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "56399106fcf9d80d476307576bc307e67f0167e2"; - sha256 = "0mc125zrbipikxdffvcn39cqphz0y2lavsbsh4x4604af74va0dv"; + rev = "044a6c956bfb557ec6c6d37921db6ee11de879f9"; + sha256 = "1sz58bn0h65bkh29047ps8wm9fni0k9q2gmf69w7q5njlynk4ah9"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -678,12 +678,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2022-02-02"; + version = "2022-05-05"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "d11266046077968bbc3d6ac37d81e069618cdedd"; - sha256 = "1hdycb9rc7kpcppwv332hmrnzx5g2jy5r0ckaynahwwbwbjiyjqh"; + rev = "315831585d8de6c7787eb05c5bea56f430c851e1"; + sha256 = "19w3qmk6q1dj4jnwmvmd1af2bjwrfjmfnsrmjim9qmv6w0c2pbav"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -714,12 +714,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2022-04-21"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "4b1c978c6fb73e1e59f988fe85cfa51347a86e8a"; - sha256 = "154s0kfhvmyvcbdmy62v00jlmnfgnkmv4ilwf8hig4qxn1376arw"; + rev = "7c9477614fb95b103c277a98bf3f588e337cd7ac"; + sha256 = "1d502bfkr6qxrqr0jxwngj22cz4bh7v36kakpb9g4qbxdd3h1r30"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -738,12 +738,12 @@ final: prev: awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2022-01-17"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "9a28614941beec4539f82937d50df1a03bb70e0d"; - sha256 = "0fvb3r8176r030wnf1rvpd4dba8cz5506a3plp5j5h5gxpsyd27y"; + rev = "9f96bbdef5cb19daf58449f0fbb597af6fc4c2eb"; + sha256 = "1yqc0j2aq3aqyn924dn8d2pqxapn1w5wylgr1pc5mf0f7nl6qc94"; }; meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; @@ -762,12 +762,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2022-02-22"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "be65945626fb6bf6058cae61d5176d156f923c11"; - sha256 = "165ffjrwhhjdyssj96z4qn3fjys0dxwckpvjyzrpca2b2fag0cx2"; + rev = "9d024d646c3fa0281a5ddcf189e2a620010f43ff"; + sha256 = "05fh6992q7npnar82ijf67nf1c3rj6sxg2wk3ckb22qks2hxq8nd"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -870,36 +870,36 @@ final: prev: bufdelete-nvim = buildVimPluginFrom2Nix { pname = "bufdelete.nvim"; - version = "2022-04-12"; + version = "2022-05-07"; src = fetchFromGitHub { owner = "famiu"; repo = "bufdelete.nvim"; - rev = "96454aedf95f52393a28cfcfc76482895de014ee"; - sha256 = "0rr87wbqil2k2cia759kisllwcsbq0s3yhcl9h849qgd4gr2926h"; + rev = "93e71aabbc3d534d70bb5d1913778eb42afb96f9"; + sha256 = "0qzf6mmws0f1nmlk8m4pwfsbkkpq5nr024n9l2jvmchax63w1bds"; }; meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; }; bufexplorer = buildVimPluginFrom2Nix { pname = "bufexplorer"; - version = "2022-03-21"; + version = "2022-05-03"; src = fetchFromGitHub { owner = "jlanzarotta"; repo = "bufexplorer"; - rev = "a81eb31192e3033eccedb61c842e274252038a04"; - sha256 = "06b0mfmys2ah1hkyfipv0chv138mmdlixc2l0377zhq8409i3k3c"; + rev = "1be66e253730fd186a5a789a67a337420f431a71"; + sha256 = "1k3x04xvsmqbvmmcg7hlv3jnwpv9qgmdvwjz0620xmspfk43m09x"; }; meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; }; bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-05-02"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "2d5266d14b7b5dbc54923469b4599f0349f7cedc"; - sha256 = "0i8k8paa23v0l011lvydcv45c4jnr8wfiiwyw16hhndfamcwhgfh"; + rev = "29d5789aa407e7105968c43dba566defd3ca96bd"; + sha256 = "0skrqpxszp2z2zv21vh2prxdyizps43qjyyy56rxs25cl6hrzb1j"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1038,12 +1038,12 @@ final: prev: cmp-buffer = buildVimPluginFrom2Nix { pname = "cmp-buffer"; - version = "2022-02-21"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-buffer"; - rev = "d66c4c2d376e5be99db68d2362cd94d250987525"; - sha256 = "0n9mqrf4rzj784zhshxr2wqyhm99d9mzalxqnik7srkghjvc9l4a"; + rev = "12463cfcd9b14052f9effccbf1d84caa7a2d57f0"; + sha256 = "11fbxw8rrhypazd256qwjvf8gg0laqb9b4h9yqdgvwj810y6n6wg"; }; meta.homepage = "https://github.com/hrsh7th/cmp-buffer/"; }; @@ -1206,12 +1206,12 @@ final: prev: cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2022-04-04"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "1c6e5c55f3a879354891c59cf27da733890bfc88"; - sha256 = "1hmif83kl2h4zz4xqkxb0xc003wzlirr26znx0r1f8z54f1j1hik"; + rev = "30629b30791b42dcaadc7680cc5cb078a7a3075f"; + sha256 = "1zs6dmaxx0af62v32c5l7cpywq2sd8fiw8j102mc4pn3s0vdcbgm"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -1374,12 +1374,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-05-01"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "83a5f083d7ed76899729f25063a5ab9c326e5f02"; - sha256 = "1pwi1l4h6hdr45z5lnw3mjbpr3jx6iipnaz5bla64cq7cgf98nw6"; + rev = "a1edaee28938ce266c2543e2552bc6ee1ad29ffa"; + sha256 = "132jvk2wf53qbn2qgnr0zjh7nw05lr91p2jhykam77gxkmgzazpq"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1398,12 +1398,12 @@ final: prev: codi-vim = buildVimPluginFrom2Nix { pname = "codi.vim"; - version = "2022-04-30"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "metakirby5"; repo = "codi.vim"; - rev = "086593fbf5f0891c9fa93cf14453ad14a79d3ed0"; - sha256 = "0m8hgchb927kgcz65fkmk61w6ma5hvqfr221r7f9jbjzj49laaxd"; + rev = "4da94d813cfcd83434098a24a277d6be43f5bf50"; + sha256 = "0rr5i704bqw2w600jvgvxl35sx2gak2bbxz59wk7k7jyxrzbjam6"; }; meta.homepage = "https://github.com/metakirby5/codi.vim/"; }; @@ -1447,12 +1447,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-04-27"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "cb0de89ba80b7cdb37b92e2a9e43b566f8834c7a"; - sha256 = "17pshx6jq82nfjn2w65i0d3zh53r5b07lc2bh2aqpm5x2c5bhn3h"; + rev = "40f5587789681b3453e4a27831b7d293e1c3da7b"; + sha256 = "1lbjqq3h6434gwzc0bmnz64xlkrkjc11nlya6kp4amb6ajj3bg9i"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1615,12 +1615,12 @@ final: prev: copilot-vim = buildVimPluginFrom2Nix { pname = "copilot.vim"; - version = "2022-04-09"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "573da1aaadd7402c3ab22fb1ae6853db1dc82acb"; - sha256 = "1j2rva50rl8kn480b613z6a0xnfwkvyi4amg9n4r2l89dxdsni84"; + rev = "df203c1356b72032df32d7b0b5facb4895139b6e"; + sha256 = "18v21b314p4firiz0xhqnfl45g5wbcigiqq4ypnhf1lgwd6ngpqd"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -1639,12 +1639,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-05-02"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "b443ff20dd28d90231dad463bcdbf342e53d13f3"; - sha256 = "14a3942nphlqfr9s4cwx8fa1n1yj1rqhk65bbp6z7zaw7x8g7jmf"; + rev = "ca1c0df28b235bdce65ac87c0bed31da8f9e8be4"; + sha256 = "17g7qd44jx5l8903m2hk8ja4hl4n2x43b0wmzvlpgjmpvgvhskzm"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -1759,24 +1759,24 @@ final: prev: dart-vim-plugin = buildVimPluginFrom2Nix { pname = "dart-vim-plugin"; - version = "2022-01-25"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "42e6f57f2404b882cb7e491d50e525f8a8eb7f1f"; - sha256 = "1lla0ldgayryib0868zl10dz6yy9dxa0k86fxl5sr6y0csfpi23z"; + rev = "ceecea7895e469fc998d383818b2107d97cec06a"; + sha256 = "1h2glyi5zyskc9ld6gz8p3k84npfg2b1in5rjv3hhwg6d14d6xd8"; }; meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; }; dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2021-04-17"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "ba98ab86487b8eda3b0934b5423759944b5f7ebd"; - sha256 = "1gyk0n8ks7xyjqab0gb7yx4ypl9k7csfjgmha84hy7mz4h08fkxq"; + rev = "3b31a80513969752a8c53ff8b16a8e060404cf50"; + sha256 = "0gcjyywjdsigq7a4jmcg8zgj6na5zagncdgp2a5qs81sa962k798"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -1867,12 +1867,12 @@ final: prev: deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2022-04-29"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "0bdb926d328765144dd788c062161c565dc38732"; - sha256 = "0c4dl37npass3n2dx6459dm1bk30fhy5yaphxjg897wz61xn622x"; + rev = "cb48ec3f1c119d68cf633757a236228e3d887bf1"; + sha256 = "0ckhcx6z1dqlvsaldy3961p3h4qvxgdqdp4i8xkqy4scjvaanvz0"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -2145,12 +2145,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2022-04-14"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "2d1f45282587d565cc4d84112490bc944c0b491d"; - sha256 = "0cwp07igj131fp650wk6nh80kygvlf7h0r8p915jsyxfh9y06p7i"; + rev = "91e99ae14e9e6e360540007e6785146458a138da"; + sha256 = "1sghkg75y62rcc0jy7ra6rsmx05gxz4nv944i4lywn952vc49nd7"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2181,12 +2181,12 @@ final: prev: dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2022-05-01"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "a476efd3f372d6b5b0df431cac36911fb84c515e"; - sha256 = "1n15lzjma6mpaphx6ppmhsgvg51vbrp91qf3nssyvr5n2vpjhhfy"; + rev = "55e4ceae81d9169f46ea4452ce6e8c58cca00651"; + sha256 = "1i34pk9l76n8ianz9hww8kn7dnnzivv8sbyf0vf7w21r2bh1p1k4"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; @@ -2205,12 +2205,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2022-04-27"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "fb5a763f2591bed8d10562edbd0e64c88cc5e674"; - sha256 = "0p79ck2n94argr7k8glwpmmzf6945mh4gb23p5hd5m8a02ys7ax4"; + rev = "93e92e161edfca2cef1534efb88e2aa2138834d9"; + sha256 = "0y24hdaqq9dsfy4di0pql1zj7a7jj48m44nm2a1g1dsra8k94jm2"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -2291,12 +2291,12 @@ final: prev: everforest = buildVimPluginFrom2Nix { pname = "everforest"; - version = "2022-04-27"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "1e594a20ce382bcc55c0e3fd488e90ca68dffb32"; - sha256 = "1415759zc6fp39h0xzpb2d99m4xsh5ma84j6yv236zb0bavm88ah"; + rev = "f748681a3fac2496aedf694f5bd09a30f80cd3c0"; + sha256 = "0w9gv52y806bn7az9yl2anx7yiv2ildslw4rvj82v5ni0b6mq4j5"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -2351,12 +2351,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2022-04-12"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "feline-nvim"; repo = "feline.nvim"; - rev = "79f5e9e5a76842b72f1814dcd4fc239a95ead391"; - sha256 = "1svj1464hlash4igbai9mdman7cvlb8rfiyyylm7yn4wh8c2xb3k"; + rev = "f63f17bc9b845dd4cca4112f243b551aea141ced"; + sha256 = "1l088yjqkjs8vfgc738qgbd8w72a4rni1bzk5wc9q2z8m1rzf7kr"; }; meta.homepage = "https://github.com/feline-nvim/feline.nvim/"; }; @@ -2399,12 +2399,12 @@ final: prev: fidget-nvim = buildVimPluginFrom2Nix { pname = "fidget.nvim"; - version = "2022-04-19"; + version = "2022-05-08"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "956683191df04c5a401e1f1fb2e53b957fbcecaa"; - sha256 = "1hwkm19x8zccwcnq72b8jk6dcmhngsxqcs3c02sarr2n0vqwvip0"; + rev = "99b306167d1d305ca084e3bb475d6eadf32a365b"; + sha256 = "0pxxsz0g2qklnl16pfbv0178fd34ff2vvx4qwndwkfgx4qmlkj8q"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -2472,12 +2472,12 @@ final: prev: formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter.nvim"; - version = "2022-04-26"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "100af7c04f12b99d29fbca7dc1aa3d17301c54e9"; - sha256 = "082cp251ynznjk3ims389ljdww9786nh8kglydqpqh3sdvc7s0mp"; + rev = "fb814e0e18a2ced247c40736d395d15a2517486e"; + sha256 = "19dav8ajydd4b9ziw6l4k9pn3dpc2z6zh1sb8a1hxcv02xfc71xg"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -2496,12 +2496,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-04-25"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "6e0881ad5dfae8bcb160bb6704e1f5fe31be9938"; - sha256 = "1cyrqsc0jf1v6qxrd944x74803cck3nxddp1ac8rhl9yj8kz176w"; + rev = "4ef45d099453a26d23084a04ae7dced19e6d5ae5"; + sha256 = "0l3hkg97w26k01f4arifnnaws4m50b2phig2pq8kqr80rz5i0gk7"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -2568,24 +2568,24 @@ final: prev: fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp.nvim"; - version = "2022-02-06"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "b02056f3c4b9d64d876bbf0a58d20791345a9364"; - sha256 = "16n78ylicrd7lh41g5hvd9vnnhkwbvj28c190k5zvrblyyhipn93"; + rev = "13fec018f619a14f0fcc90d1ff32f235d3344315"; + sha256 = "1wmmahy62dk04dplf96qh9aqfamjr3nm1fn3ky5lbw6ij8kgk5y8"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2022-05-07"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "b614a9d315512ec4ce9c1df41474e5ab8e12f7df"; - sha256 = "0gb7q4fbv3754ck44h6dd93dcy8j4czhhna1d2kgq21614xs303k"; + rev = "de7ac64e742c21afae5dae93e8207408fde5042c"; + sha256 = "14hqkwsg4sgah0nyxd08iqzl8aycy6hgxn7wnyk0xdpr0nkhlm24"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -2676,12 +2676,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2022-04-29"; + version = "2022-05-08"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "0a7d27028b69525f2c6b6a3460029ed6cb291541"; - sha256 = "0mbvaasx82wcn37mrn20gb98g7prhav4ps1wyk46mirla350ikjl"; + rev = "8ab29dd555de8f1791a4d34f47f21c8a2fdae8be"; + sha256 = "1bknqk0xc85n9qc1mhg9w95yniyk0j9jq7pxc2wwdn5zrfig1vjw"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -2736,12 +2736,12 @@ final: prev: gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-05-02"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "ef153188e849bd317c00448755bc4182a2bd495d"; - sha256 = "1pysiqgkp34kmpf4fkyjqih0rrq3mscrh9z27mzfhy2zhky8pikp"; + rev = "ffd06e36f6067935d8cb9793905dd2e84e291310"; + sha256 = "00lm0685mwrm4c4r4vprb0ksmylnrlz8silghaqdg80zlhbn729v"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2772,12 +2772,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2022-04-13"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "0c76518e440f2ea4dbadd87beec8eea4ce030f17"; - sha256 = "093qa13dd32rn8r50pw3s65186ch2i9wawf1dwylqymjn1afnqbk"; + rev = "da265c328f5e4f102dbdbb1a0fd8627afdaf0320"; + sha256 = "1pmj8rjhf80jrgxp8iim9i36qqc6jwx8c73z6nqs6nkmnccychih"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; @@ -2868,24 +2868,24 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2022-04-27"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "3d664943daf65bf99390a52c5dbc557f87fac552"; - sha256 = "08zh5rc9p6svmds57gvvkk12nadd56ysx8xrhsjxbn3cdxag86gj"; + rev = "f943521890297076cdcd629182a0405f6b9a83f0"; + sha256 = "06x45ygxmqsgxrghvc4l6zdf1waxrwg3lk7m0lq4sh6nygdzhw1h"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2022-04-26"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "cf1b07f07673b5c2f9e3903b5fc4c2f7bc7d1123"; - sha256 = "1pr91d8qsii9z5ff4gw766nf4v9r06ym15hk5y3z293bsd6hfns8"; + rev = "72930977a442a2de2592ed39168c018bef90e086"; + sha256 = "1k6rbn4ksmgi36f3zqlz52c99x3ilpjmv6q3y93j5kp2lxp1yz6r"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -2916,12 +2916,12 @@ final: prev: harpoon = buildVimPluginFrom2Nix { pname = "harpoon"; - version = "2022-04-05"; + version = "2022-05-08"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "28762aa04d6395538e26e1efff5213b26720e68f"; - sha256 = "0c2fpwm8v2fzkg8rq7lhpv8lzm614y4x6n2xp612sj824jm7aj03"; + rev = "d3d3d22b6207f46f8ca64946f4d781e975aec0fc"; + sha256 = "0vc14gg4ll4ghmvyqvzij9pkvm30sml61nhs7pbpw3qq5mfizb7z"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; @@ -3108,24 +3108,24 @@ final: prev: incsearch-vim = buildVimPluginFrom2Nix { pname = "incsearch.vim"; - version = "2017-11-24"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "haya14busa"; repo = "incsearch.vim"; - rev = "25e2547fb0566460f5999024f7a0de7b3775201f"; - sha256 = "05v0d9b5sm4d1bvhb01jk6s7brlli2xc16hvzr6gik1nm1ks6ai1"; + rev = "c83de6d1ac31d173d7c3ffee0ad61dc643ee4f08"; + sha256 = "0vlj9hdy4d1p06mnxjpdz4mjqvbsgy5rp4l8k87wbs2b5x8008yj"; }; meta.homepage = "https://github.com/haya14busa/incsearch.vim/"; }; indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2022-04-15"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "045d9582094b27f5ae04d8b635c6da8e97e53f1d"; - sha256 = "0wxkvx1xy7p4872fh9ydsnnqlpwm9x3afwakgxv38l9vmk5mpid4"; + rev = "8567ac8ccd19ee41a6ec55bf044884799fa3f56b"; + sha256 = "0gbdgn8031i4wgl5w2halaxjir39710n5cs8997cf3fhjj8zk5ss"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -3289,24 +3289,24 @@ final: prev: julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2022-03-23"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "a2c96eda9d5b0dde03d2e22d0888e40426cd38dd"; - sha256 = "1x9f3gd4bgj3f1c75bp58mvaxll4rw55vznqckc0w0p1bcwq9faw"; + rev = "d743b99ff8321f4a80d21692bf536442d841bd55"; + sha256 = "07x3zayahbp2dm7lc5kvrpd0c4i8qivs1brbdv9b1rv9b45qx5nf"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2022-04-21"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "0ad738e7cc43514d35388c1caca13990d688aa5c"; - sha256 = "06gcdkh92i5znpn5gw1xyc82nf4kr2j1mi8d8pnajqyvvxyb8mca"; + rev = "50e7b43552072696d26757aff5f6307e2ab5e3ea"; + sha256 = "051asspplaw9m1iqv78gfv8dzg3c96c1mhhv5swih4r3zcbylhhi"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -3373,24 +3373,24 @@ final: prev: lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit.nvim"; - version = "2022-04-15"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "68407ff60c1abe56cecedd4bec41380df5070a21"; - sha256 = "080h4w55l36rvi4bb8z3bx2g41wp9lk08ihmz0jfmp7dzfgjszsi"; + rev = "1f9f372b9fc137b8123d12a78c22a26c0fa78f0a"; + sha256 = "1s4bpi7i86246p28pjk99rv1qj1gp7l7zwfch0f23nwnggm8s6pm"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-05-02"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "902eb7f75d664bccd251c38d7921570b05b47cdc"; - sha256 = "1dw8r7vl260baclf8ymq9zr9vxq8d8s6hjbnjs4xqliaza0g7pj3"; + rev = "725ff1f12e908001d2d42e9b06725cd8117e16f8"; + sha256 = "0i93k3izl9b8lsax7s1bz53jwkjsjh9iv2wgwk7bf9a6c34g9mq5"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3529,24 +3529,24 @@ final: prev: lightline-vim = buildVimPluginFrom2Nix { pname = "lightline.vim"; - version = "2022-03-15"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "11931e2de42cb1a14887a002a874f0b2daf12bc2"; - sha256 = "1iyns1bm3wjr6z2hmc0p9j61vhprhax4f9qdqaf3w7vvgkhx1xj6"; + rev = "b02ef0d9f253dfc1cbb3f340b74998d7a4db0bf6"; + sha256 = "1rr5n23vvybfi3gbqljalqn0pnkwzzb4zqcz74jlz1dfyddsngah"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2022-04-04"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "cfde2b2fe0dafc5684780399961595357998f611"; - sha256 = "0zcippcfv87vcsbld0kka4mn2lixg0r6m2c82g9bssf304skfhfr"; + rev = "c5b93fc1d76a708cb698417326e04f4786a38d90"; + sha256 = "0lgk9i240mgzf7f3j3z93dkj00fi3rypn79zc60wqdyzhpg4r4lm"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -3577,12 +3577,12 @@ final: prev: lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; - version = "2022-04-20"; + version = "2022-05-07"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "43b2fae50a49fbf435899201b0c687b72ab2cc8f"; - sha256 = "0ayq5nj6mmxc4pd6sf49wllkr1bkgvx6dsdy0hl2f3w20sn5bpba"; + rev = "4fc9dcaccb31301cb6ad938e1f40c211ab1115e2"; + sha256 = "08bn39smzdsh4whqk8icmf39fixnivw0bmvh9c90260mqj7329xr"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; @@ -3613,12 +3613,12 @@ final: prev: litee-filetree-nvim = buildVimPluginFrom2Nix { pname = "litee-filetree.nvim"; - version = "2022-04-06"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-filetree.nvim"; - rev = "2a59ba7c362d1e39b80baa47dc237a7eeca42ba0"; - sha256 = "1xw3p3jhyyggp82a8n99nqk9hnm8z6n84lclb2wjbma9a0xzk9kl"; + rev = "91d403620dafeb30410aa0ed0cc416c9b67d3233"; + sha256 = "1v70qlnwc59agxasvshr5691k00lvahks469pxh0kb0m072ainri"; }; meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/"; }; @@ -3637,12 +3637,12 @@ final: prev: litee-nvim = buildVimPluginFrom2Nix { pname = "litee.nvim"; - version = "2022-04-25"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee.nvim"; - rev = "2d257af35e90b1ee6017481b7fd82878d8f0e5ff"; - sha256 = "05cnx2py9jwkpv34fbqqwjq8gb2rx3rwp97a1klr8khk8sr59b5y"; + rev = "273bc3389434ff041e65f6c10edbf470763f6a8f"; + sha256 = "1gy6an081phxkzaz0r548lq1idlxwmpgcgxj41jc7cliplfm8h4m"; }; meta.homepage = "https://github.com/ldelossa/litee.nvim/"; }; @@ -3708,12 +3708,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2022-05-01"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "6d160406f948a810c40304224a1255c8bba5a415"; - sha256 = "0hkj9z1ap6a3a4xbdq47cahx2j21pzwiss3fsarpwr6rjmcl62x3"; + rev = "db324e2ada5bb795d0016ec0ef2b4ae7f11d8904"; + sha256 = "1swvj79h7bgdm0wmb3a2a730y4gic1aivj371q7k8acc1s824j7d"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3732,24 +3732,24 @@ final: prev: lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga.nvim"; - version = "2022-03-14"; + version = "2022-05-05"; src = fetchFromGitHub { owner = "tami5"; repo = "lspsaga.nvim"; - rev = "5309d75bd90ce5b1708331df3af1e971fa83a2b9"; - sha256 = "0xvlpjv69wf18nw5hbmmgbhs8ws4gfq5ny2vrncqaxcikr3gdmms"; + rev = "8dde091a61ab07f639baaa82b456d3508d0aa7e8"; + sha256 = "15cimji9x53ki1rrxw2y7vj5g4lp4b91hxljcp9jn9qhkjb7kj47"; }; meta.homepage = "https://github.com/tami5/lspsaga.nvim/"; }; lua-dev-nvim = buildVimPluginFrom2Nix { pname = "lua-dev.nvim"; - version = "2022-01-18"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "folke"; repo = "lua-dev.nvim"; - rev = "a0ee77789d9948adce64d98700cc90cecaef88d5"; - sha256 = "10hc5iyqicbwjchwfyk7dz2wph0hz7ikjanvga9ncjk62qm2154f"; + rev = "f5c31936fe06fcbeb59b98f69f74f9c2f91abaec"; + sha256 = "0vwpi3cg0gv17w3bm2vlzspsms1rn2yjrzkq2zvf2f4slqq3rfpw"; }; meta.homepage = "https://github.com/folke/lua-dev.nvim/"; }; @@ -3768,24 +3768,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-05-02"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "45d07fc026400c211337a7ce1cb90e7b7a397e31"; - sha256 = "13np9iqh69w5mrzx8pi5db87cm5sjay5cfs9zb1lk0zxz3n4592d"; + rev = "a4e4517ac32441dd92ba869944741f0b5f468531"; + sha256 = "18q935aicddai7j99ln61wz1di6lhwzs11x8fxgq704kfap1l2fj"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-05-01"; + version = "2022-05-05"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "1dbafec2379bd836bd09c4659d4c6e1a70eb380e"; - sha256 = "1y0jp1saggg59lpicyvjbklg3fb5qmbmh8q7gacx27zgp26hz66r"; + rev = "cc0086390c6cd2eaebae1834b115c891649ec95f"; + sha256 = "1kid880y097jl9ys2zs94fj66fq2dhbgjmd97blpdyhsa9m0mgnc"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3804,12 +3804,12 @@ final: prev: lush-nvim = buildVimPluginFrom2Nix { pname = "lush.nvim"; - version = "2022-04-12"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "87e9039138051ae75f76235924a273ac1a78cc3e"; - sha256 = "1plsm3xsf7bm709l6q341cbvm7na78a11b32n3j86j204zybdvbs"; + rev = "0c4acf666eb23acb5ffbd7f29526d801560b696a"; + sha256 = "1khpmlf90yhlqaapk2vkqkwzdjwsrrl3hfb209k3wl25588m9fm8"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -3840,12 +3840,12 @@ final: prev: marks-nvim = buildVimPluginFrom2Nix { pname = "marks.nvim"; - version = "2022-04-03"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "chentau"; repo = "marks.nvim"; - rev = "8e80a20a170434bc77decc97bc4364c3ba848925"; - sha256 = "0bah5xjrwq43ihw37gw8nxsj3qdh9fjqs9n7fkfhsg6hyp1qy4fc"; + rev = "56cfa45f9c20373ed90bc4271eae17ee0d452bae"; + sha256 = "0qc452ikyrrx28by0awm9jggv05zcph95kygjya1085g9win87l4"; }; meta.homepage = "https://github.com/chentau/marks.nvim/"; }; @@ -3864,12 +3864,12 @@ final: prev: material-nvim = buildVimPluginFrom2Nix { pname = "material.nvim"; - version = "2022-04-18"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "9679aaf52e709b892a2cac044e44b694ea027709"; - sha256 = "183afbjbblwx6r8ix1z3h7nq54fhbdf5w2nagwd850w90iq6kyic"; + rev = "255033d6db241cec11d81ee46d81b56122e2000a"; + sha256 = "1zn32xkbn37mqi41rh6d0186rxkq7ry5m1j7f8iliyhvd5gj1a1s"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -3888,24 +3888,24 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-05-01"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "2bc924df80eaa788abd9af9ab9df446b10aa9b88"; - sha256 = "159n5sxg28lsvapdy59dxfhnjr7nb2wqy05pbcsdk90g4d7v43f7"; + rev = "1764bcfb1450ddef4eb7118a3c16464caad44439"; + sha256 = "0bayg5y0i23pz6x798qyx90l1w6wmf83kgdz9akxn6s5m82v8z4y"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; minimap-vim = buildVimPluginFrom2Nix { pname = "minimap.vim"; - version = "2022-04-15"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "3395cbd51bf042ef6d2cd714eb493eb7ed5fbb76"; - sha256 = "1bia6l9dhx0hk3jk38zgid8ljs28azrmz5xfp4mv5wa1g1kby0bl"; + rev = "5d44fe7a3a5f7041c4220a71e8fe83d8c8498042"; + sha256 = "04rqv8c5g1fs8pymlf2fcbm09k64bvpiqmjilf59m843vkvgk1xf"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -4248,12 +4248,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-04-13"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "c8dd268091ffcbcb673de59c5b37ff26a2eb24ed"; - sha256 = "0a5y5vlpfmx113byas8y91s0ng6xnxmjpva0jiv9wk419kgnk0f1"; + rev = "84d1eefe9d5af41cc3e5de02f2c9a263d5302781"; + sha256 = "03zrwgk0z534qzbzrf2s3bdk3kcjyrxjhr3xp0qsx7nlpx5ackby"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -4308,12 +4308,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-05-01"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "633dfc9f0c3a00a32ee89d4ab826da2eecfe9bd8"; - sha256 = "13r17drh0xy2dibx2qq4r90zlkjfyp3mzfa6p7w29yr623ixbbs1"; + rev = "509947a6587a83aa755914eb95be605864bb108d"; + sha256 = "0qhq61kl3y282dm06z7kyzda5qpj9nk3mpvz5asc46vfvw98ijyh"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4368,12 +4368,12 @@ final: prev: neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2022-05-01"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "cc64cadfd6e54967a7b01bac1a689239a20804ac"; - sha256 = "1rnlr14n3b6sxs0m64x5s42yq2bj8677bxyz4b479cdiq76gnyk2"; + rev = "bb0793b661acec468c472f20eb28dbe855428793"; + sha256 = "0nrky5mlh79xzgdbwibrs43yw317gaavhq0p7pfpxsxdxhfjw416"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -4488,12 +4488,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-05-02"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "25b3f3e46c87c51e4d8075d2e11f481628716363"; - sha256 = "1asz3wz9v47smwn6ahzmv8mdjbfazwbwzmcf9niy0jxva6b3qyrx"; + rev = "63a8eb64e8559e4c910e91025a2959c4b50b8c54"; + sha256 = "1kiryppcg1ng8n5m3b5qyzzw5vnisgpb1n6yw961yddxdzc8hcr4"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -4548,12 +4548,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2022-02-17"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "1fdad275596f85bdc36c525b14697ff3a4f08bdf"; - sha256 = "1pq32gnpmkyqaxq0j5bqf6ik9vkrf2zkayvcvb6fv4vxaiv7w7hr"; + rev = "fb2c13625c711d3ab9303c0d9881437b5b280ba5"; + sha256 = "1pd8wsjp6jg2a8bvwn593sd9wf2czaxaq05xlgjzfwgc9k30mjig"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -4572,36 +4572,36 @@ final: prev: nterm-nvim = buildVimPluginFrom2Nix { pname = "nterm.nvim"; - version = "2021-11-10"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "jlesquembre"; repo = "nterm.nvim"; - rev = "14d16c83aa1d165724f7780f470c4dcde5addcb6"; - sha256 = "0y883fpjfk7lki8nfscxhfw0wr7xm1d22zgf52zqmc9pjznjz9my"; + rev = "cd7b7035d09144ee4ea49244bf5cb8ed68e499f8"; + sha256 = "0cvg03d1z7jkamg062ng731pdmckrdm611q24brr9ha1qc5q26gm"; }; meta.homepage = "https://github.com/jlesquembre/nterm.nvim/"; }; nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2022-04-08"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "42552b3797c3452c5c94e0c84a04fbda9591b9d1"; - sha256 = "0ggiq9yvrkv2fff41qzvz82lsxxc8swlxfvv1n9g5am8zym2ssk1"; + rev = "abdbfab89f307151db83b1a5147cd390ef27ff99"; + sha256 = "0z49sfnsr7hmfr4vrd82f1m6kvswfqq31n4fsdmjy9h4qmjb0w5f"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-05-01"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "3dbded7cfaf0591157280bc97d11407eeaef3ea9"; - sha256 = "0k74064x0k2l4k07zlfv3kl3qm3f7spj49rr9ahcwn0pni38y71c"; + rev = "dcad76eb1abb80cf3a27208823becbf62547abf8"; + sha256 = "1xsgmz1gzrz313whjm2ivc7px7xkcdqqi9gn466d5yyshzqvx3jq"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4644,12 +4644,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2022-04-28"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "63779ea99ed43ab22660ac6ae5b506a40bf41aeb"; - sha256 = "0lc03xjsamy8fpfwy6ag9r8cx1cp0my461l0wvbgznzr1qkq325y"; + rev = "aea913109d30c87df329ec9b8fea9aed6ef9f52a"; + sha256 = "0jhw4m552vfxilmn5cp67a9xz1w8jd6ixijyl2bsvp1j56qklfi6"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -4704,12 +4704,12 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-05-02"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "bba6fb67fdafc0af7c5454058dfbabc2182741f4"; - sha256 = "1qkhynhaasplvk7argik7jqkl0jymi347xqbg1i7b1h4qp51xjpq"; + rev = "9a0c639ac2324e6e9ecc54dc22b1d32bb6c42ab9"; + sha256 = "06pza2xc5fzmsdz945mascmjd43k48agfq15ds91km8scpvpsx77"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -4788,24 +4788,24 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-04-18"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "d6d8317ce9e096029150bc5844916347a9af6f45"; - sha256 = "0p5317hf7a9ky78dg68j4daj6z0nmhxiq4v52nfld54kz1f5dkmx"; + rev = "2249fcfd09cdc27c08e9d2f3be5268ba81db3378"; + sha256 = "0v0gz77dqyd485f9d43q101zcxnsyc13n9bl572xcrshdn6czncs"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2022-04-29"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "3eec5258c620e2b7b688676be8fb2e9a8ae436b2"; - sha256 = "1x7y49jzbj3s07pkdi842balj9wx0x1z4khgixxj7p03awcyngsm"; + rev = "e5c32746aa72e39267803fdf6934d79541d39f42"; + sha256 = "06igsddmjd27wj880vq9l9qq38x438ybrjvizn8dz98paypa6b1d"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -4860,12 +4860,12 @@ final: prev: nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2022-05-02"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "d064ee481b2aec86133ebcd514c835a28776f9c5"; - sha256 = "1xxm69jndx8sgkip1f8n7k9nb697d1n7r13iyp1bcgllwir5f1mi"; + rev = "9c630705829fbe8c21a9379ae2be948560189d80"; + sha256 = "1cdc2r12k1nma37vicshy4kbk79ap8qj040rscxzl41z96ff8v0b"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -4884,12 +4884,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2022-04-29"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "16f6fe2ece750b9cbfacca3675e8e71cd4c19665"; - sha256 = "1i5v8z6gmj09lwi6mb6m6srskavqdwwv4iazajjrjwjv0wfzcdb9"; + rev = "1838e0a8418dfc87bc35ecb4a2bc594f032fda06"; + sha256 = "10ipn3xw4vlfkms0vg28gvwycs3hxpssc1gmp6hfj9z9ips976x1"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -4920,12 +4920,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-04-29"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "9010412f7de118168d2fe4ba97b578d0d76cc500"; - sha256 = "0jzz9av1k4msa9942p8g1f0cnlh0rdgb026s3xg4ksbdspc72d67"; + rev = "f582b5be2ae1fee2e5dc974cd9b979a1ab08cca6"; + sha256 = "0bfdp6xbq7qr7185m06ccfmln2gc24vc1215cxczm1bpyrh98ncq"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -4968,36 +4968,36 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-05-02"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "2c8f41f62d09b1e1068c3949661eba5bc0cea7ba"; - sha256 = "08syhj3wwrz7ivv492zjs02xcf42b3f1zhh26am8jr430k0l491d"; + rev = "0407c340a77380e4122dc349efa10fc846c928b4"; + sha256 = "1cagndfqdk505q18iq4wgmwav3hh04vmgxj7h8924v9ffj8wr0wx"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; nvim-lsp-ts-utils = buildVimPluginFrom2Nix { pname = "nvim-lsp-ts-utils"; - version = "2022-04-04"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "nvim-lsp-ts-utils"; - rev = "1826275ee0fc7fded65e8716b231db86a17080e3"; - sha256 = "129zjds8c69hahv307wnpdsjzfh29flsr99lkjma8dymsan96lb0"; + rev = "441385952278a1df5c91ba0d33e72c148d4654d3"; + sha256 = "199nf01hjxdalc76xhr306xyisvydjwqhhw40nx1krq9k3xy4z39"; }; meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-04-28"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "21102d5e3b6ffc6929d60418581ac1a29ee9eddd"; - sha256 = "16hdgxzbb31253178kyy1j77qpskq80dlnfdfxj2bh761zc237rn"; + rev = "9ff2a06cebd4c8c3af5259d713959ab310125bec"; + sha256 = "1jsrbimif11jvkdbb7kz6c9iykbql5kzx4q4p0njfdqmvkn4ybdb"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5016,24 +5016,24 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-04-27"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "6bc7681b489b04feff394f832984d14510e97e47"; - sha256 = "0syq7sp836glngfjv6ykbwa14bwyn1zr929ma2sxs5jvqj5sbzvx"; + rev = "7c74065823e073749652749a7a89c78c81749acf"; + sha256 = "1rbmksw2ia8rvfjncvyy77bcx1zwpragw1k9fv7n50xhpjsgahvc"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; nvim-neoclip-lua = buildVimPluginFrom2Nix { pname = "nvim-neoclip.lua"; - version = "2022-04-29"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-neoclip.lua"; - rev = "f3ff1645de5d2fd46ac8ffe86e440b7f3ae1fd11"; - sha256 = "0ayi9sfdj1rcz9zlib65vbpaf9jyyfkiqsadiq6ldgwj9wx6vvi4"; + rev = "5520ad7b24b0c4bc0b5371eef2492e787aa59a3a"; + sha256 = "050p667xqi15fddvyr2p11xpsr9sl2mapfi5x6g9ca4x1738jgsv"; }; meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; @@ -5052,12 +5052,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-05-01"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "ebe78bea13b60640816658ae798a199bd5118eb1"; - sha256 = "0mzbqfc5kw4qa9hifjkzf3i1adz38g1lg9m6395y3bc6zry73dxp"; + rev = "d4a01eedeb2e6c3d453f3aa0f1b303dd8611dc71"; + sha256 = "0i0nikpin6fab7x72mzjsxsfgpyjnk4fhmw7il51i2igllxm5krs"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -5076,24 +5076,24 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2022-04-13"; + version = "2022-05-05"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "ba6c48bf7919dd48a371e7b9c683b8858053e885"; - sha256 = "1pziragklk4zciy2q07llsa6ldqv090ynwclzrgwsv79l1rf9mzm"; + rev = "696b56fec29bad6daadafdc067955cd6010933bc"; + sha256 = "1j9i36ww0krq3k01l2rzd6qc29kc6w5cnl2lvb4m24n3k5rakjd4"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; nvim-solarized-lua = buildVimPluginFrom2Nix { pname = "nvim-solarized-lua"; - version = "2022-01-22"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "ishan9299"; repo = "nvim-solarized-lua"; - rev = "995ae7e0baa4b5d42c094ffa7d6b3fe9459397c3"; - sha256 = "01dsbdlizckvw34hwzq7jkdhsv5008jzj9p140c177zv4qps2kll"; + rev = "a6af3a33cfe78c97f3adb2d86d3165bb25fb0ec3"; + sha256 = "1z7wi72dqrw0fgsnm0s7zmxb72cq564dqvvpl1cqgizf4ab2a42a"; }; meta.homepage = "https://github.com/ishan9299/nvim-solarized-lua/"; }; @@ -5124,38 +5124,38 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-05-01"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "483f1550d1c53f7dcf261d40af5f993ffcb8b9c3"; - sha256 = "1syhjcf9pawc70apbrhrddsxyabqqs60f0s7yc759v6qb64nqshr"; + rev = "82ec79aac5557c05728d88195fb0d008cacbf565"; + sha256 = "1xxxapb093mljrw8yr7qm2nij7j0639pfpyc3pv9zgz6ivd4d6xc"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-05-01"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "4067351ffd6e5cfd5527873f6db9845e04527b8b"; - sha256 = "0232nmbp82wjpv3npb4302pmsdfcfs67cgl7775d552zqfr2va9r"; + rev = "f1373051e554cc4642cda719c8023e4e8508eb2d"; + sha256 = "1jfcjwyp57scwj164pxzh376mh2i4nx2sxx0gpihl3r4m067gb84"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2022-01-12"; + version = "2022-05-12"; src = fetchFromGitHub { - owner = "romgrk"; + owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "b7d7aba81683c1cd76141e090ff335bb55332cba"; - sha256 = "113vvcisnypfbbnw9l9jq0avsh95p286gay3vb60ykfxjfbxsw1q"; + rev = "a7916523e8107a57021cabae51917b7dae844aa6"; + sha256 = "0pqc31yp8prq5gkblasyyhf4cxi4gkqglp0jmvqmsax46r82ffz1"; }; - meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; + meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; nvim-treesitter-pyfold = buildVimPluginFrom2Nix { @@ -5220,12 +5220,12 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2022-04-24"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "a7767e2a1761078abb97f6516e45c56147e0952e"; - sha256 = "0ms95gxvydzf078y8mp2xqinm9bbk750nqc3ayyi26ipqba6f13x"; + rev = "190f8c83abb29504877b91c84ed3ceb6009ad3bd"; + sha256 = "1kq54zd1yx6q1ch886jcvhhydbxz9frky9wl60q00q62zgds8vmz"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -5280,12 +5280,12 @@ final: prev: nvimdev-nvim = buildVimPluginFrom2Nix { pname = "nvimdev.nvim"; - version = "2022-04-24"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "2bfb1156112267e1ab98c6779fb15cf858bf11b9"; - sha256 = "1bdx2lmyh9zvqlqah2knkhdnh5n1fcnav4iw0v9ls4845q2qh4i4"; + rev = "ef38441a7149087366bfc05654e7cc21a83df60e"; + sha256 = "0chdbsixjw3l6bvqdhf2na2hdwm94lzb66mssafbhgpq328y97wk"; }; meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; @@ -5316,12 +5316,12 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2022-04-26"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "622ab9feaa735dc0999e567183ce357f3dff080f"; - sha256 = "00prf7wb1p7daqly08h8l4ak5cmwbr76c5i40a8vfpn660wgj2zg"; + rev = "f5bd0c0336d6585a18b3ea95b4a40be068c74bbb"; + sha256 = "1cgkdrnk0yfrls5s4vjvkz0851c5877lmpnkh17nw1zn9rlds165"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; @@ -5364,12 +5364,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-04-26"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "bca9cfd1dc2e4311659d9ab85e6e7f3c8309a4d7"; - sha256 = "10xl1hmrkzklsxlbgkazp62h97ff7pz3dczsgx7mk8bzs8cq5433"; + rev = "1f6e3bbb20f45648f5680606e5e5d5e881133f1f"; + sha256 = "05vhgrsn8fbmrzc5hn9k34qscvdvrq30rl61lgsw0wsn49685ck9"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -5412,12 +5412,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-05-02"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "1a52ca239c726d62104fad012472c28a00cdcc22"; - sha256 = "17360m754y0fsxh95pl0zfl8jhhgw4hvk4991kxksrir0v3xsayz"; + rev = "675e58f6c7a889871911a5dc3e08491fe7b6b8a8"; + sha256 = "02czyx7gpd85ns2rndx52f5a07iq2qqm2zvhvfnmmmfpz11s26w6"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -5556,12 +5556,12 @@ final: prev: plenary-nvim = buildNeovimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2022-04-17"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "9069d14a120cadb4f6825f76821533f2babcab92"; - sha256 = "0pgzi0brqn4kcbv1k5d50xm0bcwaq50sk5jnj3q9ls2pvv7lb9a0"; + rev = "0a907364b5cd6e3438e230df7add8b9bb5ef6fd3"; + sha256 = "07k4vlpa1cxg4sxhwg0412ws13djspga16d67lqs545j5pfkgzr0"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -5834,12 +5834,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2022-04-27"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "fef309f654906d931f2c714a77f5182fe70ada7d"; - sha256 = "15y5v702xa2ax35p4sdv5ylkpz06pnrfi0jfp2isbl6z79p6dqv3"; + rev = "33ac6f3bcfe97447037ded20291d40de34d8912c"; + sha256 = "1m0bd72pjay9mlmf0lhii7yi4mch77dlqwadlsiyv9qw07w1b1s4"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -5870,12 +5870,12 @@ final: prev: rest-nvim = buildVimPluginFrom2Nix { pname = "rest.nvim"; - version = "2022-05-01"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "NTBBloodbath"; repo = "rest.nvim"; - rev = "e5f68db73276c4d4d255f75a77bbe6eff7a476ef"; - sha256 = "1gkml0101kai4cff2dlk8bv8rhsbiyr55hysvyv46gnxhisd8fy0"; + rev = "d902996de965d5d491f122e69ba9d03f9c673eb0"; + sha256 = "05vibdiig6lmiiixnnzc99adi6x4chkx02hqy51llahsdkg7369s"; }; meta.homepage = "https://github.com/NTBBloodbath/rest.nvim/"; }; @@ -5894,12 +5894,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2022-04-08"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "65705df886624833105f6f146ac4cf8c4d426aad"; - sha256 = "1xc83qih6pw1g3qrkjzmn3bri0xn8cmqiqykxajd77ijxjaq9xsp"; + rev = "9c1e490e5ff882e2f930ec015946a0b5b300037e"; + sha256 = "1msynng52mn47iqfwwi0n6wl37psj67pvyyz9kdb4l9r89ahqxax"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -5954,12 +5954,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2022-05-01"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "fe900a3d6028df4e7b7c89e8b0bf05b86af462ac"; - sha256 = "0mkbq5rk86jz5ckj1bg7z0s5x3j8kcldfc57gdk8r48bjkirds42"; + rev = "fbfcd9c4b7e40202ccf3db5035ac3c2b15a4413f"; + sha256 = "1plxhdr7j088nsq361zq35p4wmv9xd9xbgvi3mxr66mmmcm8k0pd"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -6123,12 +6123,12 @@ final: prev: slimv = buildVimPluginFrom2Nix { pname = "slimv"; - version = "2022-04-03"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "kovisoft"; repo = "slimv"; - rev = "eb5856c616466b0f463e27a30965ea142003a552"; - sha256 = "1c4hprzqzxkf0yqkqc8261qr7xk817nm28cp38dw4z1rmjcg1l04"; + rev = "cba9910aaad90dd5f1cd508ad98adebe2271069c"; + sha256 = "16zxvwrgiv5fafwm0b75ici35c630466mxdk4dww978152bxahzn"; }; meta.homepage = "https://github.com/kovisoft/slimv/"; }; @@ -6171,12 +6171,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2022-04-27"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "9ad83caa675cb5160760bf85dcb951946c994572"; - sha256 = "02sp13fbz12xbw7jh5l1isim7q66l54xdl82y4x245xh7h6mkvnh"; + rev = "06b51526ad1db6359ec65ef5326a020bcae46ab9"; + sha256 = "0yhn3hgqgdp56qcdy18zzhbx8z54g6i39prrbckpxi7mfh0i2lmm"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -6195,12 +6195,12 @@ final: prev: space-vim = buildVimPluginFrom2Nix { pname = "space-vim"; - version = "2022-02-15"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "space-vim"; - rev = "637390b17a8cd7d154a0d90a5c07612f1538a28e"; - sha256 = "0f43mspfnch1ifqa9rgvc64dmk0hz3cirz8iicpszmdr0fphq3xs"; + rev = "36f61f8e7157750f0e93d496d68b46d606d313b7"; + sha256 = "0pm630rq3ihjr4ikfzh08cpi2ps0qasp6dm8rdrm3zdf5b58i1bz"; }; meta.homepage = "https://github.com/liuchengxu/space-vim/"; }; @@ -6267,12 +6267,12 @@ final: prev: splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin.vim"; - version = "2022-05-02"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "64f68a641084d18903769ec138b8fab45477bd92"; - sha256 = "0if7z8yf75d5wamvlk76hxqvax7lrjmiiwdj4bf00j2pla5jydi8"; + rev = "37f5e795767ff14d2c8bf9cfb4998b9a0317feed"; + sha256 = "0klfadkqhv8a76qk074h9yll68wbabgsxbbhd4ba58sbv19qz35n"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -6316,12 +6316,12 @@ final: prev: stabilize-nvim = buildVimPluginFrom2Nix { pname = "stabilize.nvim"; - version = "2022-03-11"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "stabilize.nvim"; - rev = "786c818d7258b783afc192ac287b4365c5596dcf"; - sha256 = "07fd72p0qch0gfg92vcw3mlh7f8f1dii681qzpngnlk73ghq4ffw"; + rev = "174dfcd0197ebc7397c854ae8607f9c9e691eef5"; + sha256 = "1vi1gjkflrkm5fr432r23rbq474h26j9jyagdrkw6mkq3wgh4fcr"; }; meta.homepage = "https://github.com/luukvbaal/stabilize.nvim/"; }; @@ -6352,12 +6352,12 @@ final: prev: stylish-nvim = buildVimPluginFrom2Nix { pname = "stylish.nvim"; - version = "2022-02-11"; + version = "2022-02-01"; src = fetchFromGitHub { owner = "teto"; repo = "stylish.nvim"; - rev = "ea745ebf446410ef3d75f9890b2e7fd59be42e19"; - sha256 = "1kl2g32ls4s7kpr6395rdmsa7gdzkpfiypphmnxg8n75n0b0mwb3"; + rev = "279c18b7c35d1f6c650790b88e873e8a8a714f5e"; + sha256 = "09byh62f4ymkfpspk4sn5y0p9nsn3dphny94qcggfay1vddc3v93"; }; meta.homepage = "https://github.com/teto/stylish.nvim/"; }; @@ -6654,12 +6654,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2022-04-20"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "ee355b83e00475e11dec82e3ea166f846a392018"; - sha256 = "1s39si5fifv6bvjk8kzs2zy18ap5q22pfqg68wn5icnp588498hz"; + rev = "28e75f6cdb63b4903035c8db2845aaddb89f1610"; + sha256 = "1imyjajrx4irxn3m2plpz9g0crkfyiq5amivhn2mqvawk1l05zy5"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -6823,12 +6823,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-05-02"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "23e28d066a55a8e33bff33196f7bd65ea3ecbdbe"; - sha256 = "1yhc81k57ar58i0pwcwr28jsbkpcn8qqqjv95qcfi4hh14z75wfn"; + rev = "39b12d84e86f5054e2ed98829b367598ae53ab41"; + sha256 = "12krg8l13j4rqxqn9jx5nkpfpa3ffh2avv9z687ag7k1axvcak9h"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -7004,12 +7004,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2022-04-25"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "6c7f5dbdd69bc5611a85194ddca83ac2c8ee84d6"; - sha256 = "1c9hhwb77h6f4g1agkqmp0zccpbbyany2sgack1k9373y4q4c131"; + rev = "ea21c3ef51868a564eeace357f4a3d429f93efb1"; + sha256 = "1y8nb5cdlghf37sl872gx1rd28r437vxz94w90ydijin8hswcdqi"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -7064,12 +7064,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2022-03-18"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "691d490cc4eadc430d226fa7d77aaa84e2e0a125"; - sha256 = "1d218xxz936q53aknazhnfxhy9ncjyq76dna6y5n87kxn9hzqix1"; + rev = "da61737d860ddc12f78e638152834487eabf0ee5"; + sha256 = "1aa45r9z8mghak8f5gymhm875rssi1afs92h0mpnn43y0j76xy31"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -7148,12 +7148,12 @@ final: prev: unicode-vim = buildVimPluginFrom2Nix { pname = "unicode.vim"; - version = "2022-04-18"; + version = "2022-05-05"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "cc36bfa066d4a773e3152cc3c70051bc23ef2893"; - sha256 = "1npirr14khfmpvnvbmys98lxhy0yg5ah3270s85b9lp2xhxnkpps"; + rev = "176963d8e43dd54ff1582cb2374e731b51a7f5d5"; + sha256 = "030izymxcvs5hw8pqsmlqwxgzdbysh96q7qxk7mb2v15dh8qnv9d"; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; @@ -7172,12 +7172,12 @@ final: prev: urlview-nvim = buildVimPluginFrom2Nix { pname = "urlview.nvim"; - version = "2022-04-25"; + version = "2022-05-07"; src = fetchFromGitHub { owner = "axieax"; repo = "urlview.nvim"; - rev = "3b637651d5f0de185a0ceac783582692e204b053"; - sha256 = "1hpm1mhj9n6fnrkr5vpl1x80xgx7f2ic5vy9ndybbsppk2l8jrp4"; + rev = "92a6ae6f33839222ce4ea58f5cdaf0a3f235caca"; + sha256 = "0y3l0py0cnvj876xi5kgc7mmbycj7s61mj29ipsmn9bnjvk008yb"; }; meta.homepage = "https://github.com/axieax/urlview.nvim/"; }; @@ -7244,12 +7244,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2022-03-28"; + version = "2022-05-03"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "069349e5dbba9fbb24b88ebedb89f728387fae79"; - sha256 = "1rrzhg8qpvgvcm9fkr05hmkw95gn37pys0h0d6rii6qhbx9z95vs"; + rev = "d6ae9ca80284bd7df38b102ba280f0d132129c0f"; + sha256 = "087ila6rskhd7vi1yqlqmq781gqajh69y4dk7n9f4sza75hb210x"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -7580,12 +7580,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2022-04-12"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "be5bda1f1dbfa4e36b2adabaf3f423adfa66c336"; - sha256 = "1k0yv95i2kigggmh3dcg9rq6pkh7qcycsv9nm6jshgsfic8ly8n5"; + rev = "c4655701431a9c79704c827fd88a4783ec946879"; + sha256 = "1qsr3kkfx5vbhmnym0id2h9mph8bw6g75vwpqfi9vfmbg4fddh3l"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -7724,12 +7724,12 @@ final: prev: vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2022-04-21"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "544596a21c54ee0888a1f30f3bb31d472432d7d9"; - sha256 = "19ridsf6vgiknagplfdmbsg23wnl48j7n48z8qa3372x1v30c92p"; + rev = "c833f1dd0398901f5ad3f5f0ec2e07975e246294"; + sha256 = "1vafpp3m75dd8c453zq6w8qnapw7h5kpbzdx2s5fpjdn9qrg2g87"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; @@ -7952,12 +7952,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-04-27"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "7d1fb3baf5b92b707146262713f6fe30d49a2f15"; - sha256 = "0m7cgiysr95c1lssfsi84z1hhqv8bz32wsazk7jmxxn9j83696s5"; + rev = "5d0662d8d7e640a1ffb64b1b4dbbc41995391218"; + sha256 = "0bz6nrjsz1m2ibhbg4zc2z9slqfwnx5q6mc6favf9nw7j821s95g"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -8540,12 +8540,12 @@ final: prev: vim-eunuch = buildVimPluginFrom2Nix { pname = "vim-eunuch"; - version = "2022-05-01"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-eunuch"; - rev = "73b5e3fccfb5295e38546318c0d3139874c25efb"; - sha256 = "1xqx80a1g9r3lxfxb1ahrbfzmm4r6azm8iyc3430nwqx4jg72pp2"; + rev = "39e0232f490322c5a2d9e24275872f28da496a93"; + sha256 = "1wp5x5vximysab4c97d7x7y0hnnmycfm9h8mxxzz291ra5yrbbr2"; }; meta.homepage = "https://github.com/tpope/vim-eunuch/"; }; @@ -8660,12 +8660,12 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2022-02-15"; + version = "2022-05-05"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "6244d1739aad6682c6c1d5db18c846c342af6e3e"; - sha256 = "1w0d93wm0xwg8wyvyzdibjmnd1py343mvvzj911byvnm1b52zp7h"; + rev = "ab7876f86c05c1935eb23a193f4f276132902ac1"; + sha256 = "10i6akvr1ib2lwh6xwjchmpjzdabj2qs05h8h1ww9mdycj4q1pli"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -8732,12 +8732,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2022-04-26"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "b7287bd5421da62986d9abf9131509b2c9f918e4"; - sha256 = "1pk1qlr7lcifffsxm8fqy34p9nizv0n5mc0rl7xb7pr5c98a4vzz"; + rev = "a8139d37b242c5bc5ceeddc4fcd7dddf2b2c2650"; + sha256 = "1n22hjg374rs1412v4yvn3jc5nzd2jfsk3vzhaf8i3zv4b6w2vf1"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -8828,12 +8828,12 @@ final: prev: vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2022-04-25"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "988a6dbad9a9777cd94aab18ba7821a41068685b"; - sha256 = "178jzjwqjd15b3gjdyiay5fw9sv6s7jbzj1sgqfwlg2gm3m7g2fi"; + rev = "719d4ec06a0fb0aa9f1dfaebcf4f9691e8dc3f73"; + sha256 = "1mdpds4xpjcwfsm6r9w65hxwjsxm7pcr3dnkfh6v8xx0kyflmijp"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -8852,12 +8852,12 @@ final: prev: vim-glsl = buildVimPluginFrom2Nix { pname = "vim-glsl"; - version = "2022-02-06"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "tikhomirov"; repo = "vim-glsl"; - rev = "28a6dfbcd96095226bee90985b7f12c5679dbbb6"; - sha256 = "051f0q5bkgp77pz0izh5mvqsmxy0rzlvriwq4j7qzslqk7i850p2"; + rev = "bfd330a271933c3372fcfa8ce052970746c8e9dd"; + sha256 = "0nqpg95mh5z0wmiqvc8cfzq1gb99ximc1gbz9bv3x7239f66z5vn"; }; meta.homepage = "https://github.com/tikhomirov/vim-glsl/"; }; @@ -8948,24 +8948,24 @@ final: prev: vim-gutentags = buildVimPluginFrom2Nix { pname = "vim-gutentags"; - version = "2020-05-22"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "ludovicchabant"; repo = "vim-gutentags"; - rev = "50705e8ebb7038b31314f416d1bddd9cb9154049"; - sha256 = "0vm3bp94kbc28azsmm8505hyd9v1a9isrn5dp47njmj8w17l7725"; + rev = "b77b8fabcb0b052c32fe17efcc0d44f020975244"; + sha256 = "0wiqy5m7wvrmr3d2vy5j5lz6wh3z2c2v7amy9ji7prq1gxv3n095"; }; meta.homepage = "https://github.com/ludovicchabant/vim-gutentags/"; }; vim-hardtime = buildVimPluginFrom2Nix { pname = "vim-hardtime"; - version = "2022-03-13"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "takac"; repo = "vim-hardtime"; - rev = "5603072377d1f1f26a1561eda9e1884bb5f028ef"; - sha256 = "13279v9vd083xg6820gh15qxsyhbr7gjf7lzgy8w52xya852xsks"; + rev = "91177392e9372a1cf09a4b9b79532d2490bd405f"; + sha256 = "1f8vvm37yk125c0h28jbry9hshd3amrbfxcrg7j9qj9kdkad1zjq"; }; meta.homepage = "https://github.com/takac/vim-hardtime/"; }; @@ -9069,12 +9069,12 @@ final: prev: vim-highlightedyank = buildVimPluginFrom2Nix { pname = "vim-highlightedyank"; - version = "2022-01-25"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-highlightedyank"; - rev = "ff16bf3bac23fb4e17c976f4e1ff7941cd686c8d"; - sha256 = "0slnykqkbqnncz0vjwhf9p9x8wi5p8xfv485wbip1njd6vqhd965"; + rev = "f9db473137ca96c6a989ec3e2b7edf8a3189c448"; + sha256 = "0lj2w9nzqrmw33gcf8k1hf50mpwymhdyyv09mp9phanywg06l1ay"; }; meta.homepage = "https://github.com/machakann/vim-highlightedyank/"; }; @@ -9538,12 +9538,12 @@ final: prev: vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; - version = "2022-04-06"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "b0a81e42e6036f716bd9e6b025978dfb7dacaa53"; - sha256 = "1327i1pamz3bwhj1zyr2bjn142bhp45y1xlv8gs7dm7zyixfksd3"; + rev = "244a92ceae63b8c23a74022eaf205b431745fcb6"; + sha256 = "1y56xh4k7zqagsnw86lkm747l1x4i5l95r0jks4j35d1fcmpq81i"; }; meta.homepage = "https://github.com/embear/vim-localvimrc/"; }; @@ -9658,24 +9658,24 @@ final: prev: vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; - version = "2022-04-26"; + version = "2022-05-07"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-markdown"; - rev = "9068655bb74bb615b3876b4d4d6a1d1141e212f3"; - sha256 = "0s4ph2c8a1ha0cd95b2lf2i5irf4bwx34929i2c5p3ihk2701fsf"; + rev = "3a9643961233c2812816078af8bd1eaabc530dce"; + sha256 = "1yw8d1c5mjkjs93nby9xfx4jwxnb8zq36p1p7ciq808xzks42994"; }; meta.homepage = "https://github.com/preservim/vim-markdown/"; }; vim-markdown-composer = buildVimPluginFrom2Nix { pname = "vim-markdown-composer"; - version = "2022-01-04"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "euclio"; repo = "vim-markdown-composer"; - rev = "010ae3667fb0cb4c63c99439d1a8f81ebdcc849e"; - sha256 = "1hz0xjq0srv3llb4i6n2sw0pi2s0k3qcwyk6az5icrvkfhbnc0kf"; + rev = "5b79f425ebd28216d9aa472be3ba07cda41d9b24"; + sha256 = "0i4m2x2cw604aczp1ijnrv0wvh1b9bxg9zh0zmf8kk7b00zc1k5c"; fetchSubmodules = true; }; meta.homepage = "https://github.com/euclio/vim-markdown-composer/"; @@ -9695,12 +9695,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2022-04-20"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "1cb069f2a526682b3ce69610cf7c05511295ad37"; - sha256 = "09xwkzipsqiyglmyxkz0n6jycwp918mfxazqycy54zwng1c207q1"; + rev = "485e71120fea7be22f0ba051a05a00675276ced0"; + sha256 = "0zzn5gspi5811w1drbk362a75q4d697l0ngxgps00bcgvj9l8r6d"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -10247,12 +10247,12 @@ final: prev: vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2022-04-21"; + version = "2022-05-03"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "be55ec46b5ab031805487a9c3e895db57f53010b"; - sha256 = "03flkm75xp7g4kzwdmvz2dc2r1aqbkyknxbclvp38xk3qwwd5kvh"; + rev = "8fdabfba0b5a1b0616977a32d9e04b4b98a6016a"; + sha256 = "046j2cq4s14ys7n5b1lil5sgdis66mydd8bpsidcyq004k3zy2lc"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -10343,12 +10343,12 @@ final: prev: vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2022-04-27"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "df1e28dba36e69288173fdcdce122d98538ae782"; - sha256 = "1xqf3vrw5vy2pg87b840i87pxvi252rlw4q6fyldlzffxygk6zhq"; + rev = "d4aee3035699b82b3789cee0e88dad0e38c423ab"; + sha256 = "0gmpqp9wplq8pqrqfpardrj7g5mr16w4q9485wzy9nk86nsqavj9"; }; meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; @@ -10463,12 +10463,12 @@ final: prev: vim-quickrun = buildVimPluginFrom2Nix { pname = "vim-quickrun"; - version = "2022-04-16"; + version = "2022-05-08"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-quickrun"; - rev = "53917966d392d5517d38e63b2520bd2641763778"; - sha256 = "03cswzwfpjf0v3nnjr0141p03fswsv13kphhac4i3ajal30nh80h"; + rev = "276f39ab6507659ea8664c51b616a89ca9445875"; + sha256 = "1gxp1rqc0vxlpmqqwxbdz0mh2pkh3hdcvsxrh1f73ya3vzlgyqfy"; }; meta.homepage = "https://github.com/thinca/vim-quickrun/"; }; @@ -10511,12 +10511,12 @@ final: prev: vim-rails = buildVimPluginFrom2Nix { pname = "vim-rails"; - version = "2022-04-27"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "2f8adae670e3fe262b793885ae5d808d40c6f2ed"; - sha256 = "1mjjhnrpdcz85r1l3jriqa55ffdkr35c0vf85g3kzg9kqf8g9y0l"; + rev = "9c92dafe6894aed3fa81df7ac52cdd8e7a8ea9a6"; + sha256 = "050vkbj1y80f1kcmb0hfd2mha1bb4v3f2bvnazcymxn08z8frww7"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -10547,12 +10547,12 @@ final: prev: vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; - version = "2021-09-13"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "977b3ccbad1f7e5370354ae409fb2ea4a7ce2058"; - sha256 = "1vvjj3ql2dm3dniscxjmr5h9kfx005bgdxc1ppz6yi2q9spmchqg"; + rev = "ab0d42bb31b3317aa66dd1c0b506837cc6ca2835"; + sha256 = "0qv2ppmxpy72gb8ivz5cx19b4y8si4v428d9mmlx9q7mv9q4wmhq"; }; meta.homepage = "https://github.com/tpope/vim-rhubarb/"; }; @@ -10787,12 +10787,12 @@ final: prev: vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2022-01-13"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "0ea9b35882155996171fd15a5227e673ce2d2c60"; - sha256 = "1palz3375v400fjlxwpc4drm36rnffz86mdkyqdqssvm41fv0wkx"; + rev = "6e4b81303968f37346925d6907b96ef07788cc82"; + sha256 = "1z0nmfmn7ijj3hih4dbi1iq3dc6gpprck3fmidhmkv6vms041nx4"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -10823,12 +10823,12 @@ final: prev: vim-smoothie = buildVimPluginFrom2Nix { pname = "vim-smoothie"; - version = "2021-02-07"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "psliwka"; repo = "vim-smoothie"; - rev = "10fd0aa57d176718bc2c570f121ab523c4429a25"; - sha256 = "18zn29mkgdiddn3il393xzg7hpa0x25yvais1l29jq2711sg4rdc"; + rev = "b440f139a55cb5161cde3478729f6603d9d20d81"; + sha256 = "1hvv440zb3bwx1v8nyy3bk9vnhlbjy2a1hdfcmc37rghbni1kp0k"; }; meta.homepage = "https://github.com/psliwka/vim-smoothie/"; }; @@ -10871,12 +10871,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2022-04-30"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "45c8e00d0bae9056713097ea655d76d463b66f10"; - sha256 = "0zng2k82kwm0av1dyar6y44cq79v5khy07swwp6kmkz5vjj9y4dd"; + rev = "6f270bb2d26c38765ff2243e9337c65f8a96a28b"; + sha256 = "0jzafsk1ri2jfn26k962x2g6ygqrkrf3kwvd1ikx0hql0nhcvrrq"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -11292,12 +11292,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2022-04-19"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "7a5d832ca3086aeddc607304a2dde481b66f1719"; - sha256 = "0dnlq3iv7dq798m1llpn72b4kwvxrw7q7bgkswhaqhgcsb1xjxwz"; + rev = "2c4417db1d549f96a6a944bf4d85d8c797ab4a31"; + sha256 = "1rzhzl4w9k11maa1iy0a8sss3319jvp1viqqh0l7kgg13595acnk"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -11352,12 +11352,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2022-04-09"; + version = "2022-05-05"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "a99eb0bdf7d901d538b5dd724e2ab3a958c1799c"; - sha256 = "0mlb2qvxw7ds0b6jrxw5224mz1bzlzb4vly2wnygzrl6mhsk2xyw"; + rev = "6978fd32e3ca2c1c5591884eea0d57a7ee43d212"; + sha256 = "19dphm7xgfc0xvxrlys21zkp7ixbx62p11x6ms6xmwm8cjjh64pc"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -11424,12 +11424,12 @@ final: prev: vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2022-04-08"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "d5b820655e17c6ccd363885e5614652e4cffae95"; - sha256 = "0mp8g825l0zcj0gh3v5wa29dq5hhx0f96ijsd5bxhh694vppx8q5"; + rev = "046d0d5ac5fb2888447d1dd8b7e52fd0314f9766"; + sha256 = "17masfjxrhjcfqmlgf1jpmmz18j8vb4n88dl34rry6c3abiraprj"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -11797,12 +11797,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-05-02"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "9ffbe63a2055b59b09b18b1cd682e0b2703cc898"; - sha256 = "151ilpd7360rhpi3nyi5dfky814zx9zc4fa82wj6bnkcwy1b4k0c"; + rev = "dfaca59bbbf0079ab1b4f159337ae7f17d1b5289"; + sha256 = "1sbsirrl822dp9z1vynkhzbd2yhid9vcr9yzp540qrp6flcvf10q"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -11893,12 +11893,12 @@ final: prev: which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key.nvim"; - version = "2022-03-18"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "a3c19ec5754debb7bf38a8404e36a9287b282430"; - sha256 = "00kkl785ifx5sg49q65d4yzdgf08gyriqrils5n4zhz4pksd5z1a"; + rev = "bd4411a2ed4dd8bb69c125e339d837028a6eea71"; + sha256 = "0vf685xgdb967wmvffk1pfrvbhg1jkvzp1kb7r0vs90mg8gpv1aj"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -11917,12 +11917,12 @@ final: prev: wildfire-vim = buildVimPluginFrom2Nix { pname = "wildfire.vim"; - version = "2021-05-10"; + version = "2022-05-05"; src = fetchFromGitHub { owner = "gcmt"; repo = "wildfire.vim"; - rev = "fa91b732fd1c5acd23b7b32d5fbbc884eedafc8d"; - sha256 = "15gikqmpaf5c6687kgc5ib57pw7gyvxaihdv5549s7p2xkkbcl24"; + rev = "b371e2b1d938ae0e164146136051de164ecb9aa5"; + sha256 = "0lpv10330818aza0fv8adzswnq8jq47z043p6gqfn7b7h2visy5p"; }; meta.homepage = "https://github.com/gcmt/wildfire.vim/"; }; @@ -12098,12 +12098,12 @@ final: prev: zoxide-vim = buildVimPluginFrom2Nix { pname = "zoxide.vim"; - version = "2021-12-10"; + version = "2022-05-07"; src = fetchFromGitHub { owner = "nanotee"; repo = "zoxide.vim"; - rev = "c4e96f34b1b3160d6b6a6519588024412df27cd7"; - sha256 = "0zisr1r1z9ys0jkab1lvwy4klwkay07p0095f03r9qydnig8jgsm"; + rev = "5062d4c17ff873eeed88cabe317d7ee1a43c5731"; + sha256 = "1chq7fnygvb1wm7v0rg8cf0czn1q1i59kggg0jdvrnwf0f6m7nb4"; }; meta.homepage = "https://github.com/nanotee/zoxide.vim/"; }; @@ -12122,12 +12122,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-05-02"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "820c1913a77a12d080e3436e60a491327664589b"; - sha256 = "0lc5ldg65h4jqb6qkz22avzv4x2jmciabcsy47a9wkzy2l9hlvza"; + rev = "b6ac01c187359e305a2df8caea540f4527b91ab2"; + sha256 = "14rp8h59bnwpi86nnkmhxsgyszhhd26fzra7wjni2agdhf2410zp"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -12194,12 +12194,12 @@ final: prev: rose-pine = buildVimPluginFrom2Nix { pname = "rose-pine"; - version = "2022-04-25"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "da67a549cf5d67e15618cc3001f1e07724a1597f"; - sha256 = "1dfccfjy67b7269zypkdi7x6fcsdgw2qmd44kyk66qr6f9q4yng2"; + rev = "aa69b6a3d77068542c613d96419c3241a9fcbf46"; + sha256 = "0x9pn109my5rw627qmf5xawy3n40l9n3l6hp6np77y2rqlpn8m3y"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 04e28b5fc20..494d42a4c46 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -845,7 +845,7 @@ self: super: { libiconv ]; - cargoSha256 = "035v8mm8v7aj8qwhvxsp6k0afn05gi2xb1achzsvm0m4a8a9xs65"; + cargoSha256 = "0l1x7kprnxa95pbf8ml9ixmj0cmbnnv6nd0v6qry8j67rx8plpmp"; }; in '' @@ -974,7 +974,7 @@ self: super: { vim-markdown-composer-bin = rustPlatform.buildRustPackage rec { pname = "vim-markdown-composer-bin"; inherit (super.vim-markdown-composer) src version; - cargoSha256 = "03d7kap6vha1jmyfrjqaja5439x6mhnvjjbz3rmxb3x4dpppbpj1"; + cargoSha256 = "0q0i6kyihswrjrfdj4p3z54b779sdg2wz38z943ypj6dqphhcklx"; }; in super.vim-markdown-composer.overrideAttrs (oldAttrs: rec { diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 6369d0ca7c4..73f645e917d 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -533,6 +533,7 @@ https://github.com/chr4/sslsecure.vim/,, https://github.com/luukvbaal/stabilize.nvim/,, https://github.com/eigenfoo/stan-vim/,, https://github.com/darfink/starsearch.vim/,, +https://github.com/teto/stylish.nvim/,HEAD, https://github.com/lambdalisue/suda.vim/,, https://github.com/ervandew/supertab/,, https://github.com/ur4ltz/surround.nvim/,, From fd927b68f124a1e3ef377157071ddf978b1139f6 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Fri, 13 May 2022 18:28:32 -0700 Subject: [PATCH 117/166] vimPlugins.vim-jsonpath: init at 2020-06-16 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 51d065e89a8..4e35fd632b1 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -9380,6 +9380,18 @@ final: prev: meta.homepage = "https://github.com/google/vim-jsonnet/"; }; + vim-jsonpath = buildVimPluginFrom2Nix { + pname = "vim-jsonpath"; + version = "2020-06-16"; + src = fetchFromGitHub { + owner = "mogelbrod"; + repo = "vim-jsonpath"; + rev = "af9c07b87765fc5aee176a894bc91fb04a5e3c47"; + sha256 = "0l59c6xl4rly7xbfgsqam1rwcyvqhr7lzi3g2jpwirarm823rla9"; + }; + meta.homepage = "https://github.com/mogelbrod/vim-jsonpath/"; + }; + vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; version = "2021-01-12"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 73f645e917d..e3806c71a2f 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -787,6 +787,7 @@ https://github.com/maksimr/vim-jsbeautify/,, https://github.com/heavenshell/vim-jsdoc/,, https://github.com/elzr/vim-json/,, https://github.com/google/vim-jsonnet/,, +https://github.com/mogelbrod/vim-jsonpath/,HEAD, https://github.com/MaxMEllon/vim-jsx-pretty/,, https://github.com/peitalin/vim-jsx-typescript/,, https://github.com/knubie/vim-kitty-navigator/,, From bb0d2a305cf772a79d2a570d1355f14cd4a4f7da Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Fri, 13 May 2022 20:45:06 -0500 Subject: [PATCH 118/166] ctl: remove --- pkgs/development/libraries/ctl/default.nix | 41 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 pkgs/development/libraries/ctl/default.nix diff --git a/pkgs/development/libraries/ctl/default.nix b/pkgs/development/libraries/ctl/default.nix deleted file mode 100644 index 0a9f50a6aaa..00000000000 --- a/pkgs/development/libraries/ctl/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, ilmbase, libtiff, openexr }: - -stdenv.mkDerivation rec { - pname = "ctl"; - version = "1.5.2"; - - src = fetchFromGitHub { - owner = "ampas"; - repo = pname; - rev = "${pname}-${version}"; - sha256 = "0a698rd1cmixh3mk4r1xa6rjli8b8b7dbx89pb43xkgqxy67glwx"; - }; - - patches = [ - (fetchpatch { - name = "ctl-1.5.2-ilm_230.patch"; - url = "https://src.fedoraproject.org/rpms/CTL/raw/9d7c15a91bccdc0a9485d463bf2789be72e6b17d/f/ctl-1.5.2-ilm_230.patch"; - sha256 = "0mdx7llwrm0q8ai53zhyxi40i9h5s339dbkqpqv30yzi2xpnfj3d"; - }) - ]; - - postPatch = '' - # Fix include guard name - substituteInPlace lib/dpx/dpx_raw.hh \ - --replace CRL_DPX_RAW_INTERNAL_INCLUDE CTL_DPX_RAW_INTERNAL_INCLUDE - - # Fix undefined symbols (link with Imath) - substituteInPlace lib/IlmCtlMath/CMakeLists.txt \ - --replace "( IlmCtlMath IlmCtl )" "( IlmCtlMath IlmCtl Imath)" - ''; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libtiff ilmbase openexr ]; - - meta = with lib; { - description = "Color Transformation Language"; - homepage = "https://github.com/ampas/CTL"; - license = "A.M.P.A.S"; # BSD-derivative, free but GPL incompatible - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9bd5066863d..b6a629aed10 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -205,6 +205,7 @@ mapAliases ({ cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # Added 2022-01-07 crafty = throw "crafty has been removed: deleted by upstream"; # Added 2022-01-07 cryptol = throw "cryptol was removed due to prolonged broken build"; # Added 2020-08-21 + ctl = throw "ctl has been removed: abandoned by upstream"; # Added 2022-05-13 # CUDA Toolkit cudatoolkit_6 = throw "cudatoolkit_6 has been removed in favor of newer versions"; # Added 2021-02-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3226537e8b..1ea92bcdb51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16880,8 +16880,6 @@ with pkgs; python-cosmopolitan = callPackage ../development/interpreters/python-cosmopolitan { }; - ctl = callPackage ../development/libraries/ctl { }; - ctpp2 = callPackage ../development/libraries/ctpp2 { }; ctpl = callPackage ../development/libraries/ctpl { }; From 65c8b910906691ddb54946e904ac6081b8b453f5 Mon Sep 17 00:00:00 2001 From: yqrashawn Date: Sat, 14 May 2022 09:45:19 +0800 Subject: [PATCH 119/166] goku 0.5.1 -> 0.5.2 (#1) --- pkgs/os-specific/darwin/goku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix index 32a7f20befd..af70aaccc46 100644 --- a/pkgs/os-specific/darwin/goku/default.nix +++ b/pkgs/os-specific/darwin/goku/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "goku"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.zip"; - sha256 = "7c9304a5b4265575ca154bc0ebc04fcf812d14981775966092946cf82f65c782"; + sha256 = "506eccdabedc68c112778b13ded65099327267c2e3fd488916e3a340bc312954"; }; nativeBuildInputs = [ From 756c5d3df493e6fdb276dcd82f1bb85fff65c830 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 May 2022 01:59:25 +0000 Subject: [PATCH 120/166] python310Packages.pyomo: 6.4.0 -> 6.4.1 --- pkgs/development/python-modules/pyomo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix index 105f78b5824..3a9a80d5781 100644 --- a/pkgs/development/python-modules/pyomo/default.nix +++ b/pkgs/development/python-modules/pyomo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyomo"; - version = "6.4.0"; + version = "6.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { repo = "pyomo"; owner = "pyomo"; - rev = version; - hash = "sha256-FdUhne5Dn5hTIXMce1G6Zu6nx+AuP/JdK0a5fCE3hg8="; + rev = "refs/tags/${version}"; + hash = "sha256-LwlUib/CeVCCmgpTHtYHcFyxk9Esx1zhZ3yGHeGpugY="; }; propagatedBuildInputs = [ From 948bf6d0cdd4396ebd7294b932dc00c0ea30164d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 26 Apr 2022 04:05:16 +0000 Subject: [PATCH 121/166] authenticator: 4.0.3 -> 4.1.1 --- .../misc/authenticator/default.nix | 46 ++++++------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/pkgs/applications/misc/authenticator/default.nix b/pkgs/applications/misc/authenticator/default.nix index ffa34d041e9..e100c880739 100644 --- a/pkgs/applications/misc/authenticator/default.nix +++ b/pkgs/applications/misc/authenticator/default.nix @@ -3,11 +3,11 @@ , fetchFromGitLab , fetchpatch , appstream-glib +, clang , desktop-file-utils , meson , ninja , pkg-config -, python3 , rustPlatform , wrapGAppsHook , gdk-pixbuf @@ -15,7 +15,9 @@ , gst_all_1 , gtk4 , libadwaita +, libclang , openssl +, pipewire , sqlite , wayland , zbar @@ -23,33 +25,29 @@ stdenv.mkDerivation rec { pname = "authenticator"; - version = "4.0.3"; + version = "4.1.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Authenticator"; rev = version; - sha256 = "0fvs76f3fm5pxn7wg6sjbqpgip5w2j7xrh4siasdcl2bx6vsld8b"; + hash = "sha256-wl7wyj0vVDkOB7XKQFOEFzCmffTsrUsaM83fWgZ6tG0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "1s97jyszxf24rs3ni11phiyvmp1wm8sicb0rh1jgwz4bn1cnakx4"; + hash = "sha256-3SzemDjLsZUXPPtSlDMBQXQf5P3Sz8caJL73mHRv1js="; }; - postPatch = '' - patchShebangs build-aux - ''; - nativeBuildInputs = [ appstream-glib + clang desktop-file-utils meson ninja pkg-config - python3 wrapGAppsHook ] ++ (with rustPlatform; [ cargoSetupHook @@ -62,39 +60,23 @@ stdenv.mkDerivation rec { glib gst_all_1.gstreamer gst_all_1.gst-plugins-base - - # gst-plugins-good needs gtk4 support: - # https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/767 - # We copy the way it is built from the Flatpak: - # https://gitlab.gnome.org/World/Authenticator/-/blob/master/build-aux/com.belmoussaoui.Authenticator.Devel.json - (gst_all_1.gst-plugins-good.overrideAttrs (old: { - patches = old.patches or [ ] ++ [ - "${src}/build-aux/767.patch" - ]; - mesonFlags = old.mesonFlags ++ [ - "-Dgtk3=disabled" - "-Dgtk4=enabled" - "-Dgtk4-experiments=true" - ]; - buildInputs = old.buildInputs ++ [ - gtk4 - ]; - })) - (gst_all_1.gst-plugins-bad.override { enableZbar = true; }) gtk4 libadwaita openssl + pipewire sqlite wayland zbar ]; - meta = with lib; { - broken = true; # https://gitlab.gnome.org/World/Authenticator/-/issues/271 + LIBCLANG_PATH = "${lib.getLib libclang}/lib"; + + meta = { description = "Two-factor authentication code generator for GNOME"; homepage = "https://gitlab.gnome.org/World/Authenticator"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dotlambda ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dotlambda ]; + platforms = lib.platforms.linux; }; } From dda9791d799b423f5f9ed40eb9f47d8b06af175c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 May 2022 02:34:32 +0000 Subject: [PATCH 122/166] python310Packages.hatasmota: 0.4.1 -> 0.5.0 --- pkgs/development/python-modules/hatasmota/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index db524438d63..5f09cb3b735 100644 --- a/pkgs/development/python-modules/hatasmota/default.nix +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.4.1"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "emontnemery"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-So3wnz6HBGlgBgBJiU4m+fFx7f8Y+6c15OCD8GFGQaE="; + sha256 = "sha256-pIMao1zZXJJVEG9J9ypWlo/JF0nmci49ANcqHJSY2AY="; }; propagatedBuildInputs = [ From bf2d9471761da30968558e01df1c3aa719d4235d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 May 2022 02:48:46 +0000 Subject: [PATCH 123/166] python310Packages.hahomematic: 1.3.0 -> 1.3.1 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 879ffbf7123..27c1a673eee 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "1.3.0"; + version = "1.3.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-033iPQfFF26Ly8OVdjExDZDoQ35DXuVF7dXqokA7k/s="; + sha256 = "sha256-RgjsaGtji5vSQcv+npOYcXJNYUhx9Snz56BXnfoc2QY="; }; propagatedBuildInputs = [ From f9856227d950f4079767a3ecec6eddff1549e3e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 May 2022 03:34:58 +0000 Subject: [PATCH 124/166] python310Packages.mypy-boto3-s3: 1.22.8 -> 1.23.0.post1 --- pkgs/development/python-modules/mypy-boto3-s3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 6fa1728deea..987aa20d2db 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.22.8"; + version = "1.23.0.post1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Br7HlymKuQUbI+iw90HWi1lSnEFwQbziBLokAHTzGEk="; + hash = "sha256-eF0ChMOqisXsMWLlKCAWGMrTUe4sGfZxWo5uc/ZKAQk="; }; propagatedBuildInputs = [ From 94166f5520c4924f94e798b4a5a517b60ba50a71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 May 2022 03:58:24 +0000 Subject: [PATCH 125/166] python310Packages.azure-mgmt-containerservice: 19.0.0 -> 19.1.0 --- .../python-modules/azure-mgmt-containerservice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 4a502ac65db..df03e41d56b 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "19.0.0"; + version = "19.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-UHkSUoNzXWomr4vczGRRXVJplVRfqDjwFczkOP2Jwsc="; + sha256 = "sha256-t06Cesxvjk31aDxkX2Yj0VzFubWbiAc26LzNTIgVEqs="; }; propagatedBuildInputs = [ From 129c36e547004c4b11ac44aac7c0fc21cf6b51c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 11 May 2022 00:34:09 +0000 Subject: [PATCH 126/166] clickclack: 0.2.2 -> 0.2.3 --- pkgs/tools/misc/clickclack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/clickclack/default.nix b/pkgs/tools/misc/clickclack/default.nix index c7e1cbee79a..da351dbbc69 100644 --- a/pkgs/tools/misc/clickclack/default.nix +++ b/pkgs/tools/misc/clickclack/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "clickclack"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromSourcehut { owner = "~proycon"; repo = "clickclack"; rev = version; - hash = "sha256-ABVfJRSzbQ6jIpON2g2wS52QsyNQVfW6+AhTvjkkf6s="; + hash = "sha256-YmlbGEmZgT/30c+mWQzdz4rKc69d75zhoNUA5FdxdMc="; }; buildInputs = [ From 53933404f032563cda7655b1b849c5803424978f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 May 2022 04:12:28 +0000 Subject: [PATCH 127/166] python310Packages.azure-mgmt-datafactory: 2.4.0 -> 2.5.0 --- .../python-modules/azure-mgmt-datafactory/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index d26033c414f..fc638390a3b 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "2.4.0"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-oCDh7tWsBA6z/auQm3AtkRzT9IUrq8HJ+R//HDJ+1nw="; + hash = "sha256-vV+VAK+lesBylrIsGB+MZCT4kW84beFSIYJZfOzPoTY="; }; propagatedBuildInputs = [ From 545be00e305b14e165055e0d311f6eedbc38cc98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 14 May 2022 04:14:54 +0000 Subject: [PATCH 128/166] python3Packages.humblewx: use correct interpreter --- pkgs/development/python-modules/humblewx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/humblewx/default.nix b/pkgs/development/python-modules/humblewx/default.nix index 7fd0b0e8dd9..58672a3663e 100644 --- a/pkgs/development/python-modules/humblewx/default.nix +++ b/pkgs/development/python-modules/humblewx/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , buildPythonPackage , wxPython_4_0 -, python3 +, python }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck for i in examples/*; do - ${python3.interpreter} $i + ${python.interpreter} $i done runHook postCheck ''; From cec00ad9e8b9167042c63f294c7bbe3dbcee7d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 14 May 2022 04:16:55 +0000 Subject: [PATCH 129/166] python3Packages.pynest2d: use correct interpreter --- pkgs/development/python-modules/pynest2d/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynest2d/default.nix b/pkgs/development/python-modules/pynest2d/default.nix index 9be7072a89f..dd290ad5782 100644 --- a/pkgs/development/python-modules/pynest2d/default.nix +++ b/pkgs/development/python-modules/pynest2d/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, python3, cmake +{ lib, buildPythonPackage, fetchFromGitHub, python, cmake , libnest2d, sip_4, clipper }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { CLIPPER_PATH = "${clipper.out}"; postPatch = '' - sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python3.sitePackages}#' cmake/SIPMacros.cmake + sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake ''; meta = with lib; { From c8ecf276de11f219b916abe9e0c5f2c5da96f1e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 14 May 2022 04:19:58 +0000 Subject: [PATCH 130/166] python3Packages.xdot: use correct interpreter --- pkgs/development/python-modules/xdot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix index fa24256b6a0..a07235006c9 100644 --- a/pkgs/development/python-modules/xdot/default.nix +++ b/pkgs/development/python-modules/xdot/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, python3, xvfb-run +{ lib, buildPythonPackage, fetchPypi, isPy3k, python, xvfb-run , wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gtk3, numpy }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; checkPhase = '' - xvfb-run -s '-screen 0 800x600x24' ${python3.interpreter} nix_run_setup test + xvfb-run -s '-screen 0 800x600x24' ${python.interpreter} nix_run_setup test ''; # https://github.com/NixOS/nixpkgs/pull/107872#issuecomment-752175866 From d04e0ed86afef1af5567cb0786f82f7cbdb7121f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 14 May 2022 04:24:09 +0000 Subject: [PATCH 131/166] python3Packages.hg-commitsigs: use correct interpreter --- pkgs/development/python-modules/hg-commitsigs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/hg-commitsigs/default.nix b/pkgs/development/python-modules/hg-commitsigs/default.nix index 5c195bfe19f..a97c2be2b98 100644 --- a/pkgs/development/python-modules/hg-commitsigs/default.nix +++ b/pkgs/development/python-modules/hg-commitsigs/default.nix @@ -1,7 +1,7 @@ { lib , fetchhg , stdenv -, python3 +, python }: stdenv.mkDerivation rec { @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' - mkdir -p $out/lib/${python3.libPrefix}/site-packages/hgext3rd/ + mkdir -p $out/lib/${python.libPrefix}/site-packages/hgext3rd/ install -D $src/commitsigs.py \ - $out/lib/${python3.libPrefix}/site-packages/hgext3rd/ + $out/lib/${python.libPrefix}/site-packages/hgext3rd/ ''; meta = with lib; { From 97fba10b462784d9947e546fd077ba4092b5f8c6 Mon Sep 17 00:00:00 2001 From: Berry Phillips Date: Sat, 14 May 2022 14:09:18 +0900 Subject: [PATCH 132/166] maintainers: add berryp --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 68db0e24a77..e5e5f37dadf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1544,6 +1544,12 @@ githubId = 410028; name = "Tobias Bergkvist"; }; + berryp = { + email = "berryphillips@gmail.com"; + github = "berryp"; + githubId = 19911; + name = "Berry Phillips"; + }; betaboon = { email = "betaboon@0x80.ninja"; github = "betaboon"; From 2a38902f2a162c06f35d5b62b9742bf9b4ed2bb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 14 May 2022 06:58:07 +0200 Subject: [PATCH 133/166] sysdig: 0.28.0 -> 0.29.3 --- pkgs/os-specific/linux/sysdig/default.nix | 39 +++++++++++++++++++---- 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 39c07f48a29..4f5f3b585da 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,27 +1,50 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, kernel, installShellFiles, pkg-config , luajit, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, protobuf, grpc +, libyamlcpp, nlohmann_json }: with lib; let # Compare with https://github.com/draios/sysdig/blob/dev/cmake/modules/falcosecurity-libs.cmake - libsRev = "2160111cd088aea9ae2235d3385ecb0b1ab6623c"; - libsSha256 = "sha256-TOuxXtrxujyAjzAtlX3/eCfM16mwxnmZ6Wg44SG0dTs="; + libsRev = "e5c53d648f3c4694385bbe488e7d47eaa36c229a"; + libsSha256 = "sha256-pG10y5PpDqaF/cq8oAvax5B/ls2UTRQd7tCfBjWVf0U="; + + # Compare with https://github.com/falcosecurity/libs/blob/master/cmake/modules/valijson.cmake#L17 + valijson = fetchFromGitHub { + owner = "tristanpenman"; + repo = "valijson"; + rev = "v0.6"; + sha256 = "sha256-ZD19Q2MxMQd3yEKbY90GFCrerie5/jzgO8do4JQDoKM="; + }; + in stdenv.mkDerivation rec { pname = "sysdig"; - version = "0.28.0"; + version = "0.29.3"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "sha256-oE3vCmOw+gcmvGqj7Xk5injpNC/YThckJMNg5XRFhME="; + sha256 = "sha256-dMLeroOd9CgvmgQdPfX8oBxQSyksZi/hP4vO03JhlF0="; }; nativeBuildInputs = [ cmake perl installShellFiles pkg-config ]; buildInputs = [ - luajit ncurses jsoncpp libb64 openssl curl jq gcc elfutils tbb protobuf grpc + luajit + ncurses + libb64 + openssl + curl + jq + gcc + elfutils + tbb + protobuf + grpc + libyamlcpp + jsoncpp + nlohmann_json ] ++ optionals (kernel != null) kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; @@ -34,7 +57,7 @@ stdenv.mkDerivation rec { sha256 = libsSha256; }} libs chmod -R +w libs - cmakeFlagsArray+=("-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs") + cmakeFlagsArray+=("-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs" "-DVALIJSON_INCLUDE=${valijson}/include") ''; cmakeFlags = [ @@ -47,6 +70,10 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg -DluaL_getn(L,i)=((int)lua_objlen(L,i))"; preConfigure = '' + if ! grep -q "${libsRev}" cmake/modules/falcosecurity-libs.cmake; then + echo "falcosecurity-libs checksum needs to be updated!" + exit 1 + fi cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl -labsl_synchronization") '' + optionalString (kernel != null) '' export INSTALL_MOD_PATH="$out" From cf218b9fa63d7b2f9534cd418a5cfdc10b51b42f Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 14 May 2022 17:48:55 +1200 Subject: [PATCH 134/166] poetry2nix: 1.29.0 -> 1.29.1 --- pkgs/development/tools/poetry2nix/poetry2nix/default.nix | 2 +- .../tools/poetry2nix/poetry2nix/overrides/build-systems.json | 3 +++ .../tools/poetry2nix/poetry2nix/overrides/default.nix | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 45a7e6619d1..c99e0047f0d 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -5,7 +5,7 @@ }: let # Poetry2nix version - version = "1.29.0"; + version = "1.29.1"; inherit (poetryLib) isCompatible readTOML moduleName; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json index 78e1e87f6bf..dca0936ca73 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json @@ -801,6 +801,9 @@ "notebook-shim": [ "jupyter-packaging" ], + "notify-py": [ + "poetry-core" + ], "notus-scanner": [ "poetry-core" ], diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix index 83e5bb339dd..57250f0d101 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix @@ -1891,7 +1891,7 @@ lib.composeManyExtensions [ # Fix library paths postPatch = old.postPatch or "" + '' - ${self.python.pythonForBuild.interpreter} ${./shapely-rewrite.py} shapely/geos.py + ${pkgs.python3.interpreter} ${./shapely-rewrite.py} shapely/geos.py ''; } ); From 6a72b99a9d0c09dc7d15bfe33f8e00fcf96fad33 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Sat, 14 May 2022 13:51:08 +0800 Subject: [PATCH 135/166] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 2fcf4bc890b..c388d703e3f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3082,6 +3082,7 @@ broken-packages: - LTS - lua-bc - luautils + - lucid2 - lucid-htmx - lucid-hyperscript - luis-client diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index cdabe961442..9c9c66bc38e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -176580,6 +176580,8 @@ self: { ]; description = "Clear to write, read and edit DSL for HTML"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "lucienne" = callPackage From 6a0c84d59493aa2cecdb2d422431f8223d06edd4 Mon Sep 17 00:00:00 2001 From: midchildan Date: Sat, 14 May 2022 15:24:01 +0900 Subject: [PATCH 136/166] epgstation: keep old buildInputs in overrideAttrs --- pkgs/applications/video/epgstation/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/applications/video/epgstation/default.nix index 323b22c7883..1f5d23a684a 100644 --- a/pkgs/applications/video/epgstation/default.nix +++ b/pkgs/applications/video/epgstation/default.nix @@ -41,7 +41,7 @@ let # dependencies are pruned afterwards. production = false; - buildInputs = [ bash ]; + buildInputs = (drv.buildInputs or [ ]) ++ [ bash ]; nativeBuildInputs = (drv.nativeBuildInputs or [ ]) ++ [ makeWrapper ]; From 2686f10fb4b40c5406a7458945d8e41dcbadf240 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 14 May 2022 18:23:55 +1200 Subject: [PATCH 137/166] emacs.pkgs.ement: unstable-2022-05-05 -> unstable-2022-05-14 --- .../editors/emacs/elisp-packages/ement/default.nix | 6 +++--- .../elisp-packages/ement/handle-nil-images.patch | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix index d6e8de3efad..f89d0ce8007 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix @@ -13,13 +13,13 @@ trivialBuild { pname = "ement"; - version = "unstable-2022-05-05"; + version = "unstable-2022-05-14"; src = fetchFromGitHub { owner = "alphapapa"; repo = "ement.el"; - rev = "84739451afa8355360966dfa788d469d9dc4a8e3"; - sha256 = "sha256-XdegBKZfoKbFaMM/l8249VD9KKC5/4gQIK6ggPcoOaE="; + rev = "961d650377f9e7440e47c36c0386e899f5b2d86b"; + sha256 = "sha256-4KTSPgso7UvzCRKNFI3YaPR1t4DUwggO4KtBYLm0W4Y="; }; packageRequires = [ diff --git a/pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch b/pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch index 547fee16405..271e1cd2dba 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch +++ b/pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch @@ -1,8 +1,8 @@ -diff --git a/ement.el b/ement.el -index c9596a7..1b33045 100644 ---- a/ement.el -+++ b/ement.el -@@ -682,14 +682,15 @@ can cause undesirable underlining." +diff --git a/ement-lib.el b/ement-lib.el +index f0b2738..025a191 100644 +--- a/ement-lib.el ++++ b/ement-lib.el +@@ -644,14 +644,15 @@ can cause undesirable underlining." "Return a copy of IMAGE set to MAX-WIDTH and MAX-HEIGHT. IMAGE should be one as created by, e.g. `create-image'." ;; It would be nice if the image library had some simple functions to do this sort of thing. @@ -24,5 +24,5 @@ index c9596a7..1b33045 100644 + (image-property new-image :max-height) max-height) + new-image))) - ;;;;; Reading/writing sessions - + (defun ement--room-alias (room) + "Return latest m.room.canonical_alias event in ROOM." From 05dd614c533851adaa69ea8481202ef4f595ed16 Mon Sep 17 00:00:00 2001 From: Yt Date: Sat, 14 May 2022 02:28:59 -0400 Subject: [PATCH 138/166] redpanda: fix linux build (#172964) * redpanda: fix linux build * redpanda: linux arm hash update Co-authored-by: Bobby Rong * redpanda: darwin arm hash update Co-authored-by: Bobby Rong Co-authored-by: Bobby Rong --- pkgs/servers/redpanda/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index 6b0704b04a5..c2060560c59 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -4,13 +4,19 @@ let version = "21.11.15"; platform = if stdenv.isLinux then "linux" else "darwin"; arch = if stdenv.isAarch64 then "arm" else "amd"; + sha256s = { + darwin.amd = "sha256-Yf4O7lVcf+nmb0wFTx7jLjUSmdAItoUfPlkhHveI9UY="; + darwin.arm = "sha256-vKfFBheDZtvcbg0zbj3rqUEQczZvySuGuM3RopnDJG8="; + linux.amd = "sha256:0vpxn7kcpqylk0nc74m6yxgwwf8ns8pyb6kxnmnmv2x58f8x4c8n"; + linux.arm = "sha256-1AQSB2V5zGivU0UinTST2kOydQf/bmLbpjdW0Yo4ptE="; + }; in stdenv.mkDerivation rec { pname = "redpanda"; inherit version; src = fetchzip { url = "https://github.com/redpanda-data/redpanda/releases/download/v${version}/rpk-${platform}-${arch}64.zip"; - sha256 = "sha256-Yf4O7lVcf+nmb0wFTx7jLjUSmdAItoUfPlkhHveI9UY="; + sha256 = sha256s.${platform}.${arch}; }; installPhase = '' From 888446ed3167f3f118d132ff417b1321cf47a0fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 May 2022 06:33:30 +0000 Subject: [PATCH 139/166] python310Packages.pip-tools: 6.6.0 -> 6.6.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 d0569652812..2b079c8f00e 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "6.6.0"; + version = "6.6.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mKokAERAocBInXGlZ6Tor98jx3gr/0g9EhmIHnMC3oM="; + sha256 = "sha256-Y04+jUcHJXwAQxPRap1sFMHOlNPA+h+Tw40mRAHy5PI="; }; checkInputs = [ From aaab91679f26ecc2a4db8a28cf8ad83efc3fe586 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 May 2022 06:47:56 +0000 Subject: [PATCH 140/166] python310Packages.motionblinds: 0.6.5 -> 0.6.7 --- pkgs/development/python-modules/motionblinds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix index f3cf778fcba..e2a27b56cac 100644 --- a/pkgs/development/python-modules/motionblinds/default.nix +++ b/pkgs/development/python-modules/motionblinds/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "motionblinds"; - version = "0.6.5"; + version = "0.6.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "motion-blinds"; rev = "refs/tags/${version}"; - sha256 = "sha256-RAGsVHi/f+0gIzVomhC8h3JvoD4EEe6dK9PBi5daTgU="; + sha256 = "sha256-c6+kctEB4gwLGTgTA+sUA3v9ST4dn4RFPbyaXSgGvoQ="; }; propagatedBuildInputs = [ From fe71649c49abe36063fd7faac94d4a11db0e1b37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 May 2022 07:40:20 +0000 Subject: [PATCH 141/166] jc: 1.18.8 -> 1.19.0 --- pkgs/development/python-modules/jc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index d7f8e6c5a1b..cff3ad1c737 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.18.8"; + version = "1.19.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tZrvWMt0qdOFTNeL99mZGFl8bVDGCqj25zVl7QvXQLw="; + sha256 = "sha256-0UOU4arSCh+5l258mwZQLNf/JUbPcTgcHtusiTyYPwg="; }; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; From bec9150f645ac954bcafd496d6c3b74ddab2838d Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 14 May 2022 08:44:24 +0000 Subject: [PATCH 142/166] lazydocker: 0.13 -> 0.18.1 --- pkgs/tools/misc/lazydocker/default.nix | 18 ++++++++++++------ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix index cfdce8e3c0b..985cc472138 100644 --- a/pkgs/tools/misc/lazydocker/default.nix +++ b/pkgs/tools/misc/lazydocker/default.nix @@ -1,19 +1,25 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "lazydocker"; - version = "0.13"; + version = "0.18.1"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazydocker"; rev = "v${version}"; - sha256 = "sha256-thUm33AdP9Huc2vcTRatC1ULHZd0edEQggEGTqOV3a0="; + sha256 = "sha256-qtGPsfZVu5ZuCusO5nYgxR/qHiwyhzMmBMLMDpKzKDA="; }; - goPackagePath = "github.com/jesseduffield/lazydocker"; + vendorSha256 = null; - subPackages = [ "." ]; + postPatch = '' + rm -f pkg/config/app_config_test.go + ''; + + excludedPackages = [ "scripts" "test/printrandom" ]; + + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "A simple terminal UI for both docker and docker-compose"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb1ed2c4b0d..7af9936acd7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -750,7 +750,9 @@ with pkgs; installShellFiles = callPackage ../build-support/install-shell-files {}; - lazydocker = callPackage ../tools/misc/lazydocker { }; + lazydocker = callPackage ../tools/misc/lazydocker { + buildGoModule = buildGo118Module; + }; ld-is-cc-hook = makeSetupHook { name = "ld-is-cc-hook"; } ../build-support/setup-hooks/ld-is-cc-hook.sh; From f7ef6329bb21c02342f315201eec0f71e50c0c4c Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Fri, 13 May 2022 16:48:49 -0700 Subject: [PATCH 143/166] ocamlPackages: add meta.mainProgram to many packages --- pkgs/development/ocaml-modules/atd/default.nix | 3 ++- pkgs/development/ocaml-modules/awa/default.nix | 3 ++- pkgs/development/ocaml-modules/bisect_ppx/default.nix | 3 ++- .../development/ocaml-modules/ca-certs-nss/default.nix | 5 +++-- pkgs/development/ocaml-modules/checkseum/default.nix | 3 ++- pkgs/development/ocaml-modules/coin/default.nix | 3 ++- pkgs/development/ocaml-modules/cpdf/default.nix | 5 +++-- pkgs/development/ocaml-modules/decompress/default.nix | 3 ++- pkgs/development/ocaml-modules/dns/client.nix | 1 + pkgs/development/ocaml-modules/hidapi/default.nix | 3 ++- pkgs/development/ocaml-modules/irmin/pack.nix | 1 + pkgs/development/ocaml-modules/irmin/unix.nix | 1 + pkgs/development/ocaml-modules/janestreet/0.14.nix | 10 ++++++++-- pkgs/development/ocaml-modules/lablgl/default.nix | 3 ++- pkgs/development/ocaml-modules/lambda-term/default.nix | 8 ++++---- pkgs/development/ocaml-modules/letsencrypt/app.nix | 1 + pkgs/development/ocaml-modules/lustre-v6/default.nix | 3 ++- pkgs/development/ocaml-modules/lutils/default.nix | 1 + pkgs/development/ocaml-modules/mrmime/default.nix | 5 +++-- pkgs/development/ocaml-modules/ocaml-lsp/default.nix | 1 + pkgs/development/ocaml-modules/otfm/default.nix | 3 ++- .../ocaml-modules/phylogenetics/default.nix | 5 +++-- pkgs/development/ocaml-modules/tuntap/default.nix | 3 ++- pkgs/development/ocaml-modules/uuuu/default.nix | 5 +++-- pkgs/development/ocaml-modules/vg/default.nix | 3 ++- pkgs/development/ocaml-modules/wayland/default.nix | 3 ++- pkgs/development/ocaml-modules/webbrowser/default.nix | 1 + pkgs/development/ocaml-modules/wodan/unix.nix | 5 ++++- .../tools/ocaml/ocaml-recovery-parser/default.nix | 3 ++- pkgs/development/tools/ocaml/ocamlscript/default.nix | 1 + 30 files changed, 67 insertions(+), 31 deletions(-) diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix index 5ff5496ed6f..81b9567fcdc 100644 --- a/pkgs/development/ocaml-modules/atd/default.nix +++ b/pkgs/development/ocaml-modules/atd/default.nix @@ -17,9 +17,10 @@ buildDunePackage rec { }; meta = with lib; { - homepage = "https://github.com/mjambon/atd"; description = "Syntax for cross-language type definitions"; + homepage = "https://github.com/mjambon/atd"; license = licenses.mit; maintainers = with maintainers; [ aij jwilberding ]; + mainProgram = "atdcat"; }; } diff --git a/pkgs/development/ocaml-modules/awa/default.nix b/pkgs/development/ocaml-modules/awa/default.nix index d870ab86505..eba150e3402 100644 --- a/pkgs/development/ocaml-modules/awa/default.nix +++ b/pkgs/development/ocaml-modules/awa/default.nix @@ -32,9 +32,10 @@ buildDunePackage rec { meta = with lib; { description = "SSH implementation in OCaml"; - license = licenses.isc; homepage = "https://github.com/mirage/awa-ssh"; changelog = "https://github.com/mirage/awa-ssh/raw/v${version}/CHANGES.md"; + license = licenses.isc; maintainers = [ maintainers.sternenseemann ]; + mainProgram = "awa_lwt_server"; }; } diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/pkgs/development/ocaml-modules/bisect_ppx/default.nix index 48b9684902c..fdfc61e73c3 100644 --- a/pkgs/development/ocaml-modules/bisect_ppx/default.nix +++ b/pkgs/development/ocaml-modules/bisect_ppx/default.nix @@ -21,8 +21,9 @@ buildDunePackage rec { meta = with lib; { description = "Bisect_ppx is a code coverage tool for OCaml and Reason. It helps you test thoroughly by showing what's not tested."; - license = licenses.mit; homepage = "https://github.com/aantron/bisect_ppx"; + license = licenses.mit; maintainers = with maintainers; [ ]; + mainProgram = "bisect-ppx-report"; }; } diff --git a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix index 987c325ee00..9c71ca476c9 100644 --- a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix +++ b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix @@ -43,9 +43,10 @@ buildDunePackage rec { checkInputs = [ alcotest ]; meta = with lib; { - license = licenses.isc; description = "X.509 trust anchors extracted from Mozilla's NSS"; - maintainers = [ maintainers.sternenseemann ]; homepage = "https://github.com/mirage/ca-certs-nss"; + license = licenses.isc; + maintainers = [ maintainers.sternenseemann ]; + mainProgram = "extract-from-certdata"; }; } diff --git a/pkgs/development/ocaml-modules/checkseum/default.nix b/pkgs/development/ocaml-modules/checkseum/default.nix index 3a07707a4cd..13d9f2829af 100644 --- a/pkgs/development/ocaml-modules/checkseum/default.nix +++ b/pkgs/development/ocaml-modules/checkseum/default.nix @@ -39,9 +39,10 @@ buildDunePackage rec { doCheck = true; meta = { - homepage = "https://github.com/mirage/checkseum"; description = "ADLER-32 and CRC32C Cyclic Redundancy Check"; + homepage = "https://github.com/mirage/checkseum"; license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; + mainProgram = "checkseum.checkseum"; }; } diff --git a/pkgs/development/ocaml-modules/coin/default.nix b/pkgs/development/ocaml-modules/coin/default.nix index 0ff2ce94041..5996cd7adb6 100644 --- a/pkgs/development/ocaml-modules/coin/default.nix +++ b/pkgs/development/ocaml-modules/coin/default.nix @@ -30,8 +30,9 @@ buildDunePackage rec { meta = { description = "A library to normalize an KOI8-{U,R} input to Unicode"; - license = lib.licenses.mit; homepage = "https://github.com/mirage/coin"; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ]; + mainProgram = "coin.generate"; }; } diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index 360848881a9..d9960f732c7 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -31,10 +31,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://www.coherentpdf.com/"; - inherit (ocaml.meta) platforms; description = "PDF Command Line Tools"; + homepage = "https://www.coherentpdf.com/"; license = licenses.unfree; maintainers = [ maintainers.vbgl ]; + mainProgram = "cpdf"; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/decompress/default.nix b/pkgs/development/ocaml-modules/decompress/default.nix index 7629349c1d1..f329a0ff013 100644 --- a/pkgs/development/ocaml-modules/decompress/default.nix +++ b/pkgs/development/ocaml-modules/decompress/default.nix @@ -23,8 +23,9 @@ buildDunePackage rec { meta = { description = "Pure OCaml implementation of Zlib"; + homepage = "https://github.com/mirage/decompress"; license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; - homepage = "https://github.com/mirage/decompress"; + mainProgram = "decompress.pipe"; }; } diff --git a/pkgs/development/ocaml-modules/dns/client.nix b/pkgs/development/ocaml-modules/dns/client.nix index a6dc40de24e..5178360f7b5 100644 --- a/pkgs/development/ocaml-modules/dns/client.nix +++ b/pkgs/development/ocaml-modules/dns/client.nix @@ -16,5 +16,6 @@ buildDunePackage { meta = dns.meta // { description = "Pure DNS resolver API"; + mainProgram = "dns-client.unix"; }; } diff --git a/pkgs/development/ocaml-modules/hidapi/default.nix b/pkgs/development/ocaml-modules/hidapi/default.nix index 44b1d5f150a..b4492f438cc 100644 --- a/pkgs/development/ocaml-modules/hidapi/default.nix +++ b/pkgs/development/ocaml-modules/hidapi/default.nix @@ -24,9 +24,10 @@ buildDunePackage rec { doCheck = true; meta = with lib; { - homepage = "https://github.com/vbmithr/ocaml-hidapi"; description = "Bindings to Signal11's hidapi library"; + homepage = "https://github.com/vbmithr/ocaml-hidapi"; license = licenses.isc; maintainers = [ maintainers.alexfmpe ]; + mainProgram = "ocaml-hid-enumerate"; }; } diff --git a/pkgs/development/ocaml-modules/irmin/pack.nix b/pkgs/development/ocaml-modules/irmin/pack.nix index 5955dda8ed9..12934007cf1 100644 --- a/pkgs/development/ocaml-modules/irmin/pack.nix +++ b/pkgs/development/ocaml-modules/irmin/pack.nix @@ -20,6 +20,7 @@ buildDunePackage rec { meta = irmin.meta // { description = "Irmin backend which stores values in a pack file"; + mainProgram = "irmin_fsck"; }; } diff --git a/pkgs/development/ocaml-modules/irmin/unix.nix b/pkgs/development/ocaml-modules/irmin/unix.nix index 89cf36979bd..2906e77b1b6 100644 --- a/pkgs/development/ocaml-modules/irmin/unix.nix +++ b/pkgs/development/ocaml-modules/irmin/unix.nix @@ -26,6 +26,7 @@ buildDunePackage rec { meta = irmin.meta // { description = "Unix backends for Irmin"; + mainProgram = "irmin"; }; } diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index cee30da45c9..b9a19f13410 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -405,7 +405,10 @@ with self; pname = "ppx_base"; hash = "1wv3q0qyghm0c5izq03y97lv3czqk116059mg62wx6valn22a000"; minimumOCamlVersion = "4.04.2"; - meta.description = "Base set of ppx rewriters"; + meta = { + description = "Base set of ppx rewriters"; + mainProgram = "ppx-base"; + }; propagatedBuildInputs = [ ppx_cold ppx_enumerate ppx_hash ppx_js_style ]; }; @@ -519,7 +522,10 @@ with self; pname = "ppx_jane"; hash = "1kk238fvrcylymwm7xwc7llbyspmx1y662ypq00vy70g112rir7j"; minimumOCamlVersion = "4.04.2"; - meta.description = "Standard Jane Street ppx rewriters"; + meta = { + description = "Standard Jane Street ppx rewriters"; + mainProgram = "ppx-jane"; + }; propagatedBuildInputs = [ base_quickcheck ppx_bin_prot ppx_expect ppx_fixed_literal ppx_module_timer ppx_optcomp ppx_optional ppx_pipebang ppx_stable ppx_string ppx_typerep_conv ppx_variants_conv ]; }; diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index fa525dbba81..b010272b54b 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -39,10 +39,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html"; description = "OpenGL bindings for ocaml"; + homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html"; license = licenses.gpl2; maintainers = with maintainers; [ pSub vbgl ]; + mainProgram = "lablglut"; broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix index b7ed4f24b1d..e44fdbe3ee8 100644 --- a/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -25,7 +25,8 @@ buildDunePackage rec { propagatedBuildInputs = [ zed lwt_log lwt_react mew_vi ]; - meta = { description = "Terminal manipulation library for OCaml"; + meta = { + description = "Terminal manipulation library for OCaml"; longDescription = '' Lambda-term is a cross-platform library for manipulating the terminal. It provides an abstraction for keys, @@ -43,8 +44,7 @@ buildDunePackage rec { inherit (src.meta) homepage; license = lib.licenses.bsd3; - maintainers = [ - lib.maintainers.gal_bolle - ]; + maintainers = [ lib.maintainers.gal_bolle ]; + mainProgram = "lambda-term-actions"; }; } diff --git a/pkgs/development/ocaml-modules/letsencrypt/app.nix b/pkgs/development/ocaml-modules/letsencrypt/app.nix index de1dbbb8c84..1f6cc6e2b10 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/app.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/app.nix @@ -43,5 +43,6 @@ buildDunePackage { meta = letsencrypt.meta // { description = "An ACME client implementation of the ACME protocol (RFC 8555) for OCaml"; + mainProgram = "oacmel"; }; } diff --git a/pkgs/development/ocaml-modules/lustre-v6/default.nix b/pkgs/development/ocaml-modules/lustre-v6/default.nix index 4eeb01e9f3b..3cc7a25a36a 100644 --- a/pkgs/development/ocaml-modules/lustre-v6/default.nix +++ b/pkgs/development/ocaml-modules/lustre-v6/default.nix @@ -20,9 +20,10 @@ buildDunePackage rec { ]; meta = with lib; { - homepage = "https://www-verimag.imag.fr/lustre-v6.html"; description = "Lustre V6 compiler"; + homepage = "https://www-verimag.imag.fr/lustre-v6.html"; license = lib.licenses.cecill21; maintainers = [ lib.maintainers.delta ]; + mainProgram = "lv6"; }; } diff --git a/pkgs/development/ocaml-modules/lutils/default.nix b/pkgs/development/ocaml-modules/lutils/default.nix index 492a987dc9c..c462eb9fe15 100644 --- a/pkgs/development/ocaml-modules/lutils/default.nix +++ b/pkgs/development/ocaml-modules/lutils/default.nix @@ -21,5 +21,6 @@ buildDunePackage rec { homepage = "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/"; description = "Tools and libs shared by Verimag/synchronous tools (lustre, lutin, rdbg)"; license = lib.licenses.cecill21; + mainProgram = "gnuplot-rif"; }; } diff --git a/pkgs/development/ocaml-modules/mrmime/default.nix b/pkgs/development/ocaml-modules/mrmime/default.nix index a5c2a68ee47..50cd04ddb0a 100644 --- a/pkgs/development/ocaml-modules/mrmime/default.nix +++ b/pkgs/development/ocaml-modules/mrmime/default.nix @@ -67,8 +67,9 @@ buildDunePackage rec { meta = { description = "Parser and generator of mail in OCaml"; - license = lib.licenses.mit; homepage = "https://github.com/mirage/mrmime"; - maintainers = with lib.maintainers; [ ]; + license = lib.licenses.mit; + maintainers = [ ]; + mainProgram = "mrmime.generate"; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix index c1831e660f4..f5b69a3b1e3 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix @@ -17,5 +17,6 @@ buildDunePackage rec { meta = lsp.meta // { description = "OCaml Language Server Protocol implementation"; + mainProgram = "ocamllsp"; }; } diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix index f6717458791..96ef1037cf6 100644 --- a/pkgs/development/ocaml-modules/otfm/default.nix +++ b/pkgs/development/ocaml-modules/otfm/default.nix @@ -34,8 +34,9 @@ stdenv.mkDerivation { of them. ''; homepage = webpage; - inherit (ocaml.meta) platforms; license = licenses.bsd3; maintainers = [ maintainers.jirkamarsik ]; + mainProgram = "otftrip"; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix index 366ad9cc24a..11da66bd760 100644 --- a/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -46,9 +46,10 @@ buildDunePackage rec { doCheck = true; meta = with lib; { - homepage = "https://github.com/biocaml/phylogenetics"; description = "Algorithms and datastructures for phylogenetics"; - maintainers = [ maintainers.bcdarwin ]; + homepage = "https://github.com/biocaml/phylogenetics"; license = licenses.cecill-b; + maintainers = [ maintainers.bcdarwin ]; + mainProgram = "phylosim"; }; } diff --git a/pkgs/development/ocaml-modules/tuntap/default.nix b/pkgs/development/ocaml-modules/tuntap/default.nix index 981f05b01e3..2bbf89c6127 100644 --- a/pkgs/development/ocaml-modules/tuntap/default.nix +++ b/pkgs/development/ocaml-modules/tuntap/default.nix @@ -23,7 +23,8 @@ buildDunePackage rec { meta = { description = "Bindings to the UNIX tuntap facility"; - license = lib.licenses.isc; homepage = "https://github.com/mirage/ocaml-tuntap"; + license = lib.licenses.isc; + mainProgram = "otunctl"; }; } diff --git a/pkgs/development/ocaml-modules/uuuu/default.nix b/pkgs/development/ocaml-modules/uuuu/default.nix index d2895ce68e6..59dd7d56896 100644 --- a/pkgs/development/ocaml-modules/uuuu/default.nix +++ b/pkgs/development/ocaml-modules/uuuu/default.nix @@ -32,8 +32,9 @@ buildDunePackage rec { meta = { description = "A library to normalize an ISO-8859 input to Unicode code-point"; - license = lib.licenses.mit; homepage = "https://github.com/mirage/uuuu"; - maintainers = with lib.maintainers; [ ]; + license = lib.licenses.mit; + maintainers = [ ]; + mainProgram = "uuuu.generate"; }; } diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index 35a0e51cb09..94ebc1b8d81 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -57,8 +57,9 @@ stdenv.mkDerivation { module. An API allows to implement new renderers. ''; homepage = webpage; - inherit (ocaml.meta) platforms; license = licenses.isc; maintainers = [ maintainers.jirkamarsik ]; + mainProgram = "vecho"; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/wayland/default.nix b/pkgs/development/ocaml-modules/wayland/default.nix index 7dfb46ce63c..12c385eac72 100644 --- a/pkgs/development/ocaml-modules/wayland/default.nix +++ b/pkgs/development/ocaml-modules/wayland/default.nix @@ -42,8 +42,9 @@ buildDunePackage rec { meta = { description = "Pure OCaml Wayland protocol library"; + homepage = "https://github.com/talex5/ocaml-wayland"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.sternenseemann ]; - homepage = "https://github.com/talex5/ocaml-wayland"; + mainProgram = "wayland-scanner-ocaml"; }; } diff --git a/pkgs/development/ocaml-modules/webbrowser/default.nix b/pkgs/development/ocaml-modules/webbrowser/default.nix index a8adced9388..7ace251e553 100644 --- a/pkgs/development/ocaml-modules/webbrowser/default.nix +++ b/pkgs/development/ocaml-modules/webbrowser/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { homepage = "https://erratique.ch/software/webbrowser"; license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; + mainProgram = "browse"; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/wodan/unix.nix b/pkgs/development/ocaml-modules/wodan/unix.nix index 64a18b6b83d..9b9cd841e0f 100644 --- a/pkgs/development/ocaml-modules/wodan/unix.nix +++ b/pkgs/development/ocaml-modules/wodan/unix.nix @@ -22,6 +22,9 @@ buildDunePackage rec { moveToOutput bin "''${!outputBin}" ''; - meta = wodan.meta // { description = "Wodan clients with Unix integration"; }; + meta = wodan.meta // { + description = "Wodan clients with Unix integration"; + mainProgram = "wodanc"; + }; } diff --git a/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix b/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix index 619d0ded7b3..19ce91574bf 100644 --- a/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix @@ -27,9 +27,10 @@ buildDunePackage rec { ]; meta = with lib; { - homepage = "https://github.com/serokell/ocaml-recovery-parser"; description = "A simple fork of OCaml parser with support for error recovery"; + homepage = "https://github.com/serokell/ocaml-recovery-parser"; license = with licenses; [ lgpl2Only mit mpl20 ]; maintainers = with maintainers; [ romildo ]; + mainProgram = "menhir-recover"; }; } diff --git a/pkgs/development/tools/ocaml/ocamlscript/default.nix b/pkgs/development/tools/ocaml/ocamlscript/default.nix index 0b4b748f058..48b7d840a4f 100644 --- a/pkgs/development/tools/ocaml/ocamlscript/default.nix +++ b/pkgs/development/tools/ocaml/ocamlscript/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { inherit (ocaml.meta) platforms; description = "Natively-compiled OCaml scripts"; maintainers = [ maintainers.vbgl ]; + mainProgram = "ocamlscript"; }; } From 9d7c6adcf90f98a1a9d58645fb325dc9f37492bc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Apr 2022 19:56:28 +0200 Subject: [PATCH 144/166] python39Packages.qcs-api-client: 0.20.10 -> 0.20.12 --- pkgs/development/python-modules/qcs-api-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix index 41412e16f8f..92aaabb4e1a 100644 --- a/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/pkgs/development/python-modules/qcs-api-client/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "qcs-api-client"; - version = "0.20.10"; + version = "0.20.12"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "rigetti"; repo = "qcs-api-client-python"; rev = "v${version}"; - hash = "sha256-pBC8pFrk6iNYPS3/LKaVo+ds2okN56bxzvffEfs6SrU="; + hash = "sha256-4462T2WIBdWjtd51YfslYZOcJg9f0nrSOKTi2ed6WvI="; }; nativeBuildInputs = [ From 094c2cfaa1f5255183d0300a7b2ec32e641f7f84 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 May 2022 10:14:05 +0000 Subject: [PATCH 145/166] python310Packages.plugwise: 0.18.2 -> 0.18.3 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index b2c8bef9d49..7bbfbdb27d3 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.18.2"; + version = "0.18.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - sha256 = "sha256-l97GF5dZlwps2mhw84A+8IBmTmvnaJ/5MeWYdeAu4Zw="; + sha256 = "sha256-aNlPOgUChLFkPPZtb3o4A49uoSBjxKaq3WtuupHlmi8="; }; propagatedBuildInputs = [ From 33c3f831bc13d73e3689d668bbb2a32eadb3911c Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Sat, 14 May 2022 15:45:02 +0530 Subject: [PATCH 146/166] cinny: 2.0.0 -> 2.0.2 --- .../networking/instant-messengers/cinny/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index 480bba6fde1..57fb1b58d90 100644 --- a/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -4,11 +4,11 @@ let configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); in stdenv.mkDerivation rec { pname = "cinny"; - version = "2.0.0"; + version = "2.0.2"; src = fetchurl { url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - sha256 = "sha256-tM3YA0GW8Z24gt8t9dOyr10GCINodAB0b4/gD7jfgOM="; + sha256 = "sha256-qVnNVJK/Y76cZTh8QNeSNHDxHA/Ekbt7X6mKYkYAPNU="; }; installPhase = '' From 42819337275f2729bf692ccb3a5ec11d0908e03e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 14 May 2022 12:12:07 +0100 Subject: [PATCH 147/166] foomatic-filters: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: foomatic_rip-options.o:/build/foomatic-filters-4.0.17/options.c:49: multiple definition of `cupsfilter'; foomatic_rip-foomaticrip.o:/build/foomatic-filters-4.0.17/foomaticrip.c:158: first defined here --- pkgs/misc/drivers/foomatic-filters/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index 5804eb60930..b1095768691 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation rec { substituteInPlace foomaticrip.c --replace /bin/bash ${stdenv.shell} ''; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: foomatic_rip-options.o:/build/foomatic-filters-4.0.17/options.c:49: multiple definition of + # `cupsfilter'; foomatic_rip-foomaticrip.o:/build/foomatic-filters-4.0.17/foomaticrip.c:158: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + installTargets = [ "install-cups" ]; installFlags = [ From def7eb2e59a557af935c03e9a63408709716afbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 13 May 2022 17:43:38 +0200 Subject: [PATCH 148/166] sptlrx: add changelog meta attribute Co-authored-by: Bobby Rong --- pkgs/applications/audio/sptlrx/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/sptlrx/default.nix b/pkgs/applications/audio/sptlrx/default.nix index ffe4741d179..54fb7a3c164 100644 --- a/pkgs/applications/audio/sptlrx/default.nix +++ b/pkgs/applications/audio/sptlrx/default.nix @@ -24,6 +24,7 @@ buildGoModule rec { meta = with lib; { description = "Spotify lyrics in your terminal"; homepage = "https://github.com/raitonoberu/sptlrx"; + changelog = "https://github.com/raitonoberu/sptlrx/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ MoritzBoehme ]; }; From de2a80049d7a50e0044b53db7c35fd78999c1711 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 May 2022 12:58:42 +0000 Subject: [PATCH 149/166] python310Packages.casbin: 1.16.3 -> 1.16.4 --- pkgs/development/python-modules/casbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index f09b2ab6630..f38d9aa634a 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.16.3"; + version = "1.16.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - sha256 = "sha256-7URIk76iQ1u59RM1VeqO5qqTg+0kCPtsP+2Y5CxCZ3I="; + sha256 = "sha256-/zIx1GlzAnQf0t2d8ME+bi2CZGj6Qr9f5Z4afrQD8FY="; }; propagatedBuildInputs = [ From d488388cfcd660c3439aaaf5c31008b6bcdf3d1d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 14 May 2022 10:56:13 -0300 Subject: [PATCH 150/166] primesieve: 7.8 -> 7.9 --- .../science/math/primesieve/default.nix | 36 +++++++++++++++++++ .../science/math/primesieve/default.nix | 23 ------------ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 37 insertions(+), 24 deletions(-) create mode 100644 pkgs/applications/science/math/primesieve/default.nix delete mode 100644 pkgs/development/libraries/science/math/primesieve/default.nix diff --git a/pkgs/applications/science/math/primesieve/default.nix b/pkgs/applications/science/math/primesieve/default.nix new file mode 100644 index 00000000000..c57e2d71f1e --- /dev/null +++ b/pkgs/applications/science/math/primesieve/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "primesieve"; + version = "7.9"; + + src = fetchFromGitHub { + owner = "kimwalisch"; + repo = "primesieve"; + rev = "v${version}"; + hash = "sha256-lwT+adKFoNI125y5FuJMovtMh8sFi9oqMLYGLabzrCI="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + homepage = "https://primesieve.org/"; + description = "Fast C/C++ prime number generator"; + longDescription = '' + primesieve is a command-line program and C/C++ library for quickly + generating prime numbers. It is very cache efficient, it detects your + CPU's L1 & L2 cache sizes and allocates its main data structures + accordingly. It is also multi-threaded by default, it uses all available + CPU cores whenever possible i.e. if sequential ordering is not + required. primesieve can generate primes and prime k-tuplets up to 264. + ''; + license = licenses.bsd2; + maintainers = teams.sage.members ++ + (with maintainers; [ abbradar AndersonTorres ]); + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/science/math/primesieve/default.nix b/pkgs/development/libraries/science/math/primesieve/default.nix deleted file mode 100644 index 0cf263218a3..00000000000 --- a/pkgs/development/libraries/science/math/primesieve/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "primesieve"; - version = "7.8"; - - nativeBuildInputs = [ cmake ]; - - src = fetchFromGitHub { - owner = "kimwalisch"; - repo = "primesieve"; - rev = "v${version}"; - sha256 = "sha256-M35CP/xEyC7mEh84kaGsgfsDI9fnanHraNPgTvpqimI="; - }; - - meta = with lib; { - description = "Fast C/C++ prime number generator"; - homepage = "https://primesieve.org/"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a86ab8e64ed..1351c11fdfc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20115,7 +20115,7 @@ with pkgs; primecount = callPackage ../development/libraries/science/math/primecount { }; - primesieve = callPackage ../development/libraries/science/math/primesieve { }; + primesieve = callPackage ../applications/science/math/primesieve { }; prison = callPackage ../development/libraries/prison { }; From 91621176e04a887f727b1b8d5f1a04064ad97e0f Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 14 May 2022 10:59:43 -0300 Subject: [PATCH 151/166] primecount: 7.2 -> 7.3 --- .../science/math/primecount/default.nix | 51 +++++++++++++++++++ .../science/math/primecount/default.nix | 33 ------------ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 52 insertions(+), 34 deletions(-) create mode 100644 pkgs/applications/science/math/primecount/default.nix delete mode 100644 pkgs/development/libraries/science/math/primecount/default.nix diff --git a/pkgs/applications/science/math/primecount/default.nix b/pkgs/applications/science/math/primecount/default.nix new file mode 100644 index 00000000000..993092c4653 --- /dev/null +++ b/pkgs/applications/science/math/primecount/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, primesieve +}: + +stdenv.mkDerivation rec { + pname = "primecount"; + version = "7.3"; + + src = fetchFromGitHub { + owner = "kimwalisch"; + repo = "primecount"; + rev = "v${version}"; + hash = "sha256-hxnn1uiGSB6XRC7yK+SXTwTsJfjhemWXsMNhhL7Ghek="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ primesieve ]; + + cmakeFlags = [ + "-DBUILD_LIBPRIMESIEVE=ON" + "-DBUILD_PRIMECOUNT=ON" + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_STATIC_LIBS=OFF" + "-DBUILD_TESTS=ON" + ]; + + meta = with lib; { + homepage = "https://github.com/kimwalisch/primecount"; + description = "Fast prime counting function implementations"; + longDescription = '' + primecount is a command-line program and C/C++ library that counts the + primes below an integer x ≤ 10^31 using highly optimized implementations + of the combinatorial prime counting algorithms. + + primecount includes implementations of all important combinatorial prime + counting algorithms known up to this date all of which have been + parallelized using OpenMP. primecount contains the first ever open source + implementations of the Deleglise-Rivat algorithm and Xavier Gourdon's + algorithm (that works). primecount also features a novel load balancer + that is shared amongst all implementations and that scales up to hundreds + of CPU cores. primecount has already been used to compute several prime + counting function world records. + ''; + license = licenses.bsd2; + inherit (primesieve.meta) maintainers platforms; + }; +} diff --git a/pkgs/development/libraries/science/math/primecount/default.nix b/pkgs/development/libraries/science/math/primecount/default.nix deleted file mode 100644 index e1390ce6416..00000000000 --- a/pkgs/development/libraries/science/math/primecount/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, primesieve }: - -stdenv.mkDerivation rec { - pname = "primecount"; - version = "7.2"; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ primesieve ]; - - src = fetchFromGitHub { - owner = "kimwalisch"; - repo = "primecount"; - rev = "v${version}"; - sha256 = "sha256-/Cb/HkD4UQ9gXsRpvRiEuQBoRd0THxNHsBaAAa+CqQo="; - }; - - cmakeFlags = [ - "-DBUILD_STATIC_LIBS=OFF" - "-DBUILD_SHARED_LIBS=ON" - "-DBUILD_TESTS=ON" - "-DBUILD_PRIMECOUNT=ON" - "-DBUILD_LIBPRIMESIEVE=ON" - ]; - - meta = with lib; { - description = "Fast prime counting function implementations"; - homepage = "https://github.com/kimwalisch/primecount"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = teams.sage.members; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1351c11fdfc..0a38ad85721 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20113,7 +20113,7 @@ with pkgs; prime-server = callPackage ../development/libraries/prime-server { }; - primecount = callPackage ../development/libraries/science/math/primecount { }; + primecount = callPackage ../applications/science/math/primecount { }; primesieve = callPackage ../applications/science/math/primesieve { }; From 634f7d7608d20072c051d433a196cbd62505b099 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Sat, 14 May 2022 08:18:40 -0600 Subject: [PATCH 152/166] python3Packages.pyvips: 2.1.16 -> 2.2.0 --- .../python-modules/pyvips/default.nix | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index 39747678566..5b84a4373d8 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -1,15 +1,22 @@ -{ buildPythonPackage, fetchFromGitHub, pytestCheckHook, glib, vips, cffi -, pkgconfig, lib }: +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, glib +, vips +, cffi +, pkgconfig +, lib }: buildPythonPackage rec { pname = "pyvips"; - version = "2.1.16"; + version = "2.2.0"; src = fetchFromGitHub { owner = "libvips"; repo = "pyvips"; rev = "v${version}"; - sha256 = "sha256-8CeQbx3f2i0lEU0wxPeUwHlUGtzOztzTOdFNjIDy8s0="; + sha256 = "sha256-qMVoVzqXALhPWVKLzu+VqihHPN7J+pMhKnXdb+ow0zw="; }; nativeBuildInputs = [ pkgconfig ]; @@ -20,6 +27,14 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; + postPatch = '' + substituteInPlace pyvips/__init__.py \ + --replace 'libvips.so.42' '${lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}' \ + --replace 'libvips.42.dylib' '${lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}' \ + --replace 'libgobject-2.0.so.0' '${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}' \ + --replace 'libgobject-2.0.dylib' '${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}' \ + ''; + pythonImportsCheck = [ "pyvips" ]; meta = with lib; { From 92e0e80f67286e05d81797e75508ad51d235e150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 13 May 2022 22:58:00 +0000 Subject: [PATCH 153/166] rnote: 0.5.1-hotfix-1 -> 0.5.3 https://github.com/flxzt/rnote/releases/tag/v0.5.2 https://github.com/flxzt/rnote/releases/tag/v0.5.3 --- pkgs/applications/graphics/rnote/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index f1d809388a2..98726de0604 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -22,20 +22,20 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.5.1-hotfix-1"; + version = "0.5.3"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-Oq/RKeKICyImSPr4GSNjPXZWtuRQ7+9nRfl9MmC+UYI="; + hash = "sha256-v4cca4tSv//VFUvOfemkueELxlez2TdtynqbzjCTlB4="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-gdVy+7xSQVkI84Ta6KLOLR9UUsDoD2Cd0cuNU+OXf2M="; + hash = "sha256-sK8GOLxNG4mu45oQSaFi467DHYt00Pxu3vMM6Po/YqI="; }; nativeBuildInputs = [ From ac3fba148f5dafdba4ba5fe8955a7151091ae0db Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sat, 14 May 2022 23:17:41 +0800 Subject: [PATCH 154/166] eksctl: 0.96.0 -> 0.97.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index de923d1f311..b2a70c2bf28 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.96.0"; + version = "0.97.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-AmwkWFhoGRBWrEhRlTRLGRu79ayWceszZi2hgx388Eg="; + sha256 = "sha256-WqYal+SDJNBCYc4vxUvYUXnKtmlV/ttfeQKAeOsy5lE="; }; - vendorSha256 = "sha256-akFclhx6c18u3z2oa6EvLd2NwkVCgJrYWv8Vbp1hZ9g="; + vendorSha256 = "sha256-0uur+L4bSVn6S8yBbdjIdMIgTY4pbQzVPGEVDgYISuw="; doCheck = false; From 1645c6e1d2838b603d193f13729c206a70571a4b Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sat, 14 May 2022 23:22:12 +0800 Subject: [PATCH 155/166] cargo-expand: 1.0.19 -> 1.0.21 --- pkgs/development/tools/rust/cargo-expand/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index de75edf5e73..d448b9a88f8 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.19"; + version = "1.0.21"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-+LKZ0pbSlqY8rbz96HZ59XYKsSJDMOrJMxblXNj74Yw="; + sha256 = "sha256-hxG7e5JBDv79eA7IQEdU8kpvE0B69Gqc+aPdCoc6Uf4="; }; - cargoSha256 = "sha256-ZEHc67jgLSZV6JH5/owAGTxxnbnYnx2fIUf0mQ14qvg="; + cargoSha256 = "sha256-7CMNJb/HGHPP4CIBEYK+2HC/JAce25qGI86NkSvyxos="; buildInputs = lib.optional stdenv.isDarwin libiconv; From a99bf0ec51213ddaf931272bc4b89e7e39f9b9aa Mon Sep 17 00:00:00 2001 From: William Kral Date: Thu, 12 May 2022 16:28:46 -0700 Subject: [PATCH 156/166] pappl: fix build --- pkgs/applications/printing/pappl/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/applications/printing/pappl/default.nix index 5df1d93f9c8..4c0bcfb4ed3 100644 --- a/pkgs/applications/printing/pappl/default.nix +++ b/pkgs/applications/printing/pappl/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchFromGitHub +, fetchpatch , avahi , cups , gnutls @@ -21,6 +22,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-FsmR0fFb9bU9G3oUyJU1eDLcoZ6OQ2//TINlPrW6lU0="; }; + patches = [ + (fetchpatch { + name = "file-offset-bits-64-linux.patch"; + url = "https://github.com/michaelrsweet/pappl/commit/7ec4ce4331b6637c54a37943269e05d15ff6dd47.patch"; + sha256 = "sha256-x5lriopWw6Mn2qjv19flsleEzPMHU4jYWRy0y6hTL5k="; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ From c4070d4ce39adc0d27f478f9f02cafcec121be63 Mon Sep 17 00:00:00 2001 From: Yuka Date: Sat, 14 May 2022 19:31:47 +0200 Subject: [PATCH 157/166] schildichat-{web,desktop}: 1.10.4-sc.1 -> 1.10.12-sc.1 (#173045) --- .../instant-messengers/schildichat/pin.json | 14 +++++++------- .../schildichat/schildichat-web.nix | 5 ----- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/schildichat/pin.json b/pkgs/applications/networking/instant-messengers/schildichat/pin.json index d227dc4b0fb..ef981716ef1 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/pin.json +++ b/pkgs/applications/networking/instant-messengers/schildichat/pin.json @@ -1,9 +1,9 @@ { - "version": "1.10.4-sc.1", - "rev": "v1.10.4-sc.1", - "srcHash": "0sxibzskbw9pa6wmbk1y3n7p74cfj9zvm2hsw76sp6wfac1wnbwl", - "webYarnHash": "1z8xr35gh74y2iv9kfk6d6b6f3iclcrpkdds5q7rh2irpf14fwpw", - "jsSdkYarnHash": "1cwvb0hwq19dh2937fmcbfvnkkfmalk9wrxf1yv81nsbyjnx86di", - "reactSdkYarnHash": "0j4rxg11q35idfzvjrpmyrwkz9yqgzpwps3xqx1k4qcs844jjs9f", - "desktopYarnHash": "0akmgib212gkygvs2snn9c43k3ika3ipg85d480j3hqyb6yxwqmn" + "version": "1.10.12-sc.1", + "rev": "v1.10.12-sc.1", + "srcHash": "1rpfax6xx731w59a2i7v6jr17l3rnrn79d666f0cjchg36nkqqg9", + "webYarnHash": "0m5dnz3m68iz94siwmavzj50wxd6w6wanjsm1zhq76lgymgcbqc2", + "jsSdkYarnHash": "1k1jvavbqr7vcbdaxc6yqiq5254kxhywn1s2zndrfny7ap8z5c1c", + "reactSdkYarnHash": "0cz7pgrbysljmhpf4m0wqwqjqijxahl3wz5qhczlkj46dvq6qyxb", + "desktopYarnHash": "09ri87ynfgxrv22sykggiy6nlcf20qwj7zj9qq0rz3c2acr6g9mn" } diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix index a7ad6fb4d9b..7041a19684c 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix +++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix @@ -78,13 +78,8 @@ in stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - pushd matrix-react-sdk - ../element-web/node_modules/.bin/reskindex -h ../element-web/src/header - popd - pushd element-web node scripts/copy-res.js - node_modules/.bin/reskindex -h ../element-web/src/header node_modules/.bin/webpack --progress --mode production popd diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5909237b90c..54d17be1214 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5431,7 +5431,7 @@ with pkgs; schildichat-desktop = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_15; + electron = electron_17; }; schildichat-desktop-wayland = writeScriptBin "schildichat-desktop" '' #!/bin/sh From 2fc228efaf48520896eed71a8109aa6492c72939 Mon Sep 17 00:00:00 2001 From: toastal <561087+toastal@users.noreply.github.com> Date: Sat, 14 May 2022 19:14:53 +0000 Subject: [PATCH 158/166] =?UTF-8?q?ocamlPackages.otoml:=200.9.0=20?= =?UTF-8?q?=E2=86=92=201.0.1;=20soupault:=203.2.0=20=E2=86=92=204.0.0=20(#?= =?UTF-8?q?173032)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ocamlPackages.otoml: 0.9.0 → 1.0.1 * soupault: 3.2.0 → 4.0.0 > toastal: I'm switching the OPAM tarball link to codeberg for 4.0.0 — dmbaturin, #soupault Libera.Chat As directed by the maintainer, the releases will now point to the Codeberg Gitea Git forge instance. This is a win for open source code platforms and users as they will not need to interact with a proprietary code forge! --- .../ocaml-modules/otoml/default.nix | 8 ++++--- pkgs/tools/typesetting/soupault/default.nix | 24 ++++++++++++------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/pkgs/development/ocaml-modules/otoml/default.nix b/pkgs/development/ocaml-modules/otoml/default.nix index c3f53fc611e..d69df70f772 100644 --- a/pkgs/development/ocaml-modules/otoml/default.nix +++ b/pkgs/development/ocaml-modules/otoml/default.nix @@ -1,4 +1,6 @@ -{ lib, fetchFromGitHub, buildDunePackage +{ lib +, fetchFromGitHub +, buildDunePackage , menhir , menhirLib , uutf @@ -6,7 +8,7 @@ buildDunePackage rec { pname = "otoml"; - version = "0.9.0"; + version = "1.0.1"; useDune2 = true; @@ -16,7 +18,7 @@ buildDunePackage rec { owner = "dmbaturin"; repo = pname; rev = version; - sha256 = "0l0c60rzgk11y8xq05kr8q9hkzb3c8vi995mq84x98ys73wb42j3"; + sha256 = "sha256-2WGuq4ZLbLvfG6WZ3iimiSMqMYHCuruZc1EttZ/5rBE="; }; strictDeps = true; diff --git a/pkgs/tools/typesetting/soupault/default.nix b/pkgs/tools/typesetting/soupault/default.nix index a511456e02e..d40eb4aac80 100644 --- a/pkgs/tools/typesetting/soupault/default.nix +++ b/pkgs/tools/typesetting/soupault/default.nix @@ -1,20 +1,27 @@ -{ fetchFromGitHub, ocamlPackages, lib }: +{ lib +, fetchFromGitea +, ocamlPackages +}: ocamlPackages.buildDunePackage rec { pname = "soupault"; - version = "3.2.0"; + version = "4.0.0"; useDune2 = true; - src = fetchFromGitHub { - owner = "dmbaturin"; + minimalOCamlVersion = "4.08"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "PataphysicalSociety"; repo = pname; rev = version; - sha256 = "sha256-T1K/ntCK19LfPmMtaAa9c1JjSL+5dax2SNhM4yUFln4="; + sha256 = "sha256-txNKAZMd3LReFoAtf6iaoDF+Ku3IUNDzBWUqGC2ePKw="; }; buildInputs = with ocamlPackages; [ base64 + camomile containers ezjsonm fileutils @@ -32,11 +39,10 @@ ocamlPackages.buildDunePackage rec { yaml ]; - meta = with lib; { + meta = { description = "A tool that helps you create and manage static websites"; homepage = "https://soupault.app/"; - license = licenses.mit; - maintainers = [ maintainers.toastal ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ toastal ]; }; } - From cf0f19b85b8336f741c9afe890ba647cd55ca9f4 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 14 May 2022 17:09:44 -0300 Subject: [PATCH 159/166] netsurf.libnsutils: fix URL --- pkgs/applications/networking/browsers/netsurf/libnsutils.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/netsurf/libnsutils.nix b/pkgs/applications/networking/browsers/netsurf/libnsutils.nix index b0d954a00d4..bba457674c7 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsutils.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsutils.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://www.netsurf-browser.org/projects/${libname}/"; + homepage = "https://www.netsurf-browser.org/"; description = "Generalised utility library for netsurf browser"; license = licenses.mit; maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; From 37a13a3d4d838de3faa2431aab52bf19b5ca4930 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 11 May 2022 12:52:35 +0200 Subject: [PATCH 160/166] chromiumBeta: Fix the build The build was failing with: [4758/49762] ACTION //third_party/dawn/src/dawn/common:dawn_version_gen__json_tarball(//build/toolchain/linux/unbundle:default)Ke:default)ux/unbundle:default)[Kuide/optimization_guide_internals/resources/optimization_guide_internals.mojom-webui.js FAILED: gen/third_party/dawn/dawn_version_gen.json_tarball python3 ../../third_party/dawn/generator/dawn_version_generator.py --dawn-dir ../../third_party/dawn/ --template-dir /build/chromium-102.0.5005.49/third_party/dawn/generator/templates --jinja2-path /build/chromium-102.0.5005.49/third_party/jinja2 --output-json-tarball gen/third_party/dawn/dawn_version_gen.json_tarball --depfile gen/third_party/dawn/dawn_version_gen.json_tarball.d --expected-outputs-file gen/third_party/dawn/dawn_version_gen.expected_outputs --allowed-output-dirs-file gen/third_party/dawn/dawn_version_gen.allowed_output_dirs Traceback (most recent call last): [...] FileNotFoundError: [Errno 2] No such file or directory: 'git' [4761/49762] ACTION //third_party/blink/renderer/bindings:generate_bindings_all(//build/toolchain/linux/unbundle:default)fault) ninja: build stopped: subcommand failed. More details here: https://bugs.chromium.org/p/chromium/issues/detail?id=1321370 The patch doesn't apply to M102 so I had to cherry-pick it manually. --- .../networking/browsers/chromium/common.nix | 4 ++ ...2-fix-dawn_version_generator-failure.patch | 43 +++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/applications/networking/browsers/chromium/patches/m102-fix-dawn_version_generator-failure.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 3b22761cbc0..993f95a6bff 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -160,6 +160,10 @@ let ./patches/no-build-timestamps.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags: ./patches/widevine-79.patch + ] ++ optionals (versionRange "102" "103") [ + # https://dawn-review.googlesource.com/c/dawn/+/88582 + # Wrap get_gitHash in try-catch to prevent failures in tarball builds. + ./patches/m102-fix-dawn_version_generator-failure.patch ]; postPatch = optionalString (chromiumVersionAtLeast "102") '' diff --git a/pkgs/applications/networking/browsers/chromium/patches/m102-fix-dawn_version_generator-failure.patch b/pkgs/applications/networking/browsers/chromium/patches/m102-fix-dawn_version_generator-failure.patch new file mode 100644 index 00000000000..e9391541e43 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/m102-fix-dawn_version_generator-failure.patch @@ -0,0 +1,43 @@ +From e9ffd084ec1ff9f7bfc86879732953dc58256958 Mon Sep 17 00:00:00 2001 +From: Loko Kung +Date: Tue, 3 May 2022 00:28:53 +0000 +Subject: [PATCH] Wrap get_gitHash in try-catch to prevent failures in tarball + builds. + +Bug: chromium:1321370 +Change-Id: If39d2236d1b4d965f7bd189f6bd1cdc70436c41d +Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/88582 +Commit-Queue: Loko Kung +Reviewed-by: Austin Eng +Kokoro: Kokoro +(cherry picked from commit 03ddfbb81fb4127ca37ea53e70fcb34fe851e24e) +--- + third_party/dawn/generator/dawn_version_generator.py | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/third_party/dawn/generator/dawn_version_generator.py b/third_party/dawn/generator/dawn_version_generator.py +index 1907e88da..3c1927bee 100644 +--- a/third_party/dawn/generator/dawn_version_generator.py ++++ b/third_party/dawn/generator/dawn_version_generator.py +@@ -23,11 +23,14 @@ def get_git(): + + + def get_gitHash(dawnDir): +- result = subprocess.run([get_git(), 'rev-parse', 'HEAD'], +- stdout=subprocess.PIPE, +- cwd=dawnDir) +- if result.returncode == 0: +- return result.stdout.decode('utf-8').strip() ++ try: ++ result = subprocess.run([get_git(), "rev-parse", "HEAD"], ++ stdout=subprocess.PIPE, ++ cwd=dawnDir) ++ if result.returncode == 0: ++ return result.stdout.decode("utf-8").strip() ++ except Exception: ++ return "" + # No hash was available (possibly) because the directory was not a git checkout. Dawn should + # explicitly handle its absenece and disable features relying on the hash, i.e. caching. + return '' +-- +2.36.0 From 2d70de92f3a5ebbce784900cfa5c339c112e2838 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 14 May 2022 17:10:33 -0300 Subject: [PATCH 161/166] netsurf.libutf8proc: fix URL --- .../networking/browsers/netsurf/libutf8proc.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix b/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix index c7362b998be..47b53b4781b 100644 --- a/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix +++ b/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchurl, pkg-config +{ lib +, stdenv +, fetchurl +, pkg-config , buildsystem }: @@ -9,10 +12,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "sha256-AasdaYnBx3VQkNskw/ZOSflcVgrknCa+xRQrrGgCxHI="; + hash = "sha256-AasdaYnBx3VQkNskw/ZOSflcVgrknCa+xRQrrGgCxHI="; }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ buildsystem ]; makeFlags = [ @@ -21,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://www.netsurf-browser.org/projects/${libname}/"; + homepage = "https://www.netsurf-browser.org/"; description = "UTF8 Processing library for netsurf browser"; license = licenses.mit; maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; From 86fd585091882c515119ad326133ee04ec10b614 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 14 May 2022 16:06:34 -0300 Subject: [PATCH 162/166] glpng: reformat --- pkgs/development/libraries/glpng/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glpng/default.nix b/pkgs/development/libraries/glpng/default.nix index 1194d988c07..34c58774fb2 100644 --- a/pkgs/development/libraries/glpng/default.nix +++ b/pkgs/development/libraries/glpng/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { cmake pkg-config ]; + buildInputs = [ libGL libpng @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://repo.or.cz/glpng.git/blob_plain/HEAD:/glpng.htm"; - description = "PNG loader for OpenGL"; + description = "PNG loader library for OpenGL"; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; From 23fcb9a8e2935b18ccbebe4a5bf2f9d376354dc7 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 14 May 2022 17:10:52 -0300 Subject: [PATCH 163/166] oroborus: fix URL --- .../window-managers/oroborus/default.nix | 55 ++++++++++++++----- 1 file changed, 41 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix index d24abb68fb7..275db56dada 100644 --- a/pkgs/applications/window-managers/oroborus/default.nix +++ b/pkgs/applications/window-managers/oroborus/default.nix @@ -1,27 +1,54 @@ -{ lib, stdenv, fetchurl, pkg-config -, freetype, fribidi -, libSM, libICE, libXt, libXaw, libXmu -, libXext, libXft, libXpm, libXrandr -, libXrender, xorgproto, libXinerama }: +{ lib +, stdenv +, fetchurl +, freetype +, fribidi +, libICE +, libSM +, libXaw +, libXext +, libXft +, libXinerama +, libXmu +, libXpm +, libXrandr +, libXrender +, libXt +, pkg-config +, xorgproto +}: -with lib; stdenv.mkDerivation rec { - pname = "oroborus"; version = "2.0.20"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ freetype fribidi libSM libICE libXt libXaw libXmu libXext - libXft libXpm libXrandr libXrender xorgproto libXinerama ]; - src = fetchurl { url = "mirror://debian/pool/main/o/oroborus/oroborus_${version}.tar.gz"; - sha256 = "12bvk8x8rfnymbfbwmdcrd9g8m1zxbcq7rgvfdkjr0gnpi0aa82j"; + hash = "sha256-UiClQLz2gSxnc/vlg9nqP1T0UsusVb7cqt66jDqae4k=a"; }; - meta = { + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + freetype + fribidi + libICE + libSM + libXaw + libXext + libXft + libXinerama + libXmu + libXpm + libXrandr + libXrender + libXt + xorgproto + ]; + + meta = with lib; { + homepage = "https://web.archive.org/web/20191129172107/https://www.oroborus.org/"; description = "A really minimalistic X window manager"; - homepage = "https://www.oroborus.org/"; license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; From d99becc89324623dd4fef80911343ea8ef024383 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 14 May 2022 15:58:13 -0300 Subject: [PATCH 164/166] mksh: fix URL --- pkgs/shells/mksh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index 360380e19b3..8bdabd4d8c1 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "https://www.mirbsd.org/MirOS/dist/mir/mksh/${pname}-R${version}.tgz" + "http://www.mirbsd.org/MirOS/dist/mir/mksh/${pname}-R${version}.tgz" "http://pub.allbsd.org/MirOS/dist/mir/mksh/${pname}-R${version}.tgz" ]; hash = "sha256-d64WZaM38cSMYda5Yds+UhGbOOWIhNHIloSvMfh7xQY="; @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "http://www.mirbsd.org/mksh.htm"; description = "MirBSD Korn Shell"; longDescription = '' The MirBSD Korn Shell is a DFSG-free and OSD-compliant (and OSI @@ -45,7 +46,6 @@ stdenv.mkDerivation rec { also to be readily available under other UNIX(R)-like operating systems. ''; - homepage = "https://www.mirbsd.org/mksh.htm"; license = with licenses; [ miros isc unicode-dfs-2016 ]; maintainers = with maintainers; [ AndersonTorres joachifm ]; platforms = platforms.unix; From 71d8b8afd86a4c1abfb0edc06726b3f4ac04f4ec Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 14 May 2022 17:18:40 -0300 Subject: [PATCH 165/166] rs: reformat --- pkgs/tools/text/rs/default.nix | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/rs/default.nix b/pkgs/tools/text/rs/default.nix index 9aca92922a5..141d72dfe07 100644 --- a/pkgs/tools/text/rs/default.nix +++ b/pkgs/tools/text/rs/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, libbsd }: +{ lib +, stdenv +, fetchurl +, installShellFiles +, libbsd +}: stdenv.mkDerivation rec { pname = "rs"; @@ -9,18 +14,29 @@ stdenv.mkDerivation rec { sha256 = "0gxwlfk7bzivpp2260w2r6gkyl7vdi05cggn1fijfnp8kzf1b4li"; }; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ libbsd ]; buildPhase = '' + runHook preBuild + ${stdenv.cc}/bin/cc utf8.c rs.c -o rs -lbsd + + runHook postBuild ''; installPhase = '' + runHook preInstall + install -Dm 755 rs -t $out/bin - install -Dm 644 rs.1 -t $out/share/man/man1 + installManPage rs.1 + + runHook postInstall ''; meta = with lib; { + homepage = "http://www.mirbsd.org/htman/i386/man1/rs.htm"; description = "Reshape a data array from standard input"; longDescription = '' rs reads the standard input, interpreting each line as a row of blank- @@ -43,8 +59,6 @@ stdenv.mkDerivation rec { to control presentation of the output columns, including transposition of the rows and columns. ''; - - homepage = "https://www.mirbsd.org/htman/i386/man1/rs.htm"; license = licenses.bsd3; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; From 084f2307d4081b07ed81f9d581af5065e8adf043 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 14 May 2022 23:49:57 +0200 Subject: [PATCH 166/166] nixos/tests/chromium: Switch to nodes.machine (vs. deprecated machine attribute) The old attribute is deprecated: trace: warning: In test `chromium-stable': The `machine' attribute in NixOS tests (pkgs.nixosTest / make-test-pyton.nix / testing-python.nix / makeTest) is deprecated. Please use the equivalent `nodes.machine'. Note: This is only a refactoring. --- nixos/tests/chromium.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 3815dca7622..6b296fe8a61 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -45,12 +45,14 @@ mapAttrs (channel: chromiumPkg: makeTest { enableOCR = true; - machine.imports = [ ./common/user-account.nix ./common/x11.nix ]; - machine.virtualisation.memorySize = 2047; - machine.test-support.displayManager.auto.user = user; - machine.environment = { - systemPackages = [ chromiumPkg ]; - variables."XAUTHORITY" = "/home/alice/.Xauthority"; + nodes.machine = { ... }: { + imports = [ ./common/user-account.nix ./common/x11.nix ]; + virtualisation.memorySize = 2047; + test-support.displayManager.auto.user = user; + environment = { + systemPackages = [ chromiumPkg ]; + variables."XAUTHORITY" = "/home/alice/.Xauthority"; + }; }; testScript = let