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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-03-26 12:01:29 +00:00 committed by GitHub
commit 8422d0b645
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 96 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
maintainers/maintainer-list.nix
View File

@ -2094,15 +2094,6 @@
githubId = 68566724;
name = "bootstrap-prime";
};
boppyt = {
email = "boppy@nwcpz.com";
github = "boppyt";
githubId = 71049646;
name = "Zack A";
keys = [{
fingerprint = "E8D7 5C19 9F65 269B 439D F77B 6310 C97D E31D 1545";
}];
};
borisbabic = {
email = "boris.ivan.babic@gmail.com";
github = "borisbabic";
@ -13611,6 +13602,16 @@
githubId = 17243347;
name = "Sebastian Sellmeier";
};
sefidel = {
name = "sefidel";
email = "contact@sefidel.net";
matrix = "@sef:exotic.sh";
github = "sefidel";
githubId = 71049646;
keys = [{
fingerprint = "8BDF DFB5 6842 2393 82A0 441B 9238 BC70 9E05 516A";
}];
};
sei40kr = {
name = "Seong Yong-ju";
email = "sei40kr@gmail.com";

2
pkgs/applications/audio/lingot/default.nix
View File

@ -8,6 +8,7 @@
, alsa-lib
, libpulseaudio
, fftw
, fftwFloat
, json_c
, libjack2
, jackSupport ? true
@ -33,6 +34,7 @@ stdenv.mkDerivation rec {
alsa-lib
libpulseaudio
fftw
fftwFloat
json_c
] ++ lib.optional jackSupport libjack2;

2
pkgs/applications/editors/lite-xl/default.nix
View File

@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
description = "A lightweight text editor written in Lua";
homepage = "https://github.com/lite-xl/lite-xl";
license = licenses.mit;
maintainers = with maintainers; [ boppyt ];
maintainers = with maintainers; [ sefidel ];
platforms = platforms.unix;
};
}

14
pkgs/applications/emulators/snes9x/default.nix
View File

@ -3,7 +3,6 @@
, alsa-lib
, cmake
, fetchFromGitHub
, fetchpatch
, gtkmm3
, libepoxy
, libpng
@ -34,25 +33,16 @@ stdenv.mkDerivation rec {
"snes9x-gtk"
else
"snes9x";
version = "1.62";
version = "1.62.1";
src = fetchFromGitHub {
owner = "snes9xgit";
repo = "snes9x";
rev = version;
fetchSubmodules = true;
hash = "sha256-RcxFNmUbJp0rUugWOqQa3Sy/Hh18ZPOeDTxC0JY5GJQ=";
hash = "sha256-y/tNJmmgigMEqjBWLyqxM/GQ2jcu4YXZjP0AbIjoPLg=";
};
patches = [
# Fix cross-compilation, otherwise it fails to detect host compiler features
# Doesn't affect non CC builds
(fetchpatch {
url = "https://github.com/snes9xgit/snes9x/commit/f39ab408f4151c16d44e45470cc0736ffb2803f8.patch";
hash = "sha256-GMlHBsADEF+rycmEVgpWy220hZwld5D2e8fsYA7HblM=";
})
];
nativeBuildInputs = [
pkg-config
python3

12
pkgs/applications/networking/instant-messengers/zoom-us/default.nix
View File

@ -48,23 +48,23 @@ let
# and often with different versions. We write them on three lines
# like this (rather than using {}) so that the updater script can
# find where to edit them.
versions.aarch64-darwin = "5.13.11.16405";
versions.x86_64-darwin = "5.13.11.16405";
versions.x86_64-linux = "5.13.11.1288";
versions.aarch64-darwin = "5.14.0.16775";
versions.x86_64-darwin = "5.14.0.16775";
versions.x86_64-linux = "5.14.0.1720";
srcs = {
aarch64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
name = "zoomusInstallerFull.pkg";
hash = "sha256-YjERJ6B06/uloHRQVyZDLyf/2Gae0P7xdk4Db9aqROs=";
hash = "sha256-79Jb5cv9OWYM55fB8wtP+qYJc67+gNdiw9VrqnQPJ5U=";
};
x86_64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
hash = "sha256-g6n4SKdord7gRwBaYUle3+yi1eB0T36ilScTaCcU8us=";
hash = "sha256-HetPvZ7Bv8bC4DdoNM+92bFFQnwDY26WiEniwrBNSfk=";
};
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
hash = "sha256-BdI3HEQVe9A3D6KJ45wHWsrfb+dhTZAp/xlcr9X92EU=";
hash = "sha256-d8R2jfol5zAaI4qcpUIVdph899d7t/LRxQImXFzXXWo=";
};
};

4
pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome, gettext, jq }:
{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome, gettext, jq, intltool }:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-EasyScreenCast";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [
glib gettext jq
glib gettext jq intltool
];
makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ];

