Merge master into staging-next
This commit is contained in:
@@ -3,14 +3,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sbt-extras";
|
||||
rev = "2c582cdbb37dd487bf2140010ddd2e20f3c1394e";
|
||||
version = "2021-03-03";
|
||||
rev = "6db3d3d1c38082dd4c49cce9933738d9bff50065";
|
||||
version = "2021-03-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paulp";
|
||||
repo = "sbt-extras";
|
||||
inherit rev;
|
||||
sha256 = "1j4j46gzw05bis7akvzfdj36xdwxcabq66wyf917z8vsy31vvajp";
|
||||
sha256 = "0sd9a6ldcl3pgs2rjg4pydk72ciavhggbpwfar3bj1h7vsgafnng";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sbt";
|
||||
version = "1.4.7";
|
||||
version = "1.4.8";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
|
||||
sha256 = "sha256-wqdZ/kCjwhoWtaiNAM1m869vByHk6mG2OULfuDotVP0=";
|
||||
sha256 = "sha256-WXItvaPW0dfsfcPiHWGi6AAjAwpCQ4I+7q3XftnFo50=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
Reference in New Issue
Block a user