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-06-18 09:01:39 +02:00
parent b7aec77a7b c04e95573a
commit 79f9ef8752
139 changed files with 1011 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/build-managers/bazel/buildtools/default.nix
View File

@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "bazel-buildtools";
version = "3.2.0";
version = "3.2.1";
goPackagePath = "github.com/bazelbuild/buildtools";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "bazelbuild";
repo = "buildtools";
rev = version;
sha256 = "0r3vc47w5vxgy5rzh75q0lng1c490ic1a1dcc0ih7dcl6i5p1p88";
sha256 = "1f2shjskcmn3xpgvb9skli5xaf942wgyg5ps7r905n1zc0gm8izn";
};
goDeps = ./deps.nix;

4
pkgs/development/tools/database/liquibase/default.nix
View File

@@ -10,11 +10,11 @@ in
stdenv.mkDerivation rec {
pname = "liquibase";
version = "3.9.0";
version = "3.10.0";
src = fetchurl {
url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "0qasiggaxix3gmmvax00k83q4pd1c1b5wx8ayyplaszkgr9advb8";
sha256 = "1h5mcbs6mkk6cqjm8qm63rynz7611gq32v2jirl1qn71x2s7pq6y";
};
buildInputs = [ jre makeWrapper ];

12
pkgs/development/tools/database/webdis/default.nix
View File

@@ -2,23 +2,15 @@
stdenv.mkDerivation rec {
pname = "webdis";
version = "0.1.9";
version = "0.1.10";
src = fetchFromGitHub {
owner = "nicolasff";
repo = pname;
rev = version;
sha256 = "1kglzbs1sw3w05i678qr3lv4pxia20k2a8s3pjhfcxdlnlcy23sk";
sha256 = "1hn4fq0asivfs56rw9ck1vc3g6h6fnwywh8v4zs2bkyn62fg9mcw";
};
patches = [
# Do not use DESTDIR. See: https://github.com/nicolasff/webdis/pull/172
(fetchpatch {
url = "https://github.com/nicolasff/webdis/commit/a44a2964a59f2e583f4945eeb65cd19235059270.patch";
sha256 = "0i41p98gc201vpp5ppjc9gxdyb1bpimr0qrvibaf3iq3sy4jr1gb";
})
];
buildInputs = [ hiredis http-parser jansson libevent ];
makeFlags = [

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

@@ -1,13 +1,13 @@
{ stdenv, fetchurl, jre_headless, makeWrapper }:
let
version = "6.4.3";
version = "6.4.4";
in
stdenv.mkDerivation {
pname = "flyway";
inherit version;
src = fetchurl {
url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
sha256 = "05gbqc3hvi7yiqf03iwyamvvhc3jmyfvv1989527psdzhxs8gw7b";
sha256 = "16zckqq64jv3031ssrvzw4ny98gnxhy2hsdp877i38zxqsvzdcym";
};
nativeBuildInputs = [ makeWrapper ];
dontBuild = true;

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

@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "gllvm";
version = "1.2.3";
version = "1.2.6";
goPackagePath = "github.com/SRI-CSL/gllvm";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "SRI-CSL";
repo = "gllvm";
rev = "v${version}";
sha256 = "12kdgsma62nzksvw266qm3ivkbz62ma93dd25wy0p19789v4fi7s";
sha256 = "0qzmrprc7npc0ln6mhkjrm8fgh2n94rdylixk11p6imxyx5fj3gg";
};
meta = with stdenv.lib; {

6
pkgs/development/tools/go-protobuf/default.nix
View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "go-protobuf";
version = "1.3.2";
version = "1.4.2";
src = fetchFromGitHub {
owner = "golang";
repo = "protobuf";
rev = "v${version}";
sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
sha256 = "0m5z81im4nsyfgarjhppayk4hqnrwswr3nix9mj8pff8x9jvcjqw";
};
vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";
vendorSha256 = "04w9vhkrwb2zfqk73xmhignjyvjqmz1j93slkqp7v8jj2dhyla54";
meta = with stdenv.lib; {
homepage = "https://github.com/golang/protobuf";

4
pkgs/development/tools/java/visualvm/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }:
stdenv.mkDerivation rec {
version = "2.0";
version = "2.0.2";
pname = "visualvm";
src = fetchzip {
url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip";
sha256 = "057dzf7xkb4fdv4bc2fgw7mxnxclcjmflafx3n2qw0qcdky18gzr";
sha256 = "19h5804izhdhdwbpyfbfqsjwmnabz2djbhkv7gvzs66jxc6q8mgx";
};
desktopItem = makeDesktopItem {