11
pkgs/development/python-modules/denonavr/default.nix
View File

@ -12,12 +12,13 @@
, pytest-httpx
, pytest-timeout
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "denonavr";
version = "0.11.1";
format = "setuptools";
version = "0.11.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -25,9 +26,13 @@ buildPythonPackage rec {
owner = "ol-iver";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-iYekqqhrcN1rbclFVSbJSF5ky19WsBLKlTxAa2HULqY=";
hash = "sha256-Sa5pfvSzshgwHh9LGWPBVIC7pXouZbTmSMYncT46phU=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
asyncstdlib
attrs

7
pkgs/development/python-modules/fake-useragent/default.nix
View File

@ -10,14 +10,16 @@
buildPythonPackage rec {
pname = "fake-useragent";
version = "1.1.2";
version = "1.1.3";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fake-useragent";
repo = "fake-useragent";
rev = "refs/tags/${version}";
hash = "sha256-Rz+oEpgfvSRdly+H1bYxYjNCfo1STkLcogPgZs+b8DY=";
hash = "sha256-8fVNko65nP/u9vLGBPfSseKW07b4JC6kCPFCPK2f6wU=";
};
postPatch = ''
@ -42,6 +44,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Up to date simple useragent faker with real world database";
homepage = "https://github.com/hellysmile/fake-useragent";
changelog = "https://github.com/fake-useragent/fake-useragent/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ evanjs ];
};

