pyrox.dev / nixpkgs
lol
fork atom

Merge master into staging-next

authored by github-actions[bot] and committed by GitHub 6bb65ddf b1d87c03

+18 -12
unified split
+1 -1
.github/workflows/manual-rendering.yml
··· 13 jobs: 14 check-rendering-equivalence: 15 permissions: 16 - issues: write # for peter-evans/create-or-update-comment to create or update comment 17 if: github.repository_owner == 'NixOS' 18 runs-on: ubuntu-latest 19 steps:
··· 13 jobs: 14 check-rendering-equivalence: 15 permissions: 16 + pull-requests: write # for peter-evans/create-or-update-comment to create or update comment 17 if: github.repository_owner == 'NixOS' 18 runs-on: ubuntu-latest 19 steps:
+1 -1
.github/workflows/periodic-merge-24h.yml
··· 21 periodic-merge: 22 permissions: 23 contents: write # for devmasx/merge-branch to merge branches 24 - issues: write # for peter-evans/create-or-update-comment to create or update comment 25 if: github.repository_owner == 'NixOS' 26 runs-on: ubuntu-latest 27 strategy:
··· 21 periodic-merge: 22 permissions: 23 contents: write # for devmasx/merge-branch to merge branches 24 + pull-requests: write # for peter-evans/create-or-update-comment to create or update comment 25 if: github.repository_owner == 'NixOS' 26 runs-on: ubuntu-latest 27 strategy:
+1 -1
.github/workflows/periodic-merge-6h.yml
··· 21 periodic-merge: 22 permissions: 23 contents: write # for devmasx/merge-branch to merge branches 24 - issues: write # for peter-evans/create-or-update-comment to create or update comment 25 if: github.repository_owner == 'NixOS' 26 runs-on: ubuntu-latest 27 strategy:
··· 21 periodic-merge: 22 permissions: 23 contents: write # for devmasx/merge-branch to merge branches 24 + pull-requests: write # for peter-evans/create-or-update-comment to create or update comment 25 if: github.repository_owner == 'NixOS' 26 runs-on: ubuntu-latest 27 strategy:
+1 -2
.github/workflows/update-terraform-providers.yml
··· 12 tf-providers: 13 permissions: 14 contents: write # for peter-evans/create-pull-request to create branch 15 - issues: write # for peter-evans/create-or-update-comment to create or update comment 16 - pull-requests: write # for peter-evans/create-pull-request to create a PR 17 if: github.repository_owner == 'NixOS' && github.ref == 'refs/heads/master' # ensure workflow_dispatch only runs on master 18 runs-on: ubuntu-latest 19 steps:
··· 12 tf-providers: 13 permissions: 14 contents: write # for peter-evans/create-pull-request to create branch 15 + 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 16 if: github.repository_owner == 'NixOS' && github.ref == 'refs/heads/master' # ensure workflow_dispatch only runs on master 17 runs-on: ubuntu-latest 18 steps:
+3
pkgs/applications/networking/instant-messengers/baresip/default.nix
··· 8 , pkg-config 9 , gst_all_1 10 , cairo 11 , mpg123 12 , alsa-lib 13 , SDL2 ··· 42 libre 43 librem 44 cairo 45 mpg123 46 alsa-lib 47 SDL2 ··· 75 "USE_FFMPEG=1" 76 "USE_GSM=1" 77 "USE_GST1=1" 78 "USE_L16=1" 79 "USE_MPG123=1" 80 "USE_OSS=1"
··· 8 , pkg-config 9 , gst_all_1 10 , cairo 11 + , gtk3 12 , mpg123 13 , alsa-lib 14 , SDL2 ··· 43 libre 44 librem 45 cairo 46 + gtk3 47 mpg123 48 alsa-lib 49 SDL2 ··· 77 "USE_FFMPEG=1" 78 "USE_GSM=1" 79 "USE_GST1=1" 80 + "USE_GTK=1" 81 "USE_L16=1" 82 "USE_MPG123=1" 83 "USE_OSS=1"
+2 -2
pkgs/development/interpreters/php/8.0.nix
··· 2 3 let 4 base = callPackage ./generic.nix (_args // { 5 - version = "8.0.22"; 6 - hash = "sha256-40KRjT7NQi8QAy3wrD/7Dhf1aPrWz44jK296ah/cPJw="; 7 }); 8 9 in
··· 2 3 let 4 base = callPackage ./generic.nix (_args // { 5 + version = "8.0.23"; 6 + hash = "sha256-FBLbRoAKRc7Td8KJLsYmGzxBLxPcEzv8mYz7LxR7QM8="; 7 }); 8 9 in
+2 -2
pkgs/development/interpreters/php/8.1.nix
··· 2 3 let 4 base = callPackage ./generic.nix (_args // { 5 - version = "8.1.9"; 6 - hash = "sha256-nrsOLlcdtv1ZMEKNyy0Z7T4FAzjsHxNHwoLK6S/Ahv8="; 7 }); 8 9 in
··· 2 3 let 4 base = callPackage ./generic.nix (_args // { 5 + version = "8.1.10"; 6 + hash = "sha256-LejgQCKF98Voh97+ZRkiMIre1YumC+/PO3dyAgnjHxA="; 7 }); 8 9 in
+7 -3
pkgs/development/libraries/libvirt/default.nix
··· 147 sed -i '/virnetdaemontest/d' tests/meson.build 148 ''; 149 150 nativeBuildInputs = [ 151 - meson 152 153 cmake 154 docutils 155 makeWrapper 156 ninja 157 pkg-config 158 ] 159 ++ optional (!isDarwin) rpcsvc-proto 160 # NOTE: needed for rpcgen ··· 171 libpcap 172 libtasn1 173 libxml2 174 - libxslt 175 - perl 176 perlPackages.XMLXPath 177 pkg-config 178 python3
··· 147 sed -i '/virnetdaemontest/d' tests/meson.build 148 ''; 149 150 + strictDeps = true; 151 + 152 nativeBuildInputs = [ 153 + meson # needs to be first 154 155 cmake 156 docutils 157 + libxml2 # for xmllint 158 + libxslt # for xsltproc 159 makeWrapper 160 ninja 161 + perl 162 pkg-config 163 + util-linux # for mount 164 ] 165 ++ optional (!isDarwin) rpcsvc-proto 166 # NOTE: needed for rpcgen ··· 177 libpcap 178 libtasn1 179 libxml2 180 perlPackages.XMLXPath 181 pkg-config 182 python3