From 878cd0ddb9ea5f2601f0f0e1d4fb38d5fbe96aed Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 8 Apr 2025 10:38:53 +0300 Subject: [PATCH] treewide: fix mismerge --- pkgs/development/python-modules/calver/default.nix | 2 +- pkgs/development/python-modules/hpack/default.nix | 2 +- pkgs/development/python-modules/pyflakes/default.nix | 2 +- pkgs/development/python-modules/tomli-w/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/calver/default.nix b/pkgs/development/python-modules/calver/default.nix index 1a9a5491163c..b05ee4419599 100644 --- a/pkgs/development/python-modules/calver/default.nix +++ b/pkgs/development/python-modules/calver/default.nix @@ -43,7 +43,7 @@ let passthru.tests.calver = self.overridePythonAttrs { doCheck = true; }; meta = { - changelog = "https://github.com/di/calver/releases/tag/${src.tag}"; + changelog = "https://github.com/di/calver/releases/tag/${src.rev}"; description = "Setuptools extension for CalVer package versions"; homepage = "https://github.com/di/calver"; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/hpack/default.nix b/pkgs/development/python-modules/hpack/default.nix index fcf5b96757f6..f77f5bdd71ea 100644 --- a/pkgs/development/python-modules/hpack/default.nix +++ b/pkgs/development/python-modules/hpack/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "hpack" ]; meta = with lib; { - changelog = "https://github.com/python-hyper/hpack/blob/${src.tag}/CHANGELOG.rst"; + changelog = "https://github.com/python-hyper/hpack/blob/${src.rev}/CHANGELOG.rst"; description = "Pure-Python HPACK header compression"; homepage = "https://github.com/python-hyper/hpack"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index fe1e08190fc6..a7a1b1907c61 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/PyCQA/pyflakes"; - changelog = "https://github.com/PyCQA/pyflakes/blob/${src.tag}/NEWS.rst"; + changelog = "https://github.com/PyCQA/pyflakes/blob/${src.rev}/NEWS.rst"; description = "Simple program which checks Python source files for errors"; mainProgram = "pyflakes"; license = licenses.mit; diff --git a/pkgs/development/python-modules/tomli-w/default.nix b/pkgs/development/python-modules/tomli-w/default.nix index 6618d25848ab..328a471477c2 100644 --- a/pkgs/development/python-modules/tomli-w/default.nix +++ b/pkgs/development/python-modules/tomli-w/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Write-only counterpart to Tomli, which is a read-only TOML parser"; homepage = "https://github.com/hukkin/tomli-w"; - changelog = "https://github.com/hukkin/tomli-w/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/hukkin/tomli-w/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ lovesegfault ]; };