dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-06-20 00:03:01 +00:00 committed by GitHub
commit 84e1feed8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 99 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
maintainers/maintainer-list.nix
View File

@ -2529,6 +2529,13 @@
fingerprint = "68B8 0D57 B2E5 4AC3 EC1F 49B0 B37E 0F23 7101 6A4C"; fingerprint = "68B8 0D57 B2E5 4AC3 EC1F 49B0 B37E 0F23 7101 6A4C";
}]; }];
}; };
colinsane = {
name = "Colin Sane";
email = "colin@uninsane.org";
matrix = "@colin:uninsane.org";
github = "uninsane";
githubId = 106709944;
};
collares = { collares = {
email = "mauricio@collares.org"; email = "mauricio@collares.org";
github = "collares"; github = "collares";

9
pkgs/applications/editors/vim/plugins/overrides.nix
View File

@ -1031,7 +1031,7 @@ self: super: {
delve delve
errcheck errcheck
go-motion go-motion
go-tools go-tools # contains staticcheck
gocode gocode
gocode-gomod gocode-gomod
godef godef
@ -1041,7 +1041,8 @@ self: super: {
gomodifytags gomodifytags
gopls gopls
# gorename # gorename
gotools # contains staticcheck # gotags
gotools
# guru # guru
iferr iferr
impl impl
@ -1052,9 +1053,7 @@ self: super: {
in in
{ {
postPatch = '' postPatch = ''
${gnused}/bin/sed \ sed -i autoload/go/config.vim -Ee 's@"go_bin_path", ""@"go_bin_path", "${binPath}"@g'
-Ee 's@"go_bin_path", ""@"go_bin_path", "${binPath}"@g' \
-i autoload/go/config.vim
''; '';
}); });

60
pkgs/applications/misc/whalebird/default.nix
View File

@ -1,28 +1,51 @@
{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron { lib, stdenv, fetchurl, autoPatchelfHook, makeDesktopItem, copyDesktopItems, makeWrapper, electron
, nodePackages, alsa-lib, gtk3, libdbusmenu, libxshmfence, mesa, nss }: , nodePackages, alsa-lib, gtk3, libdbusmenu, libxshmfence, mesa, nss }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "whalebird"; pname = "whalebird";
version = "4.5.4"; version = "4.6.0";
src = fetchurl { src = let
url = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}/Whalebird-${version}-linux-x64.deb"; downloads = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}";
sha256 = "048c2hpnlzjli8r1lcm7hd32qfsq4p9vkimrgc049yw9f15ndjpr"; in
}; if stdenv.system == "x86_64-linux" then
fetchurl {
url = downloads + "/Whalebird-${version}-linux-x64.tar.bz2";
sha256 = "02f2f4b7184494926ef58523174acfa23738d5f27b4956d094836a485047c2f8";
}
else if stdenv.system == "aarch64-linux" then
fetchurl {
url = downloads + "/Whalebird-${version}-linux-arm64.tar.bz2";
sha256 = "de0cdf7cbd6f0305100a2440e2559ddce0a5e4ad73a341874d6774e23dc76974";
}
else
throw "Whalebird is not supported for ${stdenv.system}";
nativeBuildInputs = [ nativeBuildInputs = [
dpkg
autoPatchelfHook autoPatchelfHook
makeWrapper makeWrapper
copyDesktopItems
nodePackages.asar nodePackages.asar
]; ];
buildInputs = [ alsa-lib gtk3 libdbusmenu libxshmfence mesa nss ]; buildInputs = [ alsa-lib gtk3 libdbusmenu libxshmfence mesa nss ];
dontConfigure = true; desktopItems = [
(makeDesktopItem {
desktopName = "Whalebird";
comment = meta.description;
categories = [ "Network" ];
exec = "whalebird";
icon = "whalebird";
name = "whalebird";
})
];
unpackPhase = '' unpackPhase = ''
dpkg-deb -x ${src} ./ mkdir -p opt
tar -xf ${src} -C opt
# remove the version/target suffix from the untar'd directory
mv opt/Whalebird-* opt/Whalebird
''; '';
buildPhase = '' buildPhase = ''
@ -31,7 +54,7 @@ stdenv.mkDerivation rec {
# Necessary steps to find the tray icon # Necessary steps to find the tray icon
asar extract opt/Whalebird/resources/app.asar "$TMP/work" asar extract opt/Whalebird/resources/app.asar "$TMP/work"
substituteInPlace $TMP/work/dist/electron/main.js \ substituteInPlace $TMP/work/dist/electron/main.js \
--replace "jo,\"tray_icon.png\"" "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\"" --replace "Do,\"tray_icon.png\"" "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\""
asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" opt/Whalebird/resources/app.asar asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" opt/Whalebird/resources/app.asar
runHook postBuild runHook postBuild
@ -41,12 +64,17 @@ stdenv.mkDerivation rec {
runHook preInstall runHook preInstall
mkdir $out mkdir $out
mv usr/share opt $out mv opt $out
# install icons
for icon in $out/opt/Whalebird/resources/build/icons/*.png; do
mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps"
ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/whalebird.png"
done
substituteInPlace $out/share/applications/whalebird.desktop \
--replace '/opt/Whalebird' $out/bin
makeWrapper ${electron}/bin/electron $out/bin/whalebird \ makeWrapper ${electron}/bin/electron $out/bin/whalebird \
--add-flags $out/opt/Whalebird/resources/app.asar --add-flags $out/opt/Whalebird/resources/app.asar \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
runHook postInstall runHook postInstall
''; '';
@ -55,7 +83,7 @@ stdenv.mkDerivation rec {
description = "Electron based Mastodon, Pleroma and Misskey client for Windows, Mac and Linux"; description = "Electron based Mastodon, Pleroma and Misskey client for Windows, Mac and Linux";
homepage = "https://whalebird.social"; homepage = "https://whalebird.social";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ wolfangaukang ]; maintainers = with maintainers; [ wolfangaukang colinsane ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" "aarch64-linux" ];
}; };
} }

6
pkgs/applications/version-management/git-and-tools/lefthook/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "lefthook"; pname = "lefthook";
version = "0.8.0"; version = "1.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "evilmartians"; owner = "evilmartians";
repo = "lefthook"; repo = "lefthook";
sha256 = "sha256-ahkTxuBjMbvBzPuLtW7AhM2OUtL9Rw+ZqgnGGTkeCQQ="; sha256 = "sha256-UpMzqp4NVvj/Y3OdtI5nGhJHgPIfSlopmyv7jDDpWdM=";
}; };
vendorSha256 = "sha256-Rp67FnFU27u85t02MIs7wZQoOa8oGsHVVPQ9OdIyTJg="; vendorSha256 = "sha256-LCBQyVSkUywceIlioYRNuRc6FrbPKuhgfw5OocR3NvI=";
doCheck = false; doCheck = false;

6
pkgs/applications/virtualization/lima/default.nix
View File

@ -8,16 +8,16 @@
buildGoModule rec { buildGoModule rec {
pname = "lima"; pname = "lima";
version = "0.11.0"; version = "0.11.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lima-vm"; owner = "lima-vm";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-OqsLHxY7dZKN/zazeDASBt5UsQGieU5laIUeshtS55w="; sha256 = "sha256-tTa/FQiF2qZ36OGORr5fqvKR5i6qo7OTBJFGWJMShQ0=";
}; };
vendorSha256 = "sha256-0Z+SAEHFJio+N7ATiviBkLPn6cNFlhE3Dsj8CxVtf7c="; vendorSha256 = "sha256-wvb592mmxOeRSX8Rxx2m7tZ2S8wQTcQkL3b6z0F6OEQ=";
nativeBuildInputs = [ makeWrapper installShellFiles ]; nativeBuildInputs = [ makeWrapper installShellFiles ];

17
pkgs/development/python-modules/deal-solver/default.nix
View File

@ -11,15 +11,16 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "deal-solver"; pname = "deal-solver";
version = "0.1.0"; version = "0.1.1";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "life4"; owner = "life4";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-eSSyLBwPc0rrfew91nLBagYDD6aJRyx0cE9YTTSODI8="; hash = "sha256-LXBAWbm8fT/jYNbzB95YeBL9fEknMNJvkTRMbc+nf6c=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -47,16 +48,6 @@ buildPythonPackage rec {
hypothesis hypothesis
]; ];
disabledTests = [
# z3 assertion error
"test_expr_asserts_ok"
];
disabledTestPaths = [
# regex matching seems flaky on tests
"tests/test_stdlib/test_re.py"
];
pythonImportsCheck = [ "deal_solver" ]; pythonImportsCheck = [ "deal_solver" ];
meta = with lib; { meta = with lib; {

6
pkgs/development/python-modules/duckdb-engine/default.nix
View File

@ -11,7 +11,7 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "duckdb-engine"; pname = "duckdb-engine";
version = "0.1.8"; version = "0.1.10";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -19,8 +19,8 @@ buildPythonPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "duckdb_engine"; repo = "duckdb_engine";
owner = "Mause"; owner = "Mause";
rev = version; rev = "refs/tags/${version}";
hash = "sha256-dnm1nveCjrXFjDRykHp39AeVx7sk7Q/XwGn6hxdydT4="; hash = "sha256-KyRBtl6lCBlgnlh+iblmG6t6brYduosBF6NK3KQQ9OM=";
}; };
nativeBuildInputs = [ poetry-core ]; nativeBuildInputs = [ poetry-core ];

4
pkgs/development/python-modules/gidgethub/default.nix
View File

@ -14,14 +14,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "gidgethub"; pname = "gidgethub";
version = "5.1.0"; version = "5.2.0";
format = "flit"; format = "flit";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-kNGTb6mA2XBaljYvpOWaKFEks3NigsiPgmdIgSMKTiU="; sha256 = "sha256-w1m3aRlOcvmE0uMo3g7o64G3AjQrCkTcXOuskhBOz0s=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-spanner/default.nix
View File

@ -14,11 +14,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-spanner"; pname = "google-cloud-spanner";
version = "3.15.0"; version = "3.15.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-NiHLaxYV3+40Dbs8miru6qG5vYlTToGTi8QRdLy5rZs="; sha256 = "sha256-VmHmje3fJfiCT2CeJgk98qdFhZnxGZudfHP1MgW6Mtw=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

5
pkgs/development/python-modules/httpagentparser/default.nix
View File

@ -5,11 +5,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "httpagentparser"; pname = "httpagentparser";
version = "1.9.2"; version = "1.9.3";
# Github version does not have any release tags
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "a190dfdc5e63b2f1c87729424b19cbc49263d6a1fb585a16ac1c9d9ce127a4bf"; sha256 = "1x20j4gyx4vfsxs3bx8qcbdhq7n34gjr8gd01qlri96wpmn4c3rp";
}; };
# PyPi version does not include test directory # PyPi version does not include test directory

8
pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
View File

@ -4,6 +4,7 @@
, pyjwt , pyjwt
, pytestCheckHook , pytestCheckHook
, python-dateutil , python-dateutil
, pythonOlder
, requests , requests
, responses , responses
, tox , tox
@ -11,11 +12,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ibm-cloud-sdk-core"; pname = "ibm-cloud-sdk-core";
version = "3.15.1"; version = "3.15.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-bGTr8Qf7ywlbsl6/FEJEjFB/bqyyMwfmjVVAsrgmkTg="; hash = "sha256-CuVem9b7NhDsC2tXCg/+1DWZAqSHqJ0GuWZCmA/kesE=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

14
pkgs/servers/monitoring/prometheus/default.nix
View File

@ -13,6 +13,7 @@
, enableEureka ? true , enableEureka ? true
, enableGCE ? true , enableGCE ? true
, enableHetzner ? true , enableHetzner ? true
, enableIONOS ? true
, enableKubernetes ? true , enableKubernetes ? true
, enableLinode ? true , enableLinode ? true
, enableMarathon ? true , enableMarathon ? true
@ -22,15 +23,16 @@
, enableScaleway ? true , enableScaleway ? true
, enableTriton ? true , enableTriton ? true
, enableUyuni ? true , enableUyuni ? true
, enableVultr ? true
, enableXDS ? true , enableXDS ? true
, enableZookeeper ? true , enableZookeeper ? true
}: }:
let let
version = "2.35.0"; version = "2.36.0";
webUiStatic = fetchurl { webUiStatic = fetchurl {
url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz"; url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz";
sha256 = "sha256-66zWOjFTYwmspiKeklt3NAAT1uJJrZqeyQvWWsCN9fQ="; sha256 = "sha256-C+Np2mqAYQ1RUqYmql0eudPD/SpWmxdMQLe85SenIA4=";
}; };
in in
buildGoModule rec { buildGoModule rec {
@ -41,10 +43,10 @@ buildGoModule rec {
rev = "v${version}"; rev = "v${version}";
owner = "prometheus"; owner = "prometheus";
repo = "prometheus"; repo = "prometheus";
sha256 = "sha256-h0uBs3xMKpRH3A1VG5xrhjXVAT7GL5L3UZWb3HJ2Fz4="; sha256 = "sha256-FJXNCGIVj1OVWXwbXY6k65lXJCe1MqiqK7tw8nGWrEg=";
}; };
vendorSha256 = "sha256-0I6hmjhdfB41rWOQ9FM9CMq5w5437ka/jLuFXcBQBlM="; vendorSha256 = "sha256-kmAQGRFmGRJ3LuGLMcSc0bJuwMsKhYVUIqQ9vDSH0Cc=";
excludedPackages = [ "documentation/prometheus-mixin" ]; excludedPackages = [ "documentation/prometheus-mixin" ];
@ -70,6 +72,8 @@ buildGoModule rec {
"echo - github.com/prometheus/prometheus/discovery/gce"} "echo - github.com/prometheus/prometheus/discovery/gce"}
${lib.optionalString (enableHetzner) ${lib.optionalString (enableHetzner)
"echo - github.com/prometheus/prometheus/discovery/hetzner"} "echo - github.com/prometheus/prometheus/discovery/hetzner"}
${lib.optionalString (enableIONOS)
"echo - github.com/prometheus/prometheus/discovery/ionos"}
${lib.optionalString (enableKubernetes) ${lib.optionalString (enableKubernetes)
"echo - github.com/prometheus/prometheus/discovery/kubernetes"} "echo - github.com/prometheus/prometheus/discovery/kubernetes"}
${lib.optionalString (enableLinode) ${lib.optionalString (enableLinode)
@ -88,6 +92,8 @@ buildGoModule rec {
"echo - github.com/prometheus/prometheus/discovery/triton"} "echo - github.com/prometheus/prometheus/discovery/triton"}
${lib.optionalString (enableUyuni) ${lib.optionalString (enableUyuni)
"echo - github.com/prometheus/prometheus/discovery/uyuni"} "echo - github.com/prometheus/prometheus/discovery/uyuni"}
${lib.optionalString (enableVultr)
"echo - github.com/prometheus/prometheus/discovery/vultr"}
${lib.optionalString (enableXDS) ${lib.optionalString (enableXDS)
"echo - github.com/prometheus/prometheus/discovery/xds"} "echo - github.com/prometheus/prometheus/discovery/xds"}
${lib.optionalString (enableZookeeper) ${lib.optionalString (enableZookeeper)

6
pkgs/tools/security/keybase/default.nix
View File

@ -5,7 +5,7 @@
buildGoModule rec { buildGoModule rec {
pname = "keybase"; pname = "keybase";
version = "5.9.3"; version = "6.0.2";
modRoot = "go"; modRoot = "go";
subPackages = [ "kbnm" "keybase" ]; subPackages = [ "kbnm" "keybase" ];
@ -16,9 +16,9 @@ buildGoModule rec {
owner = "keybase"; owner = "keybase";
repo = "client"; repo = "client";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-vPQ1hBd33DwsW0b79kNH1yd7mrwkoftIYFgmMVxC+78="; sha256 = "sha256-JiYufEsoj/98An2qKdm/Uu4YHJr6ttc/VHn4kMgkuwI=";
}; };
vendorSha256 = "sha256-ckAnSSSEF00gbgxnPAi2Pi8TNu3nmAahK7TP6HnfmNo="; vendorSha256 = "sha256-D8b/pvmBGCnaRuf92FYgRcSSbN59Yu0CHKxAybdYjS4=";
patches = [ patches = [
(substituteAll { (substituteAll {

6
pkgs/tools/security/keybase/gui.nix
View File

@ -4,16 +4,16 @@
, runtimeShell, gsettings-desktop-schemas }: , runtimeShell, gsettings-desktop-schemas }:
let let
versionSuffix = "20220216215910.c82d65a685"; versionSuffix = "20220610191041.a459abf326";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "keybase-gui"; pname = "keybase-gui";
version = "5.9.3"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages version = "6.0.2"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
src = fetchurl { src = fetchurl {
url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb";
hash = "sha256-JY2DaqApv6K02y3B+JIXpV4SvvMQpBhw9eqr/5Sn0cg="; hash = "sha256-FMhbMSuJHq5d5E0dTVAk02y85UXmhtKZYk4qcbnhRxI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/tools/security/tor/default.nix
View File

@ -30,11 +30,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tor"; pname = "tor";
version = "0.4.7.7"; version = "0.4.7.8";
src = fetchurl { src = fetchurl {
url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; url = "https://dist.torproject.org/${pname}-${version}.tar.gz";
sha256 = "sha256-PhMRWLUrlDXX5D0cR+8oi5bQBTQsxEuMlQu0A4UaW0Q="; sha256 = "sha256-nppcZ60qzdXw+L4U7Vkf7QdrFwir+DRAZpkKD6Zv4ZU=";
}; };
outputs = [ "out" "geoip" ]; outputs = [ "out" "geoip" ];