diff options
author | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-08-11 09:36:34 +0200 |
---|---|---|
committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-08-11 09:36:34 +0200 |
commit | a34579e01ef2aca4b33381a5c189746a1b52e2f0 (patch) | |
tree | 70410891f5c55611a2d17d2d723f270ad022c391 /pkgs/development/tools | |
parent | af8cd3c74e80ff532b17568039ecc4f143992813 (diff) | |
parent | 40dea2488fec71f6224944c1b9dae280c2fcc2dc (diff) | |
download | nixlib-a34579e01ef2aca4b33381a5c189746a1b52e2f0.tar nixlib-a34579e01ef2aca4b33381a5c189746a1b52e2f0.tar.gz nixlib-a34579e01ef2aca4b33381a5c189746a1b52e2f0.tar.bz2 nixlib-a34579e01ef2aca4b33381a5c189746a1b52e2f0.tar.lz nixlib-a34579e01ef2aca4b33381a5c189746a1b52e2f0.tar.xz nixlib-a34579e01ef2aca4b33381a5c189746a1b52e2f0.tar.zst nixlib-a34579e01ef2aca4b33381a5c189746a1b52e2f0.zip |
Merge branch 'master' into add-missing-licenses
Conflicts: pkgs/tools/networking/network-manager/fortisslvpn.nix
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/build-managers/remake/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch | 34 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/waf/default.nix | 16 | ||||
-rw-r--r-- | pkgs/development/tools/goa/default.nix | 22 | ||||
-rw-r--r-- | pkgs/development/tools/hcloud/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/parsing/antlr/4.7.nix | 108 | ||||
-rw-r--r-- | pkgs/development/tools/wp-cli/default.nix | 8 |
7 files changed, 126 insertions, 70 deletions
diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/development/tools/build-managers/remake/default.nix index 926cc83cd976..3eca6f02e45d 100644 --- a/pkgs/development/tools/build-managers/remake/default.nix +++ b/pkgs/development/tools/build-managers/remake/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { sha256 = "1zi16pl7sqn1aa8b7zqm9qnd9vjqyfywqm8s6iap4clf86l7kss2"; }; + patches = [ + ./glibc-2.27-glob.patch + ]; + buildInputs = [ readline ]; meta = { diff --git a/pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch b/pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch new file mode 100644 index 000000000000..ef876e2fb237 --- /dev/null +++ b/pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch @@ -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 diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index e86d61cf6c9a..5c6283b00a15 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -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 ]; diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index 04c35f7b8bb7..dfb603d101fc 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -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; { diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index daa3713a8d16..2ef6b4a1d548 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -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}" ]; diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix index e097b5b3d5a5..463ea3199b2a 100644 --- a/pkgs/development/tools/parsing/antlr/4.7.nix +++ b/pkgs/development/tools/parsing/antlr/4.7.nix @@ -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" - - 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} - ''; - - inherit jre; - - 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. + runtime = { + cpp = stdenv.mkDerivation { + name = "antlr-runtime-cpp-${version}"; + src = source; + + outputs = [ "out" "dev" "doc" ]; + + nativeBuildInputs = [ cmake ninja pkgconfig ]; + buildInputs = stdenv.lib.optional stdenv.isLinux libuuid + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation; + + postUnpack = '' + export sourceRoot=$sourceRoot/runtime/Cpp + ''; + + 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 diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 9dbdcfaa8aab..2f5552945714 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -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 |