public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-05-02 09:39:00 +02:00
parent 00bbfccecf 309711c4b4
commit afb1041148
148 changed files with 5000 additions and 2598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/tools/analysis/radare2/default.nix
View File

@@ -110,17 +110,17 @@ in {
#<generated>
# DO NOT EDIT! Automatically generated by ./update.py
radare2 = generic {
version_commit = "24088";
gittap = "4.3.1";
gittip = "e7f940d27b3b4eb2738afef78a6ea09ed770318c";
rev = "4.3.1";
version = "4.3.1";
sha256 = "0fiy6aj8xf9anpkk2vpkx8x0m2f26rhjb92nmg61xj13dmhchh30";
version_commit = "24545";
gittap = "4.4.0";
gittip = "9ea0b7ce566cfdcfb3513f407c4056915204294a";
rev = "4.4.0";
version = "4.4.0";
sha256 = "0gwdnrnk7wdgkajp2qwg4fyplh7nsbmf01bzx07px6xmiscd9z2s";
cs_ver = "4.0.1";
cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6";
};
r2-for-cutter = generic {
version_commit = "24088";
version_commit = "24545";
gittap = "4.3.1";
gittip = "e7f940d27b3b4eb2738afef78a6ea09ed770318c";
rev = "e7f940d27b3b4eb2738afef78a6ea09ed770318c";

4
pkgs/development/tools/scalafmt/default.nix
View File

@@ -2,7 +2,7 @@
let
baseName = "scalafmt";
version = "2.4.2";
version = "2.5.0";
deps = stdenv.mkDerivation {
name = "${baseName}-deps-${version}";
buildCommand = ''
@@ -13,7 +13,7 @@ let
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "0axinxfyycnmxg561n80s90swr6d0pgsw669gvpsk557nhmcclja";
outputHash = "1m7jdgndbjynhl98an6g9gxxpp9bd6p3xqgzfilak8pamjkdwdp4";
};
in
stdenv.mkDerivation {

25
pkgs/development/tools/spring-boot/default.nix → pkgs/development/tools/spring-boot-cli/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchzip, jdk, makeWrapper, installShellFiles }:
{ stdenv, fetchzip, jdk, makeWrapper, installShellFiles, coreutils }:
stdenv.mkDerivation rec {
pname = "spring-boot";
version = "2.1.9";
pname = "spring-boot-cli";
version = "2.2.6";
src = fetchzip {
url = "https://repo.spring.io/release/org/springframework/boot/${pname}-cli/${version}.RELEASE/${pname}-cli-${version}.RELEASE-bin.zip";
sha256 = "03iphh5l9w9sizksidkv217qnqx3nh1zpw6kdjnn40j3mlabfb7j";
url = "https://repo.spring.io/release/org/springframework/boot/${pname}/${version}.RELEASE/${pname}-${version}.RELEASE-bin.zip";
sha256 = "1rb21a8nr4mcdsfv3c3xh45kcpdwllhjfb26w9xsdgfh1j4mhb81";
};
nativeBuildInputs = [ makeWrapper installShellFiles ];
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
rm -r shell-completion
cp -r . $out
wrapProgram $out/bin/spring \
--prefix JAVA_HOME : ${jdk}
--set JAVA_HOME ${jdk} \
--set PATH /bin:${coreutils}/bin:${jdk}/bin
runHook postInstall
'';
@@ -28,14 +29,14 @@ stdenv.mkDerivation rec {
CLI which makes it easy to create spring-based applications
'';
longDescription = ''
Spring Boot makes it easy to create stand-alone, production-grade
Spring-based Applications that you can run. We take an opinionated view
of the Spring platform and third-party libraries, so that you can get
started with minimum fuss. Most Spring Boot applications need very
Spring Boot makes it easy to create stand-alone, production-grade
Spring-based Applications that you can run. We take an opinionated view
of the Spring platform and third-party libraries, so that you can get
started with minimum fuss. Most Spring Boot applications need very
little Spring configuration.
You can use Spring Boot to create Java applications that can be started
by using java -jar or more traditional war deployments. We also provide
You can use Spring Boot to create Java applications that can be started
by using java -jar or more traditional war deployments. We also provide
a command line tool that runs “spring scripts”.
'';
homepage = "https://spring.io/projects/spring-boot";

9
pkgs/development/tools/unityhub/default.nix
View File

@@ -1,6 +1,8 @@
{ stdenv, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }:
appimageTools.wrapType2 rec {
let
version = "2.3.1";
in appimageTools.wrapType2 rec {
name = "unityhub";
extraPkgs = (pkgs: with pkgs; with xorg; [ gtk2 gdk_pixbuf glib libGL libGLU nss nspr
@@ -16,8 +18,9 @@ appimageTools.wrapType2 rec {
'';
src = fetchurl {
url = "https://public-cdn.cloud.unity3d.com/hub/prod/UnityHub.AppImage";
sha256 = "05p5kqbwgqyk2aw2lix5dk1ql16aj6iczxrc63a1l0vj8wrha7z4";
# mirror of https://public-cdn.cloud.unity3d.com/hub/prod/UnityHub.AppImage
url = "https://archive.org/download/unity-hub-${version}/UnityHub.AppImage";
sha256 = "09nrgjlknl3hgrrl7rc79bmbrq6r6sl49dw0cmvs37vjqnvlr8ny";
};
meta = with stdenv.lib; {