From 8efd3bacc29e726d1dd5c409ffb1bf9716b6710b Mon Sep 17 00:00:00 2001 From: Roosembert Palacios Date: Tue, 11 Jan 2022 07:44:33 +0100 Subject: [PATCH 01/11] prometheus-bind-exporter: 0.4.0 -> 0.5.0 Signed-off-by: Roosembert Palacios --- pkgs/servers/monitoring/prometheus/bind-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix index 74b7c2112f99..4e0ef709496e 100644 --- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bind_exporter"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus-community"; repo = "bind_exporter"; - sha256 = "152xi6kf1wzb7663ixv27hsdbf1x6s51fdp85zhghg1y700ln63v"; + sha256 = "sha256-ta+uy0FUEMcL4SW1K3v2j2bfDRmdAIz42MKPsNj4FbA="; }; - vendorSha256 = "172aqrckkhlyhpkanrcs66m13p5qp4fd2w8xv02j2kqq13klwm1a"; + vendorSha256 = "sha256-L0jZM83u423tiLf7kcqnXsQi7QBvNEXhuU+IwXXAhE0="; passthru.tests = { inherit (nixosTests.prometheus-exporters) bind; }; From 4bfeab40d63b0de4a41aff56a8574fbb3e703ff5 Mon Sep 17 00:00:00 2001 From: Moritz Hedtke Date: Tue, 11 Jan 2022 08:15:12 +0000 Subject: [PATCH 02/11] nodejs-17_x: 17.3.0 -> 17.3.1 --- pkgs/development/web/nodejs/v17.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v17.nix b/pkgs/development/web/nodejs/v17.nix index 62db8e9f87d2..2242a923f0b7 100644 --- a/pkgs/development/web/nodejs/v17.nix +++ b/pkgs/development/web/nodejs/v17.nix @@ -7,8 +7,8 @@ let in buildNodejs { inherit enableNpm; - version = "17.3.0"; - sha256 = "00sx046xmh75va7jh810npphnz3yrixifjhlj0jqysal93kc9r74"; + version = "17.3.1"; + sha256 = "070xy8rk5z6jmxiay95sjw0jld6pp2ymig7ryypday5aaiw8y26g"; patches = [ ./disable-darwin-v8-system-instrumentation.patch # Fixes node incorrectly building vendored OpenSSL when we want system OpenSSL. From 2ac55cedc9dfbbbecfcfe2afea86f76fc80aefb0 Mon Sep 17 00:00:00 2001 From: Moritz Hedtke Date: Tue, 11 Jan 2022 08:15:38 +0000 Subject: [PATCH 03/11] nodejs-16_x: 16.13.1 -> 16.13.2 --- pkgs/development/web/nodejs/v16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index a0c978169ae1..dd1410625db1 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "16.13.1"; - sha256 = "1bb3rjb2xxwn6f4grjsa7m1pycp0ad7y6vz7v2d7kbsysx7h08sc"; + version = "16.13.2"; + sha256 = "185lm13q0kwz0qimc38c7mxn8ml6m713pjdjsa9jna9az4gxxccq"; patches = [ ./disable-darwin-v8-system-instrumentation.patch # Fixes node incorrectly building vendored OpenSSL when we want system OpenSSL. From 2cfe7ecbc9388e3a9c045519e0311e6986c13cd7 Mon Sep 17 00:00:00 2001 From: Moritz Hedtke Date: Tue, 11 Jan 2022 08:15:55 +0000 Subject: [PATCH 04/11] nodejs-14_x: 14.18.2 -> 14.18.3 --- pkgs/development/web/nodejs/v14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 31912481b499..d6d94297f373 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -7,7 +7,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.18.2"; - sha256 = "02v8rjwm8492w91rfvxy369bm11wy3vlkl3dxcl3dkcb1zhrr2iy"; + version = "14.18.3"; + sha256 = "026nd6vihjdqz4jn0slg89m8m5vvkvjzgg1aip3dcg9lrm1w8fkq"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } From d1de6589a4d5e373f9194d956554f951166366d9 Mon Sep 17 00:00:00 2001 From: Moritz Hedtke Date: Tue, 11 Jan 2022 08:16:15 +0000 Subject: [PATCH 05/11] nodejs-12_x: 12.22.8 -> 12.22.9 --- pkgs/development/web/nodejs/v12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index f69915ddfa69..4eaf37d2bf40 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "12.22.8"; - sha256 = "0g0ihjzbd02izhmb4jzkdsr5788982wy8q2b4a1h04q8l4fwp197"; + version = "12.22.9"; + sha256 = "0jp2fdl73zj5lqjvw98i8pcf7m05cvjcab231zjvdhl4wl1jr66s"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } From 298f2b76e5f4dc4dea4217b938535e50e1650cd2 Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Wed, 12 Jan 2022 00:47:12 +0100 Subject: [PATCH 06/11] jackett: 0.20.184 -> 0.20.285 This fixes unit test `TestCardigannHtmlAsync` failing --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 076bd4dbdf43..a6648bbc0f8d 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.184"; + version = "0.20.285"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "Qp1yh1bPiJyZb5myPJJqOZAbrEHl/sD+PSLxjvrj0ho="; + sha256 = "3TwDzbuXaychz/BQ/AoXjhjXz1TedC2tmh5jNwe3gOM="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; From 0c72fb355cf1147de6106f3185fc8d0db22c9b3c Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Wed, 12 Jan 2022 01:15:22 +0100 Subject: [PATCH 07/11] discordchatexporter-cli: 2.30.1 -> 2.31.1 --- .../backup/discordchatexporter-cli/default.nix | 8 +++++--- .../backup/discordchatexporter-cli/deps.nix | 16 +++++----------- .../backup/discordchatexporter-cli/updater.sh | 2 +- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/backup/discordchatexporter-cli/default.nix b/pkgs/tools/backup/discordchatexporter-cli/default.nix index 38dfd55783de..fb7fc1179571 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/default.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/default.nix @@ -8,17 +8,19 @@ buildDotnetModule rec { pname = "discordchatexporter-cli"; - version = "2.30.1"; + version = "2.31.1"; src = fetchFromGitHub { owner = "tyrrrz"; repo = "discordchatexporter"; rev = version; - sha256 = "JSYIhd+DNVOKseHtWNNChECR5hKr+ntu1Yyqtnlg8rM="; + sha256 = "QK63H+Qyd8zEue84vECcyAP6FH8az++1PZmbrPvBgrU="; }; + dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-runtime = dotnetCorePackages.runtime_6_0; + projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj"; - dotnet-runtime = dotnetCorePackages.runtime_3_1; nugetDeps = ./deps.nix; nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/tools/backup/discordchatexporter-cli/deps.nix index 172fe928dd77..edc2eccd92a9 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/deps.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -1,16 +1,10 @@ { fetchNuGet }: [ (fetchNuGet { pname = "CliFx"; version = "2.0.6"; sha256 = "09yyjgpp52b0r3mqlvx75ld4vjp8hry7ql7r20nnvj0lach6fyh6"; }) (fetchNuGet { pname = "Gress"; version = "1.2.0"; sha256 = "0aidc9whi0718gh896j7xkyndki9x7rifd8n1n681afb2zbxw4bn"; }) - (fetchNuGet { pname = "JsonExtensions"; version = "1.1.0"; sha256 = "1fqxb2jdbvjgg135wmy890qf63r056dq16jy7wgzkgp21m3j0lgy"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.21"; sha256 = "01kbhi29lhv6mg1zfsyakz3z8hfbxnc0kxy0fczl8xqviik9svx7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; }) - (fetchNuGet { pname = "MiniRazor.CodeGen"; version = "2.1.4"; sha256 = "1856hfw2wl3ilxmpg4jmwpigmq0rm50i9pmy3sq8f1xc8j44kzl2"; }) - (fetchNuGet { pname = "MiniRazor.Runtime"; version = "2.1.4"; sha256 = "1pc3kjbnz810a8bb94k6355rflmayigfmpfmc4jzzx6l6iavnnc4"; }) + (fetchNuGet { pname = "JsonExtensions"; version = "1.2.0"; sha256 = "0g54hibabbqqfhxjlnxwv1rxagpali5agvnpymp2w3dk8h6q66xy"; }) + (fetchNuGet { pname = "MiniRazor.CodeGen"; version = "2.2.0"; sha256 = "1rbgkm1hsamqhviw2c62g6iafiwkxcnz66qbybpd32qgz1124cx4"; }) + (fetchNuGet { pname = "MiniRazor.Runtime"; version = "2.2.0"; sha256 = "0zm0l97jfbfy90zj0cbi7v3qbhxhfay1g8f2cw0gp829xz4yk9jr"; }) (fetchNuGet { pname = "Polly"; version = "7.2.2"; sha256 = "0s15n5zwj44i6sw3v40ca8l6j0ijydxcakvad49j52rp49iwrmkn"; }) - (fetchNuGet { pname = "Spectre.Console"; version = "0.41.0"; sha256 = "104vyzwbbq5m75dm31xk7ilvmik8hw1cj3bc301a8w6gq8i0fpk3"; }) - (fetchNuGet { pname = "Superpower"; version = "2.3.0"; sha256 = "0bdsc3c0d6jb0wr67siqfba0ldl0jxbwis6xr0whzqzf6m2cyahm"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.0"; sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; }) - (fetchNuGet { pname = "Tyrrrz.Extensions"; version = "1.6.5"; sha256 = "1yzsii1pbp6b066wxwwws310p7h809apl81bhb8ad55hqlzy1rg3"; }) - (fetchNuGet { pname = "Wcwidth"; version = "0.2.0"; sha256 = "0p7zaisix9ql4v5nyl9gfc93xcyj74j01rwvgm7jw29js3wlj10s"; }) + (fetchNuGet { pname = "Spectre.Console"; version = "0.43.0"; sha256 = "17yh20s17fkcs3iyb5yylqh90jvb36gdn0aaglq3d67rpmcrl5gc"; }) + (fetchNuGet { pname = "Superpower"; version = "3.0.0"; sha256 = "0p6riay4732j1fahc081dzgs9q4z3n2fpxrin4zfpj6q2226dhz4"; }) ] diff --git a/pkgs/tools/backup/discordchatexporter-cli/updater.sh b/pkgs/tools/backup/discordchatexporter-cli/updater.sh index 1fc261c29803..c33b318d25b1 100755 --- a/pkgs/tools/backup/discordchatexporter-cli/updater.sh +++ b/pkgs/tools/backup/discordchatexporter-cli/updater.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts nuget-to-nix dotnet-sdk_5 +#!nix-shell -i bash -p curl jq common-updater-scripts nuget-to-nix dotnet-sdk_6 set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" From d1556aac1306e36412408e2a680b7bea8970bfee Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Tue, 11 Jan 2022 18:31:29 -0600 Subject: [PATCH 08/11] pinsel: init at unstable-2021-09-13 --- pkgs/tools/misc/pinsel/default.nix | 34 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/misc/pinsel/default.nix diff --git a/pkgs/tools/misc/pinsel/default.nix b/pkgs/tools/misc/pinsel/default.nix new file mode 100644 index 000000000000..de6cc3700838 --- /dev/null +++ b/pkgs/tools/misc/pinsel/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, gtk3, lua, glib }: + +stdenv.mkDerivation rec { + pname = "pinsel"; + version = "unstable-2021-09-13"; + + src = fetchFromGitHub { + owner = "Nooo37"; + repo = pname; + rev = "24b0205ca041511b3efb2a75ef296539442f9f54"; + sha256 = "sha256-w+jiKypZODsmZq3uWGNd8PZhe1SowHj0thcQTX8WHfQ="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config glib ]; + + buildInputs = [ lua gtk3 ]; + + makeFlags = [ "INSTALLDIR=${placeholder "out"}/bin" ]; + + preInstall = '' + mkdir -p $out/bin + ''; + + meta = with lib; { + description = "Minimal screenshot annotation tool with lua config"; + homepage = "https://github.com/Nooo37/pinsel"; + # no license + license = licenses.unfree; + maintainers = with maintainers; [ lom ]; + mainProgram = "pinsel"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab134fff60fe..5bd59c7c3a83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8720,6 +8720,8 @@ with pkgs; pinnwand = callPackage ../servers/pinnwand { }; + pinsel = callPackage ../tools/misc/pinsel { }; + piping-server-rust = callPackage ../servers/piping-server-rust { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; From a9977abefe78db53a42263deea9c9dfe3fe8c283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 11 Jan 2022 21:09:45 +0000 Subject: [PATCH 09/11] flashfocus: unpin pyyaml --- pkgs/misc/flashfocus/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/misc/flashfocus/default.nix index 6a8786be6eaa..fd93260a4bca 100644 --- a/pkgs/misc/flashfocus/default.nix +++ b/pkgs/misc/flashfocus/default.nix @@ -9,6 +9,11 @@ python3.pkgs.buildPythonApplication rec { sha256 = "0cn44hryvz2wl7xklaslxsb3l2i3f8jkgmml0n9v2ks22j5l4r4h"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "pyyaml>=5.1,<6.0" "pyyaml>=5.1" + ''; + nativeBuildInputs = with python3.pkgs; [ pytest-runner ]; From 88382b95bfc9db839fe94b9dc9b0779e10b6531d Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Tue, 11 Jan 2022 21:49:56 -0600 Subject: [PATCH 10/11] maintainers: add portothree --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c58b8b6b951b..486c79b718a0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13601,6 +13601,12 @@ github = "jpagex"; githubId = 635768; }; + portothree = { + name = "Gustavo Porto"; + email = "gustavoporto@ya.ru"; + github = "portothree"; + githubId = 3718120; + }; pwoelfel = { name = "Philipp Woelfel"; email = "philipp.woelfel@gmail.com"; From bc151db96f2f032059576259c7541568cffacb94 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Tue, 11 Jan 2022 21:50:14 -0600 Subject: [PATCH 11/11] llama: init at 1.0.1 --- pkgs/applications/misc/llama/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/misc/llama/default.nix diff --git a/pkgs/applications/misc/llama/default.nix b/pkgs/applications/misc/llama/default.nix new file mode 100644 index 000000000000..60598afcc4e1 --- /dev/null +++ b/pkgs/applications/misc/llama/default.nix @@ -0,0 +1,22 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "llama"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "antonmedv"; + repo = "llama"; + rev = "v${version}"; + sha256 = "sha256-6Xuwl4IpzbVfJ2MhHeImPFWxL/Y6rhnBExlh64PeGdk="; + }; + + vendorSha256 = "sha256-J/2R3XhGNmejc3jstJ0NWmJm/a1Re6UK6AuQb5gzh4E="; + + meta = with lib; { + description = "Terminal file manager"; + homepage = "https://github.com/antonmedv/llama"; + license = licenses.mit; + maintainers = with maintainers; [ portothree ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab134fff60fe..6dc76f72ba35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18155,6 +18155,8 @@ with pkgs; libmad = callPackage ../development/libraries/libmad { }; + llama = callPackage ../applications/misc/llama { }; + malcontent = callPackage ../development/libraries/malcontent { }; malcontent-ui = callPackage ../development/libraries/malcontent/ui.nix { };