From 79e53d8772ce0d3ba9362020be9931149eec30f4 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 22 Mar 2024 19:30:21 +0100 Subject: [PATCH 1/2] a2jmidid: update upstream data --- pkgs/applications/audio/a2jmidid/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index 08ef2d083088..85ab78617d29 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -1,15 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, pkg-config, alsa-lib, dbus, libjack2 -, python3Packages , meson, ninja }: +{ lib, stdenv, fetchFromGitea, makeWrapper, pkg-config, alsa-lib, dbus, libjack2 +, python3Packages , meson, ninja, gitUpdater }: stdenv.mkDerivation rec { pname = "a2jmidid"; version = "9"; - src = fetchFromGitHub { - owner = "linuxaudio"; - repo = pname; + src = fetchFromGitea { + domain = "gitea.ladish.org"; + owner = "LADI"; + repo = "a2jmidid"; rev = version; - sha256 = "sha256-WNt74tSWV8bY4TnpLp86PsnrjkqWynJJt3Ra4gZl2fQ="; + hash = "sha256-WNt74tSWV8bY4TnpLp86PsnrjkqWynJJt3Ra4gZl2fQ="; }; nativeBuildInputs = [ pkg-config makeWrapper meson ninja ]; @@ -21,9 +22,12 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/a2j --replace "a2j_control" "$out/bin/a2j_control" ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system"; - license = licenses.gpl2; + homepage = "https://a2jmidid.ladish.org/"; + license = licenses.gpl2Only; maintainers = [ maintainers.goibhniu ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; }; From 4f344cd923589db55cf6f7e3029326047d965472 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 22 Mar 2024 18:32:13 +0000 Subject: [PATCH 2/2] a2jmidid: 9 -> 12 --- pkgs/applications/audio/a2jmidid/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index 85ab78617d29..517db11c2865 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -3,14 +3,15 @@ stdenv.mkDerivation rec { pname = "a2jmidid"; - version = "9"; + version = "12"; src = fetchFromGitea { domain = "gitea.ladish.org"; owner = "LADI"; repo = "a2jmidid"; - rev = version; - hash = "sha256-WNt74tSWV8bY4TnpLp86PsnrjkqWynJJt3Ra4gZl2fQ="; + rev = "refs/tags/${version}"; + fetchSubmodules = true; + hash = "sha256-PZKGhHmPMf0AucPruOLB9DniM5A3BKdghFCrd5pTzeM="; }; nativeBuildInputs = [ pkg-config makeWrapper meson ninja ];