Unverified Commit 073fe478 authored by Ryan Burns's avatar Ryan Burns Committed by GitHub
Browse files

Merge pull request #140209 from balodja/openmodelica 

openmodelica: 1.17.0 -> 1.18.0
parents de3b15f0 72d4a1f1

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -1197,6 +1197,12 @@ 
    email = "sivaraman.balaji@gmail.com";

    name = "Balaji Sivaraman";

  };

  balodja = {

    email = "balodja@gmail.com";

    github = "balodja";

    githubId = 294444;

    name = "Vladimir Korolev";

  };

  baloo = {

    email = "nixpkgs@superbaloo.net";

    github = "baloo";

pkgs/applications/science/misc/openmodelica/combined/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ symlinkJoin { 
    description = "An open-source Modelica-based modeling and simulation environment intended for industrial and academic usage";

    homepage = "https://openmodelica.org";

    license = licenses.gpl3Only;

    maintainers = with maintainers; [ smironov ];

    maintainers = with maintainers; [ balodja smironov ];

    platforms = platforms.linux;

  };

}

pkgs/applications/science/misc/openmodelica/mkderivation/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ stdenv.mkDerivation (pkg // { 
  inherit omtarget postPatch preAutoreconf configureFlags configurePhase preBuild makeFlags installFlags;



  src = fetchgit (import ./src-main.nix);

  version = "1.17.0";

  version = "1.18.0";



  nativeBuildInputs = getAttrDef "nativeBuildInputs" [ ] pkg

    ++ [ autoconf automake libtool cmake autoreconfHook ];

pkgs/applications/science/misc/openmodelica/mkderivation/src-main.nix

+3 −3
Original line number Diff line number Diff line 
{

  url = "https://github.com/OpenModelica/OpenModelica/";

  rev = "08fd3f9144235f209a4ed7602bfadb32b1823628";

  sha256 = "0clgqk9ilnr43iyl5sdzwfzqpnw9amfy1npdgkpgm1wfnsvz6xrw";

  rev = "49be4faa5a625a18efbbd74cc2f5be86aeea37bb";

  sha256 = "0klqiy4sdizl1djb9hb0arcvfcjz2mmnakrjx81mmxcbr8yq2016";

  fetchSubmodules = true;

}

# Update with: nix run -f ./nixpkgs/default.nix nix-prefetch-git -c nix-prefetch-git 'https://github.com/OpenModelica/OpenModelica/' 'v1.17.0' --fetch-submodules
 
# Update with: nix run -f ./nixpkgs/default.nix nix-prefetch-git -c nix-prefetch-git 'https://github.com/OpenModelica/OpenModelica/' 'v1.18.0' --fetch-submodules

pkgs/applications/science/misc/openmodelica/omcompiler/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ mkOpenModelicaDerivation ({ 
    description = "Modelica compiler from OpenModelica suite";

    homepage = "https://openmodelica.org";

    license = licenses.gpl3Only;

    maintainers = with maintainers; [ smironov ];

    maintainers = with maintainers; [ balodja smironov ];

    platforms = platforms.linux;

  };

} // lib.optionalAttrs isCross {