commit fb86d324d1a6f05a6da55af6e2ae8922e7063498 · pyrox.dev/nixpkgs

-6

nixos/modules/services/desktops/pipewire/README.md

···

       1
       1
       -
       # Updating

     

       2
       2
       -
       

     

       3
       3
       -
       1. Update the version & hash in pkgs/development/libraries/pipewire/default.nix

     

       4
       4
       -
       2. run `nix build -f /path/to/nixpkgs/checkout pipewire pipewire.mediaSession`

     

       5
       5
       -
       3. copy all JSON files from result/etc/pipewire and result-mediaSession/etc/pipewire/media-session.d to this directory

     

       6
       6
       -
       4. add new files to the module config and passthru tests

+25 -23

pkgs/development/libraries/pipewire/default.nix

···

       60
       60
        
             owner = "pipewire";

     

       61
       61
        
             repo = "pipewire";

     

       62
       62
        
             rev = version;

     

       63
       63
       -
             hash = "sha256:1rqi1sa937lp89ai79b5n7m0p66pigpj4w1mr2vq4dycfp8vppxk";

     

       63
       63
       +
             sha256 = "sha256-s9+70XXMN4K3yDVwIu+L15gL6rFlpRNVQpeekZQOEec=";

     

       64
       64
        
           };

     

       65
       65
        
       

     

       66
       66
        
           patches = [

     
···

       146
       146
        
             moveToOutput "bin/pipewire-pulse" "$pulse"

     

       147
       147
        
           '';

     

       148
       148
        
       

     

       149
       149
       -
           passthru.tests = {

     

       150
       150
       -
             installedTests = nixosTests.installed-tests.pipewire;

     

       149
       149
       +
           passthru = {

     

       150
       150
       +
             updateScript = ./update.sh;

     

       151
       151
       +
             tests = {

     

       152
       152
       +
               installedTests = nixosTests.installed-tests.pipewire;

     

       151
       153
        
       

     

       152
       152
       -
             # This ensures that all the paths used by the NixOS module are found.

     

       153
       153
       -
             test-paths = callPackage ./test-paths.nix {

     

       154
       154
       -
               paths-out = [

     

       155
       155
       -
                 "share/alsa/alsa.conf.d/50-pipewire.conf"

     

       156
       156
       -
                 "nix-support/etc/pipewire/client.conf.json"

     

       157
       157
       -
                 "nix-support/etc/pipewire/client-rt.conf.json"

     

       158
       158
       -
                 "nix-support/etc/pipewire/jack.conf.json"

     

       159
       159
       -
                 "nix-support/etc/pipewire/pipewire.conf.json"

     

       160
       160
       -
                 "nix-support/etc/pipewire/pipewire-pulse.conf.json"

     

       161
       161
       -
               ];

     

       162
       162
       -
               paths-out-media-session = [

     

       163
       163
       -
                 "nix-support/etc/pipewire/media-session.d/alsa-monitor.conf.json"

     

       164
       164
       -
                 "nix-support/etc/pipewire/media-session.d/bluez-monitor.conf.json"

     

       165
       165
       -
                 "nix-support/etc/pipewire/media-session.d/media-session.conf.json"

     

       166
       166
       -
                 "nix-support/etc/pipewire/media-session.d/v4l2-monitor.conf.json"

     

       167
       167
       -
               ];

     

       168
       168
       -
               paths-lib = [

     

       169
       169
       -
                 "lib/alsa-lib/libasound_module_pcm_pipewire.so"

     

       170
       170
       -
                 "share/alsa-card-profile/mixer"

     

       171
       171
       -
               ];

     

       154
       154
       +
               # This ensures that all the paths used by the NixOS module are found.

     

       155
       155
       +
               test-paths = callPackage ./test-paths.nix {

     

       156
       156
       +
                 paths-out = [

     

       157
       157
       +
                   "share/alsa/alsa.conf.d/50-pipewire.conf"

     

       158
       158
       +
                   "nix-support/etc/pipewire/client.conf.json"

     

       159
       159
       +
                   "nix-support/etc/pipewire/jack.conf.json"

     

       160
       160
       +
                   "nix-support/etc/pipewire/pipewire.conf.json"

     

       161
       161
       +
                   "nix-support/etc/pipewire/pipewire-pulse.conf.json"

     

       162
       162
       +
                 ];

     

       163
       163
       +
                 paths-out-media-session = [

     

       164
       164
       +
                   "nix-support/etc/pipewire/media-session.d/alsa-monitor.conf.json"

     

       165
       165
       +
                   "nix-support/etc/pipewire/media-session.d/bluez-monitor.conf.json"

     

       166
       166
       +
                   "nix-support/etc/pipewire/media-session.d/media-session.conf.json"

     

       167
       167
       +
                   "nix-support/etc/pipewire/media-session.d/v4l2-monitor.conf.json"

     

       168
       168
       +
                 ];

     

       169
       169
       +
                 paths-lib = [

     

       170
       170
       +
                   "lib/alsa-lib/libasound_module_pcm_pipewire.so"

     

       171
       171
       +
                   "share/alsa-card-profile/mixer"

     

       172
       172
       +
                 ];

     

       173
       173
       +
               };

     

       172
       174
        
             };

     

       173
       175
        
           };

     

       174
       176

+24

pkgs/development/libraries/pipewire/update.sh

···

       1
       1
       +
       #!/usr/bin/env nix-shell

     

       2
       2
       +
       #!nix-shell -p nix-update -i bash

     

       3
       3
       +
       # shellcheck shell=bash

     

       4
       4
       +
       

     

       5
       5
       +
       set -o errexit -o pipefail -o nounset -o errtrace

     

       6
       6
       +
       shopt -s inherit_errexit

     

       7
       7
       +
       shopt -s nullglob

     

       8
       8
       +
       IFS=$'\n'

     

       9
       9
       +
       

     

       10
       10
       +
       NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"

     

       11
       11
       +
       

     

       12
       12
       +
       cd "$NIXPKGS_ROOT"

     

       13
       13
       +
       nix-update pipewire

     

       14
       14
       +
       outputs=$(nix-build . -A pipewire -A pipewire.mediaSession)

     

       15
       15
       +
       for p in $outputs; do

     

       16
       16
       +
           conf_files=$(find "$p/nix-support/etc/pipewire/" -name '*.conf.json')

     

       17
       17
       +
           for c in $conf_files; do

     

       18
       18
       +
               file_name=$(basename "$c")

     

       19
       19
       +
               if [[ ! -e "nixos/modules/services/desktops/pipewire/$file_name" ]]; then

     

       20
       20
       +
                   echo "New file $file_name found! Add it to the module config and passthru tests!"

     

       21
       21
       +
               fi

     

       22
       22
       +
               install -m 0644 "$c" "nixos/modules/services/desktops/pipewire/"

     

       23
       23
       +
           done

     

       24
       24
       +
       done