From 49ee3147cda452e511ad5d096801496cdbaadd0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 12 Aug 2024 07:23:21 -0700 Subject: [PATCH 1/3] abcmidi: 2024.07.26 -> 2024.08.11 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 52c69c1577d0a2..0637ea5da7f3cc 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2024.07.26"; + version = "2024.08.11"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-LOCr1EwEUY+Nwr+bgxpVq2fUn+SfGTPlEYUPhzlpUEM="; + hash = "sha256-ljRwRSF6Odv99ej8mmMjtf9NE0du7TtAypkw7W9TEYU="; }; meta = with lib; { From fe02238662d096ba468174f07cb8c8ae8fe437e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 12 Aug 2024 07:25:25 -0700 Subject: [PATCH 2/3] abcmidi: move to pkgs/by-name --- .../abcmidi/default.nix => by-name/ab/abcmidi/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/audio/abcmidi/default.nix => by-name/ab/abcmidi/package.nix} (100%) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/by-name/ab/abcmidi/package.nix similarity index 100% rename from pkgs/tools/audio/abcmidi/default.nix rename to pkgs/by-name/ab/abcmidi/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a8e717d40474e..aabe21d6682ad9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1476,8 +1476,6 @@ with pkgs; abcm2ps = callPackage ../tools/audio/abcm2ps { }; - abcmidi = callPackage ../tools/audio/abcmidi { }; - abduco = callPackage ../tools/misc/abduco { }; acct = callPackage ../tools/system/acct { }; From 943d75b117f83ae9167e9e29fe49d1124b1ae6e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 12 Aug 2024 07:34:53 -0700 Subject: [PATCH 3/3] abcmidi: modernize --- pkgs/by-name/ab/abcmidi/package.nix | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ab/abcmidi/package.nix b/pkgs/by-name/ab/abcmidi/package.nix index 0637ea5da7f3cc..680c59f714889b 100644 --- a/pkgs/by-name/ab/abcmidi/package.nix +++ b/pkgs/by-name/ab/abcmidi/package.nix @@ -1,20 +1,26 @@ -{ lib, stdenv, fetchzip }: +{ + fetchFromGitHub, + lib, + stdenv, +}: -stdenv.mkDerivation rec { - pname = "abcMIDI"; +stdenv.mkDerivation (finalAttrs: { + pname = "abcmidi"; version = "2024.08.11"; - src = fetchzip { - url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; + src = fetchFromGitHub { + owner = "sshlien"; + repo = "abcmidi"; + rev = "refs/tags/${finalAttrs.version}"; hash = "sha256-ljRwRSF6Odv99ej8mmMjtf9NE0du7TtAypkw7W9TEYU="; }; - meta = with lib; { + meta = { homepage = "https://abc.sourceforge.net/abcMIDI/"; downloadPage = "https://ifdo.ca/~seymour/runabc/top.html"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; description = "Utilities for converting between abc and MIDI"; - platforms = platforms.unix; - maintainers = [ maintainers.dotlambda ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.dotlambda ]; }; -} +})