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
2018-12-03 12:18:43 +01:00
parent 077b7e5880 e869896d00
commit a510aa2672
388 changed files with 3023 additions and 1285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/misc/autoconf-archive/default.nix
+1 -1
View File
@@ -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;
};
pkgs/development/tools/misc/autoconf/2.13.nix
+1 -1
View File
@@ -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";
pkgs/development/tools/misc/autoconf/2.64.nix
+1 -1
View File
@@ -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 = ''
pkgs/development/tools/misc/autoconf/default.nix
+1 -1
View File
@@ -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 = ''
pkgs/development/tools/misc/autogen/default.nix
+1 -1
View File
@@ -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 = [ ];
};
pkgs/development/tools/misc/automake/automake-1.11.x.nix
+2 -2
View File
@@ -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 = ''
pkgs/development/tools/misc/automake/automake-1.16.x.nix
+1 -1
View File
@@ -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;
pkgs/development/tools/misc/avrdude/default.nix
+1 -1
View File
@@ -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 ];
pkgs/development/tools/misc/binutils/default.nix
+1 -1
View File
@@ -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;
pkgs/development/tools/misc/cflow/default.nix
+1 -1
View File
@@ -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 ];
pkgs/development/tools/misc/complexity/default.nix
+1 -1
View File
@@ -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 = [ ];
pkgs/development/tools/misc/cppi/default.nix
+1 -1
View File
@@ -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";
pkgs/development/tools/misc/ddd/default.nix
+1 -1
View File
@@ -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;
pkgs/development/tools/misc/dejagnu/default.nix
+2 -2
View File
@@ -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;
pkgs/development/tools/misc/gdb/default.nix
+1 -1
View File
@@ -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;
pkgs/development/tools/misc/gengetopt/default.nix
+1 -1
View File
@@ -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;
pkgs/development/tools/misc/global/default.nix
+1 -1
View File
@@ -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;
pkgs/development/tools/misc/gnum4/default.nix
+1 -1
View File
@@ -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 = ''
pkgs/development/tools/misc/gperf/3.0.x.nix
+1 -1
View File
@@ -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;
};
}
pkgs/development/tools/misc/gperf/default.nix
+1 -1
View File
@@ -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;
};
}
pkgs/development/tools/misc/help2man/default.nix
+1 -1
View File
@@ -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;
pkgs/development/tools/misc/kibana/default.nix
+11 -4
View File
@@ -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 = ''
pkgs/development/tools/misc/kibana/disable-nodejs-version-check.patch
+19
View File
@@ -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
+}
pkgs/development/tools/misc/libtool/default.nix
+1 -1
View 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;
pkgs/development/tools/misc/libtool/libtool2.nix
+1 -1
View File
@@ -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;
pkgs/development/tools/misc/texi2html/default.nix
+1 -1
View File
@@ -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;
pkgs/development/tools/misc/texinfo/common.nix
+1 -1
View File
@@ -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;
pkgs/development/tools/misc/uisp/default.nix
+1 -1
View File
@@ -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;
};
}