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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source
This commit is contained in:
Tuomas Tynkkynen
2018-08-04 15:17:42 +03:00
parent 7a337cde31 20f1388c3f
commit 008fd5fcf5
132 changed files with 6166 additions and 2582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/tools/easyjson/default.nix
View File

@@ -1,20 +1,19 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
{ stdenv, buildGoPackage, fetchgit }:
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "easyjson-unstable-${version}";
version = "2018-06-06";
rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485";
version = "2018-07-30";
goPackagePath = "github.com/mailru/easyjson";
goDeps = ./deps.nix;
src = fetchgit {
inherit rev;
url = "https://github.com/mailru/easyjson";
sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74";
src = fetchFromGitHub {
owner = "mailru";
repo = "easyjson";
rev = "03f2033d19d5860aef995fe360ac7d395cd8ce65";
sha256 = "0r62ym6m1ijby7nwplq0gdnhak8in63njyisrwhr3xpx9vkira97";
};
goDeps = ./deps.nix;
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = "https://github.com/mailru/easyjson";

5
pkgs/development/tools/parsing/antlr/2.7.7.nix
View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, jdk, python}:
{ stdenv, fetchurl, jdk, python2 }:
stdenv.mkDerivation {
name = "antlr-2.7.7";
@@ -7,7 +7,8 @@ stdenv.mkDerivation {
sha256 = "1ffvcwdw73id0dk6pj2mlxjvbg0662qacx4ylayqcxgg381fnfl5";
};
patches = [ ./2.7.7-fixes.patch ];
buildInputs = [jdk python];
buildInputs = [ jdk ];
nativeBuildInputs = [ python2 ];
meta = with stdenv.lib; {
description = "Powerful parser generator";

15
pkgs/development/tools/quicktemplate/default.nix
View File

@@ -1,20 +1,19 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
{ stdenv, buildGoPackage, fetchgit }:
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "quicktemplate-unstable-${version}";
version = "2018-04-30";
rev = "a91e0946457b6583004fbfc159339b8171423aed";
goPackagePath = "github.com/valyala/quicktemplate";
goDeps = ./deps.nix;
src = fetchgit {
inherit rev;
url = "https://github.com/valyala/quicktemplate";
src = fetchFromGitHub {
owner = "valyala";
repo = "quicktemplate";
rev = "a91e0946457b6583004fbfc159339b8171423aed";
sha256 = "1z89ang5pkq5qs5b2nwhzyrw0zjlsas539l9kix374fhka49n8yc";
};
goDeps = ./deps.nix;
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = "https://github.com/valyala/quicktemplate";