alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

gradle: add 8

Browse source
This commit is contained in:
Lorenz Leutgeb 2023-02-14 13:43:19 +01:00
parent a08d6979dd
commit b32ee446ee
8 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/tools/apksigner/default.nix
View file

@ -2,11 +2,13 @@
, stdenv , stdenv
, fetchgit , fetchgit
, openjdk17_headless , openjdk17_headless
, gradle , gradle_7
, perl , perl
, makeWrapper , makeWrapper
}: }:
let
gradle = gradle_7;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "apksigner"; pname = "apksigner";
version = "33.0.1"; version = "33.0.1";

7
pkgs/development/tools/build-managers/gradle/default.nix
View file

@ -126,6 +126,13 @@ rec {
# and respect the compatibility matrix at # and respect the compatibility matrix at
# https://docs.gradle.org/current/userguide/compatibility.html # 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 { gradle_7 = gen {
version = "7.6"; version = "7.6";
nativeVersion = "0.22-milestone-24"; nativeVersion = "0.22-milestone-24";

4
pkgs/development/tools/fastddsgen/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, runtimeShell, writeText, fetchFromGitHub, gradle, openjdk17, git, perl, cmake }: { lib, stdenv, runtimeShell, writeText, fetchFromGitHub, gradle_7, openjdk17, git, perl, cmake }:
let let
pname = "fastddsgen"; pname = "fastddsgen";
version = "2.3.0"; version = "2.3.0";
@ -11,6 +11,8 @@ let
hash = "sha256-lxMv1hXjHFslJts63/FJPjj0mAKTluY/pNTvf15Oo9o="; hash = "sha256-lxMv1hXjHFslJts63/FJPjj0mAKTluY/pNTvf15Oo9o=";
}; };
gradle = gradle_7;
# fake build to pre-download deps into fixed-output derivation # fake build to pre-download deps into fixed-output derivation
deps = stdenv.mkDerivation { deps = stdenv.mkDerivation {
pname = "${pname}-deps"; pname = "${pname}-deps";

4
pkgs/development/tools/scenic-view/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, jdk, gradle, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper }: { lib, stdenv, fetchFromGitHub, jdk, gradle_7, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper }:
let let
pname = "scenic-view"; pname = "scenic-view";
version = "11.0.2"; version = "11.0.2";
@ -10,6 +10,8 @@ let
sha256 = "1idfh9hxqs4fchr6gvhblhvjqk4mpl4rnpi84vn1l3yb700z7dwy"; sha256 = "1idfh9hxqs4fchr6gvhblhvjqk4mpl4rnpi84vn1l3yb700z7dwy";
}; };
gradle = gradle_7;
deps = stdenv.mkDerivation { deps = stdenv.mkDerivation {
name = "${pname}-deps"; name = "${pname}-deps";
inherit src; inherit src;

4
pkgs/servers/ma1sd/default.nix
View file

@ -4,7 +4,7 @@
, fetchpatch , fetchpatch
, jre , jre
, git , git
, gradle , gradle_7
, perl , perl
, makeWrapper , makeWrapper
}: }:
@ -20,6 +20,8 @@ let
hash = "sha256-K3kaujAhWsRQuTMW3SZOnE7Rmu8+tDXaxpLrb45OI4A="; hash = "sha256-K3kaujAhWsRQuTMW3SZOnE7Rmu8+tDXaxpLrb45OI4A=";
}; };
gradle = gradle_7;
patches = [ patches = [
# https://github.com/ma1uta/ma1sd/pull/122 # https://github.com/ma1uta/ma1sd/pull/122
(fetchpatch { (fetchpatch {

4
pkgs/tools/security/cie-middleware-linux/default.nix
View file

@ -6,7 +6,7 @@
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
, gradle , gradle_7
, curl , curl
, cryptopp , cryptopp
, fontconfig , fontconfig
@ -29,6 +29,8 @@ let
sha256 = "sha256-Kyr9OTiY6roJ/wVJS/1aWfrrzDNQbuRTJQqo0akbMUU="; sha256 = "sha256-Kyr9OTiY6roJ/wVJS/1aWfrrzDNQbuRTJQqo0akbMUU=";
}; };
gradle = gradle_7;
# Shared libraries needed by the Java application # Shared libraries needed by the Java application
libraries = lib.makeLibraryPath [ ghostscript ]; libraries = lib.makeLibraryPath [ ghostscript ];

4
pkgs/tools/security/ghidra/build.nix
View file

@ -3,7 +3,7 @@
, fetchurl , fetchurl
, fetchFromGitHub , fetchFromGitHub
, lib , lib
, gradle , gradle_7
, perl , perl
, makeWrapper , makeWrapper
, openjdk17 , openjdk17
@ -28,6 +28,8 @@ let
sha256 = "sha256-YhjKRlFlF89H05NsTS69SB108rNiiWijvZZY9fR+Ebc="; sha256 = "sha256-YhjKRlFlF89H05NsTS69SB108rNiiWijvZZY9fR+Ebc=";
}; };
gradle = gradle_7;
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "ghidra"; name = "ghidra";
exec = "ghidra"; exec = "ghidra";

3
pkgs/top-level/all-packages.nix
View file

@ -18037,7 +18037,8 @@ with pkgs;
gradleGen = gradle-packages.gen; gradleGen = gradle-packages.gen;
gradle_6 = callPackage gradle-packages.gradle_6 { }; gradle_6 = callPackage gradle-packages.gradle_6 { };
gradle_7 = callPackage gradle-packages.gradle_7 { }; gradle_7 = callPackage gradle-packages.gradle_7 { };
gradle = gradle_7; gradle_8 = callPackage gradle-packages.gradle_8 { };
gradle = gradle_8;
grcov = callPackage ../development/tools/misc/grcov { }; grcov = callPackage ../development/tools/misc/grcov { };