diff --git a/pkgs/by-name/br/brotli/package.nix b/pkgs/by-name/br/brotli/package.nix index bb6c287c870f..baf6a2f38e6a 100644 --- a/pkgs/by-name/br/brotli/package.nix +++ b/pkgs/by-name/br/brotli/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, python3Packages, staticOnly ? stdenv.hostPlatform.isStatic, @@ -11,26 +10,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "brotli"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "google"; repo = "brotli"; - rev = "v${finalAttrs.version}"; - hash = "sha256-MvceRcle2dSkkucC2PlsCizsIf8iv95d8Xjqew266wc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-kl8ZHt71v17QR2bDP+ad/5uixf+GStEPLQ5ooFoC5i8="; }; - patches = [ - # revert runpath change, breaks curl on darwin: - # https://github.com/NixOS/nixpkgs/pull/254532#issuecomment-1722337476 - (fetchpatch { - name = "revert-runpath.patch"; - url = "https://github.com/google/brotli/commit/f842c1bcf9264431cd3b15429a72b7dafbe80509.patch"; - hash = "sha256-W3LY3EjoHP74YsKOOcYQrzo+f0HbooOvEbnOibtN6TM="; - revert = true; - }) - ]; - nativeBuildInputs = [ cmake ]; cmakeFlags = lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF"; @@ -60,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/google/brotli"; + changelog = "https://github.com/google/brotli/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "General-purpose lossless compression library with CLI"; longDescription = '' Brotli is a generic-purpose lossless compression algorithm that diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix index fb78ead78779..6746fb5707fa 100644 --- a/pkgs/development/python-modules/brotli/default.nix +++ b/pkgs/development/python-modules/brotli/default.nix @@ -10,18 +10,9 @@ buildPythonPackage rec { pname = "brotli"; - version = "1.2.0"; + inherit (brotli) version src; pyproject = true; - src = fetchFromGitHub { - owner = "google"; - repo = "brotli"; - tag = "v${version}"; - hash = "sha256-ePfllKdY12hOPuO9uHuXFZ3Bdib6BLD4ghiaeurJZ28="; - # .gitattributes is not correct or GitHub does not parse it correct and the archive is missing the test data - forceFetchGit = true; - }; - build-system = [ pkgconfig setuptools