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

Merge staging-next into staging

parents 0cbfaabb 153422f4

maintainers/maintainer-list.nix

+1 −1
Original line number Diff line number Diff line
@@ -4617,7 +4617,7 @@ 
  };

  emilytrau = {

    name = "Emily Trau";

    email = "nix@angus.ws";

    email = "emily+nix@downunderctf.com";

    github = "emilytrau";

    githubId = 13267947;

  };

nixos/tests/apfs.nix

+13 −0
Original line number Diff line number Diff line
@@ -48,5 +48,18 @@ import ./make-test-python.nix ({ pkgs, ... }: { 
          "umount /tmp/mnt",

          "apfsck /dev/vdb",

      )

    with subtest("Snapshots"):

      machine.succeed(

          "mkapfs /dev/vdb",

          "mount -o cknodes,readwrite /dev/vdb /tmp/mnt",

          "echo 'Hello World' > /tmp/mnt/test.txt",

          "apfs-snap /tmp/mnt snap-1",

          "rm /tmp/mnt/test.txt",

          "umount /tmp/mnt",

          "mount -o cknodes,readwrite,snap=snap-1 /dev/vdb /tmp/mnt",

          "echo 'Hello World' | diff - /tmp/mnt/test.txt",

          "umount /tmp/mnt",

          "apfsck /dev/vdb",

      )

  '';

})

pkgs/applications/audio/csound/default.nix

+3 −1
Original line number Diff line number Diff line
@@ -31,7 +31,9 @@ stdenv.mkDerivation rec { 
  };



  cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp

    ++ lib.optional stdenv.isDarwin "-DCS_FRAMEWORK_DEST=${placeholder "out"}/lib";

    ++ lib.optional stdenv.isDarwin "-DCS_FRAMEWORK_DEST=${placeholder "out"}/lib"

    # Ignore gettext in CMAKE_PREFIX_PATH on cross to prevent find_program picking up the wrong gettext

    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DCMAKE_IGNORE_PATH=${lib.getBin gettext}/bin";



  nativeBuildInputs = [ cmake flex bison gettext ];

  buildInputs = [ libsndfile libsamplerate boost ]

pkgs/applications/backup/vorta/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ python3Packages.buildPythonApplication rec { 
    --replace pytest-runner ""



    substituteInPlace src/vorta/assets/metadata/com.borgbase.Vorta.desktop \

    --replace Exec=vorta "Exec=$out/bin/vorta" \

    --replace com.borgbase.Vorta "com.borgbase.Vorta-symbolic"

  '';

pkgs/applications/misc/otf2bdf/default.nix

0 → 100644
+36 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, freetype

}:



stdenv.mkDerivation rec {

  pname = "otf2bdf";

  version = "3.1";



  # Original site http://sofia.nmsu.edu/~mleisher/Software/otf2bdf/ unreachable,

  # This is a mirror.

  src = fetchFromGitHub {

    owner = "jirutka";

    repo  = "otf2bdf";

    rev   = "v${version}";

    hash  = "sha256-HK9ZrnwKhhYcBvSl+3RwFD7m/WSaPkGKX6utXnk5k+A=";

  };



  buildInputs = [ freetype ];



  installPhase = ''

    mkdir -p $out/bin $out/share/man/man1

    install otf2bdf $out/bin

    cp otf2bdf.man $out/share/man/man1/otf2bdf.1

  '';



  meta = with lib; {

    #homepage = "http://sofia.nmsu.edu/~mleisher/Software/otf2bdf/";  # timeout

    homepage = "https://github.com/jirutka/otf2bdf";

    description = "OpenType to BDF font converter";

    license = licenses.mit0;

    platforms = platforms.all;

    maintainers = with maintainers; [ hzeller ];

  };

}