diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-11-11 22:12:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-11 22:12:03 +0100 |
commit | 3dcda9293f6436e247e35893a84b4849112be5b8 (patch) | |
tree | b2b8783b2f23209c476084d3388be875091128d0 | |
parent | 7da1e5861e93aaf984bb5249bf7481340e1dac18 (diff) | |
parent | 3119604c2d23842d9d5bf4159b036e2a67498e98 (diff) | |
download | nixpkgs-3dcda9293f6436e247e35893a84b4849112be5b8.tar nixpkgs-3dcda9293f6436e247e35893a84b4849112be5b8.tar.gz nixpkgs-3dcda9293f6436e247e35893a84b4849112be5b8.tar.bz2 nixpkgs-3dcda9293f6436e247e35893a84b4849112be5b8.tar.lz nixpkgs-3dcda9293f6436e247e35893a84b4849112be5b8.tar.xz nixpkgs-3dcda9293f6436e247e35893a84b4849112be5b8.tar.zst nixpkgs-3dcda9293f6436e247e35893a84b4849112be5b8.zip |
Merge pull request #145524 from jansol/master
Update pipewire and pipewire-media-session
-rw-r--r-- | pkgs/development/libraries/pipewire/default.nix | 13 | ||||
-rw-r--r-- | pkgs/development/libraries/pipewire/media-session.nix | 5 | ||||
-rwxr-xr-x | pkgs/development/libraries/pipewire/update-media-session.sh (renamed from pkgs/development/libraries/pipewire/update.sh) | 13 | ||||
-rwxr-xr-x | pkgs/development/libraries/pipewire/update-pipewire.sh | 25 |
4 files changed, 31 insertions, 25 deletions
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 1f7a791471d..cf02589792f 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitLab -, fetchpatch , removeReferencesTo , python3 , meson @@ -63,7 +62,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.39"; + version = "0.3.40"; outputs = [ "out" @@ -81,7 +80,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-peTS1+NuQxZg1rrv8DrnJW5BR9yReleqooIwhZWHLjM="; + sha256 = "sha256-eY6uQa4+sC6yUWhF4IpAgRoppwhHO4s5fIMXOkS0z7A="; }; patches = [ @@ -97,12 +96,6 @@ let ./0090-pipewire-config-template-paths.patch # Place SPA data files in lib output to avoid dependency cycles ./0095-spa-data-dir.patch - # Fix compilation on some architectures - # XXX: REMOVE ON NEXT RELEASE - (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/651f0decea5f83730c271e9bed03cdd0048fcd49.diff"; - sha256 = "1bmpi5qn750mcspaw7m57ww0503sl9781jswqby4gr0f7c5wmqvj"; - }) ]; nativeBuildInputs = [ @@ -188,7 +181,7 @@ let ''; passthru = { - updateScript = ./update.sh; + updateScript = ./update-pipewire.sh; tests = { installedTests = nixosTests.installed-tests.pipewire; diff --git a/pkgs/development/libraries/pipewire/media-session.nix b/pkgs/development/libraries/pipewire/media-session.nix index 37daffe5c88..47cb3b41595 100644 --- a/pkgs/development/libraries/pipewire/media-session.nix +++ b/pkgs/development/libraries/pipewire/media-session.nix @@ -20,14 +20,14 @@ let self = stdenv.mkDerivation rec { pname = "pipewire-media-session"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "pipewire"; repo = "media-session"; rev = version; - sha256 = "sha256-zhOvBlG7DuQkJ+ZZBhBhfKwk+bbLljpt3w4JlK3cJLk="; + sha256 = "sha256-e537gTkiNYMz2YJrOff/MXYWVDgHZDkqkSn8Qh+7Wr4="; }; nativeBuildInputs = [ @@ -67,6 +67,7 @@ let ''; passthru = { + updateScript = ./update-media-session.sh; tests = { test-paths = callPackage ./test-paths.nix { package = self; } { paths-out = [ diff --git a/pkgs/development/libraries/pipewire/update.sh b/pkgs/development/libraries/pipewire/update-media-session.sh index 9fc46627667..c5574581575 100755 --- a/pkgs/development/libraries/pipewire/update.sh +++ b/pkgs/development/libraries/pipewire/update-media-session.sh @@ -10,19 +10,6 @@ IFS=$'\n' NIXPKGS_ROOT="$(git rev-parse --show-toplevel)" cd "$NIXPKGS_ROOT" -nix-update pipewire -outputs=$(nix-build . -A pipewire) -for p in $outputs; do - conf_files=$(find "$p/nix-support/" -name '*.conf.json') - for c in $conf_files; do - file_name=$(basename "$c") - if [[ ! -e "nixos/modules/services/desktops/pipewire/daemon/$file_name" ]]; then - echo "New file $file_name found! Add it to the module config and passthru tests!" - fi - install -m 0644 "$c" "nixos/modules/services/desktops/pipewire/daemon/" - done -done - nix-update pipewire-media-session outputs=$(nix-build . -A pipewire-media-session) for p in $outputs; do diff --git a/pkgs/development/libraries/pipewire/update-pipewire.sh b/pkgs/development/libraries/pipewire/update-pipewire.sh new file mode 100755 index 00000000000..d94d39c7630 --- /dev/null +++ b/pkgs/development/libraries/pipewire/update-pipewire.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p nix-update -i bash +# shellcheck shell=bash + +set -o errexit -o pipefail -o nounset -o errtrace +shopt -s inherit_errexit +shopt -s nullglob +IFS=$'\n' + +NIXPKGS_ROOT="$(git rev-parse --show-toplevel)" + +cd "$NIXPKGS_ROOT" +nix-update pipewire +outputs=$(nix-build . -A pipewire) +for p in $outputs; do + conf_files=$(find "$p/nix-support/" -name '*.conf.json') + for c in $conf_files; do + file_name=$(basename "$c") + if [[ ! -e "nixos/modules/services/desktops/pipewire/daemon/$file_name" ]]; then + echo "New file $file_name found! Add it to the module config and passthru tests!" + fi + install -m 0644 "$c" "nixos/modules/services/desktops/pipewire/daemon/" + done +done + |