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] 2023-04-04 00:02:38 +00:00 committed by GitHub
parent b730214152 f3412a568b
commit 276892f80f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 5264 additions and 159 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/CODEOWNERS vendored
View file

@ -132,7 +132,7 @@
/pkgs/development/ruby-modules @marsam
# Rust
/pkgs/development/compilers/rust @Mic92 @LnL7 @zowoq @winterqt @figsoda
/pkgs/development/compilers/rust @Mic92 @zowoq @winterqt @figsoda
/pkgs/build-support/rust @zowoq @winterqt @figsoda
/doc/languages-frameworks/rust.section.md @zowoq @winterqt @figsoda

1
maintainers/team-list.nix
View file

@ -718,7 +718,6 @@ with lib.maintainers; {
rust = {
members = [
figsoda
lnl7
mic92
tjni
winter

9
pkgs/applications/audio/scream/default.nix
View file

@ -1,7 +1,8 @@
{ stdenv, lib, config, fetchFromGitHub, cmake, pkg-config
, alsaSupport ? stdenv.isLinux, alsa-lib
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio
, jackSupport ? false, libjack2
, jackSupport ? false, libjack2, soxr
, pcapSupport ? false, libpcap
}:
stdenv.mkDerivation rec {
@ -16,14 +17,16 @@ stdenv.mkDerivation rec {
};
buildInputs = lib.optional pulseSupport libpulseaudio
++ lib.optional jackSupport libjack2
++ lib.optional alsaSupport alsa-lib;
++ lib.optionals jackSupport [ libjack2 soxr ]
++ lib.optional alsaSupport alsa-lib
++ lib.optional pcapSupport libpcap;
nativeBuildInputs = [ cmake pkg-config ];
cmakeFlags = [
"-DPULSEAUDIO_ENABLE=${if pulseSupport then "ON" else "OFF"}"
"-DALSA_ENABLE=${if alsaSupport then "ON" else "OFF"}"
"-DJACK_ENABLE=${if jackSupport then "ON" else "OFF"}"
"-DPCAP_ENABLE=${if pcapSupport then "ON" else "OFF"}"
];
cmakeDir = "../Receivers/unix";

10
pkgs/applications/display-managers/greetd/regreet.nix
View file

@ -7,18 +7,18 @@
, pango
}:
rustPlatform.buildRustPackage {
rustPlatform.buildRustPackage rec {
pname = "regreet";
version = "unstable-2023-03-19";
version = "0.1.0";
src = fetchFromGitHub {
owner = "rharish101";
repo = "ReGreet";
rev = "fd496fa00abc078570ac85a47ea296bfc275222a";
hash = "sha256-pqCtDoycFKV+EFLEodoTCDSO5L+dOVtdjN6DVgJ/7to=";
rev = version;
hash = "sha256-9Wae2sYiRpWYXdBKsSNKhG5RhIun/Ro9xIV4yl1/pUc=";
};
cargoHash = "sha256-8FbA5FFJuRt5tvW1HGaaEZcr5g6OczcBeic1hCTQmUw=";
cargoHash = "sha256-yDfUD5Uag3UM/2Q7ofvh6iGcB3n21m1gKo7SKqTWamc=";
buildFeatures = [ "gtk4_8" ];

2561
pkgs/applications/editors/helix/Cargo.lock generated Normal file
View file

File diff suppressed because it is too large Load diff

12
pkgs/applications/editors/helix/default.nix
View file

@ -2,17 +2,23 @@
rustPlatform.buildRustPackage rec {
pname = "helix";
version = "22.12";
version = "23.03";
# This release tarball includes source code for the tree-sitter grammars,
# which is not ordinarily part of the repository.
src = fetchzip {
url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz";
sha256 = "sha256-En6SOyAPNPPzDGdm2XTjbGG0NQFGBVzjjoyCbdnHFao=";
hash = "sha256-FtY2V7za3WGeUaC2t2f63CcDUEg9zAS2cGUWI0YeGwk=";
stripRoot = false;
};
cargoSha256 = "sha256-oSS0LkLg2JSRLYoF0+FVQzFUJtFuVKtU2MWYenmFC0s=";
# should be removed, when tree-sitter is not used as a git checkout anymore
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"tree-sitter-0.20.9" = "sha256-/PaFaASOT0Z8FpipX5uiRCjnv1kyZtg4B9+TnHA0yTY=";
};
};
nativeBuildInputs = [ installShellFiles makeWrapper ];

2172
pkgs/applications/networking/cluster/kubectl-view-allocations/Cargo.lock generated Normal file
View file

File diff suppressed because it is too large Load diff

38
pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix Normal file
View file

@ -0,0 +1,38 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, perl
, Security ? null
}:
rustPlatform.buildRustPackage rec {
pname = "kubectl-view-allocations";
version = "0.16.3";
src = fetchFromGitHub {
owner = "davidB";
repo = pname;
rev = version;
sha256 = "sha256-udi39j/K4Wsxva171i7mMUQ6Jb8Ny2IEHfldt3B8IoY=";
};
postPatch = ''
cp ${./Cargo.lock} Cargo.lock
'';
cargoLock = {
lockFile = ./Cargo.lock;
};
nativeBuildInputs = [ perl ];
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
meta = with lib; {
description = "kubectl plugin to list allocations (cpu, memory, gpu,... X utilization, requested, limit, allocatable,...)";
homepage = "https://github.com/davidB/kubectl-view-allocations";
license = licenses.cc0;
maintainers = [ maintainers.mrene ];
platforms = platforms.unix;
};
}

2
pkgs/applications/window-managers/hyprwm/hyprland/default.nix
View file

@ -64,6 +64,7 @@ stdenv.mkDerivation rec {
meson
ninja
pkg-config
wayland-scanner
];
outputs = [
@ -83,7 +84,6 @@ stdenv.mkDerivation rec {
udis86
wayland
wayland-protocols
wayland-scanner
pciutils
(wlroots.override { inherit enableXWayland hidpiXWayland nvidiaPatches; })
]

3
pkgs/development/compilers/nim/default.nix
View file

@ -165,7 +165,8 @@ in {
};
depsBuildBuild = [ nim-unwrapped ];
buildInputs = [ openssl ];
buildInputs = [ openssl ]
++ lib.optional stdenv.isDarwin Security;
nimFlags = [ "--cpu:${nimHost.cpu}" "--os:${nimHost.os}" "-d:release" ];

10
pkgs/development/libraries/libdeltachat/Cargo.lock generated
View file

@ -1061,7 +1061,7 @@ dependencies = [
[[package]]
name = "deltachat"
version = "1.112.4"
version = "1.112.5"
dependencies = [
"ansi_term",
"anyhow",
@ -1135,7 +1135,7 @@ dependencies = [
[[package]]
name = "deltachat-jsonrpc"
version = "1.112.4"
version = "1.112.5"
dependencies = [
"anyhow",
"async-channel",
@ -1158,7 +1158,7 @@ dependencies = [
[[package]]
name = "deltachat-repl"
version = "1.112.4"
version = "1.112.5"
dependencies = [
"ansi_term",
"anyhow",
@ -1173,7 +1173,7 @@ dependencies = [
[[package]]
name = "deltachat-rpc-server"
version = "1.112.4"
version = "1.112.5"
dependencies = [
"anyhow",
"deltachat",
@ -1197,7 +1197,7 @@ dependencies = [
[[package]]
name = "deltachat_ffi"
version = "1.112.4"
version = "1.112.5"
dependencies = [
"anyhow",
"deltachat",

4
pkgs/development/libraries/libdeltachat/default.nix
View file

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "libdeltachat";
version = "1.112.4";
version = "1.112.5";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = "v${version}";
hash = "sha256-Z6Hs8NYqMyXyTyUsR9N0Eghgh8Ltrt1uMGKuz0aCRdQ=";
hash = "sha256-me09xhsaiJr2i6kdB62suS5LBf3gr4vL3dHgdPMbD1g=";
};
patches = [

6
pkgs/development/libraries/miniaudio/default.nix
View file

@ -4,15 +4,15 @@
}:
stdenv.mkDerivation rec {
pname = "miniaudio";
version = "0.11.11";
version = "0.11.14";
src = fetchFromGitHub {
owner = "mackron";
repo = "miniaudio";
rev = "a0dc1037f99a643ff5fad7272cd3d6461f2d63fa";
rev = "9a7663496fc06f7a9439c752fd7666ca93328c20";
# upstream does not maintain tags:
# https://github.com/mackron/miniaudio/issues/273#issuecomment-783861269
hash = "sha256-jOvDZk76hDvZ1RQ9O34kVeW0n95BT9+BE6fNhdekI5s=";
hash = "sha256-v/Eo4/CYcpB4tbOoy1gPqk6PUvkQIZNWrweG3l5EcMk=";
};
installPhase = ''

12
pkgs/development/ocaml-modules/ctypes/default.nix
View file

@ -6,13 +6,13 @@ else
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-ctypes";
version = "0.20.1";
version = "0.20.2";
src = fetchFromGitHub {
owner = "ocamllabs";
repo = "ocaml-ctypes";
rev = version;
sha256 = "sha256-H1QR0MJCqRdXxRufCA663wzTNWQ8MYYAy2nz/XHCn0Y=";
hash = "sha256-LzUrR8K88CjY/R5yUK3y6KG85hUMjbzuebHGqI8KhhM=";
};
nativeBuildInputs = [ pkg-config ocaml findlib ];
@ -21,14 +21,22 @@ stdenv.mkDerivation rec {
strictDeps = true;
preConfigure = ''
substituteInPlace META --replace ' bytes ' ' '
'';
buildPhase = ''
runHook preBuild
make XEN=false libffi.config ctypes-base ctypes-stubs
make XEN=false ctypes-foreign
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs
make install XEN=false
runHook postInstall
'';
meta = with lib; {

16
pkgs/development/python-modules/miniaudio/default.nix
View file

@ -3,6 +3,7 @@
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, miniaudio
, cffi
, pytestCheckHook
, AudioToolbox
@ -11,17 +12,28 @@
buildPythonPackage rec {
pname = "miniaudio";
version = "1.55";
version = "1.56";
disabled = pythonOlder "3.6";
format = "setuptools";
src = fetchFromGitHub {
owner = "irmen";
repo = "pyminiaudio";
rev = "refs/tags/v${version}";
hash = "sha256-na8pnYIoawICbsVquzlmfYZtIagsVBudFOKJ62jSTGM=";
hash = "sha256-vNh9BupU6T+Gfa8fdt8r3/vqtTtfVDyrxM9GkFUcDcI=";
};
postPatch = ''
rm -r miniaudio
ln -s ${miniaudio} miniaudio
substituteInPlace build_ffi_module.py \
--replace "miniaudio/stb_vorbis.c" "miniaudio/extras/stb_vorbis.c";
substituteInPlace miniaudio.c \
--replace "miniaudio/stb_vorbis.c" "miniaudio/extras/stb_vorbis.c";
'';
buildInputs = lib.optionals stdenv.isDarwin [
AudioToolbox
CoreAudio

6
pkgs/games/ddnet/default.nix
View file

@ -33,19 +33,19 @@
stdenv.mkDerivation rec {
pname = "ddnet";
version = "16.8";
version = "16.9";
src = fetchFromGitHub {
owner = "ddnet";
repo = pname;
rev = version;
hash = "sha256-QhRJJQ87WMsf2yTac2lDRj7B+mTaw2r+RProUr+3zoo=";
hash = "sha256-DOP2v82346YQtL55Ix0gn9cTpvbO1ooeCIGRpgEMFpA=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
name = "${pname}-${version}";
inherit src;
hash = "sha256-36Afg0Tsf1/dGhZhd5tbxjMX4dKHqGEhIXS4Lal/rXI=";
hash = "sha256-xTB8wg4PIdg7MB3545zN83/41fUsqFE2Sk5aTXrGhps=";
};
nativeBuildInputs = [

4
pkgs/servers/roon-server/default.nix
View file

@ -15,7 +15,7 @@
, stdenv
}:
let
version = "2.0-1234";
version = "2.0-1244";
urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version;
in
stdenv.mkDerivation {
@ -24,7 +24,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2";
hash = "sha256-644tLtNr3rl3sB3BF0QoiwuIF4tWS8PjehmPKwdpg2k=";
hash = "sha256-godyvkeClBc6AW3WWNYRX+2gqhGWf/Y7xJdX6RfYDn0=";
};
dontConfigure = true;

534
pkgs/servers/search/meilisearch/Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

11
pkgs/servers/search/meilisearch/default.nix
View file

@ -8,7 +8,7 @@
, nixosTests
}:
let version = "1.0.2";
let version = "1.1.0";
in
rustPlatform.buildRustPackage {
pname = "meilisearch";
@ -18,15 +18,18 @@ rustPlatform.buildRustPackage {
owner = "meilisearch";
repo = "MeiliSearch";
rev = "refs/tags/v${version}";
hash = "sha256-2HfwNoluPPOOAdCaqUVaZcAd8M2naPYAsphZO1Inefg=";
hash = "sha256-mwrWHrndcLwdXJo+UISJdPxZFDgtZh9jEquz7jIHGP0=";
};
cargoBuildFlags = [
"--package=meilisearch"
];
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"actix-web-static-files-3.0.5" = "sha256-2BN0RzLhdykvN3ceRLkaKwSZtel2DBqZ+uz4Qut+nII=";
"filter-parser-0.41.3" = "sha256-AhXiOMd9/frioU2K/fAV6Vz+OFyw4MNm4G3kNZSJQac=";
"heed-0.12.4" = "sha256-kKwpr5zuTKUkl12J8KgXrlQiK4ee+D5xNq0DF1yWGsQ=";
"heed-0.12.5" = "sha256-atkKiK8rzqji47tJvUzbIXMw8U1uddHkHakPuEUvmFg=";
"lmdb-rkv-sys-0.15.1" = "sha256-zLHTprwF7aa+2jaD7dGYmOZpJYFijMTb4I3ODflNUII=";
"nelson-0.1.0" = "sha256-eF672quU576wmZSisk7oDR7QiDafuKlSg0BTQkXnzqY=";
};

4
pkgs/tools/package-management/poetry/unwrapped.nix
View file

@ -44,7 +44,7 @@
buildPythonPackage rec {
pname = "poetry";
version = "1.4.1";
version = "1.4.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -53,7 +53,7 @@ buildPythonPackage rec {
owner = "python-poetry";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-jNRFtEhaswG5RmFxpVcchIe6u2BCyoeNzneWR+9SuCY=";
hash = "sha256-AiRQFZA5+M1niTzj1RO2lx0QFOMmSzpQo1gzauyTblg=";
};
nativeBuildInputs = [

1
pkgs/tools/system/socklog/default.nix
View file

@ -48,7 +48,6 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = with lib; {
broken = stdenv.isDarwin;
description = "System and kernel logging services";
homepage = "http://smarden.org/socklog/";
license = licenses.publicDomain;

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

@ -31466,6 +31466,10 @@ with pkgs;
kubectl-tree = callPackage ../applications/networking/cluster/kubectl-tree { };
kubectl-view-allocations = callPackage ../applications/networking/cluster/kubectl-view-allocations {
inherit (darwin.apple_sdk.frameworks) Security;
};
kubelogin = callPackage ../applications/networking/cluster/kubelogin { };
kubelogin-oidc = callPackage ../applications/networking/cluster/kubelogin-oidc { };

1
pkgs/top-level/python-packages.nix
View file

@ -6025,6 +6025,7 @@ self: super: with self; {
minexr = callPackage ../development/python-modules/minexr { };
miniaudio = callPackage ../development/python-modules/miniaudio {
inherit (pkgs) miniaudio;
inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox CoreAudio;
};