Unverified Commit b6f9cf57 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 29aea2bf 3ed98aeb

nixos/release.nix

+7 −4
Original line number Diff line number Diff line
@@ -44,9 +44,12 @@ let 
  pkgs = import ./.. { system = "x86_64-linux"; };





  versionModule =

    { system.nixos.versionSuffix = versionSuffix;

  versionModule = { config, ... }: {

    system.nixos.versionSuffix = versionSuffix;

    system.nixos.revision = nixpkgs.rev or nixpkgs.shortRev;



    # At creation time we do not have state yet, so just default to latest.

    system.stateVersion = config.system.nixos.version;

  };



  makeModules = module: rest: [ configuration versionModule module rest ];

pkgs/applications/audio/spotify-player/default.nix

+19 −1
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ 
, withImage ? true

, withNotify ? true

, withSixel ? true

, stdenv

, darwin

, makeBinaryWrapper

}:



assert lib.assertOneOf "withAudioBackend" withAudioBackend [ "" "alsa" "pulseaudio" "rodio" "portaudio" "jackaudio" "rodiojack" "sdl" "gstreamer" ];
@@ -44,6 +47,9 @@ rustPlatform.buildRustPackage rec { 
  nativeBuildInputs = [

    pkg-config

    cmake

    rustPlatform.bindgenHook

  ] ++ lib.optionals stdenv.isDarwin [

    makeBinaryWrapper

  ];



  buildInputs = [
@@ -59,7 +65,13 @@ rustPlatform.buildRustPackage rec { 
    ++ lib.optionals (withAudioBackend == "jackaudio") [ libjack2 ]

    ++ lib.optionals (withAudioBackend == "rodiojack") [ alsa-lib libjack2 ]

    ++ lib.optionals (withAudioBackend == "sdl") [ SDL2 ]

    ++ lib.optionals (withAudioBackend == "gstreamer") [ gst_all_1.gstreamer gst_all_1.gst-devtools gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];

    ++ lib.optionals (withAudioBackend == "gstreamer") [ gst_all_1.gstreamer gst_all_1.gst-devtools gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]

    ++ lib.optionals (stdenv.isDarwin && withMediaControl) [ darwin.apple_sdk.frameworks.MediaPlayer ]

    ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [

      AppKit

      AudioUnit

      Cocoa

    ]);



  buildNoDefaultFeatures = true;
@@ -73,6 +85,12 @@ rustPlatform.buildRustPackage rec { 
    ++ lib.optionals withStreaming [ "streaming" ]

    ++ lib.optionals withSixel [ "sixel" ];



  # sixel-sys is dynamically linked to libsixel

  postInstall = lib.optionals (stdenv.isDarwin && withSixel) ''

    wrapProgram $out/bin/spotify_player \

      --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [libsixel]}"

  '';



  meta = {

    description = "A terminal spotify player that has feature parity with the official client";

    homepage = "https://github.com/aome510/spotify-player";

pkgs/applications/audio/transcribe/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -22,14 +22,14 @@ 


stdenv.mkDerivation rec {

  pname = "transcribe";

  version = "9.25";

  version = "9.30.2";



  src =

    if stdenv.hostPlatform.system == "x86_64-linux" then

      fetchzip

        {

          url = "https://www.seventhstring.com/xscribe/downlo/xscsetup-${version}.0.tar.gz";

          sha256 = "sha256-vgl3BCAC7gOYTviHJzMbgZfHTpP90XUvxpC1IhvEZ8I=";

          url = "https://www.seventhstring.com/xscribe/downlo/xscsetup-${version}.tar.gz";

          sha256 = "sha256-EZyQsO3tSedMaZIhJWc7j3f7ikBf6XqXLUgdAiQdr14=";

        }

    else throw "Platform not supported";

pkgs/applications/editors/codux/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ 


let

  pname = "codux";

  version = "15.9.0";

  version = "15.10.0";



  src = fetchurl {

    url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage";

    sha256 = "sha256-bKZShjWs2osyARBZrBgmEN7JZFi/YpXI3p8lM+GrIfc=";

    sha256 = "sha256-lz1dDbYq7aTGQoED07K8I9E0/XsnSlPL81/4W8Vix3E=";

  };



  appimageContents = appimageTools.extractType2 { inherit pname version src; };
@@ -30,6 +30,6 @@ appimageTools.wrapType2 rec { 
    homepage = "https://www.codux.com";

    license = licenses.unfree;

    platforms = [ "x86_64-linux" ];

    maintainers = with maintainers; [ dit7ya ];

    maintainers = with maintainers; [ dit7ya kashw2 ];

  };

}

pkgs/applications/emulators/mame/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -38,14 +38,14 @@ let 
in

stdenv.mkDerivation rec {

  pname = "mame";

  version = "0.257";

  version = "0.258";

  srcVersion = builtins.replaceStrings [ "." ] [ "" ] version;



  src = fetchFromGitHub {

    owner = "mamedev";

    repo = "mame";

    rev = "mame${srcVersion}";

    hash = "sha256-iBLHvdqIgF6XkJQX5hFLrP9KkTGWfVvTCs+DRJhsSp4=";

    hash = "sha256-5wsPlI3xTCeadxvOjjNSGtaa8F7M6gZobsv2Ks8DSGE=";

  };



  outputs = [ "out" "tools" ];