Unverified Commit 661c2571 authored by Lily Foster's avatar Lily Foster Committed by GitHub
Browse files

Merge pull request #266927 from carlossless/patch-1 

astyle: 3.1 -> 3.4.10
parents 8da9c947 fc1e1f36

maintainers/maintainer-list.nix

+7 −0
Original line number Diff line number Diff line
@@ -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";

pkgs/development/tools/misc/astyle/default.nix

+4 −9
Original line number Diff line number Diff line
@@ -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;

  };

}