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

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-01-13 06:01:04 +00:00 committed by GitHub
parent a8b75d6f2f 2641efd7d0
commit aacf6c8fc6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 106 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/networking/cluster/argo/default.nix
View file

@ -19,16 +19,16 @@ let
in
buildGoModule rec {
pname = "argo";
version = "3.2.4";
version = "3.2.6";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo";
rev = "v${version}";
sha256 = "sha256-uymE+Eq4jsqWIhDsbALzV+xAKF22DddPFzKtn3tV2EA=";
sha256 = "sha256-QyjG+/zXbZ7AS/+yXNV0PocXJaSKeJNN+1F7EMv1LOI=";
};
vendorSha256 = "sha256-2b+PvD5IKgobBzFrubjRl2NvFxw91dXYpnWO8dqDG+U=";
vendorSha256 = "sha256-hxSr0sNlz93JxOxnE2SnR6/OgCGK8DrJZxqQtSxfbj8=";
doCheck = false;

6
pkgs/applications/office/trilium/default.nix
View file

@ -19,16 +19,16 @@ let
maintainers = with maintainers; [ fliegendewurst ];
};
version = "0.48.8";
version = "0.49.4";
desktopSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
sha256 = "1dz4wdx3d1pmm3yrvipqa929f6gqilhfc3sp6xcgbn9faypp6qra";
sha256 = "078w7jjkn8af3i0y0s236ky54h08b2wgzcaiakqiqx4gxdpf6jrq";
};
serverSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
sha256 = "0jp1hj51x5wz27f7739nwwli119pzpskg269cxk4i04xxbhr145j";
sha256 = "0hygdxb97373z5cn3s4wr66wc41w7a55kxjyb8alck1fl9l6agn1";
};
in {

4
pkgs/applications/radio/wsjtx/default.nix
View file

@ -4,12 +4,12 @@
stdenv.mkDerivation rec {
pname = "wsjtx";
version = "2.5.3";
version = "2.5.4";
# This is a "superbuild" tarball containing both wsjtx and a hamlib fork
src = fetchurl {
url = "http://physics.princeton.edu/pulsar/k1jt/wsjtx-${version}.tgz";
sha256 = "sha256-Dd99JBPn1TgPF8Yvqk+AZX8ZUuQjYS0Tx3y5A3VZsHw=";
sha256 = "sha256-Gz84Rq0sCl9BAXi2YSdl1Z7mPbJJ62z8MyrOF/CjCJg=";
};
# Hamlib builds with autotools, wsjtx builds with cmake

13
pkgs/applications/video/mpv/scripts/sponsorblock.nix
View file

@ -3,13 +3,13 @@
# Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.sponsorblock ]; }`
stdenvNoCC.mkDerivation {
pname = "mpv_sponsorblock";
version = "unstable-2020-07-05";
version = "unstable-2021-12-23";
src = fetchFromGitHub {
owner = "po5";
repo = "mpv_sponsorblock";
rev = "f71e49e0531350339134502e095721fdc66eac20";
sha256 = "1fr4cagzs26ygxyk8dxqvjw4n85fzv6is6cb1jhr2qnsjg6pa0p8";
rev = "6743bd47d4cfce3ae3d5dd4f587f3193bd4fb9b2";
sha256 = "06c37f33cdpz1w1jacjf1wnbh4f9b1xpipxzkg5ixf46cbwssmsj";
};
dontBuild = true;
@ -39,10 +39,13 @@ stdenvNoCC.mkDerivation {
cp -r sponsorblock.lua sponsorblock_shared $out/share/mpv/scripts/
'';
passthru.scriptName = "sponsorblock.lua";
passthru = {
scriptName = "sponsorblock.lua";
updateScript = ./update-sponsorblock.sh;
};
meta = with lib; {
description = "mpv script to skip sponsored segments of YouTube videos";
description = "Script for mpv to skip sponsored segments of YouTube videos";
homepage = "https://github.com/po5/mpv_sponsorblock";
license = licenses.gpl3;
platforms = platforms.all;

49
pkgs/applications/video/mpv/scripts/update-sponsorblock.sh Executable file
View file

@ -0,0 +1,49 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p common-updater-scripts git jq nix nix-prefetch-git
git_url='https://github.com/po5/mpv_sponsorblock.git'
git_branch='master'
git_dir='/var/tmp/mpv_sponsorblock.git'
nix_file="$(dirname "${BASH_SOURCE[0]}")/sponsorblock.nix"
pkg='mpvScripts.sponsorblock'
set -euo pipefail
info() {
if [ -t 2 ]; then
set -- '\033[32m%s\033[39m\n' "$@"
else
set -- '%s\n' "$@"
fi
printf "$@" >&2
}
old_rev=$(nix-instantiate --eval --strict --json -A "$pkg.src.rev" | jq -r)
old_version=$(nix-instantiate --eval --strict --json -A "$pkg.version" | jq -r)
today=$(LANG=C date -u +'%Y-%m-%d')
info "fetching $git_url..."
if [ ! -d "$git_dir" ]; then
git init --initial-branch="$git_branch" "$git_dir"
git -C "$git_dir" remote add origin "$git_url"
fi
git -C "$git_dir" fetch --depth=1 origin "$git_branch"
# use latest commit before today, we should not call the version *today*
# because there might still be commits coming
# use the day of the latest commit we picked as version
new_rev=$(git -C "$git_dir" log -n 1 --format='format:%H' --before="${today}T00:00:00Z" "origin/$git_branch")
new_version="unstable-$(git -C "$git_dir" log -n 1 --format='format:%cs' "$new_rev")"
info "latest commit before $today: $new_rev"
if [ "$new_rev" = "$old_rev" ]; then
info "$pkg is up-to-date."
exit
fi
new_sha256=$(nix-prefetch-git --rev "$new_rev" "$git_dir" | jq -r .sha256)
update-source-version "$pkg" \
"$new_version" \
"$new_sha256" \
--rev="$new_rev"
git add "$nix_file"
git commit --verbose --message "$pkg: $old_version -> $new_version"

4
pkgs/development/beam-modules/erlang-ls/default.nix
View file

@ -1,7 +1,7 @@
{ fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper
, stdenv, writeScript, lib }:
let
version = "0.20.0";
version = "0.21.2";
owner = "erlang-ls";
repo = "erlang_ls";
deps = import ./rebar-deps.nix {
@ -19,7 +19,7 @@ rebar3Relx {
inherit version;
src = fetchFromGitHub {
inherit owner repo;
sha256 = "sha256-XBCauvPalIPjVOYlMfWC+5mKku28b/qqKhp9NgSkoyA=";
sha256 = "sha256-CiA71mvmq3HrJvgrEDMwp3CQ4Dl05BpTO5HusAL5FAQ=";
rev = version;
};
releaseType = "escript";

32
pkgs/development/beam-modules/erlang-ls/rebar-deps.nix
View file

@ -114,16 +114,6 @@ let
};
beamDeps = [ katana_code ];
};
ranch = builder {
name = "ranch";
version = "2.0.0";
src = fetchHex {
pkg = "ranch";
version = "2.0.0";
sha256 = "sha256-wgpIQMfWYjwZgS06fIKLLxvRU+8PEky2nFT+UdikKuA=";
};
beamDeps = [ ];
};
jsx = builder {
name = "jsx";
version = "3.0.0";
@ -134,14 +124,24 @@ let
};
beamDeps = [ ];
};
erlfmt = builder {
name = "erlfmt";
gradualizer = builder {
name = "gradualizer";
version = "git";
src = fetchFromGitHub {
owner = "whatsapp";
repo = "erlfmt";
rev = "2e93fc4a646111357642b0179a2a63151868d890";
sha256 = "0n7kygycn05aqdp5dyj192mja89l4nxv2wg16qg2c0bmw9s7j2mr";
owner = "josefs";
repo = "gradualizer";
rev = "e93db1c6725760def005c69d72f53b1a889b4c2f";
sha256 = "0i1mh0dw2qknrjwpbxhgpwspqv12bznylv17sznid3kbb31pslay";
};
beamDeps = [ ];
};
erlfmt = builder {
name = "erlfmt";
version = "1.0.0";
src = fetchHex {
pkg = "erlfmt";
version = "1.0.0";
sha256 = "sha256-RL4L4DzmmQLcbc2PZeezre1qr10L5wlkGIyr1K0k8E4=";
};
beamDeps = [ ];
};

4
pkgs/development/python-modules/flux-led/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "flux-led";
version = "0.28.0";
version = "0.28.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "flux_led";
rev = version;
sha256 = "sha256-6IJxOQIRUfmf+tE5CxIlu7EZBp6j8BeVO2mKKW0VWBY=";
sha256 = "sha256-4Er9n3dx2j4/dAmNiQVGh7vwbjtKk8+KOFClyDrLOsk=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pontos/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pontos";
version = "22.1.0";
version = "22.1.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "greenbone";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/C7BiKWdMcUuKXxPTdttT79YjBDmwj9CG5W38YZHw2c=";
sha256 = "sha256-p7E86McHeijsXpaByD5qLHYQLnSImLwHn15INyxWiZc=";
};
nativeBuildInputs = [

10
pkgs/development/python-modules/python-http-client/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "python_http_client";
version = "3.3.4";
version = "3.3.5";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "sendgrid";
repo = "python-http-client";
rev = version;
sha256 = "sha256-wTXHq+tC+rfvmDZIWvcGhQZqm6DxOmx50BsX0c6asec=";
sha256 = "sha256-VSrh6t9p7Xb8HqAwcuDSUD2Pj3NcXeg7ygKLG2MHFxk=";
};
checkInputs = [
@ -25,12 +25,6 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTests = [
# Test is failing as the test is dynamic
# https://github.com/sendgrid/python-http-client/issues/153
"test__daterange"
];
pythonImportsCheck = [
"python_http_client"
];

15
pkgs/misc/wiki-tui/default.nix
View file

@ -2,34 +2,25 @@
rustPlatform.buildRustPackage rec {
pname = "wiki-tui";
version = "0.4.3";
version = "0.4.4";
src = fetchFromGitHub {
owner = "Builditluc";
repo = pname;
rev = "v${version}";
sha256 = "sha256-maN/0lJx6/lj3Zn+IZcPJFPPFVLbnpwxeMSTyzKYX6s=";
sha256 = "sha256-IkPv6oPdwfuIQrqQGqZAJ0b9OPRiA3GWDQuPXM/+fY4=";
};
# latest update forgot to include cargo.lock update
cargoPatches = [
(fetchpatch {
url = "https://github.com/Builditluc/wiki-tui/commit/87993eaca35a14afc1fb557482b099a6dd2da911.patch";
sha256 = "sha256-n04FCZwQ9pPanz9QQY/7Apyoy6lG0t/23S40p4c/TXw=";
})
];
buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security;
nativeBuildInputs = [ pkg-config ];
cargoSha256 = "sha256-x4oS9IBF2GMcilv9Oi/IeFaCM3sxWn7PpkKcaeSqIog=";
cargoSha256 = "sha256-/56KsEg6deeROERWLd9lX+7v6n5Dx1VCzdr/GtPFuGo=";
meta = with lib; {
description = "A simple and easy to use Wikipedia Text User Interface";
homepage = "https://github.com/builditluc/wiki-tui";
license = licenses.mit;
maintainers = with maintainers; [ lom ];
mainProgram = "wiki-tui";
};
}

1
pkgs/tools/security/wprecon/default.nix
View file

@ -23,5 +23,6 @@ buildGoModule rec {
# https://github.com/blackbinn/wprecon/blob/master/LICENSE
license = with licenses; [ unfree ];
maintainers = with maintainers; [ fab ];
broken = true; # build fails, missing tag
};
}

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

@ -2077,7 +2077,7 @@ with pkgs;
avro-c = callPackage ../development/libraries/avro-c { };
avro-cpp = callPackage ../development/libraries/avro-c++ { boost = boost160; };
avro-cpp = callPackage ../development/libraries/avro-c++ { };
aws = callPackage ../tools/virtualization/aws { };
@ -6611,7 +6611,9 @@ with pkgs;
ipfs = callPackage ../applications/networking/ipfs { };
ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { };
ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { };
ipfs-cluster = callPackage ../applications/networking/ipfs-cluster {
buildGoModule = buildGo116Module;
};
ipget = callPackage ../applications/networking/ipget { };
@ -10106,7 +10108,9 @@ with pkgs;
pythonPackages = python3Packages;
};
telepresence2 = callPackage ../tools/networking/telepresence2 { };
telepresence2 = callPackage ../tools/networking/telepresence2 {
buildGoModule = buildGo116Module;
};
teler = callPackage ../tools/security/teler { };
@ -21249,7 +21253,9 @@ with pkgs;
unit = callPackage ../servers/http/unit { };
ncdns = callPackage ../servers/dns/ncdns { };
ncdns = callPackage ../servers/dns/ncdns {
buildGoModule = buildGo116Module;
};
nginx = nginxStable;
@ -28891,7 +28897,9 @@ with pkgs;
tenacity = callPackage ../applications/audio/tenacity { wxGTK = wxGTK31-gtk3; };
tendermint = callPackage ../tools/networking/tendermint { };
tendermint = callPackage ../tools/networking/tendermint {
buildGoModule = buildGo116Module;
};
termdbms = callPackage ../development/tools/database/termdbms { };