diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-08 12:01:37 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-08 12:01:37 +0000 |
commit | 1b60238acd96038c0a52ee73c012194d506eb432 (patch) | |
tree | 8d1bb3d0fa72f6cad063e7de94032f0cc4845097 /pkgs/applications | |
parent | 0d24f164c934cf7328b9e26c2da1836716d7e3c5 (diff) | |
parent | 5f41d9525a9e6c6d665e8e7d172d5ebac6a60df1 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications')
16 files changed, 306 insertions, 19 deletions
diff --git a/pkgs/applications/audio/exact-audio-copy/default.nix b/pkgs/applications/audio/exact-audio-copy/default.nix new file mode 100644 index 0000000000000..bd5e55bc21061 --- /dev/null +++ b/pkgs/applications/audio/exact-audio-copy/default.nix @@ -0,0 +1,86 @@ +{ 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; + }; +} diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index b19e22eeeba4d..6b47d1f3c846b 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -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; }; diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 3f1e7e8b99b37..3c54844863ffc 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -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 ]; diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 9beab9fa4beaf..26788ddb06774 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "A vim inspired text editor"; license = licenses.publicDomain; mainProgram = "kak"; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ vrthra srapenne ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix index 990e279c59012..44733d8bead75 100644 --- a/pkgs/applications/graphics/yacreader/default.nix +++ b/pkgs/applications/graphics/yacreader/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "yacreader"; - version = "9.9.1"; + version = "9.9.2"; src = fetchFromGitHub { owner = "YACReader"; repo = pname; rev = version; - sha256 = "sha256-D+ZmFMg9ZixZNUAMjPHwz7gcwKjG49lm5hTEqftbIrY="; + sha256 = "sha256-rurJkCIuHTWxIGb+TTHp8sQS26/5W/sdtWFxyeqVx54="; }; nativeBuildInputs = [ qmake pkg-config ]; @@ -22,5 +22,6 @@ mkDerivation rec { description = "A comic reader for cross-platform reading and managing your digital comic collection"; homepage = "http://www.yacreader.com"; license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ srapenne ]; }; } diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index fdac7cede1702..c7040e1c96c7f 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://keepassxc.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ jonafato turion ]; + maintainers = with maintainers; [ jonafato turion srapenne ]; platforms = platforms.linux ++ platforms.darwin; broken = stdenv.isDarwin; # see to https://github.com/NixOS/nixpkgs/issues/172165 }; diff --git a/pkgs/applications/networking/cluster/gatekeeper/default.nix b/pkgs/applications/networking/cluster/gatekeeper/default.nix index 8dbe5f4659f04..192f37228a736 100644 --- a/pkgs/applications/networking/cluster/gatekeeper/default.nix +++ b/pkgs/applications/networking/cluster/gatekeeper/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gatekeeper"; - version = "3.9.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "gatekeeper"; rev = "v${version}"; - sha256 = "sha256-hZ8PBJ+6G0A5tVrJfxy2rODxOxQarQg6mxG3sQCqjfY="; + sha256 = "sha256-XZASej26Mn4tq9c4nvjQNhQZWtu3L6jIgMNhyYyh5IE="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 2a9046d94a0bb..e30a1214c3ae9 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -74,8 +74,8 @@ in { spark_3_2 = spark rec { pname = "spark"; - version = "3.2.1"; - sha256 = "0kxdqczwmj6pray0h8h1qhygni9m82jzznw5fbv9hrxrkq1v182d"; + version = "3.2.2"; + sha256 = "sha256-yKoTyD/IqvsJQs0jB67h1zqwYaLuikdoa5fYIXtvhz0="; }; spark_3_1 = spark rec { pname = "spark"; diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 5a580cf0f705e..a40e998618a15 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -163,6 +163,6 @@ in stdenv.mkDerivation rec { homepage = "https://www.claws-mail.org/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin orivej oxzi ajs124 ]; + maintainers = with maintainers; [ fpletz globin orivej oxzi ajs124 srapenne ]; }; } diff --git a/pkgs/applications/radio/flex-ncat/default.nix b/pkgs/applications/radio/flex-ncat/default.nix index 24c2e08f5525f..e06b241905d3a 100644 --- a/pkgs/applications/radio/flex-ncat/default.nix +++ b/pkgs/applications/radio/flex-ncat/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flex-ncat"; - version = "0.1-20220505.0"; + version = "0.1-20221007.1"; src = fetchFromGitHub { owner = "kc2g-flex-tools"; repo = "nCAT"; rev = "v${version}"; - hash = "sha256-Jqoqy+W5sKfg7U/F2OpK1jAVM8rm1Tbr4RHG/mMVE0g="; + hash = "sha256-9rxI3wsqjhaH7DD1Go/8s0r6jXaE15Z9PPtbsnsfrM0="; }; - vendorSha256 = "sha256-mWZRaPbmSPBUhTCWSkU33zOOq79ylEbnjPG3gLkWeQY="; + vendorSha256 = "sha256-lnJtFixgv4ke4Knavb+XKFPzHCiAPhNtfZS3SRVvY2g="; meta = with lib; { homepage = "https://github.com/kc2g-flex-tools/nCAT"; diff --git a/pkgs/applications/radio/flex-ndax/default.nix b/pkgs/applications/radio/flex-ndax/default.nix index 6900e1eb4ed25..477953ab26fde 100644 --- a/pkgs/applications/radio/flex-ndax/default.nix +++ b/pkgs/applications/radio/flex-ndax/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "flex-ndax"; - version = "0.2-20220427"; + version = "0.2-20221007.1"; src = fetchFromGitHub { owner = "kc2g-flex-tools"; repo = "nDAX"; rev = "v${version}"; - hash = "sha256-KmvTLfGC6xzXcWYAzmBYiYSF65lqMdsdMQjUEk3siqc="; + hash = "sha256-QldbiJnCjWrlXEPvyAqV5Xwz9YvsnVobVy/E/OB0A1k="; }; buildInputs = [ libpulseaudio ]; - vendorSha256 = "sha256-u/5LiVo/ZOefprEKr/L1+3+OfYb0a4wq+CWoUjYNvzg="; + vendorSha256 = "sha256-eHy8oFYicVONQr31LQQ9b5auzeBoIzbszw2buKaBQbQ="; meta = with lib; { broken = stdenv.isDarwin; diff --git a/pkgs/applications/radio/sigdigger/default.nix b/pkgs/applications/radio/sigdigger/default.nix new file mode 100644 index 0000000000000..4273d148ce280 --- /dev/null +++ b/pkgs/applications/radio/sigdigger/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitHub +, qmake +, qtbase +, pkg-config +, sigutils +, fftwSinglePrec +, suwidgets +, wrapQtAppsHook +, suscan +, libsndfile +, soapysdr-with-plugins +, libxml2 +, volk +}: + +stdenv.mkDerivation rec { + pname = "sigdigger"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "BatchDrake"; + repo = "SigDigger"; + rev = "v${version}"; + sha256 = "sha256-dS+Fc0iQz7GIlGaR556Ur/EQh3Uzhqm9uBW42IuEqoE="; + }; + + nativeBuildInputs = [ + qmake + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + sigutils + fftwSinglePrec + suwidgets + suscan + libsndfile + libxml2 + volk + soapysdr-with-plugins + ]; + + qmakeFlags = [ + "SUWIDGETS_PREFIX=${suwidgets}" + "SigDigger.pro" + ]; + + meta = with lib; { + description = "Qt-based digital signal analyzer, using Suscan core and Sigutils DSP library"; + homepage = "https://github.com/BatchDrake/SigDigger"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ polygon oxapentane ]; + }; +} diff --git a/pkgs/applications/radio/sigutils/default.nix b/pkgs/applications/radio/sigutils/default.nix new file mode 100644 index 0000000000000..8b384af02270d --- /dev/null +++ b/pkgs/applications/radio/sigutils/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, fftwSinglePrec +, libsndfile +, volk +}: + +stdenv.mkDerivation rec { + pname = "sigutils"; + version = "unstable-2022-07-05"; + + src = fetchFromGitHub { + owner = "BatchDrake"; + repo = "sigutils"; + rev = "1d7559d427aadd253dd825eef26bf15e54860c5f"; + sha256 = "sha256-wvd6sixwGmR9R4x+swLVqXre4Dqnj10jZIXUfaJcmBw="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + fftwSinglePrec + libsndfile + volk + ]; + + meta = with lib; { + description = "Small signal processing utility library"; + homepage = "https://github.com/BatchDrake/sigutils"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ polygon oxapentane ]; + }; +} diff --git a/pkgs/applications/radio/suscan/default.nix b/pkgs/applications/radio/suscan/default.nix new file mode 100644 index 0000000000000..d2b13784a72cf --- /dev/null +++ b/pkgs/applications/radio/suscan/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, fftwSinglePrec +, libsndfile +, sigutils +, soapysdr-with-plugins +, libxml2 +, volk +}: + +stdenv.mkDerivation rec { + pname = "suscan"; + version = "unstable-2022-07-05"; + + src = fetchFromGitHub { + owner = "BatchDrake"; + repo = "suscan"; + rev = "37dad542b97aff24654f0bb80fb8e85af7cb84ab"; + sha256 = "sha256-h1ogtYjkqiHb1/NAJfJ0HQIvGnZM2K/PSP5nqLXUf9M="; + }; + + postPatch = '' + sed -i 's/fftw3 >= 3.0/fftw3f >= 3.0/' suscan.pc.in + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + fftwSinglePrec + libsndfile + sigutils + soapysdr-with-plugins + libxml2 + volk + ]; + + meta = with lib; { + description = "Channel scanner based on sigutils library"; + homepage = "https://github.com/BatchDrake/suscan"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ polygon oxapentane ]; + }; +} diff --git a/pkgs/applications/radio/suwidgets/default.nix b/pkgs/applications/radio/suwidgets/default.nix new file mode 100644 index 0000000000000..05f6cf12d6cdc --- /dev/null +++ b/pkgs/applications/radio/suwidgets/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitHub +, qmake +, qtbase +, pkg-config +, sigutils +, fftwSinglePrec +}: + +stdenv.mkDerivation rec { + pname = "suwidgets"; + version = "unstable-2022-04-03"; + + src = fetchFromGitHub { + owner = "BatchDrake"; + repo = "SuWidgets"; + rev = "826b3eeae5b682dc063f53b427caa9c7c48131ea"; + sha256 = "sha256-cyFLsP+8GbALdlgEnVX4201Qq/KAxb/Vv+sJqbFpvUk="; + }; + + dontWrapQtApps = true; + + postPatch = '' + substituteInPlace SuWidgets.pri \ + --replace "PKGCONFIG += sigutils fftw3" "PKGCONFIG += sigutils fftw3f" + ''; + + nativeBuildInputs = [ + qmake + pkg-config + ]; + + buildInputs = [ + qtbase + sigutils + fftwSinglePrec + ]; + + qmakeFlags = [ + "SuWidgetsLib.pro" + ]; + + meta = with lib; { + description = "Sigutils-related widgets"; + homepage = "https://github.com/BatchDrake/SuWidgets"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ polygon oxapentane ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index f4416dcc13408..344a10cf2ec56 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://jonas.github.io/tig/"; description = "Text-mode interface for git"; - maintainers = with maintainers; [ bjornfor domenkozar qknight globin ma27 ]; + maintainers = with maintainers; [ bjornfor domenkozar qknight globin ma27 srapenne ]; license = licenses.gpl2Plus; platforms = platforms.unix; }; |