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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-09-12 06:24:28 +00:00 committed by GitHub
commit 6bb65ddfb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/manual-rendering.yml vendored
View File

@ -13,7 +13,7 @@ permissions:
jobs:
check-rendering-equivalence:
permissions:
issues: write # for peter-evans/create-or-update-comment to create or update comment
pull-requests: write # for peter-evans/create-or-update-comment to create or update comment
if: github.repository_owner == 'NixOS'
runs-on: ubuntu-latest
steps:

2
.github/workflows/periodic-merge-24h.yml vendored
View File

@ -21,7 +21,7 @@ jobs:
periodic-merge:
permissions:
contents: write # for devmasx/merge-branch to merge branches
issues: write # for peter-evans/create-or-update-comment to create or update comment
pull-requests: write # for peter-evans/create-or-update-comment to create or update comment
if: github.repository_owner == 'NixOS'
runs-on: ubuntu-latest
strategy:

2
.github/workflows/periodic-merge-6h.yml vendored
View File

@ -21,7 +21,7 @@ jobs:
periodic-merge:
permissions:
contents: write # for devmasx/merge-branch to merge branches
issues: write # for peter-evans/create-or-update-comment to create or update comment
pull-requests: write # for peter-evans/create-or-update-comment to create or update comment
if: github.repository_owner == 'NixOS'
runs-on: ubuntu-latest
strategy:

3
.github/workflows/update-terraform-providers.yml vendored
View File

@ -12,8 +12,7 @@ jobs:
tf-providers:
permissions:
contents: write # for peter-evans/create-pull-request to create branch
issues: write # for peter-evans/create-or-update-comment to create or update comment
pull-requests: write # for peter-evans/create-pull-request to create a PR
pull-requests: write # for peter-evans/create-pull-request to create a PR, for peter-evans/create-or-update-comment to create or update comment
if: github.repository_owner == 'NixOS' && github.ref == 'refs/heads/master' # ensure workflow_dispatch only runs on master
runs-on: ubuntu-latest
steps:

3
pkgs/applications/networking/instant-messengers/baresip/default.nix
View File

@ -8,6 +8,7 @@
, pkg-config
, gst_all_1
, cairo
, gtk3
, mpg123
, alsa-lib
, SDL2
@ -42,6 +43,7 @@ stdenv.mkDerivation rec {
libre
librem
cairo
gtk3
mpg123
alsa-lib
SDL2
@ -75,6 +77,7 @@ stdenv.mkDerivation rec {
"USE_FFMPEG=1"
"USE_GSM=1"
"USE_GST1=1"
"USE_GTK=1"
"USE_L16=1"
"USE_MPG123=1"
"USE_OSS=1"

4
pkgs/development/interpreters/php/8.0.nix
View File

@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "8.0.22";
hash = "sha256-40KRjT7NQi8QAy3wrD/7Dhf1aPrWz44jK296ah/cPJw=";
version = "8.0.23";
hash = "sha256-FBLbRoAKRc7Td8KJLsYmGzxBLxPcEzv8mYz7LxR7QM8=";
});
in

4
pkgs/development/interpreters/php/8.1.nix
View File

@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "8.1.9";
hash = "sha256-nrsOLlcdtv1ZMEKNyy0Z7T4FAzjsHxNHwoLK6S/Ahv8=";
version = "8.1.10";
hash = "sha256-LejgQCKF98Voh97+ZRkiMIre1YumC+/PO3dyAgnjHxA=";
});
in

10
pkgs/development/libraries/libvirt/default.nix
View File

@ -147,14 +147,20 @@ stdenv.mkDerivation rec {
sed -i '/virnetdaemontest/d' tests/meson.build
'';
strictDeps = true;
nativeBuildInputs = [
meson
meson # needs to be first
cmake
docutils
libxml2 # for xmllint
libxslt # for xsltproc
makeWrapper
ninja
perl
pkg-config
util-linux # for mount
]
++ optional (!isDarwin) rpcsvc-proto
# NOTE: needed for rpcgen
@ -171,8 +177,6 @@ stdenv.mkDerivation rec {
libpcap
libtasn1
libxml2
libxslt
perl
perlPackages.XMLXPath
pkg-config
python3