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

Merge master into staging-next

parents c5fd953d 8b92746f

nixos/modules/system/boot/plymouth.nix

+6 −4
Original line number Diff line number Diff line
@@ -99,10 +99,12 @@ in 
        # Dimensions are 48x48 to match GDM logo

        default = "${nixos-icons}/share/icons/hicolor/48x48/apps/nix-snowflake-white.png";

        defaultText = literalExpression ''"''${nixos-icons}/share/icons/hicolor/48x48/apps/nix-snowflake-white.png"'';

        example = literalExpression ''pkgs.fetchurl {

        example = literalExpression ''

          pkgs.fetchurl {

            url = "https://nixos.org/logo/nixos-hires.png";

            sha256 = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si";

        }'';

          }

        '';

        description = lib.mdDoc ''

          Logo which is displayed on the splash screen.

        '';

pkgs/applications/audio/ft2-clone/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -13,13 +13,13 @@ 


stdenv.mkDerivation rec {

  pname = "ft2-clone";

  version = "1.67";

  version = "1.68";



  src = fetchFromGitHub {

    owner = "8bitbubsy";

    repo = "ft2-clone";

    rev = "v${version}";

    sha256 = "sha256-v/yGHWd/hhE2jDdAQhyQbZOuHSS0FSG4WlVe8Oc6tMc=";

    sha256 = "sha256-mO8GrLyO7Zr9+lRy2WQ4OeRWDGmo22mPnZbajL78hJ8=";

  };



  # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh)

pkgs/applications/audio/milkytracker/default.nix

+9 −1
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, makeWrapper

{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, makeWrapper

, SDL2, alsa-lib, libjack2, lhasa, perl, rtmidi, zlib, zziplib }:



stdenv.mkDerivation rec {
@@ -12,6 +12,14 @@ stdenv.mkDerivation rec { 
    sha256 = "025fj34gq2kmkpwcswcyx7wdxb89vm944dh685zi4bxx0hz16vvk";

  };



  patches = [

    (fetchpatch {

      name = "CVE-2022-34927.patch";

      url = "https://github.com/milkytracker/MilkyTracker/commit/3a5474f9102cbdc10fbd9e7b1b2c8d3f3f45d91b.patch";

      hash = "sha256-YnN1Khcbct7iG7TdwxFU1XVCeKR/Zrhe+oMepvh8cRU=";

    })

  ];



  postPatch = ''

    # https://github.com/milkytracker/MilkyTracker/issues/262

    substituteInPlace CMakeLists.txt \

pkgs/applications/audio/snd/default.nix

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


stdenv.mkDerivation rec {

  pname = "snd";

  version = "23.4";

  version = "23.5";



  src = fetchurl {

    url = "mirror://sourceforge/snd/snd-${version}.tar.gz";

    sha256 = "sha256-1D/j/im1Xlx689k8zgnaRzJJYWHNviVhxyVzmLlfJps=";

    sha256 = "sha256-ZbGrxy494BH6QIj2sYAUEiNBsbNJHXtAVRLPVFwAcQM=";

  };



  nativeBuildInputs = [ pkg-config ];

pkgs/applications/editors/cudatext/default.nix

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

stdenv.mkDerivation rec {

  pname = "cudatext";

  version = "1.195.0";

  version = "1.196.0";



  src = fetchFromGitHub {

    owner = "Alexey-T";

    repo = "CudaText";

    rev = version;

    hash = "sha256-7KAT7rWq4jjSz/oxw8K+WrWwJWf0Dq8cR0oyHtA4R9g=";

    hash = "sha256-O037+Pm/aq/9ZPMYpWlNPa9tEilatN8OJ3oBAuk4UTs=";

  };



  postPatch = ''