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

Merge master into staging-next

parents 0d24f164 5f41d952

maintainers/maintainer-list.nix

+15 −0
Original line number Diff line number Diff line
@@ -1922,6 +1922,12 @@ 
    githubId = 2506621;

    name = "Brayden Willenborg";

  };

  brendanreis = {

    email = "brendanreis@gmail.com";

    name = "Brendan Reis";

    github = "brendanreis";

    githubId = 10686906;

  };

  brian-dawn = {

    email = "brian.t.dawn@gmail.com";

    github = "brian-dawn";
@@ -10181,6 +10187,15 @@ 
      fingerprint = "F90F FD6D 585C 2BA1 F13D  E8A9 7571 654C F88E 31C2";

    }];

  };

  oxapentane = {

    email = "blame@oxapentane.com";

    github = "oxapentane";

    githubId = 1297357;

    name = "Grigory Shipunov";

    keys = [{

      fingerprint = "DD09 98E6 CDF2 9453 7FC6  04F9 91FA 5E5B F9AA 901C";

    }];

  };

  oxij = {

    email = "oxij@oxij.org";

    github = "oxij";

maintainers/team-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ with lib.maintainers; { 
      astro

      SuperSandro2000

      revol-xut

      oxapentane

    ];

    scope = "Maintain packages used in the C3D2 hackspace";

    shortName = "c3d2";

pkgs/applications/audio/exact-audio-copy/default.nix

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

, stdenv

, fetchurl

, makeDesktopItem

, imagemagick

, p7zip

, wine

, writeShellScriptBin

, symlinkJoin

, use64 ? false

}:



let

  pname = "exact-audio-copy";

  version = "1.6.0";



  eac_exe = fetchurl {

    url = "http://www.exactaudiocopy.de/eac-${lib.versions.majorMinor version}.exe";

    sha256 = "8291d33104ebab2619ba8d85744083e241330a286f5bd7d54c7b0eb08f2b84c1";

  };



  cygwin_dll = fetchurl {

    url = "https://cygwin.com/snapshots/x86/cygwin1-20220301.dll.xz";

    sha256 = "0zxn0r5q69fhciy0mrplhxj1hxwy3sq4k1wdy6n6kyassm4zyz1x";

  };



  patched_eac = stdenv.mkDerivation {

    pname = "patched_eac";

    inherit version;



    nativeBuildInputs = [

      imagemagick

      p7zip

    ];



    buildCommand = ''

      mkdir -p $out

      _tmp=$(mktemp -d)

      cd $_tmp

      7z x -aoa ${eac_exe}

      chmod -R 755 .

      cp ${cygwin_dll} cygwin1.dll.xz

      xz --decompress cygwin1.dll.xz

      mv cygwin1.dll CDRDAO/

      cp -r * $out

      7z x EAC.exe

      convert .rsrc/1033/ICON/29.ico -thumbnail 128x128 -alpha on -background none -flatten "$out/eac.ico.128.png"

    '';

  };



  wrapper = writeShellScriptBin pname ''

    export WINEPREFIX="''${EXACT_AUDIO_COPY_HOME:-"''${XDG_DATA_HOME:-"''${HOME}/.local/share"}/exact-audio-copy"}/wine"

    export WINEARCH=${if use64 then "win64" else "win32"}

    export WINEDLLOVERRIDES="mscoree=" # disable mono

    export WINEDEBUG=-all

    if [ ! -d "$WINEPREFIX" ] ; then

      mkdir -p "$WINEPREFIX"

      ${wine}/bin/wineboot -u

    fi



    exec ${wine}/bin/wine ${patched_eac}/EAC.exe "$@"

  '';



  desktopItem = makeDesktopItem {

    name = pname;

    exec = pname;

    comment = "Audio Grabber for CDs";

    desktopName = "Exact Audio Copy";

    categories = [ "Audio" "AudioVideo" ];

    icon = "${patched_eac}/eac.ico.128.png";

  };

in

symlinkJoin {

  name = "${pname}-${version}";



  paths = [ wrapper desktopItem ];



  meta = with lib; {

    description = "A precise CD audio grabber for creating perfect quality rips using CD and DVD drives";

    homepage = "https://www.exactaudiocopy.de/";

    changelog = "https://www.exactaudiocopy.de/en/index.php/resources/whats-new/whats-new/";

    license = licenses.unfree;

    maintainers = [ maintainers.brendanreis ];

    platforms = wine.meta.platforms;

  };

}

pkgs/applications/audio/musikcube/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec { 
  meta = with lib; {

    description = "A fully functional terminal-based music player, library, and streaming audio server";

    homepage = "https://musikcube.com/";

    maintainers = [ maintainers.aanderse ];

    maintainers = with maintainers; [ aanderse srapenne ];

    license = licenses.bsd3;

    platforms = platforms.all;

  };

pkgs/applications/blockchains/ergo/default.nix

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


stdenv.mkDerivation rec {

  pname = "ergo";

  version = "4.0.103";

  version = "4.0.104";



  src = fetchurl {

    url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";

    sha256 = "sha256-9vGPHNq76BSdqN1z0KzDOzeMOHAUKnA3Jpx+I5+FOFM=";

    sha256 = "sha256-h6OVeDifYIKyIkwbN/pmJWge4/YGL6cnQQ/sI14LsHQ=";

  };



  nativeBuildInputs = [ makeWrapper ];