diff --git a/pkgs/by-name/so/sosreport/os-release.patch b/pkgs/by-name/so/sosreport/os-release.patch new file mode 100644 index 000000000000..212727c0772d --- /dev/null +++ b/pkgs/by-name/so/sosreport/os-release.patch @@ -0,0 +1,9 @@ +--- a/sos/policies/distros/__init__.py ++++ b/sos/policies/distros/__init__.py +@@ -128,6 +128,8 @@ + return True + # next check os-release for a NAME or ID value we expect ++ if not os.path.exists(OS_RELEASE): ++ return False + with open(OS_RELEASE, "r", encoding='utf-8') as f: + return _check_release(f.read()) diff --git a/pkgs/by-name/so/sosreport/package.nix b/pkgs/by-name/so/sosreport/package.nix index af8f7c768f2d..7dc13ab50d97 100644 --- a/pkgs/by-name/so/sosreport/package.nix +++ b/pkgs/by-name/so/sosreport/package.nix @@ -7,18 +7,22 @@ python3Packages.buildPythonPackage rec { pname = "sosreport"; - version = "4.9.1"; + version = "4.11.1"; pyproject = true; src = fetchFromGitHub { owner = "sosreport"; repo = "sos"; tag = version; - hash = "sha256-97S8b4PfjUN8uzvp01PGCLs4J3CbwpJsgBKtY8kI0HE="; + hash = "sha256-HKGGA9SHCJjAaCPduPx1plUJ10nt3JYAr10J/69Sm/0="; }; build-system = [ python3Packages.setuptools ]; + patches = [ + ./os-release.patch + ]; + nativeBuildInputs = [ gettext ]; @@ -26,6 +30,7 @@ python3Packages.buildPythonPackage rec { dependencies = with python3Packages; [ packaging pexpect + python-magic pyyaml ]; @@ -43,5 +48,6 @@ python3Packages.buildPythonPackage rec { homepage = "https://github.com/sosreport/sos"; license = lib.licenses.gpl2Plus; maintainers = [ ]; + platforms = lib.platforms.linux; }; }