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

Merge branch 'master' into staging-next

Browse Source 
Hydra: ?compare=1472947
This commit is contained in:
Vladimír Čunát
2018-08-12 10:33:41 +02:00
parent 580cab57e4 bb3f7d14a1
commit 00df25ee57
298 changed files with 3752 additions and 5727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/tools/analysis/emma/default.nix
View File

@@ -19,5 +19,6 @@ stdenv.mkDerivation {
homepage = http://emma.sourceforge.net/;
description = "A code coverage tool for Java";
platforms = stdenv.lib.platforms.unix;
license = stdenv.lib.licenses.cpl10;
};
}

1
pkgs/development/tools/analysis/findbugs/default.nix
View File

@@ -39,5 +39,6 @@ stdenv.mkDerivation rec {
homepage = http://findbugs.sourceforge.net/;
maintainers = with maintainers; [ pSub ];
platforms = with platforms; unix;
license = licenses.lgpl3;
};
}

1
pkgs/development/tools/build-managers/cmake/2.8.nix
View File

@@ -84,5 +84,6 @@ stdenv.mkDerivation rec {
description = "Cross-Platform Makefile Generator";
platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ ];
license = stdenv.lib.licenses.bsd3;
};
}

1
pkgs/development/tools/build-managers/cmake/default.nix
View File

@@ -126,5 +126,6 @@ stdenv.mkDerivation rec {
description = "Cross-Platform Makefile Generator";
platforms = if useQt4 then qt4.meta.platforms else platforms.all;
maintainers = with maintainers; [ ttuegel lnl7 ];
license = licenses.bsd3;
};
}

1
pkgs/development/tools/build-managers/rebar/default.nix
View File

@@ -36,5 +36,6 @@ stdenv.mkDerivation {
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.the-kenny ];
license = stdenv.lib.licenses.asl20;
};
}

1
pkgs/development/tools/build-managers/rebar3/default.nix
View File

@@ -122,5 +122,6 @@ stdenv.mkDerivation {
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ gleber tazjin ];
license = stdenv.lib.licenses.asl20;
};
}

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

