From a6f944ba4a0826a62c13867657fc23e45eb27833 Mon Sep 17 00:00:00 2001 From: oxalica Date: Fri, 16 May 2025 02:30:57 -0400 Subject: [PATCH 1/2] dwarfs: 0.12.3 -> 0.12.4 and enable brotli support --- pkgs/by-name/dw/dwarfs/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dw/dwarfs/package.nix b/pkgs/by-name/dw/dwarfs/package.nix index 00d94841c071..6606a9466bb2 100644 --- a/pkgs/by-name/dw/dwarfs/package.nix +++ b/pkgs/by-name/dw/dwarfs/package.nix @@ -4,6 +4,7 @@ stdenv, bison, boost, + brotli, cmake, double-conversion, fmt, @@ -33,14 +34,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "dwarfs"; - version = "0.12.3"; + version = "0.12.4"; src = fetchFromGitHub { owner = "mhx"; repo = "dwarfs"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-DIlGeZXWyM9rMzo/DNQlzSbNBIRJhe2viXFM/zT2heY="; + hash = "sha256-EYNnmv0QKdWddIRFRsuwsazHep3nrJ8lInlR4S67rME="; }; cmakeFlags = [ @@ -68,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: { parallel-hashmap nlohmann_json boost + brotli flac # optional; allows automatic audio compression fmt fuse3 From dd90387a7d8086f9ad2861026095dd82e3604be7 Mon Sep 17 00:00:00 2001 From: oxalica Date: Sat, 31 May 2025 21:44:05 -0400 Subject: [PATCH 2/2] dwarfs: correct license to "gpl3Only" Upstream states clearly to have license GPL-3.0-only, not GPL-3.0-plus. License file: Source file: --- pkgs/by-name/dw/dwarfs/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/dw/dwarfs/package.nix b/pkgs/by-name/dw/dwarfs/package.nix index 6606a9466bb2..a43824fd2e87 100644 --- a/pkgs/by-name/dw/dwarfs/package.nix +++ b/pkgs/by-name/dw/dwarfs/package.nix @@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Fast high compression read-only file system"; homepage = "https://github.com/mhx/dwarfs"; changelog = "https://github.com/mhx/dwarfs/blob/v${finalAttrs.version}/CHANGES.md"; - license = lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.luftmensch-luftmensch ]; platforms = lib.platforms.linux; };