4
pkgs/development/python-modules/onvif-zeep-async/default.nix
View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "onvif-zeep-async";
version = "1.2.1";
version = "1.2.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-bRPqbuBrC4Q0gdQGb2KAy1pTHce42WvM7gjvAspH4WE=";
hash = "sha256-Mq+mARZQD48M6+9XwzX7V541Jqn/vJMSeiEm5k8/YII=";
};
propagatedBuildInputs = [

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

@ -24,7 +24,7 @@
buildPythonPackage rec {
pname = "python-benedict";
version = "0.29.1";
version = "0.30.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -33,7 +33,7 @@ buildPythonPackage rec {
owner = "fabiocaccamo";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-tsTd9EJkwI98ynXu/vz5hX+X55vxOkhIfeawQNn2f6Q=";
hash = "sha256-/LERLQw0Jb/Yuf2CfEKIZ658LtSkHjMvMxGcB00IgKs=";
};
nativeBuildInputs = [

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "readchar";
version = "4.0.3";
version = "4.0.5";
format = "setuptools";
# Don't use wheels on PyPI
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "magmax";
repo = "python-${pname}";
rev = "refs/tags/v${version}";
hash = "sha256-QMaTZRS9iOSuax706Es9WhkwU3vdcNb14dbiSt48aN0=";
hash = "sha256-Ru18lh+9tXtvttypnob0HNPKBiGF7E9HDL21l1AAGa8=";
};
postPatch = ''

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

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "types-requests";
version = "2.28.11.15";
version = "2.28.11.16";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-/I6qCcwBRpnGtjxgwuOt0MiwmkEMgYtaxuZfkqJt3gk=";
hash = "sha256-nUACBW3368TsHyj9cB+6gsXCJUnER3EWyyZWqjCs5ts=";
};
propagatedBuildInputs = [

56
pkgs/development/tools/gotools/default.nix
View File

@ -1,45 +1,26 @@
{ lib, buildGoModule, fetchgit }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "gotools";
version = "0.1.10";
version = "0.7.0";
src = fetchgit {
# using GitHub instead of https://go.googlesource.com/tools because Gitiles UI is to basic to browse
src = fetchFromGitHub {
owner = "golang";
repo = "tools";
rev = "v${version}";
url = "https://go.googlesource.com/tools";
sha256 = "sha256-r71+//VhayW18uvMl/ls/8KYNbZ7uDZw3SWoqPL3Xqk=";
# The gopls folder contains a Go submodule which causes a build failure
# and lives in its own package named gopls.
postFetch = ''
rm -r $out/gopls
'';
sha256 = "sha256-6Sdo6oKJHYXWkvJmbte7Wc7tov5AHzn70Bi1QdQ5HR4=";
};
# The gopls folder contains a Go submodule which causes a build failure.
# Given that, we can't have the gopls binary be part of the gotools
# derivation.
#
# The attribute "gopls" provides the gopls binary.
#
# Related
#
# * https://github.com/NixOS/nixpkgs/pull/85868
# * https://github.com/NixOS/nixpkgs/issues/88716
postPatch = ''
rm -rf gopls
'';
vendorSha256 = "sha256-UJIXG8WKzazNTXoqEFlT/umC40F6z2Q5I8RfxnMbsPM=";
vendorSha256 = "sha256-fp0pb3EcGRDWlSpgel4pYRdsPJGk8/d57EjWJ+fzq7g=";
doCheck = false;
postConfigure = ''
# Make the builtin tools available here
mkdir -p $out/bin
eval $(go env | grep GOTOOLDIR)
find $GOTOOLDIR -type f | while read x; do
ln -sv "$x" "$out/bin"
done
export GOTOOLDIR=$out/bin
'';
excludedPackages = [ "vet" "cover" ];
# Set GOTOOLDIR for derivations adding this to buildInputs
postInstall = ''
mkdir -p $out/nix-support
@ -47,14 +28,13 @@ buildGoModule rec {
--subst-var-by bin $out
'';
# Do not copy this without a good reason for enabling
# In this case tools is heavily coupled with go itself and embeds paths.
allowGoReference = true;
meta = with lib; {
description = "Additional tools for Go development";
homepage = "http://go.googlesource.com/tools";
longDescription = ''
This package contains tools like: godoc, goimports, callgraph, digraph, stringer or toolstash.
'';
homepage = "https://go.googlesource.com/tools";
license = licenses.bsd3;
maintainers = with maintainers; [ danderson ];
maintainers = with maintainers; [ danderson SuperSandro2000 ];
};
}

6
pkgs/development/tools/rust/cargo-vet/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-vet";
version = "0.5.1";
version = "0.5.2";
src = fetchFromGitHub {
owner = "mozilla";
repo = pname;
rev = version;
sha256 = "sha256-nBhm6EDs99oKdUxT+N+IC7fY/U0yyeJyr6vbaZaiGSI=";
sha256 = "sha256-+Qbq3EARedsaPtSTfR/UCC/1p0b/QmvriG2AIyx8coo=";
};
cargoSha256 = "sha256-M6CdYL8CDfFH0RaYGel6dC3LxQZzq9YbU8ecH9CWEr8=";
cargoSha256 = "sha256-Vij4vq+04fLpbcDpYVMBVl3QNVZprUYcVLB28mrjUOg=";
buildInputs = lib.optional stdenv.isDarwin Security;

10
pkgs/development/web/bun/default.nix
View File

@ -12,7 +12,7 @@
}:
stdenvNoCC.mkDerivation rec {
version = "0.5.7";
version = "0.5.8";
pname = "bun";
src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
@ -33,19 +33,19 @@ stdenvNoCC.mkDerivation rec {
sources = {
"aarch64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
sha256 = "m0lFokGfJY3qXLYO4vnFFqKb3/IPRXWN3L6PV5DqtX0=";
sha256 = "phTBV0vQT7Qgf1wY9Qqc7xXrs3Cms9jKpjp1KxlTbz8=";
};
"aarch64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
sha256 = "XSUbfRkjo7yiPrPa/Mp30WolFex+Evziphut1sKflDE=";
sha256 = "weH+Aygh8Ud9cfMOVpZe8EjL7BWsXBlm9GDnkZa/x0c=";
};
"x86_64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip";
sha256 = "RuZ0T5Y7Vi9mtyFL8ul715MRO4XozDf0WS+qjayx1kg=";
sha256 = "pYvBjlTPLuwOlarlZKXuvn7y6wTRdyHM/leb3hOJHrY=";
};
"x86_64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
sha256 = "uOVHQIjvZW0Gqv/GLlvbXl5bDcnwR80AP1lUJ2v2ZoM=";
sha256 = "+NiZtMUQBGPtI4VbtfIb+oZX+RMjIJiTnEbvoeeCC84=";
};
};
updateScript = writeShellScript "update-bun" ''

4
pkgs/games/opentyrian/default.nix
View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "opentyrian";
version = "2.1.20220318";
version = "2.1.20221123";
src = fetchFromGitHub {
owner = "opentyrian";
repo = "opentyrian";
rev = "v${version}";
sha256 = "01z1zxpps4ils0bnwazl9lmqdbfhfd8fkacahnh6kqyczavg40xg";
sha256 = "sha256-fVcc8v1c9uU72X6afEo4VoMo6YuDECQSwDQ/TQjgwUY=";
};
data = fetchzip {

10
pkgs/games/xonotic/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, fetchzip, makeWrapper, runCommand, makeDesktopItem
, xonotic-data, copyDesktopItems
, # required for both
unzip, libjpeg, zlib, libvorbis, curl
unzip, libjpeg, zlib, libvorbis, curl, freetype, libpng, libtheora
, # glx
libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, alsa-lib
, # sdl
@ -121,14 +121,22 @@ let
patchelf \
--add-needed ${curl.out}/lib/libcurl.so \
--add-needed ${libvorbis}/lib/libvorbisfile.so \
--add-needed ${libvorbis}/lib/libvorbisenc.so \
--add-needed ${libvorbis}/lib/libvorbis.so \
--add-needed ${libGL.out}/lib/libGL.so \
--add-needed ${freetype}/lib/libfreetype.so \
--add-needed ${libpng}/lib/libpng.so \
--add-needed ${libtheora}/lib/libtheora.so \
$out/bin/xonotic-glx
'' + lib.optionalString withSDL ''
patchelf \
--add-needed ${curl.out}/lib/libcurl.so \
--add-needed ${libvorbis}/lib/libvorbisfile.so \
--add-needed ${libvorbis}/lib/libvorbisenc.so \
--add-needed ${libvorbis}/lib/libvorbis.so \
--add-needed ${freetype}/lib/libfreetype.so \
--add-needed ${libpng}/lib/libpng.so \
--add-needed ${libtheora}/lib/libtheora.so \
$out/bin/xonotic-sdl
'';
};

