b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-01-12 06:01:45 +00:00 committed by GitHub
parent e81177a147 73aaadb639
commit 89c9684b4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 95 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View file

@ -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";

22
pkgs/applications/misc/llama/default.nix Normal file
View file

@ -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 ];
};
}

4
pkgs/development/web/nodejs/v12.nix
View file

@ -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;
}

4
pkgs/development/web/nodejs/v14.nix
View file

@ -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;
}

4
pkgs/development/web/nodejs/v16.nix
View file

@ -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.

4
pkgs/development/web/nodejs/v17.nix
View file

@ -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.

5
pkgs/misc/flashfocus/default.nix
View file

@ -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
];

4
pkgs/servers/jackett/default.nix
View file

@ -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";

6
pkgs/servers/monitoring/prometheus/bind-exporter.nix
View file

@ -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; };

8
pkgs/tools/backup/discordchatexporter-cli/default.nix
View file

@ -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 ];

16
pkgs/tools/backup/discordchatexporter-cli/deps.nix generated
View file

@ -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"; })
]

2
pkgs/tools/backup/discordchatexporter-cli/updater.sh
View file

@ -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]}")"

34
pkgs/tools/misc/pinsel/default.nix Normal file
View file

@ -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";
};
}

4
pkgs/top-level/all-packages.nix
View file

@ -8736,6 +8736,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;
};
@ -18182,6 +18184,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 { };