@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
sha256 = "1zi16pl7sqn1aa8b7zqm9qnd9vjqyfywqm8s6iap4clf86l7kss2";
};
patches = [
./glibc-2.27-glob.patch
];
buildInputs = [ readline ];
meta = {

34
pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch Normal file
View File

@@ -0,0 +1,34 @@
diff --git a/glob/glob.c b/glob/glob.c
index f3911bcd861..6cb76e8e162 100644
--- a/glob/glob.c
+++ b/glob/glob.c
@@ -208,29 +208,8 @@ my_realloc (p, n)
#endif /* __GNU_LIBRARY__ || __DJGPP__ */
-#if !defined __alloca && !defined __GNU_LIBRARY__
-
-# ifdef __GNUC__
-# undef alloca
-# define alloca(n) __builtin_alloca (n)
-# else /* Not GCC. */
-# ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-# else /* Not HAVE_ALLOCA_H. */
-# ifndef _AIX
-# ifdef WINDOWS32
-# include <malloc.h>
-# else
-extern char *alloca ();
-# endif /* WINDOWS32 */
-# endif /* Not _AIX. */
-# endif /* sparc or HAVE_ALLOCA_H. */
-# endif /* GCC. */
-
# define __alloca alloca
-#endif
-
#ifndef __GNU_LIBRARY__
# define __stat stat
# ifdef STAT_MACROS_BROKEN

16
pkgs/development/tools/build-managers/waf/default.nix
View File

@@ -1,15 +1,17 @@
{ stdenv, fetchurl, python2 }:
{ stdenv, fetchFromGitLab, python, ensureNewerSourcesForZipFilesHook }:
stdenv.mkDerivation rec {
name = "waf-${version}";
version = "2.0.6";
version = "2.0.10";
src = fetchurl {
url = "https://waf.io/waf-${version}.tar.bz2";
sha256 = "1wyl0jl10i0p2rj49sig5riyppgkqlkqmbvv35d5bqxri3y4r38q";
src = fetchFromGitLab {
owner = "ita1024";
repo = "waf";
rev = name;
sha256 = "12p5myq72r5qg7wp2gwbnyvh6lzzcrwp9h3dw194x38g52m0prc7";
};
buildInputs = [ python2 ];
buildInputs = [ python ensureNewerSourcesForZipFilesHook ];
configurePhase = ''
python waf-light configure
@@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Meta build system";
homepage = "https://waf.io/";
homepage = https://waf.io;
license = licenses.bsd3;
platforms = platforms.all;
maintainers = with maintainers; [ vrthra ];

22
pkgs/development/tools/goa/default.nix
View File

@@ -8,32 +8,12 @@ buildGoPackage rec {
subPackages = [ "goagen" ];
src = fetchFromGitHub {
rev = "v${version}";
owner = "goadesign";
repo = "goa";
rev = "v${version}";
sha256 = "13401jf907z3qh11h9clb3z0i0fshwkmhx11fq9z6vx01x8x2in1";
};
buildInputs = [ makeWrapper ];
allowGoReference = true;
outputs = [ "out" ];
preInstall = ''
export bin=$out
'';
postInstall = ''
# goagen needs GOPATH to be set
wrapProgram $out/bin/goagen \
--prefix GOPATH ":" $out/share/go
# and it needs access to all its dependancies
mkdir -p $out/share/go
cp -Rv $NIX_BUILD_TOP/go/{pkg,src} $out/share/go/
'';
goDeps = ./deps.nix;
meta = with stdenv.lib; {

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

@@ -2,14 +2,14 @@
buildGoPackage rec {
name = "hcloud-${version}";
version = "1.5.0";
version = "1.6.0";
goPackagePath = "github.com/hetznercloud/cli";
src = fetchFromGitHub {
owner = "hetznercloud";
repo = "cli";
rev = "v${version}";
sha256 = "1pbfa977ihqn7j3ynyqghxjw0wmq0vgha4lsshdpf5xr2n3w0r8l";
sha256 = "0iswy8xjqvshwk9w2vz3miph953qdh21xga9hl6aili84x25xzbx";
};
buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ];

6
pkgs/development/tools/nwjs/default.nix
View File

@@ -30,13 +30,13 @@ let
in stdenv.mkDerivation rec {
name = "nwjs-${version}";
version = "0.23.6";
version = "0.32.1";
src = fetchurl {
url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz";
sha256 = if bits == "x64" then
"0ppyjspdvacarhdn4xd5i1pqgmf4z1bxnh1cry780489h25rcjgj" else
"0c0j73vnzhsry5rdx41d954a29jmjnvzli728cfbjybfr51zdybg";
"b96fc5af62adf0567cc376c6b90cc401c9216bb01eb4767189208a29fbae5e5b" else
"0a3b712abfa0c3e7e808b1d08ea5d53375a71060e7d144fdcb58c4fe88fa2250";
};
phases = [ "unpackPhase" "installPhase" ];

1
pkgs/development/tools/ocaml/opam/default.nix
View File

@@ -87,5 +87,6 @@ in stdenv.mkDerivation rec {
homepage = http://opam.ocamlpro.com/;
maintainers = [ maintainers.henrytill ];
platforms = platforms.all;
license = licenses.lgpl21Plus;
};
}

100
pkgs/development/tools/parsing/antlr/4.7.nix
View File

@@ -1,41 +1,79 @@
{stdenv, fetchurl, jre}:
{ stdenv, fetchurl, jre
, fetchFromGitHub, cmake, ninja, pkgconfig, libuuid, darwin }:
stdenv.mkDerivation rec {
name = "antlr-${version}";
let
version = "4.7.1";
src = fetchurl {
url ="https://www.antlr.org/download/antlr-${version}-complete.jar";
sha256 = "1236gwnzchama92apb2swmklnypj01m7bdwwfvwvl8ym85scw7gl";
source = fetchFromGitHub {
owner = "antlr";
repo = "antlr4";
rev = version;
sha256 = "1xb4d9bd4hw406v85s64gg8gwcrrsrw171vhga1gz4xj6pzfwxz7";
};
unpackPhase = "true";
installPhase = ''
mkdir -p "$out"/{share/java,bin}
cp "$src" "$out/share/java/antlr-${version}-complete.jar"
runtime = {
cpp = stdenv.mkDerivation {
name = "antlr-runtime-cpp-${version}";
src = source;
echo "#! ${stdenv.shell}" >> "$out/bin/antlr"
echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' -Xmx500M org.antlr.v4.Tool \"\$@\"" >> "$out/bin/antlr"
echo "#! ${stdenv.shell}" >> "$out/bin/grun"
echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' org.antlr.v4.gui.TestRig \"\$@\"" >> "$out/bin/grun"
outputs = [ "out" "dev" "doc" ];
chmod a+x "$out/bin/antlr" "$out/bin/grun"
ln -s "$out/bin/antlr"{,4}
'';
nativeBuildInputs = [ cmake ninja pkgconfig ];
buildInputs = stdenv.lib.optional stdenv.isLinux libuuid
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation;
inherit jre;
postUnpack = ''
export sourceRoot=$sourceRoot/runtime/Cpp
'';
meta = with stdenv.lib; {
description = "Powerful parser generator";
longDescription = ''
ANTLR (ANother Tool for Language Recognition) is a powerful parser
generator for reading, processing, executing, or translating structured
text or binary files. It's widely used to build languages, tools, and
frameworks. From a grammar, ANTLR generates a parser that can build and
walk parse trees.
meta = with stdenv.lib; {
description = "C++ target for ANTLR 4";
homepage = http://www.antlr.org/;
platforms = platforms.unix;
};
};
};
antlr = stdenv.mkDerivation {
name = "antlr-${version}";
src = fetchurl {
url ="https://www.antlr.org/download/antlr-${version}-complete.jar";
sha256 = "1236gwnzchama92apb2swmklnypj01m7bdwwfvwvl8ym85scw7gl";
};
unpackPhase = "true";
installPhase = ''
mkdir -p "$out"/{share/java,bin}
cp "$src" "$out/share/java/antlr-${version}-complete.jar"
echo "#! ${stdenv.shell}" >> "$out/bin/antlr"
echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' -Xmx500M org.antlr.v4.Tool \"\$@\"" >> "$out/bin/antlr"
echo "#! ${stdenv.shell}" >> "$out/bin/grun"
echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' org.antlr.v4.gui.TestRig \"\$@\"" >> "$out/bin/grun"
chmod a+x "$out/bin/antlr" "$out/bin/grun"
ln -s "$out/bin/antlr"{,4}
'';
homepage = http://www.antlr.org/;
platforms = platforms.unix;
inherit jre;
passthru = {
inherit runtime;
jarLocation = "${antlr}/share/java/antlr-${version}-complete.jar";
};
meta = with stdenv.lib; {
description = "Powerful parser generator";
longDescription = ''
ANTLR (ANother Tool for Language Recognition) is a powerful parser
generator for reading, processing, executing, or translating structured
text or binary files. It's widely used to build languages, tools, and
frameworks. From a grammar, ANTLR generates a parser that can build and
walk parse trees.
'';
homepage = http://www.antlr.org/;
platforms = platforms.unix;
};
};
}
in antlr

1
pkgs/development/tools/sqsh/default.nix
View File

@@ -34,6 +34,7 @@ in stdenv.mkDerivation rec {
it is intended as a replacement for the venerable 'isql' program supplied
by Sybase.
'';
license = licenses.gpl2;
homepage = https://sourceforge.net/projects/sqsh/;
platforms = platforms.all;
};

1
pkgs/development/tools/toxiproxy/default.nix
View File

@@ -22,5 +22,6 @@ buildGoPackage rec {
meta = {
description = "Proxy for for simulating network conditions.";
maintainers = with lib.maintainers; [ avnik ];
license = lib.licenses.mit;
};
}

8
pkgs/development/tools/wp-cli/default.nix
View File

@@ -2,11 +2,11 @@
let
name = "wp-cli-${version}";
version = "1.5.1";
version = "2.0.0";
src = fetchurl {
url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar";
sha256 = "1lnjbl6rcv32g6akj4552ncyqmbsawmx1dnbmxr0rjj7wr8484f1";
sha256 = "1s8pv8vdjwiwknpwsxc59l1zxc2np7nrp6bjd0s8jwsrv5fgjzsp";
};
completion = fetchurl {
@@ -36,9 +36,7 @@ in stdenv.mkDerivation rec {
inherit name version;
buildCommand = ''
mkdir -p $out/{bin,share/bash-completion/completions}
ln -s ${bin} $out/bin/wp
install -Dm755 ${bin} $out/bin/wp
install -Dm644 ${completion} $out/share/bash-completion/completions/wp
# this is a very basic run test