Commit b32ee446 authored by Lorenz Leutgeb's avatar Lorenz Leutgeb
Browse files

gradle: add 8

parent a08d6979

pkgs/development/tools/apksigner/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -2,11 +2,13 @@ 
, stdenv

, fetchgit

, openjdk17_headless

, gradle

, gradle_7

, perl

, makeWrapper

}:



let

  gradle = gradle_7;

in

stdenv.mkDerivation rec {

  pname = "apksigner";

  version = "33.0.1";

pkgs/development/tools/build-managers/gradle/default.nix

+7 −0
Original line number Diff line number Diff line
@@ -126,6 +126,13 @@ rec { 
  # and respect the compatibility matrix at

  # https://docs.gradle.org/current/userguide/compatibility.html



  gradle_8 = gen {

    version = "8.0.1";

    nativeVersion = "0.22-milestone-24";

    sha256 = "02g9i1mrpdydj8d6395cv6a4ny9fw3z7sjzr7n6l6a9zx65masqv";

    defaultJava = jdk17;

  };



  gradle_7 = gen {

    version = "7.6";

    nativeVersion = "0.22-milestone-24";

pkgs/development/tools/fastddsgen/default.nix

+3 −1
Original line number Diff line number Diff line 
{ lib, stdenv, runtimeShell, writeText, fetchFromGitHub, gradle, openjdk17, git, perl, cmake }:

{ lib, stdenv, runtimeShell, writeText, fetchFromGitHub, gradle_7, openjdk17, git, perl, cmake }:

let

  pname = "fastddsgen";

  version = "2.3.0";
@@ -11,6 +11,8 @@ let 
    hash = "sha256-lxMv1hXjHFslJts63/FJPjj0mAKTluY/pNTvf15Oo9o=";

  };



  gradle = gradle_7;



  # fake build to pre-download deps into fixed-output derivation

  deps = stdenv.mkDerivation {

    pname = "${pname}-deps";

pkgs/development/tools/scenic-view/default.nix

+3 −1
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, jdk, gradle, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper }:

{ lib, stdenv, fetchFromGitHub, jdk, gradle_7, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper }:

let

  pname = "scenic-view";

  version = "11.0.2";
@@ -10,6 +10,8 @@ let 
    sha256 = "1idfh9hxqs4fchr6gvhblhvjqk4mpl4rnpi84vn1l3yb700z7dwy";

  };



  gradle = gradle_7;



  deps = stdenv.mkDerivation {

    name = "${pname}-deps";

    inherit src;

pkgs/servers/ma1sd/default.nix

+3 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
, fetchpatch

, jre

, git

, gradle

, gradle_7

, perl

, makeWrapper

}:
@@ -20,6 +20,8 @@ let 
    hash = "sha256-K3kaujAhWsRQuTMW3SZOnE7Rmu8+tDXaxpLrb45OI4A=";

  };



  gradle = gradle_7;



  patches = [

    # https://github.com/ma1uta/ma1sd/pull/122

    (fetchpatch {