From 5bd0473ab4e595b19abed23767b4d21b4a1e5803 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 20 Oct 2024 02:25:50 +0200 Subject: [PATCH 1/4] libsidplayfp: 2.9.0 -> 2.10.0 --- pkgs/development/libraries/libsidplayfp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index 803189719272..64009937eb5f 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsidplayfp"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-m1bbbtNJvoY6l2+jMbEN/dR9V7LZ4f1lHHGnn0F4bmU="; + hash = "sha256-pW2B/KClCpfWQjZNQQnXPtXDJlm5NKb4ivPlFUI/vFA="; }; outputs = [ From 17e9aca900edce72bb13c8336713b156a7430cd2 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 20 Oct 2024 02:26:22 +0200 Subject: [PATCH 2/4] libsidplayfp: nixfmt --- .../libraries/libsidplayfp/default.nix | 78 +++++++++---------- 1 file changed, 38 insertions(+), 40 deletions(-) diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index 64009937eb5f..de88a7c10adc 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -1,19 +1,20 @@ -{ stdenv -, lib -, fetchFromGitHub -, makeFontsConf -, nix-update-script -, testers -, autoreconfHook -, docSupport ? true -, doxygen -, graphviz -, libexsid -, libgcrypt -, perl -, pkg-config -, unittest-cpp -, xa +{ + stdenv, + lib, + fetchFromGitHub, + makeFontsConf, + nix-update-script, + testers, + autoreconfHook, + docSupport ? true, + doxygen, + graphviz, + libexsid, + libgcrypt, + perl, + pkg-config, + unittest-cpp, + xa, }: stdenv.mkDerivation (finalAttrs: { @@ -28,11 +29,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-pW2B/KClCpfWQjZNQQnXPtXDJlm5NKb4ivPlFUI/vFA="; }; - outputs = [ - "out" - ] ++ lib.optionals docSupport [ - "doc" - ]; + outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ]; postPatch = '' patchShebangs . @@ -40,24 +37,24 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ - autoreconfHook - perl - pkg-config - xa - ] ++ lib.optionals docSupport [ - doxygen - graphviz - ]; + nativeBuildInputs = + [ + autoreconfHook + perl + pkg-config + xa + ] + ++ lib.optionals docSupport [ + doxygen + graphviz + ]; buildInputs = [ libexsid libgcrypt ]; - checkInputs = [ - unittest-cpp - ]; + checkInputs = [ unittest-cpp ]; enableParallelBuilding = true; @@ -69,18 +66,16 @@ stdenv.mkDerivation (finalAttrs: { ]; # Make Doxygen happy with the setup, reduce log noise - FONTCONFIG_FILE = lib.optionalString docSupport (makeFontsConf { fontDirectories = [ ]; }); + FONTCONFIG_FILE = lib.optionalString docSupport (makeFontsConf { + fontDirectories = [ ]; + }); preBuild = '' # Reduce noise from fontconfig during doc building export XDG_CACHE_HOME=$TMPDIR ''; - buildFlags = [ - "all" - ] ++ lib.optionals docSupport [ - "doc" - ]; + buildFlags = [ "all" ] ++ lib.optionals docSupport [ "doc" ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; @@ -104,7 +99,10 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/libsidplayfp/libsidplayfp"; license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ ramkromberg OPNA2608 ]; + maintainers = with maintainers; [ + ramkromberg + OPNA2608 + ]; platforms = platforms.all; pkgConfigModules = [ "libsidplayfp" From 9daf997ed22c20a76a525f489e78e90f767f2653 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 20 Oct 2024 02:30:17 +0200 Subject: [PATCH 3/4] libsidplayfp: Modernise abit - Put FONTCONFIG_FILE into env - Get rid of meta-wise "with lib" - Add meta.changelog --- pkgs/development/libraries/libsidplayfp/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index de88a7c10adc..1eb6a21d4545 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # Make Doxygen happy with the setup, reduce log noise - FONTCONFIG_FILE = lib.optionalString docSupport (makeFontsConf { + env.FONTCONFIG_FILE = lib.optionalString docSupport (makeFontsConf { fontDirectories = [ ]; }); @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Library to play Commodore 64 music derived from libsidplay2"; longDescription = '' libsidplayfp is a C64 music player library which integrates @@ -98,12 +98,13 @@ stdenv.mkDerivation (finalAttrs: { C64 system and the SID chips. ''; homepage = "https://github.com/libsidplayfp/libsidplayfp"; - license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ + changelog = "https://github.com/libsidplayfp/libsidplayfp/releases/tag/v${finalAttrs.version}"; + license = with lib.licenses; [ gpl2Plus ]; + maintainers = with lib.maintainers; [ ramkromberg OPNA2608 ]; - platforms = platforms.all; + platforms = lib.platforms.all; pkgConfigModules = [ "libsidplayfp" "libstilview" From 2e48e944c1f2d0bae86bb65bf6a9b4026716f671 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 29 Oct 2024 00:27:12 +0100 Subject: [PATCH 4/4] libsidplayfp: 2.10.0 -> 2.10.1 --- pkgs/development/libraries/libsidplayfp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index 1eb6a21d4545..46ac8f556f99 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsidplayfp"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-pW2B/KClCpfWQjZNQQnXPtXDJlm5NKb4ivPlFUI/vFA="; + hash = "sha256-yZ2IiSzl78N/jrhKls/l2klnePJYKU1NCnZcBKUWiuU="; }; outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ];