Unverified Commit b37a7b6a authored by Fabián Heredia Montiel's avatar Fabián Heredia Montiel Committed by GitHub
Browse files

Merge pull request #254688 from kashw2/scala 

scala_3: 3.3.0 -> 3.3.1, scala_2_13: 2.13.11 -> 2.13.12
parents bc096b24 8ff38d74

pkgs/development/compilers/scala/2.x.nix

+3 −3
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ let 
    };



    "2.13" = {

      version = "2.13.11";

      sha256 = "YYLdgdICPM5SczPteFsaojqY6H3IVauji6SJLcaq8eM=";

      version = "2.13.12";

      sha256 = "r+fm+1njyIRX6Z9wGHMOUvuifI0V49cVT3KWggbKhxk=";

      pname = "scala_2_13";

    };

  };
@@ -114,6 +114,6 @@ stdenv.mkDerivation rec { 
    license = licenses.bsd3;

    platforms = platforms.all;

    branch = versions.majorMinor version;

    maintainers = [ maintainers.nequissimus ];

    maintainers = with maintainers; [ nequissimus kashw2 ];

  };

}

pkgs/development/compilers/scala/bare.nix

+3 −3
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, makeWrapper, jre, ncurses }:



stdenv.mkDerivation rec {

  version = "3.3.0";

  version = "3.3.1";

  pname = "scala-bare";



  src = fetchurl {

    url = "https://github.com/lampepfl/dotty/releases/download/${version}/scala3-${version}.tar.gz";

    hash = "sha256-Bk7lCKjjucaYQxAsg2qomJQUgCK/N688JqlGTfoQFHU=";

    hash = "sha256-EcDqD3HEOvD7GzVd3kFL/vAaYMFyk2deI6RNAlJpzRU=";

  };



  propagatedBuildInputs = [ jre ncurses.dev ] ;
@@ -37,6 +37,6 @@ stdenv.mkDerivation rec { 
    homepage = "http://dotty.epfl.ch/";

    license = licenses.bsd3;

    platforms = platforms.all;

    maintainers = [maintainers.karolchmist maintainers.virusdave];

    maintainers = with maintainers; [ karolchmist virusdave kashw2 ];

  };

}