Merge master into staging-next
This commit is contained in:
Frederik Rietdijk
@@ -90,17 +90,17 @@ in {
|
||||
#<generated>
|
||||
# DO NOT EDIT! Automatically generated by ./update.py
|
||||
radare2 = generic {
|
||||
version_commit = "20222";
|
||||
gittap = "3.1.0";
|
||||
gittip = "c033496ebc7034e52a84be9cdb2d2dfad6a4cfac";
|
||||
rev = "3.1.0";
|
||||
version = "3.1.0";
|
||||
sha256 = "0ggqda8433n7p4yivn7l0807i5wwf0vww2p8v90ri66nasbzvl16";
|
||||
version_commit = "20285";
|
||||
gittap = "3.1.1";
|
||||
gittip = "b143e1b1b5622ef2f41a90f4c0f7ed4c477caf40";
|
||||
rev = "3.1.1";
|
||||
version = "3.1.1";
|
||||
sha256 = "09kn25ijqhk3x9f3k6mw1g0wvwym8ys6qz53ybx3qizy4fzln0hw";
|
||||
cs_tip = "f01c267f889e932b069a559ce0c604c1ae986c0a";
|
||||
cs_sha256 = "15ifnql2gi2f9g8j60hc4hbxbvi2qn1r110ry32qmlz55svxh67y";
|
||||
};
|
||||
r2-for-cutter = generic {
|
||||
version_commit = "20222";
|
||||
version_commit = "20285";
|
||||
gittap = "2.9.0-310-gcb62c376b";
|
||||
gittip = "cb62c376bef6c7427019a7c28910c33c364436dd";
|
||||
rev = "cb62c376bef6c7427019a7c28910c33c364436dd";
|
||||
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
|
||||
outputs = [ "out" "man" "info" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.gnu.org/software/make/;
|
||||
homepage = https://www.gnu.org/software/make/;
|
||||
description = "A tool to control the generation of non-source files from sources";
|
||||
license = licenses.gpl3Plus;
|
||||
|
||||
|
||||
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
|
||||
cp -r python/bin $out/bin
|
||||
'';
|
||||
passthru.updateScript = ''
|
||||
#!${stdenv.shell}
|
||||
set -e
|
||||
echo
|
||||
cd ${toString ./.}
|
||||
|
||||
40
pkgs/development/tools/build-managers/mill/default.nix
Normal file
40
pkgs/development/tools/build-managers/mill/default.nix
Normal file
@@ -0,0 +1,40 @@
|
||||
{ stdenv, fetchurl, jre, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mill-${version}";
|
||||
version = "0.3.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}";
|
||||
sha256 = "19ka81f6vjr85gd8cadn0fv0i0qcdspx2skslfksklxdxs2gasf8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
unpackPhase = "true";
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm555 "$src" "$out/bin/.mill-wrapped"
|
||||
# can't use wrapProgram because it sets --argv0
|
||||
makeWrapper "$out/bin/.mill-wrapped" "$out/bin/mill" --prefix PATH : ${stdenv.lib.makeBinPath [ jre ]}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://www.lihaoyi.com/mill;
|
||||
license = licenses.mit;
|
||||
description = "A build tool for Scala, Java and more";
|
||||
longDescription = ''
|
||||
Mill is a build tool borrowing ideas from modern tools like Bazel, to let you build
|
||||
your projects in a way that's simple, fast, and predictable. Mill has built in
|
||||
support for the Scala programming language, and can serve as a replacement for
|
||||
SBT, but can also be extended to support any other language or platform via
|
||||
modules (written in Java or Scala) or through an external subprocesses.
|
||||
'';
|
||||
maintainers = with maintainers; [ scalavision ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sbt-${version}";
|
||||
version = "1.2.6";
|
||||
version = "1.2.7";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
|
||||
"https://cocl.us/sbt-${version}.tgz"
|
||||
];
|
||||
sha256 = "1nv8r3j2vhp38qbb123n86wfhb6mvwz7vgrrsjp344zg211psncn";
|
||||
sha256 = "10g7a1j2knbqmnbpvfhy1rqdg2pflmasz879ax59pv3mvgccn996";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
|
||||
name = "gnulib-20180226";
|
||||
|
||||
src = fetchgit {
|
||||
url = "http://git.savannah.gnu.org/r/gnulib.git";
|
||||
url = "https://git.savannah.gnu.org/r/gnulib.git";
|
||||
rev = "0bec5d56c6938c2f28417bb5fd1c4b05ea2e7d28";
|
||||
sha256 = "0sifr3bkmhyr5s6ljgfyr0fw6w49ajf11rlp1r797f3r3r6j9w4k";
|
||||
};
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/gnulib/;
|
||||
homepage = https://www.gnu.org/software/gnulib/;
|
||||
description = "Central location for code to be shared among GNU packages";
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
inter-language calls. It currently only supports generating Guile
|
||||
wrappers for C functions.
|
||||
'';
|
||||
homepage = "http://www.nongnu.org/g-wrap/";
|
||||
homepage = "https://www.nongnu.org/g-wrap/";
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = with maintainers; [ vyp ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
@@ -5,7 +5,7 @@ let version = "0.98"; in
|
||||
name = "fastjar-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.savannah.gnu.org/releases/fastjar/fastjar-${version}.tar.gz";
|
||||
url = "https://download.savannah.gnu.org/releases/fastjar/fastjar-${version}.tar.gz";
|
||||
sha256 = "0iginbz2m15hcsa3x4y7v3mhk54gr1r7m3ghx0pg4n46vv2snmpi";
|
||||
};
|
||||
|
||||
@@ -22,7 +22,7 @@ let version = "0.98"; in
|
||||
the stock `jar' program running without a JIT.
|
||||
'';
|
||||
|
||||
homepage = http://savannah.nongnu.org/projects/fastjar/;
|
||||
homepage = https://savannah.nongnu.org/projects/fastjar/;
|
||||
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
|
||||
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url="https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz";
|
||||
sha256="1a76f46a652i2g333kfvrl6mp2w7whf6h1yly519izg4y967h9cn";
|
||||
sha256="0wmapfskhzfwranf6515nzmm84r7kwljgfs7dg6bjgxakbicis2x";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "doc" "man" "dev" "lib" "out" ];
|
||||
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Archive of autoconf m4 macros";
|
||||
homepage = http://www.gnu.org/software/autoconf-archive/;
|
||||
homepage = https://www.gnu.org/software/autoconf-archive/;
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
postInstall = ''ln -s autoconf "$out"/bin/autoconf-2.13'';
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/autoconf/;
|
||||
homepage = https://www.gnu.org/software/autoconf/;
|
||||
description = "Part of the GNU Build System";
|
||||
branch = "2.13";
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
doInstallCheck = false; # fails
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/autoconf/;
|
||||
homepage = https://www.gnu.org/software/autoconf/;
|
||||
description = "Part of the GNU Build System";
|
||||
|
||||
longDescription = ''
|
||||
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
doInstallCheck = false; # fails
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/autoconf/;
|
||||
homepage = https://www.gnu.org/software/autoconf/;
|
||||
description = "Part of the GNU Build System";
|
||||
|
||||
longDescription = ''
|
||||
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Automated text and program generation tool";
|
||||
license = with licenses; [ gpl3Plus lgpl3Plus ];
|
||||
homepage = http://www.gnu.org/software/autogen/;
|
||||
homepage = https://www.gnu.org/software/autogen/;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is
|
||||
# available upstream; see
|
||||
# <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9026>.
|
||||
# <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=9026>.
|
||||
builder = ./builder.sh;
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
branch = "1.11";
|
||||
homepage = http://www.gnu.org/software/automake/;
|
||||
homepage = https://www.gnu.org/software/automake/;
|
||||
description = "GNU standard-compliant makefile generator";
|
||||
|
||||
longDescription = ''
|
||||
|
||||
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
branch = "1.15";
|
||||
homepage = http://www.gnu.org/software/automake/;
|
||||
homepage = https://www.gnu.org/software/automake/;
|
||||
description = "GNU standard-compliant makefile generator";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
download/upload/manipulate the ROM and EEPROM contents of AVR
|
||||
microcontrollers using the in-system programming technique (ISP).
|
||||
'';
|
||||
homepage = http://www.nongnu.org/avrdude/;
|
||||
homepage = https://www.nongnu.org/avrdude/;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
|
||||
@@ -150,7 +150,7 @@ stdenv.mkDerivation rec {
|
||||
They also include the BFD (Binary File Descriptor) library,
|
||||
`gprof', `nm', `strip', etc.
|
||||
'';
|
||||
homepage = http://www.gnu.org/software/binutils/;
|
||||
homepage = https://www.gnu.org/software/binutils/;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ericson2314 ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
license = licenses.gpl3Plus;
|
||||
|
||||
homepage = http://www.gnu.org/software/cflow/;
|
||||
homepage = https://www.gnu.org/software/cflow/;
|
||||
|
||||
maintainers = [ maintainers.vrthra ];
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
homepage = http://www.gnu.org/software/complexity/;
|
||||
homepage = https://www.gnu.org/software/complexity/;
|
||||
|
||||
platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
|
||||
maintainers = [ ];
|
||||
|
||||
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
homepage = http://savannah.gnu.org/projects/cppi/;
|
||||
homepage = https://savannah.gnu.org/projects/cppi/;
|
||||
|
||||
description = "A C preprocessor directive indenter";
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
patches = [ ./gcc44.patch ];
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/ddd;
|
||||
homepage = https://www.gnu.org/software/ddd;
|
||||
description = "Graphical front-end for command-line debuggers";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
|
||||
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
# details.
|
||||
|
||||
# The test-suite needs to have a non-empty stdin:
|
||||
# http://lists.gnu.org/archive/html/bug-dejagnu/2003-06/msg00002.html
|
||||
# https://lists.gnu.org/archive/html/bug-dejagnu/2003-06/msg00002.html
|
||||
checkPhase = ''
|
||||
# Provide `runtest' with a log name, otherwise it tries to run
|
||||
# `whoami', which fails when in a chroot.
|
||||
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
||||
Tool command language.
|
||||
'';
|
||||
|
||||
homepage = http://www.gnu.org/software/dejagnu/;
|
||||
homepage = https://www.gnu.org/software/dejagnu/;
|
||||
license = licenses.gpl2Plus;
|
||||
|
||||
platforms = platforms.unix;
|
||||
|
||||
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
|
||||
program was doing at the moment it crashed.
|
||||
'';
|
||||
|
||||
homepage = http://www.gnu.org/software/gdb/;
|
||||
homepage = https://www.gnu.org/software/gdb/;
|
||||
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
fills a struct
|
||||
'';
|
||||
|
||||
homepage = http://www.gnu.org/software/gengetopt/;
|
||||
homepage = https://www.gnu.org/software/gengetopt/;
|
||||
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
independence of any editor. It runs on a UNIX (POSIX) compatible
|
||||
operating system like GNU and BSD.
|
||||
'';
|
||||
homepage = http://www.gnu.org/software/global/;
|
||||
homepage = https://www.gnu.org/software/global/;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ pSub peterhoeg ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
patches = [ ./s_isdir.patch ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin stdenv.secure-format-patch;
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/m4/;
|
||||
homepage = https://www.gnu.org/software/m4/;
|
||||
description = "GNU M4, a macro processor";
|
||||
|
||||
longDescription = ''
|
||||
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
homepage = http://www.gnu.org/software/gperf/;
|
||||
homepage = https://www.gnu.org/software/gperf/;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
homepage = http://www.gnu.org/software/gperf/;
|
||||
homepage = https://www.gnu.org/software/gperf/;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
‘--version’ output of other commands.
|
||||
'';
|
||||
|
||||
homepage = http://www.gnu.org/software/help2man/;
|
||||
homepage = https://www.gnu.org/software/help2man/;
|
||||
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
|
||||
@@ -18,12 +18,12 @@ let
|
||||
shas =
|
||||
if enableUnfree
|
||||
then {
|
||||
"x86_64-linux" = "1kk97ggpzmblhqm6cfd2sv5940f58h323xcyg6rba1njj7lzanv0";
|
||||
"x86_64-darwin" = "1xvwffk8d8br92h0laf4b1m76kvki6cj0pbgcvirfcj1r70vk6c3";
|
||||
"x86_64-linux" = "0lip4bj3jazv83gydw99dnp03cb0fd1p4z3lvpjbisgmqffbbg5v";
|
||||
"x86_64-darwin" = "0hjdnqagcwbjhpcfyr6w0zmy4sjnx4fyp79czb0vp7dig5arnwm3";
|
||||
}
|
||||
else {
|
||||
"x86_64-linux" = "0m81ki1v61gpwb3s6zf84azqrirlm9pdfx65g3xmvdp3d3wii5ly";
|
||||
"x86_64-darwin" = "0zh9p6vsq1d0gh6ks7z6bh8sbhn6rm4jshjcfp3c9k7n2qa8vv9b";
|
||||
"x86_64-linux" = "1jybn4q7pz61iijzl85d948szlacfcbldn2nhhsb6063xwvf30sa";
|
||||
"x86_64-darwin" = "1bl1h6hgp9l5cjq6pzj2x855wjaka8hbs0fn2c03lbzsc991dppr";
|
||||
};
|
||||
|
||||
# For the correct phantomjs version see:
|
||||
@@ -47,6 +47,13 @@ in stdenv.mkDerivation rec {
|
||||
sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture");
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Kibana specifies it specifically needs nodejs 8.11.4 but nodejs in nixpkgs is at 8.12.0.
|
||||
# The <nixpkgs/nixos/tests/elk.nix> test succeeds with this newer version so lets just
|
||||
# disable the version check.
|
||||
./disable-nodejs-version-check.patch
|
||||
];
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
diff -Naur a/src/setup_node_env/node_version_validator.js b/src/setup_node_env/node_version_validator.js
|
||||
--- a/src/setup_node_env/node_version_validator.js 2018-11-16 03:28:42.000000000 +0100
|
||||
+++ b/src/setup_node_env/node_version_validator.js 2018-12-01 12:19:48.238337176 +0100
|
||||
@@ -26,7 +26,7 @@
|
||||
var currentVersion = process && process.version || null;
|
||||
var rawRequiredVersion = pkg && pkg.engines && pkg.engines.node || null;
|
||||
var requiredVersion = rawRequiredVersion ? 'v' + rawRequiredVersion : rawRequiredVersion;
|
||||
-var isVersionValid = !!currentVersion && !!requiredVersion && currentVersion === requiredVersion;
|
||||
+var isVersionValid = !!currentVersion && !!requiredVersion;
|
||||
|
||||
// Validates current the NodeJS version compatibility when Kibana starts.
|
||||
if (!isVersionValid) {
|
||||
@@ -35,4 +35,4 @@
|
||||
// Actions to apply when validation fails: error report + exit.
|
||||
console.error(errorMessage);
|
||||
process.exit(1);
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
documentation for details.
|
||||
'';
|
||||
|
||||
homepage = http://www.gnu.org/software/libtool/;
|
||||
homepage = https://www.gnu.org/software/libtool/;
|
||||
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
|
||||
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
documentation for details.
|
||||
'';
|
||||
|
||||
homepage = http://www.gnu.org/software/libtool/;
|
||||
homepage = https://www.gnu.org/software/libtool/;
|
||||
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "Perl script which converts Texinfo source files to HTML output";
|
||||
homepage = http://www.nongnu.org/texi2html/;
|
||||
homepage = https://www.nongnu.org/texi2html/;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [stdenv.lib.maintainers.marcweber];
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
&& !stdenv.isSunOS; # flaky
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/texinfo/;
|
||||
homepage = https://www.gnu.org/software/texinfo/;
|
||||
description = "The GNU documentation system";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
|
||||
meta = {
|
||||
description = "Tool for AVR microcontrollers which can interface to many hardware in-system programmers";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
homepage = http://savannah.nongnu.org/projects/uisp;
|
||||
homepage = https://savannah.nongnu.org/projects/uisp;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
# M4 = "${m4}/bin/m4";
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/bison/;
|
||||
homepage = https://www.gnu.org/software/bison/;
|
||||
description = "Yacc-compatible parser generator";
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
doInstallCheck = false; # fails
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/bison/;
|
||||
homepage = https://www.gnu.org/software/bison/;
|
||||
description = "Yacc-compatible parser generator";
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
|
||||
@@ -3,12 +3,12 @@
|
||||
let
|
||||
# Manually set version - the setup script requires
|
||||
# hg and git + keeping the .git directory around.
|
||||
pyre-version = "0.0.17"; # also change typeshed revision below with $pyre-src/.typeshed-version
|
||||
pyre-version = "0.0.18"; # also change typeshed revision below with $pyre-src/.typeshed-version
|
||||
pyre-src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "pyre-check";
|
||||
rev = "v${pyre-version}";
|
||||
sha256 = "0y86a3g5xbgh0byksyx5jw7yq7w840x85dhz9inz6mkg5j06mcis";
|
||||
sha256 = "1sy1lk9j3hq20dabfkr9s4r7prrcndrs345a5iqz6yzvakr4r74d";
|
||||
};
|
||||
versionFile = writeScript "version.ml" ''
|
||||
cat > "./version.ml" <<EOF
|
||||
@@ -21,6 +21,7 @@ let
|
||||
let log_version_banner () =
|
||||
Log.info "Running as pid: %d" (Pid.to_int (Unix.getpid ()));
|
||||
Log.info "Version: %s" (version ());
|
||||
Log.info "Build info: %s" (build_info ())
|
||||
EOF
|
||||
'';
|
||||
pyre-bin = stdenv.mkDerivation {
|
||||
@@ -28,8 +29,6 @@ let
|
||||
|
||||
src = pyre-src;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildInputs = with ocamlPackages; [
|
||||
ocaml
|
||||
findlib
|
||||
@@ -45,32 +44,29 @@ let
|
||||
# python36Packages.python36Full # TODO
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
preBuild = ''
|
||||
# build requires HOME to be set
|
||||
export HOME=.
|
||||
export HOME=$TMPDIR
|
||||
|
||||
# "external" because https://github.com/facebook/pyre-check/pull/8/files
|
||||
sed "s/%VERSION%/external/" dune.in > dune
|
||||
|
||||
cp ${versionFile} ./scripts/generate-version-number.sh
|
||||
ln -sf ${versionFile} ./scripts/generate-version-number.sh
|
||||
|
||||
mkdir $(pwd)/build
|
||||
export OCAMLFIND_DESTDIR=$(pwd)/build
|
||||
export OCAMLPATH=$OCAMLPATH:$(pwd)/build
|
||||
|
||||
make release
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
make test
|
||||
# ./scripts/run-python-tests.sh # TODO: once typeshed and python bits are added
|
||||
'';
|
||||
buildFlags = [ "release" ];
|
||||
|
||||
doCheck = true;
|
||||
# ./scripts/run-python-tests.sh # TODO: once typeshed and python bits are added
|
||||
|
||||
# Note that we're not installing the typeshed yet.
|
||||
# Improvement for a future version.
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp ./_build/default/main.exe $out/bin/pyre.bin
|
||||
install -D ./_build/default/main.exe $out/bin/pyre.bin
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://savannah.nongnu.org/projects/quilt;
|
||||
homepage = https://savannah.nongnu.org/projects/quilt;
|
||||
description = "Easily manage large numbers of patches";
|
||||
|
||||
longDescription = ''
|
||||
|
||||
@@ -4,16 +4,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
name = "rustup-${version}";
|
||||
version = "1.13.0";
|
||||
version = "1.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang-nursery";
|
||||
owner = "rust-lang";
|
||||
repo = "rustup.rs";
|
||||
rev = version;
|
||||
sha256 = "1h0786jx64nc9q8x6fv7a5sf1xijxhn02m2pq5v2grl9ks0vxidn";
|
||||
sha256 = "12d8z53vixrrbhvadw8fgifik0xi3hyfj1s75my8lcqwmij91gkn";
|
||||
};
|
||||
|
||||
cargoSha256 = "09lbm2k189sri3vwcwzv7j07ah39c8ajbpkg0kzvjsjwr7ypli8a";
|
||||
cargoSha256 = "0syp53s285ixshp6yswly0mwkcl0y2ddj5hc110irqsrvwgss32r";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, libusb, zlib }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "sunxi-tools-20171130";
|
||||
name = "sunxi-tools-20181113";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-sunxi";
|
||||
repo = "sunxi-tools";
|
||||
rev = "5c1971040c6c44caefb98e371bfca9e18d511da9";
|
||||
sha256 = "0qzm515i3dfn82a6sf7372080zb02d365z52bh0b1q711r4dvjgp";
|
||||
rev = "6d598a0ed714201380e78130213500be6512942b";
|
||||
sha256 = "1yhl6jfl2cws596ymkyhm8h9qkcvp67v8hlh081lsaqv1i8j9yig";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
|
||||
installTargets = [ "install-tools" "install-misc" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Tools for Allwinner A10 devices";
|
||||
description = "Tools for Allwinner SoC devices";
|
||||
homepage = http://linux-sunxi.org/;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
|
||||
Reference in New Issue
Block a user