diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5df00f2371f4..a5c7112effbe 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2883,6 +2883,13 @@ githubId = 686190; name = "Carlos D'Agostino"; }; + carlossless = { + email = "contact@carlossless.io"; + matrix = "@carlossless:matrix.org"; + github = "carlossless"; + githubId = 498906; + name = "Karolis Stasaitis"; + }; carlsverre = { email = "accounts@carlsverre.com"; github = "carlsverre"; diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index 66e972826cb9..315a21360951 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -2,25 +2,20 @@ stdenv.mkDerivation rec { pname = "astyle"; - version = "3.1"; + version = "3.4.10"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}_${version}_linux.tar.gz"; - sha256 = "1ms54wcs7hg1bsywqwf2lhdfizgbk7qxc9ghasxk8i99jvwlrk6b"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; + hash = "sha256-b2fshytDe9PFHg914RLk2/2ybV+3vZz4pIDxCvVVcGM="; }; - # lots of hardcoded references to /usr - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace ' /usr/' " $out/" - ''; - nativeBuildInputs = [ cmake ]; meta = with lib; { description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java"; homepage = "https://astyle.sourceforge.net/"; license = licenses.lgpl3; + maintainers = with maintainers; [ carlossless ]; platforms = platforms.unix; }; }