6
pkgs/tools/admin/scaleway-cli/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "scaleway-cli";
version = "2.12.0";
version = "2.13.0";
src = fetchFromGitHub {
owner = "scaleway";
repo = "scaleway-cli";
rev = "v${version}";
sha256 = "sha256-4BIw+vk0LJL6/AWtZDtOP88UqUg1EiDASMaEP3/7Bx0=";
sha256 = "sha256-C8Yeq2Mwyc3oPQSby8NiNrSNHle7Mc7uexg+G17Cl3M=";
};
vendorHash = "sha256-Wdbh7rFKvWdDULMwYxvTrWim6iO6kQaYseSkq2PBfUM=";
vendorHash = "sha256-1OwzvGngSv8N5IFlB+vOKyPAaPnY4h2i0vKQAcQHt5o=";
ldflags = [
"-w"

9
pkgs/tools/misc/mapcidr/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "mapcidr";
version = "1.1.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "v${version}";
sha256 = "sha256-cpNNStPgGnEtiiHgpiLUvEFu78NtyJIVgjrkh6N+dLU=";
rev = "refs/tags/v${version}";
hash = "sha256-HmX4C1DXPS/14TGxKFnw/sxxp2suU6c4GC5W7ZtzjZ8=";
};
vendorHash = "sha256-t6bTbgOTWNz3nz/Tgwkd+TCBhN++0UaV0LqaEsO9YCI=";
vendorHash = "sha256-7cB+fDYWy1Qe3apEPaUMA2+6KmMpC7ANjEgIde00Pas=";
modRoot = ".";
subPackages = [
@ -28,6 +28,7 @@ buildGoModule rec {
operations, it can be used both as a library and as independent CLI tool.
'';
homepage = "https://github.com/projectdiscovery/mapcidr";
changelog = "https://github.com/projectdiscovery/mapcidr/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ hanemile ];
};

6
pkgs/tools/misc/trdl-client/default.nix
View File

@ -7,18 +7,18 @@
buildGoModule rec {
pname = "trdl-client";
version = "0.6.3";
version = "0.6.5";
src = fetchFromGitHub {
owner = "werf";
repo = "trdl";
rev = "v${version}";
hash = "sha256-mmhbcBNHvx14Ihzq8UemPU8oYi/Gn3NK0FDZRVJvvfQ=";
hash = "sha256-jJwRIfxmjlhfS/0+IN2IdQPlO9FkTb64PWUiLwkarfM=";
};
sourceRoot = "source/client";
vendorHash = "sha256-3B4MYj1jlovjWGIVK233t+e/mP8eEdHHv2M3xXSHaaM=";
vendorHash = "sha256-f7FPeR+us3WvwqzcSQLbkKv905CCIAAm+HNV2FFF8OY=";
subPackages = [ "cmd/trdl" ];

3
pkgs/tools/security/gopass/default.nix
View File

@ -53,6 +53,9 @@ buildGoModule rec {
--prefix PATH : "${wrapperPath}" \
--set GOPASS_NO_REMINDER true
'';
passthru = {
inherit wrapperPath;
};
meta = with lib; {
description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go";

2
pkgs/tools/security/gopass/jsonapi.nix
View File

@ -29,7 +29,7 @@ buildGoModule rec {
postFixup = ''
wrapProgram $out/bin/gopass-jsonapi \
--prefix PATH : "${lib.makeBinPath [ gopass ]}"
--prefix PATH : "${gopass.wrapperPath}"
'';
meta = with lib; {

1
pkgs/top-level/all-packages.nix
View File

@ -23084,7 +23084,6 @@ with pkgs;
protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { };
protobuf3_19 = callPackage ../development/libraries/protobuf/3.19.nix { };
protobuf3_17 = callPackage ../development/libraries/protobuf/3.17.nix { };
protobuf3_8 = callPackage ../development/libraries/protobuf/3.8.nix { };
protobufc = callPackage ../development/libraries/protobufc { };