From a707a2b221f0becfbb9561b8a4b10c37541813eb Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Mon, 21 Oct 2024 13:33:16 +1300 Subject: [PATCH 1/5] mutmut: Format with nixfmt-rfc-style --- pkgs/by-name/mu/mutmut/package.nix | 71 +++++++++++++++++------------- 1 file changed, 41 insertions(+), 30 deletions(-) diff --git a/pkgs/by-name/mu/mutmut/package.nix b/pkgs/by-name/mu/mutmut/package.nix index 3d9c8078060c..af9ac958e7f1 100644 --- a/pkgs/by-name/mu/mutmut/package.nix +++ b/pkgs/by-name/mu/mutmut/package.nix @@ -1,39 +1,50 @@ -{ lib -, fetchFromGitHub -, python3 -, testers +{ + lib, + fetchFromGitHub, + python3, + testers, }: -let self = with python3.pkgs; buildPythonApplication rec { - pname = "mutmut"; - version = "2.2.0"; +let + self = + with python3.pkgs; + buildPythonApplication rec { + pname = "mutmut"; + version = "2.2.0"; - src = fetchFromGitHub { - repo = pname; - owner = "boxed"; - rev = version; - hash = "sha256-G+OL/9km2iUeZ1QCpU73CIWVWMexcs3r9RdCnAsESnY="; - }; + src = fetchFromGitHub { + repo = pname; + owner = "boxed"; + rev = version; + hash = "sha256-G+OL/9km2iUeZ1QCpU73CIWVWMexcs3r9RdCnAsESnY="; + }; - postPatch = '' - substituteInPlace requirements.txt --replace 'junit-xml==1.8' 'junit-xml==1.9' - ''; + postPatch = '' + substituteInPlace requirements.txt --replace 'junit-xml==1.8' 'junit-xml==1.9' + ''; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.7"; - doCheck = false; + doCheck = false; - propagatedBuildInputs = [ click glob2 parso pony junit-xml ]; + propagatedBuildInputs = [ + click + glob2 + parso + pony + junit-xml + ]; - passthru.tests.version = testers.testVersion { package = self; }; + passthru.tests.version = testers.testVersion { package = self; }; - meta = with lib; { - description = "mutation testing system for Python, with a strong focus on ease of use"; - mainProgram = "mutmut"; - homepage = "https://github.com/boxed/mutmut"; - changelog = "https://github.com/boxed/mutmut/blob/${version}/HISTORY.rst"; - license = licenses.bsd3; - maintainers = with maintainers; [ synthetica ]; - }; -}; -in self + meta = with lib; { + description = "mutation testing system for Python, with a strong focus on ease of use"; + mainProgram = "mutmut"; + homepage = "https://github.com/boxed/mutmut"; + changelog = "https://github.com/boxed/mutmut/blob/${version}/HISTORY.rst"; + license = licenses.bsd3; + maintainers = with maintainers; [ synthetica ]; + }; + }; +in +self From e713e631a4d24085a0c9bfc54afedff1605503b0 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Mon, 21 Oct 2024 13:36:51 +1300 Subject: [PATCH 2/5] mutmut: Refer to tag directly To avoid the possibility of an ambiguous reference. --- pkgs/by-name/mu/mutmut/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mu/mutmut/package.nix b/pkgs/by-name/mu/mutmut/package.nix index af9ac958e7f1..f505a2c5f204 100644 --- a/pkgs/by-name/mu/mutmut/package.nix +++ b/pkgs/by-name/mu/mutmut/package.nix @@ -15,7 +15,7 @@ let src = fetchFromGitHub { repo = pname; owner = "boxed"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-G+OL/9km2iUeZ1QCpU73CIWVWMexcs3r9RdCnAsESnY="; }; From cd6b4e2606a52bc6ffc15b8d8b9cbd4185e6d911 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Mon, 21 Oct 2024 13:43:04 +1300 Subject: [PATCH 3/5] mutmut: Simplify context Avoids `with` except for when every reference is to an attribute within that attribute set. --- pkgs/by-name/mu/mutmut/package.nix | 71 ++++++++++++++---------------- 1 file changed, 33 insertions(+), 38 deletions(-) diff --git a/pkgs/by-name/mu/mutmut/package.nix b/pkgs/by-name/mu/mutmut/package.nix index f505a2c5f204..f75af0144ac5 100644 --- a/pkgs/by-name/mu/mutmut/package.nix +++ b/pkgs/by-name/mu/mutmut/package.nix @@ -1,50 +1,45 @@ { lib, fetchFromGitHub, - python3, + mutmut, + python3Packages, testers, }: +python3Packages.buildPythonApplication rec { + pname = "mutmut"; + version = "2.2.0"; -let - self = - with python3.pkgs; - buildPythonApplication rec { - pname = "mutmut"; - version = "2.2.0"; + src = fetchFromGitHub { + repo = pname; + owner = "boxed"; + rev = "refs/tags/${version}"; + hash = "sha256-G+OL/9km2iUeZ1QCpU73CIWVWMexcs3r9RdCnAsESnY="; + }; - src = fetchFromGitHub { - repo = pname; - owner = "boxed"; - rev = "refs/tags/${version}"; - hash = "sha256-G+OL/9km2iUeZ1QCpU73CIWVWMexcs3r9RdCnAsESnY="; - }; + postPatch = '' + substituteInPlace requirements.txt --replace 'junit-xml==1.8' 'junit-xml==1.9' + ''; - postPatch = '' - substituteInPlace requirements.txt --replace 'junit-xml==1.8' 'junit-xml==1.9' - ''; + disabled = python3Packages.pythonOlder "3.7"; - disabled = pythonOlder "3.7"; + doCheck = false; - doCheck = false; + propagatedBuildInputs = with python3Packages; [ + click + glob2 + parso + pony + junit-xml + ]; - propagatedBuildInputs = [ - click - glob2 - parso - pony - junit-xml - ]; + passthru.tests.version = testers.testVersion { package = mutmut; }; - passthru.tests.version = testers.testVersion { package = self; }; - - meta = with lib; { - description = "mutation testing system for Python, with a strong focus on ease of use"; - mainProgram = "mutmut"; - homepage = "https://github.com/boxed/mutmut"; - changelog = "https://github.com/boxed/mutmut/blob/${version}/HISTORY.rst"; - license = licenses.bsd3; - maintainers = with maintainers; [ synthetica ]; - }; - }; -in -self + meta = with lib; { + description = "mutation testing system for Python, with a strong focus on ease of use"; + mainProgram = "mutmut"; + homepage = "https://github.com/boxed/mutmut"; + changelog = "https://github.com/boxed/mutmut/blob/${version}/HISTORY.rst"; + license = licenses.bsd3; + maintainers = with maintainers; [ synthetica ]; + }; +} From 4b610f43ae1b5425bdabe9343422ed2f95231642 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Mon, 21 Oct 2024 13:46:34 +1300 Subject: [PATCH 4/5] mutmut: 2.2.0 -> 3.2.0 With dependencies from the upstream requirements file . --- nixos/doc/manual/release-notes/rl-2411.section.md | 2 ++ pkgs/by-name/mu/mutmut/package.nix | 15 ++++++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 335618dbc48d..10f3ea319340 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -236,6 +236,8 @@ - `knot-dns` has been updated to version 3.4.x. Check the [migration guide](https://www.knot-dns.cz/docs/latest/html/migration.html#upgrade-3-3-x-to-3-4-x) for breaking changes. +- `mutmut` has been updated to version 3.0.5. + - `services.kubernetes.kubelet.clusterDns` now accepts a list of DNS resolvers rather than a single string, bringing the module more in line with the upstream Kubelet configuration schema. - `bluemap` has changed the format used to store map tiles, and the database layout has been heavily modified. Upstream recommends a clean reinstallation: . Unless you are using an SQL storage backend, this should only entail deleting the contents of `config.services.bluemap.coreSettings.data` (defaults to `/var/lib/bluemap`) and `config.services.bluemap.webRoot` (defaults to `/var/lib/bluemap/web`). diff --git a/pkgs/by-name/mu/mutmut/package.nix b/pkgs/by-name/mu/mutmut/package.nix index f75af0144ac5..f17d129bf3cb 100644 --- a/pkgs/by-name/mu/mutmut/package.nix +++ b/pkgs/by-name/mu/mutmut/package.nix @@ -1,23 +1,22 @@ { lib, fetchFromGitHub, - mutmut, python3Packages, - testers, }: + python3Packages.buildPythonApplication rec { pname = "mutmut"; - version = "2.2.0"; + version = "3.2.0"; src = fetchFromGitHub { repo = pname; owner = "boxed"; rev = "refs/tags/${version}"; - hash = "sha256-G+OL/9km2iUeZ1QCpU73CIWVWMexcs3r9RdCnAsESnY="; + hash = "sha256-+e2FmfpGtK401IW8LNqeHk0v8Hh5rF3LbZJkSOJ3yPY="; }; postPatch = '' - substituteInPlace requirements.txt --replace 'junit-xml==1.8' 'junit-xml==1.9' + substituteInPlace requirements.txt --replace-fail 'junit-xml==1.8' 'junit-xml==1.9' ''; disabled = python3Packages.pythonOlder "3.7"; @@ -26,14 +25,12 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ click - glob2 parso - pony junit-xml + setproctitle + textual ]; - passthru.tests.version = testers.testVersion { package = mutmut; }; - meta = with lib; { description = "mutation testing system for Python, with a strong focus on ease of use"; mainProgram = "mutmut"; From 97927bc69d81bf1e87dacd8aa6000c5668ddcb50 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 10 Nov 2024 13:18:14 +1300 Subject: [PATCH 5/5] mutmut: Add l0b0 as maintainer --- pkgs/by-name/mu/mutmut/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mu/mutmut/package.nix b/pkgs/by-name/mu/mutmut/package.nix index f17d129bf3cb..70e131e53485 100644 --- a/pkgs/by-name/mu/mutmut/package.nix +++ b/pkgs/by-name/mu/mutmut/package.nix @@ -37,6 +37,9 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/boxed/mutmut"; changelog = "https://github.com/boxed/mutmut/blob/${version}/HISTORY.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ synthetica ]; + maintainers = with maintainers; [ + l0b0 + synthetica + ]; }; }