BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-02-24 12:02:29 +00:00 committed by GitHub
commit 7a0c5ae7a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 109 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
View file

@ -722,6 +722,19 @@
<link xlink:href="https://github.com/olimorris/onedarkpro.nvim">olimorris/onedarkpro.nvim</link>).
</para>
</listitem>
<listitem>
<para>
<literal>services.pipewire.enable</literal> will default to
enabling the WirePlumber session manager instead of
pipewire-media-session. pipewire-media-session is deprecated
by upstream and not recommended, but can still be manually
enabled by setting
<literal>services.pipewire.media-session.enable</literal> to
<literal>true</literal> and
<literal>services.pipewire.wireplumber.enable</literal> to
<literal>false</literal>.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-22.05-notable-changes">

4
nixos/doc/manual/release-notes/rl-2205.section.md
View file

@ -225,6 +225,10 @@ In addition to numerous new and upgraded packages, this release has the followin
- `pkgs.vimPlugins.onedark-nvim` now refers to [navarasu/onedark.nvim](https://github.com/navarasu/onedark.nvim)
(formerly refers to [olimorris/onedarkpro.nvim](https://github.com/olimorris/onedarkpro.nvim)).
- `services.pipewire.enable` will default to enabling the WirePlumber session manager instead of pipewire-media-session.
pipewire-media-session is deprecated by upstream and not recommended, but can still be manually enabled by setting
`services.pipewire.media-session.enable` to `true` and `services.pipewire.wireplumber.enable` to `false`.
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
## Other Notable Changes {#sec-release-22.05-notable-changes}

5
nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
View file

@ -38,9 +38,8 @@ in {
services.pipewire.media-session = {
enable = mkOption {
type = types.bool;
default = config.services.pipewire.enable;
defaultText = literalExpression "config.services.pipewire.enable";
description = "Example pipewire session manager";
default = false;
description = "Whether to enable the deprecated example Pipewire session manager";
};
package = mkOption {

11
nixos/modules/services/desktops/pipewire/wireplumber.nix
View file

@ -8,15 +8,18 @@ in
options = {
services.pipewire.wireplumber = {
enable = lib.mkEnableOption "A modular session / policy manager for PipeWire";
enable = lib.mkOption {
type = lib.types.bool;
default = config.services.pipewire.enable;
defaultText = lib.literalExpression "config.services.pipewire.enable";
description = "Whether to enable Wireplumber, a modular session / policy manager for PipeWire";
};
package = lib.mkOption {
type = lib.types.package;
default = pkgs.wireplumber;
defaultText = lib.literalExpression "pkgs.wireplumber";
description = ''
The wireplumber derivation to use.
'';
description = "The wireplumber derivation to use.";
};
};
};

3
nixos/modules/virtualisation/openstack-metadata-fetcher.nix
View file

@ -15,7 +15,8 @@
}
wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path
(umask 077 && wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data)
# When no user-data is provided, the OpenStack metadata server doesn't expose the user-data route.
(umask 077 && wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data || rm -f "$metaDir/user-data")
wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname
wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
''

4
pkgs/applications/misc/jotta-cli/default.nix
View file

@ -5,10 +5,10 @@ let
in
stdenv.mkDerivation rec {
pname = "jotta-cli";
version = "0.13.53591";
version = "0.13.55213";
src = fetchzip {
url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz";
sha256 = "sha256-sffJks3/QfAJJumaE61q4fiiXa/BNFF2TKjZmDOuMkc=";
sha256 = "sha256-u5DmpKvmgTqwtXLFMdz0dhtPc/2rzEX492OKxyFBqzY=";
stripRoot = false;
};

4
pkgs/applications/networking/cluster/cni/plugins.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cni-plugins";
version = "1.0.1";
version = "1.1.0";
src = fetchFromGitHub {
owner = "containernetworking";
repo = "plugins";
rev = "v${version}";
sha256 = "sha256-zIL9KG1WL+DlgC5c+b9gV1i7mB0Ge8bapcuSV4GNIck=";
sha256 = "sha256-M0bYMaOqHkG1J6xGEqVvmYda/B6qDIrFOQhhW2LXiYE=";
};
vendorSha256 = null;

9
pkgs/development/libraries/exiv2/default.nix
View file

@ -103,6 +103,15 @@ stdenv.mkDerivation rec {
remove-references-to -t ${stdenv.cc.cc} $lib/lib/*.so.*.*.* $out/bin/exiv2 $static/lib/*.a
'';
postFixup = ''
substituteInPlace "$dev"/lib/cmake/exiv2/exiv2Config.cmake --replace \
"set(_IMPORT_PREFIX \"$out\")" \
"set(_IMPORT_PREFIX \"$static\")"
substituteInPlace "$dev"/lib/cmake/exiv2/exiv2Config-*.cmake --replace \
"$lib/lib/libexiv2-xmp.a" \
"$static/lib/libexiv2-xmp.a"
'';
disallowedReferences = [ stdenv.cc.cc ];
meta = with lib; {

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

@ -94,6 +94,12 @@ stdenv.mkDerivation rec {
patches = [
./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
./0002-meson-patch-ch-install-prefix.patch
# Fix building docs with latest libxslt.
(fetchpatch {
url = "https://gitlab.com/libvirt/libvirt/-/commit/54814c87f3706cc8eb894634ebef0f9cf7dabae6.patch";
sha256 = "1k1mGyxyofYzXr3cVtM8ZYsb6tDCzidCRKwKoNS0ocA=";
})
];
nativeBuildInputs = [

39
pkgs/development/libraries/nanodbc/default.nix Normal file
View file

@ -0,0 +1,39 @@
{ lib, stdenv, fetchFromGitHub, cmake, unixODBC }:
stdenv.mkDerivation rec {
pname = "nanodbc";
version = "2.13.0";
src = fetchFromGitHub {
owner = "nanodbc";
repo = "nanodbc";
rev = "v${version}";
sha256 = "1q80p7yv9mcl4hyvnvcjdr70y8nc940ypf368lp97vpqn5yckkgm";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ unixODBC ];
cmakeFlags = if (stdenv.hostPlatform.isStatic) then
[ "-DBUILD_STATIC_LIBS=ON" ]
else
[ "-DBUILD_SHARED_LIBS=ON" ];
# fix compilation on macOS
# https://github.com/nanodbc/nanodbc/issues/274
# remove after the next version update
postUnpack = if stdenv.isDarwin then ''
mv $sourceRoot/VERSION $sourceRoot/VERSION.txt
substituteInPlace $sourceRoot/CMakeLists.txt \
--replace 'file(STRINGS VERSION' 'file(STRINGS VERSION.txt'
'' else "";
meta = with lib; {
homepage = "https://github.com/nanodbc/nanodbc";
changelog = "https://github.com/nanodbc/nanodbc/raw/v${version}/CHANGELOG.md";
description = "Small C++ wrapper for the native C ODBC API";
license = licenses.mit;
maintainers = [ maintainers.bzizou ];
};
}

9
pkgs/development/libraries/phonon/backends/vlc.nix
View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "phonon-backend-vlc";
version = "0.11.2";
version = "0.11.3";
src = fetchurl {
url = "mirror://kde/stable/phonon/${pname}/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-xsM7/GjRN/DlegKeS3mMu5D1Svb3Ma9JZ3hXeRzNU6U=";
sha256 = "sha256-Xmn97MsGDH5rWSTO8uZb7loIrOQScAW5U0TtMHfcY5c=";
};
buildInputs = [
@ -33,9 +33,10 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
homepage = "https://phonon.kde.org/";
homepage = "https://community.kde.org/Phonon";
# Dev repo is at https://invent.kde.org/libraries/phonon-vlc
description = "GStreamer backend for Phonon";
platforms = platforms.linux;
license = with licenses; [ bsd3 lgpl2Plus ];
license = with licenses; [ bsd3 lgpl21Plus ];
};
}

2
pkgs/development/libraries/pipewire/wireplumber.nix
View file

@ -67,6 +67,8 @@ stdenv.mkDerivation rec {
"-Delogind=disabled"
"-Ddoc=${mesonEnableFeature enableDocs}"
"-Dintrospection=${mesonEnableFeature enableGI}"
"-Dsystemd-system-service=true"
"-Dsystemd-system-unit-dir=${placeholder "out"}/lib/systemd/system"
];
passthru.updateScript = nix-update-script {

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

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "0.35.2";
version = "0.35.3";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = version;
sha256 = "sha256-CDHPoGwHQ8hxN5tX4arnDcNLVqBl9U9FhH2134ly6x4=";
sha256 = "sha256-oRqA7soRpEHbjtjmByjbfJrYp7eJrcTbQUPR9TZO/IA=";
};
propagatedBuildInputs = [

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

@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "pywlroots";
version = "0.15.9";
version = "0.15.10";
src = fetchPypi {
inherit pname version;
sha256 = "V6P5zAvr0L7p+yEjr6To2rKoMPqxIvSPrlLzf6yj3WA=";
sha256 = "VWfcDhMAuUkYObRiaXRfcB7dI75SM7zVwWWvnlrxV0k=";
};
nativeBuildInputs = [ pkg-config ];

6
pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "bazel-remote";
version = "2.3.3";
version = "2.3.4";
src = fetchFromGitHub {
owner = "buchgr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-3ZN/SCTQ5k0X4cqnrpp8Yt1QDnYkT2RbMLKpDfdWaxk=";
sha256 = "sha256-ijR3RjGzm0HtVp5lSKGJemCGkRzhgQqaDOgg+MjDB1c=";
};
vendorSha256 = "sha256-UhES+jJil6+JmGH27p/LC/b5rZfHC4RIjA9nCFeB7Ao=";
vendorSha256 = "sha256-NmTdS5xgv0o7AT4lBJk472Lq1e73EcrcfnI8RIxKEoc=";
doCheck = false;

2
pkgs/os-specific/linux/kernel/common-config.nix
View file

@ -729,7 +729,7 @@ let
DRAGONRISE_FF = yes;
GREENASIA_FF = yes;
HOLTEK_FF = yes;
JOYSTICK_PSXPAD_SPI_FF = yes;
JOYSTICK_PSXPAD_SPI_FF = whenAtLeast "4.14" yes;
LOGIG940_FF = yes;
NINTENDO_FF = whenAtLeast "5.16" yes;
PLAYSTATION_FF = whenAtLeast "5.12" yes;

6
pkgs/tools/networking/croc/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "croc";
version = "9.5.1";
version = "9.5.2";
src = fetchFromGitHub {
owner = "schollz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-86uM58MCdmt0sSEIgRRQYPr6Gf4lphFOcqRU7WD5HnI=";
sha256 = "sha256-Ha84frbyRDxCRIDezlKeA+Fv9+rmpCoU+EAgMBkf3fo=";
};
vendorSha256 = "sha256-xL7aiMlnSzZsAtX3NiWfNcrz8oW7BuCLBUnJvx1ng2Y=";
vendorSha256 = "sha256-uaSDder/uzy708YE1xqpL9Te4629JD2IiVSCYhYzPwg=";
doCheck = false;

6
pkgs/tools/system/syslog-ng/default.nix
View file

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "syslog-ng";
version = "3.34.1";
version = "3.35.1";
src = fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-zs457BxoyI1JNwXgpSi4PQONo4TonUg4OTzMdfYqLUw=";
sha256 = "sha256-HQI4sGs+WYfIWeW1Kezuc491us/wSxSTmLH+jLsSHlM=";
};
nativeBuildInputs = [ pkg-config which ];
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://www.syslog-ng.com";
description = "Next-generation syslogd with advanced networking and filtering capabilities";
license = licenses.gpl2;
license = with licenses; [ gpl2Plus lgpl21Plus ];
maintainers = with maintainers; [ fpletz ];
platforms = platforms.linux;
};

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

@ -19132,6 +19132,8 @@ with pkgs;
mythes = callPackage ../development/libraries/mythes { };
nanodbc = callPackage ../development/libraries/nanodbc { };
nanoflann = callPackage ../development/libraries/nanoflann { };
nanomsg = callPackage ../development/libraries/nanomsg { };