From fab6a4376feab71e2a5630df98e6a5b42ac1ffc4 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Wed, 7 Nov 2018 13:23:11 +0100
Subject: [PATCH 001/115] nixos/triggerhappy: add option user
---
nixos/modules/services/hardware/triggerhappy.nix | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/nixos/modules/services/hardware/triggerhappy.nix b/nixos/modules/services/hardware/triggerhappy.nix
index 81d4a1ae65b..bffe7353b10 100644
--- a/nixos/modules/services/hardware/triggerhappy.nix
+++ b/nixos/modules/services/hardware/triggerhappy.nix
@@ -57,6 +57,15 @@ in
'';
};
+ user = mkOption {
+ type = types.str;
+ default = "nobody";
+ example = "root";
+ description = ''
+ User account under which <command>triggerhappy</command> runs.
+ '';
+ };
+
bindings = mkOption {
type = types.listOf (types.submodule bindingCfg);
default = [];
@@ -96,7 +105,7 @@ in
after = [ "local-fs.target" ];
description = "Global hotkey daemon";
serviceConfig = {
- ExecStart = "${pkgs.triggerhappy}/bin/thd --user nobody --socket ${socket} --triggers ${configFile} --deviceglob /dev/input/event*";
+ ExecStart = "${pkgs.triggerhappy}/bin/thd ${optionalString (cfg.user != "root") "--user ${cfg.user}"} --socket ${socket} --triggers ${configFile} --deviceglob /dev/input/event*";
};
};
From 142260c991ae62904fb6b675a9dc5198fb0a85c9 Mon Sep 17 00:00:00 2001
From: jpathy <15735913+jpathy@users.noreply.github.com>
Date: Mon, 4 Mar 2019 15:25:17 +0530
Subject: [PATCH 002/115] Zotero: Fix to use patchelf instead of FHS Env.
Removed buildFHSUserEnv to use `patchelf` on prebuilt binaries and libs. Should fix issue #48814.
---
pkgs/applications/office/zotero/default.nix | 168 +++++++++++++-------
1 file changed, 113 insertions(+), 55 deletions(-)
diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index 61e84e2be43..75a70fd9ff5 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -1,67 +1,125 @@
-{ stdenv, fetchurl, buildFHSUserEnv, makeDesktopItem, runCommand, bash, wrapGAppsHook, gsettings-desktop-schemas, gtk3, gnome3 }:
-
-let
-version = "5.0.60";
-meta = with stdenv.lib; {
- homepage = https://www.zotero.org;
- description = "Collect, organize, cite, and share your research sources";
- license = licenses.agpl3;
- platforms = platforms.linux;
-};
-
-zoteroSrc = stdenv.mkDerivation rec {
- inherit version;
- name = "zotero-${version}-pkg";
+{ stdenv, fetchurl, wrapGAppsHook
+, atk
+, cairo
+, curl
+, cups
+, dbus-glib
+, dbus
+, fontconfig
+, freetype
+, gdk_pixbuf
+, glib
+, glibc
+, gtk3
+, libX11
+, libXScrnSaver
+, libxcb
+, libXcomposite
+, libXcursor
+, libXdamage
+, libXext
+, libXfixes
+, libXi
+, libXinerama
+, libXrender
+, libXt
+, libnotify
+, gnome3
+, libGLU_combined
+, nspr
+, nss
+, pango
+, coreutils
+, gnused
+, gsettings-desktop-schemas
+}:
+stdenv.mkDerivation rec {
+ name = "zotero-${version}";
+ version = "5.0.60";
+
src = fetchurl {
url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
sha256 = "0753xk95shhxma4dvdxrj2q6y81z8lianxg7jnab9m17fb67jy2d";
};
-
+
buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ];
- phases = [ "unpackPhase" "installPhase" "fixupPhase"];
- installPhase = ''
- mkdir -p $out/data
- cp -r * $out/data
- mkdir $out/bin
- ln -s $out/data/zotero $out/bin/zotero
+ phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ];
+
+ dontStrip = true;
+ dontPatchELF = true;
+
+ libPath = stdenv.lib.makeLibraryPath
+ [ stdenv.cc.cc
+ atk
+ cairo
+ curl
+ cups
+ dbus-glib
+ dbus
+ fontconfig
+ freetype
+ gdk_pixbuf
+ glib
+ glibc
+ gtk3
+ libX11
+ libXScrnSaver
+ libXcomposite
+ libXcursor
+ libxcb
+ libXdamage
+ libXext
+ libXfixes
+ libXi
+ libXinerama
+ libXrender
+ libXt
+ libnotify
+ libGLU_combined
+ nspr
+ nss
+ pango
+ ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [
+ stdenv.cc.cc
+ ];
+
+ patchPhase = ''
+ sed -i '/pref("app.update.enabled", true);/c\pref("app.update.enabled", false);' defaults/preferences/prefs.js
'';
-};
-fhsEnv = buildFHSUserEnv {
- name = "zotero-fhs-env";
- targetPkgs = pkgs: with pkgs; with xorg; [
- gtk3 dbus-glib glib
- libXt nss
- libX11
- ];
-};
+ installPhase =
+ ''
+ mkdir -p "$prefix/usr/lib/zotero-bin-${version}"
+ cp -r * "$prefix/usr/lib/zotero-bin-${version}"
+ mkdir -p "$out/bin"
+ ln -s "$prefix/usr/lib/zotero-bin-${version}/zotero" "$out/bin/"
-desktopItem = makeDesktopItem rec {
- name = "zotero-${version}";
- exec = "zotero -url %U";
- icon = "zotero";
- type = "Application";
- comment = meta.description;
- desktopName = "Zotero";
- genericName = "Reference Management";
- categories = "Office;Database;";
- startupNotify = "true";
-};
+ install -Dm444 zotero.desktop $out/share/applications/zotero.desktop
+ for size in 16 32 48 256; do
+ install -Dm444 chrome/icons/default/default$size.png \
+ $out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png
+ done
-in runCommand "zotero-${version}" { inherit meta; } ''
- mkdir -p $out/bin $out/share/applications
- cat >$out/bin/zotero <<EOF
-#!${bash}/bin/bash
-${fhsEnv}/bin/zotero-fhs-env ${zoteroSrc}/bin/zotero
-EOF
- chmod +x $out/bin/zotero
+ for executable in \
+ zotero-bin plugin-container \
+ updater minidump-analyzer
+ do
+ if [ -e "$out/usr/lib/zotero-bin-${version}/$executable" ]; then
+ patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ "$out/usr/lib/zotero-bin-${version}/$executable"
+ fi
+ done
+ find . -executable -type f -exec \
+ patchelf --set-rpath "$libPath" \
+ "$out/usr/lib/zotero-bin-${version}/{}" \;
+ '';
- cp ${desktopItem}/share/applications/* $out/share/applications/
-
- for size in 16 32 48 256; do
- install -Dm444 ${zoteroSrc}/data/chrome/icons/default/default$size.png \
- $out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png
- done
-''
+ meta = with stdenv.lib; {
+ homepage = https://www.zotero.org;
+ description = "Collect, organize, cite, and share your research sources";
+ license = licenses.agpl3;
+ platforms = platforms.linux;
+ };
+}
From e3e0f79b9f2a349ab13b521e65ceaf0ce13a9671 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 10 Mar 2019 14:54:38 -0500
Subject: [PATCH 003/115] scribus: 1.4.7 -> 1.4.8, dep fixups
* Needs hunspell not aspell, not sure when
* bake in gs path to avoid warning on launch
* python-pillow for print preview, per README
https://www.scribus.net/scribus-1-4-8-released/
---
pkgs/applications/office/scribus/default.nix | 22 +++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix
index 434b4e64ee6..d6b73b07f0e 100644
--- a/pkgs/applications/office/scribus/default.nix
+++ b/pkgs/applications/office/scribus/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2
, libart_lgpl, qt4, python2, cups, fontconfig, libjpeg
-, zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake, imagemagick }:
+, zlib, libpng, xorg, cairo, podofo, hunspell, boost, cmake, imagemagick, ghostscript }:
let
icon = fetchurl {
@@ -8,27 +8,35 @@ let
sha256 = "0hq3i7c2l50445an9glhhg47kj26y16svfajc6naqn307ph9vzc3";
};
- pythonEnv = python2.withPackages(ps: [ps.tkinter]);
+ pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]);
in stdenv.mkDerivation rec {
- name = "scribus-1.4.7";
+ pname = "scribus";
+ version = "1.4.8";
src = fetchurl {
- url = "mirror://sourceforge/scribus/scribus/${name}.tar.xz";
- sha256 = "1v2ziq3k0yjz35nk5plcbc1jpi53p9v1cq1z3spch9lwlns3bls2";
+ url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.xz";
+ sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992";
};
enableParallelBuilding = true;
+ nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = with xorg;
- [ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt4
+ [ freetype lcms libtiff libxml2 libart_lgpl qt4
pythonEnv cups fontconfig
- libjpeg zlib libpng podofo aspell cairo
+ libjpeg zlib libpng podofo hunspell cairo
boost # for internal 2geom library
libXaw libXext libX11 libXtst libXi libXinerama
libpthreadstubs libXau libXdmcp
imagemagick # To build the icon
];
+ postPatch = ''
+ substituteInPlace scribus/util_ghostscript.cpp \
+ --replace 'QString gsName("gs");' \
+ 'QString gsName("${ghostscript}/bin/gs");'
+ '';
+
postInstall = ''
for i in 16 24 48 64 96 128 256 512; do
mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps
From 453c91af6e869e5cb0642260115a9df3ddee5394 Mon Sep 17 00:00:00 2001
From: jpathy <15735913+jpathy@users.noreply.github.com>
Date: Thu, 14 Mar 2019 09:56:39 +0530
Subject: [PATCH 004/115] Fix desktop file.
---
pkgs/applications/office/zotero/default.nix | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index 75a70fd9ff5..9ca46e6e7cd 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, wrapGAppsHook
+{ stdenv, fetchurl, wrapGAppsHook, makeDesktopItem
, atk
, cairo
, curl
@@ -89,6 +89,19 @@ stdenv.mkDerivation rec {
sed -i '/pref("app.update.enabled", true);/c\pref("app.update.enabled", false);' defaults/preferences/prefs.js
'';
+ desktopItem = makeDesktopItem rec {
+ name = "zotero-${version}";
+ exec = "zotero -url %U";
+ icon = "zotero";
+ type = "Application";
+ comment = meta.description;
+ desktopName = "Zotero";
+ genericName = "Reference Management";
+ categories = "Office;Database;";
+ startupNotify = "true";
+ mimeType = "text/plain";
+ };
+
installPhase =
''
mkdir -p "$prefix/usr/lib/zotero-bin-${version}"
@@ -96,7 +109,9 @@ stdenv.mkDerivation rec {
mkdir -p "$out/bin"
ln -s "$prefix/usr/lib/zotero-bin-${version}/zotero" "$out/bin/"
- install -Dm444 zotero.desktop $out/share/applications/zotero.desktop
+ # install desktop file and icons.
+ mkdir -p $out/share/applications
+ cp ${desktopItem}/share/applications/* $out/share/applications/
for size in 16 32 48 256; do
install -Dm444 chrome/icons/default/default$size.png \
$out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png
From 5072c519d124616caa3af9422e51562f304d8c50 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 19 Mar 2019 19:56:05 -0500
Subject: [PATCH 005/115] physfs: 3.0.1 -> 3.0.2
https://icculus.org/pipermail/physfs/2019-March/001280.html
---
pkgs/development/libraries/physfs/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix
index e29af17f35d..6edea7f5141 100644
--- a/pkgs/development/libraries/physfs/default.nix
+++ b/pkgs/development/libraries/physfs/default.nix
@@ -37,5 +37,5 @@ let
in {
physfs_2 = generic "2.0.3" "0sbbyqzqhyf0g68fcvvv20n3928j0x6ik1njmhn1yigvq2bj11na";
- physfs = generic "3.0.1" "1wgj2zqpnfbnyyi1i7bq5pshcc9n5cvwlpzp8im67nb8662ryyxp";
+ physfs = generic "3.0.2" "0qzqz4r88gvd8m7sh2z5hvqcr0jfr4wb2f77c19xycyn0rigfk9h";
}
From 928d51a9cbb3fee296da23fe297737147eb9bb05 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Wed, 20 Mar 2019 18:20:23 -0400
Subject: [PATCH 006/115] nvidia_x11: 418.43 -> 418.56
---
pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index c729a35925f..13b645c8089 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -22,10 +22,10 @@ rec {
beta = stable;
stable_418 = generic {
- version = "418.43";
- sha256_64bit = "0zrjd8wfc8cknfwiyy3llsnn1mympfxxszz7gzakncp3vs1jrghq";
- settingsSha256 = "1rzxxn7nrhwndl2lgjakxi0rblfkqjyl1n70fl7rcs6g75mi1qsq";
- persistencedSha256 = "14m4x5r0yc23sg4xx523ccfpxsr6dgm2n3xy9zdibl1cpzz50ikc";
+ version = "418.56";
+ sha256_64bit = "1cg7927g5ml1rwgpydlrjzr55gza5dfkqkch29bbarpzd7dh0mf4";
+ settingsSha256 = "1dai4dh6g3arkgicbjwhfr948i1xc13a7s0xcgalan0pn5zd56z6";
+ persistencedSha256 = "1r13jjpqg9ri5mw633k01dq2ivblc8nrbsnh7709v1xibaydwnhn";
};
# Last one supporting x86
From a8630eec1c034e0438099473a12a424ffc94ef36 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 27 Mar 2019 11:57:50 +0100
Subject: [PATCH 007/115] arora: Add license
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
pkgs/applications/networking/browsers/arora/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/applications/networking/browsers/arora/default.nix b/pkgs/applications/networking/browsers/arora/default.nix
index f9d5f01be20..32de4871186 100644
--- a/pkgs/applications/networking/browsers/arora/default.nix
+++ b/pkgs/applications/networking/browsers/arora/default.nix
@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.phreedom ];
description = "A cross-platform Qt4 Webkit browser";
homepage = https://github.com/Arora/arora;
+ license = with licenses; [ gpl2 gpl3 ];
};
}
From 9daa25fc967cad214778f4eaadbdede3ac56251f Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 27 Mar 2019 12:00:00 +0100
Subject: [PATCH 008/115] aspectj: Add license
Source: https://git.eclipse.org/c/aspectj/org.aspectj.git/tree/docs/build.xml#n7
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
pkgs/development/compilers/aspectj/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/development/compilers/aspectj/default.nix b/pkgs/development/compilers/aspectj/default.nix
index f9e79226033..4b216761259 100644
--- a/pkgs/development/compilers/aspectj/default.nix
+++ b/pkgs/development/compilers/aspectj/default.nix
@@ -16,5 +16,6 @@ stdenv.mkDerivation rec {
homepage = http://www.eclipse.org/aspectj/;
description = "A seamless aspect-oriented extension to the Java programming language";
platforms = stdenv.lib.platforms.unix;
+ license = stdenv.lib.licenses.epl10;
};
}
From 54f4958092eefe115ae6e4d17509f1fd340b93d0 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 27 Mar 2019 12:01:57 +0100
Subject: [PATCH 009/115] atanks: Add license
Source: https://sourceforge.net/p/atanks/atanks/ci/master/tree/COPYING
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
pkgs/games/atanks/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix
index 05b645ee326..de9eb9bbb58 100644
--- a/pkgs/games/atanks/default.nix
+++ b/pkgs/games/atanks/default.nix
@@ -18,5 +18,6 @@ stdenv.mkDerivation rec {
homepage = http://atanks.sourceforge.net/;
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
+ license = licenses.gpl2;
};
}
From 349921047e9e598bb2088df0694cc72a20f7b56c Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 27 Mar 2019 12:54:17 +0100
Subject: [PATCH 010/115] checkinstall: Add license
Source: http://checkinstall.izto.org/docs/LICENSE
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
pkgs/tools/package-management/checkinstall/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix
index df1bf794062..6605d9de65a 100644
--- a/pkgs/tools/package-management/checkinstall/default.nix
+++ b/pkgs/tools/package-management/checkinstall/default.nix
@@ -69,5 +69,6 @@ stdenv.mkDerivation {
description = "A tool for automatically generating Slackware, RPM or Debian packages when doing `make install'";
maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.gpl2;
};
}
From 099cc0482bc6d2857dc056a9f964b8ab7f3a67e9 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Fri, 29 Mar 2019 21:29:59 -0400
Subject: [PATCH 011/115] nixos/pantheon: enable lightdm gtk greeter
Pantheon's greeter has numerous issues that cannot be
fixed in a timely manner, and users are better off if they just
didn't use it by default.
---
nixos/doc/manual/release-notes/rl-1903.xml | 9 +++++++--
nixos/modules/services/x11/desktop-managers/pantheon.nix | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 7d40637df93..3821fa59e47 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -32,7 +32,7 @@
<note>
<para>
<varname>services.xserver.desktopManager.pantheon</varname> default
- enables lightdm as a display manager and using Pantheon's greeter.
+ enables lightdm as a display manager.
</para>
<para>
This is because of limitations with the screenlocking implementation,
@@ -50,7 +50,7 @@
</listitem>
<listitem>
<para>
- <option>services.xserver.displayManager.lightdm.greeters.pantheon.enable</option>
+ <option>services.xserver.displayManager.lightdm.greeters.gtk.enable</option>
</para>
</listitem>
</itemizedlist>
@@ -58,6 +58,11 @@
to <literal>false</literal> and enable your preferred display manager.
</para>
</note>
+ <para>
+ Also be aware that we haven't enabled lightdm with Pantheon's greeter by
+ default. That's because it has numerous issues in NixOS and isn't optimal
+ for use here yet.
+ </para>
</listitem>
<listitem>
<para>
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index d0278271409..69b0cdc986b 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -74,7 +74,7 @@ in
# Ensure lightdm is used when Pantheon is enabled
# Without it screen locking will be nonfunctional because of the use of lightlocker
services.xserver.displayManager.lightdm.enable = mkDefault true;
- services.xserver.displayManager.lightdm.greeters.pantheon.enable = mkDefault true;
+ services.xserver.displayManager.lightdm.greeters.gtk.enable = mkDefault true;
# If not set manually Pantheon session cannot be started
# Known issue of https://github.com/NixOS/nixpkgs/pull/43992
From 85fae046effb4518bdf220d152917a95bc72560a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 29 Mar 2019 22:38:43 -0500
Subject: [PATCH 012/115] vale: 1.3.2 -> 1.4.0
---
pkgs/tools/text/vale/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix
index cb1780a6903..7c21e621ea6 100644
--- a/pkgs/tools/text/vale/default.nix
+++ b/pkgs/tools/text/vale/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "vale-${version}";
- version = "1.3.2";
+ version = "1.4.0";
goPackagePath = "github.com/errata-ai/vale";
@@ -12,7 +12,7 @@ buildGoPackage rec {
owner = "errata-ai";
repo = "vale";
rev = "v${version}";
- sha256 = "0jpklca4m6wpndy6spj30s6ssb5y9ysyncxj7i6fg2g0m4dzzh8w";
+ sha256 = "05vrnmw7kpgxf2989jvmkwj9c3mv3zkr4z5rpmsplnhvgsnidg4g";
};
meta = with stdenv.lib; {
From c8dd7d49e76845689a4d20109dfb2e70167aad78 Mon Sep 17 00:00:00 2001
From: Albert Safin <xzfcpw@gmail.com>
Date: Sun, 31 Mar 2019 15:51:17 +0000
Subject: [PATCH 013/115] aria2: Add sphinx build dependency to generate man
pages
---
pkgs/tools/networking/aria2/default.nix | 8 ++++++--
pkgs/top-level/all-packages.nix | 1 +
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 2cf73532897..8d9ec928811 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, autoreconfHook
, openssl, c-ares, libxml2, sqlite, zlib, libssh2
-, cppunit
+, cppunit, sphinx
, Security
}:
@@ -23,13 +23,17 @@ stdenv.mkDerivation rec {
})
];
- nativeBuildInputs = [ pkgconfig autoreconfHook ];
+ nativeBuildInputs = [ pkgconfig autoreconfHook sphinx ];
buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ] ++
stdenv.lib.optional stdenv.isDarwin Security;
configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" ];
+ prePatch = ''
+ patchShebangs doc/manual-src/en/mkapiref.py
+ '';
+
checkInputs = [ cppunit ];
doCheck = false; # needs the net
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6789c250775..5e9dea0cbf0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -858,6 +858,7 @@ in
aria2 = callPackage ../tools/networking/aria2 {
inherit (darwin.apple_sdk.frameworks) Security;
+ inherit (pythonPackages) sphinx;
};
aria = aria2;
From 806a3fa2e64632ae2b78fda8d719bfdc80845a43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Maret?= <sebastien.maret@icloud.com>
Date: Mon, 1 Apr 2019 14:53:02 +0200
Subject: [PATCH 014/115] gildas: 20190301_b -> 20190401_a
---
pkgs/applications/science/astronomy/gildas/default.nix | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix
index 8c970440de5..3fe48ab26a2 100644
--- a/pkgs/applications/science/astronomy/gildas/default.nix
+++ b/pkgs/applications/science/astronomy/gildas/default.nix
@@ -7,16 +7,16 @@ let
in
stdenv.mkDerivation rec {
- srcVersion = "mar19b";
- version = "20190301_b";
+ srcVersion = "apr19a";
+ version = "20190401_a";
name = "gildas-${version}";
src = fetchurl {
# For each new release, the upstream developers of Gildas move the
# source code of the previous release to a different directory
- urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz"
- "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz" ];
- sha256 = "c3722863e7f3043e2d6e675557421c2eb0978fd21148386440d0139664d19f99";
+ urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
+ "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ];
+ sha256 = "0yb8dv41qsr5w2yci62phk6mrxbjlfxl4nnj7zndlyym2i5ni89c";
};
enableParallelBuilding = true;
From 6b6348eabaaaf37f8d8a99e3e879eff0f4ca6467 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 2 Apr 2019 16:02:53 +0200
Subject: [PATCH 015/115] nixos/roundcube: only configure postgres config if
localhost is used as database
When using a different database, the evaluation fails as
`config.services.postgresql.package` is only set if `services.postgresql` is enabled.
Also, the systemd service shouldn't have a relation to postgres if a
remote database is used.
---
nixos/modules/services/mail/roundcube.nix | 44 ++++++++++++-----------
1 file changed, 24 insertions(+), 20 deletions(-)
diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix
index 66b1c1e3e6f..e8b2e11bf72 100644
--- a/nixos/modules/services/mail/roundcube.nix
+++ b/nixos/modules/services/mail/roundcube.nix
@@ -141,27 +141,31 @@ in
systemd.services.roundcube-setup = let
pgSuperUser = config.services.postgresql.superUser;
- in {
- requires = [ "postgresql.service" ];
- after = [ "postgresql.service" ];
- wantedBy = [ "multi-user.target" ];
- path = [ config.services.postgresql.package ];
- script = ''
- mkdir -p /var/lib/roundcube
- if [ ! -f /var/lib/roundcube/db-created ]; then
- if [ "${cfg.database.host}" = "localhost" ]; then
- ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create role ${cfg.database.username} with login password '${cfg.database.password}'";
- ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create database ${cfg.database.dbname} with owner ${cfg.database.username}";
+ in mkMerge [
+ (mkIf (cfg.database.host == "localhost") {
+ requires = [ "postgresql.service" ];
+ after = [ "postgresql.service" ];
+ path = [ config.services.postgresql.package ];
+ })
+ {
+ wantedBy = [ "multi-user.target" ];
+ script = ''
+ mkdir -p /var/lib/roundcube
+ if [ ! -f /var/lib/roundcube/db-created ]; then
+ if [ "${cfg.database.host}" = "localhost" ]; then
+ ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create role ${cfg.database.username} with login password '${cfg.database.password}'";
+ ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create database ${cfg.database.dbname} with owner ${cfg.database.username}";
+ fi
+ PGPASSWORD=${cfg.database.password} ${pkgs.postgresql}/bin/psql -U ${cfg.database.username} \
+ -f ${cfg.package}/SQL/postgres.initial.sql \
+ -h ${cfg.database.host} ${cfg.database.dbname}
+ touch /var/lib/roundcube/db-created
fi
- PGPASSWORD=${cfg.database.password} ${pkgs.postgresql}/bin/psql -U ${cfg.database.username} \
- -f ${cfg.package}/SQL/postgres.initial.sql \
- -h ${cfg.database.host} ${cfg.database.dbname}
- touch /var/lib/roundcube/db-created
- fi
- ${pkgs.php}/bin/php ${cfg.package}/bin/update.sh
- '';
- serviceConfig.Type = "oneshot";
- };
+ ${pkgs.php}/bin/php ${cfg.package}/bin/update.sh
+ '';
+ serviceConfig.Type = "oneshot";
+ }
+ ];
};
}
From 324e6dba04ae636e10ac3cf72689fee9e578e530 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 2 Apr 2019 16:25:31 +0200
Subject: [PATCH 016/115] roundcube: don't resolve symlinks in update.sh
A side-effect of this is that the derivation required a rewrite in order
to apply the patch properly.
---
...mlinks-when-trying-to-find-INSTALL_P.patch | 27 +++++++++++++++++++
pkgs/servers/roundcube/default.nix | 23 ++++++++++------
2 files changed, 42 insertions(+), 8 deletions(-)
create mode 100644 pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch
diff --git a/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch b/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch
new file mode 100644
index 00000000000..96710d6162d
--- /dev/null
+++ b/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch
@@ -0,0 +1,27 @@
+From c1832eabb99cec47f1714f696275285e1e28da34 Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch <maximilian@mbosch.me>
+Date: Tue, 2 Apr 2019 16:20:50 +0200
+Subject: [PATCH] Don't resolve symlinks when trying to find INSTALL_PATH
+
+Nix specific patch. This behavior breaks roundcube setups where plugins
+are in a store path with symlinks to the actual source.
+---
+ bin/update.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/update.sh b/bin/update.sh
+index 08e3bb5..b2ad498 100755
+--- a/bin/update.sh
++++ b/bin/update.sh
+@@ -19,7 +19,7 @@
+ +-----------------------------------------------------------------------+
+ */
+
+-define('INSTALL_PATH', realpath(__DIR__ . '/..') . '/' );
++define('INSTALL_PATH', __DIR__ . '/../' );
+
+ require_once INSTALL_PATH . 'program/include/clisetup.php';
+
+--
+2.19.2
+
diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix
index cda5ae1d6c5..685e856644e 100644
--- a/pkgs/servers/roundcube/default.nix
+++ b/pkgs/servers/roundcube/default.nix
@@ -1,14 +1,21 @@
-{ lib, stdenv, fetchzip, buildEnv, roundcube, roundcubePlugins }:
-let
+{ lib, fetchurl, stdenv, buildEnv, roundcube, roundcubePlugins }:
+
+stdenv.mkDerivation rec {
+ pname = "roundcube";
version = "1.3.8";
-in
-fetchzip rec {
- name= "roundcube-${version}";
- url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
- sha256 = "1lhwr13bglm8rqgamnb480b07wpqhw9bskjj2xxb0x8kdjly29ks";
+ src = fetchurl {
+ url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
+ sha256 = "018djad7ygfl9c9f2l2j42qkg31ml3hs2f01f0dk361zckwk77n4";
+ };
- extraPostFetch = ''
+ patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];
+
+ dontBuild = true;
+
+ installPhase = ''
+ mkdir $out
+ cp -r * $out/
ln -sf /etc/roundcube/config.inc.php $out/config/config.inc.php
rm -rf $out/installer
'';
From 0dd9a8f658f87e0c11e3406a7276967b5d2fda32 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@xing.com>
Date: Fri, 5 Apr 2019 12:03:47 +0200
Subject: [PATCH 017/115] pidgin: fix gst plugin path for audio/video
---
.../networking/instant-messengers/pidgin/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 12348fe548c..8b6863384b3 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -62,7 +62,7 @@ let unwrapped = stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/pidgin \
- --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
+ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
'';
meta = with stdenv.lib; {
From b6b3287897170386c204e871aba64aaa2ded46e3 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 6 Apr 2019 08:17:52 -0400
Subject: [PATCH 018/115] redmine: 3.4.9 -> 3.4.10
---
.../version-management/redmine/Gemfile | 2 +-
.../version-management/redmine/Gemfile.lock | 66 +++++++++----------
.../version-management/redmine/default.nix | 4 +-
.../version-management/redmine/gemset.nix | 48 +++++++-------
4 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile
index 15662f56015..5a0283e20ed 100644
--- a/pkgs/applications/version-management/redmine/Gemfile
+++ b/pkgs/applications/version-management/redmine/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
gem "bundler", ">= 1.5.0", "< 2.0.0"
-gem "rails", "4.2.11"
+gem "rails", "4.2.11.1"
gem "addressable", "2.4.0" if RUBY_VERSION < "2.0"
if RUBY_VERSION < "2.1"
gem "public_suffix", (RUBY_VERSION < "2.0" ? "~> 1.4" : "~> 2.0.5")
diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock
index eb3e0ee73bb..888175335a7 100644
--- a/pkgs/applications/version-management/redmine/Gemfile.lock
+++ b/pkgs/applications/version-management/redmine/Gemfile.lock
@@ -1,38 +1,38 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (4.2.11)
- actionpack (= 4.2.11)
- actionview (= 4.2.11)
- activejob (= 4.2.11)
+ actionmailer (4.2.11.1)
+ actionpack (= 4.2.11.1)
+ actionview (= 4.2.11.1)
+ activejob (= 4.2.11.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
- actionpack (4.2.11)
- actionview (= 4.2.11)
- activesupport (= 4.2.11)
+ actionpack (4.2.11.1)
+ actionview (= 4.2.11.1)
+ activesupport (= 4.2.11.1)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionpack-xml_parser (1.0.2)
actionpack (>= 4.0.0, < 5)
- actionview (4.2.11)
- activesupport (= 4.2.11)
+ actionview (4.2.11.1)
+ activesupport (= 4.2.11.1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (4.2.11)
- activesupport (= 4.2.11)
+ activejob (4.2.11.1)
+ activesupport (= 4.2.11.1)
globalid (>= 0.3.0)
- activemodel (4.2.11)
- activesupport (= 4.2.11)
+ activemodel (4.2.11.1)
+ activesupport (= 4.2.11.1)
builder (~> 3.1)
- activerecord (4.2.11)
- activemodel (= 4.2.11)
- activesupport (= 4.2.11)
+ activerecord (4.2.11.1)
+ activemodel (= 4.2.11.1)
+ activesupport (= 4.2.11.1)
arel (~> 6.0)
- activesupport (4.2.11)
+ activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
@@ -51,7 +51,7 @@ GEM
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
coderay (1.1.2)
- concurrent-ruby (1.1.4)
+ concurrent-ruby (1.1.5)
crass (1.0.4)
css_parser (1.7.0)
addressable
@@ -73,7 +73,7 @@ GEM
metaclass (0.0.4)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
- mime-types-data (3.2018.0812)
+ mime-types-data (3.2019.0331)
mimemagic (0.3.3)
mini_mime (1.0.1)
mini_portile2 (2.3.0)
@@ -95,16 +95,16 @@ GEM
ruby-openid (>= 2.1.8)
rack-test (0.6.3)
rack (>= 1.0)
- rails (4.2.11)
- actionmailer (= 4.2.11)
- actionpack (= 4.2.11)
- actionview (= 4.2.11)
- activejob (= 4.2.11)
- activemodel (= 4.2.11)
- activerecord (= 4.2.11)
- activesupport (= 4.2.11)
+ rails (4.2.11.1)
+ actionmailer (= 4.2.11.1)
+ actionpack (= 4.2.11.1)
+ actionview (= 4.2.11.1)
+ activejob (= 4.2.11.1)
+ activemodel (= 4.2.11.1)
+ activerecord (= 4.2.11.1)
+ activesupport (= 4.2.11.1)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.2.11)
+ railties (= 4.2.11.1)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
@@ -114,9 +114,9 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
- railties (4.2.11)
- actionpack (= 4.2.11)
- activesupport (= 4.2.11)
+ railties (4.2.11.1)
+ actionpack (= 4.2.11.1)
+ activesupport (= 4.2.11.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.2)
@@ -161,7 +161,7 @@ GEM
websocket (1.2.8)
xpath (3.2.0)
nokogiri (~> 1.8)
- yard (0.9.18)
+ yard (0.9.19)
PLATFORMS
ruby
@@ -184,7 +184,7 @@ DEPENDENCIES
pg (~> 0.18.1)
protected_attributes
rack-openid
- rails (= 4.2.11)
+ rails (= 4.2.11.1)
rails-dom-testing
rails-html-sanitizer (>= 1.0.3)
rbpdf (~> 1.19.6)
diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix
index ab0b113bf87..12f3d18a32c 100644
--- a/pkgs/applications/version-management/redmine/default.nix
+++ b/pkgs/applications/version-management/redmine/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, bundlerEnv, ruby }:
let
- version = "3.4.9";
+ version = "3.4.10";
rubyEnv = bundlerEnv {
name = "redmine-env-${version}";
@@ -15,7 +15,7 @@ in
src = fetchurl {
url = "https://www.redmine.org/releases/${name}.tar.gz";
- sha256 = "1f7sgyka21cjkvmdqkkwrx1hn0b38yq4b7283vw858fccp0l2vy2";
+ sha256 = "08clfg7wgp4wnajawdn7qgrv7r8lk8d8haqkl7iz77ygdi3mpyrh";
};
buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ];
diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix
index bdf1b55a732..87b0b0b4f7a 100644
--- a/pkgs/applications/version-management/redmine/gemset.nix
+++ b/pkgs/applications/version-management/redmine/gemset.nix
@@ -3,19 +3,19 @@
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zkklsh7ymhvdm5p9fr5ycd39d5caassag8yq0dga9cbk7fps74m";
+ sha256 = "18wwlj4f7jffv3vxm80d2z36nwza95l5xfcqc401hvvrls4xzhsy";
type = "gem";
};
- version = "4.2.11";
+ version = "4.2.11.1";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13xkil3y7gjj0m4ky14asi4m08x69wwv63wfn0h95wli4x8h8w7r";
+ sha256 = "0rmldsk3a4lwxk0lrp6x1nz1v1r2xmbm3300l4ghgfygv3grdwjh";
type = "gem";
};
- version = "4.2.11";
+ version = "4.2.11.1";
};
actionpack-xml_parser = {
dependencies = ["actionpack"];
@@ -30,46 +30,46 @@
dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09vwq0xgxxhssxxh8fa7l2pv6a56smw3v6gvb9l1mycmf8vprd4b";
+ sha256 = "0x7vjn8q6blzyf7j3kwg0ciy7vnfh28bjdkd1mp9k4ghp9jn0g9p";
type = "gem";
};
- version = "4.2.11";
+ version = "4.2.11.1";
};
activejob = {
dependencies = ["activesupport" "globalid"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12yqs22f4lz20nw6djsrkhii3p3nfpd51nw0lhvnczx0q8kl0nyk";
+ sha256 = "0jy1c1r6syjqpa0sh9f1p4iaxzvp6qg4n6zs774j9z27q7h407mj";
type = "gem";
};
- version = "4.2.11";
+ version = "4.2.11.1";
};
activemodel = {
dependencies = ["activesupport" "builder"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "11aqvabf5c1pgb404f5bqp1i7mxkyhzmwk6y8zm5w6rf4nq095mq";
+ sha256 = "1c1x0rd6wnk1f0gsmxs6x3gx7yf6fs9qqkdv7r4hlbcdd849in33";
type = "gem";
};
- version = "4.2.11";
+ version = "4.2.11.1";
};
activerecord = {
dependencies = ["activemodel" "activesupport" "arel"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1sw0m19cnasbr4cabvc302hjddc3s6fja3fr0gbj9h2n8b3633i5";
+ sha256 = "07ixiwi0zzs9skqarvpfamsnay7npfswymrn28ngxaf8hi279q5p";
type = "gem";
};
- version = "4.2.11";
+ version = "4.2.11.1";
};
activesupport = {
dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0pqr25wmhvvlg8av7bi5p5c7r5464clhhhhv45j63bh7xw4ad6n4";
+ sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6";
type = "gem";
};
- version = "4.2.11";
+ version = "4.2.11.1";
};
addressable = {
dependencies = ["public_suffix"];
@@ -125,10 +125,10 @@
concurrent-ruby = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1";
+ sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
type = "gem";
};
- version = "1.1.4";
+ version = "1.1.5";
};
crass = {
source = {
@@ -243,10 +243,10 @@
mime-types-data = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc";
+ sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
type = "gem";
};
- version = "3.2018.0812";
+ version = "3.2019.0331";
};
mimemagic = {
source = {
@@ -377,10 +377,10 @@
dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0rhp1l5klw8alqnzji2p4w01x7ygsfnzc7mf87ncr2jlizmgy4nx";
+ sha256 = "1ywvis59dd3v8qapi9ix6743zgk07l21x1cd6nb1ddpahxhm7dml";
type = "gem";
};
- version = "4.2.11";
+ version = "4.2.11.1";
};
rails-deprecated_sanitizer = {
dependencies = ["activesupport"];
@@ -413,10 +413,10 @@
dependencies = ["actionpack" "activesupport" "rake" "thor"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09x32zkxs0vfi4y0bjrqd61821kx2azwhdxvk2ygqj4yvxfh11i1";
+ sha256 = "1bjf21z9maiiazc1if56nnh9xmgbkcqlpznv34f40a1hsvgk1d1m";
type = "gem";
};
- version = "4.2.11";
+ version = "4.2.11.1";
};
rake = {
source = {
@@ -607,9 +607,9 @@
yard = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07fykkfyrwqkfnxx9i5w6adyiadz00h497c516n96rgvs7alc74f";
+ sha256 = "1w0i13a0vsw4jmlj59xn64rdsqcsl9r3rmjjgdca5i51m1q4ix6v";
type = "gem";
};
- version = "0.9.18";
+ version = "0.9.19";
};
}
\ No newline at end of file
From a597c88ec13c79219cdb7404e216fd9e58a57bb4 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 6 Apr 2019 08:16:37 -0400
Subject: [PATCH 019/115] redmine: 4.0.2 -> 4.0.3
---
.../version-management/redmine/4.x/Gemfile | 2 +-
.../redmine/4.x/Gemfile.lock | 86 +++++++++----------
.../redmine/4.x/default.nix | 4 +-
.../version-management/redmine/4.x/gemset.nix | 68 +++++++--------
4 files changed, 80 insertions(+), 80 deletions(-)
diff --git a/pkgs/applications/version-management/redmine/4.x/Gemfile b/pkgs/applications/version-management/redmine/4.x/Gemfile
index babcfe75ed7..952dd8bda4d 100644
--- a/pkgs/applications/version-management/redmine/4.x/Gemfile
+++ b/pkgs/applications/version-management/redmine/4.x/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
gem "bundler", ">= 1.5.0"
-gem "rails", "5.2.2"
+gem "rails", "5.2.2.1"
gem "rouge", "~> 3.3.0"
gem "request_store", "1.0.5"
gem "mini_mime", "~> 1.0.1"
diff --git a/pkgs/applications/version-management/redmine/4.x/Gemfile.lock b/pkgs/applications/version-management/redmine/4.x/Gemfile.lock
index 26df0e1506a..215704e5b38 100644
--- a/pkgs/applications/version-management/redmine/4.x/Gemfile.lock
+++ b/pkgs/applications/version-management/redmine/4.x/Gemfile.lock
@@ -1,19 +1,19 @@
GEM
remote: https://rubygems.org/
specs:
- actioncable (5.2.2)
- actionpack (= 5.2.2)
+ actioncable (5.2.2.1)
+ actionpack (= 5.2.2.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
- actionmailer (5.2.2)
- actionpack (= 5.2.2)
- actionview (= 5.2.2)
- activejob (= 5.2.2)
+ actionmailer (5.2.2.1)
+ actionpack (= 5.2.2.1)
+ actionview (= 5.2.2.1)
+ activejob (= 5.2.2.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (5.2.2)
- actionview (= 5.2.2)
- activesupport (= 5.2.2)
+ actionpack (5.2.2.1)
+ actionview (= 5.2.2.1)
+ activesupport (= 5.2.2.1)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
@@ -21,26 +21,26 @@ GEM
actionpack-xml_parser (2.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
- actionview (5.2.2)
- activesupport (= 5.2.2)
+ actionview (5.2.2.1)
+ activesupport (= 5.2.2.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (5.2.2)
- activesupport (= 5.2.2)
+ activejob (5.2.2.1)
+ activesupport (= 5.2.2.1)
globalid (>= 0.3.6)
- activemodel (5.2.2)
- activesupport (= 5.2.2)
- activerecord (5.2.2)
- activemodel (= 5.2.2)
- activesupport (= 5.2.2)
+ activemodel (5.2.2.1)
+ activesupport (= 5.2.2.1)
+ activerecord (5.2.2.1)
+ activemodel (= 5.2.2.1)
+ activesupport (= 5.2.2.1)
arel (>= 9.0)
- activestorage (5.2.2)
- actionpack (= 5.2.2)
- activerecord (= 5.2.2)
+ activestorage (5.2.2.1)
+ actionpack (= 5.2.2.1)
+ activerecord (= 5.2.2.1)
marcel (~> 0.3.1)
- activesupport (5.2.2)
+ activesupport (5.2.2.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@@ -58,11 +58,11 @@ GEM
xpath (>= 2.0, < 4.0)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
- concurrent-ruby (1.1.4)
+ concurrent-ruby (1.1.5)
crass (1.0.4)
css_parser (1.7.0)
addressable
- csv (3.0.4)
+ csv (3.0.6)
docile (1.1.5)
erubi (1.8.0)
ffi (1.10.0)
@@ -89,38 +89,38 @@ GEM
mysql2 (0.5.2)
net-ldap (0.16.1)
nio4r (2.3.1)
- nokogiri (1.10.1)
+ nokogiri (1.10.2)
mini_portile2 (~> 2.4.0)
pg (1.1.4)
public_suffix (3.0.3)
- puma (3.12.0)
- rack (2.0.6)
+ puma (3.12.1)
+ rack (2.0.7)
rack-openid (1.4.2)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
rack-test (1.1.0)
rack (>= 1.0, < 3)
- rails (5.2.2)
- actioncable (= 5.2.2)
- actionmailer (= 5.2.2)
- actionpack (= 5.2.2)
- actionview (= 5.2.2)
- activejob (= 5.2.2)
- activemodel (= 5.2.2)
- activerecord (= 5.2.2)
- activestorage (= 5.2.2)
- activesupport (= 5.2.2)
+ rails (5.2.2.1)
+ actioncable (= 5.2.2.1)
+ actionmailer (= 5.2.2.1)
+ actionpack (= 5.2.2.1)
+ actionview (= 5.2.2.1)
+ activejob (= 5.2.2.1)
+ activemodel (= 5.2.2.1)
+ activerecord (= 5.2.2.1)
+ activestorage (= 5.2.2.1)
+ activesupport (= 5.2.2.1)
bundler (>= 1.3.0)
- railties (= 5.2.2)
+ railties (= 5.2.2.1)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
- railties (5.2.2)
- actionpack (= 5.2.2)
- activesupport (= 5.2.2)
+ railties (5.2.2.1)
+ actionpack (= 5.2.2.1)
+ activesupport (= 5.2.2.1)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
@@ -165,7 +165,7 @@ GEM
websocket-extensions (0.1.3)
xpath (3.2.0)
nokogiri (~> 1.8)
- yard (0.9.18)
+ yard (0.9.19)
PLATFORMS
ruby
@@ -186,7 +186,7 @@ DEPENDENCIES
pg (~> 1.1.4)
puma (~> 3.7)
rack-openid
- rails (= 5.2.2)
+ rails (= 5.2.2.1)
rails-dom-testing
rbpdf (~> 1.19.6)
redcarpet (~> 3.4.0)
diff --git a/pkgs/applications/version-management/redmine/4.x/default.nix b/pkgs/applications/version-management/redmine/4.x/default.nix
index 04adc31a886..82a994478cd 100644
--- a/pkgs/applications/version-management/redmine/4.x/default.nix
+++ b/pkgs/applications/version-management/redmine/4.x/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, bundlerEnv, ruby }:
let
- version = "4.0.2";
+ version = "4.0.3";
rubyEnv = bundlerEnv {
name = "redmine-env-${version}";
@@ -15,7 +15,7 @@ in
src = fetchurl {
url = "https://www.redmine.org/releases/${name}.tar.gz";
- sha256 = "0v00f6m7si0ca0bmh6h7mx8yz1pl4zql2c8abavya57j97mi8182";
+ sha256 = "1wyfl08sq71n4c2hc0fv1dfblykq5i3mbqyjdswk26md8dcmw8ac";
};
buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ];
diff --git a/pkgs/applications/version-management/redmine/4.x/gemset.nix b/pkgs/applications/version-management/redmine/4.x/gemset.nix
index afda745241e..53c2d73b6e9 100644
--- a/pkgs/applications/version-management/redmine/4.x/gemset.nix
+++ b/pkgs/applications/version-management/redmine/4.x/gemset.nix
@@ -3,28 +3,28 @@
dependencies = ["actionpack" "nio4r" "websocket-driver"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0826k5ch0l03f9yrkxy69aiv039z4qi00lnahw2rzywd2iz6r68x";
+ sha256 = "1x5fxhsr2mxq5r6258s48xsn7ld081d3qaavppvj7yp7w9vqn871";
type = "gem";
};
- version = "5.2.2";
+ version = "5.2.2.1";
};
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0sfpb8s95cmkpp9ybyp2c88r55r5llscmmnkfwcwgasz9ncjiq5n";
+ sha256 = "10n2v2al68rsq5ghrdp7cpycsc1q0m19fcd8cd5i528n30nl23iw";
type = "gem";
};
- version = "5.2.2";
+ version = "5.2.2.1";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0iwhbqqn0cm39dq040iwq8cfyclqk3kyzwlp5k3j5cz8k2668wws";
+ sha256 = "1lxqzxa728dqg42yw0q4hqkaawqagiw1k0392an2ghjfgb16pafx";
type = "gem";
};
- version = "5.2.2";
+ version = "5.2.2.1";
};
actionpack-xml_parser = {
dependencies = ["actionpack" "railties"];
@@ -39,55 +39,55 @@
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1lz04drbi1z0xhvb8jnr14pbf505lilr02arahxq7y3mxiz0rs8z";
+ sha256 = "0832vlx37rly8ryfgi01b20mld8b3bv9cg62n5wax4zpzgn6jdxb";
type = "gem";
};
- version = "5.2.2";
+ version = "5.2.2.1";
};
activejob = {
dependencies = ["activesupport" "globalid"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jjkl62x2aprg55x9rpm0h2c82vr2qr989hg3l9r21l01q4822ir";
+ sha256 = "1zma452lc3qp4a7r10zbdmsci0kv9a3gnk4da2apbdrc8fib5mr3";
type = "gem";
};
- version = "5.2.2";
+ version = "5.2.2.1";
};
activemodel = {
dependencies = ["activesupport"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1xmwi3mw8g4shbjvkhk72ra3r5jccbdsd4piphqka2y1h8s7sxvi";
+ sha256 = "1idmvqvpgri34k31s44pjb88rc3jad3yxra7fd1kpidpnv5f3v65";
type = "gem";
};
- version = "5.2.2";
+ version = "5.2.2.1";
};
activerecord = {
dependencies = ["activemodel" "activesupport" "arel"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19a0sns6a5wz2wym25lb1dv4lbrrl5sd1n15s5ky2636znmhz30y";
+ sha256 = "1c5cz9v7ggpqjxf0fqs1xhy1pb9m34cp31pxarhs9aqb71qjl98v";
type = "gem";
};
- version = "5.2.2";
+ version = "5.2.2.1";
};
activestorage = {
dependencies = ["actionpack" "activerecord" "marcel"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0c72837098sw384vk6dmrb2p7q3wx4swnibk6sw9dp4hn1vc4p31";
+ sha256 = "155xpbzrz0kr0argx0vsh5prvadd2h1g1m61kdiabvfy2iygc02n";
type = "gem";
};
- version = "5.2.2";
+ version = "5.2.2.1";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1iya7vxqwxysr74s7b4z1x19gmnx5advimzip3cbmsd5bd43wfgz";
+ sha256 = "161bp4p01v1a1lvszrhd1a02zf9x1p1l1yhw79a3rix1kvzkkdqb";
type = "gem";
};
- version = "5.2.2";
+ version = "5.2.2.1";
};
addressable = {
dependencies = ["public_suffix"];
@@ -135,10 +135,10 @@
concurrent-ruby = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1";
+ sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
type = "gem";
};
- version = "1.1.4";
+ version = "1.1.5";
};
crass = {
source = {
@@ -160,10 +160,10 @@
csv = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19m22vlxddva301z2izvg06hldlc37nyzhin3kjjfcnlbb8imj33";
+ sha256 = "1zvchwfkdkljnslqakagbnw76vs01xwpjrynrawfanzn376c6bcd";
type = "gem";
};
- version = "3.0.4";
+ version = "3.0.6";
};
docile = {
source = {
@@ -334,10 +334,10 @@
dependencies = ["mini_portile2"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184";
+ sha256 = "0sy96cc8i5y4p67fhf4d9c6sg8ymrrva21zyvzw55l0pa1582wx2";
type = "gem";
};
- version = "1.10.1";
+ version = "1.10.2";
};
pg = {
source = {
@@ -358,18 +358,18 @@
puma = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1k7dqxnq0dnf5rxkgs9rknclkn3ah7lsdrk6nrqxla8qzy31wliq";
+ sha256 = "1pkrbvak6rlf147qpd4zss031qrwwh53g8s6017037iwg0436kv3";
type = "gem";
};
- version = "3.12.0";
+ version = "3.12.1";
};
rack = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm";
+ sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i";
type = "gem";
};
- version = "2.0.6";
+ version = "2.0.7";
};
rack-openid = {
dependencies = ["rack" "ruby-openid"];
@@ -393,10 +393,10 @@
dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1m9cszds68dsiycciiayd3c9g90s2yzn1izkr3gpgqkfw6dmvzyr";
+ sha256 = "1jxmwrykwgbn116hhmi7h75hcsdifhj89wk12m7ch2f3mn1lrmp9";
type = "gem";
};
- version = "5.2.2";
+ version = "5.2.2.1";
};
rails-dom-testing = {
dependencies = ["activesupport" "nokogiri"];
@@ -420,10 +420,10 @@
dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00pnylmbz4c46mxw5lhxi8h39lndfg6fs1hpd0qd6swnjhkqsr1l";
+ sha256 = "0al6mvh2jvr3n7cxkx0yvhgiiarby6gxc93vl5xg1yxkvx27qzd6";
type = "gem";
};
- version = "5.2.2";
+ version = "5.2.2.1";
};
rake = {
source = {
@@ -614,9 +614,9 @@
yard = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07fykkfyrwqkfnxx9i5w6adyiadz00h497c516n96rgvs7alc74f";
+ sha256 = "1w0i13a0vsw4jmlj59xn64rdsqcsl9r3rmjjgdca5i51m1q4ix6v";
type = "gem";
};
- version = "0.9.18";
+ version = "0.9.19";
};
}
\ No newline at end of file
From 2cde1a89b68b452630a3042583fca7e0071b1b50 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 6 Apr 2019 14:37:32 +0000
Subject: [PATCH 020/115] ocamlPackages.farfadet: 0.2 -> 0.3
ocamlPackages.faraday: 0.5.0 -> 0.7.0
---
pkgs/development/ocaml-modules/faraday/default.nix | 11 ++++++-----
pkgs/development/ocaml-modules/farfadet/default.nix | 4 ++--
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/pkgs/development/ocaml-modules/faraday/default.nix b/pkgs/development/ocaml-modules/faraday/default.nix
index 34c8fcbfcbc..d739b33c8fa 100644
--- a/pkgs/development/ocaml-modules/faraday/default.nix
+++ b/pkgs/development/ocaml-modules/faraday/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, alcotest }:
+{ lib, fetchFromGitHub, buildDunePackage, alcotest, bigstringaf }:
buildDunePackage rec {
pname = "faraday";
- version = "0.5.0";
+ version = "0.7.0";
minimumOCamlVersion = "4.02";
@@ -10,16 +10,17 @@ buildDunePackage rec {
owner = "inhabitedtype";
repo = pname;
rev = version;
- sha256 = "1kql0il1frsbx6rvwqd7ahi4m14ik6la5an6c2w4x7k00ndm4d7n";
+ sha256 = "0z6ikwlqad91iac0q5z88p3wzq5k15y86ckzmhdq1aqwrcm14bq2";
};
buildInputs = [ alcotest ];
+ propagatedBuildInputs = [ bigstringaf ];
doCheck = true;
meta = {
description = "Serialization library built for speed and memory efficiency";
- license = stdenv.lib.licenses.bsd3;
- maintainers = [ stdenv.lib.maintainers.vbgl ];
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage;
};
}
diff --git a/pkgs/development/ocaml-modules/farfadet/default.nix b/pkgs/development/ocaml-modules/farfadet/default.nix
index 20b6f7d0909..96423a213a1 100644
--- a/pkgs/development/ocaml-modules/farfadet/default.nix
+++ b/pkgs/development/ocaml-modules/farfadet/default.nix
@@ -8,11 +8,11 @@ else
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-farfadet-${version}";
- version = "0.2";
+ version = "0.3";
src = fetchurl {
url = "https://github.com/oklm-wsh/Farfadet/releases/download/v${version}/farfadet-${version}.tbz";
- sha256 = "06wvd57c8khpq0c2hvm15zng269zvabsw1lcaqphqdcckl67nsxr";
+ sha256 = "0nlafnp0pwx0n4aszpsk6nvcvqi9im306p4jhx70si7k3xprlr2j";
};
buildInputs = [ ocaml findlib ocamlbuild topkg ];
From 621c4b8a59c15239742108ac59cbdf8c51438021 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 15 Dec 2018 23:35:38 -0800
Subject: [PATCH 021/115] fanficfare: 3.1.1 -> 3.6.0
Switch to Python 3 and fetching from Pypi
---
pkgs/tools/text/fanficfare/default.nix | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix
index 3315d435afb..a865859b186 100644
--- a/pkgs/tools/text/fanficfare/default.nix
+++ b/pkgs/tools/text/fanficfare/default.nix
@@ -1,19 +1,25 @@
-{ stdenv, fetchurl, python27Packages }:
+{ stdenv, fetchFromGitHub, python3Packages }:
-python27Packages.buildPythonApplication rec {
- version = "3.1.1";
- name = "fanficfare-${version}";
- nameprefix = "";
+python3Packages.buildPythonApplication rec {
+ pname = "FanFicFare";
+ version = "3.6.0";
- src = fetchurl {
- url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz";
- sha256 = "1wklii24vbvq2vi5pqgp3z4lazcplh2i7r2w4d8lkm6pzbw0s8px";
+ src = python3Packages.fetchPypi {
+ inherit pname version;
+ sha256 = "1ir3m8wknr8shdbmbpiaw73mdpa7mvidkl6pbs9ca23mgwivxa84";
};
- propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ];
+ propagatedBuildInputs = with python3Packages; [
+ beautifulsoup4
+ chardet
+ html5lib
+ html2text
+ ];
+
+ doCheck = false; # no tests exist
meta = with stdenv.lib; {
- description = "FanFicFare is a tool for making eBooks from fanfiction web sites";
+ description = "Tool for making eBooks from fanfiction web sites";
homepage = https://github.com/JimmXinu/FanFicFare;
license = licenses.gpl3;
platforms = platforms.linux;
From 8203fba410551df5ab953982c31eb218f4898952 Mon Sep 17 00:00:00 2001
From: Tim Williams <info@timphilipwilliams.com>
Date: Sun, 7 Apr 2019 12:54:13 +0100
Subject: [PATCH 022/115] mixxx: 2.1.5 -> 2.2.0 (#53643)
---
pkgs/applications/audio/mixxx/default.nix | 16 ++++++++--------
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index 4c84fb3c3f7..8d8d8d85475 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -1,33 +1,33 @@
{ stdenv, fetchFromGitHub, makeWrapper, chromaprint, fetchpatch
, fftw, flac, faad2, glibcLocales, mp4v2
, libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis
-, opusfile
-, pkgconfig, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite
-, taglib, upower, vampSDK
+, libGLU, libxcb, lilv, lv2, opusfile
+, pkgconfig, portaudio, portmidi, protobuf, qtbase, qtscript, qtsvg
+, qtx11extras, rubberband, scons, sqlite, taglib, upower, vampSDK
}:
stdenv.mkDerivation rec {
name = "mixxx-${version}";
- version = "2.1.5";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "mixxxdj";
repo = "mixxx";
rev = "release-${version}";
- sha256 = "0h14pwglz03sdmgzviypv1qa1xfjclrnhyqaq5nd60j47h4z39dr";
+ sha256 = "1rp2nyhz2j695k5kk0m94x30akwrlr9jgs0n4pi4snnvjpwmbfp9";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [
chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout libsndfile
- libusb1 libvorbis opusfile pkgconfig portaudio portmidi protobuf qt4
- rubberband scons sqlite taglib upower vampSDK
+ libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg
+ qtx11extras rubberband scons sqlite taglib upower vampSDK
];
sconsFlags = [
"build=release"
- "qtdir=${qt4}"
+ "qtdir=${qtbase}"
"faad=1"
"opus=1"
];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 35eb3777ab9..d3957a3a29e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18540,7 +18540,7 @@ in
mirage = callPackage ../applications/graphics/mirage { };
- mixxx = callPackage ../applications/audio/mixxx {
+ mixxx = libsForQt5.callPackage ../applications/audio/mixxx {
inherit (vamp) vampSDK;
};
From d3d5c674ba5c8b9348e642f59485926efab8b7af Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sun, 7 Apr 2019 17:51:19 -0400
Subject: [PATCH 023/115] nixos/lightdm-greeters/pantheon: add warning
---
.../x11/display-managers/lightdm-greeters/pantheon.nix | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
index 05011b999f2..bfba174144a 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
@@ -33,6 +33,13 @@ in
config = mkIf (ldmcfg.enable && cfg.enable) {
+ warnings = [
+ ''
+ The Pantheon greeter is suboptimal in NixOS and can possibly put you in
+ a situation where you cannot start a session when switching desktopManagers.
+ ''
+ ];
+
services.xserver.displayManager.lightdm.greeters.gtk.enable = false;
services.xserver.displayManager.lightdm.greeter = mkDefault {
From 8f93650fe4a39a41c20a47a17c3c8f7c49a9cb3e Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sun, 7 Apr 2019 17:51:41 -0400
Subject: [PATCH 024/115] nixos/pantheon: add warning when not using LightDM
---
nixos/modules/services/x11/desktop-managers/pantheon.nix | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index 69b0cdc986b..e81aea68ae9 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -73,6 +73,12 @@ in
# Ensure lightdm is used when Pantheon is enabled
# Without it screen locking will be nonfunctional because of the use of lightlocker
+
+ warnings = optional (config.services.xserver.displayManager.lightdm.enable != true)
+ ''
+ Using Pantheon without LightDM as a displayManager will break screenlocking from the UI.
+ '';
+
services.xserver.displayManager.lightdm.enable = mkDefault true;
services.xserver.displayManager.lightdm.greeters.gtk.enable = mkDefault true;
From 74e3bf3c0f6662ec2c9ae3929e2063bf9025bbe8 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 5 Jan 2019 20:29:14 +0100
Subject: [PATCH 025/115] v4l-utils: 1.16.2 -> 1.16.5
---
pkgs/os-specific/linux/v4l-utils/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index 2a9d42988b5..83674aa6421 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
name = "v4l-utils-${version}";
- version = "1.16.2";
+ version = "1.16.5";
src = fetchurl {
url = "https://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2";
- sha256 = "0iwfdp4ghzd6l9qg5545032vwmqy2rnhk0xf1g9mad67l74hhckc";
+ sha256 = "06yz34ncrpxshs9w2nqz62xj4wm7hni1fvjnvjhifl1q20jj907d";
};
outputs = [ "out" "dev" ];
From 496a73d46d9eb8c7dc22219e1ae42451fd6860a6 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 8 Apr 2019 16:44:23 +0300
Subject: [PATCH 026/115] nixos/nginx: fix error in writeNginxConfig
---
nixos/tests/nginx.nix | 1 +
pkgs/build-support/writers/default.nix | 13 ++++++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix
index 32b11364923..a4d14986a14 100644
--- a/nixos/tests/nginx.nix
+++ b/nixos/tests/nginx.nix
@@ -28,6 +28,7 @@ import ./make-test.nix ({ pkgs, ...} : {
services.nginx.virtualHosts."0.my.test" = {
extraConfig = ''
access_log syslog:server=unix:/dev/log,facility=user,tag=mytag,severity=info ceeformat;
+ location /favicon.ico { allow all; access_log off; log_not_found off; }
'';
};
};
diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix
index 3454450c1f3..281d2b19bc6 100644
--- a/pkgs/build-support/writers/default.nix
+++ b/pkgs/build-support/writers/default.nix
@@ -178,13 +178,20 @@ rec {
writeJSBin = name:
writeJS "/bin/${name}";
+ awkFormatNginx = builtins.toFile "awkFormat-nginx.awk" ''
+ awk -f
+ {sub(/^[ \t]+/,"");idx=0}
+ /\{/{ctx++;idx=1}
+ /\}/{ctx--}
+ {id="";for(i=idx;i<ctx;i++)id=sprintf("%s%s", id, "\t");printf "%s%s\n", id, $0}
+ '';
+
writeNginxConfig = name: text: pkgs.runCommand name {
inherit text;
passAsFile = [ "text" ];
} /* sh */ ''
- cp "$textPath" $out
- ${pkgs.nginx-config-formatter}/bin/nginxfmt $out
- ${pkgs.gnused}/bin/sed -i '/^$/d' $out
+ # nginx-config-formatter has an error - https://github.com/1connect/nginx-config-formatter/issues/16
+ ${pkgs.gawk}/bin/awk -f ${awkFormatNginx} "$textPath" | ${pkgs.gnused}/bin/sed '/^\s*$/d' > $out
${pkgs.gixy}/bin/gixy $out
'';
From 0ce382d86889921989a1888524f59945d595be62 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Mon, 8 Apr 2019 21:45:33 +0200
Subject: [PATCH 027/115] rl-1903: pantheon notes phrasing/organisation
---
nixos/doc/manual/release-notes/rl-1903.xml | 36 ++++++----------------
1 file changed, 10 insertions(+), 26 deletions(-)
diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 3821fa59e47..893608cbbcd 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -31,37 +31,21 @@
</para>
<note>
<para>
- <varname>services.xserver.desktopManager.pantheon</varname> default
- enables lightdm as a display manager.
+ By default, <varname>services.xserver.desktopManager.pantheon</varname>
+ enables LightDM as a display manager, as pantheon's screen locking
+ implementation relies on it.
</para>
<para>
- This is because of limitations with the screenlocking implementation,
- whereas the screenlocker would be non-functional without it.
- </para>
- <para>
- Because of that it is recommended to retain this precaution, however if
- you'd like to change this set:
- </para>
- <itemizedlist>
- <listitem>
- <para>
- <option>services.xserver.displayManager.lightdm.enable</option>
- </para>
- </listitem>
- <listitem>
- <para>
- <option>services.xserver.displayManager.lightdm.greeters.gtk.enable</option>
- </para>
- </listitem>
- </itemizedlist>
- <para>
- to <literal>false</literal> and enable your preferred display manager.
+ Because of that it is recommended to leave LightDM enabled. If you'd like
+ to disable it anyway, set
+ <option>services.xserver.displayManager.lightdm.enable</option> to
+ <literal>false</literal> and enable your preferred display manager.
</para>
</note>
<para>
- Also be aware that we haven't enabled lightdm with Pantheon's greeter by
- default. That's because it has numerous issues in NixOS and isn't optimal
- for use here yet.
+ Also note that Pantheon's LightDM greeter is not enabled by default,
+ because it has numerous issues in NixOS and isn't optimal for use here
+ yet.
</para>
</listitem>
<listitem>
From 5e19cec49185c8ca2d29d7bb7aa7842b0a887cb3 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Sun, 3 Mar 2019 17:15:03 +0900
Subject: [PATCH 028/115] wireshark: 2.6.6 -> 3.0.1
See https://www.wireshark.org/docs/relnotes/wireshark-3.0.0.html.
Drops gtk build.
---
.../networking/sniffers/wireshark/default.nix | 36 ++++++++-----------
pkgs/top-level/all-packages.nix | 5 ++-
2 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index db093310ca1..5119c70ab31 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,19 +1,17 @@
{ stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
-, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python, libcap, glib
+, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib
, libssh, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper
-, withGtk ? false, gtk3 ? null, librsvg ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null
, withQt ? true, qt5 ? null
, ApplicationServices, SystemConfiguration, gmp
}:
-assert withGtk -> !withQt && gtk3 != null;
-assert withQt -> !withGtk && qt5 != null;
+assert withQt -> qt5 != null;
with stdenv.lib;
let
- version = "2.6.6";
- variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
+ version = "3.0.1";
+ variant = if withQt then "qt" else "cli";
in stdenv.mkDerivation {
name = "wireshark-${variant}-${version}";
@@ -21,11 +19,10 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
- sha256 = "0qz8a1ays63712pq1v7nnw7c57zlqkcifq7himfv5nsv0zm36ya8";
+ sha256 = "13605bpnnbqsdr8ybqnscbz9g422zmyymn4q5aci28vc1wylr1l6";
};
cmakeFlags = [
- "-DBUILD_wireshark_gtk=${if withGtk then "ON" else "OFF"}"
"-DBUILD_wireshark=${if withQt then "ON" else "OFF"}"
"-DENABLE_QT5=${if withQt then "ON" else "OFF"}"
"-DENABLE_APPLICATION_BUNDLE=${if withQt && stdenv.isDarwin then "ON" else "OFF"}"
@@ -33,13 +30,12 @@ in stdenv.mkDerivation {
nativeBuildInputs = [
bison cmake extra-cmake-modules flex pkgconfig
- ] ++ optional withGtk wrapGAppsHook;
+ ];
buildInputs = [
gettext pcre perl libpcap lua5 libssh openssl libgcrypt
- libgpgerror gnutls geoip c-ares python glib zlib makeWrapper
+ libgpgerror gnutls geoip c-ares python3 glib zlib makeWrapper
] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
- ++ optionals withGtk [ gtk3 librsvg gsettings-desktop-schemas ]
++ optionals stdenv.isLinux [ libcap libnl ]
++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]
++ optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]);
@@ -60,8 +56,7 @@ in stdenv.mkDerivation {
export LD_LIBRARY_PATH="$PWD/run"
'';
- postInstall = if stdenv.isDarwin then ''
- ${optionalString withQt ''
+ postInstall = if (stdenv.isDarwin && withQt) then ''
mkdir -p $out/Applications
mv $out/bin/Wireshark.app $out/Applications/Wireshark.app
@@ -73,16 +68,10 @@ in stdenv.mkDerivation {
wrapProgram $out/Applications/Wireshark.app/Contents/MacOS/Wireshark \
--set QT_PLUGIN_PATH ${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}
- ''}
- '' else optionalString (withQt || withGtk) ''
- ${optionalString withGtk ''
- install -Dm644 -t $out/share/applications ../wireshark-gtk.desktop
- ''}
- ${optionalString withQt ''
+ '' else optionalString withQt ''
install -Dm644 -t $out/share/applications ../wireshark.desktop
wrapProgram $out/bin/wireshark \
--set QT_PLUGIN_PATH ${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}
- ''}
substituteInPlace $out/share/applications/*.desktop \
--replace "Exec=wireshark" "Exec=$out/bin/wireshark"
@@ -98,7 +87,12 @@ in stdenv.mkDerivation {
cp ../epan/dfilter/*.h $dev/include/epan/dfilter/
cp ../wsutil/*.h $dev/include/wsutil/
cp ../wiretap/*.h $dev/include/wiretap
- '';
+
+ '' + ''
+ # to remove "cycle detected in the references"
+ mkdir -p $dev/lib/wireshark
+ mv $out/lib/wireshark/cmake $dev/lib/wireshark
+ '';
enableParallelBuilding = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2653ad8ae41..325ae7f90fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17467,14 +17467,13 @@ in
welle-io = libsForQt5.callPackage ../applications/radio/welle-io { };
wireshark = callPackage ../applications/networking/sniffers/wireshark {
- qt5 = qt59;
inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration;
};
wireshark-qt = wireshark;
# The GTK UI is deprecated by upstream. You probably want the QT version.
- wireshark-gtk = wireshark.override { withGtk = true; withQt = false; };
- wireshark-cli = wireshark.override { withGtk = false; withQt = false; };
+ wireshark-gtk = throw "Not supported anymore. Use wireshark-qt or wireshark-cli instead.";
+ wireshark-cli = wireshark.override { withQt = false; };
fbida = callPackage ../applications/graphics/fbida { };
From 064bcdb22fc61bf7e7f6b3aa823dc2809369a515 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 8 Apr 2019 21:46:15 +0200
Subject: [PATCH 029/115] wireshark: fix darwin build
Fixing the cycle in the cmake files is also needed on darwin.
---
.../networking/sniffers/wireshark/default.nix | 29 +++++++++----------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 5119c70ab31..40fc03a8120 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -56,25 +56,29 @@ in stdenv.mkDerivation {
export LD_LIBRARY_PATH="$PWD/run"
'';
- postInstall = if (stdenv.isDarwin && withQt) then ''
- mkdir -p $out/Applications
- mv $out/bin/Wireshark.app $out/Applications/Wireshark.app
+ postInstall = ''
+ # to remove "cycle detected in the references"
+ mkdir -p $dev/lib/wireshark
+ mv $out/lib/wireshark/cmake $dev/lib/wireshark
+ '' + (if stdenv.isDarwin && withQt then ''
+ mkdir -p $out/Applications
+ mv $out/bin/Wireshark.app $out/Applications/Wireshark.app
- for so in $out/Applications/Wireshark.app/Contents/PlugIns/wireshark/*.so; do
+ for so in $out/Applications/Wireshark.app/Contents/PlugIns/wireshark/*.so; do
install_name_tool $so -change libwireshark.10.dylib $out/lib/libwireshark.10.dylib
install_name_tool $so -change libwiretap.7.dylib $out/lib/libwiretap.7.dylib
install_name_tool $so -change libwsutil.8.dylib $out/lib/libwsutil.8.dylib
- done
+ done
- wrapProgram $out/Applications/Wireshark.app/Contents/MacOS/Wireshark \
+ wrapProgram $out/Applications/Wireshark.app/Contents/MacOS/Wireshark \
--set QT_PLUGIN_PATH ${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}
'' else optionalString withQt ''
- install -Dm644 -t $out/share/applications ../wireshark.desktop
- wrapProgram $out/bin/wireshark \
+ install -Dm644 -t $out/share/applications ../wireshark.desktop
+ wrapProgram $out/bin/wireshark \
--set QT_PLUGIN_PATH ${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}
substituteInPlace $out/share/applications/*.desktop \
- --replace "Exec=wireshark" "Exec=$out/bin/wireshark"
+ --replace "Exec=wireshark" "Exec=$out/bin/wireshark"
install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg
mkdir $dev/include/{epan/{wmem,ftypes,dfilter},wsutil,wiretap} -pv
@@ -87,12 +91,7 @@ in stdenv.mkDerivation {
cp ../epan/dfilter/*.h $dev/include/epan/dfilter/
cp ../wsutil/*.h $dev/include/wsutil/
cp ../wiretap/*.h $dev/include/wiretap
-
- '' + ''
- # to remove "cycle detected in the references"
- mkdir -p $dev/lib/wireshark
- mv $out/lib/wireshark/cmake $dev/lib/wireshark
- '';
+ '');
enableParallelBuilding = true;
From a97e16e4ec4519a3d2843c0a78cc8879b0fa65c3 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 8 Apr 2019 22:50:42 +0200
Subject: [PATCH 030/115] wireshark: fix Wireshark.app on darwin
Generalize install_name_tool fixup calls for Wireshark.app to avoid breaking
when version numbers change.
---
.../networking/sniffers/wireshark/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 40fc03a8120..46869ecb24f 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -64,10 +64,10 @@ in stdenv.mkDerivation {
mkdir -p $out/Applications
mv $out/bin/Wireshark.app $out/Applications/Wireshark.app
- for so in $out/Applications/Wireshark.app/Contents/PlugIns/wireshark/*.so; do
- install_name_tool $so -change libwireshark.10.dylib $out/lib/libwireshark.10.dylib
- install_name_tool $so -change libwiretap.7.dylib $out/lib/libwiretap.7.dylib
- install_name_tool $so -change libwsutil.8.dylib $out/lib/libwsutil.8.dylib
+ for f in $(find $out/Applications/Wireshark.app/Contents/PlugIns -name "*.so"); do
+ for dylib in $(otool -L $f | awk '/^\t*lib/ {print $1}'); do
+ install_name_tool -change "$dylib" "$out/lib/$dylib" "$f"
+ done
done
wrapProgram $out/Applications/Wireshark.app/Contents/MacOS/Wireshark \
From 9cc80bc041d8bdd7df83a831b3cc9d58b51e47cf Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Tue, 9 Apr 2019 09:33:36 +0200
Subject: [PATCH 031/115] powershell: 6.1.2 -> 6.2.0
---
pkgs/shells/powershell/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix
index f40a67f7e52..4c4733bc9cd 100644
--- a/pkgs/shells/powershell/default.nix
+++ b/pkgs/shells/powershell/default.nix
@@ -4,8 +4,8 @@
let platformString = if stdenv.isDarwin then "osx"
else if stdenv.isLinux then "linux"
else throw "unsupported platform";
- platformSha = if stdenv.isDarwin then "1zm5q25ny2x6wvdqfrc380467zq0nbrzh2rzldwdkdpkb6wbvpj8"
- else if stdenv.isLinux then "021ag632jcn7f1vpddann04xifgsq3wrx93hzbvq7cngg8y16r3y"
+ platformSha = if stdenv.isDarwin then "1jcrrgybcyq9kwyqxshsfm5fy3sa77h3795xx3rvrs8k434nl1yb"
+ else if stdenv.isLinux then "1hlis827wmnjcy4h8va50093pmnqdhkbnbimmkymzmcvmkbmi9nx"
else throw "unsupported platform";
platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
else if stdenv.isLinux then "LD_LIBRARY_PATH"
@@ -15,7 +15,7 @@ let platformString = if stdenv.isDarwin then "osx"
in
stdenv.mkDerivation rec {
name = "powershell-${version}";
- version = "6.1.2";
+ version = "6.2.0";
src = fetchzip {
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz";
From 60752bebcbe19a91bb9e6b3a4b8377abc394d564 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 27 Mar 2019 14:24:57 +0100
Subject: [PATCH 032/115] clisp: Add license
Source: http://ftp.gnu.org/pub/gnu/clisp/release/latest/clisp-2.49.tar.gz
File: GNU-GPL
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
pkgs/development/interpreters/clisp/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix
index f850a9f57b8..5dcfa42c92f 100644
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -99,5 +99,6 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.unix;
# problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062
broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
+ license = stdenv.lib.licenses.gpl2;
};
}
From 3eb4e958b43328d2586784a2f49d179a80b6692f Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 9 Apr 2019 21:14:12 +0900
Subject: [PATCH 033/115] flashplayer: 32.0.0.156 -> 32.0.0.171
---
.../networking/browsers/chromium/plugins.nix | 4 ++--
.../browsers/mozilla-plugins/flashplayer/default.nix | 10 +++++-----
.../mozilla-plugins/flashplayer/standalone.nix | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index e4ec550d60c..a8bdb7d5b2d 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -100,11 +100,11 @@ let
flash = stdenv.mkDerivation rec {
name = "flashplayer-ppapi-${version}";
- version = "32.0.0.156";
+ version = "32.0.0.171";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
- sha256 = "0mf2p3qk82s2nwz1x8g92434wpdqgnd9jj8w88z4qksa9qhbbfh7";
+ sha256 = "1rqf1kidpf2jqf20dw3hscrapdpm2j751742i6xnvj9mp66nczyg";
stripRoot = false;
};
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index aa571d17534..417bdf60b12 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -74,7 +74,7 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
- version = "32.0.0.156";
+ version = "32.0.0.171";
src = fetchurl {
url =
@@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
- "0h16vdar4p8zj6w57ihll71xjr9sy7hdiq4qwvvqndah5c4ym8xl"
+ "0dl2kxsn4wh3243qkwyq13ikbmz6ljg95a1v02cylz36kpfl51iv"
else
- "06l59zid6n4b606254r937cvk95pyymlczadh4cpl6l4xncspdy6"
+ "1v9imcyml55qlvp0cibi5r5kl0rcivzvmnqgw8ph3xjm1yrxw3fr"
else
if arch == "x86_64" then
- "0b3qssn1fgm2v715l6nksqmwly7j9asgqh9yqjhpp7jsb84bvzk4"
+ "1f3nl4qkws16q2yw940vvb0zmmwxks1blm4ida65hlda6f9zfq3h"
else
- "03qdwrlvs4090s9b9fn2l6g3wsbi6q81jf59s1s5gh7qhi4i0lhy";
+ "0df9nbxyn4wl4ap333mgnnmy994xj7i5hz07sw83pszlz3pjkc0m";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index 0da07f2d2be..cfee25bf3f8 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -50,7 +50,7 @@
stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}";
- version = "32.0.0.156";
+ version = "32.0.0.171";
src = fetchurl {
url =
@@ -60,9 +60,9 @@ stdenv.mkDerivation rec {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
- "0fzs2x8yxpykkza1r3yn17hmrdz51c7qigbm5qifvw59q9zl15i9"
+ "0z4fkqbq1s63lpzfkyxllwx2wpizbabr4zim1dn7n59ld75vjxq8"
else
- "11733155aznijwhnc5wv0v6wmw9g1akbqwl07kx3lam571s8aywr";
+ "0nvgcdmgvgbj6axrh0yzkk437bxwsaxl0mvfkcyyz1hxnq51dvvg";
};
nativeBuildInputs = [ unzip ];
From 952d983e774302687d060354a67992cc25c406fb Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 9 Apr 2019 15:50:39 +0200
Subject: [PATCH 034/115] pythonPackages.django_2_1: 2.1.7 -> 2.1.8
See https://docs.djangoproject.com/en/2.2/releases/2.1.8/ for release
information
---
pkgs/development/python-modules/django/2_1.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/django/2_1.nix b/pkgs/development/python-modules/django/2_1.nix
index e15f2213f14..f8aa54dfe4c 100644
--- a/pkgs/development/python-modules/django/2_1.nix
+++ b/pkgs/development/python-modules/django/2_1.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "Django";
- version = "2.1.7";
+ version = "2.1.8";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "939652e9d34d7d53d74d5d8ef82a19e5f8bb2de75618f7e5360691b6e9667963";
+ sha256 = "1r1y3d3gz5v1kyfs77dxbcm5my27q8dpcmj821b6yl8x22281cpk";
};
patches = stdenv.lib.optionals withGdal [
From 1fffbf8ae74714f3337cc67aada7970afff3beea Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 8 Apr 2019 14:21:13 +0200
Subject: [PATCH 035/115] =?UTF-8?q?gegl=5F0=5F4:=200.4.12=20=E2=86=92=200.?=
=?UTF-8?q?4.14?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upgrade, clean up and remove intltool, which is not used since 0.3.22.
---
pkgs/development/libraries/gegl/4.0.nix | 43 +++++++++++++++++++------
1 file changed, 34 insertions(+), 9 deletions(-)
diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix
index 0fdf0a09be6..da20438fb4b 100644
--- a/pkgs/development/libraries/gegl/4.0.nix
+++ b/pkgs/development/libraries/gegl/4.0.nix
@@ -1,20 +1,45 @@
-{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which
-, librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw
+{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, babl, libpng, cairo, libjpeg, which
+, librsvg, pango, gtk, bzip2, json-glib, gettext, autoreconfHook, libraw
, gexiv2, libwebp, gnome3, libintl }:
-let
- version = "0.4.12";
-in stdenv.mkDerivation rec {
- name = "gegl-${version}";
+stdenv.mkDerivation rec {
+ pname = "gegl";
+ version = "0.4.14";
outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev";
src = fetchurl {
- url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
- sha256 = "0ljqxc4iyy2hrj31pxcy1xp4xm5zbx1nigqisphmg4p8mcz2jrz9";
+ url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+ sha256 = "00crhngwi07f5b9x77kx5p7p4cl6l5g6glpz9rqv7pfqk62xa0ac";
};
+ patches = stdenv.lib.optionals stdenv.isDarwin [
+ # Make the Darwin patches below apply cleanly
+ (fetchpatch {
+ url = https://gitlab.gnome.org/GNOME/gegl/commit/141a7aa76cd36143f624f06b1c43d2483945653c.patch;
+ sha256 = "0ijv9ra6723jn60krjwzbc6l9qr08h76bsz9xgddvfgsgr1nnpbi";
+ })
+ (fetchpatch {
+ url = https://gitlab.gnome.org/GNOME/gegl/commit/b3ff0df080d133bbdb394c3db40d4f9d2980a8a6.patch;
+ sha256 = "0im0rqk8mz9vi7qqx06vj4wm5hjwv1544jwdaaywlcrs9g266hl0";
+ })
+ (fetchpatch {
+ url = https://gitlab.gnome.org/GNOME/gegl/commit/fe756be6f0c776a45201a61f67d3e5e42f6398de.patch;
+ sha256 = "0h3rqwfsph2gisbwvc2v5a9r5b0djcxlm790xpi6yfndj42b0v2b";
+ })
+ # Fix build on Darwin
+ # https://gitlab.gnome.org/GNOME/gegl/merge_requests/28
+ (fetchpatch {
+ url = https://gitlab.gnome.org/GNOME/gegl/commit/ac331b5c0e3d940b64bb811b0f54e86c7d312917.patch;
+ sha256 = "1yj9jh8q9cbr1szrxhdapknk4nfhbkbc1njv50ifrj7vyfislj34";
+ })
+ (fetchpatch {
+ url = https://gitlab.gnome.org/GNOME/gegl/commit/d05eb01170728f45f561ca937708a293e29e02d9.patch;
+ sha256 = "0gwz12sm8kkmzyxsiq0sl30cabs5q0ckj743yrzimspkhrvc1ya2";
+ })
+ ];
+
enableParallelBuilding = true;
doCheck = true;
@@ -26,7 +51,7 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-4.0.pc
- nativeBuildInputs = [ pkgconfig intltool which autoreconfHook libintl ];
+ nativeBuildInputs = [ pkgconfig gettext which autoreconfHook libintl ];
meta = with stdenv.lib; {
description = "Graph-based image processing framework";
From 810b6e23a6c7a7bcd6b4b5ccce76a96df29c3ea7 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 8 Apr 2019 14:46:22 +0200
Subject: [PATCH 036/115] =?UTF-8?q?gimp:=202.10.8=20=E2=86=92=202.10.10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
https://www.gimp.org/news/2019/04/07/gimp-2-10-10-released/
---
pkgs/applications/graphics/gimp/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index 4d835e6590e..9e4aec16db8 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -8,12 +8,12 @@
let
inherit (python2Packages) pygtk wrapPython python;
in stdenv.mkDerivation rec {
- name = "gimp-${version}";
- version = "2.10.8";
+ pname = "gimp";
+ version = "2.10.10";
src = fetchurl {
- url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
- sha256 = "16sb4kslwin2jbgdb4nhks78pd0af8mvj8g5hap3hj946p7w2jfq";
+ url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+ sha256 = "0xwck5nbpb945s1cyij3kfqw1pchbhx8i5vf5hgywyjw4r1z5l8j";
};
nativeBuildInputs = [ pkgconfig intltool gettext wrapPython ];
From f98b4b0fda37f87fdb2060b1cf7dc337f2c76a0f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Tue, 9 Apr 2019 17:18:43 +0200
Subject: [PATCH 037/115] nixos: Fix build of manual
Commit 29d7d8f44df24d6876c527d442eb42aee7227d6b has introduced another
section with the ID "sec-release-19.09-incompatibilities", which
subsequently causes the build to fail.
I just merged both sections and the manual is now building again.
Signed-off-by: aszlig <aszlig@nix.build>
---
nixos/doc/manual/release-notes/rl-1909.xml | 50 ++++++++--------------
1 file changed, 17 insertions(+), 33 deletions(-)
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 2d391b75053..72fa6f4d515 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -65,6 +65,23 @@
</para>
<itemizedlist>
+ <listitem>
+ <para>
+ Buildbot no longer supports Python 2, as support was dropped upstream in
+ version 2.0.0. Configurations may need to be modified to make them
+ compatible with Python 3.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ PostgreSQL now uses
+ <filename class="directory">/run/postgresql</filename> as its socket
+ directory instead of <filename class="directory">/tmp</filename>. So
+ if you run an application like eg. Nextcloud, where you need to use
+ the Unix socket path as the database host name, you need to change it
+ accordingly.
+ </para>
+ </listitem>
<listitem>
<para>
The directory where Prometheus will store its metric data is now
@@ -87,39 +104,6 @@
</itemizedlist>
</section>
- <section xmlns="http://docbook.org/ns/docbook"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- version="5.0"
- xml:id="sec-release-19.09-incompatibilities">
- <title>Backward Incompatibilities</title>
-
- <para>
- When upgrading from a previous release, please be aware of the following
- incompatible changes:
- </para>
-
- <itemizedlist>
- <listitem>
- <para>
- Buildbot no longer supports Python 2, as support was dropped upstream in
- version 2.0.0. Configurations may need to be modified to make them
- compatible with Python 3.
- </para>
- </listitem>
- <listitem>
- <para>
- PostgreSQL now uses
- <filename class="directory">/run/postgresql</filename> as its socket
- directory instead of <filename class="directory">/tmp</filename>. So
- if you run an application like eg. Nextcloud, where you need to use
- the Unix socket path as the database host name, you need to change it
- accordingly.
- </para>
- </listitem>
- </itemizedlist>
- </section>
-
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
From 8a5729de67da9b7756ae4e929d82742bd5bb15c0 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Tue, 9 Apr 2019 07:41:39 +0200
Subject: [PATCH 038/115] adding maintainer: freezeboy
---
maintainers/maintainer-list.nix | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index beb766e85b0..405b7d8d0a1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5441,4 +5441,9 @@
github = "shazow";
name = "Andrey Petrov";
};
+ freezeboy = {
+ email = "freezeboy@users.noreply.github.com";
+ github = "freezeboy";
+ name = "freezeboy";
+ };
}
From 494752a39a91c0f3192c8057f9a1dd4ef501dd36 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 9 Apr 2019 09:50:14 -0700
Subject: [PATCH 039/115] python37Packages.pymediainfo: 3.0 -> 3.1 (#57436)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-pymediainfo/versions
---
pkgs/development/python-modules/pymediainfo/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix
index 61acce347ef..42902bc7045 100644
--- a/pkgs/development/python-modules/pymediainfo/default.nix
+++ b/pkgs/development/python-modules/pymediainfo/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "pymediainfo";
- version = "3.0";
+ version = "3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "e76cc5525c3fc5cba61073e12365dc06f303b261d8f923aaa6eac09bf8fab245";
+ sha256 = "00awypv2nbn44cc38q7w747gx1xhj33cygzzl56jn5jd3hdlldn7";
};
postPatch = ''
From ea0a32902b8e665dedcd6515fca30d0d9ea34aa4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 9 Apr 2019 09:53:09 -0700
Subject: [PATCH 040/115] polyml: 5.7.1 -> 5.8 (#58753)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/polyml/versions
From 4f186d2719b5a3fa9bf47e1f9fddaf31dc3ada96 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 9 Apr 2019 09:56:10 -0700
Subject: [PATCH 041/115] python37Packages.uproot-methods: 0.4.3 -> 0.4.4
(#58850)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-uproot-methods/versions
---
pkgs/development/python-modules/uproot-methods/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/pkgs/development/python-modules/uproot-methods/default.nix
index 96190811650..c6cfdacf6ee 100644
--- a/pkgs/development/python-modules/uproot-methods/default.nix
+++ b/pkgs/development/python-modules/uproot-methods/default.nix
@@ -6,12 +6,12 @@
}:
buildPythonPackage rec {
- version = "0.4.3";
+ version = "0.4.4";
pname = "uproot-methods";
src = fetchPypi {
inherit pname version;
- sha256 = "f90d91a613a875ebdf214f0f6f3fd0f8beea9125fc35e54f334d6104fe47c87d";
+ sha256 = "004q7lywhhdvsmds88cfpjvkj89nf8n9d4gyrbvvj3x0gw7iiljq";
};
propagatedBuildInputs = [ numpy awkward ];
From c51fcbc82f0ff1268e67a5fb517baacad969ba0d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 9 Apr 2019 10:01:20 -0700
Subject: [PATCH 042/115] owncloud-client: 2.5.3.11470 -> 2.5.4.11654 (#58738)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/owncloud-client/versions
---
pkgs/applications/networking/owncloud-client/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix
index 6b85dbfa3cc..8ced53c972b 100644
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/pkgs/applications/networking/owncloud-client/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "owncloud-client-${version}";
- version = "2.5.3.11470";
+ version = "2.5.4.11654";
src = fetchurl {
url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz";
- sha256 = "0cznis8qadsnlgm046lxn8vmbxli6zp4b8nk93n53mkfxlcw355n";
+ sha256 = "0gsnry0786crbnpgg3f1vcqw6mwbz6svhm6mw3767qi4lb33jm31";
};
nativeBuildInputs = [ pkgconfig cmake ];
From c641c1b2ad7d3cd1f72b5e8294143a55f9ed454f Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 9 Apr 2019 20:02:33 +0200
Subject: [PATCH 043/115] cpulimit: 2.5 -> 2.6
---
pkgs/tools/misc/cpulimit/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix
index 13c1202e1d3..9a764c12941 100644
--- a/pkgs/tools/misc/cpulimit/default.nix
+++ b/pkgs/tools/misc/cpulimit/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "cpulimit-${version}";
- version = "2.5";
+ version = "2.6";
src = fetchurl {
url = "mirror://sourceforge/limitcpu/${name}.tar.gz";
- sha256 = "1w1l3r9ini78s8idxlzmgljpfgl1n4y4qhp3q2s8y6wq4bfx41lp";
+ sha256 = "0xf0r6zxaqan1drz61nqf95p2pkiiihpvrjhrr9dx9j3vswyx31g";
};
buildFlags = with stdenv;
From 6adf0f3e9aa094d8e38ad94306faef65de09364f Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Tue, 9 Apr 2019 20:05:38 +0200
Subject: [PATCH 044/115] containerd: 1.2.5 -> 1.2.6
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
pkgs/applications/virtualization/containerd/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index a8561e0523d..fe23bcac585 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -4,13 +4,13 @@ with lib;
buildGoPackage rec {
name = "containerd-${version}";
- version = "1.2.5";
+ version = "1.2.6";
src = fetchFromGitHub {
owner = "containerd";
repo = "containerd";
rev = "v${version}";
- sha256 = "0npbzixf3c0jvzm159vygvkydrr8h36c9sq50yv0mdinrys2bvg0";
+ sha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357";
};
goPackagePath = "github.com/containerd/containerd";
From dc717bd155cbe749ad3efb75d1825920a017f420 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 9 Apr 2019 11:42:27 -0700
Subject: [PATCH 045/115] mysql-workbench: 8.0.14 -> 8.0.15 (#57328)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mysql-workbench/versions
---
pkgs/applications/misc/mysql-workbench/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index 8068a8cfd7e..cccd36d7ead 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -13,12 +13,12 @@ let
inherit (python2.pkgs) paramiko pycairo pyodbc;
in stdenv.mkDerivation rec {
pname = "mysql-workbench";
- version = "8.0.14";
+ version = "8.0.15";
name = "${pname}-${version}";
src = fetchurl {
url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";
- sha256 = "0mz615drx18h0frc6fq9nknqbpq7lr0xlsfmxd5irw2jz629lj76";
+ sha256 = "0ca93azasya5xiw6j2map8drmxf445qqydpvrb512kjfqdiv67x6";
};
patches = [
From 36bb2e3beb675af028a48968fb5eeee48e231174 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 9 Apr 2019 12:17:43 -0700
Subject: [PATCH 046/115] i2pd: 2.23.0 -> 2.24.0 (#58696)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/i2pd/versions
---
pkgs/tools/networking/i2pd/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index b2826a5cbc6..8c71018ba86 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
name = pname + "-" + version;
pname = "i2pd";
- version = "2.23.0";
+ version = "2.24.0";
src = fetchFromGitHub {
owner = "PurpleI2P";
repo = pname;
rev = version;
- sha256 = "0sw9fjamd5wjrsxnxsih9532yf6x3rrjmv5ybskkpk7b6acyqjj1";
+ sha256 = "1gn8i3jxy6zwrqxmkzc1n55sw29jxdjr4ihv33q2kcp7b90b4wsq";
};
buildInputs = with stdenv.lib; [ boost zlib openssl ]
From c26640c1570e6457b6a43643918604728d792903 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Tue, 9 Apr 2019 19:19:06 +0000
Subject: [PATCH 047/115] freerdp: remove 'optimize' parametes
all `x86_64` has SSE2, so it is needless
---
pkgs/applications/networking/remote/freerdp/default.nix | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index 425a064fa96..2110b76934d 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -9,7 +9,6 @@
, pcsclite ? null
, systemd ? null
, buildServer ? true
-, optimize ? true
}:
stdenv.mkDerivation rec {
@@ -58,7 +57,7 @@ stdenv.mkDerivation rec {
++ optional (cups != null) "-DWITH_CUPS=ON"
++ optional (pcsclite != null) "-DWITH_PCSC=ON"
++ optional buildServer "-DWITH_SERVER=ON"
- ++ optional (optimize && stdenv.isx86_64) "-DWITH_SSE2=ON";
+ ++ optional (stdenv.isx86_64) "-DWITH_SSE2=ON";
meta = with lib; {
description = "A Remote Desktop Protocol Client";
From 325fa0d51b242f2c923e19bffe624d87ac429b22 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 9 Apr 2019 12:57:04 -0700
Subject: [PATCH 048/115] libnfs: 3.0.0 -> 4.0.0 (#57285)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libnfs/versions
---
pkgs/development/libraries/libnfs/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix
index 96bd983e64c..8ed6dfa8ac0 100644
--- a/pkgs/development/libraries/libnfs/default.nix
+++ b/pkgs/development/libraries/libnfs/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "libnfs-${version}";
- version = "3.0.0";
+ version = "4.0.0";
src = fetchFromGitHub {
owner = "sahlberg";
repo = "libnfs";
rev = "libnfs-${version}";
- sha256 = "115p55y2cbs92z5lmcnjx1v29lwinpgq4sha9v1kq1vd8674h404";
+ sha256 = "0i27wd4zvhjz7620q043p4d4mkx8zv2yz9adm1byin47dynahyda";
};
nativeBuildInputs = [ autoreconfHook ];
From b972beeb07b45377af3416ec62e3bb95e3be9ee5 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Mon, 8 Apr 2019 14:36:36 +0200
Subject: [PATCH 049/115] pythonPackages.cntk: mark as broken (python37)
---
pkgs/development/python-modules/cntk/default.nix | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/cntk/default.nix b/pkgs/development/python-modules/cntk/default.nix
index 2bcb7165ca1..a9184d7d08f 100644
--- a/pkgs/development/python-modules/cntk/default.nix
+++ b/pkgs/development/python-modules/cntk/default.nix
@@ -10,7 +10,7 @@
}:
buildPythonPackage rec {
- inherit (pkgs.cntk) name version src meta;
+ inherit (pkgs.cntk) name version src;
buildInputs = [ pkgs.cntk pkgs.swig pkgs.openmpi ];
propagatedBuildInputs = [ numpy scipy enum34 protobuf pip ];
@@ -35,4 +35,12 @@ buildPythonPackage rec {
cd $NIX_BUILD_TOP
${python.interpreter} -c "import cntk"
'';
+
+ meta = {
+ inherit (pkgs.cntk.meta) homepage description license maintainers;
+ # broken in CNTK 2.4 starting with python-3.7
+ # ("ImportError: cannot import name 'GenericMeta' from 'typing'")
+ broken = stdenv.lib.versionAtLeast python.version "3.7";
+
+ };
}
From d6843c1d1a67c8ac239f4a1ded6c4fa575385c51 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Mon, 8 Apr 2019 15:51:49 +0200
Subject: [PATCH 050/115] pythonPackages.cntk: fix nativeBuildInputs
---
pkgs/development/python-modules/cntk/default.nix | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/cntk/default.nix b/pkgs/development/python-modules/cntk/default.nix
index a9184d7d08f..cfc16063cf7 100644
--- a/pkgs/development/python-modules/cntk/default.nix
+++ b/pkgs/development/python-modules/cntk/default.nix
@@ -12,7 +12,8 @@
buildPythonPackage rec {
inherit (pkgs.cntk) name version src;
- buildInputs = [ pkgs.cntk pkgs.swig pkgs.openmpi ];
+ nativeBuildInputs = [ pkgs.swig pkgs.openmpi ];
+ buildInputs = [ pkgs.cntk pkgs.openmpi ];
propagatedBuildInputs = [ numpy scipy enum34 protobuf pip ];
CNTK_LIB_PATH = "${pkgs.cntk}/lib";
From d6afe8ce5cd6040b916087444ff9188aab8031f6 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Tue, 9 Apr 2019 22:20:37 +0200
Subject: [PATCH 051/115] pythonPackages.zerorpc: init at 0.6.1 (#59102)
---
.../python-modules/zerorpc/default.nix | 22 +++++++++++++++++++
pkgs/top-level/python-packages.nix | 2 ++
2 files changed, 24 insertions(+)
create mode 100644 pkgs/development/python-modules/zerorpc/default.nix
diff --git a/pkgs/development/python-modules/zerorpc/default.nix b/pkgs/development/python-modules/zerorpc/default.nix
new file mode 100644
index 00000000000..2ad01586189
--- /dev/null
+++ b/pkgs/development/python-modules/zerorpc/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, future, gevent, msgpack-python, pyzmq }:
+
+buildPythonPackage rec {
+ pname = "zerorpc";
+ version = "0.6.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "14d0nmprs0nm17d8kg2f7qalsi8x7c4damsccqgncylj7mpnk9hh";
+ };
+
+ propagatedBuildInputs = [ future gevent msgpack-python pyzmq ];
+
+ doCheck = false; # pypi version doesn't include tests
+
+ meta = with lib; {
+ description = "An easy to use, intuitive, and cross-language RPC";
+ homepage = "https://www.zerorpc.io";
+ license = licenses.mit;
+ maintainers = with maintainers; [ xeji ];
+ };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b3e75d8e40e..db13fbf1eee 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4433,6 +4433,8 @@ in {
zc_lockfile = callPackage ../development/python-modules/zc_lockfile { };
+ zerorpc = callPackage ../development/python-modules/zerorpc { };
+
zipstream = callPackage ../development/python-modules/zipstream { };
zodb = callPackage ../development/python-modules/zodb {};
From 72a198fc60fec786eb9573217287081ac8b1c1f7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 9 Apr 2019 13:45:23 -0700
Subject: [PATCH 052/115] ocserv: 0.12.2 -> 0.12.3 (#58730)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ocserv/versions
---
pkgs/tools/networking/ocserv/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/networking/ocserv/default.nix b/pkgs/tools/networking/ocserv/default.nix
index 63a74c3ddb6..fdb281e6c37 100644
--- a/pkgs/tools/networking/ocserv/default.nix
+++ b/pkgs/tools/networking/ocserv/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "ocserv-${version}";
- version = "0.12.2";
+ version = "0.12.3";
src = fetchFromGitLab {
owner = "openconnect";
repo = "ocserv";
rev = "ocserv_${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}";
- sha256 = "13lijg5qkkpn35laaimpw9l5g2dnnbmqn74lpcknmp6nm6j2wvci";
+ sha256 = "072256099l1c6p7dvvzp0gyafh1zvmmgmnpy0fcmv9sy80qg3p44";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
From efc0fc165fe14db12abef2cc1c1c63ec466f704a Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Sat, 6 Apr 2019 15:55:12 +0100
Subject: [PATCH 053/115] python3Packages.xxhash: init at 1.3.0
---
.../python-modules/xxhash/default.nix | 21 +++++++++++++++++++
pkgs/top-level/python-packages.nix | 2 ++
2 files changed, 23 insertions(+)
create mode 100644 pkgs/development/python-modules/xxhash/default.nix
diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix
new file mode 100644
index 00000000000..da9ec8dc2d9
--- /dev/null
+++ b/pkgs/development/python-modules/xxhash/default.nix
@@ -0,0 +1,21 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ version = "1.3.0";
+ pname = "xxhash";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1rhrqrlq4n3vgqd1fv1dcc5ga5dzy9qbd40p8rsqqhh5klxg48gy";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/ifduyue/python-xxhash;
+ description = "Python Binding for xxHash https://pypi.org/project/xxhash/";
+ license = licenses.bsd2;
+ maintainers = [ maintainers.teh ];
+ };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index db13fbf1eee..26205eaec42 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4422,6 +4422,8 @@ in {
xlwt = callPackage ../development/python-modules/xlwt { };
+ xxhash = callPackage ../development/python-modules/xxhash { };
+
youtube-dl = callPackage ../tools/misc/youtube-dl {};
youtube-dl-light = callPackage ../tools/misc/youtube-dl {
From e6ebd0553c6c082aab41232c3770a9428c3c0789 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Sun, 31 Mar 2019 15:22:43 +0100
Subject: [PATCH 054/115] pyre: 0.0.20 -> 0.0.22
---
pkgs/development/tools/pyre/default.nix | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix
index 7ae95679482..b5dfe3c8bfd 100644
--- a/pkgs/development/tools/pyre/default.nix
+++ b/pkgs/development/tools/pyre/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, ocamlPackages, writeScript
-, dune, python3, rsync, buck, watchman }:
+, dune, python3, rsync, buck, watchman, sqlite }:
let
# Manually set version - the setup script requires
# hg and git + keeping the .git directory around.
- pyre-version = "0.0.20"; # also change typeshed revision below with $pyre-src/.typeshed-version
+ pyre-version = "0.0.22"; # also change typeshed revision below with $pyre-src/.typeshed-version
pyre-src = fetchFromGitHub {
owner = "facebook";
repo = "pyre-check";
rev = "v${pyre-version}";
- sha256 = "1alkhdhvmigdhxvvarh0lr5s3b1s6q4arykip2dqb62vs8064s17";
+ sha256 = "057vy6zmgwsi0ag9n4m6sszhahmfk2s1ywm36nyfs7w4d0wnk92s";
};
versionFile = writeScript "version.ml" ''
cat > "./version.ml" <<EOF
@@ -41,6 +41,8 @@ let
ppxlib
dune
ounit
+ base64
+ sqlite.dev
# python36Packages.python36Full # TODO
];
@@ -115,7 +117,16 @@ in python3.pkgs.buildPythonApplication rec {
buildInputs = [ pyre-bin ];
nativeBuildInputs = [ rsync ]; # only required for build-pypi-package.sh
- propagatedBuildInputs = with python3.pkgs; [ docutils typeshed ];
+ propagatedBuildInputs = with python3.pkgs; [
+ docutils
+ typeshed
+ click-log
+ ipython
+ sqlalchemy
+ munch
+ xxhash
+ ujson
+ ];
buildPhase = ''
bash scripts/build-pypi-package.sh --version ${pyre-version} --bundle-typeshed ${typeshed}
cp -r build/dist dist
From 11a6d01db6685344d1ef6d1363e2437be3a60614 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Tue, 9 Apr 2019 23:54:39 +0200
Subject: [PATCH 055/115] Revert "resilio-sync: 2.6.2 -> 2.6.3" (#59235)
---
pkgs/applications/networking/resilio-sync/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix
index 8bdb7b456c3..c855277e225 100644
--- a/pkgs/applications/networking/resilio-sync/default.nix
+++ b/pkgs/applications/networking/resilio-sync/default.nix
@@ -9,12 +9,12 @@ let
in stdenv.mkDerivation rec {
name = "resilio-sync-${version}";
- version = "2.6.3";
+ version = "2.6.2";
src = fetchurl {
url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz";
sha256 = {
- "x86_64-linux" = "114k7dsxn7lzv6mjq9alsqxypvkah4lmjn5w6brbvgd6m6pdwslz";
+ "x86_64-linux" = "0vq8jz4v740zz3pvgqfya8mhy35fh49wpn8d08xjrs5062hl1yc2";
"i686-linux" = "1gvq29bkdqvbcgnnhl3018h564rswk3r88s33lx5iph1rpxc6v5h";
}.${stdenv.hostPlatform.system};
};
From d99925aad9cc8a3a38f50061416bc606e0e024fe Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Tue, 9 Apr 2019 17:56:46 -0400
Subject: [PATCH 056/115] simgear: 2018.2.2 -> 2018.3.1
---
pkgs/development/libraries/simgear/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix
index 927715535b5..11612eeb288 100644
--- a/pkgs/development/libraries/simgear/default.nix
+++ b/pkgs/development/libraries/simgear/default.nix
@@ -6,12 +6,12 @@
stdenv.mkDerivation rec {
name = "simgear-${version}";
- version = "2018.2.2";
- shortVersion = "2018.2";
+ version = "2018.3.1";
+ shortVersion = "2018.3";
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2";
- sha256 = "f61576bc36aae36f350154749df1cee396763604c06b8a71c4b50452d9151ce5";
+ sha256 = "0sm0v8v1sw5xzkzhf0gzh6fwx93hd62h5lm9s9hgci40x7480i99";
};
buildInputs = [ plib freeglut xorgproto libX11 libXext libXi
From 56219a599b6578c4f53bedbc8472116129818d76 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Tue, 9 Apr 2019 17:57:11 -0400
Subject: [PATCH 057/115] flightgear: 2018.2.2 -> 2018.3.1
---
pkgs/games/flightgear/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix
index b70dec62388..728709a12f6 100644
--- a/pkgs/games/flightgear/default.nix
+++ b/pkgs/games/flightgear/default.nix
@@ -6,14 +6,14 @@
}:
let
- version = "2018.2.2";
- shortVersion = "2018.2";
+ version = "2018.3.1";
+ shortVersion = "2018.3";
data = stdenv.mkDerivation rec {
name = "flightgear-base-${version}";
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2";
- sha256 = "c89b94e4cf3cb7eda728daf6cca6dd051f7a47863776c99fd2f3fe0054400ac4";
+ sha256 = "1h69ifj84l4k0f497ybk51xj3bprzw4xvwrwzzj708zhkjk78fmh";
};
phases = [ "installPhase" ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2";
- sha256 = "61f809ef0a3f6908d156f0c483ed5313d31b5a6ac74761955d0b266751718147";
+ sha256 = "0h56npn00b6fd38cf5cha82nnglxmhd12b7h2rn3gjymwhviyjix";
};
# Of all the files in the source and data archives, there doesn't seem to be
From 82b8393bc4d102ea31b03d05fa0f3d2026e9976d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 9 Apr 2019 21:44:38 -0400
Subject: [PATCH 058/115] tk: use aqua backend on darwin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Most users don’t have xquartz, so let’s use the default window system
for macOS.
---
pkgs/development/libraries/tk/generic.nix | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix
index b3cc2b7506b..d5eaff77c11 100644
--- a/pkgs/development/libraries/tk/generic.nix
+++ b/pkgs/development/libraries/tk/generic.nix
@@ -1,4 +1,6 @@
-{ stdenv, src, pkgconfig, tcl, libXft, fontconfig, patches ? [], ... }:
+{ stdenv, lib, src, pkgconfig, tcl, libXft, fontconfig, patches ? []
+, enableAqua ? stdenv.isDarwin, darwin
+, ... }:
stdenv.mkDerivation {
name = "tk-${tcl.version}";
@@ -21,15 +23,14 @@ stdenv.mkDerivation {
configureFlags = [
"--with-tcl=${tcl}/lib"
- ];
+ ] ++ stdenv.lib.optional enableAqua "--enable-aqua";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ ]
- ++ stdenv.lib.optional stdenv.isDarwin fontconfig;
propagatedBuildInputs = [ tcl libXft ];
-
- NIX_CFLAGS_LINK = if stdenv.isDarwin then "-lfontconfig" else null;
+ buildInputs = lib.optional enableAqua (with darwin; with apple_sdk.frameworks; [
+ Cocoa cf-private
+ ]);
doCheck = false; # fails. can't find itself
From 2fe4ab320096e43ac4f8f382901701d63dc66ef2 Mon Sep 17 00:00:00 2001
From: Amar1729 <amar.paul16@gmail.com>
Date: Tue, 18 Dec 2018 18:29:28 -0500
Subject: [PATCH 059/115] argp-standalone: add x86_64-linux support
---
.../libraries/argp-standalone/default.nix | 50 ++++++++++++-------
1 file changed, 32 insertions(+), 18 deletions(-)
diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/development/libraries/argp-standalone/default.nix
index f14c77f666b..4b8093f7403 100644
--- a/pkgs/development/libraries/argp-standalone/default.nix
+++ b/pkgs/development/libraries/argp-standalone/default.nix
@@ -1,5 +1,24 @@
{ stdenv, fetchurl, fetchpatch }:
+let
+ patch-argp-fmtstream = fetchpatch {
+ name = "patch-argp-fmtstream.h";
+ url = "https://raw.githubusercontent.com/Homebrew/formula-patches/b5f0ad3/argp-standalone/patch-argp-fmtstream.h";
+ sha256 = "5656273f622fdb7ca7cf1f98c0c9529bed461d23718bc2a6a85986e4f8ed1cb8";
+ };
+
+ patch-throw-in-funcdef = fetchpatch {
+ name = "argp-standalone-1.3-throw-in-funcdef.patch";
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/argp-standalone/files/argp-standalone-1.3-throw-in-funcdef.patch?id=409d0e2a9c9c899fb1fb04cc808fe0aff3f745ca";
+ sha256 = "0b2b4l1jkvmnffl22jcn4ydzxy2i7fnmmnfim12f0yg5pb8fs43c";
+ };
+
+ patch-shared = fetchpatch {
+ name = "argp-standalone-1.3-shared.patch";
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/argp-standalone/files/argp-standalone-1.3-shared.patch?id=409d0e2a9c9c899fb1fb04cc808fe0aff3f745ca";
+ sha256 = "1xx2zdc187a1m2x6c1qs62vcrycbycw7n0q3ks2zkxpaqzx2dgkw";
+ };
+in
stdenv.mkDerivation rec {
name = "argp-standalone-1.3";
@@ -8,24 +27,19 @@ stdenv.mkDerivation rec {
sha256 = "dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be";
};
- patches = [
- (if stdenv.hostPlatform.isDarwin then
- fetchpatch {
- name = "patch-argp-fmtstream.h";
- url = "https://raw.githubusercontent.com/Homebrew/formula-patches/b5f0ad3/argp-standalone/patch-argp-fmtstream.h";
- sha256 = "5656273f622fdb7ca7cf1f98c0c9529bed461d23718bc2a6a85986e4f8ed1cb8";
- }
- else null)
- ];
+ patches =
+ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ patch-argp-fmtstream ]
+ ++ stdenv.lib.optionals stdenv.hostPlatform.isLinux [ patch-throw-in-funcdef patch-shared ];
- patchFlags = "-p0";
+ patchFlags = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "-p0";
- postInstall =
- ''
- mkdir -p $out/lib $out/include
- cp libargp.a $out/lib
- cp argp.h $out/include
- '';
+ preConfigure = stdenv.lib.optionalString stdenv.hostPlatform.isLinux "export CFLAGS='-fgnu89-inline'";
+
+ postInstall = ''
+ mkdir -p $out/lib $out/include
+ cp libargp.a $out/lib
+ cp argp.h $out/include
+ '';
doCheck = true;
@@ -34,8 +48,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = "https://www.lysator.liu.se/~nisse/misc/";
description = "Standalone version of arguments parsing functions from GLIBC";
- platforms = platforms.darwin;
+ platforms = with platforms; darwin ++ [ "x86_64-linux" ];
maintainers = with maintainers; [ amar1729 ];
- license = stdenv.lib.licenses.gpl2;
+ license = licenses.gpl2;
};
}
From 81b697db589861f6c0eff8a9a0146b8936dcbd64 Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Wed, 10 Apr 2019 09:48:42 +0700
Subject: [PATCH 060/115] burpsuite: 1.7.23 -> 1.7.36
---
pkgs/tools/networking/burpsuite/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix
index 6c440fc48fd..993e9ad7469 100644
--- a/pkgs/tools/networking/burpsuite/default.nix
+++ b/pkgs/tools/networking/burpsuite/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, jre, runtimeShell }:
let
- version = "1.7.23";
+ version = "1.7.36";
jar = fetchurl {
name = "burpsuite.jar";
url = "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar";
- sha256 = "1y83qisn9pkn88vphpli7h8nacv8jv3sq0h04zbri25nfkgvl4an";
+ sha256 = "12m4fn04yd89r6x4m4yd668p5v0bs9b1h6p239bjj11ykyi3g51a";
};
launcher = ''
#!${runtimeShell}
From 9ddf85d1d2dd1b897c673be4a8e708037b2dea26 Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Tue, 9 Apr 2019 20:43:24 -0400
Subject: [PATCH 061/115] gnomeExtensions.appindicator: 23.1 -> 28
Update the GNOME appindicator support extension to the latest version.
See the GitHub page for the full changelog:
https://github.com/ubuntu/gnome-shell-extension-appindicator/compare/v23...v28
---
pkgs/desktops/gnome-3/extensions/appindicator/default.nix | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
index 834cc7e0283..d8180096d2f 100644
--- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, gnome3 }:
stdenv.mkDerivation rec {
name = "gnome-shell-extension-appindicator-${version}";
- version = "23.1";
+ version = "28";
src = fetchFromGitHub {
owner = "Ubuntu";
repo = "gnome-shell-extension-appindicator";
rev = "v${version}";
- sha256 = "1v10jdncb9d5f5i0yzir20km4zvsb6ql7p8mv8w9ihw318rzh3qv";
+ sha256 = "03sgb2xkb4lzp8pbb7g56q29y1r764qzpc0j4d4m1gi0sb39sxrl";
};
# This package has a Makefile, but it's used for building a zip for
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
description = "AppIndicator/KStatusNotifierItem support for GNOME Shell";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jonafato ];
+ platforms = gnome3.gnome-shell.meta.platforms;
homepage = https://github.com/Ubuntu/gnome-shell-extension-appindicator;
};
}
From d269620c62df08e23addbf28cab7f78e99d02aff Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Mon, 8 Apr 2019 17:24:01 -0400
Subject: [PATCH 062/115] plank: cleanup
* placeholder
* vala should be native
* no aliases
* drop gobject-introspection
---
pkgs/applications/misc/plank/default.nix | 41 ++++++++++++++++--------
1 file changed, 27 insertions(+), 14 deletions(-)
diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix
index cc6b74dc998..8aff573ab83 100644
--- a/pkgs/applications/misc/plank/default.nix
+++ b/pkgs/applications/misc/plank/default.nix
@@ -1,36 +1,49 @@
{ stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3
, libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2
-, bamf, gdk_pixbuf, libdbusmenu-gtk3, file, gnome-menus
-, wrapGAppsHook, autoreconfHook, gobject-introspection }:
+, bamf, gdk_pixbuf, libdbusmenu-gtk3, file, gnome-menus, libgee
+, wrapGAppsHook, autoreconfHook, pantheon }:
stdenv.mkDerivation rec {
pname = "plank";
version = "0.11.4";
- name = "${pname}-${version}";
src = fetchurl {
- url = "https://launchpad.net/${pname}/1.0/${version}/+download/${name}.tar.xz";
+ url = "https://launchpad.net/${pname}/1.0/${version}/+download/${pname}-${version}.tar.xz";
sha256 = "1f41i45xpqhjxql9nl4a1sz30s0j46aqdhbwbvgrawz6himcvdc8";
};
nativeBuildInputs = [
- pkgconfig
+ autoreconfHook
+ gnome3.gnome-common
intltool
libxml2 # xmllint
+ pkgconfig
+ vala
wrapGAppsHook
- gobject-introspection
- autoreconfHook
];
- buildInputs = [ vala atk cairo glib gnome-menus
- gtk3 gnome3.libgee libwnck3 libX11 libXfixes
- libXi pango gnome3.gnome-common bamf gdk_pixbuf
- libdbusmenu-gtk3 gnome3.dconf ];
+ buildInputs = [
+ atk
+ bamf
+ cairo
+ gdk_pixbuf
+ glib
+ gnome-menus
+ gnome3.dconf
+ gtk3
+ libX11
+ libXfixes
+ libXi
+ libdbusmenu-gtk3
+ libgee
+ libwnck3
+ pango
+ ];
# fix paths
makeFlags = [
- "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/"
- "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
+ "INTROSPECTION_GIRDIR=${placeholder ''out''}/share/gir-1.0/"
+ "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0"
];
# Make plank's application launcher hidden in Pantheon
@@ -46,6 +59,6 @@ stdenv.mkDerivation rec {
homepage = https://launchpad.net/plank;
license = licenses.gpl3Plus;
platforms = platforms.linux;
- maintainers = with maintainers; [ davidak ];
+ maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers;
};
}
From 5274d8eb172249c195069e8ddba4466a75f993da Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Mon, 8 Apr 2019 17:29:28 -0400
Subject: [PATCH 063/115] pantheon.elementary-files: 4.1.6 -> 4.1.7
https://github.com/elementary/files/releases/tag/4.1.7
---
pkgs/desktops/pantheon/apps/elementary-files/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index d224dbce789..fc9d8b5236d 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
pname = "files";
- version = "4.1.6";
+ version = "4.1.7";
name = "elementary-${pname}-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1c17d5lvpzyqd7mmzyfms80am46s566xr1r7b27rgv9w7vpzpgm0";
+ sha256 = "1fz7zawqkb9fa2vy36hg1wz1sxzgm307hp5kckb7icarqfrx0gih";
};
passthru = {
From ebf3da486f4deb13e000b25e16dc643c34a7cabb Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Mon, 8 Apr 2019 17:30:20 -0400
Subject: [PATCH 064/115] pantheon.switchboard-plug-display: 2.1.6 -> 2.1.7
https://github.com/elementary/switchboard-plug-display/releases/tag/2.1.7
---
.../pantheon/apps/switchboard-plugs/display/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
index 192f8a69ae9..643bce5fe74 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-display";
- version = "2.1.6";
+ version = "2.1.7";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0pw21bnc79shiynmg7h9bs1x1v011lh07ypn22j73yhmxp6wiypd";
+ sha256 = "1icz1is576d2w5a6wc06bnkg2vbsj5g6mz0b6ikzyjddr6j743ql";
};
passthru = {
From ee4f83c03185281031e5dc8cb42b5c6f570d3cd1 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 10 Apr 2019 13:10:36 +0800
Subject: [PATCH 065/115] python3Packages.WazeRouteCalculator: 0.7.2 -> 0.9.0
---
.../python-modules/WazeRouteCalculator/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/WazeRouteCalculator/default.nix b/pkgs/development/python-modules/WazeRouteCalculator/default.nix
index 670e07e55d4..6a44dc9a75f 100644
--- a/pkgs/development/python-modules/WazeRouteCalculator/default.nix
+++ b/pkgs/development/python-modules/WazeRouteCalculator/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "WazeRouteCalculator";
- version = "0.7.2";
+ version = "0.9";
src = fetchPypi {
inherit pname version;
- sha256 = "09fe1bfb32291a658ba9baffe3fe176693f41362d74caba60fb04be01b447fa1";
+ sha256 = "1kwr7r1cn9xxvf9asxqhsy4swx4v6hsgw5cr5wmn71qg11k1i5cx";
};
propagatedBuildInputs = [ requests ];
From 03653d68a9779941bea05f0ffb5eb71ba0228c4f Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Mon, 8 Apr 2019 17:31:04 -0400
Subject: [PATCH 066/115] pantheon.switchboard-plug-sound: 2.2.0 -> 2.2.1
https://github.com/elementary/switchboard-plug-sound/releases/tag/2.2.1
---
.../pantheon/apps/switchboard-plugs/sound/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
index baf5becd347..c0f005cba2f 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-sound";
- version = "2.2.0";
+ version = "2.2.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "101a39v8fssc7s56cpi60zsggvw66y9gaxwjvawds928cll0yiy9";
+ sha256 = "0frml591r82j7hf1zlccgv8pzk3w10x470f9nzvdgdjpz0r776k2";
};
passthru = {
From ead2380ae978d86aaeefb37202584a34c9a3bc65 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 10 Apr 2019 01:03:03 -0400
Subject: [PATCH 067/115] pantheon.switchboard-plug-bluetooth: 2.2.1 -> 2.2.2
https://github.com/elementary/switchboard-plug-bluetooth/releases/tag/2.2.2
---
.../pantheon/apps/switchboard-plugs/bluetooth/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
index 697c3ac592b..f67b5bc7763 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-bluetooth";
- version = "2.2.1";
+ version = "2.2.2";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "13jm2idjsgqkvdz1dxgl2wwx7bsqahppf6cnpl0pmz167wahg5zp";
+ sha256 = "0rp9wa0yilc3wgwnybc6cryxphja7imixn45zhj475a4nb3afd0q";
};
passthru = {
From f2bb67c8067e40d58630d628607674826fc98735 Mon Sep 17 00:00:00 2001
From: Ken Micklas <kmicklas@gmail.com>
Date: Tue, 2 Apr 2019 12:45:37 -0400
Subject: [PATCH 068/115] androidndk-pkgs: Fix cc-wrapper flags
(cherry picked from commit 5f4bf240f51124ffa19a5fa0ac48bf144768d9ff)
---
pkgs/development/androidndk-pkgs/androidndk-pkgs.nix | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
index e43dacce625..aa266eb97fe 100644
--- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
+++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
@@ -100,8 +100,7 @@ rec {
$out/bin/${stdenv.targetPlatform.config}-c++ \
$out/bin/${stdenv.targetPlatform.config}-gcc \
$out/bin/${stdenv.targetPlatform.config}-g++ \
- -e '130i extraBefore+=(-Wl,--fix-cortex-a8)' \
- -e 's|^(extraBefore=)\(\)$|\1(${builtins.toString flags})|'
+ -e 's|^(extraBefore=)\((.*)\)$|\1(\2 -Wl,--fix-cortex-a8 ${builtins.toString flags})|'
'')
# GCC 4.9 is the first relase with "-fstack-protector"
+ lib.optionalString (lib.versionOlder targetInfo.gccVer "4.9") ''
From 589c2c2870340c21b799795f6ed3b09608676499 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 10 Apr 2019 01:23:02 -0400
Subject: [PATCH 069/115] androidndk: fixup mess
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
New android ndk (18) now uses clang. We were going through the wrapper
that are provided. This lead to surprising errors when building.
Ideally we could use the llvm linker as well, but this leads to errors
as many packages don’t support the llvm linker.
---
lib/systems/examples.nix | 8 --
.../androidndk-pkgs/androidndk-pkgs.nix | 101 +++++++++---------
pkgs/stdenv/cross/default.nix | 2 +-
3 files changed, 50 insertions(+), 61 deletions(-)
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 28a8d3cb9eb..3e90c5ec227 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -44,14 +44,6 @@ rec {
platform = platforms.aarch64-multiplatform;
};
- armv5te-android-prebuilt = rec {
- config = "armv5tel-unknown-linux-androideabi";
- sdkVer = "21";
- ndkVer = "18b";
- platform = platforms.armv5te-android;
- useAndroidPrebuilt = true;
- };
-
armv7a-android-prebuilt = rec {
config = "armv7a-unknown-linux-androideabi";
sdkVer = "24";
diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
index aa266eb97fe..ab206158959 100644
--- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
+++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
@@ -18,19 +18,28 @@ let
"x86_64-unknown-linux-gnu" = {
double = "linux-x86_64";
};
- "armv5tel-unknown-linux-androideabi" = {
- arch = "arm";
- triple = "arm-linux-androideabi";
- gccVer = "4.8";
+ "i686-unknown-linux-android" = {
+ triple = "i686-linux-android";
+ arch = "x86";
+ toolchain = "x86";
+ gccVer = "4.9";
+ };
+ "x86_64-unknown-linux-android" = {
+ triple = "x86_64-linux-android";
+ arch = "x86_64";
+ toolchain = "x86";
+ gccVer = "4.9";
};
"armv7a-unknown-linux-androideabi" = {
arch = "arm";
triple = "arm-linux-androideabi";
+ toolchain = "arm-linux-androideabi";
gccVer = "4.9";
};
"aarch64-unknown-linux-android" = {
arch = "arm64";
triple = "aarch64-linux-android";
+ toolchain = "aarch64-linux-android";
gccVer = "4.9";
};
}.${config} or
@@ -38,49 +47,49 @@ let
hostInfo = ndkInfoFun stdenv.hostPlatform;
targetInfo = ndkInfoFun stdenv.targetPlatform;
+
+ prefix = stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-");
in
rec {
# Misc tools
- binaries = let
- ndkBinDir =
- "${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.triple}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/bin";
- ndkGCCLibDir =
- "${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.triple}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/lib/gcc/${targetInfo.triple}/4.9.x";
+ binaries = runCommand "ndk-gcc-binutils" {
+ isClang = true; # clang based cc, but bintools ld
+ nativeBuildInputs = [ makeWrapper ];
+ propgatedBuildInputs = [ androidndk ];
+ } ''
+ mkdir -p $out/bin
- in runCommand "ndk-gcc-binutils" {
- isGNU = true; # for cc-wrapper
- nativeBuildInputs = [ makeWrapper ];
- propgatedBuildInputs = [ androidndk ];
- } ''
- mkdir -p $out/bin
- for prog in ${ndkBinDir}/${targetInfo.triple}-*; do
- prog_suffix=$(basename $prog | sed 's/${targetInfo.triple}-//')
- cat > $out/bin/${stdenv.targetPlatform.config}-$prog_suffix <<EOF
- #! ${stdenv.shell} -e
- $prog "\$@"
- EOF
- chmod +x $out/bin/${stdenv.targetPlatform.config}-$prog_suffix
- done
+ # llvm toolchain
+ for prog in ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${hostInfo.double}/bin/*; do
+ ln -s $prog $out/bin/$(basename $prog)
+ ln -s $prog $out/bin/${prefix}$(basename $prog)
+ done
- ln -s $out/bin/${stdenv.targetPlatform.config}-ld $out/bin/ld
- ln -s ${ndkGCCLibDir} $out/lib
- '';
+ # bintools toolchain
+ for prog in ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.toolchain}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/bin/*; do
+ prog_suffix=$(basename $prog | sed 's/${targetInfo.triple}-//')
+ ln -s $prog $out/bin/${stdenv.targetPlatform.config}-$prog_suffix
+ done
+
+ # shitty googly wrappers
+ rm -f $out/bin/${stdenv.targetPlatform.config}-gcc $out/bin/${stdenv.targetPlatform.config}-g++
+ '';
binutils = wrapBintoolsWith {
bintools = binaries;
libc = targetAndroidndkPkgs.libraries;
- extraBuildCommands = ''
- echo "--build-id" >> $out/nix-support/libc-ldflags
- '';
};
- gcc = wrapCCWith {
+ clang = wrapCCWith {
cc = binaries;
bintools = binutils;
libc = targetAndroidndkPkgs.libraries;
extraBuildCommands = ''
echo "-D__ANDROID_API__=${stdenv.targetPlatform.sdkVer}" >> $out/nix-support/cc-cflags
+ echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
+ echo "-resource-dir=$(echo ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${hostInfo.double}/lib*/clang/*)" >> $out/nix-support/cc-cflags
+ echo "--gcc-toolchain=${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.toolchain}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}" >> $out/nix-support/cc-cflags
''
+ lib.optionalString stdenv.targetPlatform.isAarch32 (let
p = stdenv.targetPlatform.platform.gcc or {}
@@ -98,16 +107,10 @@ rec {
sed -E -i \
$out/bin/${stdenv.targetPlatform.config}-cc \
$out/bin/${stdenv.targetPlatform.config}-c++ \
- $out/bin/${stdenv.targetPlatform.config}-gcc \
- $out/bin/${stdenv.targetPlatform.config}-g++ \
+ $out/bin/${stdenv.targetPlatform.config}-clang \
+ $out/bin/${stdenv.targetPlatform.config}-clang++ \
-e 's|^(extraBefore=)\((.*)\)$|\1(\2 -Wl,--fix-cortex-a8 ${builtins.toString flags})|'
- '')
- # GCC 4.9 is the first relase with "-fstack-protector"
- + lib.optionalString (lib.versionOlder targetInfo.gccVer "4.9") ''
- sed -E \
- -i $out/nix-support/add-hardening.sh \
- -e 's|(-fstack-protector)-strong|\1|g'
- '';
+ '');
};
# Bionic lib C and other libraries.
@@ -115,17 +118,11 @@ rec {
# We use androidndk from the previous stage, else we waste time or get cycles
# cross-compiling packages to wrap incorrectly wrap binaries we don't include
# anyways.
- libraries =
- let
- includePath = "${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include";
- asmIncludePath = "${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include/${targetInfo.triple}";
- libPath = "${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/lib/";
- in
- runCommand "bionic-prebuilt" {} ''
- mkdir -p $out
- cp -r ${includePath} $out/include
- chmod +w $out/include
- cp -r ${asmIncludePath}/* $out/include
- ln -s ${libPath} $out/lib
- '';
+ libraries = runCommand "bionic-prebuilt" {} ''
+ mkdir -p $out
+ cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include $out/include
+ chmod +w $out/include
+ cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include/${targetInfo.triple}/* $out/include
+ ln -s ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/lib $out/lib
+ '';
}
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 7b4f8adc82f..43198f4e913 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -53,7 +53,7 @@ in lib.init bootStages ++ [
cc = if crossSystem.useiOSPrebuilt or false
then buildPackages.darwin.iosSdkPkgs.clang
else if crossSystem.useAndroidPrebuilt or false
- then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".gcc
+ then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".clang
else if crossSystem.useLLVM or false
then buildPackages.llvmPackages_7.lldClang
else buildPackages.gcc;
From 67e6e031e1af73f1edfdecf1931b21ecd393e5c1 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 10 Apr 2019 01:25:52 -0400
Subject: [PATCH 070/115] readline: add android patch
---
pkgs/development/libraries/readline/6.3.nix | 2 +-
.../development/libraries/readline/android.patch | 16 ++++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
create mode 100644 pkgs/development/libraries/readline/android.patch
diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix
index cbe6c083cb4..f9a20a535cb 100644
--- a/pkgs/development/libraries/readline/6.3.nix
+++ b/pkgs/development/libraries/readline/6.3.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
patches =
[ ./link-against-ncurses.patch
./no-arch_only-6.3.patch
- ]
+ ] ++ stdenv.lib.optional stdenv.hostPlatform.useAndroidPrebuilt ./android.patch
++
(let
patch = nr: sha256:
diff --git a/pkgs/development/libraries/readline/android.patch b/pkgs/development/libraries/readline/android.patch
new file mode 100644
index 00000000000..7e81774be36
--- /dev/null
+++ b/pkgs/development/libraries/readline/android.patch
@@ -0,0 +1,16 @@
+diff --git histlib.h histlib.h
+index c938a10..925ab72 100644
+--- histlib.h
++++ histlib.h
+@@ -51,9 +51,9 @@
+ #endif
+
+ #ifndef member
+-# ifndef strchr
++# if !defined (strchr) && !defined (__STDC__)
+ extern char *strchr ();
+-# endif
++# endif /* !strchr && !__STDC__ */
+ #define member(c, s) ((c) ? ((char *)strchr ((s), (c)) != (char *)NULL) : 0)
+ #endif
+
From 3463e6ad1793516edd7acecba70116c2d59571a2 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 9 Apr 2019 23:45:52 -0400
Subject: [PATCH 071/115] static: remove libjpeg static override
it is not necessary
---
pkgs/top-level/static.nix | 3 ---
1 file changed, 3 deletions(-)
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
index e6ef50e7ee9..fe9c04de04c 100644
--- a/pkgs/top-level/static.nix
+++ b/pkgs/top-level/static.nix
@@ -95,9 +95,6 @@ in {
static = true;
shared = false;
};
- libjpeg = super.libjpeg.override {
- static = true;
- };
gifsicle = super.gifsicle.override {
static = true;
};
From ac491d2df7365b304b96a1f3606ae8ba1522ed7d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 10 Apr 2019 01:31:04 -0400
Subject: [PATCH 072/115] systems: remove android armv5te platform
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
this isn’t useful any more because the ndk we use no longer supports it.
---
lib/systems/platforms.nix | 10 ----------
pkgs/development/androidndk-pkgs/androidndk-pkgs.nix | 2 +-
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index 03bfce25610..92de3016266 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -253,16 +253,6 @@ rec {
kernelTarget = "zImage";
};
- # https://developer.android.com/ndk/guides/abis#armeabi
- armv5te-android = {
- name = "armeabi";
- gcc = {
- arch = "armv5te";
- float = "soft";
- float-abi = "soft";
- };
- };
-
# https://developer.android.com/ndk/guides/abis#v7a
armv7a-android = {
name = "armeabi-v7a";
diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
index ab206158959..fbd4fdf3d6b 100644
--- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
+++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
@@ -27,7 +27,7 @@ let
"x86_64-unknown-linux-android" = {
triple = "x86_64-linux-android";
arch = "x86_64";
- toolchain = "x86";
+ toolchain = "x86_64";
gccVer = "4.9";
};
"armv7a-unknown-linux-androideabi" = {
From 7541cbb9052743e703e7137c463ed01c2793f91d Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 10 Apr 2019 14:49:33 +0800
Subject: [PATCH 073/115] python3Packages.pyupdate: 1.3.5 -> 1.3.6
---
pkgs/development/python-modules/pyupdate/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pyupdate/default.nix b/pkgs/development/python-modules/pyupdate/default.nix
index bfb0787a1bb..d9ff4369c7a 100644
--- a/pkgs/development/python-modules/pyupdate/default.nix
+++ b/pkgs/development/python-modules/pyupdate/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "pyupdate";
- version = "1.3.5";
+ version = "1.3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "1qxbakhsgmdc5aakhkadr26dlhi0lma7170b245sragn170fqjxf";
+ sha256 = "151dxqvdpik4jy84sq6fhjyrq2qq5l70dccgxdbxxf9qyjxpywfl";
};
propagatedBuildInputs = [ requests ];
From 99c63147e0d587d0afa6596b23acdfdf83ee7ac0 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 10 Apr 2019 03:34:07 -0400
Subject: [PATCH 074/115] gnome-podcasts: fix build
---
pkgs/applications/audio/gnome-podcasts/default.nix | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix
index c8db1ac6d10..670641fae75 100644
--- a/pkgs/applications/audio/gnome-podcasts/default.nix
+++ b/pkgs/applications/audio/gnome-podcasts/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitLab, meson, ninja, gettext, cargo, rustc, python3, rustPlatform, pkgconfig, gnome3
+{ stdenv, fetchurl, fetchpatch, fetchFromGitLab, meson, ninja, gettext, cargo, rustc, python3, rustPlatform, pkgconfig, gnome3
, glib, libhandy, gtk3, dbus, openssl, sqlite, gst_all_1, wrapGAppsHook }:
# TODO: build from git for easier updates
@@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
sha256 = "0g2rk3w251fp5jwbxs5ya1adv8nsgdqjy1vmfg8qqab6qyndhbrc";
};
+ patches = [
+ # podcasts-data would fail to build because it errors on warnings
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/World/podcasts/commit/7dc1b25ee7fc59a188312d31b1fa00c3110ae63e.patch";
+ sha256 = "03ibbh1snk1391vnni529agqs14lzg5g0axjgpf3gn8dwwh1yvd5";
+ })
+ ];
+
# src = fetchFromGitLab {
# domain = "gitlab.gnome.org";
# owner = "World";
From 3c2e7e91e545834edcc756b4ccca007d22453c45 Mon Sep 17 00:00:00 2001
From: Andrew Dunham <andrew@du.nham.ca>
Date: Wed, 10 Apr 2019 02:10:44 -0700
Subject: [PATCH 075/115] aws-vault: 4.3.0 -> 4.5.1 (#59254)
---
pkgs/tools/admin/aws-vault/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix
index 71360f8030c..03b0ff5c001 100644
--- a/pkgs/tools/admin/aws-vault/default.nix
+++ b/pkgs/tools/admin/aws-vault/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "${pname}-${version}";
pname = "aws-vault";
- version = "4.3.0";
+ version = "4.5.1";
goPackagePath = "github.com/99designs/${pname}";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "99designs";
repo = pname;
rev = "v${version}";
- sha256 = "0cwzvw1rcvg7y3m8dahr9r05s4i9apnfw5xhiaf0rlkdh3vy33wp";
+ sha256 = "0y64fx15p9ls829lif7c0jaxyclzpnr8l5cyw25q545878dzmcs5";
};
# set the version. see: aws-vault's Makefile
From fe88eb233177c38d4bc52b735037e34139625dc0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 10 Apr 2019 02:31:54 -0700
Subject: [PATCH 076/115] c-blosc: 1.14.4 -> 1.16.2 (#56605)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/c-blosc/versions
---
pkgs/development/libraries/c-blosc/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix
index c52d7c2756d..4c28ca9f2c7 100644
--- a/pkgs/development/libraries/c-blosc/default.nix
+++ b/pkgs/development/libraries/c-blosc/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "c-blosc-${version}";
- version = "1.14.4";
+ version = "1.16.2";
src = fetchFromGitHub {
owner = "Blosc";
repo = "c-blosc";
rev = "v${version}";
- sha256 = "195w96gl75mkxxqq6qjsmb2s1lq8z95qlc71fr5a7sckslcwglh0";
+ sha256 = "19wb699rb5bn6h9qhw1m18m2w77lws7r50vxpgrvggnl27mvm3xc";
};
buildInputs = [ cmake ];
From 503d4b5e1adb0547d00d92432f8b72f67fb00edd Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Wed, 10 Apr 2019 17:48:30 +0800
Subject: [PATCH 077/115] ethabi: 4.1.0 -> 7.0.0 (#59218)
---
pkgs/applications/altcoins/ethabi.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/altcoins/ethabi.nix b/pkgs/applications/altcoins/ethabi.nix
index d0bc700eb70..10cf19ccb39 100644
--- a/pkgs/applications/altcoins/ethabi.nix
+++ b/pkgs/applications/altcoins/ethabi.nix
@@ -4,16 +4,16 @@ with rustPlatform;
buildRustPackage rec {
name = "ethabi-${version}";
- version = "4.1.0";
+ version = "7.0.0";
src = fetchFromGitHub {
owner = "paritytech";
repo = "ethabi";
rev = "v${version}";
- sha256 = "0kxflixmgycdh7sv73zf2mrkbcfzzw7f5sjbsjks9crc9cvjqi6p";
+ sha256 = "1gqd3vwsvv1wvi659qcdywgmh41swblpwmmxb033k8irw581dwq4";
};
- cargoSha256 = "18rigpsmfiv6im2sspnxadgqrlfdp9dd75ji8s56ksc9g7hrc3wz";
+ cargoSha256 = "0ckj5s5fr7xdqpnn4m9zwa1w71g6wwqqvax6f4xkijxdcx83n6c2";
cargoBuildFlags = ["--features cli"];
From d7d5bab30e55867d325a8255919d7f79697f4c99 Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Wed, 10 Apr 2019 17:54:29 +0800
Subject: [PATCH 078/115] powerline-go: 1.11.0 -> 1.12.1 (#59222)
---
pkgs/tools/misc/powerline-go/default.nix | 4 ++--
pkgs/tools/misc/powerline-go/deps.nix | 26 ++++++++++++------------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix
index b0d1afc654d..10972d9fa89 100644
--- a/pkgs/tools/misc/powerline-go/default.nix
+++ b/pkgs/tools/misc/powerline-go/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "powerline-go";
- version = "1.11.0";
+ version = "1.12.1";
name = "${pname}-${version}";
rev = "v${version}";
@@ -12,7 +12,7 @@ buildGoPackage rec {
owner = "justjanne";
repo = pname;
inherit rev;
- sha256 = "1s3d9p4jf23n63n6vx3frnw3wkmg3kyiazapixy66790qkx6ddi9";
+ sha256 = "0r2n3hjgr7c7nwwcph7i2lv3709z9cyc8gmsinlzjwny998akyf4";
};
goDeps = ./deps.nix;
diff --git a/pkgs/tools/misc/powerline-go/deps.nix b/pkgs/tools/misc/powerline-go/deps.nix
index e033a1cf48c..85bf229a269 100644
--- a/pkgs/tools/misc/powerline-go/deps.nix
+++ b/pkgs/tools/misc/powerline-go/deps.nix
@@ -1,12 +1,12 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
[
{
goPackagePath = "github.com/mattn/go-runewidth";
fetch = {
type = "git";
url = "https://github.com/mattn/go-runewidth";
- rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb";
- sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g";
+ rev = "703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211";
+ sha256 = "0znpyz71gajx3g0j2zp63nhjj2c07g16885vxv4ykwnrfmzbgk4w";
};
}
{
@@ -14,8 +14,8 @@
fetch = {
type = "git";
url = "https://github.com/shirou/gopsutil";
- rev = "57f370e13068146efe1cb7129f79e5d51da8a242";
- sha256 = "1ij0bbnfjj65afin8vhccr3cxvg6r0awmvcvb2ilza5wbbsslggb";
+ rev = "2cbc9195c892b304060269ef280375236d2fcac9";
+ sha256 = "1m66hhh37lxn525y2gnmh4ipc88c3wfiixr5ydywa9v1z90wxw5r";
};
}
{
@@ -23,8 +23,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
- rev = "2d027ae1dddd4694d54f7a8b6cbe78dca8720226";
- sha256 = "1fdab3scp9fm88jxwjw8a3hh5ykx6ads3zcacgy48k2n6b0rqrdw";
+ rev = "38d8ce5564a5b71b2e3a00553993f1b9a7ae852f";
+ sha256 = "1x52liy2540pw75sqsw4vpg41vq2dnmqpc0j5r7k6jxv6xmbr5mb";
};
}
{
@@ -32,8 +32,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
- rev = "9950ad118b73f9207b991f01920a3509c68f7f2b";
- sha256 = "1607m89kpdxgc2lj14mrp02bg7c42g1zv0fzrl5961gvm5qzbjja";
+ rev = "4b34438f7a67ee5f45cc6132e2bad873a20324e9";
+ sha256 = "1xnsiaikz62wqjpaly1j4nqwp504gih5mgw9wdj1pp1d4bmx0vl0";
};
}
{
@@ -41,8 +41,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
- rev = "7dd2c8130f5e924233f5543598300651c386d431";
- sha256 = "0ja6skzplirb7dgf5d4wi0navinf8j5iakak020lwm7287wnpcrg";
+ rev = "f4905fbd45b6790792202848439271c74074bbfd";
+ sha256 = "184d6ap2g92jvx0532lymdqbnx9vi9ips4dq5lnqbby0caccc6r1";
};
}
{
@@ -50,8 +50,8 @@
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
- rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
- sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+ rev = "51d6538a90f86fe93ac480b35f37b2be17fef232";
+ sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
};
}
]
From 57705705ae33e334fd2a8ae489a2b87df5243a81 Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Wed, 10 Apr 2019 18:05:24 +0800
Subject: [PATCH 079/115] cargo-xbuild: init at 0.5.7 (#59228)
---
.../tools/rust/cargo-xbuild/default.nix | 22 +++++++++++++++++++
pkgs/top-level/all-packages.nix | 1 +
2 files changed, 23 insertions(+)
create mode 100644 pkgs/development/tools/rust/cargo-xbuild/default.nix
diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix
new file mode 100644
index 00000000000..60d0ee64465
--- /dev/null
+++ b/pkgs/development/tools/rust/cargo-xbuild/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+ name = "cargo-xbuild-${version}";
+ version = "0.5.7";
+
+ src = fetchFromGitHub {
+ owner = "rust-osdev";
+ repo = "cargo-xbuild";
+ rev = "v${version}";
+ sha256 = "11hjyf16m4ri4c912jsdmqq88xcrys119135nz48y5p7b4yp0s7a";
+ };
+
+ cargoSha256 = "077qiqm470iqcgxqjzbmzxikxd5862vyg788hacli4yzpvyaq9r9";
+
+ meta = with stdenv.lib; {
+ description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc";
+ homepage = https://github.com/rust-osdev/cargo-xbuild;
+ license = with licenses; [ mit asl20 ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a821c55f31..de633d80020 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7695,6 +7695,7 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { };
+ cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { };
pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { };
rainicorn = callPackage ../development/tools/rust/rainicorn { };
From c5b633a19d2cdb5a372df9c55e5582d550bcc067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 10 Apr 2019 07:29:46 -0300
Subject: [PATCH 080/115] deepin.udisks2-qt5: init at 0.0.1 (#59247)
---
pkgs/desktops/deepin/default.nix | 1 +
pkgs/desktops/deepin/udisks2-qt5/default.nix | 41 ++++++++++++++++++++
2 files changed, 42 insertions(+)
create mode 100644 pkgs/desktops/deepin/udisks2-qt5/default.nix
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 019571498ea..b0d334ff3b4 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -49,6 +49,7 @@ let
qcef = callPackage ./qcef { };
qt5dxcb-plugin = callPackage ./qt5dxcb-plugin { };
qt5integration = callPackage ./qt5integration { };
+ udisks2-qt5 = callPackage ./udisks2-qt5 { };
};
diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/pkgs/desktops/deepin/udisks2-qt5/default.nix
new file mode 100644
index 00000000000..f4dae779061
--- /dev/null
+++ b/pkgs/desktops/deepin/udisks2-qt5/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, qmake, qtbase, pkgconfig, deepin }:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "udisks2-qt5";
+ version = "0.0.1";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "1gk4jmq7mrzk181r6man2rz1iyzkfasz7053a30h4nn24mq8ikig";
+ };
+
+ nativeBuildInputs = [
+ deepin.setupHook
+ qmake
+ ];
+
+ buildInputs = [
+ qtbase
+ ];
+
+ postPatch = ''
+ searchHardCodedPaths
+ '';
+
+ postFixup = ''
+ searchHardCodedPaths $out
+ '';
+
+ passthru.updateScript = deepin.updateScript { inherit name; };
+
+ meta = with stdenv.lib; {
+ description = "UDisks2 D-Bus interfaces binding for Qt5";
+ homepage = https://github.com/linuxdeepin/udisks2-qt5;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
From a3f9dc16cd47075a1b354188487a7f4aca53057f Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 10 Apr 2019 12:26:24 +0200
Subject: [PATCH 081/115] nvme-cli: 1.8 -> 1.8.1
---
pkgs/os-specific/linux/nvme-cli/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix
index 48ab36a5cff..4bf1e41bd57 100644
--- a/pkgs/os-specific/linux/nvme-cli/default.nix
+++ b/pkgs/os-specific/linux/nvme-cli/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "nvme-cli-${version}";
- version = "1.8";
+ version = "1.8.1";
src = fetchFromGitHub {
owner = "linux-nvme";
repo = "nvme-cli";
rev = "v${version}";
- sha256 = "0k4qnxm9sgr4bqhg7c3g870f3jpawm5yp0vp0p031a9qgnzmklb9";
+ sha256 = "0agnxfcwgnnimmxrdpg4lmiqc5ai9b4amk8krriw01lflxi3xzn0";
};
makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
From ad41c1f1c0edbf14461dbec9c2c941a32c7a647c Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Tue, 9 Apr 2019 22:51:13 +0200
Subject: [PATCH 082/115] fluentd: 1.2.3 -> 1.4.2
---
.../ruby-modules/gem-config/default.nix | 7 +
pkgs/tools/misc/fluentd/Gemfile | 1 -
pkgs/tools/misc/fluentd/Gemfile.lock | 679 +-------
pkgs/tools/misc/fluentd/gemset.nix | 1525 ++---------------
4 files changed, 245 insertions(+), 1967 deletions(-)
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 7dc0b7b88e9..53506ffe8da 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -436,6 +436,13 @@ in
buildInputs = [ taglib ];
};
+ thrift = attrs: {
+ # See: https://stackoverflow.com/questions/36378190/cant-install-thrift-gem-on-os-x-el-capitan/36523125#36523125
+ # Note that thrift-0.8.0 is a dependency of fluent-plugin-scribe which is a dependency of fluentd.
+ buildFlags = lib.optional (stdenv.isDarwin && lib.versionOlder attrs.version "0.9.2.0")
+ "--with-cppflags=\"-D_FORTIFY_SOURCE=0 -Wno-macro-redefined -Wno-shift-negative-value\"";
+ };
+
timfel-krb5-auth = attrs: {
buildInputs = [ kerberos ];
};
diff --git a/pkgs/tools/misc/fluentd/Gemfile b/pkgs/tools/misc/fluentd/Gemfile
index 3933eb13180..952c419ad31 100644
--- a/pkgs/tools/misc/fluentd/Gemfile
+++ b/pkgs/tools/misc/fluentd/Gemfile
@@ -1,7 +1,6 @@
source "https://rubygems.org"
gem 'fluentd'
-gem 'fluent-plugin-elasticsearch'
gem 'fluent-plugin-record-reformer'
gem 'fluent-plugin-s3'
gem 'fluent-plugin-kinesis'
diff --git a/pkgs/tools/misc/fluentd/Gemfile.lock b/pkgs/tools/misc/fluentd/Gemfile.lock
index d5f78e807ff..3d852e36759 100644
--- a/pkgs/tools/misc/fluentd/Gemfile.lock
+++ b/pkgs/tools/misc/fluentd/Gemfile.lock
@@ -1,644 +1,82 @@
GEM
remote: https://rubygems.org/
specs:
- addressable (2.5.2)
+ addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
- aws-eventstream (1.0.1)
- aws-partitions (1.96.0)
- aws-sdk (3.0.1)
- aws-sdk-resources (~> 3)
- aws-sdk-acm (1.9.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-acmpca (1.2.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-alexaforbusiness (1.6.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-apigateway (1.13.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-applicationautoscaling (1.11.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-applicationdiscoveryservice (1.2.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-appstream (1.13.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-appsync (1.4.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-athena (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-autoscaling (1.6.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-autoscalingplans (1.3.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-batch (1.5.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-budgets (1.8.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-cloud9 (1.2.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-clouddirectory (1.5.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-cloudformation (1.6.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-cloudfront (1.4.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-cloudhsm (1.4.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-cloudhsmv2 (1.2.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-cloudsearch (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-cloudsearchdomain (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-cloudtrail (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-cloudwatch (1.6.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-cloudwatchevents (1.4.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-cloudwatchlogs (1.4.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-codebuild (1.12.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-codecommit (1.4.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-codedeploy (1.6.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-codepipeline (1.5.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-codestar (1.2.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-cognitoidentity (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-cognitoidentityprovider (1.5.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-cognitosync (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-comprehend (1.2.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-configservice (1.12.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-connect (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-core (3.22.1)
- aws-eventstream (~> 1.0)
+ aws-eventstream (1.0.2)
+ aws-partitions (1.149.0)
+ aws-sdk-core (3.48.3)
+ aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1.0)
- aws-sigv4 (~> 1.0)
+ aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-costandusagereportservice (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-costexplorer (1.7.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-databasemigrationservice (1.7.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-datapipeline (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-dax (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-devicefarm (1.7.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-directconnect (1.2.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-directoryservice (1.3.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-dlm (1.0.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-dynamodb (1.8.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-dynamodbstreams (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-ec2 (1.38.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-ecr (1.4.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-ecs (1.15.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-efs (1.2.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-eks (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-elasticache (1.4.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-elasticbeanstalk (1.8.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-elasticloadbalancing (1.3.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-elasticloadbalancingv2 (1.11.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-elasticsearchservice (1.6.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-elastictranscoder (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-emr (1.3.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-firehose (1.4.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-fms (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-gamelift (1.5.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-glacier (1.8.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-glue (1.10.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-greengrass (1.4.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-guardduty (1.5.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-health (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-iam (1.6.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-importexport (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv2 (~> 1.0)
- aws-sdk-inspector (1.5.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-iot (1.9.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-iot1clickdevicesservice (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-iot1clickprojects (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-iotanalytics (1.2.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-iotdataplane (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-iotjobsdataplane (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-kinesis (1.3.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-kinesisanalytics (1.3.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-kinesisvideo (1.2.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-kinesisvideoarchivedmedia (1.2.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-kinesisvideomedia (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-kms (1.6.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-lambda (1.8.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-lambdapreview (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-lex (1.4.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-lexmodelbuildingservice (1.6.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-lightsail (1.5.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-machinelearning (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-macie (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-marketplacecommerceanalytics (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-marketplaceentitlementservice (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-marketplacemetering (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-mediaconvert (1.5.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-medialive (1.8.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-mediapackage (1.2.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-mediastore (1.2.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-mediastoredata (1.2.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-mediatailor (1.2.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-migrationhub (1.3.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-mobile (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-mq (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-mturk (1.4.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-neptune (1.2.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-opsworks (1.4.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-opsworkscm (1.3.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-organizations (1.10.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-pi (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-pinpoint (1.6.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-polly (1.6.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-pricing (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-rds (1.23.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-redshift (1.5.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-rekognition (1.5.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-resourcegroups (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-resourcegroupstaggingapi (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-resources (3.22.0)
- aws-sdk-acm (~> 1)
- aws-sdk-acmpca (~> 1)
- aws-sdk-alexaforbusiness (~> 1)
- aws-sdk-apigateway (~> 1)
- aws-sdk-applicationautoscaling (~> 1)
- aws-sdk-applicationdiscoveryservice (~> 1)
- aws-sdk-appstream (~> 1)
- aws-sdk-appsync (~> 1)
- aws-sdk-athena (~> 1)
- aws-sdk-autoscaling (~> 1)
- aws-sdk-autoscalingplans (~> 1)
- aws-sdk-batch (~> 1)
- aws-sdk-budgets (~> 1)
- aws-sdk-cloud9 (~> 1)
- aws-sdk-clouddirectory (~> 1)
- aws-sdk-cloudformation (~> 1)
- aws-sdk-cloudfront (~> 1)
- aws-sdk-cloudhsm (~> 1)
- aws-sdk-cloudhsmv2 (~> 1)
- aws-sdk-cloudsearch (~> 1)
- aws-sdk-cloudsearchdomain (~> 1)
- aws-sdk-cloudtrail (~> 1)
- aws-sdk-cloudwatch (~> 1)
- aws-sdk-cloudwatchevents (~> 1)
- aws-sdk-cloudwatchlogs (~> 1)
- aws-sdk-codebuild (~> 1)
- aws-sdk-codecommit (~> 1)
- aws-sdk-codedeploy (~> 1)
- aws-sdk-codepipeline (~> 1)
- aws-sdk-codestar (~> 1)
- aws-sdk-cognitoidentity (~> 1)
- aws-sdk-cognitoidentityprovider (~> 1)
- aws-sdk-cognitosync (~> 1)
- aws-sdk-comprehend (~> 1)
- aws-sdk-configservice (~> 1)
- aws-sdk-connect (~> 1)
- aws-sdk-costandusagereportservice (~> 1)
- aws-sdk-costexplorer (~> 1)
- aws-sdk-databasemigrationservice (~> 1)
- aws-sdk-datapipeline (~> 1)
- aws-sdk-dax (~> 1)
- aws-sdk-devicefarm (~> 1)
- aws-sdk-directconnect (~> 1)
- aws-sdk-directoryservice (~> 1)
- aws-sdk-dlm (~> 1)
- aws-sdk-dynamodb (~> 1)
- aws-sdk-dynamodbstreams (~> 1)
- aws-sdk-ec2 (~> 1)
- aws-sdk-ecr (~> 1)
- aws-sdk-ecs (~> 1)
- aws-sdk-efs (~> 1)
- aws-sdk-eks (~> 1)
- aws-sdk-elasticache (~> 1)
- aws-sdk-elasticbeanstalk (~> 1)
- aws-sdk-elasticloadbalancing (~> 1)
- aws-sdk-elasticloadbalancingv2 (~> 1)
- aws-sdk-elasticsearchservice (~> 1)
- aws-sdk-elastictranscoder (~> 1)
- aws-sdk-emr (~> 1)
- aws-sdk-firehose (~> 1)
- aws-sdk-fms (~> 1)
- aws-sdk-gamelift (~> 1)
- aws-sdk-glacier (~> 1)
- aws-sdk-glue (~> 1)
- aws-sdk-greengrass (~> 1)
- aws-sdk-guardduty (~> 1)
- aws-sdk-health (~> 1)
- aws-sdk-iam (~> 1)
- aws-sdk-importexport (~> 1)
- aws-sdk-inspector (~> 1)
- aws-sdk-iot (~> 1)
- aws-sdk-iot1clickdevicesservice (~> 1)
- aws-sdk-iot1clickprojects (~> 1)
- aws-sdk-iotanalytics (~> 1)
- aws-sdk-iotdataplane (~> 1)
- aws-sdk-iotjobsdataplane (~> 1)
- aws-sdk-kinesis (~> 1)
- aws-sdk-kinesisanalytics (~> 1)
- aws-sdk-kinesisvideo (~> 1)
- aws-sdk-kinesisvideoarchivedmedia (~> 1)
- aws-sdk-kinesisvideomedia (~> 1)
- aws-sdk-kms (~> 1)
- aws-sdk-lambda (~> 1)
- aws-sdk-lambdapreview (~> 1)
- aws-sdk-lex (~> 1)
- aws-sdk-lexmodelbuildingservice (~> 1)
- aws-sdk-lightsail (~> 1)
- aws-sdk-machinelearning (~> 1)
- aws-sdk-macie (~> 1)
- aws-sdk-marketplacecommerceanalytics (~> 1)
- aws-sdk-marketplaceentitlementservice (~> 1)
- aws-sdk-marketplacemetering (~> 1)
- aws-sdk-mediaconvert (~> 1)
- aws-sdk-medialive (~> 1)
- aws-sdk-mediapackage (~> 1)
- aws-sdk-mediastore (~> 1)
- aws-sdk-mediastoredata (~> 1)
- aws-sdk-mediatailor (~> 1)
- aws-sdk-migrationhub (~> 1)
- aws-sdk-mobile (~> 1)
- aws-sdk-mq (~> 1)
- aws-sdk-mturk (~> 1)
- aws-sdk-neptune (~> 1)
- aws-sdk-opsworks (~> 1)
- aws-sdk-opsworkscm (~> 1)
- aws-sdk-organizations (~> 1)
- aws-sdk-pi (~> 1)
- aws-sdk-pinpoint (~> 1)
- aws-sdk-polly (~> 1)
- aws-sdk-pricing (~> 1)
- aws-sdk-rds (~> 1)
- aws-sdk-redshift (~> 1)
- aws-sdk-rekognition (~> 1)
- aws-sdk-resourcegroups (~> 1)
- aws-sdk-resourcegroupstaggingapi (~> 1)
- aws-sdk-route53 (~> 1)
- aws-sdk-route53domains (~> 1)
- aws-sdk-s3 (~> 1)
- aws-sdk-sagemaker (~> 1)
- aws-sdk-sagemakerruntime (~> 1)
- aws-sdk-secretsmanager (~> 1)
- aws-sdk-serverlessapplicationrepository (~> 1)
- aws-sdk-servicecatalog (~> 1)
- aws-sdk-servicediscovery (~> 1)
- aws-sdk-ses (~> 1)
- aws-sdk-shield (~> 1)
- aws-sdk-simpledb (~> 1)
- aws-sdk-sms (~> 1)
- aws-sdk-snowball (~> 1)
- aws-sdk-sns (~> 1)
- aws-sdk-sqs (~> 1)
- aws-sdk-ssm (~> 1)
- aws-sdk-states (~> 1)
- aws-sdk-storagegateway (~> 1)
- aws-sdk-support (~> 1)
- aws-sdk-swf (~> 1)
- aws-sdk-transcribeservice (~> 1)
- aws-sdk-translate (~> 1)
- aws-sdk-waf (~> 1)
- aws-sdk-wafregional (~> 1)
- aws-sdk-workdocs (~> 1)
- aws-sdk-workmail (~> 1)
- aws-sdk-workspaces (~> 1)
- aws-sdk-xray (~> 1)
- aws-sdk-route53 (1.10.1)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-route53domains (1.3.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-s3 (1.17.0)
- aws-sdk-core (~> 3, >= 3.21.2)
+ aws-sdk-firehose (1.14.0)
+ aws-sdk-core (~> 3, >= 3.48.2)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-kinesis (1.13.1)
+ aws-sdk-core (~> 3, >= 3.48.2)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-kms (1.16.0)
+ aws-sdk-core (~> 3, >= 3.48.2)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-s3 (1.36.0)
+ aws-sdk-core (~> 3, >= 3.48.2)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.0)
- aws-sdk-sagemaker (1.11.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-sagemakerruntime (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-secretsmanager (1.10.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-serverlessapplicationrepository (1.4.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-servicecatalog (1.6.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-servicediscovery (1.3.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-ses (1.8.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-shield (1.3.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-simpledb (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv2 (~> 1.0)
- aws-sdk-sms (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-snowball (1.3.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-sns (1.3.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-sqs (1.4.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-ssm (1.18.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-states (1.3.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-storagegateway (1.6.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-support (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-swf (1.1.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-transcribeservice (1.3.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-translate (1.2.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-waf (1.5.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-wafregional (1.5.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-workdocs (1.2.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-workmail (1.2.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-workspaces (1.3.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sdk-xray (1.3.0)
- aws-sdk-core (~> 3)
- aws-sigv4 (~> 1.0)
- aws-sigv2 (1.0.1)
- aws-sigv4 (1.0.3)
- bson (4.3.0)
- cool.io (1.5.3)
+ aws-sdk-sqs (1.13.0)
+ aws-sdk-core (~> 3, >= 3.48.2)
+ aws-sigv4 (~> 1.1)
+ aws-sigv4 (1.1.0)
+ aws-eventstream (~> 1.0, >= 1.0.2)
+ bson (4.4.2)
+ cool.io (1.5.4)
dig_rb (1.0.1)
- elasticsearch (6.1.0)
- elasticsearch-api (= 6.1.0)
- elasticsearch-transport (= 6.1.0)
- elasticsearch-api (6.1.0)
+ digest-crc (0.4.1)
+ elasticsearch (6.3.0)
+ elasticsearch-api (= 6.3.0)
+ elasticsearch-transport (= 6.3.0)
+ elasticsearch-api (6.3.0)
multi_json
- elasticsearch-transport (6.1.0)
+ elasticsearch-transport (6.3.0)
faraday
multi_json
excon (0.62.0)
- faraday (0.15.2)
+ faraday (0.15.4)
multipart-post (>= 1.2, < 3)
fluent-config-regexp-type (1.0.0)
fluentd (> 1.0.0, < 2)
- fluent-plugin-elasticsearch (2.11.1)
+ fluent-plugin-elasticsearch (3.4.1)
elasticsearch
excon
- fluentd (>= 0.14.20)
- fluent-plugin-kafka (0.7.4)
+ fluentd (>= 0.14.22)
+ fluent-plugin-kafka (0.9.2)
fluentd (>= 0.10.58, < 2)
ltsv
- ruby-kafka (>= 0.4.1, < 1.0.0)
- fluent-plugin-kinesis (2.1.1)
- aws-sdk (>= 2.9.9, < 4)
- fluentd (>= 0.12.35, < 2)
+ ruby-kafka (>= 0.7.1, < 0.8.0)
+ fluent-plugin-kinesis (3.0.0)
+ aws-sdk-firehose (~> 1, != 1.9, != 1.5)
+ aws-sdk-kinesis (~> 1, != 1.5, != 1.4)
+ fluentd (>= 0.14.10, < 2)
google-protobuf (~> 3)
- fluent-plugin-mongo (1.1.1)
- fluentd (>= 0.14.12, < 2)
- mongo (~> 2.2.0)
+ fluent-plugin-mongo (1.2.2)
+ fluentd (>= 0.14.22, < 2)
+ mongo (~> 2.6.0)
fluent-plugin-record-reformer (0.9.1)
fluentd
- fluent-plugin-rewrite-tag-filter (2.1.0)
+ fluent-plugin-rewrite-tag-filter (2.2.0)
fluent-config-regexp-type
fluentd (>= 0.14.2, < 2)
- fluent-plugin-s3 (1.1.3)
+ fluent-plugin-s3 (1.1.9)
aws-sdk-s3 (~> 1.0)
aws-sdk-sqs (~> 1.0)
- fluentd (>= 0.14.2, < 2)
- fluent-plugin-scribe (0.10.14)
+ fluentd (>= 0.14.22, < 2)
+ fluent-plugin-scribe (1.0.0)
fluentd
thrift (~> 0.8.0)
fluent-plugin-webhdfs (1.2.3)
fluentd (>= 0.14.4)
webhdfs (>= 0.6.0)
- fluentd (1.2.3)
+ fluentd (1.4.2)
cool.io (>= 1.4.5, < 2.0.0)
dig_rb (~> 1.0.0)
http_parser.rb (>= 0.5.1, < 0.7.0)
@@ -649,18 +87,19 @@ GEM
tzinfo (~> 1.0)
tzinfo-data (~> 1.0)
yajl-ruby (~> 1.0)
- google-protobuf (3.6.0)
+ google-protobuf (3.7.1)
http_parser.rb (0.6.0)
jmespath (1.4.0)
- ltsv (0.1.0)
- mongo (2.2.7)
- bson (~> 4.0)
- msgpack (1.2.4)
+ ltsv (0.1.2)
+ mongo (2.6.4)
+ bson (>= 4.3.0, < 5.0.0)
+ msgpack (1.2.9)
multi_json (1.13.1)
multipart-post (2.0.0)
- public_suffix (3.0.2)
- ruby-kafka (0.6.7)
- serverengine (2.0.7)
+ public_suffix (3.0.3)
+ ruby-kafka (0.7.6)
+ digest-crc
+ serverengine (2.1.0)
sigdump (~> 0.2.2)
sigdump (0.2.4)
strptime (0.2.3)
@@ -668,11 +107,11 @@ GEM
thrift (0.8.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
- tzinfo-data (1.2018.5)
+ tzinfo-data (1.2019.1)
tzinfo (>= 1.0.0)
webhdfs (0.8.0)
addressable
- yajl-ruby (1.4.0)
+ yajl-ruby (1.4.1)
PLATFORMS
ruby
@@ -690,4 +129,4 @@ DEPENDENCIES
fluentd
BUNDLED WITH
- 1.16.2
+ 1.16.3
diff --git a/pkgs/tools/misc/fluentd/gemset.nix b/pkgs/tools/misc/fluentd/gemset.nix
index 8a3c212d055..022127238ec 100644
--- a/pkgs/tools/misc/fluentd/gemset.nix
+++ b/pkgs/tools/misc/fluentd/gemset.nix
@@ -1,1385 +1,135 @@
{
addressable = {
dependencies = ["public_suffix"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
+ sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
type = "gem";
};
- version = "2.5.2";
+ version = "2.6.0";
};
aws-eventstream = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0gdiwkg24jpx5f3bkw6vchgliicn6v9bpm09j0dldaxsca66q0wy";
+ sha256 = "1i4djzrynzr4l8mqx946ad6zn7blz2r5jif58y9c0lws6bdc5h1l";
type = "gem";
};
- version = "1.0.1";
+ version = "1.0.2";
};
aws-partitions = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1gqkj0fq1rlrsfr1s3dgrhz4dikxlkrbrkp0i2013aa3lcsm8hqm";
+ sha256 = "08i5a52b42x1q26j4rzaxp4hhwl0wzw12jbbjxjifnwi2dm57biy";
type = "gem";
};
- version = "1.96.0";
- };
- aws-sdk = {
- dependencies = ["aws-sdk-resources"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0z01jdka7akshp524xprqaakpavzjadh0kmwmz8mwk5i1yiakba3";
- type = "gem";
- };
- version = "3.0.1";
- };
- aws-sdk-acm = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0r6m6l8jbnhcvs6xighgcpc8li8pnjr33l34fqgnbxbbkybwnhl0";
- type = "gem";
- };
- version = "1.9.0";
- };
- aws-sdk-acmpca = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "13ggvcyijmhdwiw1ym21pxac4hf7wmndy5l5g1mmd2r6mlz08n6b";
- type = "gem";
- };
- version = "1.2.0";
- };
- aws-sdk-alexaforbusiness = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1bn1460ga5b1nair735nf8cg4hrgh499kdwn9r75d5mjfd4yxg1s";
- type = "gem";
- };
- version = "1.6.0";
- };
- aws-sdk-apigateway = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1v1p15lx6k9iyx226h6w9pp16frhnpl1xxwm1c0q39a5f9k7vyl7";
- type = "gem";
- };
- version = "1.13.0";
- };
- aws-sdk-applicationautoscaling = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1sf117qwmw3qdvydr6sn70vm9ygpnr1mgqic2vc1y6s85rzfh4z2";
- type = "gem";
- };
- version = "1.11.0";
- };
- aws-sdk-applicationdiscoveryservice = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0n770ra6d2bc23rq66x5rd2ck0c0h0ivgxcdgi7kmvkjrh09fslj";
- type = "gem";
- };
- version = "1.2.0";
- };
- aws-sdk-appstream = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "04y4s4pkwvl72a2jzrscki68p6klh9g6vxi86whi4hsg05imj909";
- type = "gem";
- };
- version = "1.13.0";
- };
- aws-sdk-appsync = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1kk4r6272fniq5dx50f3k0wz8pjysbvxs26jyvr5af97ayndks1n";
- type = "gem";
- };
- version = "1.4.0";
- };
- aws-sdk-athena = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1q9igjjw0jc860dns4mh8l1bm0s1q4bpfrzkgczij5vx3rp3jpqv";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-autoscaling = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "15hvj08avacvkkrm60rdv39k58zxaqsigrlfjgfiki7vcrrqm19j";
- type = "gem";
- };
- version = "1.6.0";
- };
- aws-sdk-autoscalingplans = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0djk1z0q92cclr0757qvphj63x20a1ygzp3c9w1ycc6b3n7j5a0r";
- type = "gem";
- };
- version = "1.3.0";
- };
- aws-sdk-batch = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "18yr41pgl11x1vfc7w4f7n5v8vbhz4vb05q1fckqcwmwrwcqwycn";
- type = "gem";
- };
- version = "1.5.0";
- };
- aws-sdk-budgets = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1xdwr9c0wcys9gljl2q0bvrjvlk6q676gsr2159qdh0px1s9f8cd";
- type = "gem";
- };
- version = "1.8.0";
- };
- aws-sdk-cloud9 = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0vs7jgg1fjz0kn1772mbk55q5ia8k8045bl38wsh23yz9naf7wrb";
- type = "gem";
- };
- version = "1.2.0";
- };
- aws-sdk-clouddirectory = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0zkbqj3nf9pdyzyk9z1xm9qkslghljhwzma10mrpg2wkic8in2zg";
- type = "gem";
- };
- version = "1.5.0";
- };
- aws-sdk-cloudformation = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1q75h9nbhkrs3rblc5bdf2v1yamskgjkz5rlzlikpp1x08alll2x";
- type = "gem";
- };
- version = "1.6.0";
- };
- aws-sdk-cloudfront = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0wzhhv2hnxy0h3zcbppdzym1zmsgmv6fqkdcdghh5ys9mj4wnq86";
- type = "gem";
- };
- version = "1.4.0";
- };
- aws-sdk-cloudhsm = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1zjdql9x8cpjikjc6q4g8vmdi1xq27q7vwns8flib9cklbkb615k";
- type = "gem";
- };
- version = "1.4.0";
- };
- aws-sdk-cloudhsmv2 = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "09pw8dgay7vrmwfjz5dzjrci1q6iqazna36d5vhp3raw4drb5q0c";
- type = "gem";
- };
- version = "1.2.0";
- };
- aws-sdk-cloudsearch = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1k702nm5aqxhgyc2gvjx8c5abg2b004apsgwfv6pi4szcbd3c4bq";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-cloudsearchdomain = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0kc6d3dy7vdydwnhzddnfkrrdspsxzc1h91yml6jskr5p6ccc6mb";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-cloudtrail = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "11lj0qw9w7cmxwgfdwvhfx6pfx5dx3b2mcsg0fmy0k8pl18zp4rr";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-cloudwatch = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1xmpmwzra3b5gracca050zs0lrsq28sc34x7qx8c0cr05jlkjjig";
- type = "gem";
- };
- version = "1.6.0";
- };
- aws-sdk-cloudwatchevents = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0qr2mlx7w2wb168vldm0ci7z7jf8mjmp73i50048pa6yqsn5jg42";
- type = "gem";
- };
- version = "1.4.0";
- };
- aws-sdk-cloudwatchlogs = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "16fwk4hxycqq8kkv1asiimr5h5dcrnh22ix9z7vzg6gd3w4cx8yl";
- type = "gem";
- };
- version = "1.4.0";
- };
- aws-sdk-codebuild = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1x88dg1ygffxlvw9hl9xj7nfvd311vic49sjwrq171ily9drd8dp";
- type = "gem";
- };
- version = "1.12.0";
- };
- aws-sdk-codecommit = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "17xch4hwf5i7vvpq3mi6hg120jdjxw9qplhi7d48ch20w5w2nn3k";
- type = "gem";
- };
- version = "1.4.0";
- };
- aws-sdk-codedeploy = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "18qpmbaqwnbw91hbm64fixn4dba35fhr7x770lvly885i8srbv44";
- type = "gem";
- };
- version = "1.6.0";
- };
- aws-sdk-codepipeline = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1n0v9ml7bfdr30py24ab7jhh35ni17m2c7rr16d55sp14j6583ax";
- type = "gem";
- };
- version = "1.5.0";
- };
- aws-sdk-codestar = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0dd3l6igidddxy4flw3wry0mv2lr559vvfafjwna7ilj3v311dz2";
- type = "gem";
- };
- version = "1.2.0";
- };
- aws-sdk-cognitoidentity = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "014b9d7iai5sinjfs2qar3wwnhhb3cd35867jiwkqwhyga30r70p";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-cognitoidentityprovider = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0jlk4ysr1lbn94p16p7z0hr0m7pr47447g632fd0ss1hw7ap4csw";
- type = "gem";
- };
- version = "1.5.0";
- };
- aws-sdk-cognitosync = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1d5fxq99sfwv4c7jgx65yrhxp9qg524bd8bsfamhakn0rlwi4iny";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-comprehend = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0l50mvlrarqhb7d469czi3p7rimjwzcwp52bhklxbx6lmv3il23p";
- type = "gem";
- };
- version = "1.2.0";
- };
- aws-sdk-configservice = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "11lzxili2c17m6h8y6ngl7z7h0rf7jwwaim4dq2pdf2qi2k5mh70";
- type = "gem";
- };
- version = "1.12.0";
- };
- aws-sdk-connect = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "15xz6v48y4nn1yrr2n8d2w0z7g52cqyjrkjxyhgdv6967yby4qw2";
- type = "gem";
- };
- version = "1.1.0";
+ version = "1.149.0";
};
aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1dhii8d1ra9rbh3n0v5s2p4dg5mrwj44sl0mfcan40s1crcrm3m8";
+ sha256 = "1sng9iagk96r8986gsacljnw357famz5x4xa1wk9xm4cx0bmpm5i";
type = "gem";
};
- version = "3.22.1";
- };
- aws-sdk-costandusagereportservice = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "04sady26xlvkrmym4bmdbkc1d472kjlxsgr9awa205ih0bxsaffn";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-costexplorer = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1ddd92nny926ipzgmr2gg9qh64iv96cd35zwsbwn7ns8mnndxa4q";
- type = "gem";
- };
- version = "1.7.0";
- };
- aws-sdk-databasemigrationservice = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0slj051gw3mr155cwmj67d95wywq4v14ri6xhnkfx07sqp4i8z9a";
- type = "gem";
- };
- version = "1.7.0";
- };
- aws-sdk-datapipeline = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0r2jnvbcbqkg5k42ly1x2w4g97rl4km1m3bwjvwl7q8c9fbrzpby";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-dax = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0m6l7p2g667c54jxbdpb1zkin5damiq3x34aw5b3b88wk9nm8pfy";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-devicefarm = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "02bzffmwrbw5irg94iki16ybg0wb926vsfvd4ziv890fc8n239ya";
- type = "gem";
- };
- version = "1.7.0";
- };
- aws-sdk-directconnect = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "03jshg8ax2cww8zvf2lvf542xllgpv38i2iqnv79y62s9a26g4l5";
- type = "gem";
- };
- version = "1.2.0";
- };
- aws-sdk-directoryservice = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0mmjxk34gids533s2x1ay4s9zzrvad16djf1m6xib6ys9bja1x27";
- type = "gem";
- };
- version = "1.3.0";
- };
- aws-sdk-dlm = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0j6r629wqg08zr9ndisy3d27hqj32kimlrfkigw276mnx2v507cn";
- type = "gem";
- };
- version = "1.0.0";
- };
- aws-sdk-dynamodb = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0id29l91wpd9az9axsfmiqdwlh0qx4m1ci7fwzxm7ac6yjq4p7gr";
- type = "gem";
- };
- version = "1.8.0";
- };
- aws-sdk-dynamodbstreams = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "03b2wrkxp9cpr0akxqgn5hss9l2yzqa7kl9j0isyh968rbdzaxla";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-ec2 = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "17144h9892pf8hn5c5lnid47q2dilyb5hxzf8pj7z3pkra5yn5aw";
- type = "gem";
- };
- version = "1.38.0";
- };
- aws-sdk-ecr = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "01x7m60sqfdkfiif1fxknl9p97076ndwr71s5aixq688plf7zybf";
- type = "gem";
- };
- version = "1.4.0";
- };
- aws-sdk-ecs = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "16czi8zgy8s1p0skcxwr4lcbfwp0g9c8ppbd3ymjchm75rdrg47g";
- type = "gem";
- };
- version = "1.15.0";
- };
- aws-sdk-efs = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0fi1a99fh62ma1xy4axh5cpach3fclajd30jp8kig9bxyaspsf2c";
- type = "gem";
- };
- version = "1.2.0";
- };
- aws-sdk-eks = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1sgyja0kdj68vcqzmckxmik7ibp4rmyiw8vl6zyp3ihkqpvwf5ns";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-elasticache = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0wy4w8gcdnn4ckyc0aa9p293fnwlv8ihyvmxflzjkigallxa23vc";
- type = "gem";
- };
- version = "1.4.0";
- };
- aws-sdk-elasticbeanstalk = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "10f9lg288m74ssm24m7mhphi4h6km84pak0bpg7gd4rnrw4fdw1f";
- type = "gem";
- };
- version = "1.8.0";
- };
- aws-sdk-elasticloadbalancing = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1dz9gx4c83s1qb03kqng5vh9kjihi0jv02j3ndp2z5z10cpncf3p";
- type = "gem";
- };
- version = "1.3.0";
- };
- aws-sdk-elasticloadbalancingv2 = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1qs1gjjnvhx1ijm7mr5aa0cv7sanvm81l8kpx1y57zrpa5ikp3r7";
- type = "gem";
- };
- version = "1.11.0";
- };
- aws-sdk-elasticsearchservice = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0zhylvqwln0vz5qhd1vj89s7fwdk330wksp206dphscmqjra0ggz";
- type = "gem";
- };
- version = "1.6.0";
- };
- aws-sdk-elastictranscoder = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1r9waa8jksznqwvlrapf71j8ga6cjm9j6qjrssqps083kxg0sad1";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-emr = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0mkb4302iczxmn7al36f151xvjnf8v0r559p4wn6jginvgwxk48n";
- type = "gem";
- };
- version = "1.3.0";
+ version = "3.48.3";
};
aws-sdk-firehose = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0yc2kvnf0hdlpfh3i51m44775vws3k84wvlhnvj68nm5jszhhx7b";
+ sha256 = "0f7s1vqs1qga6jzvjgg4x4hcz1rdycwry5dcizidzffwn9sp9iy0";
type = "gem";
};
- version = "1.4.0";
- };
- aws-sdk-fms = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1lqh6pxg3ki2k539xm99p63fai8grswpkyd5nj8dl4pwsqn4xx57";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-gamelift = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0wfyq9m0dv9isdriin285daj5b90bbkrk5b0ss0awhcqwarlj29i";
- type = "gem";
- };
- version = "1.5.0";
- };
- aws-sdk-glacier = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0vlg62v7zraz5f7h13wws9cga4sdv62v6lsfkqn2ai6n1ks80c02";
- type = "gem";
- };
- version = "1.8.0";
- };
- aws-sdk-glue = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1rlq8hchn6dkccwdrd27lizfghmgf4lcrdcblhs14sxmwk0jzl25";
- type = "gem";
- };
- version = "1.10.0";
- };
- aws-sdk-greengrass = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "05cjp6jvcnzg3jxwcggg31l0sqb743b6x66230nb5ahf7l8sq4fx";
- type = "gem";
- };
- version = "1.4.0";
- };
- aws-sdk-guardduty = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0l2fbhm1d5mgkvrz8jgny2zcd4zzijwy8s4f4p91kn22m1s74cg4";
- type = "gem";
- };
- version = "1.5.0";
- };
- aws-sdk-health = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0b3zgjwh2drkxcbmglw9vz9b8wir0qwxihf2yrra33qhcxvlf29q";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-iam = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1wch93pvh5y16ldn1b42igrj0q76j7mfwvkwqnlk8197wpmyzl8z";
- type = "gem";
- };
- version = "1.6.0";
- };
- aws-sdk-importexport = {
- dependencies = ["aws-sdk-core" "aws-sigv2"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0clry5ch04npyrgz61xrwwj6kwqai5d9c933rd17jx0r7dm2x5zb";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-inspector = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0blgc82naibxdv5zv7brc8kdp4mnqimxc3lsb2fahn9av4bdh4zf";
- type = "gem";
- };
- version = "1.5.0";
- };
- aws-sdk-iot = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "00paa2lhahcfk1kk8zka7zb3hnia1qj6i8rv5ybapgdq9rj4936q";
- type = "gem";
- };
- version = "1.9.0";
- };
- aws-sdk-iot1clickdevicesservice = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0k1if31wsy3dpk4mhwc6s86432g8jbbb1w4gpj85qlydrk2c7y96";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-iot1clickprojects = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "12r1pkzixj2g0i9mz7ywsr5qlz19868d8qb4www4s45h6qjwxwnz";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-iotanalytics = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0a69cv9nypykg6il99znymfm09da4hlh3d6i13kj8gma5q7prnq6";
- type = "gem";
- };
- version = "1.2.0";
- };
- aws-sdk-iotdataplane = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0777k6l8phrby6ar5zpbhsp4i77d8bfs5z57axn6ir1q4dalgza5";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-iotjobsdataplane = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "05awqr95nlral8f8il5n27swri3vq9y60mhqz9qmhld8w3cwwspj";
- type = "gem";
- };
- version = "1.1.0";
+ version = "1.14.0";
};
aws-sdk-kinesis = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1kw8ksdy6mylrzdswvxxdjb8wim9agdgxpjp3a1aqa72nlswq3nx";
+ sha256 = "005dj7m3zi8gkda5g40a0wxlx48g0w5cz4k7783g2p6c0h5wwdsb";
type = "gem";
};
- version = "1.3.0";
- };
- aws-sdk-kinesisanalytics = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1krdg2qvm2if5npbpw4bk2i1kz51bknfy1j5gaiiym1mmrz7lrap";
- type = "gem";
- };
- version = "1.3.0";
- };
- aws-sdk-kinesisvideo = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1299hi3296i3wjmy8cjzpy10bzpljb638yrbyash39y3znaxk2i8";
- type = "gem";
- };
- version = "1.2.0";
- };
- aws-sdk-kinesisvideoarchivedmedia = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "17sap4wdpi6l6h8yfm9yzjniv4cps5q3wrhdjp6slwrmhrmq2gpx";
- type = "gem";
- };
- version = "1.2.0";
- };
- aws-sdk-kinesisvideomedia = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0rzwpjnym78i5g6427w7war436qnl77qjaiwwh5avrvy12lfjyrb";
- type = "gem";
- };
- version = "1.1.0";
+ version = "1.13.1";
};
aws-sdk-kms = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1y41nf5p94r2mrmpxx2icylz7g1jm72d1awwpjfrw5zlxbzi8jgj";
+ sha256 = "1m64sb5nnpryjmjbgvr5lmlrd06wvafd0ss9i9zf3fsi39hqaicg";
type = "gem";
};
- version = "1.6.0";
- };
- aws-sdk-lambda = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0ng2k320s81d5v1g2ihjvkmspnyfkcb9v2fc25mszwg9gwq4mhz1";
- type = "gem";
- };
- version = "1.8.0";
- };
- aws-sdk-lambdapreview = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1ys1zpc7jmzn4vs01z5qw7rkg4732fbzpiwj5p0gpgy151hip110";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-lex = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1g67akcqmv1i1k4a370vwnb1qkmfl7smfllbw84kd062h8m1h2vl";
- type = "gem";
- };
- version = "1.4.0";
- };
- aws-sdk-lexmodelbuildingservice = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0awdfirdc2wn4xaqxkizlxy604gwna55mn261fjwj6a3jp83pb1z";
- type = "gem";
- };
- version = "1.6.0";
- };
- aws-sdk-lightsail = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0gxs8b3grk4dwsldszvkz31w3lypdnyqhqs1c3w7f18b66p5l714";
- type = "gem";
- };
- version = "1.5.0";
- };
- aws-sdk-machinelearning = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1rf84hxrqgzpmr08h14p1070x8cs3x5gxn48l1ia1bdlfjvllv2f";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-macie = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0l20rk8r0k6n81vfy132l5xbaxr4h58ykvyhka0xrb2fys5kr704";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-marketplacecommerceanalytics = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0mcbk1gwqpfxg9wrf1vd9c4s97d46p425yx4m7fx6z73fb26ckp3";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-marketplaceentitlementservice = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "17r2c9ir63wbhpl4kz3pwkavjqvi73jpx3vpbm8172zqai72m2qw";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-marketplacemetering = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "05snignv3fjdfpjw771daxkkm7hlc7wbsi43ajjwvrxzl8apgkl1";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-mediaconvert = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0hdliqi7rxhp02rnnnvrkg1pn5rbss577f5di4h1pbcmw29zqa2p";
- type = "gem";
- };
- version = "1.5.0";
- };
- aws-sdk-medialive = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "03pr959i5lnsdw4vagdhfcjfrm01h055j83abs9w2gs4asmknyi9";
- type = "gem";
- };
- version = "1.8.0";
- };
- aws-sdk-mediapackage = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "190ca52xzdgnfn73qwv4kc2jix2a3s7gxx6a2nij47ak5bs8qhhn";
- type = "gem";
- };
- version = "1.2.0";
- };
- aws-sdk-mediastore = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1m7xjz0xpnwvsm35m2wnp9ja8sqhk5w09jf92frim482vyddk46n";
- type = "gem";
- };
- version = "1.2.0";
- };
- aws-sdk-mediastoredata = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1da6wd4nrf99mxyv9fay4bbk3n64swzr8989dfjipqa8rpnry9dq";
- type = "gem";
- };
- version = "1.2.0";
- };
- aws-sdk-mediatailor = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1rm8f2ln263mabj5ia880h8464pxqg7cp1b1dy6mggbj77v4qyw7";
- type = "gem";
- };
- version = "1.2.0";
- };
- aws-sdk-migrationhub = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1vaswa6f4hd7gf5y2rn6jn4rxx4i3dhyngb6446llwc218qqcp5x";
- type = "gem";
- };
- version = "1.3.0";
- };
- aws-sdk-mobile = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1kvx23q0dcf4kznf72fq6vrz2wzprim1n87a7jwwvqp1cm8dkh9s";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-mq = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1h258myrx75zvicpdb06bbls4d0fnpfqfp16yc0j5lmqdr6p74qn";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-mturk = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0kb5ii2lqiq8va1plyrna0zczgc9p2dgv0a17xx9pzfg2djvc7vz";
- type = "gem";
- };
- version = "1.4.0";
- };
- aws-sdk-neptune = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1rddn8y1cwnj5zahvln643sfb4ayddqmydrxibf5j1nqsvv46lg7";
- type = "gem";
- };
- version = "1.2.0";
- };
- aws-sdk-opsworks = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1mkjf0694daikkqsqygq1f34zw4wiwg57p8vxlwx5fxjbgwfi01a";
- type = "gem";
- };
- version = "1.4.0";
- };
- aws-sdk-opsworkscm = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "06067wx6ihk9kj11789dlzag3j2b7zxk9yil4zxy0gv95w37ypzg";
- type = "gem";
- };
- version = "1.3.0";
- };
- aws-sdk-organizations = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1jhll8rgp78pwsd5wgfg4nwxkyzahlh0xrnddw3cx9qhzcb001xn";
- type = "gem";
- };
- version = "1.10.0";
- };
- aws-sdk-pi = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0xm7d9ssn4q2107gp90qsi8vjg87wdl5py55qq76m79xmp2i08wi";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-pinpoint = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "023yvhr6xdisyyx9p104hyaq2vy9rs0n43h2dc5nbm58a1bm2zsn";
- type = "gem";
- };
- version = "1.6.0";
- };
- aws-sdk-polly = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0g98zchw6ycnz3anvpc6glxj9kal71mn78gr2i37awb6z0j3mk1g";
- type = "gem";
- };
- version = "1.6.0";
- };
- aws-sdk-pricing = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1hm8m1jhf6qfpy1866ykvvnc51mfbp89mfby6z6yxy00fz6mvax5";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-rds = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "009ns5wfcrxan5hhzsj7gpcwnni2ydq79mk2i3lj4gw87k9kr9zx";
- type = "gem";
- };
- version = "1.23.0";
- };
- aws-sdk-redshift = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0rp9zm846rx9vm2qvh238gzixbb7r58xbrrfk0ipsrw6v19b4my4";
- type = "gem";
- };
- version = "1.5.0";
- };
- aws-sdk-rekognition = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1j399i23anlj252rwnj3dcm66787nspfj8hyazfsgb5ww7b2day3";
- type = "gem";
- };
- version = "1.5.0";
- };
- aws-sdk-resourcegroups = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0f878grncnyxlkml525apx3l28mmq96gfi5vpcjhcw9apz58qclf";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-resourcegroupstaggingapi = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0wr75f1gi449x12hai1yjzrlw6cql3z4jyc1hd68wppyf6f1s8kw";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-resources = {
- dependencies = ["aws-sdk-acm" "aws-sdk-acmpca" "aws-sdk-alexaforbusiness" "aws-sdk-apigateway" "aws-sdk-applicationautoscaling" "aws-sdk-applicationdiscoveryservice" "aws-sdk-appstream" "aws-sdk-appsync" "aws-sdk-athena" "aws-sdk-autoscaling" "aws-sdk-autoscalingplans" "aws-sdk-batch" "aws-sdk-budgets" "aws-sdk-cloud9" "aws-sdk-clouddirectory" "aws-sdk-cloudformation" "aws-sdk-cloudfront" "aws-sdk-cloudhsm" "aws-sdk-cloudhsmv2" "aws-sdk-cloudsearch" "aws-sdk-cloudsearchdomain" "aws-sdk-cloudtrail" "aws-sdk-cloudwatch" "aws-sdk-cloudwatchevents" "aws-sdk-cloudwatchlogs" "aws-sdk-codebuild" "aws-sdk-codecommit" "aws-sdk-codedeploy" "aws-sdk-codepipeline" "aws-sdk-codestar" "aws-sdk-cognitoidentity" "aws-sdk-cognitoidentityprovider" "aws-sdk-cognitosync" "aws-sdk-comprehend" "aws-sdk-configservice" "aws-sdk-connect" "aws-sdk-costandusagereportservice" "aws-sdk-costexplorer" "aws-sdk-databasemigrationservice" "aws-sdk-datapipeline" "aws-sdk-dax" "aws-sdk-devicefarm" "aws-sdk-directconnect" "aws-sdk-directoryservice" "aws-sdk-dlm" "aws-sdk-dynamodb" "aws-sdk-dynamodbstreams" "aws-sdk-ec2" "aws-sdk-ecr" "aws-sdk-ecs" "aws-sdk-efs" "aws-sdk-eks" "aws-sdk-elasticache" "aws-sdk-elasticbeanstalk" "aws-sdk-elasticloadbalancing" "aws-sdk-elasticloadbalancingv2" "aws-sdk-elasticsearchservice" "aws-sdk-elastictranscoder" "aws-sdk-emr" "aws-sdk-firehose" "aws-sdk-fms" "aws-sdk-gamelift" "aws-sdk-glacier" "aws-sdk-glue" "aws-sdk-greengrass" "aws-sdk-guardduty" "aws-sdk-health" "aws-sdk-iam" "aws-sdk-importexport" "aws-sdk-inspector" "aws-sdk-iot" "aws-sdk-iot1clickdevicesservice" "aws-sdk-iot1clickprojects" "aws-sdk-iotanalytics" "aws-sdk-iotdataplane" "aws-sdk-iotjobsdataplane" "aws-sdk-kinesis" "aws-sdk-kinesisanalytics" "aws-sdk-kinesisvideo" "aws-sdk-kinesisvideoarchivedmedia" "aws-sdk-kinesisvideomedia" "aws-sdk-kms" "aws-sdk-lambda" "aws-sdk-lambdapreview" "aws-sdk-lex" "aws-sdk-lexmodelbuildingservice" "aws-sdk-lightsail" "aws-sdk-machinelearning" "aws-sdk-macie" "aws-sdk-marketplacecommerceanalytics" "aws-sdk-marketplaceentitlementservice" "aws-sdk-marketplacemetering" "aws-sdk-mediaconvert" "aws-sdk-medialive" "aws-sdk-mediapackage" "aws-sdk-mediastore" "aws-sdk-mediastoredata" "aws-sdk-mediatailor" "aws-sdk-migrationhub" "aws-sdk-mobile" "aws-sdk-mq" "aws-sdk-mturk" "aws-sdk-neptune" "aws-sdk-opsworks" "aws-sdk-opsworkscm" "aws-sdk-organizations" "aws-sdk-pi" "aws-sdk-pinpoint" "aws-sdk-polly" "aws-sdk-pricing" "aws-sdk-rds" "aws-sdk-redshift" "aws-sdk-rekognition" "aws-sdk-resourcegroups" "aws-sdk-resourcegroupstaggingapi" "aws-sdk-route53" "aws-sdk-route53domains" "aws-sdk-s3" "aws-sdk-sagemaker" "aws-sdk-sagemakerruntime" "aws-sdk-secretsmanager" "aws-sdk-serverlessapplicationrepository" "aws-sdk-servicecatalog" "aws-sdk-servicediscovery" "aws-sdk-ses" "aws-sdk-shield" "aws-sdk-simpledb" "aws-sdk-sms" "aws-sdk-snowball" "aws-sdk-sns" "aws-sdk-sqs" "aws-sdk-ssm" "aws-sdk-states" "aws-sdk-storagegateway" "aws-sdk-support" "aws-sdk-swf" "aws-sdk-transcribeservice" "aws-sdk-translate" "aws-sdk-waf" "aws-sdk-wafregional" "aws-sdk-workdocs" "aws-sdk-workmail" "aws-sdk-workspaces" "aws-sdk-xray"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "15z91flcf5daz7v5sfrib5sxm4gk6w66jlh93is0ixr6hwanqb2h";
- type = "gem";
- };
- version = "3.22.0";
- };
- aws-sdk-route53 = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1ga3rd1b3fgg8z46490gjkf2a7j1vys7mf3wi4qmwg8ijs8gva4c";
- type = "gem";
- };
- version = "1.10.1";
- };
- aws-sdk-route53domains = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "02nzhks6kjpdakm3xcc5373g3dnn45a9gr70vc8jhdjyarhcasbk";
- type = "gem";
- };
- version = "1.3.0";
+ version = "1.16.0";
};
aws-sdk-s3 = {
dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0sxd6iwyg54qdzqxqhww1qnhg4z1il1impkg2g8ksgr9q2ykf4jd";
+ sha256 = "1bnihahz0va36jcw5wifw6ad0fdarl0lsils6h50wpvzcxzmlm2i";
type = "gem";
};
- version = "1.17.0";
- };
- aws-sdk-sagemaker = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "11arjp9mcgy3b8rp6dpdla0zcsrv40sw7cc0azplayk5n6cislx1";
- type = "gem";
- };
- version = "1.11.0";
- };
- aws-sdk-sagemakerruntime = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1zyinypfjsf7kp6dh7wbk3f5x3qhj8p76pv332pknrgk94v6rn3i";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-secretsmanager = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1b5xk5icz664rjjcy9ijwfg4nr1chg0pbxyrmzy0agh88vxgp71z";
- type = "gem";
- };
- version = "1.10.0";
- };
- aws-sdk-serverlessapplicationrepository = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1n7lzzvpyryv1v3pai3yxk2w95zk2yglmdh0k3h84n6z3w6jlgr3";
- type = "gem";
- };
- version = "1.4.0";
- };
- aws-sdk-servicecatalog = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "13dhxxp1nmzs71ripdi4yas1wm17w3ks22by6qlbnqy9zwb0r6jg";
- type = "gem";
- };
- version = "1.6.0";
- };
- aws-sdk-servicediscovery = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "033fynzwr4j6idlk3p5rqk94n0ayxrwjcziky5hnfj2aic2yj3lf";
- type = "gem";
- };
- version = "1.3.0";
- };
- aws-sdk-ses = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0aa3vq1lscb5cmcc10s38pdw2crdsfjd4gpb6d9j5d5z8wbpqjhz";
- type = "gem";
- };
- version = "1.8.0";
- };
- aws-sdk-shield = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "12imklik3j9l4fchyj4q6wpiw27kkm4m29accjwkxxikh70w9q0l";
- type = "gem";
- };
- version = "1.3.0";
- };
- aws-sdk-simpledb = {
- dependencies = ["aws-sdk-core" "aws-sigv2"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "16qrczxn096aanan2qrvbbk398sqlfiawviz72z9y31pxds7699d";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-sms = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1d16b5s6x894fagk6mzvli4n9rpsv4gx1xw445nl49jc8z3b941l";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-snowball = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "17kk7n83zbhms7bvavlasw13ydsiqzm8l2p6dpsa3cjqvs7bn9bw";
- type = "gem";
- };
- version = "1.3.0";
- };
- aws-sdk-sns = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0pkv99yqilpklrhwhxr5lv0xma1irk0j7q5myw220yl84d7c6m04";
- type = "gem";
- };
- version = "1.3.0";
+ version = "1.36.0";
};
aws-sdk-sqs = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0m4lk45bfanxyq3rz428az2bbz2g3xbzq40754d81m0b17kyz6nc";
+ sha256 = "1cpmimcnjfwrqv1nmaxp4yyxmh50wg83ccihj8hiafkazg75kfx0";
type = "gem";
};
- version = "1.4.0";
- };
- aws-sdk-ssm = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0w5idgdqp3z9s0cf84r66ha1npjhszp0zd3w43rlp96m1z9m8pk8";
- type = "gem";
- };
- version = "1.18.0";
- };
- aws-sdk-states = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0sg5z9mgn76l81zgigxrxwnn710gigp6iragc3gvz0cdfwwzd33f";
- type = "gem";
- };
- version = "1.3.0";
- };
- aws-sdk-storagegateway = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "078j56x8jllk5dsb8crk33336kmcgs83p2achlw5j10mlfzlra6z";
- type = "gem";
- };
- version = "1.6.0";
- };
- aws-sdk-support = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0bg642zz7nn3dfr039pgry44js9jlr31yq47rsqzhl6p3qh9yisi";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-swf = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "108gzaw0y83vncbv6rzaww4950cycwh8crcw3vf2av6w0mbqi61f";
- type = "gem";
- };
- version = "1.1.0";
- };
- aws-sdk-transcribeservice = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1z66aqfh1s561wa9dqasvbb4shxb2chp12i8h6hs6lxsrpihxbi0";
- type = "gem";
- };
- version = "1.3.0";
- };
- aws-sdk-translate = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "17wprz7c8h8bfi1pv8pw2jll4iaixs9v2zd6iyy33zy0ssyzp9jc";
- type = "gem";
- };
- version = "1.2.0";
- };
- aws-sdk-waf = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1kxaspfpgsrwm1vdyqhbjw1l40z5ygkx9if5lfqh80906rns9gwz";
- type = "gem";
- };
- version = "1.5.0";
- };
- aws-sdk-wafregional = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1ryrx7zh7dmxzrvky3kx6dvz22v0s919jkdhqh8rx65p97ikml2c";
- type = "gem";
- };
- version = "1.5.0";
- };
- aws-sdk-workdocs = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "07grgjkzg31n3k0ig70gj6pjix44jwnl54lw4pn4yqld3472r296";
- type = "gem";
- };
- version = "1.2.0";
- };
- aws-sdk-workmail = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "04yak9s80kcx0vnz9ghbis5qj274rpkwga2391kky8r2gf40lpn2";
- type = "gem";
- };
- version = "1.2.0";
- };
- aws-sdk-workspaces = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1vq0bayq1ryzd9z4y70w39h1ag2jj6k59bv72agdafrszv13fggf";
- type = "gem";
- };
- version = "1.3.0";
- };
- aws-sdk-xray = {
- dependencies = ["aws-sdk-core" "aws-sigv4"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "00n7nrx5qfbcv94hdlh623nhv269z9abfkb6mj5dmjw4hzpm8d31";
- type = "gem";
- };
- version = "1.3.0";
- };
- aws-sigv2 = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1191i9c0kkiyfs3vfwgfxc8kq19rg1q4lkackz56yffv05yp5ng3";
- type = "gem";
- };
- version = "1.0.1";
+ version = "1.13.0";
};
aws-sigv4 = {
+ dependencies = ["aws-eventstream"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1hzndv113i6bgy2n72i5l3mwn8vjnb6hhjxfkpn9mm2p5ra77yk7";
+ sha256 = "1dfc8i5cxjwlvi4b665lbpbwvks8a6wfy3vfmwr3pjdmxwdmc2cs";
type = "gem";
};
- version = "1.0.3";
+ version = "1.1.0";
};
bson = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07baxjrd8rb5gfsv7hh1akjqcpwih76f1711bwjzp228c79ny2na";
+ sha256 = "1kgim98b41cj0njlqv1bwvx2m6gw9n7ilwklfn9hivfg096bzl8l";
type = "gem";
};
- version = "4.3.0";
+ version = "4.4.2";
};
"cool.io" = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "03wwgs427nmic6aa365d7kyfbljpb1ra6syywffxfmz9382xswcp";
+ sha256 = "0l836z3qgrl5829q48qaz1zngqqxy2k0l61swqm0amhyfcgfbz1m";
type = "gem";
};
- version = "1.5.3";
+ version = "1.5.4";
};
dig_rb = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12dbb1pl2vr9z7yy2zsbsjaj4hw89y56wll6kd8422mylmcw7bx4";
@@ -1387,34 +137,52 @@
};
version = "1.0.1";
};
- elasticsearch = {
- dependencies = ["elasticsearch-api" "elasticsearch-transport"];
+ digest-crc = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "162a7aiajs7w3rak21y6jidik7zhkm104wcx25190llyqbqkvlp9";
+ sha256 = "08q8p0fk51aa6dwhy2xmjaj76arcq9nn22gyia162jmqpccfx50l";
type = "gem";
};
- version = "6.1.0";
+ version = "0.4.1";
+ };
+ elasticsearch = {
+ dependencies = ["elasticsearch-api" "elasticsearch-transport"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1kx13w90dnmrfgwgm86h8wsmjmpv19qxvd1f6xxrdjmw0ij0vyqn";
+ type = "gem";
+ };
+ version = "6.3.0";
};
elasticsearch-api = {
dependencies = ["multi_json"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0q9shhpifl6cir68zxv30mjjybxsx39asqnircrgs4lqsb20j1n7";
+ sha256 = "06dji10nahhqd04igfwcqb1d521lv7gy40g7nv0mx3nnb1c6ksbm";
type = "gem";
};
- version = "6.1.0";
+ version = "6.3.0";
};
elasticsearch-transport = {
dependencies = ["faraday" "multi_json"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1dmb587mp526q1wvb1j13rjj13vxl4fcpmm899ipyr88spld5vc7";
+ sha256 = "025c0plj3ydrykmwpwhn6vdxfgf4b7xr4gg5dzdd5ck9frvqb6mz";
type = "gem";
};
- version = "6.1.0";
+ version = "6.3.0";
};
excon = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2";
@@ -1424,15 +192,19 @@
};
faraday = {
dependencies = ["multipart-post"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "14lg0c4bphk16rccc5jmaan6nfcvmy0caiahpc61f9zfwpsj7ymg";
+ sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0";
type = "gem";
};
- version = "0.15.2";
+ version = "0.15.4";
};
fluent-config-regexp-type = {
dependencies = ["fluentd"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hk0vxcmlbid7n6piyv3x83j5gyiz7in397l9x3c6nh69wicy7gm";
@@ -1442,42 +214,52 @@
};
fluent-plugin-elasticsearch = {
dependencies = ["elasticsearch" "excon" "fluentd"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jh7wpj46753mii98ddafl5yas0iw8dc1b87lzgdyfri9z8cbfv1";
+ sha256 = "115y11r7rd4hd9gc2lngm6cas1119fas87s75x6iaykqg8hlr99l";
type = "gem";
};
- version = "2.11.1";
+ version = "3.4.1";
};
fluent-plugin-kafka = {
dependencies = ["fluentd" "ltsv" "ruby-kafka"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "16r7ydlnb1ba7adk3f95v3x1qjk22cifd9bvz71099m17njw56g1";
+ sha256 = "079isjc1788fbhagrn2qfrp6mcfw0b6kl6dpnrwpwv9865h75hmm";
type = "gem";
};
- version = "0.7.4";
+ version = "0.9.2";
};
fluent-plugin-kinesis = {
- dependencies = ["aws-sdk" "fluentd" "google-protobuf"];
+ dependencies = ["aws-sdk-firehose" "aws-sdk-kinesis" "fluentd" "google-protobuf"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "14hsvbskfviq11408qglqx1434hv6i7qbgqy8nnii8a657fccvxy";
+ sha256 = "14jqr13k50vs29akjpi0prcs1fdjy335prlqylvri7bc1cmfkhz3";
type = "gem";
};
- version = "2.1.1";
+ version = "3.0.0";
};
fluent-plugin-mongo = {
dependencies = ["fluentd" "mongo"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1w7fla5172x7bll10zja0sg4n0gzkqa191jf6zradhb6416qd355";
+ sha256 = "1p5c7j3yx4cjrn4ljxwghrp8yh0rcdra1iafc67i92s1sl8b70dq";
type = "gem";
};
- version = "1.1.1";
+ version = "1.2.2";
};
fluent-plugin-record-reformer = {
dependencies = ["fluentd"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gwfrfyi9is4l9q4ih3c4l3c9qvyh00jnd2qajdpdh5xjj2m7akn";
@@ -1487,33 +269,41 @@
};
fluent-plugin-rewrite-tag-filter = {
dependencies = ["fluent-config-regexp-type" "fluentd"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1xra33l2pid84qmgr0ni9dmd114l035z9j4g66wdfyihncnaaamp";
+ sha256 = "0kf8p1s02pwhkks82kmkkbfbf4qlhhqiczqah4w0dnp86wp6xyw5";
type = "gem";
};
- version = "2.1.0";
+ version = "2.2.0";
};
fluent-plugin-s3 = {
dependencies = ["aws-sdk-s3" "aws-sdk-sqs" "fluentd"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "102d85igcnnlha8j0vw3pvc0425d38c9r0pryqhz7v1j4p2igi27";
+ sha256 = "16zaxvf3rs5lmd933sgyrxkrws0qcd0z2ypbky45gyq8si1dpwcl";
type = "gem";
};
- version = "1.1.3";
+ version = "1.1.9";
};
fluent-plugin-scribe = {
dependencies = ["fluentd" "thrift"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00m19w7p22adq0yx1h7h2h4ckw9kh5j458a8lawgmbazw2dz0zxi";
+ sha256 = "19m37d0saknifjg8kva96pgsc7zsmdlwvwiy9gvhi2d6c7bq3q30";
type = "gem";
};
- version = "0.10.14";
+ version = "1.0.0";
};
fluent-plugin-webhdfs = {
dependencies = ["fluentd" "webhdfs"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yyv3f0g30x9dzhq74b5cq8z0wbyppw9bb6152v6yrwz25b16231";
@@ -1523,29 +313,38 @@
};
fluentd = {
dependencies = ["cool.io" "dig_rb" "http_parser.rb" "msgpack" "serverengine" "sigdump" "strptime" "tzinfo" "tzinfo-data" "yajl-ruby"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02a7xzpq3vs3lgwawygbkzbsjr2p46945l6wc3bkvws47v33yr4d";
+ sha256 = "1ppdfa03gzv97px7xhdx5nnzc15g8l7yp10jw87qyl5cp62kpx3c";
type = "gem";
};
- version = "1.2.3";
+ version = "1.4.2";
};
google-protobuf = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "10r48i7g0387sd8a1cl8n2da54ar9nw29jshmydwmdrb8y5v5nic";
+ sha256 = "04988m3hmllg4sl4syjb35x0wzsg7rj1nmvhx3d9ihml22w76gb2";
type = "gem";
};
- version = "3.6.0";
+ version = "3.7.1";
};
"http_parser.rb" = {
+ groups = ["default"];
+ platforms = [];
source = {
+ remotes = ["https://rubygems.org"];
sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
type = "gem";
};
version = "0.6.0";
};
jmespath = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf";
@@ -1554,31 +353,39 @@
version = "1.4.0";
};
ltsv = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1alfq3g0mih4w86736ybnzqmknphm2z95c9q0wl765i4lrmxng11";
+ sha256 = "0wrjvc5079zhpn62k1yflrf7js6vaysrg1qwggf7bj2zi0p5rhys";
type = "gem";
};
- version = "0.1.0";
+ version = "0.1.2";
};
mongo = {
dependencies = ["bson"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0qdy2prwr9hv9691xxl0zqgp1s24jm6pknd2vq829yy6a1fv8f87";
+ sha256 = "0k0f1826hixqfqgsc9g6rdqrzr5pzy46hszmk6869pmvm638jah1";
type = "gem";
};
- version = "2.2.7";
+ version = "2.6.4";
};
msgpack = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864";
+ sha256 = "0zs8v59d77wlx4yylyh0lglsj8sp9jrq11yqngdgn95avfhxjw0s";
type = "gem";
};
- version = "1.2.4";
+ version = "1.2.9";
};
multi_json = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
@@ -1587,38 +394,50 @@
version = "1.13.1";
};
multipart-post = {
+ groups = ["default"];
+ platforms = [];
source = {
+ remotes = ["https://rubygems.org"];
sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
type = "gem";
};
version = "2.0.0";
};
public_suffix = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
+ sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
type = "gem";
};
- version = "3.0.2";
+ version = "3.0.3";
};
ruby-kafka = {
+ dependencies = ["digest-crc"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1k9p93zgyify9barnzc4di09pm8bdaywqx68149bmw0zzhghqdqa";
+ sha256 = "0b5i6vazw9s26nwifwsbd95sl35l5krh3yp4z2zpp6lpp6al36db";
type = "gem";
};
- version = "0.6.7";
+ version = "0.7.6";
};
serverengine = {
dependencies = ["sigdump"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1gkm880njsi9x6vpb5grsspxb097hi8898drlbbkj1wl9qf2xv8l";
+ sha256 = "01978684zvab2pbg7r8vm53n8m2h99pc9iqm1wy9gy67y1nxvz13";
type = "gem";
};
- version = "2.0.7";
+ version = "2.1.0";
};
sigdump = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mqf06iw7rymv54y7rgbmfi6ppddgjjmxzi3hrw658n1amp1gwhb";
@@ -1627,6 +446,8 @@
version = "0.2.4";
};
strptime = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yj5wwa7wbhgi7w8d9ihpzpf99niw956fhyxddhayj09fgmdcxd8";
@@ -1635,6 +456,8 @@
version = "0.2.3";
};
thread_safe = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
@@ -1643,6 +466,8 @@
version = "0.3.6";
};
thrift = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0aj23ndh5n5yqcvp4c12y7vl5wvxpl66zncf6n6ax2zvb6ig44cv";
@@ -1652,6 +477,8 @@
};
tzinfo = {
dependencies = ["thread_safe"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
@@ -1661,15 +488,19 @@
};
tzinfo-data = {
dependencies = ["tzinfo"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1fkihwl9k9pmygl6c4kdlzqv51hn33bvjnxs4q48gs4s63d8gva2";
+ sha256 = "1105fp27d527k7rrq1yx1ikbzf1sra046ndayxikkjvay9ql61jz";
type = "gem";
};
- version = "1.2018.5";
+ version = "1.2019.1";
};
webhdfs = {
dependencies = ["addressable"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gs6xb9dz9bp5xc38yplfy48jcgj7jrj0zg0vgi7ydkxnkzkhbf2";
@@ -1678,11 +509,13 @@
version = "0.8.0";
};
yajl-ruby = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01bk8pi6h9wdm0ikjqvl1nxlkrxv3q74m3yfg64va9wvk9sqjvvw";
+ sha256 = "16v0w5749qjp13xhjgr2gcsvjv6mf35br7iqwycix1n2h7kfcckf";
type = "gem";
};
- version = "1.4.0";
+ version = "1.4.1";
};
}
\ No newline at end of file
From 8c1f1b2324bb90f8e1ea33db3253eb30c330ed99 Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Wed, 10 Apr 2019 20:31:30 +0800
Subject: [PATCH 083/115] go-ethereum: 1.8.22 -> 1.8.25 (#59220)
---
pkgs/applications/altcoins/go-ethereum.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix
index 85dfacb2095..cb8a22b84c9 100644
--- a/pkgs/applications/altcoins/go-ethereum.nix
+++ b/pkgs/applications/altcoins/go-ethereum.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "go-ethereum-${version}";
- version = "1.8.22";
+ version = "1.8.25";
goPackagePath = "github.com/ethereum/go-ethereum";
# Fix for usb-related segmentation faults on darwin
@@ -16,7 +16,7 @@ buildGoPackage rec {
owner = "ethereum";
repo = "go-ethereum";
rev = "v${version}";
- sha256 = "0ag9qxrf7n0qkccaf6v4jaysivpxvsy5zfzar3mcm65223pqy375";
+ sha256 = "0kjmr4brw6vszmqqyx8q330nfav8sy4ggn010n254gbi461zy5j7";
};
meta = with stdenv.lib; {
From 180aa21259b666c6b7850aee00c5871c89c0d939 Mon Sep 17 00:00:00 2001
From: Nathaniel Hill <nata@goguna.com>
Date: Wed, 10 Apr 2019 07:41:50 -0500
Subject: [PATCH 084/115] now-cli: 14.0.3 -> 15.0.3 (#59221)
---
pkgs/development/web/now-cli/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix
index 0358f7b8b76..ab2ff35cd51 100644
--- a/pkgs/development/web/now-cli/default.nix
+++ b/pkgs/development/web/now-cli/default.nix
@@ -1,12 +1,12 @@
{ stdenv, lib, fetchurl }:
stdenv.mkDerivation rec {
name = "now-cli-${version}";
- version = "14.0.3";
+ version = "15.0.3";
# TODO: switch to building from source, if possible
src = fetchurl {
url = "https://github.com/zeit/now-cli/releases/download/${version}/now-linux.gz";
- sha256 = "0nnwaj3iik8anx7xd5mzbrgq5g5ng8gqmhxyyfgkmawsg34bk6nj";
+ sha256 = "db9e0ca18513bc407c59945deaa64006acf03dd6007879f0594a38b56153a7c2";
};
sourceRoot = ".";
From 18925d0ceb5af5c3cfa69059a80c334924752236 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Wed, 10 Apr 2019 14:52:31 +0200
Subject: [PATCH 085/115] prometheus-alertmanager: 0.15.3 -> 0.16.2
---
pkgs/servers/monitoring/prometheus/alertmanager.nix | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix
index 530c4305088..e104f31a74d 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "alertmanager-${version}";
- version = "0.15.3";
+ version = "0.16.2";
rev = "v${version}";
goPackagePath = "github.com/prometheus/alertmanager";
@@ -11,12 +11,9 @@ buildGoPackage rec {
inherit rev;
owner = "prometheus";
repo = "alertmanager";
- sha256 = "037wwfadb9rp1592v8bkqcsy9ym4gbhkg3pz6a6fzirg65d29aia";
+ sha256 = "0zjyr9964qxv5fsb17qhmxa1v4z0c7va60n05p9w6j2ah4dmcd8q";
};
- # Tests exist, but seem to clash with the firewall.
- doCheck = false;
-
buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in ''
-ldflags=
-X ${t}.Version=${version}
From 739bdff4a4b77ad662697364af7d316c1e4a7c2d Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Wed, 10 Apr 2019 15:03:09 +0200
Subject: [PATCH 086/115] nixos/prometheus/alertmanager: use ExecStart instead
of script
This results in a simpler service unit which doesn't first have to
start a shell:
> cat /nix/store/s95nsr8zbkblklanqpkiap49mkwbaq45-unit-alertmanager.service/alertmanager.service
...
ExecStart=/nix/store/4g784lwcy7kp69hg0z2hfwkhjp2914lr-alertmanager-0.16.2-bin/bin/alertmanager \
--config.file /nix/store/p2c7fyi2jkkwq04z2flk84q4wyj2ggry-checked-config \
--web.listen-address [::1]:9093 \
--log.level warn
...
---
.../services/monitoring/prometheus/alertmanager.nix | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
index 7d790b6b590..31beee3d39d 100644
--- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix
+++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
@@ -151,17 +151,15 @@ in {
systemd.services.alertmanager = {
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
- script = ''
- ${cfg.package}/bin/alertmanager \
- ${concatStringsSep " \\\n " cmdlineArgs}
- '';
-
serviceConfig = {
User = cfg.user;
Group = cfg.group;
Restart = "always";
PrivateTmp = true;
WorkingDirectory = "/tmp";
+ ExecStart = "${cfg.package}/bin/alertmanager" +
+ optionalString (length cmdlineArgs != 0) (" \\\n " +
+ concatStringsSep " \\\n " cmdlineArgs);
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
};
};
From b19ccfff73802f7acb0aafddad06d3debdc14f55 Mon Sep 17 00:00:00 2001
From: Felix Weilbach <felix.weilbach@t-online.de>
Date: Sun, 31 Mar 2019 23:18:17 +0200
Subject: [PATCH 087/115] cask: init at 0.8.4
---
maintainers/maintainer-list.nix | 5 +++
pkgs/development/tools/cask/default.nix | 43 +++++++++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
3 files changed, 50 insertions(+)
create mode 100644 pkgs/development/tools/cask/default.nix
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index beb766e85b0..56d30fc066d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1618,6 +1618,11 @@
github = "FireyFly";
name = "Jonas Höglund";
};
+ flexw = {
+ email = "felix.weilbach@t-online.de";
+ github = "FlexW";
+ name = "Felix Weilbach";
+ };
flokli = {
email = "flokli@flokli.de";
github = "flokli";
diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix
new file mode 100644
index 00000000000..0960ced99bc
--- /dev/null
+++ b/pkgs/development/tools/cask/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, emacs, python }:
+
+stdenv.mkDerivation rec {
+ name = "cask-${version}";
+ version = "0.8.4";
+
+ src = fetchurl {
+ url = "https://github.com/cask/cask/archive/v${version}.tar.gz";
+ sha256 = "02f8bb20b33b23fb11e7d2a1d282519dfdb8b3090b9672448b8c2c2cacd3e478";
+ };
+
+ doCheck = true;
+
+ dontBuild = true;
+
+ installPhase = ''
+ mkdir -p $out/bin
+ mkdir -p $out/templates
+ install -Dm644 *.el $out/
+ install -Dm755 bin/cask $out/bin
+ install -Dm644 templates/* $out/templates/
+ touch $out/.no-upgrade
+ mkdir -p $out/usr/share/emacs/site-lisp/cask
+ ln -s cask{,-bootstrap}.el $out/usr/share/emacs/site-lisp/cask/
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Project management for Emacs";
+ longDescription = ''
+ Cask is a project management tool for Emacs that helps automate the
+ package development cycle; development, dependencies, testing, building,
+ packaging and more.
+ Cask can also be used to manage dependencies for your local Emacs configuration.
+ '';
+
+ homepage = https://cask.readthedocs.io/en/latest/index.html;
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.flexw ];
+ };
+
+ nativeBuildInputs = [ emacs python ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de633d80020..668312e1a96 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8606,6 +8606,8 @@ in
cadre = callPackage ../development/tools/cadre { };
+ cask = callPackage ../development/tools/cask { };
+
casperjs = callPackage ../development/tools/casperjs {
inherit (texFunctions) fontsConf;
};
From 63ad043e4183cd397cadf309938949a3c36e13d4 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 9 Apr 2019 17:30:12 +0200
Subject: [PATCH 088/115] webkitgtk: 2.24.0 -> 2.24.1
---
pkgs/development/libraries/webkitgtk/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 1bec00e5559..2ccc9b7c2b4 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "webkitgtk-${version}";
- version = "2.24.0";
+ version = "2.24.1";
meta = {
description = "Web content rendering engine, GTK+ port";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://webkitgtk.org/releases/${name}.tar.xz";
- sha256 = "01s446lmjk7y8il4snjm32vpxws2rp4hmxrwm2swx0p47x8d2jif";
+ sha256 = "0v9riwrmwi9wxbb8hlvcbyyxa9zxhcdk6s1xcspalk6asam8xjsk";
};
patches = optionals stdenv.isDarwin [
From a31c37da269c7f34ffad129dbe16cb44ce63abb9 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Wed, 10 Apr 2019 16:54:46 +0200
Subject: [PATCH 089/115] Revert "spotify: 1.0.96.181.gf6bc1b6b-12 ->
1.1.0.237.g378f6f25-11"
This reverts commit ea87db215304c948484023f3a3be330d26c24650.
See #57800
---
pkgs/applications/audio/spotify/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index df6f9714819..060c1dc5d4d 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -10,14 +10,14 @@ let
# If an update breaks things, one of those might have valuable info:
# https://aur.archlinux.org/packages/spotify/
# https://community.spotify.com/t5/Desktop-Linux
- version = "1.1.0.237.g378f6f25-11";
+ version = "1.0.96.181.gf6bc1b6b-12";
# To get the latest stable revision:
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
# To get general information:
# curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
# More examples of api usage:
# https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
- rev = "34";
+ rev = "30";
deps = [
@@ -71,7 +71,7 @@ stdenv.mkDerivation {
# https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
- sha512 = "beddfa8f5de9998e8d1dca32295d03bdf41ec2c23eca82fcf56e5bae7b8fb84c036627b02ea458623a72a01ba09ef83cc50acdd06f2810bd444aae450d4861e6";
+ sha512 = "859730fbc80067f0828f7e13eee9a21b13b749f897a50e17c2da4ee672785cfd79e1af6336e609529d105e040dc40f61b6189524783ac93d49f991c4ea8b3c56";
};
buildInputs = [ squashfsTools makeWrapper ];
From fc1603583befcf2c5e83e4acee0d248c8129fc9f Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Wed, 10 Apr 2019 23:56:21 +0800
Subject: [PATCH 090/115] brook: init at 20190401 (#59201)
---
maintainers/maintainer-list.nix | 5 +
pkgs/tools/networking/brook/default.nix | 26 ++++
pkgs/tools/networking/brook/deps.nix | 173 ++++++++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 +
4 files changed, 206 insertions(+)
create mode 100644 pkgs/tools/networking/brook/default.nix
create mode 100644 pkgs/tools/networking/brook/deps.nix
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 56d30fc066d..835ebd528b7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5267,6 +5267,11 @@
github = "xnwdd";
name = "Guillermo NWDD";
};
+ xrelkd = {
+ email = "46590321+xrelkd@users.noreply.github.com";
+ github = "xrelkd";
+ name = "xrelkd";
+ };
xurei = {
email = "olivier.bourdoux@gmail.com";
github = "xurei";
diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix
new file mode 100644
index 00000000000..b840628e215
--- /dev/null
+++ b/pkgs/tools/networking/brook/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ pname = "brook";
+ version = "20190401";
+
+ goPackagePath = "github.com/txthinking/brook";
+
+ src = fetchFromGitHub {
+ owner = "txthinking";
+ repo = "${pname}";
+ rev = "v${version}";
+ sha256 = "0kx0dpvr3llpdzmw5bvzhdvwkmzrv6kqbsilx6rgrvyl61y9pyry";
+ };
+
+ goDeps = ./deps.nix;
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/txthinking/brook;
+ description = "A cross-platform Proxy/VPN software";
+ license = with licenses; [ gpl3 ];
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ xrelkd ];
+ };
+}
+
diff --git a/pkgs/tools/networking/brook/deps.nix b/pkgs/tools/networking/brook/deps.nix
new file mode 100644
index 00000000000..68fffd34e2a
--- /dev/null
+++ b/pkgs/tools/networking/brook/deps.nix
@@ -0,0 +1,173 @@
+[
+ {
+ goPackagePath = "github.com/urfave/cli";
+ fetch = {
+ type = "git";
+ url = "https://github.com/urfave/cli";
+ rev = "a1c7408de3f632d86eee604a3bb755f1ffb68226";
+ sha256 = "1fq0amfgpccf35nll7xw0k6smwrb7h0wy62n70kfd9kvh64n8hbn";
+ };
+ }
+ {
+ goPackagePath = "github.com/bitly/go-simplejson";
+ fetch = {
+ type = "git";
+ url = "https://github.com/bitly/go-simplejson";
+ rev = "9db4a59bd4d803ae0c173a7d8a538e056cd59d57";
+ sha256 = "0cbnjzjq55jnzk07zdk7nb96yzgpyawm1r6km3xignn8ih4bnn6g";
+ };
+ }
+ {
+ goPackagePath = "github.com/fatih/structs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fatih/structs";
+ rev = "878a968ab22548362a09bdb3322f98b00f470d46";
+ sha256 = "15nkffa8ylr5kkv52gyry675l8bzv3c0xx39j0fzz0vp2kcjyy8x";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-sql-driver/mysql";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-sql-driver/mysql";
+ rev = "93c3765e9bb2e29c6a63277c9f829dae34ec24eb";
+ sha256 = "043yalxp97vc9xsd5npms0h6slxrlzf8dzvd9l0wcxa8v0cl9lp6";
+ };
+ }
+ {
+ goPackagePath = "github.com/jinzhu/inflection";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jinzhu/inflection";
+ rev = "04140366298a54a039076d798123ffa108fff46c";
+ sha256 = "1s4qcnwaajp3c5ykwx4dfy32hykwsm0ki7kx8lcw8b0z0grkz6qh";
+ };
+ }
+ {
+ goPackagePath = "github.com/jmoiron/sqlx";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jmoiron/sqlx";
+ rev = "1d3423c595d749e4613fce663591b44ae539d377";
+ sha256 = "0947211fqibv9sqsk22lfnk080vqnsxmsan9fff5phygbmzbhzzb";
+ };
+ }
+ {
+ goPackagePath = "github.com/mdp/qrterminal";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mdp/qrterminal";
+ rev = "28b49810f53911623d0a538d8edc01b8cbe2bd0e";
+ sha256 = "17dq5niw57r1iq1rn1crpgbq1ydrcxqpzc9gj7dd1snc0p9n1rv1";
+ };
+ }
+ {
+ goPackagePath = "github.com/miekg/dns";
+ fetch = {
+ type = "git";
+ url = "https://github.com/miekg/dns";
+ rev = "73601d4aed9d844322611759d7f3619110b7c88e";
+ sha256 = "1frnj97bbch1qhg55fx2yz6mdjsz8fw94sj7pkrjms239j7vqcvm";
+ };
+ }
+ {
+ goPackagePath = "github.com/patrickmn/go-cache";
+ fetch = {
+ type = "git";
+ url = "https://github.com/patrickmn/go-cache";
+ rev = "5633e0862627c011927fa39556acae8b1f1df58a";
+ sha256 = "1zjk6yvig68zcbipa85dxz9xa82fk4zp4q33hwzxdv6h68wga5bs";
+ };
+ }
+ {
+ goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
+ fetch = {
+ type = "git";
+ url = "https://github.com/shurcooL/sanitized_anchor_name";
+ rev = "7bfe4c7ecddb3666a94b053b422cdd8f5aaa3615";
+ sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f";
+ };
+ }
+ {
+ goPackagePath = "github.com/txthinking/gotun2socks";
+ fetch = {
+ type = "git";
+ url = "https://github.com/txthinking/gotun2socks";
+ rev = "35016fdae05e78db993d43f55eb96ddbe3958252";
+ sha256 = "11rl8pqyd6jzi5alpymzi0i5q7pk2492di44v85g7r24y6livrjg";
+ };
+ }
+ {
+ goPackagePath = "github.com/txthinking/mailx";
+ fetch = {
+ type = "git";
+ url = "https://github.com/txthinking/mailx";
+ rev = "ebc2af2e1aa8d2178c30786c18eb138fbe40010d";
+ sha256 = "02h5b922savsljcgjz3gxkydk52zd2gbs51prz88l60n6miv9k70";
+ };
+ }
+ {
+ goPackagePath = "github.com/txthinking/socks5";
+ fetch = {
+ type = "git";
+ url = "https://github.com/txthinking/socks5";
+ rev = "254e122c4eaf8657900905ed5bed5777870b9df8";
+ sha256 = "1q43sxzacj216mdzl44khhx51w1z78jpraw955dnjv9va0zqbhmi";
+ };
+ }
+ {
+ goPackagePath = "github.com/txthinking/x";
+ fetch = {
+ type = "git";
+ url = "https://github.com/txthinking/x";
+ rev = "e13a838cdc21596c45b4e6b6fd15c822597c9ae3";
+ sha256 = "0l5gzhy3h3qynfkgd789hxkv433yqdn1mmk945bwjha7vrm4rx2z";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "38d8ce5564a5b71b2e3a00553993f1b9a7ae852f";
+ sha256 = "1x52liy2540pw75sqsw4vpg41vq2dnmqpc0j5r7k6jxv6xmbr5mb";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "eb5bcb51f2a31c7d5141d810b70815c05d9c9146";
+ sha256 = "17k4g8krxbl84gzcs275b7gsh66dzm15fdxivjnx9xz8q84l4kby";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/text";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/text";
+ rev = "31e7599a6c37728c25ca34167be099d072ad335d";
+ sha256 = "18i17j7nkkc5dl9rpzm8l345r409hfj4knfnldar684337x1irrf";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/russross/blackfriday.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/russross/blackfriday.v2";
+ rev = "d3b5b032dc8e8927d31a5071b56e14c89f045135";
+ sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j";
+ };
+ }
+ {
+ goPackagePath = "rsc.io/qr";
+ fetch = {
+ type = "git";
+ url = "https://github.com/rsc/qr";
+ rev = "ca9a01fc2f9505024045632c50e5e8cd6142fafe";
+ sha256 = "04yx493g0fqp8i59zjxnl4k3s0cl0kr5m8xh0ph8m10r1hkw0xr3";
+ };
+ }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 668312e1a96..44dc7aacd0e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1053,6 +1053,8 @@ in
bro = callPackage ../applications/networking/ids/bro { };
+ brook = callPackage ../tools/networking/brook { };
+
broot = callPackage ../tools/misc/broot { };
bruteforce-luks = callPackage ../tools/security/bruteforce-luks { };
From f15bd3cca3c4dbc2d24f0bb74dda4a35eac11758 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 10 Apr 2019 17:27:07 +0100
Subject: [PATCH 091/115] pythonPackages.pythonix: 0.1.4 -> 0.1.6
---
pkgs/development/python-modules/pythonix/default.nix | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/python-modules/pythonix/default.nix b/pkgs/development/python-modules/pythonix/default.nix
index cd20bf72f5d..6ed150d1239 100644
--- a/pkgs/development/python-modules/pythonix/default.nix
+++ b/pkgs/development/python-modules/pythonix/default.nix
@@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "pythonix";
- version = "0.1.4";
+ version = "0.1.6";
format = "other";
src = fetchFromGitHub {
owner = "Mic92";
repo = "pythonix";
rev = "v${version}";
- sha256 = "1q1fagfwzvmcm1n3a0liay7m5krazmhw9l001m90rrz2x7vrsqwk";
+ sha256 = "1qzcrpn333hsgn6fj1m1s3cvaf0ny8qpygamcrazqv57xmwyr8h5";
};
disabled = !isPy3k;
@@ -24,6 +24,5 @@ buildPythonPackage rec {
'';
maintainers = [ maintainers.mic92 ];
license = licenses.mit;
- broken = true;
};
}
From 5e4ca6a0da6e9bd65efced79502c061bbedff965 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 23 Feb 2019 10:18:21 +0100
Subject: [PATCH 092/115] init: demoit-unstable-2019-03-29
---
pkgs/servers/demoit/default.nix | 24 ++++++++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
2 files changed, 26 insertions(+)
create mode 100644 pkgs/servers/demoit/default.nix
diff --git a/pkgs/servers/demoit/default.nix b/pkgs/servers/demoit/default.nix
new file mode 100644
index 00000000000..24eafb98747
--- /dev/null
+++ b/pkgs/servers/demoit/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildGoPackage
+, fetchFromGitHub
+}:
+
+buildGoPackage rec {
+ pname = "demoit";
+ version = "unstable-2019-03-29";
+ goPackagePath = "github.com/dgageot/demoit";
+
+ src = fetchFromGitHub {
+ owner = "dgageot";
+ repo = "demoit";
+ rev = "ec70fbdf5a5e92fa1c06d8f039f7d388e0237ba2";
+ sha256 = "01584cxlnrc928sw7ldmi0sm7gixmwnawy3c5hd79rqkw8r0gbk0";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Live coding demos without Context Switching";
+ homepage = https://github.com/dgageot/demoit;
+ license = licenses.asl20;
+ maintainers = [ maintainers.freezeboy ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0675242485..113930d69cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -157,6 +157,8 @@ in
deadcode = callPackage ../development/tools/deadcode { };
+ demoit = callPackage ../servers/demoit { };
+
diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins;
dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh;
From 7bd2c5a6043218a2feab7ef38027d4c5a73554f8 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 10 Apr 2019 17:46:15 +0100
Subject: [PATCH 093/115] python3Packages.nixpkgs: Fix ImportError with recent
pythonix versions
---
pkgs/development/python-modules/nixpkgs/default.nix | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/pkgs/development/python-modules/nixpkgs/default.nix b/pkgs/development/python-modules/nixpkgs/default.nix
index 71c142436d9..3a3f03c87ba 100644
--- a/pkgs/development/python-modules/nixpkgs/default.nix
+++ b/pkgs/development/python-modules/nixpkgs/default.nix
@@ -1,5 +1,6 @@
{ stdenv
, buildPythonPackage
+, fetchpatch
, fetchPypi
, pbr
, pythonix
@@ -16,6 +17,15 @@ buildPythonPackage rec {
sha256 = "0gsrd99kkv99jsrh3hckz7ns1zwndi9vvh4465v4gnpz723dd6fj";
};
+ patches = [
+ # Patch should be dropped once https://github.com/t184256/nixpkgs-python-importer/pull/7
+ # is merged and in a release
+ (fetchpatch {
+ url = "https://github.com/adisbladis/nixpkgs-python-importer/commit/749e05f1.patch";
+ sha256 = "1a72phazpqf6vf3hl3m84z9i5n6h1xpa53bqxnpsff6agxxhd21b";
+ })
+ ];
+
buildInputs = [ pbr ];
propagatedBuildInputs = [ pythonix ];
From 015888ce7f7bd8e5168390fc6a923972389f0727 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Tue, 2 Apr 2019 16:26:05 +0200
Subject: [PATCH 094/115] hdf5: 1.10.4 -> 1.10.5
---
...se-the-MPI-2-function-MPI_Type_get_e.patch | 58 ---------
.../hdf5/0001-Yanked-all-MPI-1-calls.patch | 115 ------------------
pkgs/tools/misc/hdf5/default.nix | 8 +-
3 files changed, 2 insertions(+), 179 deletions(-)
delete mode 100644 pkgs/tools/misc/hdf5/0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch
delete mode 100644 pkgs/tools/misc/hdf5/0001-Yanked-all-MPI-1-calls.patch
diff --git a/pkgs/tools/misc/hdf5/0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch b/pkgs/tools/misc/hdf5/0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch
deleted file mode 100644
index 8b32ea4bab1..00000000000
--- a/pkgs/tools/misc/hdf5/0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 38c202df4db8eddd5e6f6f7d6506ce97912a3111 Mon Sep 17 00:00:00 2001
-From: Dana Robinson <derobins@hdfgroup.org>
-Date: Mon, 26 Nov 2018 22:10:06 -0800
-Subject: [PATCH] Updated H5S to use the MPI-2 function MPI_Type_get_exten()
- where available. OpenMPI 4.0 removed the deprecated MPI-1 MPI_type_extent()
- call by default, so this avoids needing a special OpenMPI build.
-
----
- src/H5Smpio.c | 26 ++++++++++++++++++++++++--
- 1 file changed, 24 insertions(+), 2 deletions(-)
-
-diff --git a/src/H5Smpio.c b/src/H5Smpio.c
-index 2bd275a729..e71e2cb858 100644
---- a/src/H5Smpio.c
-+++ b/src/H5Smpio.c
-@@ -879,7 +879,18 @@ H5S_mpio_hyper_type(const H5S_t *space, size_t elmt_size,
- HMPI_GOTO_ERROR(FAIL, "MPI_Type_contiguous failed", mpi_code)
- }
-
-- MPI_Type_extent (inner_type, &inner_extent);
-+#if MPI_VERSION >= 2
-+{
-+ /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default,
-+ * so we're using the MPI-2 version even though we don't need the lb
-+ * value.
-+ */
-+ MPI_Aint unused_lb_arg;
-+ MPI_Type_get_extent(inner_type, &unused_lb_arg, &inner_extent);
-+}
-+#else
-+ MPI_Type_extent(inner_type, &inner_extent);
-+#endif
- stride_in_bytes = inner_extent * (MPI_Aint)d[i].strid;
-
- /* If the element count is larger than what a 32 bit integer can hold,
-@@ -1500,7 +1511,18 @@ static herr_t H5S_mpio_create_large_type (hsize_t num_elements,
- }
- }
-
-- MPI_Type_extent (old_type, &old_extent);
-+#if MPI_VERSION >= 2
-+{
-+ /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default,
-+ * so we're using the MPI-2 version even though we don't need the lb
-+ * value.
-+ */
-+ MPI_Aint unused_lb_arg;
-+ MPI_Type_get_extent(old_type, &unused_lb_arg, &old_extent);
-+}
-+#else
-+ MPI_Type_extent(old_type, &old_extent);
-+#endif
-
- /* Set up the arguments for MPI_Type_struct constructor */
- type[0] = outer_type;
---
-2.18.1
-
diff --git a/pkgs/tools/misc/hdf5/0001-Yanked-all-MPI-1-calls.patch b/pkgs/tools/misc/hdf5/0001-Yanked-all-MPI-1-calls.patch
deleted file mode 100644
index 8dc831dbba1..00000000000
--- a/pkgs/tools/misc/hdf5/0001-Yanked-all-MPI-1-calls.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 8cf3bfb14bd2a80f13d269a9e84cd99f86f19254 Mon Sep 17 00:00:00 2001
-From: Dana Robinson <derobins@hdfgroup.org>
-Date: Tue, 27 Nov 2018 10:31:54 -0800
-Subject: [PATCH] Yanked all MPI-1 calls
-
----
- src/H5.c | 2 +-
- src/H5Smpio.c | 24 ++++++++----------------
- testpar/t_cache.c | 20 ++++++++++----------
- 3 files changed, 19 insertions(+), 27 deletions(-)
-
-diff --git a/src/H5.c b/src/H5.c
-index d1967e611b..bf4643ca59 100644
---- a/src/H5.c
-+++ b/src/H5.c
-@@ -138,7 +138,7 @@ H5_init_library(void)
- if (mpi_initialized && !mpi_finalized) {
- int key_val;
-
-- if(MPI_SUCCESS != (mpi_code = MPI_Comm_create_keyval(MPI_NULL_COPY_FN,
-+ if(MPI_SUCCESS != (mpi_code = MPI_Comm_create_keyval(MPI_COMM_NULL_COPY_FN,
- (MPI_Comm_delete_attr_function *)H5_mpi_delete_cb,
- &key_val, NULL)))
- HMPI_GOTO_ERROR(FAIL, "MPI_Comm_create_keyval failed", mpi_code)
-diff --git a/src/H5Smpio.c b/src/H5Smpio.c
-index e71e2cb858..935d27972e 100644
---- a/src/H5Smpio.c
-+++ b/src/H5Smpio.c
-@@ -879,18 +879,14 @@ H5S_mpio_hyper_type(const H5S_t *space, size_t elmt_size,
- HMPI_GOTO_ERROR(FAIL, "MPI_Type_contiguous failed", mpi_code)
- }
-
--#if MPI_VERSION >= 2
--{
- /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default,
- * so we're using the MPI-2 version even though we don't need the lb
- * value.
- */
-- MPI_Aint unused_lb_arg;
-- MPI_Type_get_extent(inner_type, &unused_lb_arg, &inner_extent);
--}
--#else
-- MPI_Type_extent(inner_type, &inner_extent);
--#endif
-+ {
-+ MPI_Aint unused_lb_arg;
-+ MPI_Type_get_extent(inner_type, &unused_lb_arg, &inner_extent);
-+ }
- stride_in_bytes = inner_extent * (MPI_Aint)d[i].strid;
-
- /* If the element count is larger than what a 32 bit integer can hold,
-@@ -1511,18 +1507,14 @@ static herr_t H5S_mpio_create_large_type (hsize_t num_elements,
- }
- }
-
--#if MPI_VERSION >= 2
--{
- /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default,
- * so we're using the MPI-2 version even though we don't need the lb
- * value.
- */
-- MPI_Aint unused_lb_arg;
-- MPI_Type_get_extent(old_type, &unused_lb_arg, &old_extent);
--}
--#else
-- MPI_Type_extent(old_type, &old_extent);
--#endif
-+ {
-+ MPI_Aint unused_lb_arg;
-+ MPI_Type_get_extent(old_type, &unused_lb_arg, &old_extent);
-+ }
-
- /* Set up the arguments for MPI_Type_struct constructor */
- type[0] = outer_type;
-diff --git a/testpar/t_cache.c b/testpar/t_cache.c
-index 5e15ec274c..ca5ded9ecf 100644
---- a/testpar/t_cache.c
-+++ b/testpar/t_cache.c
-@@ -1217,15 +1217,15 @@ setup_derived_types(void)
- struct mssg_t sample; /* used to compute displacements */
-
- /* setup the displacements array */
-- if ( ( MPI_SUCCESS != MPI_Address(&sample.req, &displs[0]) ) ||
-- ( MPI_SUCCESS != MPI_Address(&sample.src, &displs[1]) ) ||
-- ( MPI_SUCCESS != MPI_Address(&sample.dest, &displs[2]) ) ||
-- ( MPI_SUCCESS != MPI_Address(&sample.mssg_num, &displs[3]) ) ||
-- ( MPI_SUCCESS != MPI_Address(&sample.base_addr, &displs[4]) ) ||
-- ( MPI_SUCCESS != MPI_Address(&sample.len, &displs[5]) ) ||
-- ( MPI_SUCCESS != MPI_Address(&sample.ver, &displs[6]) ) ||
-- ( MPI_SUCCESS != MPI_Address(&sample.count, &displs[7]) ) ||
-- ( MPI_SUCCESS != MPI_Address(&sample.magic, &displs[8]) ) ) {
-+ if ( ( MPI_SUCCESS != MPI_Get_address(&sample.req, &displs[0]) ) ||
-+ ( MPI_SUCCESS != MPI_Get_address(&sample.src, &displs[1]) ) ||
-+ ( MPI_SUCCESS != MPI_Get_address(&sample.dest, &displs[2]) ) ||
-+ ( MPI_SUCCESS != MPI_Get_address(&sample.mssg_num, &displs[3]) ) ||
-+ ( MPI_SUCCESS != MPI_Get_address(&sample.base_addr, &displs[4]) ) ||
-+ ( MPI_SUCCESS != MPI_Get_address(&sample.len, &displs[5]) ) ||
-+ ( MPI_SUCCESS != MPI_Get_address(&sample.ver, &displs[6]) ) ||
-+ ( MPI_SUCCESS != MPI_Get_address(&sample.count, &displs[7]) ) ||
-+ ( MPI_SUCCESS != MPI_Get_address(&sample.magic, &displs[8]) ) ) {
-
- nerrors++;
- success = FALSE;
-@@ -1245,7 +1245,7 @@ setup_derived_types(void)
-
- if ( success ) {
-
-- result = MPI_Type_struct(9, block_len, displs, mpi_types, &mpi_mssg_t);
-+ result = MPI_Type_create_struct(9, block_len, displs, mpi_types, &mpi_mssg_t);
-
- if ( result != MPI_SUCCESS ) {
-
---
-2.18.1
-
diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index ae34cfd3235..e6402322d35 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -16,11 +16,11 @@ assert !cpp || mpi == null;
let inherit (stdenv.lib) optional optionals; in
stdenv.mkDerivation rec {
- version = "1.10.4";
+ version = "1.10.5";
name = "hdf5-${version}";
src = fetchurl {
url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${name}/src/${name}.tar.bz2";
- sha256 = "1pr85fa1sh2ky6ai2hs3f21lp252grl2cq3wbyi4rh7dm83gyrqj";
+ sha256 = "0i3g6v521vigzbx8wpd32ibsiiw92r65ca3qdbn0d8fj8f4fmmk8";
};
passthru = {
@@ -47,10 +47,6 @@ stdenv.mkDerivation rec {
patches = [
./bin-mv.patch
- # upstream patches for openmpi-4 compatiblity
- # To be removed with the upgrade to 1.10.5
- ./0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch
- ./0001-Yanked-all-MPI-1-calls.patch
];
postInstall = ''
From d5cc30b721ea10bd01db69f465e505effba245ad Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Mon, 8 Apr 2019 16:46:27 +0200
Subject: [PATCH 095/115] pythonPackages.h5py: add patch to fix broken test
---
pkgs/development/python-modules/h5py/default.nix | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix
index 69507798cbe..23e659ea7ae 100644
--- a/pkgs/development/python-modules/h5py/default.nix
+++ b/pkgs/development/python-modules/h5py/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchPypi, isPy27, python, buildPythonPackage
-, numpy, hdf5, cython, six, pkgconfig, unittest2
+, numpy, hdf5, cython, six, pkgconfig, unittest2, fetchpatch
, mpi4py ? null, openssh }:
assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi;
@@ -18,6 +18,12 @@ in buildPythonPackage rec {
sha256 = "9d41ca62daf36d6b6515ab8765e4c8c4388ee18e2a665701fef2b41563821002";
};
+ patches = [ ( fetchpatch {
+ # Skip a test that probes an already fixed bug in HDF5 (upstream patch)
+ url = "https://github.com/h5py/h5py/commit/141eafa531c6c09a06efe6a694251a1eea84908d.patch";
+ sha256 = "0lmdn0gznr7gadx7qkxybl945fvwk6r0cc4lg3ylpf8ril1975h8";
+ })];
+
configure_flags = "--hdf5=${hdf5}" + optionalString mpiSupport " --mpi";
postConfigure = ''
From 40160d5f17bb80fd8ad6fa207b5362a5ca6eefba Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Thu, 11 Apr 2019 01:24:14 +0800
Subject: [PATCH 096/115] go-ethereum: 1.8.25 -> 1.8.26
---
pkgs/applications/altcoins/go-ethereum.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix
index cb8a22b84c9..22697af2092 100644
--- a/pkgs/applications/altcoins/go-ethereum.nix
+++ b/pkgs/applications/altcoins/go-ethereum.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "go-ethereum-${version}";
- version = "1.8.25";
+ version = "1.8.26";
goPackagePath = "github.com/ethereum/go-ethereum";
# Fix for usb-related segmentation faults on darwin
@@ -16,7 +16,7 @@ buildGoPackage rec {
owner = "ethereum";
repo = "go-ethereum";
rev = "v${version}";
- sha256 = "0kjmr4brw6vszmqqyx8q330nfav8sy4ggn010n254gbi461zy5j7";
+ sha256 = "0i7shrwix5j8l5i0ap5pzhninwyk2kvm1pax27pnnjlpam8577i4";
};
meta = with stdenv.lib; {
From cd4486ecc3a4ce0e4c8ec3ce87945f581f0a6037 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Wed, 10 Apr 2019 17:12:36 +0200
Subject: [PATCH 097/115] nixos/prometheus/alertmanager: use DynamicUser
instead of nobody
See issue #55370
---
nixos/doc/manual/release-notes/rl-1909.xml | 9 +++++++++
nixos/modules/rename.nix | 2 ++
.../monitoring/prometheus/alertmanager.nix | 20 +------------------
3 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 72fa6f4d515..2fef14e6a80 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -101,6 +101,15 @@
<option>services.prometheus.stateDir</option> at the same time.
</para>
</listitem>
+ <listitem>
+ <para>
+ The options <option>services.prometheus.alertmanager.user</option> and
+ <option>services.prometheus.alertmanager.group</option> have been removed
+ because the alertmanager service is now using systemd's <link
+ xlink:href="http://0pointer.net/blog/dynamic-users-with-systemd.html">
+ DynamicUser mechanism</link> which obviates these options.
+ </para>
+ </listitem>
</itemizedlist>
</section>
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 30d11cc58fa..f6c112d9cfa 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -45,6 +45,8 @@ with lib;
(mkRemovedOptionModule [ "services" "neo4j" "port" ] "Use services.neo4j.http.listenAddress instead.")
(mkRemovedOptionModule [ "services" "neo4j" "boltPort" ] "Use services.neo4j.bolt.listenAddress instead.")
(mkRemovedOptionModule [ "services" "neo4j" "httpsPort" ] "Use services.neo4j.https.listenAddress instead.")
+ (mkRemovedOptionModule [ "services" "prometheus" "alertmanager" "user" ] "The alertmanager service is now using systemd's DynamicUser mechanism which obviates a user setting.")
+ (mkRemovedOptionModule [ "services" "prometheus" "alertmanager" "group" ] "The alertmanager service is now using systemd's DynamicUser mechanism which obviates a group setting.")
(mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "relay" "port" ])
(mkRenamedOptionModule [ "services" "vmwareGuest" ] [ "virtualisation" "vmware" "guest" ])
(mkRenamedOptionModule [ "jobs" ] [ "systemd" "services" ])
diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
index 31beee3d39d..11d85e9c4fc 100644
--- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix
+++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
@@ -40,22 +40,6 @@ in {
'';
};
- user = mkOption {
- type = types.str;
- default = "nobody";
- description = ''
- User name under which Alertmanager shall be run.
- '';
- };
-
- group = mkOption {
- type = types.str;
- default = "nogroup";
- description = ''
- Group under which Alertmanager shall be run.
- '';
- };
-
configuration = mkOption {
type = types.nullOr types.attrs;
default = null;
@@ -152,10 +136,8 @@ in {
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig = {
- User = cfg.user;
- Group = cfg.group;
Restart = "always";
- PrivateTmp = true;
+ DynamicUser = true;
WorkingDirectory = "/tmp";
ExecStart = "${cfg.package}/bin/alertmanager" +
optionalString (length cmdlineArgs != 0) (" \\\n " +
From 6f9084464b93adc0f831eabe7b6c52aae7bbafb3 Mon Sep 17 00:00:00 2001
From: StillerHarpo <florianengel39@gmail.com>
Date: Wed, 10 Apr 2019 22:00:57 +0200
Subject: [PATCH 098/115] lolcat: 99.9.19 -> 99.9.96 (#59271)
---
pkgs/tools/misc/lolcat/Gemfile.lock | 10 +++++-----
pkgs/tools/misc/lolcat/gemset.nix | 26 +++++++++++++-------------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/pkgs/tools/misc/lolcat/Gemfile.lock b/pkgs/tools/misc/lolcat/Gemfile.lock
index 58f62b64e71..e1e60663a27 100644
--- a/pkgs/tools/misc/lolcat/Gemfile.lock
+++ b/pkgs/tools/misc/lolcat/Gemfile.lock
@@ -1,13 +1,13 @@
GEM
remote: http://rubygems.org/
specs:
- lolcat (99.9.19)
+ lolcat (99.9.69)
manpages (~> 0.6.1)
+ optimist (~> 3.0.0)
paint (~> 2.0.0)
- trollop (~> 2.1.3)
manpages (0.6.1)
- paint (2.0.1)
- trollop (2.1.3)
+ optimist (3.0.0)
+ paint (2.0.3)
PLATFORMS
ruby
@@ -16,4 +16,4 @@ DEPENDENCIES
lolcat
BUNDLED WITH
- 1.14.6
+ 1.16.3
diff --git a/pkgs/tools/misc/lolcat/gemset.nix b/pkgs/tools/misc/lolcat/gemset.nix
index 3e68f307530..9e351eecb82 100644
--- a/pkgs/tools/misc/lolcat/gemset.nix
+++ b/pkgs/tools/misc/lolcat/gemset.nix
@@ -1,12 +1,12 @@
{
lolcat = {
- dependencies = ["manpages" "paint" "trollop"];
+ dependencies = ["manpages" "optimist" "paint"];
source = {
remotes = ["http://rubygems.org"];
- sha256 = "05zm92ad0ws9fklpz1xk94hy95argwana01c6rr2xbx2q4mcil9m";
+ sha256 = "0d1yh2ikyhyh7am4qznd6fzv2pyvk82xrnsrsbbyxzcqfz9x6aa9";
type = "gem";
};
- version = "99.9.19";
+ version = "99.9.69";
};
manpages = {
source = {
@@ -16,20 +16,20 @@
};
version = "0.6.1";
};
+ optimist = {
+ source = {
+ remotes = ["http://rubygems.org"];
+ sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j";
+ type = "gem";
+ };
+ version = "3.0.0";
+ };
paint = {
source = {
remotes = ["http://rubygems.org"];
- sha256 = "1gnh9cihc84w4xbw51pg15crjvhblbq6nkzljrp7kmn3434nsg0d";
+ sha256 = "0ldb269l3pzkihmsws19cr9h3l6naw8c2fqpav8ck3nllnyiv7r2";
type = "gem";
};
- version = "2.0.1";
- };
- trollop = {
- source = {
- remotes = ["http://rubygems.org"];
- sha256 = "1rzx9rkacpq58dsvbbzs4cpybls1v1h36xskkfs5q2askpdr00wq";
- type = "gem";
- };
- version = "2.1.3";
+ version = "2.0.3";
};
}
\ No newline at end of file
From e527f99d49f30d40d70187337b6f706a5de079ab Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 10 Apr 2019 13:20:28 -0700
Subject: [PATCH 099/115] rspamd: 1.8.3 -> 1.9.0 (#58873)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/rspamd/versions
From 1c17ccf6c2a220167e65c57b25ff2743fe7b24bd Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 10 Apr 2019 15:22:48 -0500
Subject: [PATCH 100/115] gotop: 2.0.1 -> 3.0.0 (#58615)
---
pkgs/tools/system/gotop/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix
index 745139f9e50..daf9ce58c91 100644
--- a/pkgs/tools/system/gotop/default.nix
+++ b/pkgs/tools/system/gotop/default.nix
@@ -1,16 +1,16 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "gotop-${version}";
- version = "2.0.1";
+ pname = "gotop";
+ version = "3.0.0";
goPackagePath = "github.com/cjbassi/gotop";
src = fetchFromGitHub {
- repo = "gotop";
owner = "cjbassi";
+ repo = pname;
rev = version;
- sha256 = "0xpm8nrn53kz65f93czflgdgr2a33qfi1w0gsgngrmaliq1vlpji";
+ sha256 = "1kndj5qjaqgizjakh642fay2i0i1jmfjlk1p01gnjbh2b0yzvj1r";
};
meta = with stdenv.lib; {
From 90231bc929bfce72ceb09ef2a8b81cb5b1985b73 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 10 Apr 2019 15:29:30 -0500
Subject: [PATCH 101/115] dep2nix: 0.0.2 -> 2019-04-02 (#58623)
---
pkgs/development/tools/dep2nix/default.nix | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/tools/dep2nix/default.nix b/pkgs/development/tools/dep2nix/default.nix
index e7033c44dd4..dcdb1053cf7 100644
--- a/pkgs/development/tools/dep2nix/default.nix
+++ b/pkgs/development/tools/dep2nix/default.nix
@@ -2,16 +2,16 @@
, makeWrapper, nix-prefetch-scripts }:
buildGoPackage rec {
- name = "dep2nix-${version}";
- version = "0.0.2";
+ pname = "dep2nix";
+ version = "unstable-2019-04-02";
goPackagePath = "github.com/nixcloud/dep2nix";
src = fetchFromGitHub {
owner = "nixcloud";
- repo = "dep2nix";
- rev = version;
- sha256 = "17csgnd6imr1l0gpirsvr5qg7z0mpzxj211p2nwqilrvbp8zj7vg";
+ repo = pname;
+ rev = "830684f920333b8ff0946d6b807e8be642eec3ef";
+ sha256 = "17sjxhzhmz4893x3x054anp4xvqd1px15nv3fj2m7i6r0vbgpm0j";
};
nativeBuildInputs = [
From 5e2dee877a40d1225a648f4bdb4f2812fd1dd7c3 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 10 Apr 2019 15:32:13 -0500
Subject: [PATCH 102/115] influxdb: 1.6.3 -> 1.7.5 (#58622)
---
pkgs/servers/nosql/influxdb/default.nix | 13 +-
pkgs/servers/nosql/influxdb/deps-1.4.1.nix | 227 ------
pkgs/servers/nosql/influxdb/deps-1.6.3.nix | 444 -----------
pkgs/servers/nosql/influxdb/deps.nix | 840 +++++++++++++++++++++
4 files changed, 846 insertions(+), 678 deletions(-)
delete mode 100644 pkgs/servers/nosql/influxdb/deps-1.4.1.nix
delete mode 100644 pkgs/servers/nosql/influxdb/deps-1.6.3.nix
create mode 100644 pkgs/servers/nosql/influxdb/deps.nix
diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
index a47553b975e..1bbdc678952 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -1,14 +1,14 @@
{ lib, buildGoPackage, fetchFromGitHub, }:
buildGoPackage rec {
- name = "influxdb-${version}";
- version = "1.6.3";
+ pname = "influxdb";
+ version = "1.7.5";
src = fetchFromGitHub {
owner = "influxdata";
- repo = "influxdb";
+ repo = pname;
rev = "v${version}";
- sha256 = "0xf16liapllk8qnw0vsy1ja4if1xlazwwaa4p0r5j7bny5lxm7zy";
+ sha256 = "0gwivazjvxw6fflf2637qn0crq564fjzhncsl3agph5ciqyv48gx";
};
buildFlagsArray = [ ''-ldflags=
@@ -19,13 +19,12 @@ buildGoPackage rec {
excludedPackages = "test";
- # Generated with dep2nix (for 1.6.3) / nix2go (for 1.4.1).
- goDeps = ./. + "/deps-${version}.nix";
+ goDeps = ./deps.nix;
meta = with lib; {
description = "An open-source distributed time series database";
license = licenses.mit;
- homepage = https://influxdb.com/;
+ homepage = https://influxdata.com/;
maintainers = with maintainers; [ offline zimbatm ];
};
}
diff --git a/pkgs/servers/nosql/influxdb/deps-1.4.1.nix b/pkgs/servers/nosql/influxdb/deps-1.4.1.nix
deleted file mode 100644
index edda6ff7c7d..00000000000
--- a/pkgs/servers/nosql/influxdb/deps-1.4.1.nix
+++ /dev/null
@@ -1,227 +0,0 @@
-[
- {
- goPackagePath = "collectd.org";
- fetch = {
- type = "git";
- url = "https://github.com/collectd/go-collectd";
- rev = "e84e8af5356e7f47485bbc95c96da6dd7984a67e";
- sha256 = "0cfxg8iz7bdy3d74cqjns7x7lyrma5lkrqqpqk79a2gk0g2bhmnd";
- };
- }
- {
- goPackagePath = "github.com/bmizerany/pat";
- fetch = {
- type = "git";
- url = "https://github.com/bmizerany/pat";
- rev = "c068ca2f0aacee5ac3681d68e4d0a003b7d1fd2c";
- sha256 = "02ayddkp2b22rixw5jldw3kb6762zzkg5zhxwcv9v9yp0x39qw6r";
- };
- }
- {
- goPackagePath = "github.com/boltdb/bolt";
- fetch = {
- type = "git";
- url = "https://github.com/boltdb/bolt";
- rev = "4b1ebc1869ad66568b313d0dc410e2be72670dda";
- sha256 = "1narpch9fc2f4yj8asb981gyq7b3z6p41xb635xh2k75yv5g024w";
- };
- }
- {
- goPackagePath = "github.com/BurntSushi/toml";
- fetch = {
- type = "git";
- url = "https://github.com/BurntSushi/toml";
- rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
- sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
- };
- }
- {
- goPackagePath = "github.com/cespare/xxhash";
- fetch = {
- type = "git";
- url = "https://github.com/cespare/xxhash";
- rev = "1b6d2e40c16ba0dfce5c8eac2480ad6e7394819b";
- sha256 = "1h7dym9fmk7rwrrc26lcwi7wmf4y4rxgg7byivg55yia9wlhy00m";
- };
- }
- {
- goPackagePath = "github.com/dgrijalva/jwt-go";
- fetch = {
- type = "git";
- url = "https://github.com/dgrijalva/jwt-go";
- rev = "24c63f56522a87ec5339cc3567883f1039378fdb";
- sha256 = "1xjb3cj9qa66dk6sfrlggfm4a66qirqrp4qds90xzjj5sx51j4zk";
- };
- }
- {
- goPackagePath = "github.com/dgryski/go-bits";
- fetch = {
- type = "git";
- url = "https://github.com/dgryski/go-bits";
- rev = "2ad8d707cc05b1815ce6ff2543bb5e8d8f9298ef";
- sha256 = "08mxwa4c77dgpvz2ygwd0pc929qxwff95y680mjjgbvj8yifiag2";
- };
- }
- {
- goPackagePath = "github.com/dgryski/go-bitstream";
- fetch = {
- type = "git";
- url = "https://github.com/dgryski/go-bitstream";
- rev = "7d46cd22db7004f0cceb6f7975824b560cf0e486";
- sha256 = "1k9l16y7l2mkfvnp2ydv9cqly8179wqd20am4zy0q77qcsawkksx";
- };
- }
- {
- goPackagePath = "github.com/gogo/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/gogo/protobuf";
- rev = "1c2b16bc280d6635de6c52fc1471ab962dc36ec9";
- sha256 = "0h9vkfy3ydz0d6x72853yg49r9k54cgjnlv6a7v12gzqw47p941i";
- };
- }
- {
- goPackagePath = "github.com/golang/snappy";
- fetch = {
- type = "git";
- url = "https://github.com/golang/snappy";
- rev = "d9eb7a3d35ec988b8585d4a0068e462c27d28380";
- sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn";
- };
- }
- {
- goPackagePath = "github.com/influxdata/influxql";
- fetch = {
- type = "git";
- url = "https://github.com/influxdata/influxql";
- rev = "3921ab7858b6af8443fe0bef06b52608be72852c";
- sha256 = "182ja5a9njlklavh5hzf7p06913pznp7j3chkrp0qwxj3jxysi2d";
- };
- }
- {
- goPackagePath = "github.com/influxdata/usage-client";
- fetch = {
- type = "git";
- url = "https://github.com/influxdata/usage-client";
- rev = "6d3895376368aa52a3a81d2a16e90f0f52371967";
- sha256 = "0a5adnid42f9vpckgcpkj7v60fh147j7zlg1rhxcpq5vkw698ifl";
- };
- }
- {
- goPackagePath = "github.com/influxdata/yamux";
- fetch = {
- type = "git";
- url = "https://github.com/influxdata/yamux";
- rev = "1f58ded512de5feabbe30b60c7d33a7a896c5f16";
- sha256 = "08y1lgcyyaa8zrg24ck64b5dfassgb2pp1fb9x5lw9q16fb170bx";
- };
- }
- {
- goPackagePath = "github.com/influxdata/yarpc";
- fetch = {
- type = "git";
- url = "https://github.com/influxdata/yarpc";
- rev = "036268cdec22b7074cd6d50cc6d7315c667063c7";
- sha256 = "12xxwr451ya5h7kv7lg6lnwk04xazyxzv2g7bcgx9zifafxlhpxf";
- };
- }
- {
- goPackagePath = "github.com/jwilder/encoding";
- fetch = {
- type = "git";
- url = "https://github.com/jwilder/encoding";
- rev = "27894731927e49b0a9023f00312be26733744815";
- sha256 = "0g4sdc5wj50js2hhrdcb7iik3wpd87gc0ivy4gwn49m8nxlpl7w3";
- };
- }
- {
- goPackagePath = "github.com/peterh/liner";
- fetch = {
- type = "git";
- url = "https://github.com/peterh/liner";
- rev = "88609521dc4b6c858fd4c98b628147da928ce4ac";
- sha256 = "0jacb2fqgiccb98v1875j5xvj01l1z2laga1kgr8lhd0nl22r96k";
- };
- }
- {
- goPackagePath = "github.com/philhofer/fwd";
- fetch = {
- type = "git";
- url = "https://github.com/philhofer/fwd";
- rev = "1612a298117663d7bc9a760ae20d383413859798";
- sha256 = "155l0nvvblpx0fy683q6bzins7csh8fw7yf64hbia8hc7wh0gjdl";
- };
- }
- {
- goPackagePath = "github.com/retailnext/hllpp";
- fetch = {
- type = "git";
- url = "https://github.com/retailnext/hllpp";
- rev = "38a7bb71b483e855d35010808143beaf05b67f9d";
- sha256 = "0zpq5yjqprzdw9ll6g9sqp8nzwkhjh4ngzhx5mxahmpajgnzz7a8";
- };
- }
- {
- goPackagePath = "github.com/tinylib/msgp";
- fetch = {
- type = "git";
- url = "https://github.com/tinylib/msgp";
- rev = "ad0ff2e232ad2e37faf67087fb24bf8d04a8ce20";
- sha256 = "1j3sqsmq8v40dp1qcv2dsy3aq3yl088hpd4fnrrnnl53g3a18p4d";
- };
- }
- {
- goPackagePath = "github.com/uber-go/atomic";
- fetch = {
- type = "git";
- url = "https://github.com/uber-go/atomic";
- rev = "74ca5ec650841aee9f289dce76e928313a37cbc6";
- sha256 = "14a4k5z4p2iig6sf7as5ps1frdyzcr67b9bff0by4z1vg4nrxi7h";
- };
- }
- {
- goPackagePath = "github.com/uber-go/zap";
- fetch = {
- type = "git";
- url = "https://github.com/uber-go/zap";
- rev = "fbae0281ffd546fa6d1959fec6075ac5da7fb577";
- sha256 = "0ys6cb2h3r0vbly36v8zqkqsfc5y7fjsw2qmvx5fvjh35ih4w738";
- };
- }
- {
- goPackagePath = "github.com/xlab/treeprint";
- fetch = {
- type = "git";
- url = "https://github.com/xlab/treeprint";
- rev = "06dfc6fa17cdde904617990a0c2d89e3e332dbb3";
- sha256 = "04v2glr8wsgs8gr5qbcxyqn9s6569lmgqb7rcs6bkmdnr79xpwl5";
- };
- }
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "9477e0b78b9ac3d0b03822fd95422e2fe07627cd";
- sha256 = "1qcqai6nf1q50z9ga7r4ljnrh1qz49kwlcqpri4bknx732lqq0v5";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "1e2299c37cc91a509f1b12369872d27be0ce98a6";
- sha256 = "1nh8v330pcwgk3h6nvfi12rlydl16v9ajv4s1giyx8wnfq8h6fm1";
- };
- }
- {
- goPackagePath = "golang.org/x/text";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/text";
- rev = "a71fd10341b064c10f4a81ceac72bcf70f26ea34";
- sha256 = "1igxqrgnnb6983fl0yck0xal2hwnkcgbslr7cxyrg7a65vawd0q1";
- };
- }
-]
diff --git a/pkgs/servers/nosql/influxdb/deps-1.6.3.nix b/pkgs/servers/nosql/influxdb/deps-1.6.3.nix
deleted file mode 100644
index a2f4dfaeb8d..00000000000
--- a/pkgs/servers/nosql/influxdb/deps-1.6.3.nix
+++ /dev/null
@@ -1,444 +0,0 @@
-# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
-[
- {
- goPackagePath = "collectd.org";
- fetch = {
- type = "git";
- url = "https://github.com/collectd/go-collectd";
- rev = "2ce144541b8903101fb8f1483cc0497a68798122";
- sha256 = "0rr9rnc777jk27a7yxhdb7vgkj493158a8k6q44x51s30dkp78x3";
- };
- }
- {
- goPackagePath = "github.com/BurntSushi/toml";
- fetch = {
- type = "git";
- url = "https://github.com/BurntSushi/toml";
- rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
- sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
- };
- }
- {
- goPackagePath = "github.com/RoaringBitmap/roaring";
- fetch = {
- type = "git";
- url = "https://github.com/RoaringBitmap/roaring";
- rev = "d6540aab65a17321470b1661bfc52da1823871e9";
- sha256 = "1lsrz7j55blalpp95vgz214b35sjf8nfmrw3fxybdl4xipk2ssdj";
- };
- }
- {
- goPackagePath = "github.com/beorn7/perks";
- fetch = {
- type = "git";
- url = "https://github.com/beorn7/perks";
- rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
- sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
- };
- }
- {
- goPackagePath = "github.com/bmizerany/pat";
- fetch = {
- type = "git";
- url = "https://github.com/bmizerany/pat";
- rev = "6226ea591a40176dd3ff9cd8eff81ed6ca721a00";
- sha256 = "0qjkm7169y6pybwh0s02fjjk251isa2b367xqfzrwvl6cy4yzfxp";
- };
- }
- {
- goPackagePath = "github.com/boltdb/bolt";
- fetch = {
- type = "git";
- url = "https://github.com/boltdb/bolt";
- rev = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8";
- sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r";
- };
- }
- {
- goPackagePath = "github.com/cespare/xxhash";
- fetch = {
- type = "git";
- url = "https://github.com/cespare/xxhash";
- rev = "5c37fe3735342a2e0d01c87a907579987c8936cc";
- sha256 = "02aii7z46sasagw816zz3v0gzax1z5d1hkjslz7ng25386p0gzk1";
- };
- }
- {
- goPackagePath = "github.com/davecgh/go-spew";
- fetch = {
- type = "git";
- url = "https://github.com/davecgh/go-spew";
- rev = "346938d642f2ec3594ed81d874461961cd0faa76";
- sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
- };
- }
- {
- goPackagePath = "github.com/dgrijalva/jwt-go";
- fetch = {
- type = "git";
- url = "https://github.com/dgrijalva/jwt-go";
- rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e";
- sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
- };
- }
- {
- goPackagePath = "github.com/dgryski/go-bitstream";
- fetch = {
- type = "git";
- url = "https://github.com/dgryski/go-bitstream";
- rev = "9f22ccc24718d9643ac427c8c897ae1a01575783";
- sha256 = "0x3hbsrn7qafhhjz6lgyc1pd1p5kgkrkbccvsr6yygkl785h5lhn";
- };
- }
- {
- goPackagePath = "github.com/glycerine/go-unsnap-stream";
- fetch = {
- type = "git";
- url = "https://github.com/glycerine/go-unsnap-stream";
- rev = "62a9a9eb44fd8932157b1a8ace2149eff5971af6";
- sha256 = "1ray7p4q3vv5zn9w5xs7m9kjh68b2ck98nh25mxhfiwl9jxkabrc";
- };
- }
- {
- goPackagePath = "github.com/gogo/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/gogo/protobuf";
- rev = "1adfc126b41513cc696b209667c8656ea7aac67c";
- sha256 = "1j7azzlnihcvnd1apw5zr0bz30h7n0gyimqqkgc76vzb1n5dpi7m";
- };
- }
- {
- goPackagePath = "github.com/golang/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/golang/protobuf";
- rev = "925541529c1fa6821df4e44ce2723319eb2be768";
- sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa";
- };
- }
- {
- goPackagePath = "github.com/golang/snappy";
- fetch = {
- type = "git";
- url = "https://github.com/golang/snappy";
- rev = "d9eb7a3d35ec988b8585d4a0068e462c27d28380";
- sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn";
- };
- }
- {
- goPackagePath = "github.com/google/go-cmp";
- fetch = {
- type = "git";
- url = "https://github.com/google/go-cmp";
- rev = "3af367b6b30c263d47e8895973edcca9a49cf029";
- sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
- };
- }
- {
- goPackagePath = "github.com/influxdata/influxql";
- fetch = {
- type = "git";
- url = "https://github.com/influxdata/influxql";
- rev = "a7267bff5327e316e54c54342b0bc9598753e3d5";
- sha256 = "0mqc9xki5l9yfbb0dqjb417cmv3pca1bj71m90dkshladr2wlcg3";
- };
- }
- {
- goPackagePath = "github.com/influxdata/usage-client";
- fetch = {
- type = "git";
- url = "https://github.com/influxdata/usage-client";
- rev = "6d3895376368aa52a3a81d2a16e90f0f52371967";
- sha256 = "0a5adnid42f9vpckgcpkj7v60fh147j7zlg1rhxcpq5vkw698ifl";
- };
- }
- {
- goPackagePath = "github.com/influxdata/yamux";
- fetch = {
- type = "git";
- url = "https://github.com/influxdata/yamux";
- rev = "1f58ded512de5feabbe30b60c7d33a7a896c5f16";
- sha256 = "08y1lgcyyaa8zrg24ck64b5dfassgb2pp1fb9x5lw9q16fb170bx";
- };
- }
- {
- goPackagePath = "github.com/influxdata/yarpc";
- fetch = {
- type = "git";
- url = "https://github.com/influxdata/yarpc";
- rev = "f0da2db138cad2fb425541938fc28dd5a5bc6918";
- sha256 = "1g71flc8s8xas7vmaiwv0425paii1akc7jsdqsgxkhyfxx2gvib0";
- };
- }
- {
- goPackagePath = "github.com/jsternberg/zap-logfmt";
- fetch = {
- type = "git";
- url = "https://github.com/jsternberg/zap-logfmt";
- rev = "ac4bd917e18a4548ce6e0e765b29a4e7f397b0b6";
- sha256 = "0pqp2nsqvsq8kqc7l14340lrvl03715s12bag63kdbi25s8fcdkx";
- };
- }
- {
- goPackagePath = "github.com/jwilder/encoding";
- fetch = {
- type = "git";
- url = "https://github.com/jwilder/encoding";
- rev = "b4e1701a28efcc637d9afcca7d38e495fe909a09";
- sha256 = "195js5njz86k096p3ggglgpc7rw3801mpqzdfwfr3miflhnp7nwg";
- };
- }
- {
- goPackagePath = "github.com/klauspost/compress";
- fetch = {
- type = "git";
- url = "https://github.com/klauspost/compress";
- rev = "6c8db69c4b49dd4df1fff66996cf556176d0b9bf";
- sha256 = "00h2lpqcyc3pg2xk3q4a9cgyv0vkn15bx0hb725j5zbkr9vah23x";
- };
- }
- {
- goPackagePath = "github.com/klauspost/cpuid";
- fetch = {
- type = "git";
- url = "https://github.com/klauspost/cpuid";
- rev = "ae7887de9fa5d2db4eaa8174a7eff2c1ac00f2da";
- sha256 = "178apw89g8nsd7w6mbdylxn956h3iig6rbw3bkivp6lplhb5dvq4";
- };
- }
- {
- goPackagePath = "github.com/klauspost/crc32";
- fetch = {
- type = "git";
- url = "https://github.com/klauspost/crc32";
- rev = "cb6bfca970f6908083f26f39a79009d608efd5cd";
- sha256 = "0q4yr4isgmph1yf1vq527lpmid7vqv56q7vxh3gkp5679fb90q6n";
- };
- }
- {
- goPackagePath = "github.com/klauspost/pgzip";
- fetch = {
- type = "git";
- url = "https://github.com/klauspost/pgzip";
- rev = "0bf5dcad4ada2814c3c00f996a982270bb81a506";
- sha256 = "0dgp2iljvhibzxia1g3lsfg4bjmfh4kf0bfrmfi7sd49hwhrvk7s";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-isatty";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-isatty";
- rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c";
- sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
- };
- }
- {
- goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
- fetch = {
- type = "git";
- url = "https://github.com/matttproud/golang_protobuf_extensions";
- rev = "3247c84500bff8d9fb6d579d800f20b3e091582c";
- sha256 = "12hcych25wf725zxdkpnyx4wa0gyxl8v4m8xmhdmmaki9bbmqd0d";
- };
- }
- {
- goPackagePath = "github.com/mschoch/smat";
- fetch = {
- type = "git";
- url = "https://github.com/mschoch/smat";
- rev = "90eadee771aeab36e8bf796039b8c261bebebe4f";
- sha256 = "141saq6d4z3c7v3jw45zy4gn6wwjlyralqygjff1fzvz1gkvimk3";
- };
- }
- {
- goPackagePath = "github.com/opentracing/opentracing-go";
- fetch = {
- type = "git";
- url = "https://github.com/opentracing/opentracing-go";
- rev = "328fceb7548c744337cd010914152b74eaf4c4ab";
- sha256 = "1w6s42n9glqwif6awyiapr7sh1wjvkxan41qhc1yi555byyw200k";
- };
- }
- {
- goPackagePath = "github.com/paulbellamy/ratecounter";
- fetch = {
- type = "git";
- url = "https://github.com/paulbellamy/ratecounter";
- rev = "524851a93235ac051e3540563ed7909357fe24ab";
- sha256 = "0z4c61ac6v8mpnr9z37d91h1cf8v9psja5jfdxmsf69r1b7qr4f9";
- };
- }
- {
- goPackagePath = "github.com/peterh/liner";
- fetch = {
- type = "git";
- url = "https://github.com/peterh/liner";
- rev = "6106ee4fe3e8435f18cd10e34557e5e50f0e792a";
- sha256 = "178s1amw5r60lywgmh24pd2ljim0b05fdfsm4c8px22fkycmn1qr";
- };
- }
- {
- goPackagePath = "github.com/philhofer/fwd";
- fetch = {
- type = "git";
- url = "https://github.com/philhofer/fwd";
- rev = "bb6d471dc95d4fe11e432687f8b70ff496cf3136";
- sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2";
- };
- }
- {
- goPackagePath = "github.com/prometheus/client_golang";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/client_golang";
- rev = "661e31bf844dfca9aeba15f27ea8aa0d485ad212";
- sha256 = "0r9sr3m57ks7rc5bbghl0gy9wxlznzmz331xdp42zlgk6g774xcn";
- };
- }
- {
- goPackagePath = "github.com/prometheus/client_model";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/client_model";
- rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c";
- sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998";
- };
- }
- {
- goPackagePath = "github.com/prometheus/common";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/common";
- rev = "e4aa40a9169a88835b849a6efb71e05dc04b88f0";
- sha256 = "0m1n616d694jca0qjwjn5ci7scfgm2jpi94dhi356arm9lhda4jc";
- };
- }
- {
- goPackagePath = "github.com/prometheus/procfs";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/procfs";
- rev = "54d17b57dd7d4a3aa092476596b3f8a933bde349";
- sha256 = "1b5218hi6k9i637k6xc7ynpll577zbnrhjm9jr2iczy3j0rr4rvr";
- };
- }
- {
- goPackagePath = "github.com/retailnext/hllpp";
- fetch = {
- type = "git";
- url = "https://github.com/retailnext/hllpp";
- rev = "101a6d2f8b52abfc409ac188958e7e7be0116331";
- sha256 = "1dyyjyrscd3d22jhh2pbn67c6nzva0v069215sjjmj313k1xzmj3";
- };
- }
- {
- goPackagePath = "github.com/tinylib/msgp";
- fetch = {
- type = "git";
- url = "https://github.com/tinylib/msgp";
- rev = "b2b6a672cf1e5b90748f79b8b81fc8c5cf0571a1";
- sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc";
- };
- }
- {
- goPackagePath = "github.com/willf/bitset";
- fetch = {
- type = "git";
- url = "https://github.com/willf/bitset";
- rev = "d860f346b89450988a379d7d705e83c58d1ea227";
- sha256 = "18419ip5mnblnyx2rjixad90dhjb1x2kaiidr7zk9b3qci799rh0";
- };
- }
- {
- goPackagePath = "github.com/xlab/treeprint";
- fetch = {
- type = "git";
- url = "https://github.com/xlab/treeprint";
- rev = "f3a15cfd24bf976c724324cb6846a8b54b88b639";
- sha256 = "0fgbdyk2mfj5vh8902sga33w5gw7q0f1if4nqx631ca33fd6pfbn";
- };
- }
- {
- goPackagePath = "go.uber.org/atomic";
- fetch = {
- type = "git";
- url = "https://github.com/uber-go/atomic";
- rev = "8474b86a5a6f79c443ce4b2992817ff32cf208b8";
- sha256 = "166shnjw8rvjvksymi2gqw1ygsbxlq15xb10j2dx5rwy4y4asq8x";
- };
- }
- {
- goPackagePath = "go.uber.org/multierr";
- fetch = {
- type = "git";
- url = "https://github.com/uber-go/multierr";
- rev = "3c4937480c32f4c13a875a1829af76c98ca3d40a";
- sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w";
- };
- }
- {
- goPackagePath = "go.uber.org/zap";
- fetch = {
- type = "git";
- url = "https://github.com/uber-go/zap";
- rev = "35aad584952c3e7020db7b839f6b102de6271f89";
- sha256 = "0n79ir7jcr7s51j85swji7an0jgy1w5dxg1g68j722rmpbvsagwv";
- };
- }
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "c3a3ad6d03f7a915c0f7e194b7152974bb73d287";
- sha256 = "0x18275g5xlaw55bpx8hdna66d2hpbcw6hs0pxf1kmvfds6gzn6n";
- };
- }
- {
- goPackagePath = "golang.org/x/net";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/net";
- rev = "92b859f39abd2d91a854c9f9c4621b2f5054a92d";
- sha256 = "1nzbay48k53pxa1sh102v571k6pa57540p0bzcil4qgan47yxba6";
- };
- }
- {
- goPackagePath = "golang.org/x/sync";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sync";
- rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
- sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "d8e400bc7db4870d786864138af681469693d18c";
- sha256 = "08d23f9gjarp63dw0wj54nlqh3x2lqnchzkw8n5d7ik3wy7qy4yf";
- };
- }
- {
- goPackagePath = "golang.org/x/text";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/text";
- rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
- sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
- };
- }
- {
- goPackagePath = "golang.org/x/time";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/time";
- rev = "26559e0f760e39c24d730d3224364aef164ee23f";
- sha256 = "00fx6m59cjbi7y0ri4a57q1zs6r310xbg5yqns5kfm2cax0dkmnf";
- };
- }
-]
\ No newline at end of file
diff --git a/pkgs/servers/nosql/influxdb/deps.nix b/pkgs/servers/nosql/influxdb/deps.nix
new file mode 100644
index 00000000000..e00a985fd8d
--- /dev/null
+++ b/pkgs/servers/nosql/influxdb/deps.nix
@@ -0,0 +1,840 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+ {
+ goPackagePath = "collectd.org";
+ fetch = {
+ type = "git";
+ url = "https://github.com/collectd/go-collectd";
+ rev = "2ce144541b8903101fb8f1483cc0497a68798122";
+ sha256 = "0rr9rnc777jk27a7yxhdb7vgkj493158a8k6q44x51s30dkp78x3";
+ };
+ }
+ {
+ goPackagePath = "github.com/BurntSushi/toml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/BurntSushi/toml";
+ rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
+ sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
+ };
+ }
+ {
+ goPackagePath = "github.com/Masterminds/semver";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Masterminds/semver";
+ rev = "c7af12943936e8c39859482e61f0574c2fd7fc75";
+ sha256 = "0k2fpk2x8jbvqkqxx5hkx1ygrsppzmzypqb90i1r33yq7ac7zlxj";
+ };
+ }
+ {
+ goPackagePath = "github.com/RoaringBitmap/roaring";
+ fetch = {
+ type = "git";
+ url = "https://github.com/RoaringBitmap/roaring";
+ rev = "3d677d3262197ee558b85029301eb69b8239f91a";
+ sha256 = "0v5jbqr7m4x7n8rxcyizhs21ndyinn8kil9hd6y2bifx9b9g6gv9";
+ };
+ }
+ {
+ goPackagePath = "github.com/alecthomas/kingpin";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/kingpin";
+ rev = "947dcec5ba9c011838740e680966fd7087a71d0d";
+ sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
+ };
+ }
+ {
+ goPackagePath = "github.com/alecthomas/template";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/template";
+ rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
+ sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+ };
+ }
+ {
+ goPackagePath = "github.com/alecthomas/units";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/units";
+ rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
+ sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+ };
+ }
+ {
+ goPackagePath = "github.com/apache/arrow";
+ fetch = {
+ type = "git";
+ url = "https://github.com/apache/arrow";
+ rev = "f5df77359953ed06e1dce47edffc03340e2ff3ea";
+ sha256 = "12lygmhrchpf46jzyf0gnbfq3bf9ha68iajbnzflqf6k78jf6dj7";
+ };
+ }
+ {
+ goPackagePath = "github.com/apex/log";
+ fetch = {
+ type = "git";
+ url = "https://github.com/apex/log";
+ rev = "941dea75d3ebfbdd905a5d8b7b232965c5e5c684";
+ sha256 = "0cavvljwrxhxpsf6wdfncswamsqvpkah2pmnm6g94iq6l16lkbix";
+ };
+ }
+ {
+ goPackagePath = "github.com/aws/aws-sdk-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/aws/aws-sdk-go";
+ rev = "dd947f47decb37a7c3bee72501bfc790701ab5ad";
+ sha256 = "1l4lxxlw0x2lkkr2m78p67ncr7dbv9a5ij8ahwa8hqm2sv0zsc5d";
+ };
+ }
+ {
+ goPackagePath = "github.com/beorn7/perks";
+ fetch = {
+ type = "git";
+ url = "https://github.com/beorn7/perks";
+ rev = "3a771d992973f24aa725d07868b467d1ddfceafb";
+ sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
+ };
+ }
+ {
+ goPackagePath = "github.com/blakesmith/ar";
+ fetch = {
+ type = "git";
+ url = "https://github.com/blakesmith/ar";
+ rev = "8bd4349a67f2533b078dbc524689d15dba0f4659";
+ sha256 = "1rdbn3v9vv3cs6indgrf9agydcbaspyc21fi0mpxlksva1sci99j";
+ };
+ }
+ {
+ goPackagePath = "github.com/bmizerany/pat";
+ fetch = {
+ type = "git";
+ url = "https://github.com/bmizerany/pat";
+ rev = "6226ea591a40176dd3ff9cd8eff81ed6ca721a00";
+ sha256 = "0qjkm7169y6pybwh0s02fjjk251isa2b367xqfzrwvl6cy4yzfxp";
+ };
+ }
+ {
+ goPackagePath = "github.com/boltdb/bolt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/boltdb/bolt";
+ rev = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8";
+ sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r";
+ };
+ }
+ {
+ goPackagePath = "github.com/c-bata/go-prompt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/c-bata/go-prompt";
+ rev = "e99fbc797b795e0a7a94affc8d44f6a0350d85f0";
+ sha256 = "00i8wfi51hzla59qgkdlijnvad4h1p1si9jaaw3jzchm7g7ryrlj";
+ };
+ }
+ {
+ goPackagePath = "github.com/caarlos0/ctrlc";
+ fetch = {
+ type = "git";
+ url = "https://github.com/caarlos0/ctrlc";
+ rev = "70dc48d5d792f20f684a8f1d29bbac298f4b2ef4";
+ sha256 = "1xqlagjzwvfls17vn5zlmw58g4ha60hvpjpj7nbd9mn87yd2h22j";
+ };
+ }
+ {
+ goPackagePath = "github.com/campoy/unique";
+ fetch = {
+ type = "git";
+ url = "https://github.com/campoy/unique";
+ rev = "88950e537e7e644cd746a3102037b5d2b723e9f5";
+ sha256 = "1cf0mfdxx68ak8i3x5z50nhr29ivpssg2sg73krdpxs2qjzwji90";
+ };
+ }
+ {
+ goPackagePath = "github.com/cespare/xxhash";
+ fetch = {
+ type = "git";
+ url = "https://github.com/cespare/xxhash";
+ rev = "5c37fe3735342a2e0d01c87a907579987c8936cc";
+ sha256 = "02aii7z46sasagw816zz3v0gzax1z5d1hkjslz7ng25386p0gzk1";
+ };
+ }
+ {
+ goPackagePath = "github.com/davecgh/go-spew";
+ fetch = {
+ type = "git";
+ url = "https://github.com/davecgh/go-spew";
+ rev = "346938d642f2ec3594ed81d874461961cd0faa76";
+ sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
+ };
+ }
+ {
+ goPackagePath = "github.com/dgrijalva/jwt-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dgrijalva/jwt-go";
+ rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e";
+ sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
+ };
+ }
+ {
+ goPackagePath = "github.com/dgryski/go-bitstream";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dgryski/go-bitstream";
+ rev = "3522498ce2c8ea06df73e55df58edfbfb33cfdd6";
+ sha256 = "1lr0qjdddxdiwfs530saglk4q5395i4n3w8h8k5j8nsjj8k3na7f";
+ };
+ }
+ {
+ goPackagePath = "github.com/fatih/color";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fatih/color";
+ rev = "570b54cabe6b8eb0bc2dfce68d964677d63b5260";
+ sha256 = "1hw9hgkfzbzqjhy29pqpk20xggxaqjv45wx8yn69488mw5ph7khh";
+ };
+ }
+ {
+ goPackagePath = "github.com/glycerine/go-unsnap-stream";
+ fetch = {
+ type = "git";
+ url = "https://github.com/glycerine/go-unsnap-stream";
+ rev = "9f0cb55181dd3a0a4c168d3dbc72d4aca4853126";
+ sha256 = "1v10z30y9qc8dl34x0s8lr773g6raxilfdxbmzd1176pspzcmm9n";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-ini/ini";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-ini/ini";
+ rev = "7b294651033cd7d9e7f0d9ffa1b75ed1e198e737";
+ sha256 = "0y6qzla90zd6dhs04vclrg46rwlsy9zlqi0y6y2k1pdxn2cbblhb";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-sql-driver/mysql";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-sql-driver/mysql";
+ rev = "d523deb1b23d913de5bdada721a6071e71283618";
+ sha256 = "1jwz2j3vd5hlzmnkh20d4276yd8cxy7pac3x3dfi52jkm82ms99n";
+ };
+ }
+ {
+ goPackagePath = "github.com/gogo/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gogo/protobuf";
+ rev = "636bf0302bc95575d69441b25a2603156ffdddf1";
+ sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/protobuf";
+ rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265";
+ sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/snappy";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/snappy";
+ rev = "d9eb7a3d35ec988b8585d4a0068e462c27d28380";
+ sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/go-cmp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-cmp";
+ rev = "3af367b6b30c263d47e8895973edcca9a49cf029";
+ sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/go-github";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-github";
+ rev = "dd29b543e14c33e6373773f2c5ea008b29aeac95";
+ sha256 = "0sk67d9zdn420h2g4l3wib28zqr3ihbg6dj382cwmns7yska58lp";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/go-querystring";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-querystring";
+ rev = "44c6ddd0a2342c386950e880b658017258da92fc";
+ sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz";
+ };
+ }
+ {
+ goPackagePath = "github.com/goreleaser/goreleaser";
+ fetch = {
+ type = "git";
+ url = "https://github.com/goreleaser/goreleaser";
+ rev = "f99940ff5397b099bf606cf1323c00c63afcd153";
+ sha256 = "1mh4j0vdyxhr7fmwva59p0wrsrk318c2fbgzf1vqbgs8iwibs739";
+ };
+ }
+ {
+ goPackagePath = "github.com/goreleaser/nfpm";
+ fetch = {
+ type = "git";
+ url = "https://github.com/goreleaser/nfpm";
+ rev = "de75d679901371e3ed0c0a606e160539d5a4b45e";
+ sha256 = "1dbw458xndgj9k5dvffrqkz7cq6rcmflvsvzd8adsg24a3mk3qgy";
+ };
+ }
+ {
+ goPackagePath = "github.com/imdario/mergo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/imdario/mergo";
+ rev = "9f23e2d6bd2a77f959b2bf6acdbefd708a83a4a4";
+ sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7";
+ };
+ }
+ {
+ goPackagePath = "github.com/influxdata/flux";
+ fetch = {
+ type = "git";
+ url = "https://github.com/influxdata/flux";
+ rev = "8c9d0ad49204d3bbb171e96d872cf663ee7f1b4d";
+ sha256 = "0yamrzqjs6giwqq0ljf2dscarqw6851cw3iya8cya0x5plyd810c";
+ };
+ }
+ {
+ goPackagePath = "github.com/influxdata/influxql";
+ fetch = {
+ type = "git";
+ url = "https://github.com/influxdata/influxql";
+ rev = "c661ab7db8ad858626cc7a2114e786f4e7463564";
+ sha256 = "1j73aj312laqmi20fbinx0aal82ncpqbj5dgs41br0j7fkvi6873";
+ };
+ }
+ {
+ goPackagePath = "github.com/influxdata/line-protocol";
+ fetch = {
+ type = "git";
+ url = "https://github.com/influxdata/line-protocol";
+ rev = "32c6aa80de5eb09d190ad284a8214a531c6bce57";
+ sha256 = "0wvd6lplbvmz2lznvy4zz3fmxiqc43cgr4vppp1xi38j1iwq0349";
+ };
+ }
+ {
+ goPackagePath = "github.com/influxdata/platform";
+ fetch = {
+ type = "git";
+ url = "https://github.com/influxdata/platform";
+ rev = "0f79e4ea3248354c789cba274542e0a8e55971db";
+ sha256 = "16d9g7vgy30zahhj066kz7akahvpknq3ljk2fzvczjsm59ih8rjk";
+ };
+ }
+ {
+ goPackagePath = "github.com/influxdata/roaring";
+ fetch = {
+ type = "git";
+ url = "https://github.com/influxdata/roaring";
+ rev = "fc520f41fab6dcece280e8d4853d87a09a67f9e0";
+ sha256 = "0jr9r5q4s5bz4kbqndrlm5aikls4kqbl955qbsh6bpbmxdsamcsr";
+ };
+ }
+ {
+ goPackagePath = "github.com/influxdata/tdigest";
+ fetch = {
+ type = "git";
+ url = "https://github.com/influxdata/tdigest";
+ rev = "a7d76c6f093a59b94a01c6c2b8429122d444a8cc";
+ sha256 = "02jxrb2d1n6zflwa7jhgid5344l6zj4gxg4kis20v7xa6iqrj1ni";
+ };
+ }
+ {
+ goPackagePath = "github.com/influxdata/usage-client";
+ fetch = {
+ type = "git";
+ url = "https://github.com/influxdata/usage-client";
+ rev = "6d3895376368aa52a3a81d2a16e90f0f52371967";
+ sha256 = "0a5adnid42f9vpckgcpkj7v60fh147j7zlg1rhxcpq5vkw698ifl";
+ };
+ }
+ {
+ goPackagePath = "github.com/jmespath/go-jmespath";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jmespath/go-jmespath";
+ rev = "0b12d6b5";
+ sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld";
+ };
+ }
+ {
+ goPackagePath = "github.com/jsternberg/zap-logfmt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jsternberg/zap-logfmt";
+ rev = "ac4bd917e18a4548ce6e0e765b29a4e7f397b0b6";
+ sha256 = "0pqp2nsqvsq8kqc7l14340lrvl03715s12bag63kdbi25s8fcdkx";
+ };
+ }
+ {
+ goPackagePath = "github.com/jwilder/encoding";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jwilder/encoding";
+ rev = "b4e1701a28efcc637d9afcca7d38e495fe909a09";
+ sha256 = "195js5njz86k096p3ggglgpc7rw3801mpqzdfwfr3miflhnp7nwg";
+ };
+ }
+ {
+ goPackagePath = "github.com/kevinburke/go-bindata";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kevinburke/go-bindata";
+ rev = "06af60a4461b70d84a2b173d92f9f425d78baf55";
+ sha256 = "0k9bpx6vqsr53bzj7k78rjalybpwbs86zdks6v7jqkwsrx4j7a07";
+ };
+ }
+ {
+ goPackagePath = "github.com/kisielk/gotool";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kisielk/gotool";
+ rev = "80517062f582ea3340cd4baf70e86d539ae7d84d";
+ sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
+ };
+ }
+ {
+ goPackagePath = "github.com/klauspost/compress";
+ fetch = {
+ type = "git";
+ url = "https://github.com/klauspost/compress";
+ rev = "b939724e787a27c0005cabe3f78e7ed7987ac74f";
+ sha256 = "1y7951q0ji894d111lqqbacq64cxyi2dxsni5sqi9488zsasgw8s";
+ };
+ }
+ {
+ goPackagePath = "github.com/klauspost/cpuid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/klauspost/cpuid";
+ rev = "ae7887de9fa5d2db4eaa8174a7eff2c1ac00f2da";
+ sha256 = "178apw89g8nsd7w6mbdylxn956h3iig6rbw3bkivp6lplhb5dvq4";
+ };
+ }
+ {
+ goPackagePath = "github.com/klauspost/crc32";
+ fetch = {
+ type = "git";
+ url = "https://github.com/klauspost/crc32";
+ rev = "cb6bfca970f6908083f26f39a79009d608efd5cd";
+ sha256 = "0q4yr4isgmph1yf1vq527lpmid7vqv56q7vxh3gkp5679fb90q6n";
+ };
+ }
+ {
+ goPackagePath = "github.com/klauspost/pgzip";
+ fetch = {
+ type = "git";
+ url = "https://github.com/klauspost/pgzip";
+ rev = "0bf5dcad4ada2814c3c00f996a982270bb81a506";
+ sha256 = "0dgp2iljvhibzxia1g3lsfg4bjmfh4kf0bfrmfi7sd49hwhrvk7s";
+ };
+ }
+ {
+ goPackagePath = "github.com/lib/pq";
+ fetch = {
+ type = "git";
+ url = "https://github.com/lib/pq";
+ rev = "4ded0e9383f75c197b3a2aaa6d590ac52df6fd79";
+ sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-colorable";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-colorable";
+ rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
+ sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-isatty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-isatty";
+ rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c";
+ sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-runewidth";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-runewidth";
+ rev = "9e777a8366cce605130a531d2cd6363d07ad7317";
+ sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-tty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-tty";
+ rev = "13ff1204f104d52c3f7645ec027ecbcf9026429e";
+ sha256 = "1c9vzrq7r5skq0cz9alkix9n1cp6h7wybdwrg0f1vzvxj26qr7yq";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-zglob";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-zglob";
+ rev = "2ea3427bfa539cca900ca2768d8663ecc8a708c1";
+ sha256 = "1sncdyq5fbd42al4amyy91h7vlzm3wm6c9vl8za2pjgfgsd581fz";
+ };
+ }
+ {
+ goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+ fetch = {
+ type = "git";
+ url = "https://github.com/matttproud/golang_protobuf_extensions";
+ rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
+ sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/go-homedir";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/go-homedir";
+ rev = "ae18d6b8b3205b561c79e8e5f69bff09736185f4";
+ sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq";
+ };
+ }
+ {
+ goPackagePath = "github.com/mna/pigeon";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mna/pigeon";
+ rev = "9df264905d4734c0133161d8c67828ff522b154a";
+ sha256 = "120m90lig5984wd2k7x2fclx5vb64lxmx4j3065pp0q1fqjif87z";
+ };
+ }
+ {
+ goPackagePath = "github.com/mschoch/smat";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mschoch/smat";
+ rev = "90eadee771aeab36e8bf796039b8c261bebebe4f";
+ sha256 = "141saq6d4z3c7v3jw45zy4gn6wwjlyralqygjff1fzvz1gkvimk3";
+ };
+ }
+ {
+ goPackagePath = "github.com/opentracing/opentracing-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/opentracing/opentracing-go";
+ rev = "bd9c3193394760d98b2fa6ebb2291f0cd1d06a7d";
+ sha256 = "11ad6yhi1fi7ybg6jj18kw5pl12zhvvcrkjqbz6rspawb5qrlq1g";
+ };
+ }
+ {
+ goPackagePath = "github.com/paulbellamy/ratecounter";
+ fetch = {
+ type = "git";
+ url = "https://github.com/paulbellamy/ratecounter";
+ rev = "524851a93235ac051e3540563ed7909357fe24ab";
+ sha256 = "0z4c61ac6v8mpnr9z37d91h1cf8v9psja5jfdxmsf69r1b7qr4f9";
+ };
+ }
+ {
+ goPackagePath = "github.com/peterh/liner";
+ fetch = {
+ type = "git";
+ url = "https://github.com/peterh/liner";
+ rev = "8c1271fcf47f341a9e6771872262870e1ad7650c";
+ sha256 = "15swk6y173sdav3gzxk0rj2z17khsyc8wljk6gk3w4fq9wnziggd";
+ };
+ }
+ {
+ goPackagePath = "github.com/philhofer/fwd";
+ fetch = {
+ type = "git";
+ url = "https://github.com/philhofer/fwd";
+ rev = "bb6d471dc95d4fe11e432687f8b70ff496cf3136";
+ sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2";
+ };
+ }
+ {
+ goPackagePath = "github.com/pkg/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pkg/errors";
+ rev = "645ef00459ed84a119197bfb8d8205042c6df63d";
+ sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+ };
+ }
+ {
+ goPackagePath = "github.com/pkg/term";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pkg/term";
+ rev = "bffc007b7fd5a70e20e28f5b7649bb84671ef436";
+ sha256 = "0c9xnx7dyw7j890nm9av5fjpqjb129z7vbg3lw554vwnckc84x54";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/client_golang";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/client_golang";
+ rev = "661e31bf844dfca9aeba15f27ea8aa0d485ad212";
+ sha256 = "0r9sr3m57ks7rc5bbghl0gy9wxlznzmz331xdp42zlgk6g774xcn";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/client_model";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/client_model";
+ rev = "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f";
+ sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/common";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/common";
+ rev = "7600349dcfe1abd18d72d3a1770870d9800a7801";
+ sha256 = "0lsp94dqpj35dny4m4x15kg4wgwawlm3in7cnpajkkacgyxagk5f";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/procfs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/procfs";
+ rev = "ae68e2d4c00fed4943b5f6698d504a5fe083da8a";
+ sha256 = "04sar4k99w8nvq3kwx6chz0mbp4s6xfjfxww7aqfd950xgs2jv5f";
+ };
+ }
+ {
+ goPackagePath = "github.com/retailnext/hllpp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/retailnext/hllpp";
+ rev = "101a6d2f8b52abfc409ac188958e7e7be0116331";
+ sha256 = "1dyyjyrscd3d22jhh2pbn67c6nzva0v069215sjjmj313k1xzmj3";
+ };
+ }
+ {
+ goPackagePath = "github.com/satori/go.uuid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/satori/go.uuid";
+ rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3";
+ sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb";
+ };
+ }
+ {
+ goPackagePath = "github.com/segmentio/kafka-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/segmentio/kafka-go";
+ rev = "c6db9435477f3cb658e2dd0fa93e02118c870251";
+ sha256 = "17zdj0i429a0wmwj8rm4j0hmxsv8kbql67s5iv78hac6rcys7bj2";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/cast";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/cast";
+ rev = "8c9545af88b134710ab1cd196795e7f2388358d7";
+ sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5";
+ };
+ }
+ {
+ goPackagePath = "github.com/tinylib/msgp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/tinylib/msgp";
+ rev = "b2b6a672cf1e5b90748f79b8b81fc8c5cf0571a1";
+ sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc";
+ };
+ }
+ {
+ goPackagePath = "github.com/willf/bitset";
+ fetch = {
+ type = "git";
+ url = "https://github.com/willf/bitset";
+ rev = "d860f346b89450988a379d7d705e83c58d1ea227";
+ sha256 = "18419ip5mnblnyx2rjixad90dhjb1x2kaiidr7zk9b3qci799rh0";
+ };
+ }
+ {
+ goPackagePath = "github.com/xlab/treeprint";
+ fetch = {
+ type = "git";
+ url = "https://github.com/xlab/treeprint";
+ rev = "d6fb6747feb6e7cfdc44682a024bddf87ef07ec2";
+ sha256 = "1ln6p8va53sxrhyy0gfanskzzc30c55l6nk1f0bin91jlr2mxn4n";
+ };
+ }
+ {
+ goPackagePath = "go.uber.org/atomic";
+ fetch = {
+ type = "git";
+ url = "https://github.com/uber-go/atomic";
+ rev = "1ea20fb1cbb1cc08cbd0d913a96dead89aa18289";
+ sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6";
+ };
+ }
+ {
+ goPackagePath = "go.uber.org/multierr";
+ fetch = {
+ type = "git";
+ url = "https://github.com/uber-go/multierr";
+ rev = "3c4937480c32f4c13a875a1829af76c98ca3d40a";
+ sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w";
+ };
+ }
+ {
+ goPackagePath = "go.uber.org/zap";
+ fetch = {
+ type = "git";
+ url = "https://github.com/uber-go/zap";
+ rev = "4d45f9617f7d90f7a663ff21c7a4321dbe78098b";
+ sha256 = "0fpgcbqv8inx70jmnrv0zay7mjj8rwwcvd3ivqwy1wmrmkm8jjmj";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "a2144134853fc9a27a7b1e3eb4f19f1a76df13c9";
+ sha256 = "0hjjk6k9dq7zllwsw9icdfbli12ii379q2lajd6l7lyw72wy28by";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1";
+ sha256 = "018zmn4kmg2mbngcciqal54slc3pl4ry5vlv0bw36fcxvnazxnbp";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/oauth2";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/oauth2";
+ rev = "c57b0facaced709681d9f90397429b9430a74754";
+ sha256 = "044rx9vkkwpp7d23gdk3k4yb7k28kcy34y83pjb1gwndhhh019w1";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sync";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sync";
+ rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
+ sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "ac767d655b305d4e9612f5f6e33120b9176c4ad4";
+ sha256 = "1ds29n5lh4j21hmzxz7vk7hv1k6sixc7f0zsdc9xqdg0j7d212zm";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/text";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/text";
+ rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
+ sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/time";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/time";
+ rev = "fbb02b2291d28baffd63558aa44b4b56f178d650";
+ sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/tools";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/tools";
+ rev = "45ff765b4815d34d8b80220fd05c79063b185ce1";
+ sha256 = "0pirpy0xcks294zd629x6p5yxwcpz1xbxbg6hy5xpxqq2v24nxqr";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/appengine";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/appengine";
+ rev = "ae0ab99deb4dc413a2b4bd6c8bdd0eb67f1e4d06";
+ sha256 = "1iabxnqgxvvn1239i6fvfl375vlbvhfrc03m1x2rvalmx4d6w9c7";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/genproto";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-genproto";
+ rev = "fedd2861243fd1a8152376292b921b394c7bef7e";
+ sha256 = "08324j170skzacglhjmpkpsivp9gwcvmljx1nq6a2d2h2qksfdbp";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/grpc";
+ fetch = {
+ type = "git";
+ url = "https://github.com/grpc/grpc-go";
+ rev = "168a6198bcb0ef175f7dacec0b8691fc141dc9b8";
+ sha256 = "0d8vj372ri55mrqfc0rhjl3albp5ykwfjhda1s5cgm5n40v70pr3";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/yaml.v2";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-yaml/yaml";
+ rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
+ sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+ };
+ }
+ {
+ goPackagePath = "honnef.co/go/tools";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dominikh/go-tools";
+ rev = "d73ab98e7c39fdcf9ba65062e43d34310f198353";
+ sha256 = "1khl6szjj0skkfqp234p9rf3icik7fw2pk2x0wbj3wa9q3f84hb7";
+ };
+ }
+]
\ No newline at end of file
From 9eb4e1596f8a118239e744c647dd3de388122891 Mon Sep 17 00:00:00 2001
From: bricewge <brice.wge@gmail.com>
Date: Wed, 10 Apr 2019 22:42:58 +0200
Subject: [PATCH 103/115] brig: 0.3.0 -> 0.4.1 (#58612)
---
pkgs/applications/networking/brig/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/applications/networking/brig/default.nix
index b86cb7d3dd9..8b7bc0bb899 100644
--- a/pkgs/applications/networking/brig/default.nix
+++ b/pkgs/applications/networking/brig/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "brig-${version}";
- version = "0.3.0";
+ version = "0.4.1";
rev = "v${version}";
goPackagePath = "github.com/sahib/brig";
@@ -12,7 +12,7 @@ buildGoPackage rec {
owner = "sahib";
repo = "brig";
inherit rev;
- sha256 = "01hpb6cvq8cw21ka74jllggkv5pavc0sbl1207x32gzxslw3gsvy";
+ sha256 = "0gi39jmnzqrgj146yw8lcmgmvzx7ii1dgw4iqig7kx8c0jiqi600";
};
meta = with stdenv.lib; {
From 1548084c3b9aad93987253e9c5aa253a4cb35476 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 10 Apr 2019 16:54:50 -0400
Subject: [PATCH 104/115] netbsd.mkDerivation: fix darwin build
Fixes build of netbsd.make on darwin
Fixes: aab8c7ba437d ('netbsd: add cross target')
---
pkgs/os-specific/bsd/netbsd/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 46bac37f4e8..7f8a623b20d 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -51,7 +51,7 @@ let
AR = "${stdenv'.cc.targetPrefix or ""}ar";
CC = "${stdenv'.cc.targetPrefix or ""}cc";
- CPP = if (stdenv'.cc.isClang or false) then "clang-cpp" else "cpp";
+ CPP = "${stdenv'.cc.targetPrefix or ""}cpp";
CXX = "${stdenv'.cc.targetPrefix or ""}c++";
LD = "${stdenv'.cc.targetPrefix or ""}ld";
STRIP = "${stdenv'.cc.targetPrefix or ""}strip";
From 81ab32e510fc212f26b8a265eb32261785bd2863 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 10 Apr 2019 17:35:08 -0400
Subject: [PATCH 105/115] netbsd.mkDerivation: don't supply -z relro
Fixes netbsd.locale
Fixes: aab8c7ba437d ('netbsd: add cross target')
---
pkgs/os-specific/bsd/netbsd/default.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 7f8a623b20d..f93ed5669d0 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -65,6 +65,8 @@ let
platforms = platforms.unix;
license = licenses.bsd2;
};
+ } // lib.optionalAttrs stdenv'.isDarwin {
+ MKRELRO = "no";
} // lib.optionalAttrs (stdenv'.cc.isClang or false) {
HAVE_LLVM = lib.head (lib.splitString "." (lib.getVersion stdenv'.cc.cc));
} // lib.optionalAttrs (stdenv'.cc.isGNU or false) {
From d44250ba18354d5008978005346e58f1193e1bb1 Mon Sep 17 00:00:00 2001
From: divisor <div@altertech.com>
Date: Sun, 7 Apr 2019 14:46:58 +0200
Subject: [PATCH 106/115] libow: init at 3.2p1
---
pkgs/development/libraries/libow/default.nix | 43 ++++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 +
2 files changed, 45 insertions(+)
create mode 100644 pkgs/development/libraries/libow/default.nix
diff --git a/pkgs/development/libraries/libow/default.nix b/pkgs/development/libraries/libow/default.nix
new file mode 100644
index 00000000000..66cb0762c25
--- /dev/null
+++ b/pkgs/development/libraries/libow/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, libtool }:
+
+stdenv.mkDerivation rec {
+ version = "3.2p1";
+ name = "libow-${version}";
+
+ src = fetchFromGitHub {
+ owner = "owfs";
+ repo = "owfs";
+ rev = "v${version}";
+ sha256 = "17jhhvlqzndf7q3xnb8bjf4j0j905c420cbxabwpz8xac3z62vb8";
+ };
+
+ nativeBuildInputs = [ autoconf automake pkgconfig ];
+
+ meta = with stdenv.lib; {
+ description = "1-Wire File System full library";
+ homepage = http://owfs.org/;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ disserman ];
+ platforms = platforms.unix;
+ };
+
+ buildInputs = [ libtool ];
+
+ preConfigure = "./bootstrap";
+
+ configureFlags = [
+ "--disable-owtcl"
+ "--disable-owphp"
+ "--disable-owpython"
+ "--disable-zero"
+ "--disable-owshell"
+ "--disable-owhttpd"
+ "--disable-owftpd"
+ "--disable-owserver"
+ "--disable-owperl"
+ "--disable-owtcl"
+ "--disable-owtap"
+ "--disable-owmon"
+ "--disable-owexternal"
+ ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index acb5a0f1dc8..3f67f7eb224 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11481,6 +11481,8 @@ in
libotr = callPackage ../development/libraries/libotr { };
+ libow = callPackage ../development/libraries/libow { };
+
libp11 = callPackage ../development/libraries/libp11 { };
libpar2 = callPackage ../development/libraries/libpar2 { };
From f0157c2364a173ffd913fc4328f2d31762622678 Mon Sep 17 00:00:00 2001
From: divisor <div@altertech.com>
Date: Sun, 7 Apr 2019 14:47:49 +0200
Subject: [PATCH 107/115] maintainer: disserman
---
maintainers/maintainer-list.nix | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 039da8cbff8..cc7cb07c5fa 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1229,6 +1229,11 @@
github = "disassembler";
name = "Samuel Leathers";
};
+ disserman = {
+ email = "disserman@gmail.com";
+ github = "divi255";
+ name = "Sergei S.";
+ };
dizfer = {
email = "david@izquierdofernandez.com";
github = "dizfer";
From fcd769b721d87377dc75e3ce4bafb8d970fb44af Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 11 Apr 2019 02:37:04 +0200
Subject: [PATCH 108/115] cask: clean up and byte compile
cc @FlexW
---
pkgs/development/tools/cask/default.nix | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix
index 0960ced99bc..13037e417c3 100644
--- a/pkgs/development/tools/cask/default.nix
+++ b/pkgs/development/tools/cask/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, emacs, python }:
+{ stdenv, fetchurl, python, emacsPackages }:
stdenv.mkDerivation rec {
name = "cask-${version}";
@@ -10,18 +10,21 @@ stdenv.mkDerivation rec {
};
doCheck = true;
-
- dontBuild = true;
+ buildInputs = with emacsPackages; [ s dash f ansi ecukes servant ert-runner el-mock
+ noflet ert-async shell-split-string git package-build ];
+ buildPhase = ''
+ emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el
+ '';
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/templates
- install -Dm644 *.el $out/
- install -Dm755 bin/cask $out/bin
+ mkdir -p $out/share/emacs/site-lisp/cask/bin
+ install -Dm644 *.el *.elc $out/share/emacs/site-lisp/cask
+ install -Dm755 bin/cask $out/share/emacs/site-lisp/cask/bin
install -Dm644 templates/* $out/templates/
touch $out/.no-upgrade
- mkdir -p $out/usr/share/emacs/site-lisp/cask
- ln -s cask{,-bootstrap}.el $out/usr/share/emacs/site-lisp/cask/
+ ln -s $out/share/emacs/site-lisp/cask/bin/cask $out/bin/cask
'';
meta = with stdenv.lib; {
@@ -39,5 +42,5 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.flexw ];
};
- nativeBuildInputs = [ emacs python ];
+ nativeBuildInputs = [ emacsPackages.emacs python ];
}
From 9404900cc43c2305d6b149986225f4ef906bc9dd Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Wed, 10 Apr 2019 21:00:02 -0400
Subject: [PATCH 109/115] vocal: 2.3.0 -> 2.4.0
Vocal has a new release featuring a number of bug fixes and new
features. See the full changelog at
https://github.com/needle-and-thread/vocal/releases/tag/2.4.0.
---
pkgs/applications/audio/vocal/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix
index 49e11aee0a1..bbd62a2f9e3 100644
--- a/pkgs/applications/audio/vocal/default.nix
+++ b/pkgs/applications/audio/vocal/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
pname = "vocal";
- version = "2.3.0";
+ version = "2.4.0";
name = "${pname}-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "needle-and-thread";
repo = pname;
rev = version;
- sha256 = "1wkkyai14in4yk3q4qq23wk3l49px2xi8z819y3glna236qsq6qp";
+ sha256 = "09g9692rckdwh1i5krqgfwdx4p67b1q5834cnxahxzpq4p08rf5w";
};
nativeBuildInputs = [
From 4bdd577aff74a50e01c9e20c34defd5d41fda7d2 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 11 Apr 2019 05:47:30 +0200
Subject: [PATCH 110/115] cask: use emacsPackagesNg instead of emacsPackages
---
pkgs/development/tools/cask/default.nix | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix
index 13037e417c3..e33761a67e0 100644
--- a/pkgs/development/tools/cask/default.nix
+++ b/pkgs/development/tools/cask/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, emacsPackages }:
+{ stdenv, fetchurl, python, emacsPackagesNg }:
stdenv.mkDerivation rec {
name = "cask-${version}";
@@ -10,8 +10,10 @@ stdenv.mkDerivation rec {
};
doCheck = true;
- buildInputs = with emacsPackages; [ s dash f ansi ecukes servant ert-runner el-mock
- noflet ert-async shell-split-string git package-build ];
+ buildInputs = with emacsPackagesNg; [
+ s f dash ansi ecukes servant ert-runner el-mock
+ noflet ert-async shell-split-string git package-build
+ ];
buildPhase = ''
emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el
'';
@@ -42,5 +44,5 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.flexw ];
};
- nativeBuildInputs = [ emacsPackages.emacs python ];
+ nativeBuildInputs = [ emacsPackagesNg.emacs python ];
}
From c0d27053ccc7fcc5dde326e5bc3e318d67529682 Mon Sep 17 00:00:00 2001
From: Tobias Bora <tobias.bora@gmail.com>
Date: Thu, 11 Apr 2019 06:27:17 +0200
Subject: [PATCH 111/115] drawpile: set meta.platforms (#57888)
---
pkgs/applications/graphics/drawpile/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix
index 8a2657c3f5c..8c547359820 100644
--- a/pkgs/applications/graphics/drawpile/default.nix
+++ b/pkgs/applications/graphics/drawpile/default.nix
@@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
downloadPage = https://drawpile.net/download/;
license = licenses.gpl3;
maintainers = with maintainers; [ fgaz ];
+ platforms = platforms.unix;
};
}
From 991f77b19f825da5105756255843da34d305eb17 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 11 Apr 2019 00:32:52 -0400
Subject: [PATCH 112/115] vocal: cleanup
---
pkgs/applications/audio/vocal/default.nix | 36 +++++++++++++++++------
1 file changed, 27 insertions(+), 9 deletions(-)
diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix
index bbd62a2f9e3..21522f94873 100644
--- a/pkgs/applications/audio/vocal/default.nix
+++ b/pkgs/applications/audio/vocal/default.nix
@@ -1,12 +1,29 @@
-{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, pantheon, gtk3, libxml2, webkitgtk, clutter-gtk
-, clutter-gst, libunity, libnotify, sqlite, gst_all_1, libsoup, json-glib, gnome3, gobject-introspection, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, cmake
+, ninja
+, pkgconfig
+, pantheon
+, gtk3
+, glib
+, libxml2
+, webkitgtk
+, clutter-gtk
+, clutter-gst
+, libunity
+, libnotify
+, sqlite
+, gst_all_1
+, libsoup
+, json-glib
+, libgee
+, wrapGAppsHook
+}:
stdenv.mkDerivation rec {
pname = "vocal";
version = "2.4.0";
- name = "${pname}-${version}";
-
src = fetchFromGitHub {
owner = "needle-and-thread";
repo = pname;
@@ -16,26 +33,27 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
- gobject-introspection
libxml2
ninja
- pkgconfig
pantheon.vala
+ pkgconfig
wrapGAppsHook
];
buildInputs = with gst_all_1; [
clutter-gst
clutter-gtk
- pantheon.elementary-icon-theme
- gnome3.libgee
- pantheon.granite
+ glib
gst-plugins-base
gst-plugins-good
gstreamer
+ gtk3
json-glib
+ libgee
libnotify
libunity
+ pantheon.elementary-icon-theme
+ pantheon.granite
sqlite
webkitgtk
];
From 49c646cbf7a887541b4100e5808027721b681b2b Mon Sep 17 00:00:00 2001
From: ryan4729 <40183301+ryan4729@users.noreply.github.com>
Date: Wed, 10 Apr 2019 22:09:45 -0700
Subject: [PATCH 113/115] ffmpeg_4: build with videotoolbox on darwin (#57743)
---
pkgs/development/libraries/ffmpeg/4.nix | 4 ++--
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix
index d8a13a9c384..7e2507d5afd 100644
--- a/pkgs/development/libraries/ffmpeg/4.nix
+++ b/pkgs/development/libraries/ffmpeg/4.nix
@@ -1,6 +1,6 @@
{ stdenv, callPackage, fetchpatch
# Darwin frameworks
-, Cocoa, CoreMedia
+, Cocoa, CoreMedia, VideoToolbox
, ...
}@args:
@@ -8,5 +8,5 @@ callPackage ./generic.nix (args // rec {
version = "${branch}";
branch = "4.1.2";
sha256 = "00yzwc2g97h8ws0haz1p0ahaavhgrbha6xjdc53a5vyfy3zyy3i0";
- darwinFrameworks = [ Cocoa CoreMedia ];
+ darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a45ea62a05c..e743d1d0b6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9957,7 +9957,7 @@ in
inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
};
ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix {
- inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
+ inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox;
};
# Aliases
From b528e0aecfc9307306ecccd7c1b43cc6cf019412 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 11 Apr 2019 01:32:21 -0400
Subject: [PATCH 114/115] font-manager: 0.7.4.3 -> 0.7.5, fix build
Has fixes for type-argument mismatches in lastest vala etc.
Note that there isn't an offical 0.7.5 release yet (not tagged).
Patching the fixes would have been nicer, but all the changes
touched the translations.
---
pkgs/applications/misc/font-manager/default.nix | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix
index 2ffa784360f..f8a02d2f78c 100644
--- a/pkgs/applications/misc/font-manager/default.nix
+++ b/pkgs/applications/misc/font-manager/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3,
+{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3, fetchpatch,
pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg,
vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection
}:
stdenv.mkDerivation rec {
pname = "font-manager";
- version = "0.7.4.3";
+ version = "0.7.5";
src = fetchFromGitHub {
owner = "FontManager";
repo = "master";
- rev = version;
- sha256 = "0v6zn25vxsn3ng31zgsgkb2wwrl0kdv4ikw4ij4yqv49aid3qjd5";
+ rev = "cc057f3e93f5b1033b04decee03cdb44177e48b3";
+ sha256 = "1xg80bi2465p5r8zfmb34iga9yqs3is1k4f13hw0ligvhb58gas0";
};
nativeBuildInputs = [
@@ -38,7 +38,9 @@ stdenv.mkDerivation rec {
gnome3.adwaita-icon-theme
];
- patches = [ ./correct-post-install.patch ];
+ patches = [
+ ./correct-post-install.patch
+ ];
mesonFlags = [
"-Ddisable_pycompile=true"
From 932f1086a9a66885d57c7428540fc6731af58c61 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 11 Apr 2019 01:45:06 -0400
Subject: [PATCH 115/115] plasma5.plasma-workspace: fix patch
---
pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch | 1 -
1 file changed, 1 deletion(-)
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
index 21adba7359d..55a4518021e 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
+++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
@@ -595,7 +595,6 @@ index 1fe41c5..11757df 100644
+wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true)
-if test x"$wait_drkonqi"x = x"true"x ; then
->>>>>>> upstream/master
+if [ x"$wait_drkonqi"x = x"true"x ]; then
# wait for remaining drkonqi instances with timeout (in seconds)
- wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`