git.iko.soy/typeable/nixpkgs
on master help sign in
Merge master into staging-next
commit230c67f43bc36f6327163a603256278c71431688 authorFrederik Rietdijk <fridh@fridh.nl> dateThu 11 Apr 2019, 07:50 (8 years ago) parent932f10899eddf3
126 files changed+2443−3494
lib/systems/examples.nix−8 lib/systems/platforms.nix−10 maintainers/maintainer-list.nix+20 nixos/doc/manual/release-notes/rl-1903.xml+12−23 nixos/doc/manual/release-notes/rl-1909.xml+22−29 nixos/modules/rename.nix+2 nixos/modules/services/hardware/triggerhappy.nix+10−1 nixos/modules/services/mail/roundcube.nix+24−20 nixos/modules/services/monitoring/prometheus/alertmanager.nix+4−24 nixos/modules/services/x11/desktop-managers/pantheon.nix+7−1 nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix+7 nixos/tests/nginx.nix+1 pkgs/applications/altcoins/ethabi.nix+3−3 pkgs/applications/altcoins/go-ethereum.nix+2−2 pkgs/applications/audio/gnome-podcasts/default.nix+9−1 pkgs/applications/audio/mixxx/default.nix+8−8 pkgs/applications/audio/spotify/default.nix+3−3 pkgs/applications/audio/vocal/default.nix+29−11 pkgs/applications/graphics/drawpile/default.nix+1 pkgs/applications/graphics/gimp/default.nix+4−4 pkgs/applications/misc/mysql-workbench/default.nix+2−2 pkgs/applications/misc/plank/default.nix+27−14 pkgs/applications/networking/brig/default.nix+2−2 pkgs/applications/networking/browsers/arora/default.nix+1 pkgs/applications/networking/browsers/chromium/plugins.nix+2−2 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix+5−5 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix+3−3 pkgs/applications/networking/instant-messengers/pidgin/default.nix+1−1 pkgs/applications/networking/owncloud-client/default.nix+2−2 pkgs/applications/networking/remote/freerdp/default.nix+1−2 pkgs/applications/networking/resilio-sync/default.nix+2−2 pkgs/applications/networking/sniffers/wireshark/default.nix+27−34 pkgs/applications/office/scribus/default.nix+15−7 pkgs/applications/office/zotero/default.nix+127−54 pkgs/applications/science/astronomy/gildas/default.nix+5−5 pkgs/applications/version-management/redmine/4.x/Gemfile+1−1 pkgs/applications/version-management/redmine/4.x/Gemfile.lock+43−43 pkgs/applications/version-management/redmine/4.x/default.nix+2−2 pkgs/applications/version-management/redmine/4.x/gemset.nix+34−34 pkgs/applications/version-management/redmine/Gemfile+1−1 pkgs/applications/version-management/redmine/Gemfile.lock+33−33 pkgs/applications/version-management/redmine/default.nix+2−2 pkgs/applications/version-management/redmine/gemset.nix+24−24 pkgs/applications/virtualization/containerd/default.nix+2−2 pkgs/build-support/writers/default.nix+10−3 pkgs/desktops/deepin/default.nix+1 pkgs/desktops/deepin/udisks2-qt5/default.nix+41 pkgs/desktops/pantheon/apps/elementary-files/default.nix+2−2 pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix+2−2 pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix+2−2 pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix+2−2 pkgs/development/androidndk-pkgs/androidndk-pkgs.nix+50−54 pkgs/development/compilers/aspectj/default.nix+1 pkgs/development/interpreters/clisp/default.nix+1 pkgs/development/libraries/argp-standalone/default.nix+34−20 pkgs/development/libraries/c-blosc/default.nix+2−2 pkgs/development/libraries/ffmpeg/4.nix+2−2 pkgs/development/libraries/gegl/4.0.nix+34−9 pkgs/development/libraries/libnfs/default.nix+2−2 pkgs/development/libraries/libow/default.nix+43 pkgs/development/libraries/physfs/default.nix+1−1 pkgs/development/libraries/readline/6.3.nix+1−1 pkgs/development/libraries/readline/android.patch+16 pkgs/development/libraries/simgear/default.nix+3−3 pkgs/development/libraries/tk/generic.nix+7−6 pkgs/development/libraries/webkitgtk/default.nix+2−2 pkgs/development/ocaml-modules/faraday/default.nix+6−5 pkgs/development/ocaml-modules/farfadet/default.nix+2−2 pkgs/development/python-modules/WazeRouteCalculator/default.nix+2−2 pkgs/development/python-modules/cntk/default.nix+11−2 pkgs/development/python-modules/django/2_1.nix+2−2 pkgs/development/python-modules/h5py/default.nix+7−1 pkgs/development/python-modules/nixpkgs/default.nix+10 pkgs/development/python-modules/pymediainfo/default.nix+2−2 pkgs/development/python-modules/pythonix/default.nix+2−3 pkgs/development/python-modules/pyupdate/default.nix+2−2 pkgs/development/python-modules/uproot-methods/default.nix+2−2 pkgs/development/python-modules/xxhash/default.nix+21 pkgs/development/python-modules/zerorpc/default.nix+22 pkgs/development/ruby-modules/gem-config/default.nix+7 pkgs/development/tools/cask/default.nix+48 pkgs/development/tools/dep2nix/default.nix+5−5 pkgs/development/tools/pyre/default.nix+15−4 pkgs/development/tools/rust/cargo-xbuild/default.nix+22 pkgs/development/web/now-cli/default.nix+2−2 pkgs/games/atanks/default.nix+1 pkgs/games/flightgear/default.nix+4−4 pkgs/os-specific/bsd/netbsd/default.nix+3−1 pkgs/os-specific/linux/nvidia-x11/default.nix+4−4 pkgs/os-specific/linux/nvme-cli/default.nix+2−2 pkgs/os-specific/linux/v4l-utils/default.nix+2−2 pkgs/servers/demoit/default.nix+24 pkgs/servers/monitoring/prometheus/alertmanager.nix+2−5 pkgs/servers/nosql/influxdb/default.nix+6−7 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 pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch+27 pkgs/servers/roundcube/default.nix+15−8 pkgs/shells/powershell/default.nix+3−3 pkgs/stdenv/cross/default.nix+1−1 pkgs/tools/admin/aws-vault/default.nix+2−2 pkgs/tools/misc/cpulimit/default.nix+2−2 pkgs/tools/misc/fluentd/Gemfile−1 pkgs/tools/misc/fluentd/Gemfile.lock+59−620 pkgs/tools/misc/fluentd/gemset.nix+182−1349 pkgs/tools/misc/hdf5/0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch−58 pkgs/tools/misc/hdf5/0001-Yanked-all-MPI-1-calls.patch−115 pkgs/tools/misc/hdf5/default.nix+2−6 pkgs/tools/misc/lolcat/Gemfile.lock+5−5 pkgs/tools/misc/lolcat/gemset.nix+9−9 pkgs/tools/misc/powerline-go/default.nix+2−2 pkgs/tools/misc/powerline-go/deps.nix+13−13 pkgs/tools/networking/aria2/default.nix+6−2 pkgs/tools/networking/brook/default.nix+26 pkgs/tools/networking/brook/deps.nix+173 pkgs/tools/networking/burpsuite/default.nix+2−2 pkgs/tools/networking/i2pd/default.nix+2−2 pkgs/tools/networking/ocserv/default.nix+2−2 pkgs/tools/package-management/checkinstall/default.nix+1 pkgs/tools/system/gotop/default.nix+4−4 pkgs/tools/text/fanficfare/default.nix+16−10 pkgs/tools/text/vale/default.nix+2−2 pkgs/top-level/all-packages.nix+14−5 pkgs/top-level/python-packages.nix+4 pkgs/top-level/static.nix−3
lib/systems/examples.nix−8
@@ -44,14 +44,6 @@ rec {
4444 platform = platforms.aarch64-multiplatform;
4545 };
4646
47− armv5te-android-prebuilt = rec {
48− config = "armv5tel-unknown-linux-androideabi";
49− sdkVer = "21";
50− ndkVer = "18b";
51− platform = platforms.armv5te-android;
52− useAndroidPrebuilt = true;
53− };
54−
5547 armv7a-android-prebuilt = rec {
5648 config = "armv7a-unknown-linux-androideabi";
5749 sdkVer = "24";
lib/systems/platforms.nix−10
@@ -253,16 +253,6 @@ rec {
253253 kernelTarget = "zImage";
254254 };
255255
256− # https://developer.android.com/ndk/guides/abis#armeabi
257− armv5te-android = {
258− name = "armeabi";
259− gcc = {
260− arch = "armv5te";
261− float = "soft";
262− float-abi = "soft";
263− };
264− };
265−
266256 # https://developer.android.com/ndk/guides/abis#v7a
267257 armv7a-android = {
268258 name = "armeabi-v7a";
maintainers/maintainer-list.nix+20
@@ -1234,6 +1234,11 @@
12341234 github = "disassembler";
12351235 name = "Samuel Leathers";
12361236 };
1237+ disserman = {
1238+ email = "disserman@gmail.com";
1239+ github = "divi255";
1240+ name = "Sergei S.";
1241+ };
12371242 dizfer = {
12381243 email = "david@izquierdofernandez.com";
12391244 github = "dizfer";
@@ -1618,6 +1623,11 @@
16181623 github = "FireyFly";
16191624 name = "Jonas Höglund";
16201625 };
1626+ flexw = {
1627+ email = "felix.weilbach@t-online.de";
1628+ github = "FlexW";
1629+ name = "Felix Weilbach";
1630+ };
16211631 flokli = {
16221632 email = "flokli@flokli.de";
16231633 github = "flokli";
@@ -5262,6 +5272,11 @@
52625272 github = "xnwdd";
52635273 name = "Guillermo NWDD";
52645274 };
5275+ xrelkd = {
5276+ email = "46590321+xrelkd@users.noreply.github.com";
5277+ github = "xrelkd";
5278+ name = "xrelkd";
5279+ };
52655280 xurei = {
52665281 email = "olivier.bourdoux@gmail.com";
52675282 github = "xurei";
@@ -5441,4 +5456,9 @@
54415456 github = "shazow";
54425457 name = "Andrey Petrov";
54435458 };
5459+ freezeboy = {
5460+ email = "freezeboy@users.noreply.github.com";
5461+ github = "freezeboy";
5462+ name = "freezeboy";
5463+ };
54445464}
nixos/doc/manual/release-notes/rl-1903.xml+12−23
@@ -31,33 +31,22 @@
3131 </para>
3232 <note>
3333 <para>
34− <varname>services.xserver.desktopManager.pantheon</varname> default
35− enables lightdm as a display manager and using Pantheon's greeter.
34+ By default, <varname>services.xserver.desktopManager.pantheon</varname>
35+ enables LightDM as a display manager, as pantheon's screen locking
36+ implementation relies on it.
3637 </para>
3738 <para>
38− This is because of limitations with the screenlocking implementation,
39− whereas the screenlocker would be non-functional without it.
40− </para>
41− <para>
42− Because of that it is recommended to retain this precaution, however if
43− you'd like to change this set:
44− </para>
45− <itemizedlist>
46− <listitem>
47− <para>
48− <option>services.xserver.displayManager.lightdm.enable</option>
49− </para>
50− </listitem>
51− <listitem>
52− <para>
53− <option>services.xserver.displayManager.lightdm.greeters.pantheon.enable</option>
54− </para>
55− </listitem>
56− </itemizedlist>
57− <para>
58− to <literal>false</literal> and enable your preferred display manager.
39+ Because of that it is recommended to leave LightDM enabled. If you'd like
40+ to disable it anyway, set
41+ <option>services.xserver.displayManager.lightdm.enable</option> to
42+ <literal>false</literal> and enable your preferred display manager.
5943 </para>
6044 </note>
45+ <para>
46+ Also note that Pantheon's LightDM greeter is not enabled by default,
47+ because it has numerous issues in NixOS and isn't optimal for use here
48+ yet.
49+ </para>
6150 </listitem>
6251 <listitem>
6352 <para>
nixos/doc/manual/release-notes/rl-1909.xml+22−29
@@ -65,6 +65,23 @@
6565 </para>
6666
6767 <itemizedlist>
68+ <listitem>
69+ <para>
70+ Buildbot no longer supports Python 2, as support was dropped upstream in
71+ version 2.0.0. Configurations may need to be modified to make them
72+ compatible with Python 3.
73+ </para>
74+ </listitem>
75+ <listitem>
76+ <para>
77+ PostgreSQL now uses
78+ <filename class="directory">/run/postgresql</filename> as its socket
79+ directory instead of <filename class="directory">/tmp</filename>. So
80+ if you run an application like eg. Nextcloud, where you need to use
81+ the Unix socket path as the database host name, you need to change it
82+ accordingly.
83+ </para>
84+ </listitem>
6885 <listitem>
6986 <para>
7087 The directory where Prometheus will store its metric data is now
@@ -84,37 +101,13 @@
84101 <option>services.prometheus.stateDir</option> at the same time.
85102 </para>
86103 </listitem>
87− </itemizedlist>
88− </section>
89−
90− <section xmlns="http://docbook.org/ns/docbook"
91− xmlns:xlink="http://www.w3.org/1999/xlink"
92− xmlns:xi="http://www.w3.org/2001/XInclude"
93− version="5.0"
94− xml:id="sec-release-19.09-incompatibilities">
95− <title>Backward Incompatibilities</title>
96−
97− <para>
98− When upgrading from a previous release, please be aware of the following
99− incompatible changes:
100− </para>
101−
102− <itemizedlist>
103− <listitem>
104− <para>
105− Buildbot no longer supports Python 2, as support was dropped upstream in
106− version 2.0.0. Configurations may need to be modified to make them
107− compatible with Python 3.
108− </para>
109− </listitem>
110104 <listitem>
111105 <para>
112− PostgreSQL now uses
113− <filename class="directory">/run/postgresql</filename> as its socket
114− directory instead of <filename class="directory">/tmp</filename>. So
115− if you run an application like eg. Nextcloud, where you need to use
116− the Unix socket path as the database host name, you need to change it
117− accordingly.
106+ The options <option>services.prometheus.alertmanager.user</option> and
107+ <option>services.prometheus.alertmanager.group</option> have been removed
108+ because the alertmanager service is now using systemd's <link
109+ xlink:href="http://0pointer.net/blog/dynamic-users-with-systemd.html">
110+ DynamicUser mechanism</link> which obviates these options.
118111 </para>
119112 </listitem>
120113 <listitem>
nixos/modules/rename.nix+2
@@ -45,6 +45,8 @@ with lib;
4545 (mkRemovedOptionModule [ "services" "neo4j" "port" ] "Use services.neo4j.http.listenAddress instead.")
4646 (mkRemovedOptionModule [ "services" "neo4j" "boltPort" ] "Use services.neo4j.bolt.listenAddress instead.")
4747 (mkRemovedOptionModule [ "services" "neo4j" "httpsPort" ] "Use services.neo4j.https.listenAddress instead.")
48+ (mkRemovedOptionModule [ "services" "prometheus" "alertmanager" "user" ] "The alertmanager service is now using systemd's DynamicUser mechanism which obviates a user setting.")
49+ (mkRemovedOptionModule [ "services" "prometheus" "alertmanager" "group" ] "The alertmanager service is now using systemd's DynamicUser mechanism which obviates a group setting.")
4850 (mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "relay" "port" ])
4951 (mkRenamedOptionModule [ "services" "vmwareGuest" ] [ "virtualisation" "vmware" "guest" ])
5052 (mkRenamedOptionModule [ "jobs" ] [ "systemd" "services" ])
nixos/modules/services/hardware/triggerhappy.nix+10−1
@@ -57,6 +57,15 @@ in
5757 '';
5858 };
5959
60+ user = mkOption {
61+ type = types.str;
62+ default = "nobody";
63+ example = "root";
64+ description = ''
65+ User account under which <command>triggerhappy</command> runs.
66+ '';
67+ };
68+
6069 bindings = mkOption {
6170 type = types.listOf (types.submodule bindingCfg);
6271 default = [];
@@ -96,7 +105,7 @@ in
96105 after = [ "local-fs.target" ];
97106 description = "Global hotkey daemon";
98107 serviceConfig = {
99− ExecStart = "${pkgs.triggerhappy}/bin/thd --user nobody --socket ${socket} --triggers ${configFile} --deviceglob /dev/input/event*";
108+ ExecStart = "${pkgs.triggerhappy}/bin/thd ${optionalString (cfg.user != "root") "--user ${cfg.user}"} --socket ${socket} --triggers ${configFile} --deviceglob /dev/input/event*";
100109 };
101110 };
102111
nixos/modules/services/mail/roundcube.nix+24−20
@@ -141,27 +141,31 @@ in
141141
142142 systemd.services.roundcube-setup = let
143143 pgSuperUser = config.services.postgresql.superUser;
144− in {
145− requires = [ "postgresql.service" ];
146− after = [ "postgresql.service" ];
147− wantedBy = [ "multi-user.target" ];
148− path = [ config.services.postgresql.package ];
149− script = ''
150− mkdir -p /var/lib/roundcube
151− if [ ! -f /var/lib/roundcube/db-created ]; then
152− if [ "${cfg.database.host}" = "localhost" ]; then
153− ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create role ${cfg.database.username} with login password '${cfg.database.password}'";
154− ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create database ${cfg.database.dbname} with owner ${cfg.database.username}";
144+ in mkMerge [
145+ (mkIf (cfg.database.host == "localhost") {
146+ requires = [ "postgresql.service" ];
147+ after = [ "postgresql.service" ];
148+ path = [ config.services.postgresql.package ];
149+ })
150+ {
151+ wantedBy = [ "multi-user.target" ];
152+ script = ''
153+ mkdir -p /var/lib/roundcube
154+ if [ ! -f /var/lib/roundcube/db-created ]; then
155+ if [ "${cfg.database.host}" = "localhost" ]; then
156+ ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create role ${cfg.database.username} with login password '${cfg.database.password}'";
157+ ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create database ${cfg.database.dbname} with owner ${cfg.database.username}";
158+ fi
159+ PGPASSWORD=${cfg.database.password} ${pkgs.postgresql}/bin/psql -U ${cfg.database.username} \
160+ -f ${cfg.package}/SQL/postgres.initial.sql \
161+ -h ${cfg.database.host} ${cfg.database.dbname}
162+ touch /var/lib/roundcube/db-created
155163 fi
156− PGPASSWORD=${cfg.database.password} ${pkgs.postgresql}/bin/psql -U ${cfg.database.username} \
157− -f ${cfg.package}/SQL/postgres.initial.sql \
158− -h ${cfg.database.host} ${cfg.database.dbname}
159− touch /var/lib/roundcube/db-created
160− fi
161164
162− ${pkgs.php}/bin/php ${cfg.package}/bin/update.sh
163− '';
164− serviceConfig.Type = "oneshot";
165− };
165+ ${pkgs.php}/bin/php ${cfg.package}/bin/update.sh
166+ '';
167+ serviceConfig.Type = "oneshot";
168+ }
169+ ];
166170 };
167171}
nixos/modules/services/monitoring/prometheus/alertmanager.nix+4−24
@@ -40,22 +40,6 @@ in {
4040 '';
4141 };
4242
43− user = mkOption {
44− type = types.str;
45− default = "nobody";
46− description = ''
47− User name under which Alertmanager shall be run.
48− '';
49− };
50−
51− group = mkOption {
52− type = types.str;
53− default = "nogroup";
54− description = ''
55− Group under which Alertmanager shall be run.
56− '';
57− };
58−
5943 configuration = mkOption {
6044 type = types.nullOr types.attrs;
6145 default = null;
@@ -151,17 +135,13 @@ in {
151135 systemd.services.alertmanager = {
152136 wantedBy = [ "multi-user.target" ];
153137 after = [ "network.target" ];
154− script = ''
155− ${cfg.package}/bin/alertmanager \
156− ${concatStringsSep " \\\n " cmdlineArgs}
157− '';
158−
159138 serviceConfig = {
160− User = cfg.user;
161− Group = cfg.group;
162139 Restart = "always";
163− PrivateTmp = true;
140+ DynamicUser = true;
164141 WorkingDirectory = "/tmp";
142+ ExecStart = "${cfg.package}/bin/alertmanager" +
143+ optionalString (length cmdlineArgs != 0) (" \\\n " +
144+ concatStringsSep " \\\n " cmdlineArgs);
165145 ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
166146 };
167147 };
nixos/modules/services/x11/desktop-managers/pantheon.nix+7−1
@@ -73,8 +73,14 @@ in
7373
7474 # Ensure lightdm is used when Pantheon is enabled
7575 # Without it screen locking will be nonfunctional because of the use of lightlocker
76+
77+ warnings = optional (config.services.xserver.displayManager.lightdm.enable != true)
78+ ''
79+ Using Pantheon without LightDM as a displayManager will break screenlocking from the UI.
80+ '';
81+
7682 services.xserver.displayManager.lightdm.enable = mkDefault true;
77− services.xserver.displayManager.lightdm.greeters.pantheon.enable = mkDefault true;
83+ services.xserver.displayManager.lightdm.greeters.gtk.enable = mkDefault true;
7884
7985 # If not set manually Pantheon session cannot be started
8086 # Known issue of https://github.com/NixOS/nixpkgs/pull/43992
nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix+7
@@ -33,6 +33,13 @@ in
3333
3434 config = mkIf (ldmcfg.enable && cfg.enable) {
3535
36+ warnings = [
37+ ''
38+ The Pantheon greeter is suboptimal in NixOS and can possibly put you in
39+ a situation where you cannot start a session when switching desktopManagers.
40+ ''
41+ ];
42+
3643 services.xserver.displayManager.lightdm.greeters.gtk.enable = false;
3744
3845 services.xserver.displayManager.lightdm.greeter = mkDefault {
nixos/tests/nginx.nix+1
@@ -28,6 +28,7 @@ import ./make-test.nix ({ pkgs, ...} : {
2828 services.nginx.virtualHosts."0.my.test" = {
2929 extraConfig = ''
3030 access_log syslog:server=unix:/dev/log,facility=user,tag=mytag,severity=info ceeformat;
31+ location /favicon.ico { allow all; access_log off; log_not_found off; }
3132 '';
3233 };
3334 };
pkgs/applications/altcoins/ethabi.nix+3−3
@@ -4,16 +4,16 @@ with rustPlatform;
44
55buildRustPackage rec {
66 name = "ethabi-${version}";
7− version = "4.1.0";
7+ version = "7.0.0";
88
99 src = fetchFromGitHub {
1010 owner = "paritytech";
1111 repo = "ethabi";
1212 rev = "v${version}";
13− sha256 = "0kxflixmgycdh7sv73zf2mrkbcfzzw7f5sjbsjks9crc9cvjqi6p";
13+ sha256 = "1gqd3vwsvv1wvi659qcdywgmh41swblpwmmxb033k8irw581dwq4";
1414 };
1515
16− cargoSha256 = "18rigpsmfiv6im2sspnxadgqrlfdp9dd75ji8s56ksc9g7hrc3wz";
16+ cargoSha256 = "0ckj5s5fr7xdqpnn4m9zwa1w71g6wwqqvax6f4xkijxdcx83n6c2";
1717
1818 cargoBuildFlags = ["--features cli"];
1919
pkgs/applications/altcoins/go-ethereum.nix+2−2
@@ -2,7 +2,7 @@
22
33buildGoPackage rec {
44 name = "go-ethereum-${version}";
5− version = "1.8.22";
5+ version = "1.8.26";
66 goPackagePath = "github.com/ethereum/go-ethereum";
77
88 # Fix for usb-related segmentation faults on darwin
@@ -16,7 +16,7 @@ buildGoPackage rec {
1616 owner = "ethereum";
1717 repo = "go-ethereum";
1818 rev = "v${version}";
19− sha256 = "0ag9qxrf7n0qkccaf6v4jaysivpxvsy5zfzar3mcm65223pqy375";
19+ sha256 = "0i7shrwix5j8l5i0ap5pzhninwyk2kvm1pax27pnnjlpam8577i4";
2020 };
2121
2222 meta = with stdenv.lib; {
pkgs/applications/audio/gnome-podcasts/default.nix+9−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchFromGitLab, meson, ninja, gettext, cargo, rustc, python3, rustPlatform, pkgconfig, gnome3
1+{ stdenv, fetchurl, fetchpatch, fetchFromGitLab, meson, ninja, gettext, cargo, rustc, python3, rustPlatform, pkgconfig, gnome3
22, glib, libhandy, gtk3, dbus, openssl, sqlite, gst_all_1, wrapGAppsHook }:
33
44# TODO: build from git for easier updates
@@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
1212 sha256 = "0g2rk3w251fp5jwbxs5ya1adv8nsgdqjy1vmfg8qqab6qyndhbrc";
1313 };
1414
15+ patches = [
16+ # podcasts-data would fail to build because it errors on warnings
17+ (fetchpatch {
18+ url = "https://gitlab.gnome.org/World/podcasts/commit/7dc1b25ee7fc59a188312d31b1fa00c3110ae63e.patch";
19+ sha256 = "03ibbh1snk1391vnni529agqs14lzg5g0axjgpf3gn8dwwh1yvd5";
20+ })
21+ ];
22+
1523 # src = fetchFromGitLab {
1624 # domain = "gitlab.gnome.org";
1725 # owner = "World";
pkgs/applications/audio/mixxx/default.nix+8−8
@@ -1,33 +1,33 @@
11{ stdenv, fetchFromGitHub, makeWrapper, chromaprint, fetchpatch
22, fftw, flac, faad2, glibcLocales, mp4v2
33, libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis
4−, opusfile
5−, pkgconfig, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite
6−, taglib, upower, vampSDK
4+, libGLU, libxcb, lilv, lv2, opusfile
5+, pkgconfig, portaudio, portmidi, protobuf, qtbase, qtscript, qtsvg
6+, qtx11extras, rubberband, scons, sqlite, taglib, upower, vampSDK
77}:
88
99stdenv.mkDerivation rec {
1010 name = "mixxx-${version}";
11− version = "2.1.5";
11+ version = "2.2.0";
1212
1313 src = fetchFromGitHub {
1414 owner = "mixxxdj";
1515 repo = "mixxx";
1616 rev = "release-${version}";
17− sha256 = "0h14pwglz03sdmgzviypv1qa1xfjclrnhyqaq5nd60j47h4z39dr";
17+ sha256 = "1rp2nyhz2j695k5kk0m94x30akwrlr9jgs0n4pi4snnvjpwmbfp9";
1818 };
1919
2020 nativeBuildInputs = [ makeWrapper ];
2121
2222 buildInputs = [
2323 chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout libsndfile
24− libusb1 libvorbis opusfile pkgconfig portaudio portmidi protobuf qt4
25− rubberband scons sqlite taglib upower vampSDK
24+ libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg
25+ qtx11extras rubberband scons sqlite taglib upower vampSDK
2626 ];
2727
2828 sconsFlags = [
2929 "build=release"
30− "qtdir=${qt4}"
30+ "qtdir=${qtbase}"
3131 "faad=1"
3232 "opus=1"
3333 ];
pkgs/applications/audio/spotify/default.nix+3−3
@@ -10,14 +10,14 @@ let
1010 # If an update breaks things, one of those might have valuable info:
1111 # https://aur.archlinux.org/packages/spotify/
1212 # https://community.spotify.com/t5/Desktop-Linux
13− version = "1.1.0.237.g378f6f25-11";
13+ version = "1.0.96.181.gf6bc1b6b-12";
1414 # To get the latest stable revision:
1515 # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
1616 # To get general information:
1717 # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
1818 # More examples of api usage:
1919 # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
20− rev = "34";
20+ rev = "30";
2121
2222
2323 deps = [
@@ -71,7 +71,7 @@ stdenv.mkDerivation {
7171 # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
7272 src = fetchurl {
7373 url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
74− sha512 = "beddfa8f5de9998e8d1dca32295d03bdf41ec2c23eca82fcf56e5bae7b8fb84c036627b02ea458623a72a01ba09ef83cc50acdd06f2810bd444aae450d4861e6";
74+ sha512 = "859730fbc80067f0828f7e13eee9a21b13b749f897a50e17c2da4ee672785cfd79e1af6336e609529d105e040dc40f61b6189524783ac93d49f991c4ea8b3c56";
7575 };
7676
7777 buildInputs = [ squashfsTools makeWrapper ];
pkgs/applications/audio/vocal/default.nix+29−11
@@ -1,41 +1,59 @@
1−{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, pantheon, gtk3, libxml2, webkitgtk, clutter-gtk
2−, clutter-gst, libunity, libnotify, sqlite, gst_all_1, libsoup, json-glib, gnome3, gobject-introspection, wrapGAppsHook }:
1+{ stdenv
2+, fetchFromGitHub
3+, cmake
4+, ninja
5+, pkgconfig
6+, pantheon
7+, gtk3
8+, glib
9+, libxml2
10+, webkitgtk
11+, clutter-gtk
12+, clutter-gst
13+, libunity
14+, libnotify
15+, sqlite
16+, gst_all_1
17+, libsoup
18+, json-glib
19+, libgee
20+, wrapGAppsHook
21+}:
322
423stdenv.mkDerivation rec {
524 pname = "vocal";
6− version = "2.3.0";
7−
8− name = "${pname}-${version}";
25+ version = "2.4.0";
926
1027 src = fetchFromGitHub {
1128 owner = "needle-and-thread";
1229 repo = pname;
1330 rev = version;
14− sha256 = "1wkkyai14in4yk3q4qq23wk3l49px2xi8z819y3glna236qsq6qp";
31+ sha256 = "09g9692rckdwh1i5krqgfwdx4p67b1q5834cnxahxzpq4p08rf5w";
1532 };
1633
1734 nativeBuildInputs = [
1835 cmake
19− gobject-introspection
2036 libxml2
2137 ninja
22− pkgconfig
2338 pantheon.vala
39+ pkgconfig
2440 wrapGAppsHook
2541 ];
2642
2743 buildInputs = with gst_all_1; [
2844 clutter-gst
2945 clutter-gtk
30− pantheon.elementary-icon-theme
31− gnome3.libgee
32− pantheon.granite
46+ glib
3347 gst-plugins-base
3448 gst-plugins-good
3549 gstreamer
50+ gtk3
3651 json-glib
52+ libgee
3753 libnotify
3854 libunity
55+ pantheon.elementary-icon-theme
56+ pantheon.granite
3957 sqlite
4058 webkitgtk
4159 ];
pkgs/applications/graphics/drawpile/default.nix+1
@@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
4848 downloadPage = https://drawpile.net/download/;
4949 license = licenses.gpl3;
5050 maintainers = with maintainers; [ fgaz ];
51+ platforms = platforms.unix;
5152 };
5253}
5354
pkgs/applications/graphics/gimp/default.nix+4−4
@@ -8,12 +8,12 @@
88let
99 inherit (python2Packages) pygtk wrapPython python;
1010in stdenv.mkDerivation rec {
11− name = "gimp-${version}";
12− version = "2.10.8";
11+ pname = "gimp";
12+ version = "2.10.10";
1313
1414 src = fetchurl {
15− url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
16− sha256 = "16sb4kslwin2jbgdb4nhks78pd0af8mvj8g5hap3hj946p7w2jfq";
15+ url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
16+ sha256 = "0xwck5nbpb945s1cyij3kfqw1pchbhx8i5vf5hgywyjw4r1z5l8j";
1717 };
1818
1919 nativeBuildInputs = [ pkgconfig intltool gettext wrapPython ];
pkgs/applications/misc/mysql-workbench/default.nix+2−2
@@ -13,12 +13,12 @@ let
1313 inherit (python2.pkgs) paramiko pycairo pyodbc;
1414in stdenv.mkDerivation rec {
1515 pname = "mysql-workbench";
16− version = "8.0.14";
16+ version = "8.0.15";
1717 name = "${pname}-${version}";
1818
1919 src = fetchurl {
2020 url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";
21− sha256 = "0mz615drx18h0frc6fq9nknqbpq7lr0xlsfmxd5irw2jz629lj76";
21+ sha256 = "0ca93azasya5xiw6j2map8drmxf445qqydpvrb512kjfqdiv67x6";
2222 };
2323
2424 patches = [
pkgs/applications/misc/plank/default.nix+27−14
@@ -1,36 +1,49 @@
11{ stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3
22, libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2
3−, bamf, gdk_pixbuf, libdbusmenu-gtk3, file, gnome-menus
4−, wrapGAppsHook, autoreconfHook, gobject-introspection }:
3+, bamf, gdk_pixbuf, libdbusmenu-gtk3, file, gnome-menus, libgee
4+, wrapGAppsHook, autoreconfHook, pantheon }:
55
66stdenv.mkDerivation rec {
77 pname = "plank";
88 version = "0.11.4";
9− name = "${pname}-${version}";
109
1110 src = fetchurl {
12− url = "https://launchpad.net/${pname}/1.0/${version}/+download/${name}.tar.xz";
11+ url = "https://launchpad.net/${pname}/1.0/${version}/+download/${pname}-${version}.tar.xz";
1312 sha256 = "1f41i45xpqhjxql9nl4a1sz30s0j46aqdhbwbvgrawz6himcvdc8";
1413 };
1514
1615 nativeBuildInputs = [
17− pkgconfig
16+ autoreconfHook
17+ gnome3.gnome-common
1818 intltool
1919 libxml2 # xmllint
20+ pkgconfig
21+ vala
2022 wrapGAppsHook
21− gobject-introspection
22− autoreconfHook
2323 ];
2424
25− buildInputs = [ vala atk cairo glib gnome-menus
26− gtk3 gnome3.libgee libwnck3 libX11 libXfixes
27− libXi pango gnome3.gnome-common bamf gdk_pixbuf
28− libdbusmenu-gtk3 gnome3.dconf ];
25+ buildInputs = [
26+ atk
27+ bamf
28+ cairo
29+ gdk_pixbuf
30+ glib
31+ gnome-menus
32+ gnome3.dconf
33+ gtk3
34+ libX11
35+ libXfixes
36+ libXi
37+ libdbusmenu-gtk3
38+ libgee
39+ libwnck3
40+ pango
41+ ];
2942
3043 # fix paths
3144 makeFlags = [
32− "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/"
33− "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
45+ "INTROSPECTION_GIRDIR=${placeholder ''out''}/share/gir-1.0/"
46+ "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0"
3447 ];
3548
3649 # Make plank's application launcher hidden in Pantheon
@@ -46,6 +59,6 @@ stdenv.mkDerivation rec {
4659 homepage = https://launchpad.net/plank;
4760 license = licenses.gpl3Plus;
4861 platforms = platforms.linux;
49− maintainers = with maintainers; [ davidak ];
62+ maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers;
5063 };
5164}
pkgs/applications/networking/brig/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildGoPackage rec {
44 name = "brig-${version}";
5− version = "0.3.0";
5+ version = "0.4.1";
66 rev = "v${version}";
77
88 goPackagePath = "github.com/sahib/brig";
@@ -12,7 +12,7 @@ buildGoPackage rec {
1212 owner = "sahib";
1313 repo = "brig";
1414 inherit rev;
15− sha256 = "01hpb6cvq8cw21ka74jllggkv5pavc0sbl1207x32gzxslw3gsvy";
15+ sha256 = "0gi39jmnzqrgj146yw8lcmgmvzx7ii1dgw4iqig7kx8c0jiqi600";
1616 };
1717
1818 meta = with stdenv.lib; {
pkgs/applications/networking/browsers/arora/default.nix+1
@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
2121 maintainers = [ maintainers.phreedom ];
2222 description = "A cross-platform Qt4 Webkit browser";
2323 homepage = https://github.com/Arora/arora;
24+ license = with licenses; [ gpl2 gpl3 ];
2425 };
2526}
pkgs/applications/networking/browsers/chromium/plugins.nix+2−2
@@ -100,11 +100,11 @@ let
100100
101101 flash = stdenv.mkDerivation rec {
102102 name = "flashplayer-ppapi-${version}";
103− version = "32.0.0.156";
103+ version = "32.0.0.171";
104104
105105 src = fetchzip {
106106 url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
107− sha256 = "0mf2p3qk82s2nwz1x8g92434wpdqgnd9jj8w88z4qksa9qhbbfh7";
107+ sha256 = "1rqf1kidpf2jqf20dw3hscrapdpm2j751742i6xnvj9mp66nczyg";
108108 stripRoot = false;
109109 };
110110
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix+5−5
@@ -74,7 +74,7 @@ let
7474in
7575stdenv.mkDerivation rec {
7676 name = "flashplayer-${version}";
77− version = "32.0.0.156";
77+ version = "32.0.0.171";
7878
7979 src = fetchurl {
8080 url =
@@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
8585 sha256 =
8686 if debug then
8787 if arch == "x86_64" then
88− "0h16vdar4p8zj6w57ihll71xjr9sy7hdiq4qwvvqndah5c4ym8xl"
88+ "0dl2kxsn4wh3243qkwyq13ikbmz6ljg95a1v02cylz36kpfl51iv"
8989 else
90− "06l59zid6n4b606254r937cvk95pyymlczadh4cpl6l4xncspdy6"
90+ "1v9imcyml55qlvp0cibi5r5kl0rcivzvmnqgw8ph3xjm1yrxw3fr"
9191 else
9292 if arch == "x86_64" then
93− "0b3qssn1fgm2v715l6nksqmwly7j9asgqh9yqjhpp7jsb84bvzk4"
93+ "1f3nl4qkws16q2yw940vvb0zmmwxks1blm4ida65hlda6f9zfq3h"
9494 else
95− "03qdwrlvs4090s9b9fn2l6g3wsbi6q81jf59s1s5gh7qhi4i0lhy";
95+ "0df9nbxyn4wl4ap333mgnnmy994xj7i5hz07sw83pszlz3pjkc0m";
9696 };
9797
9898 nativeBuildInputs = [ unzip ];
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix+3−3
@@ -50,7 +50,7 @@
5050
5151stdenv.mkDerivation rec {
5252 name = "flashplayer-standalone-${version}";
53− version = "32.0.0.156";
53+ version = "32.0.0.171";
5454
5555 src = fetchurl {
5656 url =
@@ -60,9 +60,9 @@ stdenv.mkDerivation rec {
6060 "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
6161 sha256 =
6262 if debug then
63− "0fzs2x8yxpykkza1r3yn17hmrdz51c7qigbm5qifvw59q9zl15i9"
63+ "0z4fkqbq1s63lpzfkyxllwx2wpizbabr4zim1dn7n59ld75vjxq8"
6464 else
65− "11733155aznijwhnc5wv0v6wmw9g1akbqwl07kx3lam571s8aywr";
65+ "0nvgcdmgvgbj6axrh0yzkk437bxwsaxl0mvfkcyyz1hxnq51dvvg";
6666 };
6767
6868 nativeBuildInputs = [ unzip ];
pkgs/applications/networking/instant-messengers/pidgin/default.nix+1−1
@@ -62,7 +62,7 @@ let unwrapped = stdenv.mkDerivation rec {
6262
6363 postInstall = ''
6464 wrapProgram $out/bin/pidgin \
65− --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
65+ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
6666 '';
6767
6868 meta = with stdenv.lib; {
pkgs/applications/networking/owncloud-client/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "owncloud-client-${version}";
5− version = "2.5.3.11470";
5+ version = "2.5.4.11654";
66
77 src = fetchurl {
88 url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz";
9− sha256 = "0cznis8qadsnlgm046lxn8vmbxli6zp4b8nk93n53mkfxlcw355n";
9+ sha256 = "0gsnry0786crbnpgg3f1vcqw6mwbz6svhm6mw3767qi4lb33jm31";
1010 };
1111
1212 nativeBuildInputs = [ pkgconfig cmake ];
pkgs/applications/networking/remote/freerdp/default.nix+1−2
@@ -9,7 +9,6 @@
99, pcsclite ? null
1010, systemd ? null
1111, buildServer ? true
12−, optimize ? true
1312}:
1413
1514stdenv.mkDerivation rec {
@@ -58,7 +57,7 @@ stdenv.mkDerivation rec {
5857 ++ optional (cups != null) "-DWITH_CUPS=ON"
5958 ++ optional (pcsclite != null) "-DWITH_PCSC=ON"
6059 ++ optional buildServer "-DWITH_SERVER=ON"
61− ++ optional (optimize && stdenv.isx86_64) "-DWITH_SSE2=ON";
60+ ++ optional (stdenv.isx86_64) "-DWITH_SSE2=ON";
6261
6362 meta = with lib; {
6463 description = "A Remote Desktop Protocol Client";
pkgs/applications/networking/resilio-sync/default.nix+2−2
@@ -9,12 +9,12 @@ let
99
1010in stdenv.mkDerivation rec {
1111 name = "resilio-sync-${version}";
12− version = "2.6.3";
12+ version = "2.6.2";
1313
1414 src = fetchurl {
1515 url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz";
1616 sha256 = {
17− "x86_64-linux" = "114k7dsxn7lzv6mjq9alsqxypvkah4lmjn5w6brbvgd6m6pdwslz";
17+ "x86_64-linux" = "0vq8jz4v740zz3pvgqfya8mhy35fh49wpn8d08xjrs5062hl1yc2";
1818 "i686-linux" = "1gvq29bkdqvbcgnnhl3018h564rswk3r88s33lx5iph1rpxc6v5h";
1919 }.${stdenv.hostPlatform.system};
2020 };
pkgs/applications/networking/sniffers/wireshark/default.nix+27−34
@@ -1,19 +1,17 @@
11{ stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
2−, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python, libcap, glib
2+, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib
33, libssh, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper
4−, withGtk ? false, gtk3 ? null, librsvg ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null
54, withQt ? true, qt5 ? null
65, ApplicationServices, SystemConfiguration, gmp
76}:
87
9−assert withGtk -> !withQt && gtk3 != null;
10−assert withQt -> !withGtk && qt5 != null;
8+assert withQt -> qt5 != null;
119
1210with stdenv.lib;
1311
1412let
15− version = "2.6.6";
16− variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
13+ version = "3.0.1";
14+ variant = if withQt then "qt" else "cli";
1715
1816in stdenv.mkDerivation {
1917 name = "wireshark-${variant}-${version}";
@@ -21,11 +19,10 @@ in stdenv.mkDerivation {
2119
2220 src = fetchurl {
2321 url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
24− sha256 = "0qz8a1ays63712pq1v7nnw7c57zlqkcifq7himfv5nsv0zm36ya8";
22+ sha256 = "13605bpnnbqsdr8ybqnscbz9g422zmyymn4q5aci28vc1wylr1l6";
2523 };
2624
2725 cmakeFlags = [
28− "-DBUILD_wireshark_gtk=${if withGtk then "ON" else "OFF"}"
2926 "-DBUILD_wireshark=${if withQt then "ON" else "OFF"}"
3027 "-DENABLE_QT5=${if withQt then "ON" else "OFF"}"
3128 "-DENABLE_APPLICATION_BUNDLE=${if withQt && stdenv.isDarwin then "ON" else "OFF"}"
@@ -33,13 +30,12 @@ in stdenv.mkDerivation {
3330
3431 nativeBuildInputs = [
3532 bison cmake extra-cmake-modules flex pkgconfig
36− ] ++ optional withGtk wrapGAppsHook;
33+ ];
3734
3835 buildInputs = [
3936 gettext pcre perl libpcap lua5 libssh openssl libgcrypt
40− libgpgerror gnutls geoip c-ares python glib zlib makeWrapper
37+ libgpgerror gnutls geoip c-ares python3 glib zlib makeWrapper
4138 ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
42− ++ optionals withGtk [ gtk3 librsvg gsettings-desktop-schemas ]
4339 ++ optionals stdenv.isLinux [ libcap libnl ]
4440 ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]
4541 ++ optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]);
@@ -60,32 +56,29 @@ in stdenv.mkDerivation {
6056 export LD_LIBRARY_PATH="$PWD/run"
6157 '';
6258
63− postInstall = if stdenv.isDarwin then ''
64− ${optionalString withQt ''
65− mkdir -p $out/Applications
66− mv $out/bin/Wireshark.app $out/Applications/Wireshark.app
67−
68− for so in $out/Applications/Wireshark.app/Contents/PlugIns/wireshark/*.so; do
69− install_name_tool $so -change libwireshark.10.dylib $out/lib/libwireshark.10.dylib
70− install_name_tool $so -change libwiretap.7.dylib $out/lib/libwiretap.7.dylib
71− install_name_tool $so -change libwsutil.8.dylib $out/lib/libwsutil.8.dylib
72− done
73−
74− wrapProgram $out/Applications/Wireshark.app/Contents/MacOS/Wireshark \
59+ postInstall = ''
60+ # to remove "cycle detected in the references"
61+ mkdir -p $dev/lib/wireshark
62+ mv $out/lib/wireshark/cmake $dev/lib/wireshark
63+ '' + (if stdenv.isDarwin && withQt then ''
64+ mkdir -p $out/Applications
65+ mv $out/bin/Wireshark.app $out/Applications/Wireshark.app
66+
67+ for f in $(find $out/Applications/Wireshark.app/Contents/PlugIns -name "*.so"); do
68+ for dylib in $(otool -L $f | awk '/^\t*lib/ {print $1}'); do
69+ install_name_tool -change "$dylib" "$out/lib/$dylib" "$f"
70+ done
71+ done
72+
73+ wrapProgram $out/Applications/Wireshark.app/Contents/MacOS/Wireshark \
7574 --set QT_PLUGIN_PATH ${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}
76− ''}
77− '' else optionalString (withQt || withGtk) ''
78− ${optionalString withGtk ''
79− install -Dm644 -t $out/share/applications ../wireshark-gtk.desktop
80− ''}
81− ${optionalString withQt ''
82− install -Dm644 -t $out/share/applications ../wireshark.desktop
83− wrapProgram $out/bin/wireshark \
75+ '' else optionalString withQt ''
76+ install -Dm644 -t $out/share/applications ../wireshark.desktop
77+ wrapProgram $out/bin/wireshark \
8478 --set QT_PLUGIN_PATH ${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}
85− ''}
8679
8780 substituteInPlace $out/share/applications/*.desktop \
88− --replace "Exec=wireshark" "Exec=$out/bin/wireshark"
81+ --replace "Exec=wireshark" "Exec=$out/bin/wireshark"
8982
9083 install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg
9184 mkdir $dev/include/{epan/{wmem,ftypes,dfilter},wsutil,wiretap} -pv
@@ -98,7 +91,7 @@ in stdenv.mkDerivation {
9891 cp ../epan/dfilter/*.h $dev/include/epan/dfilter/
9992 cp ../wsutil/*.h $dev/include/wsutil/
10093 cp ../wiretap/*.h $dev/include/wiretap
101− '';
94+ '');
10295
10396 enableParallelBuilding = true;
10497
pkgs/applications/office/scribus/default.nix+15−7
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2
22, libart_lgpl, qt4, python2, cups, fontconfig, libjpeg
3−, zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake, imagemagick }:
3+, zlib, libpng, xorg, cairo, podofo, hunspell, boost, cmake, imagemagick, ghostscript }:
44
55let
66 icon = fetchurl {
@@ -8,27 +8,35 @@ let
88 sha256 = "0hq3i7c2l50445an9glhhg47kj26y16svfajc6naqn307ph9vzc3";
99 };
1010
11− pythonEnv = python2.withPackages(ps: [ps.tkinter]);
11+ pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]);
1212in stdenv.mkDerivation rec {
13− name = "scribus-1.4.7";
13+ pname = "scribus";
14+ version = "1.4.8";
1415
1516 src = fetchurl {
16− url = "mirror://sourceforge/scribus/scribus/${name}.tar.xz";
17− sha256 = "1v2ziq3k0yjz35nk5plcbc1jpi53p9v1cq1z3spch9lwlns3bls2";
17+ url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.xz";
18+ sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992";
1819 };
1920
2021 enableParallelBuilding = true;
2122
23+ nativeBuildInputs = [ pkgconfig cmake ];
2224 buildInputs = with xorg;
23− [ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt4
25+ [ freetype lcms libtiff libxml2 libart_lgpl qt4
2426 pythonEnv cups fontconfig
25− libjpeg zlib libpng podofo aspell cairo
27+ libjpeg zlib libpng podofo hunspell cairo
2628 boost # for internal 2geom library
2729 libXaw libXext libX11 libXtst libXi libXinerama
2830 libpthreadstubs libXau libXdmcp
2931 imagemagick # To build the icon
3032 ];
3133
34+ postPatch = ''
35+ substituteInPlace scribus/util_ghostscript.cpp \
36+ --replace 'QString gsName("gs");' \
37+ 'QString gsName("${ghostscript}/bin/gs");'
38+ '';
39+
3240 postInstall = ''
3341 for i in 16 24 48 64 96 128 256 512; do
3442 mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps
pkgs/applications/office/zotero/default.nix+127−54
@@ -1,67 +1,140 @@
1−{ stdenv, fetchurl, buildFHSUserEnv, makeDesktopItem, runCommand, bash, wrapGAppsHook, gsettings-desktop-schemas, gtk3, gnome3 }:
2−
3−let
4−version = "5.0.60";
5−meta = with stdenv.lib; {
6− homepage = https://www.zotero.org;
7− description = "Collect, organize, cite, and share your research sources";
8− license = licenses.agpl3;
9− platforms = platforms.linux;
10−};
11−
12−zoteroSrc = stdenv.mkDerivation rec {
13− inherit version;
14− name = "zotero-${version}-pkg";
1+{ stdenv, fetchurl, wrapGAppsHook, makeDesktopItem
2+, atk
3+, cairo
4+, curl
5+, cups
6+, dbus-glib
7+, dbus
8+, fontconfig
9+, freetype
10+, gdk_pixbuf
11+, glib
12+, glibc
13+, gtk3
14+, libX11
15+, libXScrnSaver
16+, libxcb
17+, libXcomposite
18+, libXcursor
19+, libXdamage
20+, libXext
21+, libXfixes
22+, libXi
23+, libXinerama
24+, libXrender
25+, libXt
26+, libnotify
27+, gnome3
28+, libGLU_combined
29+, nspr
30+, nss
31+, pango
32+, coreutils
33+, gnused
34+, gsettings-desktop-schemas
35+}:
1536
37+stdenv.mkDerivation rec {
38+ name = "zotero-${version}";
39+ version = "5.0.60";
40+
1641 src = fetchurl {
1742 url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
1843 sha256 = "0753xk95shhxma4dvdxrj2q6y81z8lianxg7jnab9m17fb67jy2d";
1944 };
20−
45+
2146 buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ];
22− phases = [ "unpackPhase" "installPhase" "fixupPhase"];
2347
24− installPhase = ''
25− mkdir -p $out/data
26− cp -r * $out/data
27− mkdir $out/bin
28− ln -s $out/data/zotero $out/bin/zotero
48+ phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ];
49+
50+ dontStrip = true;
51+ dontPatchELF = true;
52+
53+ libPath = stdenv.lib.makeLibraryPath
54+ [ stdenv.cc.cc
55+ atk
56+ cairo
57+ curl
58+ cups
59+ dbus-glib
60+ dbus
61+ fontconfig
62+ freetype
63+ gdk_pixbuf
64+ glib
65+ glibc
66+ gtk3
67+ libX11
68+ libXScrnSaver
69+ libXcomposite
70+ libXcursor
71+ libxcb
72+ libXdamage
73+ libXext
74+ libXfixes
75+ libXi
76+ libXinerama
77+ libXrender
78+ libXt
79+ libnotify
80+ libGLU_combined
81+ nspr
82+ nss
83+ pango
84+ ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [
85+ stdenv.cc.cc
86+ ];
87+
88+ patchPhase = ''
89+ sed -i '/pref("app.update.enabled", true);/c\pref("app.update.enabled", false);' defaults/preferences/prefs.js
2990 '';
30−};
3191
32−fhsEnv = buildFHSUserEnv {
33− name = "zotero-fhs-env";
34− targetPkgs = pkgs: with pkgs; with xorg; [
35− gtk3 dbus-glib glib
36− libXt nss
37− libX11
38− ];
39−};
92+ desktopItem = makeDesktopItem rec {
93+ name = "zotero-${version}";
94+ exec = "zotero -url %U";
95+ icon = "zotero";
96+ type = "Application";
97+ comment = meta.description;
98+ desktopName = "Zotero";
99+ genericName = "Reference Management";
100+ categories = "Office;Database;";
101+ startupNotify = "true";
102+ mimeType = "text/plain";
103+ };
40104
41−desktopItem = makeDesktopItem rec {
42− name = "zotero-${version}";
43− exec = "zotero -url %U";
44− icon = "zotero";
45− type = "Application";
46− comment = meta.description;
47− desktopName = "Zotero";
48− genericName = "Reference Management";
49− categories = "Office;Database;";
50− startupNotify = "true";
51−};
105+ installPhase =
106+ ''
107+ mkdir -p "$prefix/usr/lib/zotero-bin-${version}"
108+ cp -r * "$prefix/usr/lib/zotero-bin-${version}"
109+ mkdir -p "$out/bin"
110+ ln -s "$prefix/usr/lib/zotero-bin-${version}/zotero" "$out/bin/"
52111
53−in runCommand "zotero-${version}" { inherit meta; } ''
54− mkdir -p $out/bin $out/share/applications
55− cat >$out/bin/zotero <<EOF
56−#!${bash}/bin/bash
57−${fhsEnv}/bin/zotero-fhs-env ${zoteroSrc}/bin/zotero
58−EOF
59− chmod +x $out/bin/zotero
112+ # install desktop file and icons.
113+ mkdir -p $out/share/applications
114+ cp ${desktopItem}/share/applications/* $out/share/applications/
115+ for size in 16 32 48 256; do
116+ install -Dm444 chrome/icons/default/default$size.png \
117+ $out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png
118+ done
60119
61− cp ${desktopItem}/share/applications/* $out/share/applications/
120+ for executable in \
121+ zotero-bin plugin-container \
122+ updater minidump-analyzer
123+ do
124+ if [ -e "$out/usr/lib/zotero-bin-${version}/$executable" ]; then
125+ patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
126+ "$out/usr/lib/zotero-bin-${version}/$executable"
127+ fi
128+ done
129+ find . -executable -type f -exec \
130+ patchelf --set-rpath "$libPath" \
131+ "$out/usr/lib/zotero-bin-${version}/{}" \;
132+ '';
62133
63− for size in 16 32 48 256; do
64− install -Dm444 ${zoteroSrc}/data/chrome/icons/default/default$size.png \
65− $out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png
66− done
67−''
134+ meta = with stdenv.lib; {
135+ homepage = https://www.zotero.org;
136+ description = "Collect, organize, cite, and share your research sources";
137+ license = licenses.agpl3;
138+ platforms = platforms.linux;
139+ };
140+}
pkgs/applications/science/astronomy/gildas/default.nix+5−5
@@ -7,16 +7,16 @@ let
77in
88
99stdenv.mkDerivation rec {
10− srcVersion = "mar19b";
11− version = "20190301_b";
10+ srcVersion = "apr19a";
11+ version = "20190401_a";
1212 name = "gildas-${version}";
1313
1414 src = fetchurl {
1515 # For each new release, the upstream developers of Gildas move the
1616 # source code of the previous release to a different directory
17− urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz"
18− "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz" ];
19− sha256 = "c3722863e7f3043e2d6e675557421c2eb0978fd21148386440d0139664d19f99";
17+ urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
18+ "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ];
19+ sha256 = "0yb8dv41qsr5w2yci62phk6mrxbjlfxl4nnj7zndlyym2i5ni89c";
2020 };
2121
2222 enableParallelBuilding = true;
pkgs/applications/version-management/redmine/4.x/Gemfile+1−1
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
22
33gem "bundler", ">= 1.5.0"
44
5−gem "rails", "5.2.2"
5+gem "rails", "5.2.2.1"
66gem "rouge", "~> 3.3.0"
77gem "request_store", "1.0.5"
88gem "mini_mime", "~> 1.0.1"
pkgs/applications/version-management/redmine/4.x/Gemfile.lock+43−43
@@ -1,19 +1,19 @@
11GEM
22 remote: https://rubygems.org/
33 specs:
4− actioncable (5.2.2)
5− actionpack (= 5.2.2)
4+ actioncable (5.2.2.1)
5+ actionpack (= 5.2.2.1)
66 nio4r (~> 2.0)
77 websocket-driver (>= 0.6.1)
8− actionmailer (5.2.2)
9− actionpack (= 5.2.2)
10− actionview (= 5.2.2)
11− activejob (= 5.2.2)
8+ actionmailer (5.2.2.1)
9+ actionpack (= 5.2.2.1)
10+ actionview (= 5.2.2.1)
11+ activejob (= 5.2.2.1)
1212 mail (~> 2.5, >= 2.5.4)
1313 rails-dom-testing (~> 2.0)
14− actionpack (5.2.2)
15− actionview (= 5.2.2)
16− activesupport (= 5.2.2)
14+ actionpack (5.2.2.1)
15+ actionview (= 5.2.2.1)
16+ activesupport (= 5.2.2.1)
1717 rack (~> 2.0)
1818 rack-test (>= 0.6.3)
1919 rails-dom-testing (~> 2.0)
@@ -21,26 +21,26 @@ GEM
2121 actionpack-xml_parser (2.0.1)
2222 actionpack (>= 5.0)
2323 railties (>= 5.0)
24− actionview (5.2.2)
25− activesupport (= 5.2.2)
24+ actionview (5.2.2.1)
25+ activesupport (= 5.2.2.1)
2626 builder (~> 3.1)
2727 erubi (~> 1.4)
2828 rails-dom-testing (~> 2.0)
2929 rails-html-sanitizer (~> 1.0, >= 1.0.3)
30− activejob (5.2.2)
31− activesupport (= 5.2.2)
30+ activejob (5.2.2.1)
31+ activesupport (= 5.2.2.1)
3232 globalid (>= 0.3.6)
33− activemodel (5.2.2)
34− activesupport (= 5.2.2)
35− activerecord (5.2.2)
36− activemodel (= 5.2.2)
37− activesupport (= 5.2.2)
33+ activemodel (5.2.2.1)
34+ activesupport (= 5.2.2.1)
35+ activerecord (5.2.2.1)
36+ activemodel (= 5.2.2.1)
37+ activesupport (= 5.2.2.1)
3838 arel (>= 9.0)
39− activestorage (5.2.2)
40− actionpack (= 5.2.2)
41− activerecord (= 5.2.2)
39+ activestorage (5.2.2.1)
40+ actionpack (= 5.2.2.1)
41+ activerecord (= 5.2.2.1)
4242 marcel (~> 0.3.1)
43− activesupport (5.2.2)
43+ activesupport (5.2.2.1)
4444 concurrent-ruby (~> 1.0, >= 1.0.2)
4545 i18n (>= 0.7, < 2)
4646 minitest (~> 5.1)
@@ -58,11 +58,11 @@ GEM
5858 xpath (>= 2.0, < 4.0)
5959 childprocess (0.9.0)
6060 ffi (~> 1.0, >= 1.0.11)
61− concurrent-ruby (1.1.4)
61+ concurrent-ruby (1.1.5)
6262 crass (1.0.4)
6363 css_parser (1.7.0)
6464 addressable
65− csv (3.0.4)
65+ csv (3.0.6)
6666 docile (1.1.5)
6767 erubi (1.8.0)
6868 ffi (1.10.0)
@@ -89,38 +89,38 @@ GEM
8989 mysql2 (0.5.2)
9090 net-ldap (0.16.1)
9191 nio4r (2.3.1)
92− nokogiri (1.10.1)
92+ nokogiri (1.10.2)
9393 mini_portile2 (~> 2.4.0)
9494 pg (1.1.4)
9595 public_suffix (3.0.3)
96− puma (3.12.0)
97− rack (2.0.6)
96+ puma (3.12.1)
97+ rack (2.0.7)
9898 rack-openid (1.4.2)
9999 rack (>= 1.1.0)
100100 ruby-openid (>= 2.1.8)
101101 rack-test (1.1.0)
102102 rack (>= 1.0, < 3)
103− rails (5.2.2)
104− actioncable (= 5.2.2)
105− actionmailer (= 5.2.2)
106− actionpack (= 5.2.2)
107− actionview (= 5.2.2)
108− activejob (= 5.2.2)
109− activemodel (= 5.2.2)
110− activerecord (= 5.2.2)
111− activestorage (= 5.2.2)
112− activesupport (= 5.2.2)
103+ rails (5.2.2.1)
104+ actioncable (= 5.2.2.1)
105+ actionmailer (= 5.2.2.1)
106+ actionpack (= 5.2.2.1)
107+ actionview (= 5.2.2.1)
108+ activejob (= 5.2.2.1)
109+ activemodel (= 5.2.2.1)
110+ activerecord (= 5.2.2.1)
111+ activestorage (= 5.2.2.1)
112+ activesupport (= 5.2.2.1)
113113 bundler (>= 1.3.0)
114− railties (= 5.2.2)
114+ railties (= 5.2.2.1)
115115 sprockets-rails (>= 2.0.0)
116116 rails-dom-testing (2.0.3)
117117 activesupport (>= 4.2.0)
118118 nokogiri (>= 1.6)
119119 rails-html-sanitizer (1.0.4)
120120 loofah (~> 2.2, >= 2.2.2)
121− railties (5.2.2)
122− actionpack (= 5.2.2)
123− activesupport (= 5.2.2)
121+ railties (5.2.2.1)
122+ actionpack (= 5.2.2.1)
123+ activesupport (= 5.2.2.1)
124124 method_source
125125 rake (>= 0.8.7)
126126 thor (>= 0.19.0, < 2.0)
@@ -165,7 +165,7 @@ GEM
165165 websocket-extensions (0.1.3)
166166 xpath (3.2.0)
167167 nokogiri (~> 1.8)
168− yard (0.9.18)
168+ yard (0.9.19)
169169
170170PLATFORMS
171171 ruby
@@ -186,7 +186,7 @@ DEPENDENCIES
186186 pg (~> 1.1.4)
187187 puma (~> 3.7)
188188 rack-openid
189− rails (= 5.2.2)
189+ rails (= 5.2.2.1)
190190 rails-dom-testing
191191 rbpdf (~> 1.19.6)
192192 redcarpet (~> 3.4.0)
pkgs/applications/version-management/redmine/4.x/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchurl, bundlerEnv, ruby }:
22
33let
4− version = "4.0.2";
4+ version = "4.0.3";
55 rubyEnv = bundlerEnv {
66 name = "redmine-env-${version}";
77
@@ -15,7 +15,7 @@ in
1515
1616 src = fetchurl {
1717 url = "https://www.redmine.org/releases/${name}.tar.gz";
18− sha256 = "0v00f6m7si0ca0bmh6h7mx8yz1pl4zql2c8abavya57j97mi8182";
18+ sha256 = "1wyfl08sq71n4c2hc0fv1dfblykq5i3mbqyjdswk26md8dcmw8ac";
1919 };
2020
2121 buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ];
pkgs/applications/version-management/redmine/4.x/gemset.nix+34−34
@@ -3,28 +3,28 @@
33 dependencies = ["actionpack" "nio4r" "websocket-driver"];
44 source = {
55 remotes = ["https://rubygems.org"];
6− sha256 = "0826k5ch0l03f9yrkxy69aiv039z4qi00lnahw2rzywd2iz6r68x";
6+ sha256 = "1x5fxhsr2mxq5r6258s48xsn7ld081d3qaavppvj7yp7w9vqn871";
77 type = "gem";
88 };
9− version = "5.2.2";
9+ version = "5.2.2.1";
1010 };
1111 actionmailer = {
1212 dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
1313 source = {
1414 remotes = ["https://rubygems.org"];
15− sha256 = "0sfpb8s95cmkpp9ybyp2c88r55r5llscmmnkfwcwgasz9ncjiq5n";
15+ sha256 = "10n2v2al68rsq5ghrdp7cpycsc1q0m19fcd8cd5i528n30nl23iw";
1616 type = "gem";
1717 };
18− version = "5.2.2";
18+ version = "5.2.2.1";
1919 };
2020 actionpack = {
2121 dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
2222 source = {
2323 remotes = ["https://rubygems.org"];
24− sha256 = "0iwhbqqn0cm39dq040iwq8cfyclqk3kyzwlp5k3j5cz8k2668wws";
24+ sha256 = "1lxqzxa728dqg42yw0q4hqkaawqagiw1k0392an2ghjfgb16pafx";
2525 type = "gem";
2626 };
27− version = "5.2.2";
27+ version = "5.2.2.1";
2828 };
2929 actionpack-xml_parser = {
3030 dependencies = ["actionpack" "railties"];
@@ -39,55 +39,55 @@
3939 dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
4040 source = {
4141 remotes = ["https://rubygems.org"];
42− sha256 = "1lz04drbi1z0xhvb8jnr14pbf505lilr02arahxq7y3mxiz0rs8z";
42+ sha256 = "0832vlx37rly8ryfgi01b20mld8b3bv9cg62n5wax4zpzgn6jdxb";
4343 type = "gem";
4444 };
45− version = "5.2.2";
45+ version = "5.2.2.1";
4646 };
4747 activejob = {
4848 dependencies = ["activesupport" "globalid"];
4949 source = {
5050 remotes = ["https://rubygems.org"];
51− sha256 = "1jjkl62x2aprg55x9rpm0h2c82vr2qr989hg3l9r21l01q4822ir";
51+ sha256 = "1zma452lc3qp4a7r10zbdmsci0kv9a3gnk4da2apbdrc8fib5mr3";
5252 type = "gem";
5353 };
54− version = "5.2.2";
54+ version = "5.2.2.1";
5555 };
5656 activemodel = {
5757 dependencies = ["activesupport"];
5858 source = {
5959 remotes = ["https://rubygems.org"];
60− sha256 = "1xmwi3mw8g4shbjvkhk72ra3r5jccbdsd4piphqka2y1h8s7sxvi";
60+ sha256 = "1idmvqvpgri34k31s44pjb88rc3jad3yxra7fd1kpidpnv5f3v65";
6161 type = "gem";
6262 };
63− version = "5.2.2";
63+ version = "5.2.2.1";
6464 };
6565 activerecord = {
6666 dependencies = ["activemodel" "activesupport" "arel"];
6767 source = {
6868 remotes = ["https://rubygems.org"];
69− sha256 = "19a0sns6a5wz2wym25lb1dv4lbrrl5sd1n15s5ky2636znmhz30y";
69+ sha256 = "1c5cz9v7ggpqjxf0fqs1xhy1pb9m34cp31pxarhs9aqb71qjl98v";
7070 type = "gem";
7171 };
72− version = "5.2.2";
72+ version = "5.2.2.1";
7373 };
7474 activestorage = {
7575 dependencies = ["actionpack" "activerecord" "marcel"];
7676 source = {
7777 remotes = ["https://rubygems.org"];
78− sha256 = "0c72837098sw384vk6dmrb2p7q3wx4swnibk6sw9dp4hn1vc4p31";
78+ sha256 = "155xpbzrz0kr0argx0vsh5prvadd2h1g1m61kdiabvfy2iygc02n";
7979 type = "gem";
8080 };
81− version = "5.2.2";
81+ version = "5.2.2.1";
8282 };
8383 activesupport = {
8484 dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
8585 source = {
8686 remotes = ["https://rubygems.org"];
87− sha256 = "1iya7vxqwxysr74s7b4z1x19gmnx5advimzip3cbmsd5bd43wfgz";
87+ sha256 = "161bp4p01v1a1lvszrhd1a02zf9x1p1l1yhw79a3rix1kvzkkdqb";
8888 type = "gem";
8989 };
90− version = "5.2.2";
90+ version = "5.2.2.1";
9191 };
9292 addressable = {
9393 dependencies = ["public_suffix"];
@@ -135,10 +135,10 @@
135135 concurrent-ruby = {
136136 source = {
137137 remotes = ["https://rubygems.org"];
138− sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1";
138+ sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
139139 type = "gem";
140140 };
141− version = "1.1.4";
141+ version = "1.1.5";
142142 };
143143 crass = {
144144 source = {
@@ -160,10 +160,10 @@
160160 csv = {
161161 source = {
162162 remotes = ["https://rubygems.org"];
163− sha256 = "19m22vlxddva301z2izvg06hldlc37nyzhin3kjjfcnlbb8imj33";
163+ sha256 = "1zvchwfkdkljnslqakagbnw76vs01xwpjrynrawfanzn376c6bcd";
164164 type = "gem";
165165 };
166− version = "3.0.4";
166+ version = "3.0.6";
167167 };
168168 docile = {
169169 source = {
@@ -334,10 +334,10 @@
334334 dependencies = ["mini_portile2"];
335335 source = {
336336 remotes = ["https://rubygems.org"];
337− sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184";
337+ sha256 = "0sy96cc8i5y4p67fhf4d9c6sg8ymrrva21zyvzw55l0pa1582wx2";
338338 type = "gem";
339339 };
340− version = "1.10.1";
340+ version = "1.10.2";
341341 };
342342 pg = {
343343 source = {
@@ -358,18 +358,18 @@
358358 puma = {
359359 source = {
360360 remotes = ["https://rubygems.org"];
361− sha256 = "1k7dqxnq0dnf5rxkgs9rknclkn3ah7lsdrk6nrqxla8qzy31wliq";
361+ sha256 = "1pkrbvak6rlf147qpd4zss031qrwwh53g8s6017037iwg0436kv3";
362362 type = "gem";
363363 };
364− version = "3.12.0";
364+ version = "3.12.1";
365365 };
366366 rack = {
367367 source = {
368368 remotes = ["https://rubygems.org"];
369− sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm";
369+ sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i";
370370 type = "gem";
371371 };
372− version = "2.0.6";
372+ version = "2.0.7";
373373 };
374374 rack-openid = {
375375 dependencies = ["rack" "ruby-openid"];
@@ -393,10 +393,10 @@
393393 dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"];
394394 source = {
395395 remotes = ["https://rubygems.org"];
396− sha256 = "1m9cszds68dsiycciiayd3c9g90s2yzn1izkr3gpgqkfw6dmvzyr";
396+ sha256 = "1jxmwrykwgbn116hhmi7h75hcsdifhj89wk12m7ch2f3mn1lrmp9";
397397 type = "gem";
398398 };
399− version = "5.2.2";
399+ version = "5.2.2.1";
400400 };
401401 rails-dom-testing = {
402402 dependencies = ["activesupport" "nokogiri"];
@@ -420,10 +420,10 @@
420420 dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"];
421421 source = {
422422 remotes = ["https://rubygems.org"];
423− sha256 = "00pnylmbz4c46mxw5lhxi8h39lndfg6fs1hpd0qd6swnjhkqsr1l";
423+ sha256 = "0al6mvh2jvr3n7cxkx0yvhgiiarby6gxc93vl5xg1yxkvx27qzd6";
424424 type = "gem";
425425 };
426− version = "5.2.2";
426+ version = "5.2.2.1";
427427 };
428428 rake = {
429429 source = {
@@ -614,9 +614,9 @@
614614 yard = {
615615 source = {
616616 remotes = ["https://rubygems.org"];
617− sha256 = "07fykkfyrwqkfnxx9i5w6adyiadz00h497c516n96rgvs7alc74f";
617+ sha256 = "1w0i13a0vsw4jmlj59xn64rdsqcsl9r3rmjjgdca5i51m1q4ix6v";
618618 type = "gem";
619619 };
620− version = "0.9.18";
620+ version = "0.9.19";
621621 };
622622}
pkgs/applications/version-management/redmine/Gemfile+1−1
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
22
33gem "bundler", ">= 1.5.0", "< 2.0.0"
44
5−gem "rails", "4.2.11"
5+gem "rails", "4.2.11.1"
66gem "addressable", "2.4.0" if RUBY_VERSION < "2.0"
77if RUBY_VERSION < "2.1"
88 gem "public_suffix", (RUBY_VERSION < "2.0" ? "~> 1.4" : "~> 2.0.5")
pkgs/applications/version-management/redmine/Gemfile.lock+33−33
@@ -1,38 +1,38 @@
11GEM
22 remote: https://rubygems.org/
33 specs:
4− actionmailer (4.2.11)
5− actionpack (= 4.2.11)
6− actionview (= 4.2.11)
7− activejob (= 4.2.11)
4+ actionmailer (4.2.11.1)
5+ actionpack (= 4.2.11.1)
6+ actionview (= 4.2.11.1)
7+ activejob (= 4.2.11.1)
88 mail (~> 2.5, >= 2.5.4)
99 rails-dom-testing (~> 1.0, >= 1.0.5)
10− actionpack (4.2.11)
11− actionview (= 4.2.11)
12− activesupport (= 4.2.11)
10+ actionpack (4.2.11.1)
11+ actionview (= 4.2.11.1)
12+ activesupport (= 4.2.11.1)
1313 rack (~> 1.6)
1414 rack-test (~> 0.6.2)
1515 rails-dom-testing (~> 1.0, >= 1.0.5)
1616 rails-html-sanitizer (~> 1.0, >= 1.0.2)
1717 actionpack-xml_parser (1.0.2)
1818 actionpack (>= 4.0.0, < 5)
19− actionview (4.2.11)
20− activesupport (= 4.2.11)
19+ actionview (4.2.11.1)
20+ activesupport (= 4.2.11.1)
2121 builder (~> 3.1)
2222 erubis (~> 2.7.0)
2323 rails-dom-testing (~> 1.0, >= 1.0.5)
2424 rails-html-sanitizer (~> 1.0, >= 1.0.3)
25− activejob (4.2.11)
26− activesupport (= 4.2.11)
25+ activejob (4.2.11.1)
26+ activesupport (= 4.2.11.1)
2727 globalid (>= 0.3.0)
28− activemodel (4.2.11)
29− activesupport (= 4.2.11)
28+ activemodel (4.2.11.1)
29+ activesupport (= 4.2.11.1)
3030 builder (~> 3.1)
31− activerecord (4.2.11)
32− activemodel (= 4.2.11)
33− activesupport (= 4.2.11)
31+ activerecord (4.2.11.1)
32+ activemodel (= 4.2.11.1)
33+ activesupport (= 4.2.11.1)
3434 arel (~> 6.0)
35− activesupport (4.2.11)
35+ activesupport (4.2.11.1)
3636 i18n (~> 0.7)
3737 minitest (~> 5.1)
3838 thread_safe (~> 0.3, >= 0.3.4)
@@ -51,7 +51,7 @@ GEM
5151 childprocess (0.9.0)
5252 ffi (~> 1.0, >= 1.0.11)
5353 coderay (1.1.2)
54− concurrent-ruby (1.1.4)
54+ concurrent-ruby (1.1.5)
5555 crass (1.0.4)
5656 css_parser (1.7.0)
5757 addressable
@@ -73,7 +73,7 @@ GEM
7373 metaclass (0.0.4)
7474 mime-types (3.2.2)
7575 mime-types-data (~> 3.2015)
76− mime-types-data (3.2018.0812)
76+ mime-types-data (3.2019.0331)
7777 mimemagic (0.3.3)
7878 mini_mime (1.0.1)
7979 mini_portile2 (2.3.0)
@@ -95,16 +95,16 @@ GEM
9595 ruby-openid (>= 2.1.8)
9696 rack-test (0.6.3)
9797 rack (>= 1.0)
98− rails (4.2.11)
99− actionmailer (= 4.2.11)
100− actionpack (= 4.2.11)
101− actionview (= 4.2.11)
102− activejob (= 4.2.11)
103− activemodel (= 4.2.11)
104− activerecord (= 4.2.11)
105− activesupport (= 4.2.11)
98+ rails (4.2.11.1)
99+ actionmailer (= 4.2.11.1)
100+ actionpack (= 4.2.11.1)
101+ actionview (= 4.2.11.1)
102+ activejob (= 4.2.11.1)
103+ activemodel (= 4.2.11.1)
104+ activerecord (= 4.2.11.1)
105+ activesupport (= 4.2.11.1)
106106 bundler (>= 1.3.0, < 2.0)
107− railties (= 4.2.11)
107+ railties (= 4.2.11.1)
108108 sprockets-rails
109109 rails-deprecated_sanitizer (1.0.3)
110110 activesupport (>= 4.2.0.alpha)
@@ -114,9 +114,9 @@ GEM
114114 rails-deprecated_sanitizer (>= 1.0.1)
115115 rails-html-sanitizer (1.0.4)
116116 loofah (~> 2.2, >= 2.2.2)
117− railties (4.2.11)
118− actionpack (= 4.2.11)
119− activesupport (= 4.2.11)
117+ railties (4.2.11.1)
118+ actionpack (= 4.2.11.1)
119+ activesupport (= 4.2.11.1)
120120 rake (>= 0.8.7)
121121 thor (>= 0.18.1, < 2.0)
122122 rake (12.3.2)
@@ -161,7 +161,7 @@ GEM
161161 websocket (1.2.8)
162162 xpath (3.2.0)
163163 nokogiri (~> 1.8)
164− yard (0.9.18)
164+ yard (0.9.19)
165165
166166PLATFORMS
167167 ruby
@@ -184,7 +184,7 @@ DEPENDENCIES
184184 pg (~> 0.18.1)
185185 protected_attributes
186186 rack-openid
187− rails (= 4.2.11)
187+ rails (= 4.2.11.1)
188188 rails-dom-testing
189189 rails-html-sanitizer (>= 1.0.3)
190190 rbpdf (~> 1.19.6)
pkgs/applications/version-management/redmine/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchurl, bundlerEnv, ruby }:
22
33let
4− version = "3.4.9";
4+ version = "3.4.10";
55 rubyEnv = bundlerEnv {
66 name = "redmine-env-${version}";
77
@@ -15,7 +15,7 @@ in
1515
1616 src = fetchurl {
1717 url = "https://www.redmine.org/releases/${name}.tar.gz";
18− sha256 = "1f7sgyka21cjkvmdqkkwrx1hn0b38yq4b7283vw858fccp0l2vy2";
18+ sha256 = "08clfg7wgp4wnajawdn7qgrv7r8lk8d8haqkl7iz77ygdi3mpyrh";
1919 };
2020
2121 buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ];
pkgs/applications/version-management/redmine/gemset.nix+24−24
@@ -3,19 +3,19 @@
33 dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
44 source = {
55 remotes = ["https://rubygems.org"];
6− sha256 = "0zkklsh7ymhvdm5p9fr5ycd39d5caassag8yq0dga9cbk7fps74m";
6+ sha256 = "18wwlj4f7jffv3vxm80d2z36nwza95l5xfcqc401hvvrls4xzhsy";
77 type = "gem";
88 };
9− version = "4.2.11";
9+ version = "4.2.11.1";
1010 };
1111 actionpack = {
1212 dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
1313 source = {
1414 remotes = ["https://rubygems.org"];
15− sha256 = "13xkil3y7gjj0m4ky14asi4m08x69wwv63wfn0h95wli4x8h8w7r";
15+ sha256 = "0rmldsk3a4lwxk0lrp6x1nz1v1r2xmbm3300l4ghgfygv3grdwjh";
1616 type = "gem";
1717 };
18− version = "4.2.11";
18+ version = "4.2.11.1";
1919 };
2020 actionpack-xml_parser = {
2121 dependencies = ["actionpack"];
@@ -30,46 +30,46 @@
3030 dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"];
3131 source = {
3232 remotes = ["https://rubygems.org"];
33− sha256 = "09vwq0xgxxhssxxh8fa7l2pv6a56smw3v6gvb9l1mycmf8vprd4b";
33+ sha256 = "0x7vjn8q6blzyf7j3kwg0ciy7vnfh28bjdkd1mp9k4ghp9jn0g9p";
3434 type = "gem";
3535 };
36− version = "4.2.11";
36+ version = "4.2.11.1";
3737 };
3838 activejob = {
3939 dependencies = ["activesupport" "globalid"];
4040 source = {
4141 remotes = ["https://rubygems.org"];
42− sha256 = "12yqs22f4lz20nw6djsrkhii3p3nfpd51nw0lhvnczx0q8kl0nyk";
42+ sha256 = "0jy1c1r6syjqpa0sh9f1p4iaxzvp6qg4n6zs774j9z27q7h407mj";
4343 type = "gem";
4444 };
45− version = "4.2.11";
45+ version = "4.2.11.1";
4646 };
4747 activemodel = {
4848 dependencies = ["activesupport" "builder"];
4949 source = {
5050 remotes = ["https://rubygems.org"];
51− sha256 = "11aqvabf5c1pgb404f5bqp1i7mxkyhzmwk6y8zm5w6rf4nq095mq";
51+ sha256 = "1c1x0rd6wnk1f0gsmxs6x3gx7yf6fs9qqkdv7r4hlbcdd849in33";
5252 type = "gem";
5353 };
54− version = "4.2.11";
54+ version = "4.2.11.1";
5555 };
5656 activerecord = {
5757 dependencies = ["activemodel" "activesupport" "arel"];
5858 source = {
5959 remotes = ["https://rubygems.org"];
60− sha256 = "1sw0m19cnasbr4cabvc302hjddc3s6fja3fr0gbj9h2n8b3633i5";
60+ sha256 = "07ixiwi0zzs9skqarvpfamsnay7npfswymrn28ngxaf8hi279q5p";
6161 type = "gem";
6262 };
63− version = "4.2.11";
63+ version = "4.2.11.1";
6464 };
6565 activesupport = {
6666 dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"];
6767 source = {
6868 remotes = ["https://rubygems.org"];
69− sha256 = "0pqr25wmhvvlg8av7bi5p5c7r5464clhhhhv45j63bh7xw4ad6n4";
69+ sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6";
7070 type = "gem";
7171 };
72− version = "4.2.11";
72+ version = "4.2.11.1";
7373 };
7474 addressable = {
7575 dependencies = ["public_suffix"];
@@ -125,10 +125,10 @@
125125 concurrent-ruby = {
126126 source = {
127127 remotes = ["https://rubygems.org"];
128− sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1";
128+ sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
129129 type = "gem";
130130 };
131− version = "1.1.4";
131+ version = "1.1.5";
132132 };
133133 crass = {
134134 source = {
@@ -243,10 +243,10 @@
243243 mime-types-data = {
244244 source = {
245245 remotes = ["https://rubygems.org"];
246− sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc";
246+ sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
247247 type = "gem";
248248 };
249− version = "3.2018.0812";
249+ version = "3.2019.0331";
250250 };
251251 mimemagic = {
252252 source = {
@@ -377,10 +377,10 @@
377377 dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"];
378378 source = {
379379 remotes = ["https://rubygems.org"];
380− sha256 = "0rhp1l5klw8alqnzji2p4w01x7ygsfnzc7mf87ncr2jlizmgy4nx";
380+ sha256 = "1ywvis59dd3v8qapi9ix6743zgk07l21x1cd6nb1ddpahxhm7dml";
381381 type = "gem";
382382 };
383− version = "4.2.11";
383+ version = "4.2.11.1";
384384 };
385385 rails-deprecated_sanitizer = {
386386 dependencies = ["activesupport"];
@@ -413,10 +413,10 @@
413413 dependencies = ["actionpack" "activesupport" "rake" "thor"];
414414 source = {
415415 remotes = ["https://rubygems.org"];
416− sha256 = "09x32zkxs0vfi4y0bjrqd61821kx2azwhdxvk2ygqj4yvxfh11i1";
416+ sha256 = "1bjf21z9maiiazc1if56nnh9xmgbkcqlpznv34f40a1hsvgk1d1m";
417417 type = "gem";
418418 };
419− version = "4.2.11";
419+ version = "4.2.11.1";
420420 };
421421 rake = {
422422 source = {
@@ -607,9 +607,9 @@
607607 yard = {
608608 source = {
609609 remotes = ["https://rubygems.org"];
610− sha256 = "07fykkfyrwqkfnxx9i5w6adyiadz00h497c516n96rgvs7alc74f";
610+ sha256 = "1w0i13a0vsw4jmlj59xn64rdsqcsl9r3rmjjgdca5i51m1q4ix6v";
611611 type = "gem";
612612 };
613− version = "0.9.18";
613+ version = "0.9.19";
614614 };
615615}
pkgs/applications/virtualization/containerd/default.nix+2−2
@@ -4,13 +4,13 @@ with lib;
44
55buildGoPackage rec {
66 name = "containerd-${version}";
7− version = "1.2.5";
7+ version = "1.2.6";
88
99 src = fetchFromGitHub {
1010 owner = "containerd";
1111 repo = "containerd";
1212 rev = "v${version}";
13− sha256 = "0npbzixf3c0jvzm159vygvkydrr8h36c9sq50yv0mdinrys2bvg0";
13+ sha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357";
1414 };
1515
1616 goPackagePath = "github.com/containerd/containerd";
pkgs/build-support/writers/default.nix+10−3
@@ -178,13 +178,20 @@ rec {
178178 writeJSBin = name:
179179 writeJS "/bin/${name}";
180180
181+ awkFormatNginx = builtins.toFile "awkFormat-nginx.awk" ''
182+ awk -f
183+ {sub(/^[ \t]+/,"");idx=0}
184+ /\{/{ctx++;idx=1}
185+ /\}/{ctx--}
186+ {id="";for(i=idx;i<ctx;i++)id=sprintf("%s%s", id, "\t");printf "%s%s\n", id, $0}
187+ '';
188+
181189 writeNginxConfig = name: text: pkgs.runCommand name {
182190 inherit text;
183191 passAsFile = [ "text" ];
184192 } /* sh */ ''
185− cp "$textPath" $out
186− ${pkgs.nginx-config-formatter}/bin/nginxfmt $out
187− ${pkgs.gnused}/bin/sed -i '/^$/d' $out
193+ # nginx-config-formatter has an error - https://github.com/1connect/nginx-config-formatter/issues/16
194+ ${pkgs.gawk}/bin/awk -f ${awkFormatNginx} "$textPath" | ${pkgs.gnused}/bin/sed '/^\s*$/d' > $out
188195 ${pkgs.gixy}/bin/gixy $out
189196 '';
190197
pkgs/desktops/deepin/default.nix+1
@@ -43,6 +43,7 @@ let
4343 qcef = callPackage ./qcef { };
4444 qt5dxcb-plugin = callPackage ./qt5dxcb-plugin { };
4545 qt5integration = callPackage ./qt5integration { };
46+ udisks2-qt5 = callPackage ./udisks2-qt5 { };
4647
4748 };
4849
pkgs/desktops/deepin/udisks2-qt5/default.nixnew file+41
@@ -0,0 +1,41 @@
1+{ stdenv, fetchFromGitHub, qmake, qtbase, pkgconfig, deepin }:
2+
3+stdenv.mkDerivation rec {
4+ name = "${pname}-${version}";
5+ pname = "udisks2-qt5";
6+ version = "0.0.1";
7+
8+ src = fetchFromGitHub {
9+ owner = "linuxdeepin";
10+ repo = pname;
11+ rev = version;
12+ sha256 = "1gk4jmq7mrzk181r6man2rz1iyzkfasz7053a30h4nn24mq8ikig";
13+ };
14+
15+ nativeBuildInputs = [
16+ deepin.setupHook
17+ qmake
18+ ];
19+
20+ buildInputs = [
21+ qtbase
22+ ];
23+
24+ postPatch = ''
25+ searchHardCodedPaths
26+ '';
27+
28+ postFixup = ''
29+ searchHardCodedPaths $out
30+ '';
31+
32+ passthru.updateScript = deepin.updateScript { inherit name; };
33+
34+ meta = with stdenv.lib; {
35+ description = "UDisks2 D-Bus interfaces binding for Qt5";
36+ homepage = https://github.com/linuxdeepin/udisks2-qt5;
37+ license = licenses.gpl3;
38+ platforms = platforms.linux;
39+ maintainers = with maintainers; [ romildo ];
40+ };
41+}
pkgs/desktops/pantheon/apps/elementary-files/default.nix+2−2
@@ -5,7 +5,7 @@
55
66stdenv.mkDerivation rec {
77 pname = "files";
8− version = "4.1.6";
8+ version = "4.1.7";
99
1010 name = "elementary-${pname}-${version}";
1111
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 owner = "elementary";
1414 repo = pname;
1515 rev = version;
16− sha256 = "1c17d5lvpzyqd7mmzyfms80am46s566xr1r7b27rgv9w7vpzpgm0";
16+ sha256 = "1fz7zawqkb9fa2vy36hg1wz1sxzgm307hp5kckb7icarqfrx0gih";
1717 };
1818
1919 passthru = {
pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix+2−2
@@ -3,13 +3,13 @@
33
44stdenv.mkDerivation rec {
55 pname = "switchboard-plug-bluetooth";
6− version = "2.2.1";
6+ version = "2.2.2";
77
88 src = fetchFromGitHub {
99 owner = "elementary";
1010 repo = pname;
1111 rev = version;
12− sha256 = "13jm2idjsgqkvdz1dxgl2wwx7bsqahppf6cnpl0pmz167wahg5zp";
12+ sha256 = "0rp9wa0yilc3wgwnybc6cryxphja7imixn45zhj475a4nb3afd0q";
1313 };
1414
1515 passthru = {
pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix+2−2
@@ -3,13 +3,13 @@
33
44stdenv.mkDerivation rec {
55 pname = "switchboard-plug-display";
6− version = "2.1.6";
6+ version = "2.1.7";
77
88 src = fetchFromGitHub {
99 owner = "elementary";
1010 repo = pname;
1111 rev = version;
12− sha256 = "0pw21bnc79shiynmg7h9bs1x1v011lh07ypn22j73yhmxp6wiypd";
12+ sha256 = "1icz1is576d2w5a6wc06bnkg2vbsj5g6mz0b6ikzyjddr6j743ql";
1313 };
1414
1515 passthru = {
pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix+2−2
@@ -4,13 +4,13 @@
44
55stdenv.mkDerivation rec {
66 pname = "switchboard-plug-sound";
7− version = "2.2.0";
7+ version = "2.2.1";
88
99 src = fetchFromGitHub {
1010 owner = "elementary";
1111 repo = pname;
1212 rev = version;
13− sha256 = "101a39v8fssc7s56cpi60zsggvw66y9gaxwjvawds928cll0yiy9";
13+ sha256 = "0frml591r82j7hf1zlccgv8pzk3w10x470f9nzvdgdjpz0r776k2";
1414 };
1515
1616 passthru = {
pkgs/development/androidndk-pkgs/androidndk-pkgs.nix+50−54
@@ -18,19 +18,28 @@ let
1818 "x86_64-unknown-linux-gnu" = {
1919 double = "linux-x86_64";
2020 };
21− "armv5tel-unknown-linux-androideabi" = {
22− arch = "arm";
23− triple = "arm-linux-androideabi";
24− gccVer = "4.8";
21+ "i686-unknown-linux-android" = {
22+ triple = "i686-linux-android";
23+ arch = "x86";
24+ toolchain = "x86";
25+ gccVer = "4.9";
26+ };
27+ "x86_64-unknown-linux-android" = {
28+ triple = "x86_64-linux-android";
29+ arch = "x86_64";
30+ toolchain = "x86_64";
31+ gccVer = "4.9";
2532 };
2633 "armv7a-unknown-linux-androideabi" = {
2734 arch = "arm";
2835 triple = "arm-linux-androideabi";
36+ toolchain = "arm-linux-androideabi";
2937 gccVer = "4.9";
3038 };
3139 "aarch64-unknown-linux-android" = {
3240 arch = "arm64";
3341 triple = "aarch64-linux-android";
42+ toolchain = "aarch64-linux-android";
3443 gccVer = "4.9";
3544 };
3645 }.${config} or
@@ -38,49 +47,49 @@ let
3847
3948 hostInfo = ndkInfoFun stdenv.hostPlatform;
4049 targetInfo = ndkInfoFun stdenv.targetPlatform;
50+
51+ prefix = stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-");
4152in
4253
4354rec {
4455 # Misc tools
45− binaries = let
46− ndkBinDir =
47− "${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.triple}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/bin";
48− ndkGCCLibDir =
49− "${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.triple}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/lib/gcc/${targetInfo.triple}/4.9.x";
56+ binaries = runCommand "ndk-gcc-binutils" {
57+ isClang = true; # clang based cc, but bintools ld
58+ nativeBuildInputs = [ makeWrapper ];
59+ propgatedBuildInputs = [ androidndk ];
60+ } ''
61+ mkdir -p $out/bin
5062
51− in runCommand "ndk-gcc-binutils" {
52− isGNU = true; # for cc-wrapper
53− nativeBuildInputs = [ makeWrapper ];
54− propgatedBuildInputs = [ androidndk ];
55− } ''
56− mkdir -p $out/bin
57− for prog in ${ndkBinDir}/${targetInfo.triple}-*; do
58− prog_suffix=$(basename $prog | sed 's/${targetInfo.triple}-//')
59− cat > $out/bin/${stdenv.targetPlatform.config}-$prog_suffix <<EOF
60− #! ${stdenv.shell} -e
61− $prog "\$@"
62− EOF
63− chmod +x $out/bin/${stdenv.targetPlatform.config}-$prog_suffix
64− done
63+ # llvm toolchain
64+ for prog in ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${hostInfo.double}/bin/*; do
65+ ln -s $prog $out/bin/$(basename $prog)
66+ ln -s $prog $out/bin/${prefix}$(basename $prog)
67+ done
6568
66− ln -s $out/bin/${stdenv.targetPlatform.config}-ld $out/bin/ld
67− ln -s ${ndkGCCLibDir} $out/lib
68− '';
69+ # bintools toolchain
70+ for prog in ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.toolchain}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/bin/*; do
71+ prog_suffix=$(basename $prog | sed 's/${targetInfo.triple}-//')
72+ ln -s $prog $out/bin/${stdenv.targetPlatform.config}-$prog_suffix
73+ done
74+
75+ # shitty googly wrappers
76+ rm -f $out/bin/${stdenv.targetPlatform.config}-gcc $out/bin/${stdenv.targetPlatform.config}-g++
77+ '';
6978
7079 binutils = wrapBintoolsWith {
7180 bintools = binaries;
7281 libc = targetAndroidndkPkgs.libraries;
73− extraBuildCommands = ''
74− echo "--build-id" >> $out/nix-support/libc-ldflags
75− '';
7682 };
7783
78− gcc = wrapCCWith {
84+ clang = wrapCCWith {
7985 cc = binaries;
8086 bintools = binutils;
8187 libc = targetAndroidndkPkgs.libraries;
8288 extraBuildCommands = ''
8389 echo "-D__ANDROID_API__=${stdenv.targetPlatform.sdkVer}" >> $out/nix-support/cc-cflags
90+ echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
91+ echo "-resource-dir=$(echo ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${hostInfo.double}/lib*/clang/*)" >> $out/nix-support/cc-cflags
92+ echo "--gcc-toolchain=${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.toolchain}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}" >> $out/nix-support/cc-cflags
8493 ''
8594 + lib.optionalString stdenv.targetPlatform.isAarch32 (let
8695 p = stdenv.targetPlatform.platform.gcc or {}
@@ -98,17 +107,10 @@ rec {
98107 sed -E -i \
99108 $out/bin/${stdenv.targetPlatform.config}-cc \
100109 $out/bin/${stdenv.targetPlatform.config}-c++ \
101− $out/bin/${stdenv.targetPlatform.config}-gcc \
102− $out/bin/${stdenv.targetPlatform.config}-g++ \
103− -e '130i extraBefore+=(-Wl,--fix-cortex-a8)' \
104− -e 's|^(extraBefore=)\(\)$|\1(${builtins.toString flags})|'
105− '')
106− # GCC 4.9 is the first relase with "-fstack-protector"
107− + lib.optionalString (lib.versionOlder targetInfo.gccVer "4.9") ''
108− sed -E \
109− -i $out/nix-support/add-hardening.sh \
110− -e 's|(-fstack-protector)-strong|\1|g'
111− '';
110+ $out/bin/${stdenv.targetPlatform.config}-clang \
111+ $out/bin/${stdenv.targetPlatform.config}-clang++ \
112+ -e 's|^(extraBefore=)\((.*)\)$|\1(\2 -Wl,--fix-cortex-a8 ${builtins.toString flags})|'
113+ '');
112114 };
113115
114116 # Bionic lib C and other libraries.
@@ -116,17 +118,11 @@ rec {
116118 # We use androidndk from the previous stage, else we waste time or get cycles
117119 # cross-compiling packages to wrap incorrectly wrap binaries we don't include
118120 # anyways.
119− libraries =
120− let
121− includePath = "${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include";
122− asmIncludePath = "${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include/${targetInfo.triple}";
123− libPath = "${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/lib/";
124− in
125− runCommand "bionic-prebuilt" {} ''
126− mkdir -p $out
127− cp -r ${includePath} $out/include
128− chmod +w $out/include
129− cp -r ${asmIncludePath}/* $out/include
130− ln -s ${libPath} $out/lib
131− '';
121+ libraries = runCommand "bionic-prebuilt" {} ''
122+ mkdir -p $out
123+ cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include $out/include
124+ chmod +w $out/include
125+ cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include/${targetInfo.triple}/* $out/include
126+ ln -s ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/lib $out/lib
127+ '';
132128}
pkgs/development/compilers/aspectj/default.nix+1
@@ -16,5 +16,6 @@ stdenv.mkDerivation rec {
1616 homepage = http://www.eclipse.org/aspectj/;
1717 description = "A seamless aspect-oriented extension to the Java programming language";
1818 platforms = stdenv.lib.platforms.unix;
19+ license = stdenv.lib.licenses.epl10;
1920 };
2021}
pkgs/development/interpreters/clisp/default.nix+1
@@ -99,5 +99,6 @@ stdenv.mkDerivation rec {
9999 platforms = stdenv.lib.platforms.unix;
100100 # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062
101101 broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
102+ license = stdenv.lib.licenses.gpl2;
102103 };
103104}
pkgs/development/libraries/argp-standalone/default.nix+34−20
@@ -1,5 +1,24 @@
11{ stdenv, fetchurl, fetchpatch }:
22
3+let
4+ patch-argp-fmtstream = fetchpatch {
5+ name = "patch-argp-fmtstream.h";
6+ url = "https://raw.githubusercontent.com/Homebrew/formula-patches/b5f0ad3/argp-standalone/patch-argp-fmtstream.h";
7+ sha256 = "5656273f622fdb7ca7cf1f98c0c9529bed461d23718bc2a6a85986e4f8ed1cb8";
8+ };
9+
10+ patch-throw-in-funcdef = fetchpatch {
11+ name = "argp-standalone-1.3-throw-in-funcdef.patch";
12+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/argp-standalone/files/argp-standalone-1.3-throw-in-funcdef.patch?id=409d0e2a9c9c899fb1fb04cc808fe0aff3f745ca";
13+ sha256 = "0b2b4l1jkvmnffl22jcn4ydzxy2i7fnmmnfim12f0yg5pb8fs43c";
14+ };
15+
16+ patch-shared = fetchpatch {
17+ name = "argp-standalone-1.3-shared.patch";
18+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/argp-standalone/files/argp-standalone-1.3-shared.patch?id=409d0e2a9c9c899fb1fb04cc808fe0aff3f745ca";
19+ sha256 = "1xx2zdc187a1m2x6c1qs62vcrycbycw7n0q3ks2zkxpaqzx2dgkw";
20+ };
21+in
322stdenv.mkDerivation rec {
423 name = "argp-standalone-1.3";
524
@@ -8,24 +27,19 @@ stdenv.mkDerivation rec {
827 sha256 = "dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be";
928 };
1029
11− patches = [
12− (if stdenv.hostPlatform.isDarwin then
13− fetchpatch {
14− name = "patch-argp-fmtstream.h";
15− url = "https://raw.githubusercontent.com/Homebrew/formula-patches/b5f0ad3/argp-standalone/patch-argp-fmtstream.h";
16− sha256 = "5656273f622fdb7ca7cf1f98c0c9529bed461d23718bc2a6a85986e4f8ed1cb8";
17− }
18− else null)
19− ];
20−
21− patchFlags = "-p0";
22−
23− postInstall =
24− ''
25− mkdir -p $out/lib $out/include
26− cp libargp.a $out/lib
27− cp argp.h $out/include
28− '';
30+ patches =
31+ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ patch-argp-fmtstream ]
32+ ++ stdenv.lib.optionals stdenv.hostPlatform.isLinux [ patch-throw-in-funcdef patch-shared ];
33+
34+ patchFlags = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "-p0";
35+
36+ preConfigure = stdenv.lib.optionalString stdenv.hostPlatform.isLinux "export CFLAGS='-fgnu89-inline'";
37+
38+ postInstall = ''
39+ mkdir -p $out/lib $out/include
40+ cp libargp.a $out/lib
41+ cp argp.h $out/include
42+ '';
2943
3044 doCheck = true;
3145
@@ -34,8 +48,8 @@ stdenv.mkDerivation rec {
3448 meta = with stdenv.lib; {
3549 homepage = "https://www.lysator.liu.se/~nisse/misc/";
3650 description = "Standalone version of arguments parsing functions from GLIBC";
37− platforms = platforms.darwin;
51+ platforms = with platforms; darwin ++ [ "x86_64-linux" ];
3852 maintainers = with maintainers; [ amar1729 ];
39− license = stdenv.lib.licenses.gpl2;
53+ license = licenses.gpl2;
4054 };
4155}
pkgs/development/libraries/c-blosc/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "c-blosc-${version}";
5− version = "1.14.4";
5+ version = "1.16.2";
66
77 src = fetchFromGitHub {
88 owner = "Blosc";
99 repo = "c-blosc";
1010 rev = "v${version}";
11− sha256 = "195w96gl75mkxxqq6qjsmb2s1lq8z95qlc71fr5a7sckslcwglh0";
11+ sha256 = "19wb699rb5bn6h9qhw1m18m2w77lws7r50vxpgrvggnl27mvm3xc";
1212 };
1313
1414 buildInputs = [ cmake ];
pkgs/development/libraries/ffmpeg/4.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, callPackage, fetchpatch
22# Darwin frameworks
3−, Cocoa, CoreMedia
3+, Cocoa, CoreMedia, VideoToolbox
44, ...
55}@args:
66
@@ -8,5 +8,5 @@ callPackage ./generic.nix (args // rec {
88 version = "${branch}";
99 branch = "4.1.2";
1010 sha256 = "00yzwc2g97h8ws0haz1p0ahaavhgrbha6xjdc53a5vyfy3zyy3i0";
11− darwinFrameworks = [ Cocoa CoreMedia ];
11+ darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
1212})
pkgs/development/libraries/gegl/4.0.nix+34−9
@@ -1,20 +1,45 @@
1−{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which
2−, librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw
1+{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, babl, libpng, cairo, libjpeg, which
2+, librsvg, pango, gtk, bzip2, json-glib, gettext, autoreconfHook, libraw
33, gexiv2, libwebp, gnome3, libintl }:
44
5−let
6− version = "0.4.12";
7−in stdenv.mkDerivation rec {
8− name = "gegl-${version}";
5+stdenv.mkDerivation rec {
6+ pname = "gegl";
7+ version = "0.4.14";
98
109 outputs = [ "out" "dev" "devdoc" ];
1110 outputBin = "dev";
1211
1312 src = fetchurl {
14− url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
15− sha256 = "0ljqxc4iyy2hrj31pxcy1xp4xm5zbx1nigqisphmg4p8mcz2jrz9";
13+ url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
14+ sha256 = "00crhngwi07f5b9x77kx5p7p4cl6l5g6glpz9rqv7pfqk62xa0ac";
1615 };
1716
17+ patches = stdenv.lib.optionals stdenv.isDarwin [
18+ # Make the Darwin patches below apply cleanly
19+ (fetchpatch {
20+ url = https://gitlab.gnome.org/GNOME/gegl/commit/141a7aa76cd36143f624f06b1c43d2483945653c.patch;
21+ sha256 = "0ijv9ra6723jn60krjwzbc6l9qr08h76bsz9xgddvfgsgr1nnpbi";
22+ })
23+ (fetchpatch {
24+ url = https://gitlab.gnome.org/GNOME/gegl/commit/b3ff0df080d133bbdb394c3db40d4f9d2980a8a6.patch;
25+ sha256 = "0im0rqk8mz9vi7qqx06vj4wm5hjwv1544jwdaaywlcrs9g266hl0";
26+ })
27+ (fetchpatch {
28+ url = https://gitlab.gnome.org/GNOME/gegl/commit/fe756be6f0c776a45201a61f67d3e5e42f6398de.patch;
29+ sha256 = "0h3rqwfsph2gisbwvc2v5a9r5b0djcxlm790xpi6yfndj42b0v2b";
30+ })
31+ # Fix build on Darwin
32+ # https://gitlab.gnome.org/GNOME/gegl/merge_requests/28
33+ (fetchpatch {
34+ url = https://gitlab.gnome.org/GNOME/gegl/commit/ac331b5c0e3d940b64bb811b0f54e86c7d312917.patch;
35+ sha256 = "1yj9jh8q9cbr1szrxhdapknk4nfhbkbc1njv50ifrj7vyfislj34";
36+ })
37+ (fetchpatch {
38+ url = https://gitlab.gnome.org/GNOME/gegl/commit/d05eb01170728f45f561ca937708a293e29e02d9.patch;
39+ sha256 = "0gwz12sm8kkmzyxsiq0sl30cabs5q0ckj743yrzimspkhrvc1ya2";
40+ })
41+ ];
42+
1843 enableParallelBuilding = true;
1944
2045 doCheck = true;
@@ -26,7 +51,7 @@ in stdenv.mkDerivation rec {
2651
2752 propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-4.0.pc
2853
29− nativeBuildInputs = [ pkgconfig intltool which autoreconfHook libintl ];
54+ nativeBuildInputs = [ pkgconfig gettext which autoreconfHook libintl ];
3055
3156 meta = with stdenv.lib; {
3257 description = "Graph-based image processing framework";
pkgs/development/libraries/libnfs/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "libnfs-${version}";
5− version = "3.0.0";
5+ version = "4.0.0";
66
77 src = fetchFromGitHub {
88 owner = "sahlberg";
99 repo = "libnfs";
1010 rev = "libnfs-${version}";
11− sha256 = "115p55y2cbs92z5lmcnjx1v29lwinpgq4sha9v1kq1vd8674h404";
11+ sha256 = "0i27wd4zvhjz7620q043p4d4mkx8zv2yz9adm1byin47dynahyda";
1212 };
1313
1414 nativeBuildInputs = [ autoreconfHook ];
pkgs/development/libraries/libow/default.nixnew file+43
@@ -0,0 +1,43 @@
1+{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, libtool }:
2+
3+stdenv.mkDerivation rec {
4+ version = "3.2p1";
5+ name = "libow-${version}";
6+
7+ src = fetchFromGitHub {
8+ owner = "owfs";
9+ repo = "owfs";
10+ rev = "v${version}";
11+ sha256 = "17jhhvlqzndf7q3xnb8bjf4j0j905c420cbxabwpz8xac3z62vb8";
12+ };
13+
14+ nativeBuildInputs = [ autoconf automake pkgconfig ];
15+
16+ meta = with stdenv.lib; {
17+ description = "1-Wire File System full library";
18+ homepage = http://owfs.org/;
19+ license = licenses.gpl2;
20+ maintainers = with maintainers; [ disserman ];
21+ platforms = platforms.unix;
22+ };
23+
24+ buildInputs = [ libtool ];
25+
26+ preConfigure = "./bootstrap";
27+
28+ configureFlags = [
29+ "--disable-owtcl"
30+ "--disable-owphp"
31+ "--disable-owpython"
32+ "--disable-zero"
33+ "--disable-owshell"
34+ "--disable-owhttpd"
35+ "--disable-owftpd"
36+ "--disable-owserver"
37+ "--disable-owperl"
38+ "--disable-owtcl"
39+ "--disable-owtap"
40+ "--disable-owmon"
41+ "--disable-owexternal"
42+ ];
43+}
pkgs/development/libraries/physfs/default.nix+1−1
@@ -37,5 +37,5 @@ let
3737
3838in {
3939 physfs_2 = generic "2.0.3" "0sbbyqzqhyf0g68fcvvv20n3928j0x6ik1njmhn1yigvq2bj11na";
40− physfs = generic "3.0.1" "1wgj2zqpnfbnyyi1i7bq5pshcc9n5cvwlpzp8im67nb8662ryyxp";
40+ physfs = generic "3.0.2" "0qzqz4r88gvd8m7sh2z5hvqcr0jfr4wb2f77c19xycyn0rigfk9h";
4141}
pkgs/development/libraries/readline/6.3.nix+1−1
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 patches =
2424 [ ./link-against-ncurses.patch
2525 ./no-arch_only-6.3.patch
26− ]
26+ ] ++ stdenv.lib.optional stdenv.hostPlatform.useAndroidPrebuilt ./android.patch
2727 ++
2828 (let
2929 patch = nr: sha256:
pkgs/development/libraries/readline/android.patchnew file+16
@@ -0,0 +1,16 @@
1+diff --git histlib.h histlib.h
2+index c938a10..925ab72 100644
3+--- histlib.h
4++++ histlib.h
5+@@ -51,9 +51,9 @@
6+ #endif
7+
8+ #ifndef member
9+-# ifndef strchr
10++# if !defined (strchr) && !defined (__STDC__)
11+ extern char *strchr ();
12+-# endif
13++# endif /* !strchr && !__STDC__ */
14+ #define member(c, s) ((c) ? ((char *)strchr ((s), (c)) != (char *)NULL) : 0)
15+ #endif
16+
pkgs/development/libraries/simgear/default.nix+3−3
@@ -6,12 +6,12 @@
66
77stdenv.mkDerivation rec {
88 name = "simgear-${version}";
9− version = "2018.2.2";
10− shortVersion = "2018.2";
9+ version = "2018.3.1";
10+ shortVersion = "2018.3";
1111
1212 src = fetchurl {
1313 url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2";
14− sha256 = "f61576bc36aae36f350154749df1cee396763604c06b8a71c4b50452d9151ce5";
14+ sha256 = "0sm0v8v1sw5xzkzhf0gzh6fwx93hd62h5lm9s9hgci40x7480i99";
1515 };
1616
1717 buildInputs = [ plib freeglut xorgproto libX11 libXext libXi
pkgs/development/libraries/tk/generic.nix+7−6
@@ -1,4 +1,6 @@
1−{ stdenv, src, pkgconfig, tcl, libXft, fontconfig, patches ? [], ... }:
1+{ stdenv, lib, src, pkgconfig, tcl, libXft, fontconfig, patches ? []
2+, enableAqua ? stdenv.isDarwin, darwin
3+, ... }:
24
35stdenv.mkDerivation {
46 name = "tk-${tcl.version}";
@@ -21,15 +23,14 @@ stdenv.mkDerivation {
2123
2224 configureFlags = [
2325 "--with-tcl=${tcl}/lib"
24− ];
26+ ] ++ stdenv.lib.optional enableAqua "--enable-aqua";
2527
2628 nativeBuildInputs = [ pkgconfig ];
27− buildInputs = [ ]
28− ++ stdenv.lib.optional stdenv.isDarwin fontconfig;
2929
3030 propagatedBuildInputs = [ tcl libXft ];
31−
32− NIX_CFLAGS_LINK = if stdenv.isDarwin then "-lfontconfig" else null;
31+ buildInputs = lib.optional enableAqua (with darwin; with apple_sdk.frameworks; [
32+ Cocoa cf-private
33+ ]);
3334
3435 doCheck = false; # fails. can't find itself
3536
pkgs/development/libraries/webkitgtk/default.nix+2−2
@@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
1515with stdenv.lib;
1616stdenv.mkDerivation rec {
1717 name = "webkitgtk-${version}";
18− version = "2.24.0";
18+ version = "2.24.1";
1919
2020 meta = {
2121 description = "Web content rendering engine, GTK+ port";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828
2929 src = fetchurl {
3030 url = "https://webkitgtk.org/releases/${name}.tar.xz";
31− sha256 = "01s446lmjk7y8il4snjm32vpxws2rp4hmxrwm2swx0p47x8d2jif";
31+ sha256 = "0v9riwrmwi9wxbb8hlvcbyyxa9zxhcdk6s1xcspalk6asam8xjsk";
3232 };
3333
3434 patches = optionals stdenv.isDarwin [
pkgs/development/ocaml-modules/faraday/default.nix+6−5
@@ -1,8 +1,8 @@
1−{ stdenv, fetchFromGitHub, buildDunePackage, alcotest }:
1+{ lib, fetchFromGitHub, buildDunePackage, alcotest, bigstringaf }:
22
33buildDunePackage rec {
44 pname = "faraday";
5− version = "0.5.0";
5+ version = "0.7.0";
66
77 minimumOCamlVersion = "4.02";
88
@@ -10,16 +10,17 @@ buildDunePackage rec {
1010 owner = "inhabitedtype";
1111 repo = pname;
1212 rev = version;
13− sha256 = "1kql0il1frsbx6rvwqd7ahi4m14ik6la5an6c2w4x7k00ndm4d7n";
13+ sha256 = "0z6ikwlqad91iac0q5z88p3wzq5k15y86ckzmhdq1aqwrcm14bq2";
1414 };
1515
1616 buildInputs = [ alcotest ];
17+ propagatedBuildInputs = [ bigstringaf ];
1718 doCheck = true;
1819
1920 meta = {
2021 description = "Serialization library built for speed and memory efficiency";
21− license = stdenv.lib.licenses.bsd3;
22− maintainers = [ stdenv.lib.maintainers.vbgl ];
22+ license = lib.licenses.bsd3;
23+ maintainers = [ lib.maintainers.vbgl ];
2324 inherit (src.meta) homepage;
2425 };
2526}
pkgs/development/ocaml-modules/farfadet/default.nix+2−2
@@ -8,11 +8,11 @@ else
88
99stdenv.mkDerivation rec {
1010 name = "ocaml${ocaml.version}-farfadet-${version}";
11− version = "0.2";
11+ version = "0.3";
1212
1313 src = fetchurl {
1414 url = "https://github.com/oklm-wsh/Farfadet/releases/download/v${version}/farfadet-${version}.tbz";
15− sha256 = "06wvd57c8khpq0c2hvm15zng269zvabsw1lcaqphqdcckl67nsxr";
15+ sha256 = "0nlafnp0pwx0n4aszpsk6nvcvqi9im306p4jhx70si7k3xprlr2j";
1616 };
1717
1818 buildInputs = [ ocaml findlib ocamlbuild topkg ];
pkgs/development/python-modules/WazeRouteCalculator/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "WazeRouteCalculator";
6− version = "0.7.2";
6+ version = "0.9";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "09fe1bfb32291a658ba9baffe3fe176693f41362d74caba60fb04be01b447fa1";
10+ sha256 = "1kwr7r1cn9xxvf9asxqhsy4swx4v6hsgw5cr5wmn71qg11k1i5cx";
1111 };
1212
1313 propagatedBuildInputs = [ requests ];
pkgs/development/python-modules/cntk/default.nix+11−2
@@ -10,9 +10,10 @@
1010}:
1111
1212buildPythonPackage rec {
13− inherit (pkgs.cntk) name version src meta;
13+ inherit (pkgs.cntk) name version src;
1414
15− buildInputs = [ pkgs.cntk pkgs.swig pkgs.openmpi ];
15+ nativeBuildInputs = [ pkgs.swig pkgs.openmpi ];
16+ buildInputs = [ pkgs.cntk pkgs.openmpi ];
1617 propagatedBuildInputs = [ numpy scipy enum34 protobuf pip ];
1718
1819 CNTK_LIB_PATH = "${pkgs.cntk}/lib";
@@ -35,4 +36,12 @@ buildPythonPackage rec {
3536 cd $NIX_BUILD_TOP
3637 ${python.interpreter} -c "import cntk"
3738 '';
39+
40+ meta = {
41+ inherit (pkgs.cntk.meta) homepage description license maintainers;
42+ # broken in CNTK 2.4 starting with python-3.7
43+ # ("ImportError: cannot import name 'GenericMeta' from 'typing'")
44+ broken = stdenv.lib.versionAtLeast python.version "3.7";
45+
46+ };
3847}
pkgs/development/python-modules/django/2_1.nix+2−2
@@ -6,13 +6,13 @@
66
77buildPythonPackage rec {
88 pname = "Django";
9− version = "2.1.7";
9+ version = "2.1.8";
1010
1111 disabled = !isPy3k;
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "939652e9d34d7d53d74d5d8ef82a19e5f8bb2de75618f7e5360691b6e9667963";
15+ sha256 = "1r1y3d3gz5v1kyfs77dxbcm5my27q8dpcmj821b6yl8x22281cpk";
1616 };
1717
1818 patches = stdenv.lib.optionals withGdal [
pkgs/development/python-modules/h5py/default.nix+7−1
@@ -1,5 +1,5 @@
11{ stdenv, fetchPypi, isPy27, python, buildPythonPackage
2−, numpy, hdf5, cython, six, pkgconfig, unittest2
2+, numpy, hdf5, cython, six, pkgconfig, unittest2, fetchpatch
33, mpi4py ? null, openssh }:
44
55assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi;
@@ -18,6 +18,12 @@ in buildPythonPackage rec {
1818 sha256 = "9d41ca62daf36d6b6515ab8765e4c8c4388ee18e2a665701fef2b41563821002";
1919 };
2020
21+ patches = [ ( fetchpatch {
22+ # Skip a test that probes an already fixed bug in HDF5 (upstream patch)
23+ url = "https://github.com/h5py/h5py/commit/141eafa531c6c09a06efe6a694251a1eea84908d.patch";
24+ sha256 = "0lmdn0gznr7gadx7qkxybl945fvwk6r0cc4lg3ylpf8ril1975h8";
25+ })];
26+
2127 configure_flags = "--hdf5=${hdf5}" + optionalString mpiSupport " --mpi";
2228
2329 postConfigure = ''
pkgs/development/python-modules/nixpkgs/default.nix+10
@@ -1,5 +1,6 @@
11{ stdenv
22, buildPythonPackage
3+, fetchpatch
34, fetchPypi
45, pbr
56, pythonix
@@ -16,6 +17,15 @@ buildPythonPackage rec {
1617 sha256 = "0gsrd99kkv99jsrh3hckz7ns1zwndi9vvh4465v4gnpz723dd6fj";
1718 };
1819
20+ patches = [
21+ # Patch should be dropped once https://github.com/t184256/nixpkgs-python-importer/pull/7
22+ # is merged and in a release
23+ (fetchpatch {
24+ url = "https://github.com/adisbladis/nixpkgs-python-importer/commit/749e05f1.patch";
25+ sha256 = "1a72phazpqf6vf3hl3m84z9i5n6h1xpa53bqxnpsff6agxxhd21b";
26+ })
27+ ];
28+
1929 buildInputs = [ pbr ];
2030 propagatedBuildInputs = [ pythonix ];
2131
pkgs/development/python-modules/pymediainfo/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "pymediainfo";
8− version = "3.0";
8+ version = "3.1";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "e76cc5525c3fc5cba61073e12365dc06f303b261d8f923aaa6eac09bf8fab245";
12+ sha256 = "00awypv2nbn44cc38q7w747gx1xhj33cygzzl56jn5jd3hdlldn7";
1313 };
1414
1515 postPatch = ''
pkgs/development/python-modules/pythonix/default.nix+2−3
@@ -2,14 +2,14 @@
22
33buildPythonPackage rec {
44 pname = "pythonix";
5− version = "0.1.4";
5+ version = "0.1.6";
66 format = "other";
77
88 src = fetchFromGitHub {
99 owner = "Mic92";
1010 repo = "pythonix";
1111 rev = "v${version}";
12− sha256 = "1q1fagfwzvmcm1n3a0liay7m5krazmhw9l001m90rrz2x7vrsqwk";
12+ sha256 = "1qzcrpn333hsgn6fj1m1s3cvaf0ny8qpygamcrazqv57xmwyr8h5";
1313 };
1414
1515 disabled = !isPy3k;
@@ -24,6 +24,5 @@ buildPythonPackage rec {
2424 '';
2525 maintainers = [ maintainers.mic92 ];
2626 license = licenses.mit;
27− broken = true;
2827 };
2928}
pkgs/development/python-modules/pyupdate/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "pyupdate";
6− version = "1.3.5";
6+ version = "1.3.6";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "1qxbakhsgmdc5aakhkadr26dlhi0lma7170b245sragn170fqjxf";
10+ sha256 = "151dxqvdpik4jy84sq6fhjyrq2qq5l70dccgxdbxxf9qyjxpywfl";
1111 };
1212
1313 propagatedBuildInputs = [ requests ];
pkgs/development/python-modules/uproot-methods/default.nix+2−2
@@ -6,12 +6,12 @@
66}:
77
88buildPythonPackage rec {
9− version = "0.4.3";
9+ version = "0.4.4";
1010 pname = "uproot-methods";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "f90d91a613a875ebdf214f0f6f3fd0f8beea9125fc35e54f334d6104fe47c87d";
14+ sha256 = "004q7lywhhdvsmds88cfpjvkj89nf8n9d4gyrbvvj3x0gw7iiljq";
1515 };
1616
1717 propagatedBuildInputs = [ numpy awkward ];
pkgs/development/python-modules/xxhash/default.nixnew file+21
@@ -0,0 +1,21 @@
1+{ stdenv
2+, buildPythonPackage
3+, fetchPypi
4+}:
5+
6+buildPythonPackage rec {
7+ version = "1.3.0";
8+ pname = "xxhash";
9+
10+ src = fetchPypi {
11+ inherit pname version;
12+ sha256 = "1rhrqrlq4n3vgqd1fv1dcc5ga5dzy9qbd40p8rsqqhh5klxg48gy";
13+ };
14+
15+ meta = with stdenv.lib; {
16+ homepage = https://github.com/ifduyue/python-xxhash;
17+ description = "Python Binding for xxHash https://pypi.org/project/xxhash/";
18+ license = licenses.bsd2;
19+ maintainers = [ maintainers.teh ];
20+ };
21+}
pkgs/development/python-modules/zerorpc/default.nixnew file+22
@@ -0,0 +1,22 @@
1+{ lib, buildPythonPackage, fetchPypi, future, gevent, msgpack-python, pyzmq }:
2+
3+buildPythonPackage rec {
4+ pname = "zerorpc";
5+ version = "0.6.1";
6+
7+ src = fetchPypi {
8+ inherit pname version;
9+ sha256 = "14d0nmprs0nm17d8kg2f7qalsi8x7c4damsccqgncylj7mpnk9hh";
10+ };
11+
12+ propagatedBuildInputs = [ future gevent msgpack-python pyzmq ];
13+
14+ doCheck = false; # pypi version doesn't include tests
15+
16+ meta = with lib; {
17+ description = "An easy to use, intuitive, and cross-language RPC";
18+ homepage = "https://www.zerorpc.io";
19+ license = licenses.mit;
20+ maintainers = with maintainers; [ xeji ];
21+ };
22+}
pkgs/development/ruby-modules/gem-config/default.nix+7
@@ -436,6 +436,13 @@ in
436436 buildInputs = [ taglib ];
437437 };
438438
439+ thrift = attrs: {
440+ # See: https://stackoverflow.com/questions/36378190/cant-install-thrift-gem-on-os-x-el-capitan/36523125#36523125
441+ # Note that thrift-0.8.0 is a dependency of fluent-plugin-scribe which is a dependency of fluentd.
442+ buildFlags = lib.optional (stdenv.isDarwin && lib.versionOlder attrs.version "0.9.2.0")
443+ "--with-cppflags=\"-D_FORTIFY_SOURCE=0 -Wno-macro-redefined -Wno-shift-negative-value\"";
444+ };
445+
439446 timfel-krb5-auth = attrs: {
440447 buildInputs = [ kerberos ];
441448 };
pkgs/development/tools/cask/default.nixnew file+48
@@ -0,0 +1,48 @@
1+{ stdenv, fetchurl, python, emacsPackagesNg }:
2+
3+stdenv.mkDerivation rec {
4+ name = "cask-${version}";
5+ version = "0.8.4";
6+
7+ src = fetchurl {
8+ url = "https://github.com/cask/cask/archive/v${version}.tar.gz";
9+ sha256 = "02f8bb20b33b23fb11e7d2a1d282519dfdb8b3090b9672448b8c2c2cacd3e478";
10+ };
11+
12+ doCheck = true;
13+ buildInputs = with emacsPackagesNg; [
14+ s f dash ansi ecukes servant ert-runner el-mock
15+ noflet ert-async shell-split-string git package-build
16+ ];
17+ buildPhase = ''
18+ emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el
19+ '';
20+
21+ installPhase = ''
22+ mkdir -p $out/bin
23+ mkdir -p $out/templates
24+ mkdir -p $out/share/emacs/site-lisp/cask/bin
25+ install -Dm644 *.el *.elc $out/share/emacs/site-lisp/cask
26+ install -Dm755 bin/cask $out/share/emacs/site-lisp/cask/bin
27+ install -Dm644 templates/* $out/templates/
28+ touch $out/.no-upgrade
29+ ln -s $out/share/emacs/site-lisp/cask/bin/cask $out/bin/cask
30+ '';
31+
32+ meta = with stdenv.lib; {
33+ description = "Project management for Emacs";
34+ longDescription = ''
35+ Cask is a project management tool for Emacs that helps automate the
36+ package development cycle; development, dependencies, testing, building,
37+ packaging and more.
38+ Cask can also be used to manage dependencies for your local Emacs configuration.
39+ '';
40+
41+ homepage = https://cask.readthedocs.io/en/latest/index.html;
42+ license = licenses.gpl3Plus;
43+ platforms = platforms.linux;
44+ maintainers = [ maintainers.flexw ];
45+ };
46+
47+ nativeBuildInputs = [ emacsPackagesNg.emacs python ];
48+}
pkgs/development/tools/dep2nix/default.nix+5−5
@@ -2,16 +2,16 @@
22, makeWrapper, nix-prefetch-scripts }:
33
44buildGoPackage rec {
5− name = "dep2nix-${version}";
6− version = "0.0.2";
5+ pname = "dep2nix";
6+ version = "unstable-2019-04-02";
77
88 goPackagePath = "github.com/nixcloud/dep2nix";
99
1010 src = fetchFromGitHub {
1111 owner = "nixcloud";
12− repo = "dep2nix";
13− rev = version;
14− sha256 = "17csgnd6imr1l0gpirsvr5qg7z0mpzxj211p2nwqilrvbp8zj7vg";
12+ repo = pname;
13+ rev = "830684f920333b8ff0946d6b807e8be642eec3ef";
14+ sha256 = "17sjxhzhmz4893x3x054anp4xvqd1px15nv3fj2m7i6r0vbgpm0j";
1515 };
1616
1717 nativeBuildInputs = [
pkgs/development/tools/pyre/default.nix+15−4
@@ -1,14 +1,14 @@
11{ stdenv, fetchFromGitHub, ocamlPackages, writeScript
2−, dune, python3, rsync, buck, watchman }:
2+, dune, python3, rsync, buck, watchman, sqlite }:
33let
44 # Manually set version - the setup script requires
55 # hg and git + keeping the .git directory around.
6− pyre-version = "0.0.20"; # also change typeshed revision below with $pyre-src/.typeshed-version
6+ pyre-version = "0.0.22"; # also change typeshed revision below with $pyre-src/.typeshed-version
77 pyre-src = fetchFromGitHub {
88 owner = "facebook";
99 repo = "pyre-check";
1010 rev = "v${pyre-version}";
11− sha256 = "1alkhdhvmigdhxvvarh0lr5s3b1s6q4arykip2dqb62vs8064s17";
11+ sha256 = "057vy6zmgwsi0ag9n4m6sszhahmfk2s1ywm36nyfs7w4d0wnk92s";
1212 };
1313 versionFile = writeScript "version.ml" ''
1414 cat > "./version.ml" <<EOF
@@ -41,6 +41,8 @@ let
4141 ppxlib
4242 dune
4343 ounit
44+ base64
45+ sqlite.dev
4446 # python36Packages.python36Full # TODO
4547 ];
4648
@@ -115,7 +117,16 @@ in python3.pkgs.buildPythonApplication rec {
115117
116118 buildInputs = [ pyre-bin ];
117119 nativeBuildInputs = [ rsync ]; # only required for build-pypi-package.sh
118− propagatedBuildInputs = with python3.pkgs; [ docutils typeshed ];
120+ propagatedBuildInputs = with python3.pkgs; [
121+ docutils
122+ typeshed
123+ click-log
124+ ipython
125+ sqlalchemy
126+ munch
127+ xxhash
128+ ujson
129+ ];
119130 buildPhase = ''
120131 bash scripts/build-pypi-package.sh --version ${pyre-version} --bundle-typeshed ${typeshed}
121132 cp -r build/dist dist
pkgs/development/tools/rust/cargo-xbuild/default.nixnew file+22
@@ -0,0 +1,22 @@
1+{ stdenv, fetchFromGitHub, rustPlatform }:
2+
3+rustPlatform.buildRustPackage rec {
4+ name = "cargo-xbuild-${version}";
5+ version = "0.5.7";
6+
7+ src = fetchFromGitHub {
8+ owner = "rust-osdev";
9+ repo = "cargo-xbuild";
10+ rev = "v${version}";
11+ sha256 = "11hjyf16m4ri4c912jsdmqq88xcrys119135nz48y5p7b4yp0s7a";
12+ };
13+
14+ cargoSha256 = "077qiqm470iqcgxqjzbmzxikxd5862vyg788hacli4yzpvyaq9r9";
15+
16+ meta = with stdenv.lib; {
17+ description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc";
18+ homepage = https://github.com/rust-osdev/cargo-xbuild;
19+ license = with licenses; [ mit asl20 ];
20+ platforms = platforms.all;
21+ };
22+}
pkgs/development/web/now-cli/default.nix+2−2
@@ -1,12 +1,12 @@
11{ stdenv, lib, fetchurl }:
22stdenv.mkDerivation rec {
33 name = "now-cli-${version}";
4− version = "14.0.3";
4+ version = "15.0.3";
55
66 # TODO: switch to building from source, if possible
77 src = fetchurl {
88 url = "https://github.com/zeit/now-cli/releases/download/${version}/now-linux.gz";
9− sha256 = "0nnwaj3iik8anx7xd5mzbrgq5g5ng8gqmhxyyfgkmawsg34bk6nj";
9+ sha256 = "db9e0ca18513bc407c59945deaa64006acf03dd6007879f0594a38b56153a7c2";
1010 };
1111
1212 sourceRoot = ".";
pkgs/games/atanks/default.nix+1
@@ -18,5 +18,6 @@ stdenv.mkDerivation rec {
1818 homepage = http://atanks.sourceforge.net/;
1919 maintainers = [ maintainers.raskin ];
2020 platforms = platforms.linux;
21+ license = licenses.gpl2;
2122 };
2223}
pkgs/games/flightgear/default.nix+4−4
@@ -6,14 +6,14 @@
66}:
77
88let
9− version = "2018.2.2";
10− shortVersion = "2018.2";
9+ version = "2018.3.1";
10+ shortVersion = "2018.3";
1111 data = stdenv.mkDerivation rec {
1212 name = "flightgear-base-${version}";
1313
1414 src = fetchurl {
1515 url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2";
16− sha256 = "c89b94e4cf3cb7eda728daf6cca6dd051f7a47863776c99fd2f3fe0054400ac4";
16+ sha256 = "1h69ifj84l4k0f497ybk51xj3bprzw4xvwrwzzj708zhkjk78fmh";
1717 };
1818
1919 phases = [ "installPhase" ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131
3232 src = fetchurl {
3333 url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2";
34− sha256 = "61f809ef0a3f6908d156f0c483ed5313d31b5a6ac74761955d0b266751718147";
34+ sha256 = "0h56npn00b6fd38cf5cha82nnglxmhd12b7h2rn3gjymwhviyjix";
3535 };
3636
3737 # Of all the files in the source and data archives, there doesn't seem to be
pkgs/os-specific/bsd/netbsd/default.nix+3−1
@@ -51,7 +51,7 @@ let
5151
5252 AR = "${stdenv'.cc.targetPrefix or ""}ar";
5353 CC = "${stdenv'.cc.targetPrefix or ""}cc";
54− CPP = if (stdenv'.cc.isClang or false) then "clang-cpp" else "cpp";
54+ CPP = "${stdenv'.cc.targetPrefix or ""}cpp";
5555 CXX = "${stdenv'.cc.targetPrefix or ""}c++";
5656 LD = "${stdenv'.cc.targetPrefix or ""}ld";
5757 STRIP = "${stdenv'.cc.targetPrefix or ""}strip";
@@ -65,6 +65,8 @@ let
6565 platforms = platforms.unix;
6666 license = licenses.bsd2;
6767 };
68+ } // lib.optionalAttrs stdenv'.isDarwin {
69+ MKRELRO = "no";
6870 } // lib.optionalAttrs (stdenv'.cc.isClang or false) {
6971 HAVE_LLVM = lib.head (lib.splitString "." (lib.getVersion stdenv'.cc.cc));
7072 } // lib.optionalAttrs (stdenv'.cc.isGNU or false) {
pkgs/os-specific/linux/nvidia-x11/default.nix+4−4
@@ -22,10 +22,10 @@ rec {
2222 beta = stable;
2323
2424 stable_418 = generic {
25− version = "418.43";
26− sha256_64bit = "0zrjd8wfc8cknfwiyy3llsnn1mympfxxszz7gzakncp3vs1jrghq";
27− settingsSha256 = "1rzxxn7nrhwndl2lgjakxi0rblfkqjyl1n70fl7rcs6g75mi1qsq";
28− persistencedSha256 = "14m4x5r0yc23sg4xx523ccfpxsr6dgm2n3xy9zdibl1cpzz50ikc";
25+ version = "418.56";
26+ sha256_64bit = "1cg7927g5ml1rwgpydlrjzr55gza5dfkqkch29bbarpzd7dh0mf4";
27+ settingsSha256 = "1dai4dh6g3arkgicbjwhfr948i1xc13a7s0xcgalan0pn5zd56z6";
28+ persistencedSha256 = "1r13jjpqg9ri5mw633k01dq2ivblc8nrbsnh7709v1xibaydwnhn";
2929 };
3030
3131 # Last one supporting x86
pkgs/os-specific/linux/nvme-cli/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "nvme-cli-${version}";
5− version = "1.8";
5+ version = "1.8.1";
66
77 src = fetchFromGitHub {
88 owner = "linux-nvme";
99 repo = "nvme-cli";
1010 rev = "v${version}";
11− sha256 = "0k4qnxm9sgr4bqhg7c3g870f3jpawm5yp0vp0p031a9qgnzmklb9";
11+ sha256 = "0agnxfcwgnnimmxrdpg4lmiqc5ai9b4amk8krriw01lflxi3xzn0";
1212 };
1313
1414 makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
pkgs/os-specific/linux/v4l-utils/default.nix+2−2
@@ -8,11 +8,11 @@
88
99stdenv.mkDerivation rec {
1010 name = "v4l-utils-${version}";
11− version = "1.16.2";
11+ version = "1.16.5";
1212
1313 src = fetchurl {
1414 url = "https://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2";
15− sha256 = "0iwfdp4ghzd6l9qg5545032vwmqy2rnhk0xf1g9mad67l74hhckc";
15+ sha256 = "06yz34ncrpxshs9w2nqz62xj4wm7hni1fvjnvjhifl1q20jj907d";
1616 };
1717
1818 outputs = [ "out" "dev" ];
pkgs/servers/demoit/default.nixnew file+24
@@ -0,0 +1,24 @@
1+{ stdenv
2+, buildGoPackage
3+, fetchFromGitHub
4+}:
5+
6+buildGoPackage rec {
7+ pname = "demoit";
8+ version = "unstable-2019-03-29";
9+ goPackagePath = "github.com/dgageot/demoit";
10+
11+ src = fetchFromGitHub {
12+ owner = "dgageot";
13+ repo = "demoit";
14+ rev = "ec70fbdf5a5e92fa1c06d8f039f7d388e0237ba2";
15+ sha256 = "01584cxlnrc928sw7ldmi0sm7gixmwnawy3c5hd79rqkw8r0gbk0";
16+ };
17+
18+ meta = with stdenv.lib; {
19+ description = "Live coding demos without Context Switching";
20+ homepage = https://github.com/dgageot/demoit;
21+ license = licenses.asl20;
22+ maintainers = [ maintainers.freezeboy ];
23+ };
24+}
pkgs/servers/monitoring/prometheus/alertmanager.nix+2−5
@@ -2,7 +2,7 @@
22
33buildGoPackage rec {
44 name = "alertmanager-${version}";
5− version = "0.15.3";
5+ version = "0.16.2";
66 rev = "v${version}";
77
88 goPackagePath = "github.com/prometheus/alertmanager";
@@ -11,12 +11,9 @@ buildGoPackage rec {
1111 inherit rev;
1212 owner = "prometheus";
1313 repo = "alertmanager";
14− sha256 = "037wwfadb9rp1592v8bkqcsy9ym4gbhkg3pz6a6fzirg65d29aia";
14+ sha256 = "0zjyr9964qxv5fsb17qhmxa1v4z0c7va60n05p9w6j2ah4dmcd8q";
1515 };
1616
17− # Tests exist, but seem to clash with the firewall.
18− doCheck = false;
19−
2017 buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in ''
2118 -ldflags=
2219 -X ${t}.Version=${version}
pkgs/servers/nosql/influxdb/default.nix+6−7
@@ -1,14 +1,14 @@
11{ lib, buildGoPackage, fetchFromGitHub, }:
22
33buildGoPackage rec {
4− name = "influxdb-${version}";
5− version = "1.6.3";
4+ pname = "influxdb";
5+ version = "1.7.5";
66
77 src = fetchFromGitHub {
88 owner = "influxdata";
9− repo = "influxdb";
9+ repo = pname;
1010 rev = "v${version}";
11− sha256 = "0xf16liapllk8qnw0vsy1ja4if1xlazwwaa4p0r5j7bny5lxm7zy";
11+ sha256 = "0gwivazjvxw6fflf2637qn0crq564fjzhncsl3agph5ciqyv48gx";
1212 };
1313
1414 buildFlagsArray = [ ''-ldflags=
@@ -19,13 +19,12 @@ buildGoPackage rec {
1919
2020 excludedPackages = "test";
2121
22− # Generated with dep2nix (for 1.6.3) / nix2go (for 1.4.1).
23− goDeps = ./. + "/deps-${version}.nix";
22+ goDeps = ./deps.nix;
2423
2524 meta = with lib; {
2625 description = "An open-source distributed time series database";
2726 license = licenses.mit;
28− homepage = https://influxdb.com/;
27+ homepage = https://influxdata.com/;
2928 maintainers = with maintainers; [ offline zimbatm ];
3029 };
3130}
pkgs/servers/nosql/influxdb/deps-1.4.1.nixdeleted−227
@@ -1,227 +0,0 @@
1−[
2− {
3− goPackagePath = "collectd.org";
4− fetch = {
5− type = "git";
6− url = "https://github.com/collectd/go-collectd";
7− rev = "e84e8af5356e7f47485bbc95c96da6dd7984a67e";
8− sha256 = "0cfxg8iz7bdy3d74cqjns7x7lyrma5lkrqqpqk79a2gk0g2bhmnd";
9− };
10− }
11− {
12− goPackagePath = "github.com/bmizerany/pat";
13− fetch = {
14− type = "git";
15− url = "https://github.com/bmizerany/pat";
16− rev = "c068ca2f0aacee5ac3681d68e4d0a003b7d1fd2c";
17− sha256 = "02ayddkp2b22rixw5jldw3kb6762zzkg5zhxwcv9v9yp0x39qw6r";
18− };
19− }
20− {
21− goPackagePath = "github.com/boltdb/bolt";
22− fetch = {
23− type = "git";
24− url = "https://github.com/boltdb/bolt";
25− rev = "4b1ebc1869ad66568b313d0dc410e2be72670dda";
26− sha256 = "1narpch9fc2f4yj8asb981gyq7b3z6p41xb635xh2k75yv5g024w";
27− };
28− }
29− {
30− goPackagePath = "github.com/BurntSushi/toml";
31− fetch = {
32− type = "git";
33− url = "https://github.com/BurntSushi/toml";
34− rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
35− sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
36− };
37− }
38− {
39− goPackagePath = "github.com/cespare/xxhash";
40− fetch = {
41− type = "git";
42− url = "https://github.com/cespare/xxhash";
43− rev = "1b6d2e40c16ba0dfce5c8eac2480ad6e7394819b";
44− sha256 = "1h7dym9fmk7rwrrc26lcwi7wmf4y4rxgg7byivg55yia9wlhy00m";
45− };
46− }
47− {
48− goPackagePath = "github.com/dgrijalva/jwt-go";
49− fetch = {
50− type = "git";
51− url = "https://github.com/dgrijalva/jwt-go";
52− rev = "24c63f56522a87ec5339cc3567883f1039378fdb";
53− sha256 = "1xjb3cj9qa66dk6sfrlggfm4a66qirqrp4qds90xzjj5sx51j4zk";
54− };
55− }
56− {
57− goPackagePath = "github.com/dgryski/go-bits";
58− fetch = {
59− type = "git";
60− url = "https://github.com/dgryski/go-bits";
61− rev = "2ad8d707cc05b1815ce6ff2543bb5e8d8f9298ef";
62− sha256 = "08mxwa4c77dgpvz2ygwd0pc929qxwff95y680mjjgbvj8yifiag2";
63− };
64− }
65− {
66− goPackagePath = "github.com/dgryski/go-bitstream";
67− fetch = {
68− type = "git";
69− url = "https://github.com/dgryski/go-bitstream";
70− rev = "7d46cd22db7004f0cceb6f7975824b560cf0e486";
71− sha256 = "1k9l16y7l2mkfvnp2ydv9cqly8179wqd20am4zy0q77qcsawkksx";
72− };
73− }
74− {
75− goPackagePath = "github.com/gogo/protobuf";
76− fetch = {
77− type = "git";
78− url = "https://github.com/gogo/protobuf";
79− rev = "1c2b16bc280d6635de6c52fc1471ab962dc36ec9";
80− sha256 = "0h9vkfy3ydz0d6x72853yg49r9k54cgjnlv6a7v12gzqw47p941i";
81− };
82− }
83− {
84− goPackagePath = "github.com/golang/snappy";
85− fetch = {
86− type = "git";
87− url = "https://github.com/golang/snappy";
88− rev = "d9eb7a3d35ec988b8585d4a0068e462c27d28380";
89− sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn";
90− };
91− }
92− {
93− goPackagePath = "github.com/influxdata/influxql";
94− fetch = {
95− type = "git";
96− url = "https://github.com/influxdata/influxql";
97− rev = "3921ab7858b6af8443fe0bef06b52608be72852c";
98− sha256 = "182ja5a9njlklavh5hzf7p06913pznp7j3chkrp0qwxj3jxysi2d";
99− };
100− }
101− {
102− goPackagePath = "github.com/influxdata/usage-client";
103− fetch = {
104− type = "git";
105− url = "https://github.com/influxdata/usage-client";
106− rev = "6d3895376368aa52a3a81d2a16e90f0f52371967";
107− sha256 = "0a5adnid42f9vpckgcpkj7v60fh147j7zlg1rhxcpq5vkw698ifl";
108− };
109− }
110− {
111− goPackagePath = "github.com/influxdata/yamux";
112− fetch = {
113− type = "git";
114− url = "https://github.com/influxdata/yamux";
115− rev = "1f58ded512de5feabbe30b60c7d33a7a896c5f16";
116− sha256 = "08y1lgcyyaa8zrg24ck64b5dfassgb2pp1fb9x5lw9q16fb170bx";
117− };
118− }
119− {
120− goPackagePath = "github.com/influxdata/yarpc";
121− fetch = {
122− type = "git";
123− url = "https://github.com/influxdata/yarpc";
124− rev = "036268cdec22b7074cd6d50cc6d7315c667063c7";
125− sha256 = "12xxwr451ya5h7kv7lg6lnwk04xazyxzv2g7bcgx9zifafxlhpxf";
126− };
127− }
128− {
129− goPackagePath = "github.com/jwilder/encoding";
130− fetch = {
131− type = "git";
132− url = "https://github.com/jwilder/encoding";
133− rev = "27894731927e49b0a9023f00312be26733744815";
134− sha256 = "0g4sdc5wj50js2hhrdcb7iik3wpd87gc0ivy4gwn49m8nxlpl7w3";
135− };
136− }
137− {
138− goPackagePath = "github.com/peterh/liner";
139− fetch = {
140− type = "git";
141− url = "https://github.com/peterh/liner";
142− rev = "88609521dc4b6c858fd4c98b628147da928ce4ac";
143− sha256 = "0jacb2fqgiccb98v1875j5xvj01l1z2laga1kgr8lhd0nl22r96k";
144− };
145− }
146− {
147− goPackagePath = "github.com/philhofer/fwd";
148− fetch = {
149− type = "git";
150− url = "https://github.com/philhofer/fwd";
151− rev = "1612a298117663d7bc9a760ae20d383413859798";
152− sha256 = "155l0nvvblpx0fy683q6bzins7csh8fw7yf64hbia8hc7wh0gjdl";
153− };
154− }
155− {
156− goPackagePath = "github.com/retailnext/hllpp";
157− fetch = {
158− type = "git";
159− url = "https://github.com/retailnext/hllpp";
160− rev = "38a7bb71b483e855d35010808143beaf05b67f9d";
161− sha256 = "0zpq5yjqprzdw9ll6g9sqp8nzwkhjh4ngzhx5mxahmpajgnzz7a8";
162− };
163− }
164− {
165− goPackagePath = "github.com/tinylib/msgp";
166− fetch = {
167− type = "git";
168− url = "https://github.com/tinylib/msgp";
169− rev = "ad0ff2e232ad2e37faf67087fb24bf8d04a8ce20";
170− sha256 = "1j3sqsmq8v40dp1qcv2dsy3aq3yl088hpd4fnrrnnl53g3a18p4d";
171− };
172− }
173− {
174− goPackagePath = "github.com/uber-go/atomic";
175− fetch = {
176− type = "git";
177− url = "https://github.com/uber-go/atomic";
178− rev = "74ca5ec650841aee9f289dce76e928313a37cbc6";
179− sha256 = "14a4k5z4p2iig6sf7as5ps1frdyzcr67b9bff0by4z1vg4nrxi7h";
180− };
181− }
182− {
183− goPackagePath = "github.com/uber-go/zap";
184− fetch = {
185− type = "git";
186− url = "https://github.com/uber-go/zap";
187− rev = "fbae0281ffd546fa6d1959fec6075ac5da7fb577";
188− sha256 = "0ys6cb2h3r0vbly36v8zqkqsfc5y7fjsw2qmvx5fvjh35ih4w738";
189− };
190− }
191− {
192− goPackagePath = "github.com/xlab/treeprint";
193− fetch = {
194− type = "git";
195− url = "https://github.com/xlab/treeprint";
196− rev = "06dfc6fa17cdde904617990a0c2d89e3e332dbb3";
197− sha256 = "04v2glr8wsgs8gr5qbcxyqn9s6569lmgqb7rcs6bkmdnr79xpwl5";
198− };
199− }
200− {
201− goPackagePath = "golang.org/x/crypto";
202− fetch = {
203− type = "git";
204− url = "https://go.googlesource.com/crypto";
205− rev = "9477e0b78b9ac3d0b03822fd95422e2fe07627cd";
206− sha256 = "1qcqai6nf1q50z9ga7r4ljnrh1qz49kwlcqpri4bknx732lqq0v5";
207− };
208− }
209− {
210− goPackagePath = "golang.org/x/sys";
211− fetch = {
212− type = "git";
213− url = "https://go.googlesource.com/sys";
214− rev = "1e2299c37cc91a509f1b12369872d27be0ce98a6";
215− sha256 = "1nh8v330pcwgk3h6nvfi12rlydl16v9ajv4s1giyx8wnfq8h6fm1";
216− };
217− }
218− {
219− goPackagePath = "golang.org/x/text";
220− fetch = {
221− type = "git";
222− url = "https://go.googlesource.com/text";
223− rev = "a71fd10341b064c10f4a81ceac72bcf70f26ea34";
224− sha256 = "1igxqrgnnb6983fl0yck0xal2hwnkcgbslr7cxyrg7a65vawd0q1";
225− };
226− }
227−]
pkgs/servers/nosql/influxdb/deps-1.6.3.nixdeleted−444
@@ -1,444 +0,0 @@
1−# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
2−[
3− {
4− goPackagePath = "collectd.org";
5− fetch = {
6− type = "git";
7− url = "https://github.com/collectd/go-collectd";
8− rev = "2ce144541b8903101fb8f1483cc0497a68798122";
9− sha256 = "0rr9rnc777jk27a7yxhdb7vgkj493158a8k6q44x51s30dkp78x3";
10− };
11− }
12− {
13− goPackagePath = "github.com/BurntSushi/toml";
14− fetch = {
15− type = "git";
16− url = "https://github.com/BurntSushi/toml";
17− rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
18− sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
19− };
20− }
21− {
22− goPackagePath = "github.com/RoaringBitmap/roaring";
23− fetch = {
24− type = "git";
25− url = "https://github.com/RoaringBitmap/roaring";
26− rev = "d6540aab65a17321470b1661bfc52da1823871e9";
27− sha256 = "1lsrz7j55blalpp95vgz214b35sjf8nfmrw3fxybdl4xipk2ssdj";
28− };
29− }
30− {
31− goPackagePath = "github.com/beorn7/perks";
32− fetch = {
33− type = "git";
34− url = "https://github.com/beorn7/perks";
35− rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
36− sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
37− };
38− }
39− {
40− goPackagePath = "github.com/bmizerany/pat";
41− fetch = {
42− type = "git";
43− url = "https://github.com/bmizerany/pat";
44− rev = "6226ea591a40176dd3ff9cd8eff81ed6ca721a00";
45− sha256 = "0qjkm7169y6pybwh0s02fjjk251isa2b367xqfzrwvl6cy4yzfxp";
46− };
47− }
48− {
49− goPackagePath = "github.com/boltdb/bolt";
50− fetch = {
51− type = "git";
52− url = "https://github.com/boltdb/bolt";
53− rev = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8";
54− sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r";
55− };
56− }
57− {
58− goPackagePath = "github.com/cespare/xxhash";
59− fetch = {
60− type = "git";
61− url = "https://github.com/cespare/xxhash";
62− rev = "5c37fe3735342a2e0d01c87a907579987c8936cc";
63− sha256 = "02aii7z46sasagw816zz3v0gzax1z5d1hkjslz7ng25386p0gzk1";
64− };
65− }
66− {
67− goPackagePath = "github.com/davecgh/go-spew";
68− fetch = {
69− type = "git";
70− url = "https://github.com/davecgh/go-spew";
71− rev = "346938d642f2ec3594ed81d874461961cd0faa76";
72− sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
73− };
74− }
75− {
76− goPackagePath = "github.com/dgrijalva/jwt-go";
77− fetch = {
78− type = "git";
79− url = "https://github.com/dgrijalva/jwt-go";
80− rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e";
81− sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
82− };
83− }
84− {
85− goPackagePath = "github.com/dgryski/go-bitstream";
86− fetch = {
87− type = "git";
88− url = "https://github.com/dgryski/go-bitstream";
89− rev = "9f22ccc24718d9643ac427c8c897ae1a01575783";
90− sha256 = "0x3hbsrn7qafhhjz6lgyc1pd1p5kgkrkbccvsr6yygkl785h5lhn";
91− };
92− }
93− {
94− goPackagePath = "github.com/glycerine/go-unsnap-stream";
95− fetch = {
96− type = "git";
97− url = "https://github.com/glycerine/go-unsnap-stream";
98− rev = "62a9a9eb44fd8932157b1a8ace2149eff5971af6";
99− sha256 = "1ray7p4q3vv5zn9w5xs7m9kjh68b2ck98nh25mxhfiwl9jxkabrc";
100− };
101− }
102− {
103− goPackagePath = "github.com/gogo/protobuf";
104− fetch = {
105− type = "git";
106− url = "https://github.com/gogo/protobuf";
107− rev = "1adfc126b41513cc696b209667c8656ea7aac67c";
108− sha256 = "1j7azzlnihcvnd1apw5zr0bz30h7n0gyimqqkgc76vzb1n5dpi7m";
109− };
110− }
111− {
112− goPackagePath = "github.com/golang/protobuf";
113− fetch = {
114− type = "git";
115− url = "https://github.com/golang/protobuf";
116− rev = "925541529c1fa6821df4e44ce2723319eb2be768";
117− sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa";
118− };
119− }
120− {
121− goPackagePath = "github.com/golang/snappy";
122− fetch = {
123− type = "git";
124− url = "https://github.com/golang/snappy";
125− rev = "d9eb7a3d35ec988b8585d4a0068e462c27d28380";
126− sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn";
127− };
128− }
129− {
130− goPackagePath = "github.com/google/go-cmp";
131− fetch = {
132− type = "git";
133− url = "https://github.com/google/go-cmp";
134− rev = "3af367b6b30c263d47e8895973edcca9a49cf029";
135− sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
136− };
137− }
138− {
139− goPackagePath = "github.com/influxdata/influxql";
140− fetch = {
141− type = "git";
142− url = "https://github.com/influxdata/influxql";
143− rev = "a7267bff5327e316e54c54342b0bc9598753e3d5";
144− sha256 = "0mqc9xki5l9yfbb0dqjb417cmv3pca1bj71m90dkshladr2wlcg3";
145− };
146− }
147− {
148− goPackagePath = "github.com/influxdata/usage-client";
149− fetch = {
150− type = "git";
151− url = "https://github.com/influxdata/usage-client";
152− rev = "6d3895376368aa52a3a81d2a16e90f0f52371967";
153− sha256 = "0a5adnid42f9vpckgcpkj7v60fh147j7zlg1rhxcpq5vkw698ifl";
154− };
155− }
156− {
157− goPackagePath = "github.com/influxdata/yamux";
158− fetch = {
159− type = "git";
160− url = "https://github.com/influxdata/yamux";
161− rev = "1f58ded512de5feabbe30b60c7d33a7a896c5f16";
162− sha256 = "08y1lgcyyaa8zrg24ck64b5dfassgb2pp1fb9x5lw9q16fb170bx";
163− };
164− }
165− {
166− goPackagePath = "github.com/influxdata/yarpc";
167− fetch = {
168− type = "git";
169− url = "https://github.com/influxdata/yarpc";
170− rev = "f0da2db138cad2fb425541938fc28dd5a5bc6918";
171− sha256 = "1g71flc8s8xas7vmaiwv0425paii1akc7jsdqsgxkhyfxx2gvib0";
172− };
173− }
174− {
175− goPackagePath = "github.com/jsternberg/zap-logfmt";
176− fetch = {
177− type = "git";
178− url = "https://github.com/jsternberg/zap-logfmt";
179− rev = "ac4bd917e18a4548ce6e0e765b29a4e7f397b0b6";
180− sha256 = "0pqp2nsqvsq8kqc7l14340lrvl03715s12bag63kdbi25s8fcdkx";
181− };
182− }
183− {
184− goPackagePath = "github.com/jwilder/encoding";
185− fetch = {
186− type = "git";
187− url = "https://github.com/jwilder/encoding";
188− rev = "b4e1701a28efcc637d9afcca7d38e495fe909a09";
189− sha256 = "195js5njz86k096p3ggglgpc7rw3801mpqzdfwfr3miflhnp7nwg";
190− };
191− }
192− {
193− goPackagePath = "github.com/klauspost/compress";
194− fetch = {
195− type = "git";
196− url = "https://github.com/klauspost/compress";
197− rev = "6c8db69c4b49dd4df1fff66996cf556176d0b9bf";
198− sha256 = "00h2lpqcyc3pg2xk3q4a9cgyv0vkn15bx0hb725j5zbkr9vah23x";
199− };
200− }
201− {
202− goPackagePath = "github.com/klauspost/cpuid";
203− fetch = {
204− type = "git";
205− url = "https://github.com/klauspost/cpuid";
206− rev = "ae7887de9fa5d2db4eaa8174a7eff2c1ac00f2da";
207− sha256 = "178apw89g8nsd7w6mbdylxn956h3iig6rbw3bkivp6lplhb5dvq4";
208− };
209− }
210− {
211− goPackagePath = "github.com/klauspost/crc32";
212− fetch = {
213− type = "git";
214− url = "https://github.com/klauspost/crc32";
215− rev = "cb6bfca970f6908083f26f39a79009d608efd5cd";
216− sha256 = "0q4yr4isgmph1yf1vq527lpmid7vqv56q7vxh3gkp5679fb90q6n";
217− };
218− }
219− {
220− goPackagePath = "github.com/klauspost/pgzip";
221− fetch = {
222− type = "git";
223− url = "https://github.com/klauspost/pgzip";
224− rev = "0bf5dcad4ada2814c3c00f996a982270bb81a506";
225− sha256 = "0dgp2iljvhibzxia1g3lsfg4bjmfh4kf0bfrmfi7sd49hwhrvk7s";
226− };
227− }
228− {
229− goPackagePath = "github.com/mattn/go-isatty";
230− fetch = {
231− type = "git";
232− url = "https://github.com/mattn/go-isatty";
233− rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c";
234− sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
235− };
236− }
237− {
238− goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
239− fetch = {
240− type = "git";
241− url = "https://github.com/matttproud/golang_protobuf_extensions";
242− rev = "3247c84500bff8d9fb6d579d800f20b3e091582c";
243− sha256 = "12hcych25wf725zxdkpnyx4wa0gyxl8v4m8xmhdmmaki9bbmqd0d";
244− };
245− }
246− {
247− goPackagePath = "github.com/mschoch/smat";
248− fetch = {
249− type = "git";
250− url = "https://github.com/mschoch/smat";
251− rev = "90eadee771aeab36e8bf796039b8c261bebebe4f";
252− sha256 = "141saq6d4z3c7v3jw45zy4gn6wwjlyralqygjff1fzvz1gkvimk3";
253− };
254− }
255− {
256− goPackagePath = "github.com/opentracing/opentracing-go";
257− fetch = {
258− type = "git";
259− url = "https://github.com/opentracing/opentracing-go";
260− rev = "328fceb7548c744337cd010914152b74eaf4c4ab";
261− sha256 = "1w6s42n9glqwif6awyiapr7sh1wjvkxan41qhc1yi555byyw200k";
262− };
263− }
264− {
265− goPackagePath = "github.com/paulbellamy/ratecounter";
266− fetch = {
267− type = "git";
268− url = "https://github.com/paulbellamy/ratecounter";
269− rev = "524851a93235ac051e3540563ed7909357fe24ab";
270− sha256 = "0z4c61ac6v8mpnr9z37d91h1cf8v9psja5jfdxmsf69r1b7qr4f9";
271− };
272− }
273− {
274− goPackagePath = "github.com/peterh/liner";
275− fetch = {
276− type = "git";
277− url = "https://github.com/peterh/liner";
278− rev = "6106ee4fe3e8435f18cd10e34557e5e50f0e792a";
279− sha256 = "178s1amw5r60lywgmh24pd2ljim0b05fdfsm4c8px22fkycmn1qr";
280− };
281− }
282− {
283− goPackagePath = "github.com/philhofer/fwd";
284− fetch = {
285− type = "git";
286− url = "https://github.com/philhofer/fwd";
287− rev = "bb6d471dc95d4fe11e432687f8b70ff496cf3136";
288− sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2";
289− };
290− }
291− {
292− goPackagePath = "github.com/prometheus/client_golang";
293− fetch = {
294− type = "git";
295− url = "https://github.com/prometheus/client_golang";
296− rev = "661e31bf844dfca9aeba15f27ea8aa0d485ad212";
297− sha256 = "0r9sr3m57ks7rc5bbghl0gy9wxlznzmz331xdp42zlgk6g774xcn";
298− };
299− }
300− {
301− goPackagePath = "github.com/prometheus/client_model";
302− fetch = {
303− type = "git";
304− url = "https://github.com/prometheus/client_model";
305− rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c";
306− sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998";
307− };
308− }
309− {
310− goPackagePath = "github.com/prometheus/common";
311− fetch = {
312− type = "git";
313− url = "https://github.com/prometheus/common";
314− rev = "e4aa40a9169a88835b849a6efb71e05dc04b88f0";
315− sha256 = "0m1n616d694jca0qjwjn5ci7scfgm2jpi94dhi356arm9lhda4jc";
316− };
317− }
318− {
319− goPackagePath = "github.com/prometheus/procfs";
320− fetch = {
321− type = "git";
322− url = "https://github.com/prometheus/procfs";
323− rev = "54d17b57dd7d4a3aa092476596b3f8a933bde349";
324− sha256 = "1b5218hi6k9i637k6xc7ynpll577zbnrhjm9jr2iczy3j0rr4rvr";
325− };
326− }
327− {
328− goPackagePath = "github.com/retailnext/hllpp";
329− fetch = {
330− type = "git";
331− url = "https://github.com/retailnext/hllpp";
332− rev = "101a6d2f8b52abfc409ac188958e7e7be0116331";
333− sha256 = "1dyyjyrscd3d22jhh2pbn67c6nzva0v069215sjjmj313k1xzmj3";
334− };
335− }
336− {
337− goPackagePath = "github.com/tinylib/msgp";
338− fetch = {
339− type = "git";
340− url = "https://github.com/tinylib/msgp";
341− rev = "b2b6a672cf1e5b90748f79b8b81fc8c5cf0571a1";
342− sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc";
343− };
344− }
345− {
346− goPackagePath = "github.com/willf/bitset";
347− fetch = {
348− type = "git";
349− url = "https://github.com/willf/bitset";
350− rev = "d860f346b89450988a379d7d705e83c58d1ea227";
351− sha256 = "18419ip5mnblnyx2rjixad90dhjb1x2kaiidr7zk9b3qci799rh0";
352− };
353− }
354− {
355− goPackagePath = "github.com/xlab/treeprint";
356− fetch = {
357− type = "git";
358− url = "https://github.com/xlab/treeprint";
359− rev = "f3a15cfd24bf976c724324cb6846a8b54b88b639";
360− sha256 = "0fgbdyk2mfj5vh8902sga33w5gw7q0f1if4nqx631ca33fd6pfbn";
361− };
362− }
363− {
364− goPackagePath = "go.uber.org/atomic";
365− fetch = {
366− type = "git";
367− url = "https://github.com/uber-go/atomic";
368− rev = "8474b86a5a6f79c443ce4b2992817ff32cf208b8";
369− sha256 = "166shnjw8rvjvksymi2gqw1ygsbxlq15xb10j2dx5rwy4y4asq8x";
370− };
371− }
372− {
373− goPackagePath = "go.uber.org/multierr";
374− fetch = {
375− type = "git";
376− url = "https://github.com/uber-go/multierr";
377− rev = "3c4937480c32f4c13a875a1829af76c98ca3d40a";
378− sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w";
379− };
380− }
381− {
382− goPackagePath = "go.uber.org/zap";
383− fetch = {
384− type = "git";
385− url = "https://github.com/uber-go/zap";
386− rev = "35aad584952c3e7020db7b839f6b102de6271f89";
387− sha256 = "0n79ir7jcr7s51j85swji7an0jgy1w5dxg1g68j722rmpbvsagwv";
388− };
389− }
390− {
391− goPackagePath = "golang.org/x/crypto";
392− fetch = {
393− type = "git";
394− url = "https://go.googlesource.com/crypto";
395− rev = "c3a3ad6d03f7a915c0f7e194b7152974bb73d287";
396− sha256 = "0x18275g5xlaw55bpx8hdna66d2hpbcw6hs0pxf1kmvfds6gzn6n";
397− };
398− }
399− {
400− goPackagePath = "golang.org/x/net";
401− fetch = {
402− type = "git";
403− url = "https://go.googlesource.com/net";
404− rev = "92b859f39abd2d91a854c9f9c4621b2f5054a92d";
405− sha256 = "1nzbay48k53pxa1sh102v571k6pa57540p0bzcil4qgan47yxba6";
406− };
407− }
408− {
409− goPackagePath = "golang.org/x/sync";
410− fetch = {
411− type = "git";
412− url = "https://go.googlesource.com/sync";
413− rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
414− sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
415− };
416− }
417− {
418− goPackagePath = "golang.org/x/sys";
419− fetch = {
420− type = "git";
421− url = "https://go.googlesource.com/sys";
422− rev = "d8e400bc7db4870d786864138af681469693d18c";
423− sha256 = "08d23f9gjarp63dw0wj54nlqh3x2lqnchzkw8n5d7ik3wy7qy4yf";
424− };
425− }
426− {
427− goPackagePath = "golang.org/x/text";
428− fetch = {
429− type = "git";
430− url = "https://go.googlesource.com/text";
431− rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
432− sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
433− };
434− }
435− {
436− goPackagePath = "golang.org/x/time";
437− fetch = {
438− type = "git";
439− url = "https://go.googlesource.com/time";
440− rev = "26559e0f760e39c24d730d3224364aef164ee23f";
441− sha256 = "00fx6m59cjbi7y0ri4a57q1zs6r310xbg5yqns5kfm2cax0dkmnf";
442− };
443− }
444−]
pkgs/servers/nosql/influxdb/deps.nixnew file+840
@@ -0,0 +1,840 @@
1+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
2+[
3+ {
4+ goPackagePath = "collectd.org";
5+ fetch = {
6+ type = "git";
7+ url = "https://github.com/collectd/go-collectd";
8+ rev = "2ce144541b8903101fb8f1483cc0497a68798122";
9+ sha256 = "0rr9rnc777jk27a7yxhdb7vgkj493158a8k6q44x51s30dkp78x3";
10+ };
11+ }
12+ {
13+ goPackagePath = "github.com/BurntSushi/toml";
14+ fetch = {
15+ type = "git";
16+ url = "https://github.com/BurntSushi/toml";
17+ rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
18+ sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
19+ };
20+ }
21+ {
22+ goPackagePath = "github.com/Masterminds/semver";
23+ fetch = {
24+ type = "git";
25+ url = "https://github.com/Masterminds/semver";
26+ rev = "c7af12943936e8c39859482e61f0574c2fd7fc75";
27+ sha256 = "0k2fpk2x8jbvqkqxx5hkx1ygrsppzmzypqb90i1r33yq7ac7zlxj";
28+ };
29+ }
30+ {
31+ goPackagePath = "github.com/RoaringBitmap/roaring";
32+ fetch = {
33+ type = "git";
34+ url = "https://github.com/RoaringBitmap/roaring";
35+ rev = "3d677d3262197ee558b85029301eb69b8239f91a";
36+ sha256 = "0v5jbqr7m4x7n8rxcyizhs21ndyinn8kil9hd6y2bifx9b9g6gv9";
37+ };
38+ }
39+ {
40+ goPackagePath = "github.com/alecthomas/kingpin";
41+ fetch = {
42+ type = "git";
43+ url = "https://github.com/alecthomas/kingpin";
44+ rev = "947dcec5ba9c011838740e680966fd7087a71d0d";
45+ sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
46+ };
47+ }
48+ {
49+ goPackagePath = "github.com/alecthomas/template";
50+ fetch = {
51+ type = "git";
52+ url = "https://github.com/alecthomas/template";
53+ rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
54+ sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
55+ };
56+ }
57+ {
58+ goPackagePath = "github.com/alecthomas/units";
59+ fetch = {
60+ type = "git";
61+ url = "https://github.com/alecthomas/units";
62+ rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
63+ sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
64+ };
65+ }
66+ {
67+ goPackagePath = "github.com/apache/arrow";
68+ fetch = {
69+ type = "git";
70+ url = "https://github.com/apache/arrow";
71+ rev = "f5df77359953ed06e1dce47edffc03340e2ff3ea";
72+ sha256 = "12lygmhrchpf46jzyf0gnbfq3bf9ha68iajbnzflqf6k78jf6dj7";
73+ };
74+ }
75+ {
76+ goPackagePath = "github.com/apex/log";
77+ fetch = {
78+ type = "git";
79+ url = "https://github.com/apex/log";
80+ rev = "941dea75d3ebfbdd905a5d8b7b232965c5e5c684";
81+ sha256 = "0cavvljwrxhxpsf6wdfncswamsqvpkah2pmnm6g94iq6l16lkbix";
82+ };
83+ }
84+ {
85+ goPackagePath = "github.com/aws/aws-sdk-go";
86+ fetch = {
87+ type = "git";
88+ url = "https://github.com/aws/aws-sdk-go";
89+ rev = "dd947f47decb37a7c3bee72501bfc790701ab5ad";
90+ sha256 = "1l4lxxlw0x2lkkr2m78p67ncr7dbv9a5ij8ahwa8hqm2sv0zsc5d";
91+ };
92+ }
93+ {
94+ goPackagePath = "github.com/beorn7/perks";
95+ fetch = {
96+ type = "git";
97+ url = "https://github.com/beorn7/perks";
98+ rev = "3a771d992973f24aa725d07868b467d1ddfceafb";
99+ sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
100+ };
101+ }
102+ {
103+ goPackagePath = "github.com/blakesmith/ar";
104+ fetch = {
105+ type = "git";
106+ url = "https://github.com/blakesmith/ar";
107+ rev = "8bd4349a67f2533b078dbc524689d15dba0f4659";
108+ sha256 = "1rdbn3v9vv3cs6indgrf9agydcbaspyc21fi0mpxlksva1sci99j";
109+ };
110+ }
111+ {
112+ goPackagePath = "github.com/bmizerany/pat";
113+ fetch = {
114+ type = "git";
115+ url = "https://github.com/bmizerany/pat";
116+ rev = "6226ea591a40176dd3ff9cd8eff81ed6ca721a00";
117+ sha256 = "0qjkm7169y6pybwh0s02fjjk251isa2b367xqfzrwvl6cy4yzfxp";
118+ };
119+ }
120+ {
121+ goPackagePath = "github.com/boltdb/bolt";
122+ fetch = {
123+ type = "git";
124+ url = "https://github.com/boltdb/bolt";
125+ rev = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8";
126+ sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r";
127+ };
128+ }
129+ {
130+ goPackagePath = "github.com/c-bata/go-prompt";
131+ fetch = {
132+ type = "git";
133+ url = "https://github.com/c-bata/go-prompt";
134+ rev = "e99fbc797b795e0a7a94affc8d44f6a0350d85f0";
135+ sha256 = "00i8wfi51hzla59qgkdlijnvad4h1p1si9jaaw3jzchm7g7ryrlj";
136+ };
137+ }
138+ {
139+ goPackagePath = "github.com/caarlos0/ctrlc";
140+ fetch = {
141+ type = "git";
142+ url = "https://github.com/caarlos0/ctrlc";
143+ rev = "70dc48d5d792f20f684a8f1d29bbac298f4b2ef4";
144+ sha256 = "1xqlagjzwvfls17vn5zlmw58g4ha60hvpjpj7nbd9mn87yd2h22j";
145+ };
146+ }
147+ {
148+ goPackagePath = "github.com/campoy/unique";
149+ fetch = {
150+ type = "git";
151+ url = "https://github.com/campoy/unique";
152+ rev = "88950e537e7e644cd746a3102037b5d2b723e9f5";
153+ sha256 = "1cf0mfdxx68ak8i3x5z50nhr29ivpssg2sg73krdpxs2qjzwji90";
154+ };
155+ }
156+ {
157+ goPackagePath = "github.com/cespare/xxhash";
158+ fetch = {
159+ type = "git";
160+ url = "https://github.com/cespare/xxhash";
161+ rev = "5c37fe3735342a2e0d01c87a907579987c8936cc";
162+ sha256 = "02aii7z46sasagw816zz3v0gzax1z5d1hkjslz7ng25386p0gzk1";
163+ };
164+ }
165+ {
166+ goPackagePath = "github.com/davecgh/go-spew";
167+ fetch = {
168+ type = "git";
169+ url = "https://github.com/davecgh/go-spew";
170+ rev = "346938d642f2ec3594ed81d874461961cd0faa76";
171+ sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
172+ };
173+ }
174+ {
175+ goPackagePath = "github.com/dgrijalva/jwt-go";
176+ fetch = {
177+ type = "git";
178+ url = "https://github.com/dgrijalva/jwt-go";
179+ rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e";
180+ sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
181+ };
182+ }
183+ {
184+ goPackagePath = "github.com/dgryski/go-bitstream";
185+ fetch = {
186+ type = "git";
187+ url = "https://github.com/dgryski/go-bitstream";
188+ rev = "3522498ce2c8ea06df73e55df58edfbfb33cfdd6";
189+ sha256 = "1lr0qjdddxdiwfs530saglk4q5395i4n3w8h8k5j8nsjj8k3na7f";
190+ };
191+ }
192+ {
193+ goPackagePath = "github.com/fatih/color";
194+ fetch = {
195+ type = "git";
196+ url = "https://github.com/fatih/color";
197+ rev = "570b54cabe6b8eb0bc2dfce68d964677d63b5260";
198+ sha256 = "1hw9hgkfzbzqjhy29pqpk20xggxaqjv45wx8yn69488mw5ph7khh";
199+ };
200+ }
201+ {
202+ goPackagePath = "github.com/glycerine/go-unsnap-stream";
203+ fetch = {
204+ type = "git";
205+ url = "https://github.com/glycerine/go-unsnap-stream";
206+ rev = "9f0cb55181dd3a0a4c168d3dbc72d4aca4853126";
207+ sha256 = "1v10z30y9qc8dl34x0s8lr773g6raxilfdxbmzd1176pspzcmm9n";
208+ };
209+ }
210+ {
211+ goPackagePath = "github.com/go-ini/ini";
212+ fetch = {
213+ type = "git";
214+ url = "https://github.com/go-ini/ini";
215+ rev = "7b294651033cd7d9e7f0d9ffa1b75ed1e198e737";
216+ sha256 = "0y6qzla90zd6dhs04vclrg46rwlsy9zlqi0y6y2k1pdxn2cbblhb";
217+ };
218+ }
219+ {
220+ goPackagePath = "github.com/go-sql-driver/mysql";
221+ fetch = {
222+ type = "git";
223+ url = "https://github.com/go-sql-driver/mysql";
224+ rev = "d523deb1b23d913de5bdada721a6071e71283618";
225+ sha256 = "1jwz2j3vd5hlzmnkh20d4276yd8cxy7pac3x3dfi52jkm82ms99n";
226+ };
227+ }
228+ {
229+ goPackagePath = "github.com/gogo/protobuf";
230+ fetch = {
231+ type = "git";
232+ url = "https://github.com/gogo/protobuf";
233+ rev = "636bf0302bc95575d69441b25a2603156ffdddf1";
234+ sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2";
235+ };
236+ }
237+ {
238+ goPackagePath = "github.com/golang/protobuf";
239+ fetch = {
240+ type = "git";
241+ url = "https://github.com/golang/protobuf";
242+ rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265";
243+ sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
244+ };
245+ }
246+ {
247+ goPackagePath = "github.com/golang/snappy";
248+ fetch = {
249+ type = "git";
250+ url = "https://github.com/golang/snappy";
251+ rev = "d9eb7a3d35ec988b8585d4a0068e462c27d28380";
252+ sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn";
253+ };
254+ }
255+ {
256+ goPackagePath = "github.com/google/go-cmp";
257+ fetch = {
258+ type = "git";
259+ url = "https://github.com/google/go-cmp";
260+ rev = "3af367b6b30c263d47e8895973edcca9a49cf029";
261+ sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
262+ };
263+ }
264+ {
265+ goPackagePath = "github.com/google/go-github";
266+ fetch = {
267+ type = "git";
268+ url = "https://github.com/google/go-github";
269+ rev = "dd29b543e14c33e6373773f2c5ea008b29aeac95";
270+ sha256 = "0sk67d9zdn420h2g4l3wib28zqr3ihbg6dj382cwmns7yska58lp";
271+ };
272+ }
273+ {
274+ goPackagePath = "github.com/google/go-querystring";
275+ fetch = {
276+ type = "git";
277+ url = "https://github.com/google/go-querystring";
278+ rev = "44c6ddd0a2342c386950e880b658017258da92fc";
279+ sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz";
280+ };
281+ }
282+ {
283+ goPackagePath = "github.com/goreleaser/goreleaser";
284+ fetch = {
285+ type = "git";
286+ url = "https://github.com/goreleaser/goreleaser";
287+ rev = "f99940ff5397b099bf606cf1323c00c63afcd153";
288+ sha256 = "1mh4j0vdyxhr7fmwva59p0wrsrk318c2fbgzf1vqbgs8iwibs739";
289+ };
290+ }
291+ {
292+ goPackagePath = "github.com/goreleaser/nfpm";
293+ fetch = {
294+ type = "git";
295+ url = "https://github.com/goreleaser/nfpm";
296+ rev = "de75d679901371e3ed0c0a606e160539d5a4b45e";
297+ sha256 = "1dbw458xndgj9k5dvffrqkz7cq6rcmflvsvzd8adsg24a3mk3qgy";
298+ };
299+ }
300+ {
301+ goPackagePath = "github.com/imdario/mergo";
302+ fetch = {
303+ type = "git";
304+ url = "https://github.com/imdario/mergo";
305+ rev = "9f23e2d6bd2a77f959b2bf6acdbefd708a83a4a4";
306+ sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7";
307+ };
308+ }
309+ {
310+ goPackagePath = "github.com/influxdata/flux";
311+ fetch = {
312+ type = "git";
313+ url = "https://github.com/influxdata/flux";
314+ rev = "8c9d0ad49204d3bbb171e96d872cf663ee7f1b4d";
315+ sha256 = "0yamrzqjs6giwqq0ljf2dscarqw6851cw3iya8cya0x5plyd810c";
316+ };
317+ }
318+ {
319+ goPackagePath = "github.com/influxdata/influxql";
320+ fetch = {
321+ type = "git";
322+ url = "https://github.com/influxdata/influxql";
323+ rev = "c661ab7db8ad858626cc7a2114e786f4e7463564";
324+ sha256 = "1j73aj312laqmi20fbinx0aal82ncpqbj5dgs41br0j7fkvi6873";
325+ };
326+ }
327+ {
328+ goPackagePath = "github.com/influxdata/line-protocol";
329+ fetch = {
330+ type = "git";
331+ url = "https://github.com/influxdata/line-protocol";
332+ rev = "32c6aa80de5eb09d190ad284a8214a531c6bce57";
333+ sha256 = "0wvd6lplbvmz2lznvy4zz3fmxiqc43cgr4vppp1xi38j1iwq0349";
334+ };
335+ }
336+ {
337+ goPackagePath = "github.com/influxdata/platform";
338+ fetch = {
339+ type = "git";
340+ url = "https://github.com/influxdata/platform";
341+ rev = "0f79e4ea3248354c789cba274542e0a8e55971db";
342+ sha256 = "16d9g7vgy30zahhj066kz7akahvpknq3ljk2fzvczjsm59ih8rjk";
343+ };
344+ }
345+ {
346+ goPackagePath = "github.com/influxdata/roaring";
347+ fetch = {
348+ type = "git";
349+ url = "https://github.com/influxdata/roaring";
350+ rev = "fc520f41fab6dcece280e8d4853d87a09a67f9e0";
351+ sha256 = "0jr9r5q4s5bz4kbqndrlm5aikls4kqbl955qbsh6bpbmxdsamcsr";
352+ };
353+ }
354+ {
355+ goPackagePath = "github.com/influxdata/tdigest";
356+ fetch = {
357+ type = "git";
358+ url = "https://github.com/influxdata/tdigest";
359+ rev = "a7d76c6f093a59b94a01c6c2b8429122d444a8cc";
360+ sha256 = "02jxrb2d1n6zflwa7jhgid5344l6zj4gxg4kis20v7xa6iqrj1ni";
361+ };
362+ }
363+ {
364+ goPackagePath = "github.com/influxdata/usage-client";
365+ fetch = {
366+ type = "git";
367+ url = "https://github.com/influxdata/usage-client";
368+ rev = "6d3895376368aa52a3a81d2a16e90f0f52371967";
369+ sha256 = "0a5adnid42f9vpckgcpkj7v60fh147j7zlg1rhxcpq5vkw698ifl";
370+ };
371+ }
372+ {
373+ goPackagePath = "github.com/jmespath/go-jmespath";
374+ fetch = {
375+ type = "git";
376+ url = "https://github.com/jmespath/go-jmespath";
377+ rev = "0b12d6b5";
378+ sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld";
379+ };
380+ }
381+ {
382+ goPackagePath = "github.com/jsternberg/zap-logfmt";
383+ fetch = {
384+ type = "git";
385+ url = "https://github.com/jsternberg/zap-logfmt";
386+ rev = "ac4bd917e18a4548ce6e0e765b29a4e7f397b0b6";
387+ sha256 = "0pqp2nsqvsq8kqc7l14340lrvl03715s12bag63kdbi25s8fcdkx";
388+ };
389+ }
390+ {
391+ goPackagePath = "github.com/jwilder/encoding";
392+ fetch = {
393+ type = "git";
394+ url = "https://github.com/jwilder/encoding";
395+ rev = "b4e1701a28efcc637d9afcca7d38e495fe909a09";
396+ sha256 = "195js5njz86k096p3ggglgpc7rw3801mpqzdfwfr3miflhnp7nwg";
397+ };
398+ }
399+ {
400+ goPackagePath = "github.com/kevinburke/go-bindata";
401+ fetch = {
402+ type = "git";
403+ url = "https://github.com/kevinburke/go-bindata";
404+ rev = "06af60a4461b70d84a2b173d92f9f425d78baf55";
405+ sha256 = "0k9bpx6vqsr53bzj7k78rjalybpwbs86zdks6v7jqkwsrx4j7a07";
406+ };
407+ }
408+ {
409+ goPackagePath = "github.com/kisielk/gotool";
410+ fetch = {
411+ type = "git";
412+ url = "https://github.com/kisielk/gotool";
413+ rev = "80517062f582ea3340cd4baf70e86d539ae7d84d";
414+ sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
415+ };
416+ }
417+ {
418+ goPackagePath = "github.com/klauspost/compress";
419+ fetch = {
420+ type = "git";
421+ url = "https://github.com/klauspost/compress";
422+ rev = "b939724e787a27c0005cabe3f78e7ed7987ac74f";
423+ sha256 = "1y7951q0ji894d111lqqbacq64cxyi2dxsni5sqi9488zsasgw8s";
424+ };
425+ }
426+ {
427+ goPackagePath = "github.com/klauspost/cpuid";
428+ fetch = {
429+ type = "git";
430+ url = "https://github.com/klauspost/cpuid";
431+ rev = "ae7887de9fa5d2db4eaa8174a7eff2c1ac00f2da";
432+ sha256 = "178apw89g8nsd7w6mbdylxn956h3iig6rbw3bkivp6lplhb5dvq4";
433+ };
434+ }
435+ {
436+ goPackagePath = "github.com/klauspost/crc32";
437+ fetch = {
438+ type = "git";
439+ url = "https://github.com/klauspost/crc32";
440+ rev = "cb6bfca970f6908083f26f39a79009d608efd5cd";
441+ sha256 = "0q4yr4isgmph1yf1vq527lpmid7vqv56q7vxh3gkp5679fb90q6n";
442+ };
443+ }
444+ {
445+ goPackagePath = "github.com/klauspost/pgzip";
446+ fetch = {
447+ type = "git";
448+ url = "https://github.com/klauspost/pgzip";
449+ rev = "0bf5dcad4ada2814c3c00f996a982270bb81a506";
450+ sha256 = "0dgp2iljvhibzxia1g3lsfg4bjmfh4kf0bfrmfi7sd49hwhrvk7s";
451+ };
452+ }
453+ {
454+ goPackagePath = "github.com/lib/pq";
455+ fetch = {
456+ type = "git";
457+ url = "https://github.com/lib/pq";
458+ rev = "4ded0e9383f75c197b3a2aaa6d590ac52df6fd79";
459+ sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i";
460+ };
461+ }
462+ {
463+ goPackagePath = "github.com/mattn/go-colorable";
464+ fetch = {
465+ type = "git";
466+ url = "https://github.com/mattn/go-colorable";
467+ rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
468+ sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
469+ };
470+ }
471+ {
472+ goPackagePath = "github.com/mattn/go-isatty";
473+ fetch = {
474+ type = "git";
475+ url = "https://github.com/mattn/go-isatty";
476+ rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c";
477+ sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
478+ };
479+ }
480+ {
481+ goPackagePath = "github.com/mattn/go-runewidth";
482+ fetch = {
483+ type = "git";
484+ url = "https://github.com/mattn/go-runewidth";
485+ rev = "9e777a8366cce605130a531d2cd6363d07ad7317";
486+ sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb";
487+ };
488+ }
489+ {
490+ goPackagePath = "github.com/mattn/go-tty";
491+ fetch = {
492+ type = "git";
493+ url = "https://github.com/mattn/go-tty";
494+ rev = "13ff1204f104d52c3f7645ec027ecbcf9026429e";
495+ sha256 = "1c9vzrq7r5skq0cz9alkix9n1cp6h7wybdwrg0f1vzvxj26qr7yq";
496+ };
497+ }
498+ {
499+ goPackagePath = "github.com/mattn/go-zglob";
500+ fetch = {
501+ type = "git";
502+ url = "https://github.com/mattn/go-zglob";
503+ rev = "2ea3427bfa539cca900ca2768d8663ecc8a708c1";
504+ sha256 = "1sncdyq5fbd42al4amyy91h7vlzm3wm6c9vl8za2pjgfgsd581fz";
505+ };
506+ }
507+ {
508+ goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
509+ fetch = {
510+ type = "git";
511+ url = "https://github.com/matttproud/golang_protobuf_extensions";
512+ rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
513+ sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
514+ };
515+ }
516+ {
517+ goPackagePath = "github.com/mitchellh/go-homedir";
518+ fetch = {
519+ type = "git";
520+ url = "https://github.com/mitchellh/go-homedir";
521+ rev = "ae18d6b8b3205b561c79e8e5f69bff09736185f4";
522+ sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq";
523+ };
524+ }
525+ {
526+ goPackagePath = "github.com/mna/pigeon";
527+ fetch = {
528+ type = "git";
529+ url = "https://github.com/mna/pigeon";
530+ rev = "9df264905d4734c0133161d8c67828ff522b154a";
531+ sha256 = "120m90lig5984wd2k7x2fclx5vb64lxmx4j3065pp0q1fqjif87z";
532+ };
533+ }
534+ {
535+ goPackagePath = "github.com/mschoch/smat";
536+ fetch = {
537+ type = "git";
538+ url = "https://github.com/mschoch/smat";
539+ rev = "90eadee771aeab36e8bf796039b8c261bebebe4f";
540+ sha256 = "141saq6d4z3c7v3jw45zy4gn6wwjlyralqygjff1fzvz1gkvimk3";
541+ };
542+ }
543+ {
544+ goPackagePath = "github.com/opentracing/opentracing-go";
545+ fetch = {
546+ type = "git";
547+ url = "https://github.com/opentracing/opentracing-go";
548+ rev = "bd9c3193394760d98b2fa6ebb2291f0cd1d06a7d";
549+ sha256 = "11ad6yhi1fi7ybg6jj18kw5pl12zhvvcrkjqbz6rspawb5qrlq1g";
550+ };
551+ }
552+ {
553+ goPackagePath = "github.com/paulbellamy/ratecounter";
554+ fetch = {
555+ type = "git";
556+ url = "https://github.com/paulbellamy/ratecounter";
557+ rev = "524851a93235ac051e3540563ed7909357fe24ab";
558+ sha256 = "0z4c61ac6v8mpnr9z37d91h1cf8v9psja5jfdxmsf69r1b7qr4f9";
559+ };
560+ }
561+ {
562+ goPackagePath = "github.com/peterh/liner";
563+ fetch = {
564+ type = "git";
565+ url = "https://github.com/peterh/liner";
566+ rev = "8c1271fcf47f341a9e6771872262870e1ad7650c";
567+ sha256 = "15swk6y173sdav3gzxk0rj2z17khsyc8wljk6gk3w4fq9wnziggd";
568+ };
569+ }
570+ {
571+ goPackagePath = "github.com/philhofer/fwd";
572+ fetch = {
573+ type = "git";
574+ url = "https://github.com/philhofer/fwd";
575+ rev = "bb6d471dc95d4fe11e432687f8b70ff496cf3136";
576+ sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2";
577+ };
578+ }
579+ {
580+ goPackagePath = "github.com/pkg/errors";
581+ fetch = {
582+ type = "git";
583+ url = "https://github.com/pkg/errors";
584+ rev = "645ef00459ed84a119197bfb8d8205042c6df63d";
585+ sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
586+ };
587+ }
588+ {
589+ goPackagePath = "github.com/pkg/term";
590+ fetch = {
591+ type = "git";
592+ url = "https://github.com/pkg/term";
593+ rev = "bffc007b7fd5a70e20e28f5b7649bb84671ef436";
594+ sha256 = "0c9xnx7dyw7j890nm9av5fjpqjb129z7vbg3lw554vwnckc84x54";
595+ };
596+ }
597+ {
598+ goPackagePath = "github.com/prometheus/client_golang";
599+ fetch = {
600+ type = "git";
601+ url = "https://github.com/prometheus/client_golang";
602+ rev = "661e31bf844dfca9aeba15f27ea8aa0d485ad212";
603+ sha256 = "0r9sr3m57ks7rc5bbghl0gy9wxlznzmz331xdp42zlgk6g774xcn";
604+ };
605+ }
606+ {
607+ goPackagePath = "github.com/prometheus/client_model";
608+ fetch = {
609+ type = "git";
610+ url = "https://github.com/prometheus/client_model";
611+ rev = "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f";
612+ sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0";
613+ };
614+ }
615+ {
616+ goPackagePath = "github.com/prometheus/common";
617+ fetch = {
618+ type = "git";
619+ url = "https://github.com/prometheus/common";
620+ rev = "7600349dcfe1abd18d72d3a1770870d9800a7801";
621+ sha256 = "0lsp94dqpj35dny4m4x15kg4wgwawlm3in7cnpajkkacgyxagk5f";
622+ };
623+ }
624+ {
625+ goPackagePath = "github.com/prometheus/procfs";
626+ fetch = {
627+ type = "git";
628+ url = "https://github.com/prometheus/procfs";
629+ rev = "ae68e2d4c00fed4943b5f6698d504a5fe083da8a";
630+ sha256 = "04sar4k99w8nvq3kwx6chz0mbp4s6xfjfxww7aqfd950xgs2jv5f";
631+ };
632+ }
633+ {
634+ goPackagePath = "github.com/retailnext/hllpp";
635+ fetch = {
636+ type = "git";
637+ url = "https://github.com/retailnext/hllpp";
638+ rev = "101a6d2f8b52abfc409ac188958e7e7be0116331";
639+ sha256 = "1dyyjyrscd3d22jhh2pbn67c6nzva0v069215sjjmj313k1xzmj3";
640+ };
641+ }
642+ {
643+ goPackagePath = "github.com/satori/go.uuid";
644+ fetch = {
645+ type = "git";
646+ url = "https://github.com/satori/go.uuid";
647+ rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3";
648+ sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb";
649+ };
650+ }
651+ {
652+ goPackagePath = "github.com/segmentio/kafka-go";
653+ fetch = {
654+ type = "git";
655+ url = "https://github.com/segmentio/kafka-go";
656+ rev = "c6db9435477f3cb658e2dd0fa93e02118c870251";
657+ sha256 = "17zdj0i429a0wmwj8rm4j0hmxsv8kbql67s5iv78hac6rcys7bj2";
658+ };
659+ }
660+ {
661+ goPackagePath = "github.com/spf13/cast";
662+ fetch = {
663+ type = "git";
664+ url = "https://github.com/spf13/cast";
665+ rev = "8c9545af88b134710ab1cd196795e7f2388358d7";
666+ sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5";
667+ };
668+ }
669+ {
670+ goPackagePath = "github.com/tinylib/msgp";
671+ fetch = {
672+ type = "git";
673+ url = "https://github.com/tinylib/msgp";
674+ rev = "b2b6a672cf1e5b90748f79b8b81fc8c5cf0571a1";
675+ sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc";
676+ };
677+ }
678+ {
679+ goPackagePath = "github.com/willf/bitset";
680+ fetch = {
681+ type = "git";
682+ url = "https://github.com/willf/bitset";
683+ rev = "d860f346b89450988a379d7d705e83c58d1ea227";
684+ sha256 = "18419ip5mnblnyx2rjixad90dhjb1x2kaiidr7zk9b3qci799rh0";
685+ };
686+ }
687+ {
688+ goPackagePath = "github.com/xlab/treeprint";
689+ fetch = {
690+ type = "git";
691+ url = "https://github.com/xlab/treeprint";
692+ rev = "d6fb6747feb6e7cfdc44682a024bddf87ef07ec2";
693+ sha256 = "1ln6p8va53sxrhyy0gfanskzzc30c55l6nk1f0bin91jlr2mxn4n";
694+ };
695+ }
696+ {
697+ goPackagePath = "go.uber.org/atomic";
698+ fetch = {
699+ type = "git";
700+ url = "https://github.com/uber-go/atomic";
701+ rev = "1ea20fb1cbb1cc08cbd0d913a96dead89aa18289";
702+ sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6";
703+ };
704+ }
705+ {
706+ goPackagePath = "go.uber.org/multierr";
707+ fetch = {
708+ type = "git";
709+ url = "https://github.com/uber-go/multierr";
710+ rev = "3c4937480c32f4c13a875a1829af76c98ca3d40a";
711+ sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w";
712+ };
713+ }
714+ {
715+ goPackagePath = "go.uber.org/zap";
716+ fetch = {
717+ type = "git";
718+ url = "https://github.com/uber-go/zap";
719+ rev = "4d45f9617f7d90f7a663ff21c7a4321dbe78098b";
720+ sha256 = "0fpgcbqv8inx70jmnrv0zay7mjj8rwwcvd3ivqwy1wmrmkm8jjmj";
721+ };
722+ }
723+ {
724+ goPackagePath = "golang.org/x/crypto";
725+ fetch = {
726+ type = "git";
727+ url = "https://go.googlesource.com/crypto";
728+ rev = "a2144134853fc9a27a7b1e3eb4f19f1a76df13c9";
729+ sha256 = "0hjjk6k9dq7zllwsw9icdfbli12ii379q2lajd6l7lyw72wy28by";
730+ };
731+ }
732+ {
733+ goPackagePath = "golang.org/x/net";
734+ fetch = {
735+ type = "git";
736+ url = "https://go.googlesource.com/net";
737+ rev = "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1";
738+ sha256 = "018zmn4kmg2mbngcciqal54slc3pl4ry5vlv0bw36fcxvnazxnbp";
739+ };
740+ }
741+ {
742+ goPackagePath = "golang.org/x/oauth2";
743+ fetch = {
744+ type = "git";
745+ url = "https://go.googlesource.com/oauth2";
746+ rev = "c57b0facaced709681d9f90397429b9430a74754";
747+ sha256 = "044rx9vkkwpp7d23gdk3k4yb7k28kcy34y83pjb1gwndhhh019w1";
748+ };
749+ }
750+ {
751+ goPackagePath = "golang.org/x/sync";
752+ fetch = {
753+ type = "git";
754+ url = "https://go.googlesource.com/sync";
755+ rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
756+ sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
757+ };
758+ }
759+ {
760+ goPackagePath = "golang.org/x/sys";
761+ fetch = {
762+ type = "git";
763+ url = "https://go.googlesource.com/sys";
764+ rev = "ac767d655b305d4e9612f5f6e33120b9176c4ad4";
765+ sha256 = "1ds29n5lh4j21hmzxz7vk7hv1k6sixc7f0zsdc9xqdg0j7d212zm";
766+ };
767+ }
768+ {
769+ goPackagePath = "golang.org/x/text";
770+ fetch = {
771+ type = "git";
772+ url = "https://go.googlesource.com/text";
773+ rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
774+ sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
775+ };
776+ }
777+ {
778+ goPackagePath = "golang.org/x/time";
779+ fetch = {
780+ type = "git";
781+ url = "https://go.googlesource.com/time";
782+ rev = "fbb02b2291d28baffd63558aa44b4b56f178d650";
783+ sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4";
784+ };
785+ }
786+ {
787+ goPackagePath = "golang.org/x/tools";
788+ fetch = {
789+ type = "git";
790+ url = "https://go.googlesource.com/tools";
791+ rev = "45ff765b4815d34d8b80220fd05c79063b185ce1";
792+ sha256 = "0pirpy0xcks294zd629x6p5yxwcpz1xbxbg6hy5xpxqq2v24nxqr";
793+ };
794+ }
795+ {
796+ goPackagePath = "google.golang.org/appengine";
797+ fetch = {
798+ type = "git";
799+ url = "https://github.com/golang/appengine";
800+ rev = "ae0ab99deb4dc413a2b4bd6c8bdd0eb67f1e4d06";
801+ sha256 = "1iabxnqgxvvn1239i6fvfl375vlbvhfrc03m1x2rvalmx4d6w9c7";
802+ };
803+ }
804+ {
805+ goPackagePath = "google.golang.org/genproto";
806+ fetch = {
807+ type = "git";
808+ url = "https://github.com/google/go-genproto";
809+ rev = "fedd2861243fd1a8152376292b921b394c7bef7e";
810+ sha256 = "08324j170skzacglhjmpkpsivp9gwcvmljx1nq6a2d2h2qksfdbp";
811+ };
812+ }
813+ {
814+ goPackagePath = "google.golang.org/grpc";
815+ fetch = {
816+ type = "git";
817+ url = "https://github.com/grpc/grpc-go";
818+ rev = "168a6198bcb0ef175f7dacec0b8691fc141dc9b8";
819+ sha256 = "0d8vj372ri55mrqfc0rhjl3albp5ykwfjhda1s5cgm5n40v70pr3";
820+ };
821+ }
822+ {
823+ goPackagePath = "gopkg.in/yaml.v2";
824+ fetch = {
825+ type = "git";
826+ url = "https://github.com/go-yaml/yaml";
827+ rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
828+ sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
829+ };
830+ }
831+ {
832+ goPackagePath = "honnef.co/go/tools";
833+ fetch = {
834+ type = "git";
835+ url = "https://github.com/dominikh/go-tools";
836+ rev = "d73ab98e7c39fdcf9ba65062e43d34310f198353";
837+ sha256 = "1khl6szjj0skkfqp234p9rf3icik7fw2pk2x0wbj3wa9q3f84hb7";
838+ };
839+ }
840+]
pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patchnew file+27
@@ -0,0 +1,27 @@
1+From c1832eabb99cec47f1714f696275285e1e28da34 Mon Sep 17 00:00:00 2001
2+From: Maximilian Bosch <maximilian@mbosch.me>
3+Date: Tue, 2 Apr 2019 16:20:50 +0200
4+Subject: [PATCH] Don't resolve symlinks when trying to find INSTALL_PATH
5+
6+Nix specific patch. This behavior breaks roundcube setups where plugins
7+are in a store path with symlinks to the actual source.
8+---
9+ bin/update.sh | 2 +-
10+ 1 file changed, 1 insertion(+), 1 deletion(-)
11+
12+diff --git a/bin/update.sh b/bin/update.sh
13+index 08e3bb5..b2ad498 100755
14+--- a/bin/update.sh
15++++ b/bin/update.sh
16+@@ -19,7 +19,7 @@
17+ +-----------------------------------------------------------------------+
18+ */
19+
20+-define('INSTALL_PATH', realpath(__DIR__ . '/..') . '/' );
21++define('INSTALL_PATH', __DIR__ . '/../' );
22+
23+ require_once INSTALL_PATH . 'program/include/clisetup.php';
24+
25+--
26+2.19.2
27+
pkgs/servers/roundcube/default.nix+15−8
@@ -1,14 +1,21 @@
1−{ lib, stdenv, fetchzip, buildEnv, roundcube, roundcubePlugins }:
2−let
1+{ lib, fetchurl, stdenv, buildEnv, roundcube, roundcubePlugins }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "roundcube";
35 version = "1.3.8";
4−in
5−fetchzip rec {
6− name= "roundcube-${version}";
76
8− url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
9− sha256 = "1lhwr13bglm8rqgamnb480b07wpqhw9bskjj2xxb0x8kdjly29ks";
7+ src = fetchurl {
8+ url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
9+ sha256 = "018djad7ygfl9c9f2l2j42qkg31ml3hs2f01f0dk361zckwk77n4";
10+ };
11+
12+ patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];
13+
14+ dontBuild = true;
1015
11− extraPostFetch = ''
16+ installPhase = ''
17+ mkdir $out
18+ cp -r * $out/
1219 ln -sf /etc/roundcube/config.inc.php $out/config/config.inc.php
1320 rm -rf $out/installer
1421 '';
pkgs/shells/powershell/default.nix+3−3
@@ -4,8 +4,8 @@
44let platformString = if stdenv.isDarwin then "osx"
55 else if stdenv.isLinux then "linux"
66 else throw "unsupported platform";
7− platformSha = if stdenv.isDarwin then "1zm5q25ny2x6wvdqfrc380467zq0nbrzh2rzldwdkdpkb6wbvpj8"
8− else if stdenv.isLinux then "021ag632jcn7f1vpddann04xifgsq3wrx93hzbvq7cngg8y16r3y"
7+ platformSha = if stdenv.isDarwin then "1jcrrgybcyq9kwyqxshsfm5fy3sa77h3795xx3rvrs8k434nl1yb"
8+ else if stdenv.isLinux then "1hlis827wmnjcy4h8va50093pmnqdhkbnbimmkymzmcvmkbmi9nx"
99 else throw "unsupported platform";
1010 platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
1111 else if stdenv.isLinux then "LD_LIBRARY_PATH"
@@ -15,7 +15,7 @@ let platformString = if stdenv.isDarwin then "osx"
1515in
1616stdenv.mkDerivation rec {
1717 name = "powershell-${version}";
18− version = "6.1.2";
18+ version = "6.2.0";
1919
2020 src = fetchzip {
2121 url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz";
pkgs/stdenv/cross/default.nix+1−1
@@ -53,7 +53,7 @@ in lib.init bootStages ++ [
5353 cc = if crossSystem.useiOSPrebuilt or false
5454 then buildPackages.darwin.iosSdkPkgs.clang
5555 else if crossSystem.useAndroidPrebuilt or false
56− then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".gcc
56+ then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".clang
5757 else if crossSystem.useLLVM or false
5858 then buildPackages.llvmPackages_7.lldClang
5959 else buildPackages.gcc;
pkgs/tools/admin/aws-vault/default.nix+2−2
@@ -2,7 +2,7 @@
22buildGoPackage rec {
33 name = "${pname}-${version}";
44 pname = "aws-vault";
5− version = "4.3.0";
5+ version = "4.5.1";
66
77 goPackagePath = "github.com/99designs/${pname}";
88
@@ -10,7 +10,7 @@ buildGoPackage rec {
1010 owner = "99designs";
1111 repo = pname;
1212 rev = "v${version}";
13− sha256 = "0cwzvw1rcvg7y3m8dahr9r05s4i9apnfw5xhiaf0rlkdh3vy33wp";
13+ sha256 = "0y64fx15p9ls829lif7c0jaxyclzpnr8l5cyw25q545878dzmcs5";
1414 };
1515
1616 # set the version. see: aws-vault's Makefile
pkgs/tools/misc/cpulimit/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "cpulimit-${version}";
5− version = "2.5";
5+ version = "2.6";
66
77 src = fetchurl {
88 url = "mirror://sourceforge/limitcpu/${name}.tar.gz";
9− sha256 = "1w1l3r9ini78s8idxlzmgljpfgl1n4y4qhp3q2s8y6wq4bfx41lp";
9+ sha256 = "0xf0r6zxaqan1drz61nqf95p2pkiiihpvrjhrr9dx9j3vswyx31g";
1010 };
1111
1212 buildFlags = with stdenv;
pkgs/tools/misc/fluentd/Gemfile−1
@@ -1,7 +1,6 @@
11source "https://rubygems.org"
22
33gem 'fluentd'
4−gem 'fluent-plugin-elasticsearch'
54gem 'fluent-plugin-record-reformer'
65gem 'fluent-plugin-s3'
76gem 'fluent-plugin-kinesis'
pkgs/tools/misc/fluentd/Gemfile.lock+59−620
@@ -1,644 +1,82 @@
11GEM
22 remote: https://rubygems.org/
33 specs:
4− addressable (2.5.2)
4+ addressable (2.6.0)
55 public_suffix (>= 2.0.2, < 4.0)
6− aws-eventstream (1.0.1)
7− aws-partitions (1.96.0)
8− aws-sdk (3.0.1)
9− aws-sdk-resources (~> 3)
10− aws-sdk-acm (1.9.0)
11− aws-sdk-core (~> 3)
12− aws-sigv4 (~> 1.0)
13− aws-sdk-acmpca (1.2.0)
14− aws-sdk-core (~> 3)
15− aws-sigv4 (~> 1.0)
16− aws-sdk-alexaforbusiness (1.6.0)
17− aws-sdk-core (~> 3)
18− aws-sigv4 (~> 1.0)
19− aws-sdk-apigateway (1.13.0)
20− aws-sdk-core (~> 3)
21− aws-sigv4 (~> 1.0)
22− aws-sdk-applicationautoscaling (1.11.0)
23− aws-sdk-core (~> 3)
24− aws-sigv4 (~> 1.0)
25− aws-sdk-applicationdiscoveryservice (1.2.0)
26− aws-sdk-core (~> 3)
27− aws-sigv4 (~> 1.0)
28− aws-sdk-appstream (1.13.0)
29− aws-sdk-core (~> 3)
30− aws-sigv4 (~> 1.0)
31− aws-sdk-appsync (1.4.0)
32− aws-sdk-core (~> 3)
33− aws-sigv4 (~> 1.0)
34− aws-sdk-athena (1.1.0)
35− aws-sdk-core (~> 3)
36− aws-sigv4 (~> 1.0)
37− aws-sdk-autoscaling (1.6.0)
38− aws-sdk-core (~> 3)
39− aws-sigv4 (~> 1.0)
40− aws-sdk-autoscalingplans (1.3.0)
41− aws-sdk-core (~> 3)
42− aws-sigv4 (~> 1.0)
43− aws-sdk-batch (1.5.0)
44− aws-sdk-core (~> 3)
45− aws-sigv4 (~> 1.0)
46− aws-sdk-budgets (1.8.0)
47− aws-sdk-core (~> 3)
48− aws-sigv4 (~> 1.0)
49− aws-sdk-cloud9 (1.2.0)
50− aws-sdk-core (~> 3)
51− aws-sigv4 (~> 1.0)
52− aws-sdk-clouddirectory (1.5.0)
53− aws-sdk-core (~> 3)
54− aws-sigv4 (~> 1.0)
55− aws-sdk-cloudformation (1.6.0)
56− aws-sdk-core (~> 3)
57− aws-sigv4 (~> 1.0)
58− aws-sdk-cloudfront (1.4.0)
59− aws-sdk-core (~> 3)
60− aws-sigv4 (~> 1.0)
61− aws-sdk-cloudhsm (1.4.0)
62− aws-sdk-core (~> 3)
63− aws-sigv4 (~> 1.0)
64− aws-sdk-cloudhsmv2 (1.2.0)
65− aws-sdk-core (~> 3)
66− aws-sigv4 (~> 1.0)
67− aws-sdk-cloudsearch (1.1.0)
68− aws-sdk-core (~> 3)
69− aws-sigv4 (~> 1.0)
70− aws-sdk-cloudsearchdomain (1.1.0)
71− aws-sdk-core (~> 3)
72− aws-sigv4 (~> 1.0)
73− aws-sdk-cloudtrail (1.1.0)
74− aws-sdk-core (~> 3)
75− aws-sigv4 (~> 1.0)
76− aws-sdk-cloudwatch (1.6.0)
77− aws-sdk-core (~> 3)
78− aws-sigv4 (~> 1.0)
79− aws-sdk-cloudwatchevents (1.4.0)
80− aws-sdk-core (~> 3)
81− aws-sigv4 (~> 1.0)
82− aws-sdk-cloudwatchlogs (1.4.0)
83− aws-sdk-core (~> 3)
84− aws-sigv4 (~> 1.0)
85− aws-sdk-codebuild (1.12.0)
86− aws-sdk-core (~> 3)
87− aws-sigv4 (~> 1.0)
88− aws-sdk-codecommit (1.4.0)
89− aws-sdk-core (~> 3)
90− aws-sigv4 (~> 1.0)
91− aws-sdk-codedeploy (1.6.0)
92− aws-sdk-core (~> 3)
93− aws-sigv4 (~> 1.0)
94− aws-sdk-codepipeline (1.5.0)
95− aws-sdk-core (~> 3)
96− aws-sigv4 (~> 1.0)
97− aws-sdk-codestar (1.2.0)
98− aws-sdk-core (~> 3)
99− aws-sigv4 (~> 1.0)
100− aws-sdk-cognitoidentity (1.1.0)
101− aws-sdk-core (~> 3)
102− aws-sigv4 (~> 1.0)
103− aws-sdk-cognitoidentityprovider (1.5.0)
104− aws-sdk-core (~> 3)
105− aws-sigv4 (~> 1.0)
106− aws-sdk-cognitosync (1.1.0)
107− aws-sdk-core (~> 3)
108− aws-sigv4 (~> 1.0)
109− aws-sdk-comprehend (1.2.0)
110− aws-sdk-core (~> 3)
111− aws-sigv4 (~> 1.0)
112− aws-sdk-configservice (1.12.0)
113− aws-sdk-core (~> 3)
114− aws-sigv4 (~> 1.0)
115− aws-sdk-connect (1.1.0)
116− aws-sdk-core (~> 3)
117− aws-sigv4 (~> 1.0)
118− aws-sdk-core (3.22.1)
119− aws-eventstream (~> 1.0)
6+ aws-eventstream (1.0.2)
7+ aws-partitions (1.149.0)
8+ aws-sdk-core (3.48.3)
9+ aws-eventstream (~> 1.0, >= 1.0.2)
12010 aws-partitions (~> 1.0)
121− aws-sigv4 (~> 1.0)
11+ aws-sigv4 (~> 1.1)
12212 jmespath (~> 1.0)
123− aws-sdk-costandusagereportservice (1.1.0)
124− aws-sdk-core (~> 3)
125− aws-sigv4 (~> 1.0)
126− aws-sdk-costexplorer (1.7.0)
127− aws-sdk-core (~> 3)
128− aws-sigv4 (~> 1.0)
129− aws-sdk-databasemigrationservice (1.7.0)
130− aws-sdk-core (~> 3)
131− aws-sigv4 (~> 1.0)
132− aws-sdk-datapipeline (1.1.0)
133− aws-sdk-core (~> 3)
134− aws-sigv4 (~> 1.0)
135− aws-sdk-dax (1.1.0)
136− aws-sdk-core (~> 3)
137− aws-sigv4 (~> 1.0)
138− aws-sdk-devicefarm (1.7.0)
139− aws-sdk-core (~> 3)
140− aws-sigv4 (~> 1.0)
141− aws-sdk-directconnect (1.2.0)
142− aws-sdk-core (~> 3)
143− aws-sigv4 (~> 1.0)
144− aws-sdk-directoryservice (1.3.0)
145− aws-sdk-core (~> 3)
146− aws-sigv4 (~> 1.0)
147− aws-sdk-dlm (1.0.0)
148− aws-sdk-core (~> 3)
149− aws-sigv4 (~> 1.0)
150− aws-sdk-dynamodb (1.8.0)
151− aws-sdk-core (~> 3)
152− aws-sigv4 (~> 1.0)
153− aws-sdk-dynamodbstreams (1.1.0)
154− aws-sdk-core (~> 3)
155− aws-sigv4 (~> 1.0)
156− aws-sdk-ec2 (1.38.0)
157− aws-sdk-core (~> 3)
158− aws-sigv4 (~> 1.0)
159− aws-sdk-ecr (1.4.0)
160− aws-sdk-core (~> 3)
161− aws-sigv4 (~> 1.0)
162− aws-sdk-ecs (1.15.0)
163− aws-sdk-core (~> 3)
164− aws-sigv4 (~> 1.0)
165− aws-sdk-efs (1.2.0)
166− aws-sdk-core (~> 3)
167− aws-sigv4 (~> 1.0)
168− aws-sdk-eks (1.1.0)
169− aws-sdk-core (~> 3)
170− aws-sigv4 (~> 1.0)
171− aws-sdk-elasticache (1.4.0)
172− aws-sdk-core (~> 3)
173− aws-sigv4 (~> 1.0)
174− aws-sdk-elasticbeanstalk (1.8.0)
175− aws-sdk-core (~> 3)
176− aws-sigv4 (~> 1.0)
177− aws-sdk-elasticloadbalancing (1.3.0)
178− aws-sdk-core (~> 3)
179− aws-sigv4 (~> 1.0)
180− aws-sdk-elasticloadbalancingv2 (1.11.0)
181− aws-sdk-core (~> 3)
182− aws-sigv4 (~> 1.0)
183− aws-sdk-elasticsearchservice (1.6.0)
184− aws-sdk-core (~> 3)
185− aws-sigv4 (~> 1.0)
186− aws-sdk-elastictranscoder (1.1.0)
187− aws-sdk-core (~> 3)
188− aws-sigv4 (~> 1.0)
189− aws-sdk-emr (1.3.0)
190− aws-sdk-core (~> 3)
191− aws-sigv4 (~> 1.0)
192− aws-sdk-firehose (1.4.0)
193− aws-sdk-core (~> 3)
194− aws-sigv4 (~> 1.0)
195− aws-sdk-fms (1.1.0)
196− aws-sdk-core (~> 3)
197− aws-sigv4 (~> 1.0)
198− aws-sdk-gamelift (1.5.0)
199− aws-sdk-core (~> 3)
200− aws-sigv4 (~> 1.0)
201− aws-sdk-glacier (1.8.0)
202− aws-sdk-core (~> 3)
203− aws-sigv4 (~> 1.0)
204− aws-sdk-glue (1.10.0)
205− aws-sdk-core (~> 3)
206− aws-sigv4 (~> 1.0)
207− aws-sdk-greengrass (1.4.0)
208− aws-sdk-core (~> 3)
209− aws-sigv4 (~> 1.0)
210− aws-sdk-guardduty (1.5.0)
211− aws-sdk-core (~> 3)
212− aws-sigv4 (~> 1.0)
213− aws-sdk-health (1.1.0)
214− aws-sdk-core (~> 3)
215− aws-sigv4 (~> 1.0)
216− aws-sdk-iam (1.6.0)
217− aws-sdk-core (~> 3)
218− aws-sigv4 (~> 1.0)
219− aws-sdk-importexport (1.1.0)
220− aws-sdk-core (~> 3)
221− aws-sigv2 (~> 1.0)
222− aws-sdk-inspector (1.5.0)
223− aws-sdk-core (~> 3)
224− aws-sigv4 (~> 1.0)
225− aws-sdk-iot (1.9.0)
226− aws-sdk-core (~> 3)
227− aws-sigv4 (~> 1.0)
228− aws-sdk-iot1clickdevicesservice (1.1.0)
229− aws-sdk-core (~> 3)
230− aws-sigv4 (~> 1.0)
231− aws-sdk-iot1clickprojects (1.1.0)
232− aws-sdk-core (~> 3)
233− aws-sigv4 (~> 1.0)
234− aws-sdk-iotanalytics (1.2.0)
235− aws-sdk-core (~> 3)
236− aws-sigv4 (~> 1.0)
237− aws-sdk-iotdataplane (1.1.0)
238− aws-sdk-core (~> 3)
239− aws-sigv4 (~> 1.0)
240− aws-sdk-iotjobsdataplane (1.1.0)
241− aws-sdk-core (~> 3)
242− aws-sigv4 (~> 1.0)
243− aws-sdk-kinesis (1.3.0)
244− aws-sdk-core (~> 3)
245− aws-sigv4 (~> 1.0)
246− aws-sdk-kinesisanalytics (1.3.0)
247− aws-sdk-core (~> 3)
248− aws-sigv4 (~> 1.0)
249− aws-sdk-kinesisvideo (1.2.0)
250− aws-sdk-core (~> 3)
251− aws-sigv4 (~> 1.0)
252− aws-sdk-kinesisvideoarchivedmedia (1.2.0)
253− aws-sdk-core (~> 3)
254− aws-sigv4 (~> 1.0)
255− aws-sdk-kinesisvideomedia (1.1.0)
256− aws-sdk-core (~> 3)
257− aws-sigv4 (~> 1.0)
258− aws-sdk-kms (1.6.0)
259− aws-sdk-core (~> 3)
260− aws-sigv4 (~> 1.0)
261− aws-sdk-lambda (1.8.0)
262− aws-sdk-core (~> 3)
263− aws-sigv4 (~> 1.0)
264− aws-sdk-lambdapreview (1.1.0)
265− aws-sdk-core (~> 3)
266− aws-sigv4 (~> 1.0)
267− aws-sdk-lex (1.4.0)
268− aws-sdk-core (~> 3)
269− aws-sigv4 (~> 1.0)
270− aws-sdk-lexmodelbuildingservice (1.6.0)
271− aws-sdk-core (~> 3)
272− aws-sigv4 (~> 1.0)
273− aws-sdk-lightsail (1.5.0)
274− aws-sdk-core (~> 3)
275− aws-sigv4 (~> 1.0)
276− aws-sdk-machinelearning (1.1.0)
277− aws-sdk-core (~> 3)
278− aws-sigv4 (~> 1.0)
279− aws-sdk-macie (1.1.0)
280− aws-sdk-core (~> 3)
281− aws-sigv4 (~> 1.0)
282− aws-sdk-marketplacecommerceanalytics (1.1.0)
283− aws-sdk-core (~> 3)
284− aws-sigv4 (~> 1.0)
285− aws-sdk-marketplaceentitlementservice (1.1.0)
286− aws-sdk-core (~> 3)
287− aws-sigv4 (~> 1.0)
288− aws-sdk-marketplacemetering (1.1.0)
289− aws-sdk-core (~> 3)
290− aws-sigv4 (~> 1.0)
291− aws-sdk-mediaconvert (1.5.0)
292− aws-sdk-core (~> 3)
293− aws-sigv4 (~> 1.0)
294− aws-sdk-medialive (1.8.0)
295− aws-sdk-core (~> 3)
296− aws-sigv4 (~> 1.0)
297− aws-sdk-mediapackage (1.2.0)
298− aws-sdk-core (~> 3)
299− aws-sigv4 (~> 1.0)
300− aws-sdk-mediastore (1.2.0)
301− aws-sdk-core (~> 3)
302− aws-sigv4 (~> 1.0)
303− aws-sdk-mediastoredata (1.2.0)
304− aws-sdk-core (~> 3)
305− aws-sigv4 (~> 1.0)
306− aws-sdk-mediatailor (1.2.0)
307− aws-sdk-core (~> 3)
308− aws-sigv4 (~> 1.0)
309− aws-sdk-migrationhub (1.3.0)
310− aws-sdk-core (~> 3)
311− aws-sigv4 (~> 1.0)
312− aws-sdk-mobile (1.1.0)
313− aws-sdk-core (~> 3)
314− aws-sigv4 (~> 1.0)
315− aws-sdk-mq (1.1.0)
316− aws-sdk-core (~> 3)
317− aws-sigv4 (~> 1.0)
318− aws-sdk-mturk (1.4.0)
319− aws-sdk-core (~> 3)
320− aws-sigv4 (~> 1.0)
321− aws-sdk-neptune (1.2.0)
322− aws-sdk-core (~> 3)
323− aws-sigv4 (~> 1.0)
324− aws-sdk-opsworks (1.4.0)
325− aws-sdk-core (~> 3)
326− aws-sigv4 (~> 1.0)
327− aws-sdk-opsworkscm (1.3.0)
328− aws-sdk-core (~> 3)
329− aws-sigv4 (~> 1.0)
330− aws-sdk-organizations (1.10.0)
331− aws-sdk-core (~> 3)
332− aws-sigv4 (~> 1.0)
333− aws-sdk-pi (1.1.0)
334− aws-sdk-core (~> 3)
335− aws-sigv4 (~> 1.0)
336− aws-sdk-pinpoint (1.6.0)
337− aws-sdk-core (~> 3)
338− aws-sigv4 (~> 1.0)
339− aws-sdk-polly (1.6.0)
340− aws-sdk-core (~> 3)
341− aws-sigv4 (~> 1.0)
342− aws-sdk-pricing (1.1.0)
343− aws-sdk-core (~> 3)
344− aws-sigv4 (~> 1.0)
345− aws-sdk-rds (1.23.0)
346− aws-sdk-core (~> 3)
347− aws-sigv4 (~> 1.0)
348− aws-sdk-redshift (1.5.0)
349− aws-sdk-core (~> 3)
350− aws-sigv4 (~> 1.0)
351− aws-sdk-rekognition (1.5.0)
352− aws-sdk-core (~> 3)
353− aws-sigv4 (~> 1.0)
354− aws-sdk-resourcegroups (1.1.0)
355− aws-sdk-core (~> 3)
356− aws-sigv4 (~> 1.0)
357− aws-sdk-resourcegroupstaggingapi (1.1.0)
358− aws-sdk-core (~> 3)
359− aws-sigv4 (~> 1.0)
360− aws-sdk-resources (3.22.0)
361− aws-sdk-acm (~> 1)
362− aws-sdk-acmpca (~> 1)
363− aws-sdk-alexaforbusiness (~> 1)
364− aws-sdk-apigateway (~> 1)
365− aws-sdk-applicationautoscaling (~> 1)
366− aws-sdk-applicationdiscoveryservice (~> 1)
367− aws-sdk-appstream (~> 1)
368− aws-sdk-appsync (~> 1)
369− aws-sdk-athena (~> 1)
370− aws-sdk-autoscaling (~> 1)
371− aws-sdk-autoscalingplans (~> 1)
372− aws-sdk-batch (~> 1)
373− aws-sdk-budgets (~> 1)
374− aws-sdk-cloud9 (~> 1)
375− aws-sdk-clouddirectory (~> 1)
376− aws-sdk-cloudformation (~> 1)
377− aws-sdk-cloudfront (~> 1)
378− aws-sdk-cloudhsm (~> 1)
379− aws-sdk-cloudhsmv2 (~> 1)
380− aws-sdk-cloudsearch (~> 1)
381− aws-sdk-cloudsearchdomain (~> 1)
382− aws-sdk-cloudtrail (~> 1)
383− aws-sdk-cloudwatch (~> 1)
384− aws-sdk-cloudwatchevents (~> 1)
385− aws-sdk-cloudwatchlogs (~> 1)
386− aws-sdk-codebuild (~> 1)
387− aws-sdk-codecommit (~> 1)
388− aws-sdk-codedeploy (~> 1)
389− aws-sdk-codepipeline (~> 1)
390− aws-sdk-codestar (~> 1)
391− aws-sdk-cognitoidentity (~> 1)
392− aws-sdk-cognitoidentityprovider (~> 1)
393− aws-sdk-cognitosync (~> 1)
394− aws-sdk-comprehend (~> 1)
395− aws-sdk-configservice (~> 1)
396− aws-sdk-connect (~> 1)
397− aws-sdk-costandusagereportservice (~> 1)
398− aws-sdk-costexplorer (~> 1)
399− aws-sdk-databasemigrationservice (~> 1)
400− aws-sdk-datapipeline (~> 1)
401− aws-sdk-dax (~> 1)
402− aws-sdk-devicefarm (~> 1)
403− aws-sdk-directconnect (~> 1)
404− aws-sdk-directoryservice (~> 1)
405− aws-sdk-dlm (~> 1)
406− aws-sdk-dynamodb (~> 1)
407− aws-sdk-dynamodbstreams (~> 1)
408− aws-sdk-ec2 (~> 1)
409− aws-sdk-ecr (~> 1)
410− aws-sdk-ecs (~> 1)
411− aws-sdk-efs (~> 1)
412− aws-sdk-eks (~> 1)
413− aws-sdk-elasticache (~> 1)
414− aws-sdk-elasticbeanstalk (~> 1)
415− aws-sdk-elasticloadbalancing (~> 1)
416− aws-sdk-elasticloadbalancingv2 (~> 1)
417− aws-sdk-elasticsearchservice (~> 1)
418− aws-sdk-elastictranscoder (~> 1)
419− aws-sdk-emr (~> 1)
420− aws-sdk-firehose (~> 1)
421− aws-sdk-fms (~> 1)
422− aws-sdk-gamelift (~> 1)
423− aws-sdk-glacier (~> 1)
424− aws-sdk-glue (~> 1)
425− aws-sdk-greengrass (~> 1)
426− aws-sdk-guardduty (~> 1)
427− aws-sdk-health (~> 1)
428− aws-sdk-iam (~> 1)
429− aws-sdk-importexport (~> 1)
430− aws-sdk-inspector (~> 1)
431− aws-sdk-iot (~> 1)
432− aws-sdk-iot1clickdevicesservice (~> 1)
433− aws-sdk-iot1clickprojects (~> 1)
434− aws-sdk-iotanalytics (~> 1)
435− aws-sdk-iotdataplane (~> 1)
436− aws-sdk-iotjobsdataplane (~> 1)
437− aws-sdk-kinesis (~> 1)
438− aws-sdk-kinesisanalytics (~> 1)
439− aws-sdk-kinesisvideo (~> 1)
440− aws-sdk-kinesisvideoarchivedmedia (~> 1)
441− aws-sdk-kinesisvideomedia (~> 1)
442− aws-sdk-kms (~> 1)
443− aws-sdk-lambda (~> 1)
444− aws-sdk-lambdapreview (~> 1)
445− aws-sdk-lex (~> 1)
446− aws-sdk-lexmodelbuildingservice (~> 1)
447− aws-sdk-lightsail (~> 1)
448− aws-sdk-machinelearning (~> 1)
449− aws-sdk-macie (~> 1)
450− aws-sdk-marketplacecommerceanalytics (~> 1)
451− aws-sdk-marketplaceentitlementservice (~> 1)
452− aws-sdk-marketplacemetering (~> 1)
453− aws-sdk-mediaconvert (~> 1)
454− aws-sdk-medialive (~> 1)
455− aws-sdk-mediapackage (~> 1)
456− aws-sdk-mediastore (~> 1)
457− aws-sdk-mediastoredata (~> 1)
458− aws-sdk-mediatailor (~> 1)
459− aws-sdk-migrationhub (~> 1)
460− aws-sdk-mobile (~> 1)
461− aws-sdk-mq (~> 1)
462− aws-sdk-mturk (~> 1)
463− aws-sdk-neptune (~> 1)
464− aws-sdk-opsworks (~> 1)
465− aws-sdk-opsworkscm (~> 1)
466− aws-sdk-organizations (~> 1)
467− aws-sdk-pi (~> 1)
468− aws-sdk-pinpoint (~> 1)
469− aws-sdk-polly (~> 1)
470− aws-sdk-pricing (~> 1)
471− aws-sdk-rds (~> 1)
472− aws-sdk-redshift (~> 1)
473− aws-sdk-rekognition (~> 1)
474− aws-sdk-resourcegroups (~> 1)
475− aws-sdk-resourcegroupstaggingapi (~> 1)
476− aws-sdk-route53 (~> 1)
477− aws-sdk-route53domains (~> 1)
478− aws-sdk-s3 (~> 1)
479− aws-sdk-sagemaker (~> 1)
480− aws-sdk-sagemakerruntime (~> 1)
481− aws-sdk-secretsmanager (~> 1)
482− aws-sdk-serverlessapplicationrepository (~> 1)
483− aws-sdk-servicecatalog (~> 1)
484− aws-sdk-servicediscovery (~> 1)
485− aws-sdk-ses (~> 1)
486− aws-sdk-shield (~> 1)
487− aws-sdk-simpledb (~> 1)
488− aws-sdk-sms (~> 1)
489− aws-sdk-snowball (~> 1)
490− aws-sdk-sns (~> 1)
491− aws-sdk-sqs (~> 1)
492− aws-sdk-ssm (~> 1)
493− aws-sdk-states (~> 1)
494− aws-sdk-storagegateway (~> 1)
495− aws-sdk-support (~> 1)
496− aws-sdk-swf (~> 1)
497− aws-sdk-transcribeservice (~> 1)
498− aws-sdk-translate (~> 1)
499− aws-sdk-waf (~> 1)
500− aws-sdk-wafregional (~> 1)
501− aws-sdk-workdocs (~> 1)
502− aws-sdk-workmail (~> 1)
503− aws-sdk-workspaces (~> 1)
504− aws-sdk-xray (~> 1)
505− aws-sdk-route53 (1.10.1)
506− aws-sdk-core (~> 3)
507− aws-sigv4 (~> 1.0)
508− aws-sdk-route53domains (1.3.0)
509− aws-sdk-core (~> 3)
510− aws-sigv4 (~> 1.0)
511− aws-sdk-s3 (1.17.0)
512− aws-sdk-core (~> 3, >= 3.21.2)
13+ aws-sdk-firehose (1.14.0)
14+ aws-sdk-core (~> 3, >= 3.48.2)
15+ aws-sigv4 (~> 1.1)
16+ aws-sdk-kinesis (1.13.1)
17+ aws-sdk-core (~> 3, >= 3.48.2)
18+ aws-sigv4 (~> 1.1)
19+ aws-sdk-kms (1.16.0)
20+ aws-sdk-core (~> 3, >= 3.48.2)
21+ aws-sigv4 (~> 1.1)
22+ aws-sdk-s3 (1.36.0)
23+ aws-sdk-core (~> 3, >= 3.48.2)
51324 aws-sdk-kms (~> 1)
51425 aws-sigv4 (~> 1.0)
515− aws-sdk-sagemaker (1.11.0)
516− aws-sdk-core (~> 3)
517− aws-sigv4 (~> 1.0)
518− aws-sdk-sagemakerruntime (1.1.0)
519− aws-sdk-core (~> 3)
520− aws-sigv4 (~> 1.0)
521− aws-sdk-secretsmanager (1.10.0)
522− aws-sdk-core (~> 3)
523− aws-sigv4 (~> 1.0)
524− aws-sdk-serverlessapplicationrepository (1.4.0)
525− aws-sdk-core (~> 3)
526− aws-sigv4 (~> 1.0)
527− aws-sdk-servicecatalog (1.6.0)
528− aws-sdk-core (~> 3)
529− aws-sigv4 (~> 1.0)
530− aws-sdk-servicediscovery (1.3.0)
531− aws-sdk-core (~> 3)
532− aws-sigv4 (~> 1.0)
533− aws-sdk-ses (1.8.0)
534− aws-sdk-core (~> 3)
535− aws-sigv4 (~> 1.0)
536− aws-sdk-shield (1.3.0)
537− aws-sdk-core (~> 3)
538− aws-sigv4 (~> 1.0)
539− aws-sdk-simpledb (1.1.0)
540− aws-sdk-core (~> 3)
541− aws-sigv2 (~> 1.0)
542− aws-sdk-sms (1.1.0)
543− aws-sdk-core (~> 3)
544− aws-sigv4 (~> 1.0)
545− aws-sdk-snowball (1.3.0)
546− aws-sdk-core (~> 3)
547− aws-sigv4 (~> 1.0)
548− aws-sdk-sns (1.3.0)
549− aws-sdk-core (~> 3)
550− aws-sigv4 (~> 1.0)
551− aws-sdk-sqs (1.4.0)
552− aws-sdk-core (~> 3)
553− aws-sigv4 (~> 1.0)
554− aws-sdk-ssm (1.18.0)
555− aws-sdk-core (~> 3)
556− aws-sigv4 (~> 1.0)
557− aws-sdk-states (1.3.0)
558− aws-sdk-core (~> 3)
559− aws-sigv4 (~> 1.0)
560− aws-sdk-storagegateway (1.6.0)
561− aws-sdk-core (~> 3)
562− aws-sigv4 (~> 1.0)
563− aws-sdk-support (1.1.0)
564− aws-sdk-core (~> 3)
565− aws-sigv4 (~> 1.0)
566− aws-sdk-swf (1.1.0)
567− aws-sdk-core (~> 3)
568− aws-sigv4 (~> 1.0)
569− aws-sdk-transcribeservice (1.3.0)
570− aws-sdk-core (~> 3)
571− aws-sigv4 (~> 1.0)
572− aws-sdk-translate (1.2.0)
573− aws-sdk-core (~> 3)
574− aws-sigv4 (~> 1.0)
575− aws-sdk-waf (1.5.0)
576− aws-sdk-core (~> 3)
577− aws-sigv4 (~> 1.0)
578− aws-sdk-wafregional (1.5.0)
579− aws-sdk-core (~> 3)
580− aws-sigv4 (~> 1.0)
581− aws-sdk-workdocs (1.2.0)
582− aws-sdk-core (~> 3)
583− aws-sigv4 (~> 1.0)
584− aws-sdk-workmail (1.2.0)
585− aws-sdk-core (~> 3)
586− aws-sigv4 (~> 1.0)
587− aws-sdk-workspaces (1.3.0)
588− aws-sdk-core (~> 3)
589− aws-sigv4 (~> 1.0)
590− aws-sdk-xray (1.3.0)
591− aws-sdk-core (~> 3)
592− aws-sigv4 (~> 1.0)
593− aws-sigv2 (1.0.1)
594− aws-sigv4 (1.0.3)
595− bson (4.3.0)
596− cool.io (1.5.3)
26+ aws-sdk-sqs (1.13.0)
27+ aws-sdk-core (~> 3, >= 3.48.2)
28+ aws-sigv4 (~> 1.1)
29+ aws-sigv4 (1.1.0)
30+ aws-eventstream (~> 1.0, >= 1.0.2)
31+ bson (4.4.2)
32+ cool.io (1.5.4)
59733 dig_rb (1.0.1)
598− elasticsearch (6.1.0)
599− elasticsearch-api (= 6.1.0)
600− elasticsearch-transport (= 6.1.0)
601− elasticsearch-api (6.1.0)
34+ digest-crc (0.4.1)
35+ elasticsearch (6.3.0)
36+ elasticsearch-api (= 6.3.0)
37+ elasticsearch-transport (= 6.3.0)
38+ elasticsearch-api (6.3.0)
60239 multi_json
603− elasticsearch-transport (6.1.0)
40+ elasticsearch-transport (6.3.0)
60441 faraday
60542 multi_json
60643 excon (0.62.0)
607− faraday (0.15.2)
44+ faraday (0.15.4)
60845 multipart-post (>= 1.2, < 3)
60946 fluent-config-regexp-type (1.0.0)
61047 fluentd (> 1.0.0, < 2)
611− fluent-plugin-elasticsearch (2.11.1)
48+ fluent-plugin-elasticsearch (3.4.1)
61249 elasticsearch
61350 excon
614− fluentd (>= 0.14.20)
615− fluent-plugin-kafka (0.7.4)
51+ fluentd (>= 0.14.22)
52+ fluent-plugin-kafka (0.9.2)
61653 fluentd (>= 0.10.58, < 2)
61754 ltsv
618− ruby-kafka (>= 0.4.1, < 1.0.0)
619− fluent-plugin-kinesis (2.1.1)
620− aws-sdk (>= 2.9.9, < 4)
621− fluentd (>= 0.12.35, < 2)
55+ ruby-kafka (>= 0.7.1, < 0.8.0)
56+ fluent-plugin-kinesis (3.0.0)
57+ aws-sdk-firehose (~> 1, != 1.9, != 1.5)
58+ aws-sdk-kinesis (~> 1, != 1.5, != 1.4)
59+ fluentd (>= 0.14.10, < 2)
62260 google-protobuf (~> 3)
623− fluent-plugin-mongo (1.1.1)
624− fluentd (>= 0.14.12, < 2)
625− mongo (~> 2.2.0)
61+ fluent-plugin-mongo (1.2.2)
62+ fluentd (>= 0.14.22, < 2)
63+ mongo (~> 2.6.0)
62664 fluent-plugin-record-reformer (0.9.1)
62765 fluentd
628− fluent-plugin-rewrite-tag-filter (2.1.0)
66+ fluent-plugin-rewrite-tag-filter (2.2.0)
62967 fluent-config-regexp-type
63068 fluentd (>= 0.14.2, < 2)
631− fluent-plugin-s3 (1.1.3)
69+ fluent-plugin-s3 (1.1.9)
63270 aws-sdk-s3 (~> 1.0)
63371 aws-sdk-sqs (~> 1.0)
634− fluentd (>= 0.14.2, < 2)
635− fluent-plugin-scribe (0.10.14)
72+ fluentd (>= 0.14.22, < 2)
73+ fluent-plugin-scribe (1.0.0)
63674 fluentd
63775 thrift (~> 0.8.0)
63876 fluent-plugin-webhdfs (1.2.3)
63977 fluentd (>= 0.14.4)
64078 webhdfs (>= 0.6.0)
641− fluentd (1.2.3)
79+ fluentd (1.4.2)
64280 cool.io (>= 1.4.5, < 2.0.0)
64381 dig_rb (~> 1.0.0)
64482 http_parser.rb (>= 0.5.1, < 0.7.0)
@@ -649,18 +87,19 @@ GEM
64987 tzinfo (~> 1.0)
65088 tzinfo-data (~> 1.0)
65189 yajl-ruby (~> 1.0)
652− google-protobuf (3.6.0)
90+ google-protobuf (3.7.1)
65391 http_parser.rb (0.6.0)
65492 jmespath (1.4.0)
655− ltsv (0.1.0)
656− mongo (2.2.7)
657− bson (~> 4.0)
658− msgpack (1.2.4)
93+ ltsv (0.1.2)
94+ mongo (2.6.4)
95+ bson (>= 4.3.0, < 5.0.0)
96+ msgpack (1.2.9)
65997 multi_json (1.13.1)
66098 multipart-post (2.0.0)
661− public_suffix (3.0.2)
662− ruby-kafka (0.6.7)
663− serverengine (2.0.7)
99+ public_suffix (3.0.3)
100+ ruby-kafka (0.7.6)
101+ digest-crc
102+ serverengine (2.1.0)
664103 sigdump (~> 0.2.2)
665104 sigdump (0.2.4)
666105 strptime (0.2.3)
@@ -668,11 +107,11 @@ GEM
668107 thrift (0.8.0)
669108 tzinfo (1.2.5)
670109 thread_safe (~> 0.1)
671− tzinfo-data (1.2018.5)
110+ tzinfo-data (1.2019.1)
672111 tzinfo (>= 1.0.0)
673112 webhdfs (0.8.0)
674113 addressable
675− yajl-ruby (1.4.0)
114+ yajl-ruby (1.4.1)
676115
677116PLATFORMS
678117 ruby
@@ -690,4 +129,4 @@ DEPENDENCIES
690129 fluentd
691130
692131BUNDLED WITH
693− 1.16.2
132+ 1.16.3
pkgs/tools/misc/fluentd/gemset.nix+182−1349
@@ -1,1420 +1,188 @@
11{
22 addressable = {
33 dependencies = ["public_suffix"];
4+ groups = ["default"];
5+ platforms = [];
46 source = {
57 remotes = ["https://rubygems.org"];
6− sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
8+ sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
79 type = "gem";
810 };
9− version = "2.5.2";
11+ version = "2.6.0";
1012 };
1113 aws-eventstream = {
14+ groups = ["default"];
15+ platforms = [];
1216 source = {
1317 remotes = ["https://rubygems.org"];
14− sha256 = "0gdiwkg24jpx5f3bkw6vchgliicn6v9bpm09j0dldaxsca66q0wy";
18+ sha256 = "1i4djzrynzr4l8mqx946ad6zn7blz2r5jif58y9c0lws6bdc5h1l";
1519 type = "gem";
1620 };
17− version = "1.0.1";
18− };
19− aws-partitions = {
20− source = {
21− remotes = ["https://rubygems.org"];
22− sha256 = "1gqkj0fq1rlrsfr1s3dgrhz4dikxlkrbrkp0i2013aa3lcsm8hqm";
23− type = "gem";
24− };
25− version = "1.96.0";
26− };
27− aws-sdk = {
28− dependencies = ["aws-sdk-resources"];
29− source = {
30− remotes = ["https://rubygems.org"];
31− sha256 = "0z01jdka7akshp524xprqaakpavzjadh0kmwmz8mwk5i1yiakba3";
32− type = "gem";
33− };
34− version = "3.0.1";
35− };
36− aws-sdk-acm = {
37− dependencies = ["aws-sdk-core" "aws-sigv4"];
38− source = {
39− remotes = ["https://rubygems.org"];
40− sha256 = "0r6m6l8jbnhcvs6xighgcpc8li8pnjr33l34fqgnbxbbkybwnhl0";
41− type = "gem";
42− };
43− version = "1.9.0";
44− };
45− aws-sdk-acmpca = {
46− dependencies = ["aws-sdk-core" "aws-sigv4"];
47− source = {
48− remotes = ["https://rubygems.org"];
49− sha256 = "13ggvcyijmhdwiw1ym21pxac4hf7wmndy5l5g1mmd2r6mlz08n6b";
50− type = "gem";
51− };
52− version = "1.2.0";
53− };
54− aws-sdk-alexaforbusiness = {
55− dependencies = ["aws-sdk-core" "aws-sigv4"];
56− source = {
57− remotes = ["https://rubygems.org"];
58− sha256 = "1bn1460ga5b1nair735nf8cg4hrgh499kdwn9r75d5mjfd4yxg1s";
59− type = "gem";
60− };
61− version = "1.6.0";
62− };
63− aws-sdk-apigateway = {
64− dependencies = ["aws-sdk-core" "aws-sigv4"];
65− source = {
66− remotes = ["https://rubygems.org"];
67− sha256 = "1v1p15lx6k9iyx226h6w9pp16frhnpl1xxwm1c0q39a5f9k7vyl7";
68− type = "gem";
69− };
70− version = "1.13.0";
71− };
72− aws-sdk-applicationautoscaling = {
73− dependencies = ["aws-sdk-core" "aws-sigv4"];
74− source = {
75− remotes = ["https://rubygems.org"];
76− sha256 = "1sf117qwmw3qdvydr6sn70vm9ygpnr1mgqic2vc1y6s85rzfh4z2";
77− type = "gem";
78− };
79− version = "1.11.0";
80− };
81− aws-sdk-applicationdiscoveryservice = {
82− dependencies = ["aws-sdk-core" "aws-sigv4"];
83− source = {
84− remotes = ["https://rubygems.org"];
85− sha256 = "0n770ra6d2bc23rq66x5rd2ck0c0h0ivgxcdgi7kmvkjrh09fslj";
86− type = "gem";
87− };
88− version = "1.2.0";
89− };
90− aws-sdk-appstream = {
91− dependencies = ["aws-sdk-core" "aws-sigv4"];
92− source = {
93− remotes = ["https://rubygems.org"];
94− sha256 = "04y4s4pkwvl72a2jzrscki68p6klh9g6vxi86whi4hsg05imj909";
95− type = "gem";
96− };
97− version = "1.13.0";
98− };
99− aws-sdk-appsync = {
100− dependencies = ["aws-sdk-core" "aws-sigv4"];
101− source = {
102− remotes = ["https://rubygems.org"];
103− sha256 = "1kk4r6272fniq5dx50f3k0wz8pjysbvxs26jyvr5af97ayndks1n";
104− type = "gem";
105− };
106− version = "1.4.0";
107− };
108− aws-sdk-athena = {
109− dependencies = ["aws-sdk-core" "aws-sigv4"];
110− source = {
111− remotes = ["https://rubygems.org"];
112− sha256 = "1q9igjjw0jc860dns4mh8l1bm0s1q4bpfrzkgczij5vx3rp3jpqv";
113− type = "gem";
114− };
115− version = "1.1.0";
116− };
117− aws-sdk-autoscaling = {
118− dependencies = ["aws-sdk-core" "aws-sigv4"];
119− source = {
120− remotes = ["https://rubygems.org"];
121− sha256 = "15hvj08avacvkkrm60rdv39k58zxaqsigrlfjgfiki7vcrrqm19j";
122− type = "gem";
123− };
124− version = "1.6.0";
125− };
126− aws-sdk-autoscalingplans = {
127− dependencies = ["aws-sdk-core" "aws-sigv4"];
128− source = {
129− remotes = ["https://rubygems.org"];
130− sha256 = "0djk1z0q92cclr0757qvphj63x20a1ygzp3c9w1ycc6b3n7j5a0r";
131− type = "gem";
132− };
133− version = "1.3.0";
134− };
135− aws-sdk-batch = {
136− dependencies = ["aws-sdk-core" "aws-sigv4"];
137− source = {
138− remotes = ["https://rubygems.org"];
139− sha256 = "18yr41pgl11x1vfc7w4f7n5v8vbhz4vb05q1fckqcwmwrwcqwycn";
140− type = "gem";
141− };
142− version = "1.5.0";
143− };
144− aws-sdk-budgets = {
145− dependencies = ["aws-sdk-core" "aws-sigv4"];
146− source = {
147− remotes = ["https://rubygems.org"];
148− sha256 = "1xdwr9c0wcys9gljl2q0bvrjvlk6q676gsr2159qdh0px1s9f8cd";
149− type = "gem";
150− };
151− version = "1.8.0";
152− };
153− aws-sdk-cloud9 = {
154− dependencies = ["aws-sdk-core" "aws-sigv4"];
155− source = {
156− remotes = ["https://rubygems.org"];
157− sha256 = "0vs7jgg1fjz0kn1772mbk55q5ia8k8045bl38wsh23yz9naf7wrb";
158− type = "gem";
159− };
160− version = "1.2.0";
161− };
162− aws-sdk-clouddirectory = {
163− dependencies = ["aws-sdk-core" "aws-sigv4"];
164− source = {
165− remotes = ["https://rubygems.org"];
166− sha256 = "0zkbqj3nf9pdyzyk9z1xm9qkslghljhwzma10mrpg2wkic8in2zg";
167− type = "gem";
168− };
169− version = "1.5.0";
170− };
171− aws-sdk-cloudformation = {
172− dependencies = ["aws-sdk-core" "aws-sigv4"];
173− source = {
174− remotes = ["https://rubygems.org"];
175− sha256 = "1q75h9nbhkrs3rblc5bdf2v1yamskgjkz5rlzlikpp1x08alll2x";
176− type = "gem";
177− };
178− version = "1.6.0";
179− };
180− aws-sdk-cloudfront = {
181− dependencies = ["aws-sdk-core" "aws-sigv4"];
182− source = {
183− remotes = ["https://rubygems.org"];
184− sha256 = "0wzhhv2hnxy0h3zcbppdzym1zmsgmv6fqkdcdghh5ys9mj4wnq86";
185− type = "gem";
186− };
187− version = "1.4.0";
188− };
189− aws-sdk-cloudhsm = {
190− dependencies = ["aws-sdk-core" "aws-sigv4"];
191− source = {
192− remotes = ["https://rubygems.org"];
193− sha256 = "1zjdql9x8cpjikjc6q4g8vmdi1xq27q7vwns8flib9cklbkb615k";
194− type = "gem";
195− };
196− version = "1.4.0";
197− };
198− aws-sdk-cloudhsmv2 = {
199− dependencies = ["aws-sdk-core" "aws-sigv4"];
200− source = {
201− remotes = ["https://rubygems.org"];
202− sha256 = "09pw8dgay7vrmwfjz5dzjrci1q6iqazna36d5vhp3raw4drb5q0c";
203− type = "gem";
204− };
205− version = "1.2.0";
206− };
207− aws-sdk-cloudsearch = {
208− dependencies = ["aws-sdk-core" "aws-sigv4"];
209− source = {
210− remotes = ["https://rubygems.org"];
211− sha256 = "1k702nm5aqxhgyc2gvjx8c5abg2b004apsgwfv6pi4szcbd3c4bq";
212− type = "gem";
213− };
214− version = "1.1.0";
215− };
216− aws-sdk-cloudsearchdomain = {
217− dependencies = ["aws-sdk-core" "aws-sigv4"];
218− source = {
219− remotes = ["https://rubygems.org"];
220− sha256 = "0kc6d3dy7vdydwnhzddnfkrrdspsxzc1h91yml6jskr5p6ccc6mb";
221− type = "gem";
222− };
223− version = "1.1.0";
224− };
225− aws-sdk-cloudtrail = {
226− dependencies = ["aws-sdk-core" "aws-sigv4"];
227− source = {
228− remotes = ["https://rubygems.org"];
229− sha256 = "11lj0qw9w7cmxwgfdwvhfx6pfx5dx3b2mcsg0fmy0k8pl18zp4rr";
230− type = "gem";
231− };
232− version = "1.1.0";
233− };
234− aws-sdk-cloudwatch = {
235− dependencies = ["aws-sdk-core" "aws-sigv4"];
236− source = {
237− remotes = ["https://rubygems.org"];
238− sha256 = "1xmpmwzra3b5gracca050zs0lrsq28sc34x7qx8c0cr05jlkjjig";
239− type = "gem";
240− };
241− version = "1.6.0";
242− };
243− aws-sdk-cloudwatchevents = {
244− dependencies = ["aws-sdk-core" "aws-sigv4"];
245− source = {
246− remotes = ["https://rubygems.org"];
247− sha256 = "0qr2mlx7w2wb168vldm0ci7z7jf8mjmp73i50048pa6yqsn5jg42";
248− type = "gem";
249− };
250− version = "1.4.0";
251− };
252− aws-sdk-cloudwatchlogs = {
253− dependencies = ["aws-sdk-core" "aws-sigv4"];
254− source = {
255− remotes = ["https://rubygems.org"];
256− sha256 = "16fwk4hxycqq8kkv1asiimr5h5dcrnh22ix9z7vzg6gd3w4cx8yl";
257− type = "gem";
258− };
259− version = "1.4.0";
260− };
261− aws-sdk-codebuild = {
262− dependencies = ["aws-sdk-core" "aws-sigv4"];
263− source = {
264− remotes = ["https://rubygems.org"];
265− sha256 = "1x88dg1ygffxlvw9hl9xj7nfvd311vic49sjwrq171ily9drd8dp";
266− type = "gem";
267− };
268− version = "1.12.0";
269− };
270− aws-sdk-codecommit = {
271− dependencies = ["aws-sdk-core" "aws-sigv4"];
272− source = {
273− remotes = ["https://rubygems.org"];
274− sha256 = "17xch4hwf5i7vvpq3mi6hg120jdjxw9qplhi7d48ch20w5w2nn3k";
275− type = "gem";
276− };
277− version = "1.4.0";
278− };
279− aws-sdk-codedeploy = {
280− dependencies = ["aws-sdk-core" "aws-sigv4"];
281− source = {
282− remotes = ["https://rubygems.org"];
283− sha256 = "18qpmbaqwnbw91hbm64fixn4dba35fhr7x770lvly885i8srbv44";
284− type = "gem";
285− };
286− version = "1.6.0";
287− };
288− aws-sdk-codepipeline = {
289− dependencies = ["aws-sdk-core" "aws-sigv4"];
290− source = {
291− remotes = ["https://rubygems.org"];
292− sha256 = "1n0v9ml7bfdr30py24ab7jhh35ni17m2c7rr16d55sp14j6583ax";
293− type = "gem";
294− };
295− version = "1.5.0";
296− };
297− aws-sdk-codestar = {
298− dependencies = ["aws-sdk-core" "aws-sigv4"];
299− source = {
300− remotes = ["https://rubygems.org"];
301− sha256 = "0dd3l6igidddxy4flw3wry0mv2lr559vvfafjwna7ilj3v311dz2";
302− type = "gem";
303− };
304− version = "1.2.0";
305− };
306− aws-sdk-cognitoidentity = {
307− dependencies = ["aws-sdk-core" "aws-sigv4"];
308− source = {
309− remotes = ["https://rubygems.org"];
310− sha256 = "014b9d7iai5sinjfs2qar3wwnhhb3cd35867jiwkqwhyga30r70p";
311− type = "gem";
312− };
313− version = "1.1.0";
314− };
315− aws-sdk-cognitoidentityprovider = {
316− dependencies = ["aws-sdk-core" "aws-sigv4"];
317− source = {
318− remotes = ["https://rubygems.org"];
319− sha256 = "0jlk4ysr1lbn94p16p7z0hr0m7pr47447g632fd0ss1hw7ap4csw";
320− type = "gem";
321− };
322− version = "1.5.0";
323− };
324− aws-sdk-cognitosync = {
325− dependencies = ["aws-sdk-core" "aws-sigv4"];
326− source = {
327− remotes = ["https://rubygems.org"];
328− sha256 = "1d5fxq99sfwv4c7jgx65yrhxp9qg524bd8bsfamhakn0rlwi4iny";
329− type = "gem";
330− };
331− version = "1.1.0";
332− };
333− aws-sdk-comprehend = {
334− dependencies = ["aws-sdk-core" "aws-sigv4"];
335− source = {
336− remotes = ["https://rubygems.org"];
337− sha256 = "0l50mvlrarqhb7d469czi3p7rimjwzcwp52bhklxbx6lmv3il23p";
338− type = "gem";
339− };
340− version = "1.2.0";
341− };
342− aws-sdk-configservice = {
343− dependencies = ["aws-sdk-core" "aws-sigv4"];
344− source = {
345− remotes = ["https://rubygems.org"];
346− sha256 = "11lzxili2c17m6h8y6ngl7z7h0rf7jwwaim4dq2pdf2qi2k5mh70";
347− type = "gem";
348− };
349− version = "1.12.0";
350− };
351− aws-sdk-connect = {
352− dependencies = ["aws-sdk-core" "aws-sigv4"];
353− source = {
354− remotes = ["https://rubygems.org"];
355− sha256 = "15xz6v48y4nn1yrr2n8d2w0z7g52cqyjrkjxyhgdv6967yby4qw2";
356− type = "gem";
357− };
358− version = "1.1.0";
359− };
360− aws-sdk-core = {
361− dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
362− source = {
363− remotes = ["https://rubygems.org"];
364− sha256 = "1dhii8d1ra9rbh3n0v5s2p4dg5mrwj44sl0mfcan40s1crcrm3m8";
365− type = "gem";
366− };
367− version = "3.22.1";
368− };
369− aws-sdk-costandusagereportservice = {
370− dependencies = ["aws-sdk-core" "aws-sigv4"];
371− source = {
372− remotes = ["https://rubygems.org"];
373− sha256 = "04sady26xlvkrmym4bmdbkc1d472kjlxsgr9awa205ih0bxsaffn";
374− type = "gem";
375− };
376− version = "1.1.0";
377− };
378− aws-sdk-costexplorer = {
379− dependencies = ["aws-sdk-core" "aws-sigv4"];
380− source = {
381− remotes = ["https://rubygems.org"];
382− sha256 = "1ddd92nny926ipzgmr2gg9qh64iv96cd35zwsbwn7ns8mnndxa4q";
383− type = "gem";
384− };
385− version = "1.7.0";
386− };
387− aws-sdk-databasemigrationservice = {
388− dependencies = ["aws-sdk-core" "aws-sigv4"];
389− source = {
390− remotes = ["https://rubygems.org"];
391− sha256 = "0slj051gw3mr155cwmj67d95wywq4v14ri6xhnkfx07sqp4i8z9a";
392− type = "gem";
393− };
394− version = "1.7.0";
395− };
396− aws-sdk-datapipeline = {
397− dependencies = ["aws-sdk-core" "aws-sigv4"];
398− source = {
399− remotes = ["https://rubygems.org"];
400− sha256 = "0r2jnvbcbqkg5k42ly1x2w4g97rl4km1m3bwjvwl7q8c9fbrzpby";
401− type = "gem";
402− };
403− version = "1.1.0";
404− };
405− aws-sdk-dax = {
406− dependencies = ["aws-sdk-core" "aws-sigv4"];
407− source = {
408− remotes = ["https://rubygems.org"];
409− sha256 = "0m6l7p2g667c54jxbdpb1zkin5damiq3x34aw5b3b88wk9nm8pfy";
410− type = "gem";
411− };
412− version = "1.1.0";
413− };
414− aws-sdk-devicefarm = {
415− dependencies = ["aws-sdk-core" "aws-sigv4"];
416− source = {
417− remotes = ["https://rubygems.org"];
418− sha256 = "02bzffmwrbw5irg94iki16ybg0wb926vsfvd4ziv890fc8n239ya";
419− type = "gem";
420− };
421− version = "1.7.0";
422− };
423− aws-sdk-directconnect = {
424− dependencies = ["aws-sdk-core" "aws-sigv4"];
425− source = {
426− remotes = ["https://rubygems.org"];
427− sha256 = "03jshg8ax2cww8zvf2lvf542xllgpv38i2iqnv79y62s9a26g4l5";
428− type = "gem";
429− };
430− version = "1.2.0";
431− };
432− aws-sdk-directoryservice = {
433− dependencies = ["aws-sdk-core" "aws-sigv4"];
434− source = {
435− remotes = ["https://rubygems.org"];
436− sha256 = "0mmjxk34gids533s2x1ay4s9zzrvad16djf1m6xib6ys9bja1x27";
437− type = "gem";
438− };
439− version = "1.3.0";
440− };
441− aws-sdk-dlm = {
442− dependencies = ["aws-sdk-core" "aws-sigv4"];
443− source = {
444− remotes = ["https://rubygems.org"];
445− sha256 = "0j6r629wqg08zr9ndisy3d27hqj32kimlrfkigw276mnx2v507cn";
446− type = "gem";
447− };
448− version = "1.0.0";
449− };
450− aws-sdk-dynamodb = {
451− dependencies = ["aws-sdk-core" "aws-sigv4"];
452− source = {
453− remotes = ["https://rubygems.org"];
454− sha256 = "0id29l91wpd9az9axsfmiqdwlh0qx4m1ci7fwzxm7ac6yjq4p7gr";
455− type = "gem";
456− };
457− version = "1.8.0";
458− };
459− aws-sdk-dynamodbstreams = {
460− dependencies = ["aws-sdk-core" "aws-sigv4"];
461− source = {
462− remotes = ["https://rubygems.org"];
463− sha256 = "03b2wrkxp9cpr0akxqgn5hss9l2yzqa7kl9j0isyh968rbdzaxla";
464− type = "gem";
465− };
466− version = "1.1.0";
467− };
468− aws-sdk-ec2 = {
469− dependencies = ["aws-sdk-core" "aws-sigv4"];
470− source = {
471− remotes = ["https://rubygems.org"];
472− sha256 = "17144h9892pf8hn5c5lnid47q2dilyb5hxzf8pj7z3pkra5yn5aw";
473− type = "gem";
474− };
475− version = "1.38.0";
476− };
477− aws-sdk-ecr = {
478− dependencies = ["aws-sdk-core" "aws-sigv4"];
479− source = {
480− remotes = ["https://rubygems.org"];
481− sha256 = "01x7m60sqfdkfiif1fxknl9p97076ndwr71s5aixq688plf7zybf";
482− type = "gem";
483− };
484− version = "1.4.0";
485− };
486− aws-sdk-ecs = {
487− dependencies = ["aws-sdk-core" "aws-sigv4"];
488− source = {
489− remotes = ["https://rubygems.org"];
490− sha256 = "16czi8zgy8s1p0skcxwr4lcbfwp0g9c8ppbd3ymjchm75rdrg47g";
491− type = "gem";
492− };
493− version = "1.15.0";
494− };
495− aws-sdk-efs = {
496− dependencies = ["aws-sdk-core" "aws-sigv4"];
497− source = {
498− remotes = ["https://rubygems.org"];
499− sha256 = "0fi1a99fh62ma1xy4axh5cpach3fclajd30jp8kig9bxyaspsf2c";
500− type = "gem";
501− };
502− version = "1.2.0";
503− };
504− aws-sdk-eks = {
505− dependencies = ["aws-sdk-core" "aws-sigv4"];
506− source = {
507− remotes = ["https://rubygems.org"];
508− sha256 = "1sgyja0kdj68vcqzmckxmik7ibp4rmyiw8vl6zyp3ihkqpvwf5ns";
509− type = "gem";
510− };
511− version = "1.1.0";
512− };
513− aws-sdk-elasticache = {
514− dependencies = ["aws-sdk-core" "aws-sigv4"];
515− source = {
516− remotes = ["https://rubygems.org"];
517− sha256 = "0wy4w8gcdnn4ckyc0aa9p293fnwlv8ihyvmxflzjkigallxa23vc";
518− type = "gem";
519− };
520− version = "1.4.0";
521− };
522− aws-sdk-elasticbeanstalk = {
523− dependencies = ["aws-sdk-core" "aws-sigv4"];
524− source = {
525− remotes = ["https://rubygems.org"];
526− sha256 = "10f9lg288m74ssm24m7mhphi4h6km84pak0bpg7gd4rnrw4fdw1f";
527− type = "gem";
528− };
529− version = "1.8.0";
530− };
531− aws-sdk-elasticloadbalancing = {
532− dependencies = ["aws-sdk-core" "aws-sigv4"];
533− source = {
534− remotes = ["https://rubygems.org"];
535− sha256 = "1dz9gx4c83s1qb03kqng5vh9kjihi0jv02j3ndp2z5z10cpncf3p";
536− type = "gem";
537− };
538− version = "1.3.0";
539− };
540− aws-sdk-elasticloadbalancingv2 = {
541− dependencies = ["aws-sdk-core" "aws-sigv4"];
542− source = {
543− remotes = ["https://rubygems.org"];
544− sha256 = "1qs1gjjnvhx1ijm7mr5aa0cv7sanvm81l8kpx1y57zrpa5ikp3r7";
545− type = "gem";
546− };
547− version = "1.11.0";
548− };
549− aws-sdk-elasticsearchservice = {
550− dependencies = ["aws-sdk-core" "aws-sigv4"];
551− source = {
552− remotes = ["https://rubygems.org"];
553− sha256 = "0zhylvqwln0vz5qhd1vj89s7fwdk330wksp206dphscmqjra0ggz";
554− type = "gem";
555− };
556− version = "1.6.0";
557− };
558− aws-sdk-elastictranscoder = {
559− dependencies = ["aws-sdk-core" "aws-sigv4"];
560− source = {
561− remotes = ["https://rubygems.org"];
562− sha256 = "1r9waa8jksznqwvlrapf71j8ga6cjm9j6qjrssqps083kxg0sad1";
563− type = "gem";
564− };
565− version = "1.1.0";
566− };
567− aws-sdk-emr = {
568− dependencies = ["aws-sdk-core" "aws-sigv4"];
569− source = {
570− remotes = ["https://rubygems.org"];
571− sha256 = "0mkb4302iczxmn7al36f151xvjnf8v0r559p4wn6jginvgwxk48n";
572− type = "gem";
573− };
574− version = "1.3.0";
575− };
576− aws-sdk-firehose = {
577− dependencies = ["aws-sdk-core" "aws-sigv4"];
578− source = {
579− remotes = ["https://rubygems.org"];
580− sha256 = "0yc2kvnf0hdlpfh3i51m44775vws3k84wvlhnvj68nm5jszhhx7b";
581− type = "gem";
582− };
583− version = "1.4.0";
584− };
585− aws-sdk-fms = {
586− dependencies = ["aws-sdk-core" "aws-sigv4"];
587− source = {
588− remotes = ["https://rubygems.org"];
589− sha256 = "1lqh6pxg3ki2k539xm99p63fai8grswpkyd5nj8dl4pwsqn4xx57";
590− type = "gem";
591− };
592− version = "1.1.0";
593− };
594− aws-sdk-gamelift = {
595− dependencies = ["aws-sdk-core" "aws-sigv4"];
596− source = {
597− remotes = ["https://rubygems.org"];
598− sha256 = "0wfyq9m0dv9isdriin285daj5b90bbkrk5b0ss0awhcqwarlj29i";
599− type = "gem";
600− };
601− version = "1.5.0";
602− };
603− aws-sdk-glacier = {
604− dependencies = ["aws-sdk-core" "aws-sigv4"];
605− source = {
606− remotes = ["https://rubygems.org"];
607− sha256 = "0vlg62v7zraz5f7h13wws9cga4sdv62v6lsfkqn2ai6n1ks80c02";
608− type = "gem";
609− };
610− version = "1.8.0";
611− };
612− aws-sdk-glue = {
613− dependencies = ["aws-sdk-core" "aws-sigv4"];
614− source = {
615− remotes = ["https://rubygems.org"];
616− sha256 = "1rlq8hchn6dkccwdrd27lizfghmgf4lcrdcblhs14sxmwk0jzl25";
617− type = "gem";
618− };
619− version = "1.10.0";
620− };
621− aws-sdk-greengrass = {
622− dependencies = ["aws-sdk-core" "aws-sigv4"];
623− source = {
624− remotes = ["https://rubygems.org"];
625− sha256 = "05cjp6jvcnzg3jxwcggg31l0sqb743b6x66230nb5ahf7l8sq4fx";
626− type = "gem";
627− };
628− version = "1.4.0";
629− };
630− aws-sdk-guardduty = {
631− dependencies = ["aws-sdk-core" "aws-sigv4"];
632− source = {
633− remotes = ["https://rubygems.org"];
634− sha256 = "0l2fbhm1d5mgkvrz8jgny2zcd4zzijwy8s4f4p91kn22m1s74cg4";
635− type = "gem";
636− };
637− version = "1.5.0";
638− };
639− aws-sdk-health = {
640− dependencies = ["aws-sdk-core" "aws-sigv4"];
641− source = {
642− remotes = ["https://rubygems.org"];
643− sha256 = "0b3zgjwh2drkxcbmglw9vz9b8wir0qwxihf2yrra33qhcxvlf29q";
644− type = "gem";
645− };
646− version = "1.1.0";
647− };
648− aws-sdk-iam = {
649− dependencies = ["aws-sdk-core" "aws-sigv4"];
650− source = {
651− remotes = ["https://rubygems.org"];
652− sha256 = "1wch93pvh5y16ldn1b42igrj0q76j7mfwvkwqnlk8197wpmyzl8z";
653− type = "gem";
654− };
655− version = "1.6.0";
656− };
657− aws-sdk-importexport = {
658− dependencies = ["aws-sdk-core" "aws-sigv2"];
659− source = {
660− remotes = ["https://rubygems.org"];
661− sha256 = "0clry5ch04npyrgz61xrwwj6kwqai5d9c933rd17jx0r7dm2x5zb";
662− type = "gem";
663− };
664− version = "1.1.0";
665− };
666− aws-sdk-inspector = {
667− dependencies = ["aws-sdk-core" "aws-sigv4"];
668− source = {
669− remotes = ["https://rubygems.org"];
670− sha256 = "0blgc82naibxdv5zv7brc8kdp4mnqimxc3lsb2fahn9av4bdh4zf";
671− type = "gem";
672− };
673− version = "1.5.0";
674− };
675− aws-sdk-iot = {
676− dependencies = ["aws-sdk-core" "aws-sigv4"];
677− source = {
678− remotes = ["https://rubygems.org"];
679− sha256 = "00paa2lhahcfk1kk8zka7zb3hnia1qj6i8rv5ybapgdq9rj4936q";
680− type = "gem";
681− };
682− version = "1.9.0";
683− };
684− aws-sdk-iot1clickdevicesservice = {
685− dependencies = ["aws-sdk-core" "aws-sigv4"];
686− source = {
687− remotes = ["https://rubygems.org"];
688− sha256 = "0k1if31wsy3dpk4mhwc6s86432g8jbbb1w4gpj85qlydrk2c7y96";
689− type = "gem";
690− };
691− version = "1.1.0";
692− };
693− aws-sdk-iot1clickprojects = {
694− dependencies = ["aws-sdk-core" "aws-sigv4"];
695− source = {
696− remotes = ["https://rubygems.org"];
697− sha256 = "12r1pkzixj2g0i9mz7ywsr5qlz19868d8qb4www4s45h6qjwxwnz";
698− type = "gem";
699− };
700− version = "1.1.0";
701− };
702− aws-sdk-iotanalytics = {
703− dependencies = ["aws-sdk-core" "aws-sigv4"];
704− source = {
705− remotes = ["https://rubygems.org"];
706− sha256 = "0a69cv9nypykg6il99znymfm09da4hlh3d6i13kj8gma5q7prnq6";
707− type = "gem";
708− };
709− version = "1.2.0";
710− };
711− aws-sdk-iotdataplane = {
712− dependencies = ["aws-sdk-core" "aws-sigv4"];
713− source = {
714− remotes = ["https://rubygems.org"];
715− sha256 = "0777k6l8phrby6ar5zpbhsp4i77d8bfs5z57axn6ir1q4dalgza5";
716− type = "gem";
717− };
718− version = "1.1.0";
719− };
720− aws-sdk-iotjobsdataplane = {
721− dependencies = ["aws-sdk-core" "aws-sigv4"];
722− source = {
723− remotes = ["https://rubygems.org"];
724− sha256 = "05awqr95nlral8f8il5n27swri3vq9y60mhqz9qmhld8w3cwwspj";
725− type = "gem";
726− };
727− version = "1.1.0";
728− };
729− aws-sdk-kinesis = {
730− dependencies = ["aws-sdk-core" "aws-sigv4"];
731− source = {
732− remotes = ["https://rubygems.org"];
733− sha256 = "1kw8ksdy6mylrzdswvxxdjb8wim9agdgxpjp3a1aqa72nlswq3nx";
734− type = "gem";
735− };
736− version = "1.3.0";
737− };
738− aws-sdk-kinesisanalytics = {
739− dependencies = ["aws-sdk-core" "aws-sigv4"];
740− source = {
741− remotes = ["https://rubygems.org"];
742− sha256 = "1krdg2qvm2if5npbpw4bk2i1kz51bknfy1j5gaiiym1mmrz7lrap";
743− type = "gem";
744− };
745− version = "1.3.0";
746− };
747− aws-sdk-kinesisvideo = {
748− dependencies = ["aws-sdk-core" "aws-sigv4"];
749− source = {
750− remotes = ["https://rubygems.org"];
751− sha256 = "1299hi3296i3wjmy8cjzpy10bzpljb638yrbyash39y3znaxk2i8";
752− type = "gem";
753− };
754− version = "1.2.0";
755− };
756− aws-sdk-kinesisvideoarchivedmedia = {
757− dependencies = ["aws-sdk-core" "aws-sigv4"];
758− source = {
759− remotes = ["https://rubygems.org"];
760− sha256 = "17sap4wdpi6l6h8yfm9yzjniv4cps5q3wrhdjp6slwrmhrmq2gpx";
761− type = "gem";
762− };
763− version = "1.2.0";
764− };
765− aws-sdk-kinesisvideomedia = {
766− dependencies = ["aws-sdk-core" "aws-sigv4"];
767− source = {
768− remotes = ["https://rubygems.org"];
769− sha256 = "0rzwpjnym78i5g6427w7war436qnl77qjaiwwh5avrvy12lfjyrb";
770− type = "gem";
771− };
772− version = "1.1.0";
773− };
774− aws-sdk-kms = {
775− dependencies = ["aws-sdk-core" "aws-sigv4"];
776− source = {
777− remotes = ["https://rubygems.org"];
778− sha256 = "1y41nf5p94r2mrmpxx2icylz7g1jm72d1awwpjfrw5zlxbzi8jgj";
779− type = "gem";
780− };
781− version = "1.6.0";
782− };
783− aws-sdk-lambda = {
784− dependencies = ["aws-sdk-core" "aws-sigv4"];
785− source = {
786− remotes = ["https://rubygems.org"];
787− sha256 = "0ng2k320s81d5v1g2ihjvkmspnyfkcb9v2fc25mszwg9gwq4mhz1";
788− type = "gem";
789− };
790− version = "1.8.0";
791− };
792− aws-sdk-lambdapreview = {
793− dependencies = ["aws-sdk-core" "aws-sigv4"];
794− source = {
795− remotes = ["https://rubygems.org"];
796− sha256 = "1ys1zpc7jmzn4vs01z5qw7rkg4732fbzpiwj5p0gpgy151hip110";
797− type = "gem";
798− };
799− version = "1.1.0";
800− };
801− aws-sdk-lex = {
802− dependencies = ["aws-sdk-core" "aws-sigv4"];
803− source = {
804− remotes = ["https://rubygems.org"];
805− sha256 = "1g67akcqmv1i1k4a370vwnb1qkmfl7smfllbw84kd062h8m1h2vl";
806− type = "gem";
807− };
808− version = "1.4.0";
809− };
810− aws-sdk-lexmodelbuildingservice = {
811− dependencies = ["aws-sdk-core" "aws-sigv4"];
812− source = {
813− remotes = ["https://rubygems.org"];
814− sha256 = "0awdfirdc2wn4xaqxkizlxy604gwna55mn261fjwj6a3jp83pb1z";
815− type = "gem";
816− };
817− version = "1.6.0";
818− };
819− aws-sdk-lightsail = {
820− dependencies = ["aws-sdk-core" "aws-sigv4"];
821− source = {
822− remotes = ["https://rubygems.org"];
823− sha256 = "0gxs8b3grk4dwsldszvkz31w3lypdnyqhqs1c3w7f18b66p5l714";
824− type = "gem";
825− };
826− version = "1.5.0";
827− };
828− aws-sdk-machinelearning = {
829− dependencies = ["aws-sdk-core" "aws-sigv4"];
830− source = {
831− remotes = ["https://rubygems.org"];
832− sha256 = "1rf84hxrqgzpmr08h14p1070x8cs3x5gxn48l1ia1bdlfjvllv2f";
833− type = "gem";
834− };
835− version = "1.1.0";
836− };
837− aws-sdk-macie = {
838− dependencies = ["aws-sdk-core" "aws-sigv4"];
839− source = {
840− remotes = ["https://rubygems.org"];
841− sha256 = "0l20rk8r0k6n81vfy132l5xbaxr4h58ykvyhka0xrb2fys5kr704";
842− type = "gem";
843− };
844− version = "1.1.0";
845− };
846− aws-sdk-marketplacecommerceanalytics = {
847− dependencies = ["aws-sdk-core" "aws-sigv4"];
848− source = {
849− remotes = ["https://rubygems.org"];
850− sha256 = "0mcbk1gwqpfxg9wrf1vd9c4s97d46p425yx4m7fx6z73fb26ckp3";
851− type = "gem";
852− };
853− version = "1.1.0";
854− };
855− aws-sdk-marketplaceentitlementservice = {
856− dependencies = ["aws-sdk-core" "aws-sigv4"];
857− source = {
858− remotes = ["https://rubygems.org"];
859− sha256 = "17r2c9ir63wbhpl4kz3pwkavjqvi73jpx3vpbm8172zqai72m2qw";
860− type = "gem";
861− };
862− version = "1.1.0";
863− };
864− aws-sdk-marketplacemetering = {
865− dependencies = ["aws-sdk-core" "aws-sigv4"];
866− source = {
867− remotes = ["https://rubygems.org"];
868− sha256 = "05snignv3fjdfpjw771daxkkm7hlc7wbsi43ajjwvrxzl8apgkl1";
869− type = "gem";
870− };
871− version = "1.1.0";
872− };
873− aws-sdk-mediaconvert = {
874− dependencies = ["aws-sdk-core" "aws-sigv4"];
875− source = {
876− remotes = ["https://rubygems.org"];
877− sha256 = "0hdliqi7rxhp02rnnnvrkg1pn5rbss577f5di4h1pbcmw29zqa2p";
878− type = "gem";
879− };
880− version = "1.5.0";
881− };
882− aws-sdk-medialive = {
883− dependencies = ["aws-sdk-core" "aws-sigv4"];
884− source = {
885− remotes = ["https://rubygems.org"];
886− sha256 = "03pr959i5lnsdw4vagdhfcjfrm01h055j83abs9w2gs4asmknyi9";
887− type = "gem";
888− };
889− version = "1.8.0";
890− };
891− aws-sdk-mediapackage = {
892− dependencies = ["aws-sdk-core" "aws-sigv4"];
893− source = {
894− remotes = ["https://rubygems.org"];
895− sha256 = "190ca52xzdgnfn73qwv4kc2jix2a3s7gxx6a2nij47ak5bs8qhhn";
896− type = "gem";
897− };
898− version = "1.2.0";
899− };
900− aws-sdk-mediastore = {
901− dependencies = ["aws-sdk-core" "aws-sigv4"];
902− source = {
903− remotes = ["https://rubygems.org"];
904− sha256 = "1m7xjz0xpnwvsm35m2wnp9ja8sqhk5w09jf92frim482vyddk46n";
905− type = "gem";
906− };
907− version = "1.2.0";
908− };
909− aws-sdk-mediastoredata = {
910− dependencies = ["aws-sdk-core" "aws-sigv4"];
911− source = {
912− remotes = ["https://rubygems.org"];
913− sha256 = "1da6wd4nrf99mxyv9fay4bbk3n64swzr8989dfjipqa8rpnry9dq";
914− type = "gem";
915− };
916− version = "1.2.0";
917− };
918− aws-sdk-mediatailor = {
919− dependencies = ["aws-sdk-core" "aws-sigv4"];
920− source = {
921− remotes = ["https://rubygems.org"];
922− sha256 = "1rm8f2ln263mabj5ia880h8464pxqg7cp1b1dy6mggbj77v4qyw7";
923− type = "gem";
924− };
925− version = "1.2.0";
926− };
927− aws-sdk-migrationhub = {
928− dependencies = ["aws-sdk-core" "aws-sigv4"];
929− source = {
930− remotes = ["https://rubygems.org"];
931− sha256 = "1vaswa6f4hd7gf5y2rn6jn4rxx4i3dhyngb6446llwc218qqcp5x";
932− type = "gem";
933− };
934− version = "1.3.0";
935− };
936− aws-sdk-mobile = {
937− dependencies = ["aws-sdk-core" "aws-sigv4"];
938− source = {
939− remotes = ["https://rubygems.org"];
940− sha256 = "1kvx23q0dcf4kznf72fq6vrz2wzprim1n87a7jwwvqp1cm8dkh9s";
941− type = "gem";
942− };
943− version = "1.1.0";
944− };
945− aws-sdk-mq = {
946− dependencies = ["aws-sdk-core" "aws-sigv4"];
947− source = {
948− remotes = ["https://rubygems.org"];
949− sha256 = "1h258myrx75zvicpdb06bbls4d0fnpfqfp16yc0j5lmqdr6p74qn";
950− type = "gem";
951− };
952− version = "1.1.0";
953− };
954− aws-sdk-mturk = {
955− dependencies = ["aws-sdk-core" "aws-sigv4"];
956− source = {
957− remotes = ["https://rubygems.org"];
958− sha256 = "0kb5ii2lqiq8va1plyrna0zczgc9p2dgv0a17xx9pzfg2djvc7vz";
959− type = "gem";
960− };
961− version = "1.4.0";
962− };
963− aws-sdk-neptune = {
964− dependencies = ["aws-sdk-core" "aws-sigv4"];
965− source = {
966− remotes = ["https://rubygems.org"];
967− sha256 = "1rddn8y1cwnj5zahvln643sfb4ayddqmydrxibf5j1nqsvv46lg7";
968− type = "gem";
969− };
970− version = "1.2.0";
971− };
972− aws-sdk-opsworks = {
973− dependencies = ["aws-sdk-core" "aws-sigv4"];
974− source = {
975− remotes = ["https://rubygems.org"];
976− sha256 = "1mkjf0694daikkqsqygq1f34zw4wiwg57p8vxlwx5fxjbgwfi01a";
977− type = "gem";
978− };
979− version = "1.4.0";
980− };
981− aws-sdk-opsworkscm = {
982− dependencies = ["aws-sdk-core" "aws-sigv4"];
983− source = {
984− remotes = ["https://rubygems.org"];
985− sha256 = "06067wx6ihk9kj11789dlzag3j2b7zxk9yil4zxy0gv95w37ypzg";
986− type = "gem";
987− };
988− version = "1.3.0";
989− };
990− aws-sdk-organizations = {
991− dependencies = ["aws-sdk-core" "aws-sigv4"];
992− source = {
993− remotes = ["https://rubygems.org"];
994− sha256 = "1jhll8rgp78pwsd5wgfg4nwxkyzahlh0xrnddw3cx9qhzcb001xn";
995− type = "gem";
996− };
997− version = "1.10.0";
998− };
999− aws-sdk-pi = {
1000− dependencies = ["aws-sdk-core" "aws-sigv4"];
1001− source = {
1002− remotes = ["https://rubygems.org"];
1003− sha256 = "0xm7d9ssn4q2107gp90qsi8vjg87wdl5py55qq76m79xmp2i08wi";
1004− type = "gem";
1005− };
1006− version = "1.1.0";
1007− };
1008− aws-sdk-pinpoint = {
1009− dependencies = ["aws-sdk-core" "aws-sigv4"];
1010− source = {
1011− remotes = ["https://rubygems.org"];
1012− sha256 = "023yvhr6xdisyyx9p104hyaq2vy9rs0n43h2dc5nbm58a1bm2zsn";
1013− type = "gem";
1014− };
1015− version = "1.6.0";
1016− };
1017− aws-sdk-polly = {
1018− dependencies = ["aws-sdk-core" "aws-sigv4"];
1019− source = {
1020− remotes = ["https://rubygems.org"];
1021− sha256 = "0g98zchw6ycnz3anvpc6glxj9kal71mn78gr2i37awb6z0j3mk1g";
1022− type = "gem";
1023− };
1024− version = "1.6.0";
1025− };
1026− aws-sdk-pricing = {
1027− dependencies = ["aws-sdk-core" "aws-sigv4"];
1028− source = {
1029− remotes = ["https://rubygems.org"];
1030− sha256 = "1hm8m1jhf6qfpy1866ykvvnc51mfbp89mfby6z6yxy00fz6mvax5";
1031− type = "gem";
1032− };
1033− version = "1.1.0";
1034− };
1035− aws-sdk-rds = {
1036− dependencies = ["aws-sdk-core" "aws-sigv4"];
1037− source = {
1038− remotes = ["https://rubygems.org"];
1039− sha256 = "009ns5wfcrxan5hhzsj7gpcwnni2ydq79mk2i3lj4gw87k9kr9zx";
1040− type = "gem";
1041− };
1042− version = "1.23.0";
1043− };
1044− aws-sdk-redshift = {
1045− dependencies = ["aws-sdk-core" "aws-sigv4"];
1046− source = {
1047− remotes = ["https://rubygems.org"];
1048− sha256 = "0rp9zm846rx9vm2qvh238gzixbb7r58xbrrfk0ipsrw6v19b4my4";
1049− type = "gem";
1050− };
1051− version = "1.5.0";
21+ version = "1.0.2";
105222 };
1053− aws-sdk-rekognition = {
1054− dependencies = ["aws-sdk-core" "aws-sigv4"];
23+ aws-partitions = {
24+ groups = ["default"];
25+ platforms = [];
105526 source = {
105627 remotes = ["https://rubygems.org"];
1057− sha256 = "1j399i23anlj252rwnj3dcm66787nspfj8hyazfsgb5ww7b2day3";
28+ sha256 = "08i5a52b42x1q26j4rzaxp4hhwl0wzw12jbbjxjifnwi2dm57biy";
105829 type = "gem";
105930 };
1060− version = "1.5.0";
31+ version = "1.149.0";
106132 };
1062− aws-sdk-resourcegroups = {
1063− dependencies = ["aws-sdk-core" "aws-sigv4"];
33+ aws-sdk-core = {
34+ dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
35+ groups = ["default"];
36+ platforms = [];
106437 source = {
106538 remotes = ["https://rubygems.org"];
1066− sha256 = "0f878grncnyxlkml525apx3l28mmq96gfi5vpcjhcw9apz58qclf";
39+ sha256 = "1sng9iagk96r8986gsacljnw357famz5x4xa1wk9xm4cx0bmpm5i";
106740 type = "gem";
106841 };
1069− version = "1.1.0";
42+ version = "3.48.3";
107043 };
1071− aws-sdk-resourcegroupstaggingapi = {
44+ aws-sdk-firehose = {
107245 dependencies = ["aws-sdk-core" "aws-sigv4"];
46+ groups = ["default"];
47+ platforms = [];
107348 source = {
107449 remotes = ["https://rubygems.org"];
1075− sha256 = "0wr75f1gi449x12hai1yjzrlw6cql3z4jyc1hd68wppyf6f1s8kw";
1076− type = "gem";
1077− };
1078− version = "1.1.0";
1079− };
1080− aws-sdk-resources = {
1081− 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"];
1082− source = {
1083− remotes = ["https://rubygems.org"];
1084− sha256 = "15z91flcf5daz7v5sfrib5sxm4gk6w66jlh93is0ixr6hwanqb2h";
50+ sha256 = "0f7s1vqs1qga6jzvjgg4x4hcz1rdycwry5dcizidzffwn9sp9iy0";
108551 type = "gem";
108652 };
1087− version = "3.22.0";
53+ version = "1.14.0";
108854 };
1089− aws-sdk-route53 = {
55+ aws-sdk-kinesis = {
109056 dependencies = ["aws-sdk-core" "aws-sigv4"];
57+ groups = ["default"];
58+ platforms = [];
109159 source = {
109260 remotes = ["https://rubygems.org"];
1093− sha256 = "1ga3rd1b3fgg8z46490gjkf2a7j1vys7mf3wi4qmwg8ijs8gva4c";
61+ sha256 = "005dj7m3zi8gkda5g40a0wxlx48g0w5cz4k7783g2p6c0h5wwdsb";
109462 type = "gem";
109563 };
1096− version = "1.10.1";
64+ version = "1.13.1";
109765 };
1098− aws-sdk-route53domains = {
66+ aws-sdk-kms = {
109967 dependencies = ["aws-sdk-core" "aws-sigv4"];
68+ groups = ["default"];
69+ platforms = [];
110070 source = {
110171 remotes = ["https://rubygems.org"];
1102− sha256 = "02nzhks6kjpdakm3xcc5373g3dnn45a9gr70vc8jhdjyarhcasbk";
72+ sha256 = "1m64sb5nnpryjmjbgvr5lmlrd06wvafd0ss9i9zf3fsi39hqaicg";
110373 type = "gem";
110474 };
1105− version = "1.3.0";
75+ version = "1.16.0";
110676 };
110777 aws-sdk-s3 = {
110878 dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
79+ groups = ["default"];
80+ platforms = [];
110981 source = {
111082 remotes = ["https://rubygems.org"];
1111− sha256 = "0sxd6iwyg54qdzqxqhww1qnhg4z1il1impkg2g8ksgr9q2ykf4jd";
1112− type = "gem";
1113− };
1114− version = "1.17.0";
1115− };
1116− aws-sdk-sagemaker = {
1117− dependencies = ["aws-sdk-core" "aws-sigv4"];
1118− source = {
1119− remotes = ["https://rubygems.org"];
1120− sha256 = "11arjp9mcgy3b8rp6dpdla0zcsrv40sw7cc0azplayk5n6cislx1";
1121− type = "gem";
1122− };
1123− version = "1.11.0";
1124− };
1125− aws-sdk-sagemakerruntime = {
1126− dependencies = ["aws-sdk-core" "aws-sigv4"];
1127− source = {
1128− remotes = ["https://rubygems.org"];
1129− sha256 = "1zyinypfjsf7kp6dh7wbk3f5x3qhj8p76pv332pknrgk94v6rn3i";
1130− type = "gem";
1131− };
1132− version = "1.1.0";
1133− };
1134− aws-sdk-secretsmanager = {
1135− dependencies = ["aws-sdk-core" "aws-sigv4"];
1136− source = {
1137− remotes = ["https://rubygems.org"];
1138− sha256 = "1b5xk5icz664rjjcy9ijwfg4nr1chg0pbxyrmzy0agh88vxgp71z";
1139− type = "gem";
1140− };
1141− version = "1.10.0";
1142− };
1143− aws-sdk-serverlessapplicationrepository = {
1144− dependencies = ["aws-sdk-core" "aws-sigv4"];
1145− source = {
1146− remotes = ["https://rubygems.org"];
1147− sha256 = "1n7lzzvpyryv1v3pai3yxk2w95zk2yglmdh0k3h84n6z3w6jlgr3";
1148− type = "gem";
1149− };
1150− version = "1.4.0";
1151− };
1152− aws-sdk-servicecatalog = {
1153− dependencies = ["aws-sdk-core" "aws-sigv4"];
1154− source = {
1155− remotes = ["https://rubygems.org"];
1156− sha256 = "13dhxxp1nmzs71ripdi4yas1wm17w3ks22by6qlbnqy9zwb0r6jg";
1157− type = "gem";
1158− };
1159− version = "1.6.0";
1160− };
1161− aws-sdk-servicediscovery = {
1162− dependencies = ["aws-sdk-core" "aws-sigv4"];
1163− source = {
1164− remotes = ["https://rubygems.org"];
1165− sha256 = "033fynzwr4j6idlk3p5rqk94n0ayxrwjcziky5hnfj2aic2yj3lf";
1166− type = "gem";
1167− };
1168− version = "1.3.0";
1169− };
1170− aws-sdk-ses = {
1171− dependencies = ["aws-sdk-core" "aws-sigv4"];
1172− source = {
1173− remotes = ["https://rubygems.org"];
1174− sha256 = "0aa3vq1lscb5cmcc10s38pdw2crdsfjd4gpb6d9j5d5z8wbpqjhz";
1175− type = "gem";
1176− };
1177− version = "1.8.0";
1178− };
1179− aws-sdk-shield = {
1180− dependencies = ["aws-sdk-core" "aws-sigv4"];
1181− source = {
1182− remotes = ["https://rubygems.org"];
1183− sha256 = "12imklik3j9l4fchyj4q6wpiw27kkm4m29accjwkxxikh70w9q0l";
1184− type = "gem";
1185− };
1186− version = "1.3.0";
1187− };
1188− aws-sdk-simpledb = {
1189− dependencies = ["aws-sdk-core" "aws-sigv2"];
1190− source = {
1191− remotes = ["https://rubygems.org"];
1192− sha256 = "16qrczxn096aanan2qrvbbk398sqlfiawviz72z9y31pxds7699d";
1193− type = "gem";
1194− };
1195− version = "1.1.0";
1196− };
1197− aws-sdk-sms = {
1198− dependencies = ["aws-sdk-core" "aws-sigv4"];
1199− source = {
1200− remotes = ["https://rubygems.org"];
1201− sha256 = "1d16b5s6x894fagk6mzvli4n9rpsv4gx1xw445nl49jc8z3b941l";
83+ sha256 = "1bnihahz0va36jcw5wifw6ad0fdarl0lsils6h50wpvzcxzmlm2i";
120284 type = "gem";
120385 };
1204− version = "1.1.0";
1205− };
1206− aws-sdk-snowball = {
1207− dependencies = ["aws-sdk-core" "aws-sigv4"];
1208− source = {
1209− remotes = ["https://rubygems.org"];
1210− sha256 = "17kk7n83zbhms7bvavlasw13ydsiqzm8l2p6dpsa3cjqvs7bn9bw";
1211− type = "gem";
1212− };
1213− version = "1.3.0";
1214− };
1215− aws-sdk-sns = {
1216− dependencies = ["aws-sdk-core" "aws-sigv4"];
1217− source = {
1218− remotes = ["https://rubygems.org"];
1219− sha256 = "0pkv99yqilpklrhwhxr5lv0xma1irk0j7q5myw220yl84d7c6m04";
1220− type = "gem";
1221− };
1222− version = "1.3.0";
86+ version = "1.36.0";
122387 };
122488 aws-sdk-sqs = {
122589 dependencies = ["aws-sdk-core" "aws-sigv4"];
90+ groups = ["default"];
91+ platforms = [];
122692 source = {
122793 remotes = ["https://rubygems.org"];
1228− sha256 = "0m4lk45bfanxyq3rz428az2bbz2g3xbzq40754d81m0b17kyz6nc";
1229− type = "gem";
1230− };
1231− version = "1.4.0";
1232− };
1233− aws-sdk-ssm = {
1234− dependencies = ["aws-sdk-core" "aws-sigv4"];
1235− source = {
1236− remotes = ["https://rubygems.org"];
1237− sha256 = "0w5idgdqp3z9s0cf84r66ha1npjhszp0zd3w43rlp96m1z9m8pk8";
1238− type = "gem";
1239− };
1240− version = "1.18.0";
1241− };
1242− aws-sdk-states = {
1243− dependencies = ["aws-sdk-core" "aws-sigv4"];
1244− source = {
1245− remotes = ["https://rubygems.org"];
1246− sha256 = "0sg5z9mgn76l81zgigxrxwnn710gigp6iragc3gvz0cdfwwzd33f";
1247− type = "gem";
1248− };
1249− version = "1.3.0";
1250− };
1251− aws-sdk-storagegateway = {
1252− dependencies = ["aws-sdk-core" "aws-sigv4"];
1253− source = {
1254− remotes = ["https://rubygems.org"];
1255− sha256 = "078j56x8jllk5dsb8crk33336kmcgs83p2achlw5j10mlfzlra6z";
94+ sha256 = "1cpmimcnjfwrqv1nmaxp4yyxmh50wg83ccihj8hiafkazg75kfx0";
125695 type = "gem";
125796 };
1258− version = "1.6.0";
1259− };
1260− aws-sdk-support = {
1261− dependencies = ["aws-sdk-core" "aws-sigv4"];
1262− source = {
1263− remotes = ["https://rubygems.org"];
1264− sha256 = "0bg642zz7nn3dfr039pgry44js9jlr31yq47rsqzhl6p3qh9yisi";
1265− type = "gem";
1266− };
1267− version = "1.1.0";
97+ version = "1.13.0";
126898 };
1269− aws-sdk-swf = {
1270− dependencies = ["aws-sdk-core" "aws-sigv4"];
99+ aws-sigv4 = {
100+ dependencies = ["aws-eventstream"];
101+ groups = ["default"];
102+ platforms = [];
1271103 source = {
1272104 remotes = ["https://rubygems.org"];
1273− sha256 = "108gzaw0y83vncbv6rzaww4950cycwh8crcw3vf2av6w0mbqi61f";
105+ sha256 = "1dfc8i5cxjwlvi4b665lbpbwvks8a6wfy3vfmwr3pjdmxwdmc2cs";
1274106 type = "gem";
1275107 };
1276108 version = "1.1.0";
1277109 };
1278− aws-sdk-transcribeservice = {
1279− dependencies = ["aws-sdk-core" "aws-sigv4"];
1280− source = {
1281− remotes = ["https://rubygems.org"];
1282− sha256 = "1z66aqfh1s561wa9dqasvbb4shxb2chp12i8h6hs6lxsrpihxbi0";
1283− type = "gem";
1284− };
1285− version = "1.3.0";
1286− };
1287− aws-sdk-translate = {
1288− dependencies = ["aws-sdk-core" "aws-sigv4"];
1289− source = {
1290− remotes = ["https://rubygems.org"];
1291− sha256 = "17wprz7c8h8bfi1pv8pw2jll4iaixs9v2zd6iyy33zy0ssyzp9jc";
1292− type = "gem";
1293− };
1294− version = "1.2.0";
1295− };
1296− aws-sdk-waf = {
1297− dependencies = ["aws-sdk-core" "aws-sigv4"];
1298− source = {
1299− remotes = ["https://rubygems.org"];
1300− sha256 = "1kxaspfpgsrwm1vdyqhbjw1l40z5ygkx9if5lfqh80906rns9gwz";
1301− type = "gem";
1302− };
1303− version = "1.5.0";
1304− };
1305− aws-sdk-wafregional = {
1306− dependencies = ["aws-sdk-core" "aws-sigv4"];
1307− source = {
1308− remotes = ["https://rubygems.org"];
1309− sha256 = "1ryrx7zh7dmxzrvky3kx6dvz22v0s919jkdhqh8rx65p97ikml2c";
1310− type = "gem";
1311− };
1312− version = "1.5.0";
1313− };
1314− aws-sdk-workdocs = {
1315− dependencies = ["aws-sdk-core" "aws-sigv4"];
1316− source = {
1317− remotes = ["https://rubygems.org"];
1318− sha256 = "07grgjkzg31n3k0ig70gj6pjix44jwnl54lw4pn4yqld3472r296";
1319− type = "gem";
1320− };
1321− version = "1.2.0";
1322− };
1323− aws-sdk-workmail = {
1324− dependencies = ["aws-sdk-core" "aws-sigv4"];
1325− source = {
1326− remotes = ["https://rubygems.org"];
1327− sha256 = "04yak9s80kcx0vnz9ghbis5qj274rpkwga2391kky8r2gf40lpn2";
1328− type = "gem";
1329− };
1330− version = "1.2.0";
1331− };
1332− aws-sdk-workspaces = {
1333− dependencies = ["aws-sdk-core" "aws-sigv4"];
110+ bson = {
111+ groups = ["default"];
112+ platforms = [];
1334113 source = {
1335114 remotes = ["https://rubygems.org"];
1336− sha256 = "1vq0bayq1ryzd9z4y70w39h1ag2jj6k59bv72agdafrszv13fggf";
115+ sha256 = "1kgim98b41cj0njlqv1bwvx2m6gw9n7ilwklfn9hivfg096bzl8l";
1337116 type = "gem";
1338117 };
1339− version = "1.3.0";
118+ version = "4.4.2";
1340119 };
1341− aws-sdk-xray = {
1342− dependencies = ["aws-sdk-core" "aws-sigv4"];
120+ "cool.io" = {
121+ groups = ["default"];
122+ platforms = [];
1343123 source = {
1344124 remotes = ["https://rubygems.org"];
1345− sha256 = "00n7nrx5qfbcv94hdlh623nhv269z9abfkb6mj5dmjw4hzpm8d31";
125+ sha256 = "0l836z3qgrl5829q48qaz1zngqqxy2k0l61swqm0amhyfcgfbz1m";
1346126 type = "gem";
1347127 };
1348− version = "1.3.0";
128+ version = "1.5.4";
1349129 };
1350− aws-sigv2 = {
130+ dig_rb = {
131+ groups = ["default"];
132+ platforms = [];
1351133 source = {
1352134 remotes = ["https://rubygems.org"];
1353− sha256 = "1191i9c0kkiyfs3vfwgfxc8kq19rg1q4lkackz56yffv05yp5ng3";
135+ sha256 = "12dbb1pl2vr9z7yy2zsbsjaj4hw89y56wll6kd8422mylmcw7bx4";
1354136 type = "gem";
1355137 };
1356138 version = "1.0.1";
1357139 };
1358− aws-sigv4 = {
1359− source = {
1360− remotes = ["https://rubygems.org"];
1361− sha256 = "1hzndv113i6bgy2n72i5l3mwn8vjnb6hhjxfkpn9mm2p5ra77yk7";
1362− type = "gem";
1363− };
1364− version = "1.0.3";
1365− };
1366− bson = {
1367− source = {
1368− remotes = ["https://rubygems.org"];
1369− sha256 = "07baxjrd8rb5gfsv7hh1akjqcpwih76f1711bwjzp228c79ny2na";
1370− type = "gem";
1371− };
1372− version = "4.3.0";
1373− };
1374− "cool.io" = {
1375− source = {
1376− remotes = ["https://rubygems.org"];
1377− sha256 = "03wwgs427nmic6aa365d7kyfbljpb1ra6syywffxfmz9382xswcp";
1378− type = "gem";
1379− };
1380− version = "1.5.3";
1381− };
1382− dig_rb = {
140+ digest-crc = {
141+ groups = ["default"];
142+ platforms = [];
1383143 source = {
1384144 remotes = ["https://rubygems.org"];
1385− sha256 = "12dbb1pl2vr9z7yy2zsbsjaj4hw89y56wll6kd8422mylmcw7bx4";
145+ sha256 = "08q8p0fk51aa6dwhy2xmjaj76arcq9nn22gyia162jmqpccfx50l";
1386146 type = "gem";
1387147 };
1388− version = "1.0.1";
148+ version = "0.4.1";
1389149 };
1390150 elasticsearch = {
1391151 dependencies = ["elasticsearch-api" "elasticsearch-transport"];
152+ groups = ["default"];
153+ platforms = [];
1392154 source = {
1393155 remotes = ["https://rubygems.org"];
1394− sha256 = "162a7aiajs7w3rak21y6jidik7zhkm104wcx25190llyqbqkvlp9";
156+ sha256 = "1kx13w90dnmrfgwgm86h8wsmjmpv19qxvd1f6xxrdjmw0ij0vyqn";
1395157 type = "gem";
1396158 };
1397− version = "6.1.0";
159+ version = "6.3.0";
1398160 };
1399161 elasticsearch-api = {
1400162 dependencies = ["multi_json"];
163+ groups = ["default"];
164+ platforms = [];
1401165 source = {
1402166 remotes = ["https://rubygems.org"];
1403− sha256 = "0q9shhpifl6cir68zxv30mjjybxsx39asqnircrgs4lqsb20j1n7";
167+ sha256 = "06dji10nahhqd04igfwcqb1d521lv7gy40g7nv0mx3nnb1c6ksbm";
1404168 type = "gem";
1405169 };
1406− version = "6.1.0";
170+ version = "6.3.0";
1407171 };
1408172 elasticsearch-transport = {
1409173 dependencies = ["faraday" "multi_json"];
174+ groups = ["default"];
175+ platforms = [];
1410176 source = {
1411177 remotes = ["https://rubygems.org"];
1412− sha256 = "1dmb587mp526q1wvb1j13rjj13vxl4fcpmm899ipyr88spld5vc7";
178+ sha256 = "025c0plj3ydrykmwpwhn6vdxfgf4b7xr4gg5dzdd5ck9frvqb6mz";
1413179 type = "gem";
1414180 };
1415− version = "6.1.0";
181+ version = "6.3.0";
1416182 };
1417183 excon = {
184+ groups = ["default"];
185+ platforms = [];
1418186 source = {
1419187 remotes = ["https://rubygems.org"];
1420188 sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2";
@@ -1424,15 +192,19 @@
1424192 };
1425193 faraday = {
1426194 dependencies = ["multipart-post"];
195+ groups = ["default"];
196+ platforms = [];
1427197 source = {
1428198 remotes = ["https://rubygems.org"];
1429− sha256 = "14lg0c4bphk16rccc5jmaan6nfcvmy0caiahpc61f9zfwpsj7ymg";
199+ sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0";
1430200 type = "gem";
1431201 };
1432− version = "0.15.2";
202+ version = "0.15.4";
1433203 };
1434204 fluent-config-regexp-type = {
1435205 dependencies = ["fluentd"];
206+ groups = ["default"];
207+ platforms = [];
1436208 source = {
1437209 remotes = ["https://rubygems.org"];
1438210 sha256 = "0hk0vxcmlbid7n6piyv3x83j5gyiz7in397l9x3c6nh69wicy7gm";
@@ -1442,42 +214,52 @@
1442214 };
1443215 fluent-plugin-elasticsearch = {
1444216 dependencies = ["elasticsearch" "excon" "fluentd"];
217+ groups = ["default"];
218+ platforms = [];
1445219 source = {
1446220 remotes = ["https://rubygems.org"];
1447− sha256 = "1jh7wpj46753mii98ddafl5yas0iw8dc1b87lzgdyfri9z8cbfv1";
221+ sha256 = "115y11r7rd4hd9gc2lngm6cas1119fas87s75x6iaykqg8hlr99l";
1448222 type = "gem";
1449223 };
1450− version = "2.11.1";
224+ version = "3.4.1";
1451225 };
1452226 fluent-plugin-kafka = {
1453227 dependencies = ["fluentd" "ltsv" "ruby-kafka"];
228+ groups = ["default"];
229+ platforms = [];
1454230 source = {
1455231 remotes = ["https://rubygems.org"];
1456− sha256 = "16r7ydlnb1ba7adk3f95v3x1qjk22cifd9bvz71099m17njw56g1";
232+ sha256 = "079isjc1788fbhagrn2qfrp6mcfw0b6kl6dpnrwpwv9865h75hmm";
1457233 type = "gem";
1458234 };
1459− version = "0.7.4";
235+ version = "0.9.2";
1460236 };
1461237 fluent-plugin-kinesis = {
1462− dependencies = ["aws-sdk" "fluentd" "google-protobuf"];
238+ dependencies = ["aws-sdk-firehose" "aws-sdk-kinesis" "fluentd" "google-protobuf"];
239+ groups = ["default"];
240+ platforms = [];
1463241 source = {
1464242 remotes = ["https://rubygems.org"];
1465− sha256 = "14hsvbskfviq11408qglqx1434hv6i7qbgqy8nnii8a657fccvxy";
243+ sha256 = "14jqr13k50vs29akjpi0prcs1fdjy335prlqylvri7bc1cmfkhz3";
1466244 type = "gem";
1467245 };
1468− version = "2.1.1";
246+ version = "3.0.0";
1469247 };
1470248 fluent-plugin-mongo = {
1471249 dependencies = ["fluentd" "mongo"];
250+ groups = ["default"];
251+ platforms = [];
1472252 source = {
1473253 remotes = ["https://rubygems.org"];
1474− sha256 = "1w7fla5172x7bll10zja0sg4n0gzkqa191jf6zradhb6416qd355";
254+ sha256 = "1p5c7j3yx4cjrn4ljxwghrp8yh0rcdra1iafc67i92s1sl8b70dq";
1475255 type = "gem";
1476256 };
1477− version = "1.1.1";
257+ version = "1.2.2";
1478258 };
1479259 fluent-plugin-record-reformer = {
1480260 dependencies = ["fluentd"];
261+ groups = ["default"];
262+ platforms = [];
1481263 source = {
1482264 remotes = ["https://rubygems.org"];
1483265 sha256 = "1gwfrfyi9is4l9q4ih3c4l3c9qvyh00jnd2qajdpdh5xjj2m7akn";
@@ -1487,33 +269,41 @@
1487269 };
1488270 fluent-plugin-rewrite-tag-filter = {
1489271 dependencies = ["fluent-config-regexp-type" "fluentd"];
272+ groups = ["default"];
273+ platforms = [];
1490274 source = {
1491275 remotes = ["https://rubygems.org"];
1492− sha256 = "1xra33l2pid84qmgr0ni9dmd114l035z9j4g66wdfyihncnaaamp";
276+ sha256 = "0kf8p1s02pwhkks82kmkkbfbf4qlhhqiczqah4w0dnp86wp6xyw5";
1493277 type = "gem";
1494278 };
1495− version = "2.1.0";
279+ version = "2.2.0";
1496280 };
1497281 fluent-plugin-s3 = {
1498282 dependencies = ["aws-sdk-s3" "aws-sdk-sqs" "fluentd"];
283+ groups = ["default"];
284+ platforms = [];
1499285 source = {
1500286 remotes = ["https://rubygems.org"];
1501− sha256 = "102d85igcnnlha8j0vw3pvc0425d38c9r0pryqhz7v1j4p2igi27";
287+ sha256 = "16zaxvf3rs5lmd933sgyrxkrws0qcd0z2ypbky45gyq8si1dpwcl";
1502288 type = "gem";
1503289 };
1504− version = "1.1.3";
290+ version = "1.1.9";
1505291 };
1506292 fluent-plugin-scribe = {
1507293 dependencies = ["fluentd" "thrift"];
294+ groups = ["default"];
295+ platforms = [];
1508296 source = {
1509297 remotes = ["https://rubygems.org"];
1510− sha256 = "00m19w7p22adq0yx1h7h2h4ckw9kh5j458a8lawgmbazw2dz0zxi";
298+ sha256 = "19m37d0saknifjg8kva96pgsc7zsmdlwvwiy9gvhi2d6c7bq3q30";
1511299 type = "gem";
1512300 };
1513− version = "0.10.14";
301+ version = "1.0.0";
1514302 };
1515303 fluent-plugin-webhdfs = {
1516304 dependencies = ["fluentd" "webhdfs"];
305+ groups = ["default"];
306+ platforms = [];
1517307 source = {
1518308 remotes = ["https://rubygems.org"];
1519309 sha256 = "1yyv3f0g30x9dzhq74b5cq8z0wbyppw9bb6152v6yrwz25b16231";
@@ -1523,29 +313,38 @@
1523313 };
1524314 fluentd = {
1525315 dependencies = ["cool.io" "dig_rb" "http_parser.rb" "msgpack" "serverengine" "sigdump" "strptime" "tzinfo" "tzinfo-data" "yajl-ruby"];
316+ groups = ["default"];
317+ platforms = [];
1526318 source = {
1527319 remotes = ["https://rubygems.org"];
1528− sha256 = "02a7xzpq3vs3lgwawygbkzbsjr2p46945l6wc3bkvws47v33yr4d";
320+ sha256 = "1ppdfa03gzv97px7xhdx5nnzc15g8l7yp10jw87qyl5cp62kpx3c";
1529321 type = "gem";
1530322 };
1531− version = "1.2.3";
323+ version = "1.4.2";
1532324 };
1533325 google-protobuf = {
326+ groups = ["default"];
327+ platforms = [];
1534328 source = {
1535329 remotes = ["https://rubygems.org"];
1536− sha256 = "10r48i7g0387sd8a1cl8n2da54ar9nw29jshmydwmdrb8y5v5nic";
330+ sha256 = "04988m3hmllg4sl4syjb35x0wzsg7rj1nmvhx3d9ihml22w76gb2";
1537331 type = "gem";
1538332 };
1539− version = "3.6.0";
333+ version = "3.7.1";
1540334 };
1541335 "http_parser.rb" = {
336+ groups = ["default"];
337+ platforms = [];
1542338 source = {
339+ remotes = ["https://rubygems.org"];
1543340 sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
1544341 type = "gem";
1545342 };
1546343 version = "0.6.0";
1547344 };
1548345 jmespath = {
346+ groups = ["default"];
347+ platforms = [];
1549348 source = {
1550349 remotes = ["https://rubygems.org"];
1551350 sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf";
@@ -1554,31 +353,39 @@
1554353 version = "1.4.0";
1555354 };
1556355 ltsv = {
356+ groups = ["default"];
357+ platforms = [];
1557358 source = {
1558359 remotes = ["https://rubygems.org"];
1559− sha256 = "1alfq3g0mih4w86736ybnzqmknphm2z95c9q0wl765i4lrmxng11";
360+ sha256 = "0wrjvc5079zhpn62k1yflrf7js6vaysrg1qwggf7bj2zi0p5rhys";
1560361 type = "gem";
1561362 };
1562− version = "0.1.0";
363+ version = "0.1.2";
1563364 };
1564365 mongo = {
1565366 dependencies = ["bson"];
367+ groups = ["default"];
368+ platforms = [];
1566369 source = {
1567370 remotes = ["https://rubygems.org"];
1568− sha256 = "0qdy2prwr9hv9691xxl0zqgp1s24jm6pknd2vq829yy6a1fv8f87";
371+ sha256 = "0k0f1826hixqfqgsc9g6rdqrzr5pzy46hszmk6869pmvm638jah1";
1569372 type = "gem";
1570373 };
1571− version = "2.2.7";
374+ version = "2.6.4";
1572375 };
1573376 msgpack = {
377+ groups = ["default"];
378+ platforms = [];
1574379 source = {
1575380 remotes = ["https://rubygems.org"];
1576− sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864";
381+ sha256 = "0zs8v59d77wlx4yylyh0lglsj8sp9jrq11yqngdgn95avfhxjw0s";
1577382 type = "gem";
1578383 };
1579− version = "1.2.4";
384+ version = "1.2.9";
1580385 };
1581386 multi_json = {
387+ groups = ["default"];
388+ platforms = [];
1582389 source = {
1583390 remotes = ["https://rubygems.org"];
1584391 sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
@@ -1587,38 +394,50 @@
1587394 version = "1.13.1";
1588395 };
1589396 multipart-post = {
397+ groups = ["default"];
398+ platforms = [];
1590399 source = {
400+ remotes = ["https://rubygems.org"];
1591401 sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
1592402 type = "gem";
1593403 };
1594404 version = "2.0.0";
1595405 };
1596406 public_suffix = {
407+ groups = ["default"];
408+ platforms = [];
1597409 source = {
1598410 remotes = ["https://rubygems.org"];
1599− sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
411+ sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
1600412 type = "gem";
1601413 };
1602− version = "3.0.2";
414+ version = "3.0.3";
1603415 };
1604416 ruby-kafka = {
417+ dependencies = ["digest-crc"];
418+ groups = ["default"];
419+ platforms = [];
1605420 source = {
1606421 remotes = ["https://rubygems.org"];
1607− sha256 = "1k9p93zgyify9barnzc4di09pm8bdaywqx68149bmw0zzhghqdqa";
422+ sha256 = "0b5i6vazw9s26nwifwsbd95sl35l5krh3yp4z2zpp6lpp6al36db";
1608423 type = "gem";
1609424 };
1610− version = "0.6.7";
425+ version = "0.7.6";
1611426 };
1612427 serverengine = {
1613428 dependencies = ["sigdump"];
429+ groups = ["default"];
430+ platforms = [];
1614431 source = {
1615432 remotes = ["https://rubygems.org"];
1616− sha256 = "1gkm880njsi9x6vpb5grsspxb097hi8898drlbbkj1wl9qf2xv8l";
433+ sha256 = "01978684zvab2pbg7r8vm53n8m2h99pc9iqm1wy9gy67y1nxvz13";
1617434 type = "gem";
1618435 };
1619− version = "2.0.7";
436+ version = "2.1.0";
1620437 };
1621438 sigdump = {
439+ groups = ["default"];
440+ platforms = [];
1622441 source = {
1623442 remotes = ["https://rubygems.org"];
1624443 sha256 = "1mqf06iw7rymv54y7rgbmfi6ppddgjjmxzi3hrw658n1amp1gwhb";
@@ -1627,6 +446,8 @@
1627446 version = "0.2.4";
1628447 };
1629448 strptime = {
449+ groups = ["default"];
450+ platforms = [];
1630451 source = {
1631452 remotes = ["https://rubygems.org"];
1632453 sha256 = "1yj5wwa7wbhgi7w8d9ihpzpf99niw956fhyxddhayj09fgmdcxd8";
@@ -1635,6 +456,8 @@
1635456 version = "0.2.3";
1636457 };
1637458 thread_safe = {
459+ groups = ["default"];
460+ platforms = [];
1638461 source = {
1639462 remotes = ["https://rubygems.org"];
1640463 sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
@@ -1643,6 +466,8 @@
1643466 version = "0.3.6";
1644467 };
1645468 thrift = {
469+ groups = ["default"];
470+ platforms = [];
1646471 source = {
1647472 remotes = ["https://rubygems.org"];
1648473 sha256 = "0aj23ndh5n5yqcvp4c12y7vl5wvxpl66zncf6n6ax2zvb6ig44cv";
@@ -1652,6 +477,8 @@
1652477 };
1653478 tzinfo = {
1654479 dependencies = ["thread_safe"];
480+ groups = ["default"];
481+ platforms = [];
1655482 source = {
1656483 remotes = ["https://rubygems.org"];
1657484 sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
@@ -1661,15 +488,19 @@
1661488 };
1662489 tzinfo-data = {
1663490 dependencies = ["tzinfo"];
491+ groups = ["default"];
492+ platforms = [];
1664493 source = {
1665494 remotes = ["https://rubygems.org"];
1666− sha256 = "1fkihwl9k9pmygl6c4kdlzqv51hn33bvjnxs4q48gs4s63d8gva2";
495+ sha256 = "1105fp27d527k7rrq1yx1ikbzf1sra046ndayxikkjvay9ql61jz";
1667496 type = "gem";
1668497 };
1669− version = "1.2018.5";
498+ version = "1.2019.1";
1670499 };
1671500 webhdfs = {
1672501 dependencies = ["addressable"];
502+ groups = ["default"];
503+ platforms = [];
1673504 source = {
1674505 remotes = ["https://rubygems.org"];
1675506 sha256 = "0gs6xb9dz9bp5xc38yplfy48jcgj7jrj0zg0vgi7ydkxnkzkhbf2";
@@ -1678,11 +509,13 @@
1678509 version = "0.8.0";
1679510 };
1680511 yajl-ruby = {
512+ groups = ["default"];
513+ platforms = [];
1681514 source = {
1682515 remotes = ["https://rubygems.org"];
1683− sha256 = "01bk8pi6h9wdm0ikjqvl1nxlkrxv3q74m3yfg64va9wvk9sqjvvw";
516+ sha256 = "16v0w5749qjp13xhjgr2gcsvjv6mf35br7iqwycix1n2h7kfcckf";
1684517 type = "gem";
1685518 };
1686− version = "1.4.0";
519+ version = "1.4.1";
1687520 };
1688521}
pkgs/tools/misc/hdf5/0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patchdeleted−58
@@ -1,58 +0,0 @@
1−From 38c202df4db8eddd5e6f6f7d6506ce97912a3111 Mon Sep 17 00:00:00 2001
2−From: Dana Robinson <derobins@hdfgroup.org>
3−Date: Mon, 26 Nov 2018 22:10:06 -0800
4−Subject: [PATCH] Updated H5S to use the MPI-2 function MPI_Type_get_exten()
5− where available. OpenMPI 4.0 removed the deprecated MPI-1 MPI_type_extent()
6− call by default, so this avoids needing a special OpenMPI build.
7−
8−---
9− src/H5Smpio.c | 26 ++++++++++++++++++++++++--
10− 1 file changed, 24 insertions(+), 2 deletions(-)
11−
12−diff --git a/src/H5Smpio.c b/src/H5Smpio.c
13−index 2bd275a729..e71e2cb858 100644
14−--- a/src/H5Smpio.c
15−+++ b/src/H5Smpio.c
16−@@ -879,7 +879,18 @@ H5S_mpio_hyper_type(const H5S_t *space, size_t elmt_size,
17− HMPI_GOTO_ERROR(FAIL, "MPI_Type_contiguous failed", mpi_code)
18− }
19−
20−- MPI_Type_extent (inner_type, &inner_extent);
21−+#if MPI_VERSION >= 2
22−+{
23−+ /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default,
24−+ * so we're using the MPI-2 version even though we don't need the lb
25−+ * value.
26−+ */
27−+ MPI_Aint unused_lb_arg;
28−+ MPI_Type_get_extent(inner_type, &unused_lb_arg, &inner_extent);
29−+}
30−+#else
31−+ MPI_Type_extent(inner_type, &inner_extent);
32−+#endif
33− stride_in_bytes = inner_extent * (MPI_Aint)d[i].strid;
34−
35− /* If the element count is larger than what a 32 bit integer can hold,
36−@@ -1500,7 +1511,18 @@ static herr_t H5S_mpio_create_large_type (hsize_t num_elements,
37− }
38− }
39−
40−- MPI_Type_extent (old_type, &old_extent);
41−+#if MPI_VERSION >= 2
42−+{
43−+ /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default,
44−+ * so we're using the MPI-2 version even though we don't need the lb
45−+ * value.
46−+ */
47−+ MPI_Aint unused_lb_arg;
48−+ MPI_Type_get_extent(old_type, &unused_lb_arg, &old_extent);
49−+}
50−+#else
51−+ MPI_Type_extent(old_type, &old_extent);
52−+#endif
53−
54− /* Set up the arguments for MPI_Type_struct constructor */
55− type[0] = outer_type;
56−--
57−2.18.1
58−
pkgs/tools/misc/hdf5/0001-Yanked-all-MPI-1-calls.patchdeleted−115
@@ -1,115 +0,0 @@
1−From 8cf3bfb14bd2a80f13d269a9e84cd99f86f19254 Mon Sep 17 00:00:00 2001
2−From: Dana Robinson <derobins@hdfgroup.org>
3−Date: Tue, 27 Nov 2018 10:31:54 -0800
4−Subject: [PATCH] Yanked all MPI-1 calls
5−
6−---
7− src/H5.c | 2 +-
8− src/H5Smpio.c | 24 ++++++++----------------
9− testpar/t_cache.c | 20 ++++++++++----------
10− 3 files changed, 19 insertions(+), 27 deletions(-)
11−
12−diff --git a/src/H5.c b/src/H5.c
13−index d1967e611b..bf4643ca59 100644
14−--- a/src/H5.c
15−+++ b/src/H5.c
16−@@ -138,7 +138,7 @@ H5_init_library(void)
17− if (mpi_initialized && !mpi_finalized) {
18− int key_val;
19−
20−- if(MPI_SUCCESS != (mpi_code = MPI_Comm_create_keyval(MPI_NULL_COPY_FN,
21−+ if(MPI_SUCCESS != (mpi_code = MPI_Comm_create_keyval(MPI_COMM_NULL_COPY_FN,
22− (MPI_Comm_delete_attr_function *)H5_mpi_delete_cb,
23− &key_val, NULL)))
24− HMPI_GOTO_ERROR(FAIL, "MPI_Comm_create_keyval failed", mpi_code)
25−diff --git a/src/H5Smpio.c b/src/H5Smpio.c
26−index e71e2cb858..935d27972e 100644
27−--- a/src/H5Smpio.c
28−+++ b/src/H5Smpio.c
29−@@ -879,18 +879,14 @@ H5S_mpio_hyper_type(const H5S_t *space, size_t elmt_size,
30− HMPI_GOTO_ERROR(FAIL, "MPI_Type_contiguous failed", mpi_code)
31− }
32−
33−-#if MPI_VERSION >= 2
34−-{
35− /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default,
36− * so we're using the MPI-2 version even though we don't need the lb
37− * value.
38− */
39−- MPI_Aint unused_lb_arg;
40−- MPI_Type_get_extent(inner_type, &unused_lb_arg, &inner_extent);
41−-}
42−-#else
43−- MPI_Type_extent(inner_type, &inner_extent);
44−-#endif
45−+ {
46−+ MPI_Aint unused_lb_arg;
47−+ MPI_Type_get_extent(inner_type, &unused_lb_arg, &inner_extent);
48−+ }
49− stride_in_bytes = inner_extent * (MPI_Aint)d[i].strid;
50−
51− /* If the element count is larger than what a 32 bit integer can hold,
52−@@ -1511,18 +1507,14 @@ static herr_t H5S_mpio_create_large_type (hsize_t num_elements,
53− }
54− }
55−
56−-#if MPI_VERSION >= 2
57−-{
58− /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default,
59− * so we're using the MPI-2 version even though we don't need the lb
60− * value.
61− */
62−- MPI_Aint unused_lb_arg;
63−- MPI_Type_get_extent(old_type, &unused_lb_arg, &old_extent);
64−-}
65−-#else
66−- MPI_Type_extent(old_type, &old_extent);
67−-#endif
68−+ {
69−+ MPI_Aint unused_lb_arg;
70−+ MPI_Type_get_extent(old_type, &unused_lb_arg, &old_extent);
71−+ }
72−
73− /* Set up the arguments for MPI_Type_struct constructor */
74− type[0] = outer_type;
75−diff --git a/testpar/t_cache.c b/testpar/t_cache.c
76−index 5e15ec274c..ca5ded9ecf 100644
77−--- a/testpar/t_cache.c
78−+++ b/testpar/t_cache.c
79−@@ -1217,15 +1217,15 @@ setup_derived_types(void)
80− struct mssg_t sample; /* used to compute displacements */
81−
82− /* setup the displacements array */
83−- if ( ( MPI_SUCCESS != MPI_Address(&sample.req, &displs[0]) ) ||
84−- ( MPI_SUCCESS != MPI_Address(&sample.src, &displs[1]) ) ||
85−- ( MPI_SUCCESS != MPI_Address(&sample.dest, &displs[2]) ) ||
86−- ( MPI_SUCCESS != MPI_Address(&sample.mssg_num, &displs[3]) ) ||
87−- ( MPI_SUCCESS != MPI_Address(&sample.base_addr, &displs[4]) ) ||
88−- ( MPI_SUCCESS != MPI_Address(&sample.len, &displs[5]) ) ||
89−- ( MPI_SUCCESS != MPI_Address(&sample.ver, &displs[6]) ) ||
90−- ( MPI_SUCCESS != MPI_Address(&sample.count, &displs[7]) ) ||
91−- ( MPI_SUCCESS != MPI_Address(&sample.magic, &displs[8]) ) ) {
92−+ if ( ( MPI_SUCCESS != MPI_Get_address(&sample.req, &displs[0]) ) ||
93−+ ( MPI_SUCCESS != MPI_Get_address(&sample.src, &displs[1]) ) ||
94−+ ( MPI_SUCCESS != MPI_Get_address(&sample.dest, &displs[2]) ) ||
95−+ ( MPI_SUCCESS != MPI_Get_address(&sample.mssg_num, &displs[3]) ) ||
96−+ ( MPI_SUCCESS != MPI_Get_address(&sample.base_addr, &displs[4]) ) ||
97−+ ( MPI_SUCCESS != MPI_Get_address(&sample.len, &displs[5]) ) ||
98−+ ( MPI_SUCCESS != MPI_Get_address(&sample.ver, &displs[6]) ) ||
99−+ ( MPI_SUCCESS != MPI_Get_address(&sample.count, &displs[7]) ) ||
100−+ ( MPI_SUCCESS != MPI_Get_address(&sample.magic, &displs[8]) ) ) {
101−
102− nerrors++;
103− success = FALSE;
104−@@ -1245,7 +1245,7 @@ setup_derived_types(void)
105−
106− if ( success ) {
107−
108−- result = MPI_Type_struct(9, block_len, displs, mpi_types, &mpi_mssg_t);
109−+ result = MPI_Type_create_struct(9, block_len, displs, mpi_types, &mpi_mssg_t);
110−
111− if ( result != MPI_SUCCESS ) {
112−
113−--
114−2.18.1
115−
pkgs/tools/misc/hdf5/default.nix+2−6
@@ -16,11 +16,11 @@ assert !cpp || mpi == null;
1616let inherit (stdenv.lib) optional optionals; in
1717
1818stdenv.mkDerivation rec {
19− version = "1.10.4";
19+ version = "1.10.5";
2020 name = "hdf5-${version}";
2121 src = fetchurl {
2222 url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${name}/src/${name}.tar.bz2";
23− sha256 = "1pr85fa1sh2ky6ai2hs3f21lp252grl2cq3wbyi4rh7dm83gyrqj";
23+ sha256 = "0i3g6v521vigzbx8wpd32ibsiiw92r65ca3qdbn0d8fj8f4fmmk8";
2424 };
2525
2626 passthru = {
@@ -47,10 +47,6 @@ stdenv.mkDerivation rec {
4747
4848 patches = [
4949 ./bin-mv.patch
50− # upstream patches for openmpi-4 compatiblity
51− # To be removed with the upgrade to 1.10.5
52− ./0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch
53− ./0001-Yanked-all-MPI-1-calls.patch
5450 ];
5551
5652 postInstall = ''
pkgs/tools/misc/lolcat/Gemfile.lock+5−5
@@ -1,13 +1,13 @@
11GEM
22 remote: http://rubygems.org/
33 specs:
4− lolcat (99.9.19)
4+ lolcat (99.9.69)
55 manpages (~> 0.6.1)
6+ optimist (~> 3.0.0)
67 paint (~> 2.0.0)
7− trollop (~> 2.1.3)
88 manpages (0.6.1)
9− paint (2.0.1)
10− trollop (2.1.3)
9+ optimist (3.0.0)
10+ paint (2.0.3)
1111
1212PLATFORMS
1313 ruby
@@ -16,4 +16,4 @@ DEPENDENCIES
1616 lolcat
1717
1818BUNDLED WITH
19− 1.14.6
19+ 1.16.3
pkgs/tools/misc/lolcat/gemset.nix+9−9
@@ -1,12 +1,12 @@
11{
22 lolcat = {
3− dependencies = ["manpages" "paint" "trollop"];
3+ dependencies = ["manpages" "optimist" "paint"];
44 source = {
55 remotes = ["http://rubygems.org"];
6− sha256 = "05zm92ad0ws9fklpz1xk94hy95argwana01c6rr2xbx2q4mcil9m";
6+ sha256 = "0d1yh2ikyhyh7am4qznd6fzv2pyvk82xrnsrsbbyxzcqfz9x6aa9";
77 type = "gem";
88 };
9− version = "99.9.19";
9+ version = "99.9.69";
1010 };
1111 manpages = {
1212 source = {
@@ -16,20 +16,20 @@
1616 };
1717 version = "0.6.1";
1818 };
19− paint = {
19+ optimist = {
2020 source = {
2121 remotes = ["http://rubygems.org"];
22− sha256 = "1gnh9cihc84w4xbw51pg15crjvhblbq6nkzljrp7kmn3434nsg0d";
22+ sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j";
2323 type = "gem";
2424 };
25− version = "2.0.1";
25+ version = "3.0.0";
2626 };
27− trollop = {
27+ paint = {
2828 source = {
2929 remotes = ["http://rubygems.org"];
30− sha256 = "1rzx9rkacpq58dsvbbzs4cpybls1v1h36xskkfs5q2askpdr00wq";
30+ sha256 = "0ldb269l3pzkihmsws19cr9h3l6naw8c2fqpav8ck3nllnyiv7r2";
3131 type = "gem";
3232 };
33− version = "2.1.3";
33+ version = "2.0.3";
3434 };
3535}
pkgs/tools/misc/powerline-go/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildGoPackage rec {
44 pname = "powerline-go";
5− version = "1.11.0";
5+ version = "1.12.1";
66 name = "${pname}-${version}";
77 rev = "v${version}";
88
@@ -12,7 +12,7 @@ buildGoPackage rec {
1212 owner = "justjanne";
1313 repo = pname;
1414 inherit rev;
15− sha256 = "1s3d9p4jf23n63n6vx3frnw3wkmg3kyiazapixy66790qkx6ddi9";
15+ sha256 = "0r2n3hjgr7c7nwwcph7i2lv3709z9cyc8gmsinlzjwny998akyf4";
1616 };
1717
1818 goDeps = ./deps.nix;
pkgs/tools/misc/powerline-go/deps.nix+13−13
@@ -1,12 +1,12 @@
1−# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
1+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
22[
33 {
44 goPackagePath = "github.com/mattn/go-runewidth";
55 fetch = {
66 type = "git";
77 url = "https://github.com/mattn/go-runewidth";
8− rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb";
9− sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g";
8+ rev = "703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211";
9+ sha256 = "0znpyz71gajx3g0j2zp63nhjj2c07g16885vxv4ykwnrfmzbgk4w";
1010 };
1111 }
1212 {
@@ -14,8 +14,8 @@
1414 fetch = {
1515 type = "git";
1616 url = "https://github.com/shirou/gopsutil";
17− rev = "57f370e13068146efe1cb7129f79e5d51da8a242";
18− sha256 = "1ij0bbnfjj65afin8vhccr3cxvg6r0awmvcvb2ilza5wbbsslggb";
17+ rev = "2cbc9195c892b304060269ef280375236d2fcac9";
18+ sha256 = "1m66hhh37lxn525y2gnmh4ipc88c3wfiixr5ydywa9v1z90wxw5r";
1919 };
2020 }
2121 {
@@ -23,8 +23,8 @@
2323 fetch = {
2424 type = "git";
2525 url = "https://go.googlesource.com/crypto";
26− rev = "2d027ae1dddd4694d54f7a8b6cbe78dca8720226";
27− sha256 = "1fdab3scp9fm88jxwjw8a3hh5ykx6ads3zcacgy48k2n6b0rqrdw";
26+ rev = "38d8ce5564a5b71b2e3a00553993f1b9a7ae852f";
27+ sha256 = "1x52liy2540pw75sqsw4vpg41vq2dnmqpc0j5r7k6jxv6xmbr5mb";
2828 };
2929 }
3030 {
@@ -32,8 +32,8 @@
3232 fetch = {
3333 type = "git";
3434 url = "https://go.googlesource.com/sys";
35− rev = "9950ad118b73f9207b991f01920a3509c68f7f2b";
36− sha256 = "1607m89kpdxgc2lj14mrp02bg7c42g1zv0fzrl5961gvm5qzbjja";
35+ rev = "4b34438f7a67ee5f45cc6132e2bad873a20324e9";
36+ sha256 = "1xnsiaikz62wqjpaly1j4nqwp504gih5mgw9wdj1pp1d4bmx0vl0";
3737 };
3838 }
3939 {
@@ -41,8 +41,8 @@
4141 fetch = {
4242 type = "git";
4343 url = "https://go.googlesource.com/text";
44− rev = "7dd2c8130f5e924233f5543598300651c386d431";
45− sha256 = "0ja6skzplirb7dgf5d4wi0navinf8j5iakak020lwm7287wnpcrg";
44+ rev = "f4905fbd45b6790792202848439271c74074bbfd";
45+ sha256 = "184d6ap2g92jvx0532lymdqbnx9vi9ips4dq5lnqbby0caccc6r1";
4646 };
4747 }
4848 {
@@ -50,8 +50,8 @@
5050 fetch = {
5151 type = "git";
5252 url = "https://gopkg.in/yaml.v2";
53− rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
54− sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
53+ rev = "51d6538a90f86fe93ac480b35f37b2be17fef232";
54+ sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
5555 };
5656 }
5757]
pkgs/tools/networking/aria2/default.nix+6−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, autoreconfHook
22, openssl, c-ares, libxml2, sqlite, zlib, libssh2
3−, cppunit
3+, cppunit, sphinx
44, Security
55}:
66
@@ -23,13 +23,17 @@ stdenv.mkDerivation rec {
2323 })
2424 ];
2525
26− nativeBuildInputs = [ pkgconfig autoreconfHook ];
26+ nativeBuildInputs = [ pkgconfig autoreconfHook sphinx ];
2727
2828 buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ] ++
2929 stdenv.lib.optional stdenv.isDarwin Security;
3030
3131 configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" ];
3232
33+ prePatch = ''
34+ patchShebangs doc/manual-src/en/mkapiref.py
35+ '';
36+
3337 checkInputs = [ cppunit ];
3438 doCheck = false; # needs the net
3539
pkgs/tools/networking/brook/default.nixnew file+26
@@ -0,0 +1,26 @@
1+{ stdenv, buildGoPackage, fetchFromGitHub }:
2+
3+buildGoPackage rec {
4+ pname = "brook";
5+ version = "20190401";
6+
7+ goPackagePath = "github.com/txthinking/brook";
8+
9+ src = fetchFromGitHub {
10+ owner = "txthinking";
11+ repo = "${pname}";
12+ rev = "v${version}";
13+ sha256 = "0kx0dpvr3llpdzmw5bvzhdvwkmzrv6kqbsilx6rgrvyl61y9pyry";
14+ };
15+
16+ goDeps = ./deps.nix;
17+
18+ meta = with stdenv.lib; {
19+ homepage = https://github.com/txthinking/brook;
20+ description = "A cross-platform Proxy/VPN software";
21+ license = with licenses; [ gpl3 ];
22+ platforms = platforms.linux;
23+ maintainers = with maintainers; [ xrelkd ];
24+ };
25+}
26+
pkgs/tools/networking/brook/deps.nixnew file+173
@@ -0,0 +1,173 @@
1+[
2+ {
3+ goPackagePath = "github.com/urfave/cli";
4+ fetch = {
5+ type = "git";
6+ url = "https://github.com/urfave/cli";
7+ rev = "a1c7408de3f632d86eee604a3bb755f1ffb68226";
8+ sha256 = "1fq0amfgpccf35nll7xw0k6smwrb7h0wy62n70kfd9kvh64n8hbn";
9+ };
10+ }
11+ {
12+ goPackagePath = "github.com/bitly/go-simplejson";
13+ fetch = {
14+ type = "git";
15+ url = "https://github.com/bitly/go-simplejson";
16+ rev = "9db4a59bd4d803ae0c173a7d8a538e056cd59d57";
17+ sha256 = "0cbnjzjq55jnzk07zdk7nb96yzgpyawm1r6km3xignn8ih4bnn6g";
18+ };
19+ }
20+ {
21+ goPackagePath = "github.com/fatih/structs";
22+ fetch = {
23+ type = "git";
24+ url = "https://github.com/fatih/structs";
25+ rev = "878a968ab22548362a09bdb3322f98b00f470d46";
26+ sha256 = "15nkffa8ylr5kkv52gyry675l8bzv3c0xx39j0fzz0vp2kcjyy8x";
27+ };
28+ }
29+ {
30+ goPackagePath = "github.com/go-sql-driver/mysql";
31+ fetch = {
32+ type = "git";
33+ url = "https://github.com/go-sql-driver/mysql";
34+ rev = "93c3765e9bb2e29c6a63277c9f829dae34ec24eb";
35+ sha256 = "043yalxp97vc9xsd5npms0h6slxrlzf8dzvd9l0wcxa8v0cl9lp6";
36+ };
37+ }
38+ {
39+ goPackagePath = "github.com/jinzhu/inflection";
40+ fetch = {
41+ type = "git";
42+ url = "https://github.com/jinzhu/inflection";
43+ rev = "04140366298a54a039076d798123ffa108fff46c";
44+ sha256 = "1s4qcnwaajp3c5ykwx4dfy32hykwsm0ki7kx8lcw8b0z0grkz6qh";
45+ };
46+ }
47+ {
48+ goPackagePath = "github.com/jmoiron/sqlx";
49+ fetch = {
50+ type = "git";
51+ url = "https://github.com/jmoiron/sqlx";
52+ rev = "1d3423c595d749e4613fce663591b44ae539d377";
53+ sha256 = "0947211fqibv9sqsk22lfnk080vqnsxmsan9fff5phygbmzbhzzb";
54+ };
55+ }
56+ {
57+ goPackagePath = "github.com/mdp/qrterminal";
58+ fetch = {
59+ type = "git";
60+ url = "https://github.com/mdp/qrterminal";
61+ rev = "28b49810f53911623d0a538d8edc01b8cbe2bd0e";
62+ sha256 = "17dq5niw57r1iq1rn1crpgbq1ydrcxqpzc9gj7dd1snc0p9n1rv1";
63+ };
64+ }
65+ {
66+ goPackagePath = "github.com/miekg/dns";
67+ fetch = {
68+ type = "git";
69+ url = "https://github.com/miekg/dns";
70+ rev = "73601d4aed9d844322611759d7f3619110b7c88e";
71+ sha256 = "1frnj97bbch1qhg55fx2yz6mdjsz8fw94sj7pkrjms239j7vqcvm";
72+ };
73+ }
74+ {
75+ goPackagePath = "github.com/patrickmn/go-cache";
76+ fetch = {
77+ type = "git";
78+ url = "https://github.com/patrickmn/go-cache";
79+ rev = "5633e0862627c011927fa39556acae8b1f1df58a";
80+ sha256 = "1zjk6yvig68zcbipa85dxz9xa82fk4zp4q33hwzxdv6h68wga5bs";
81+ };
82+ }
83+ {
84+ goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
85+ fetch = {
86+ type = "git";
87+ url = "https://github.com/shurcooL/sanitized_anchor_name";
88+ rev = "7bfe4c7ecddb3666a94b053b422cdd8f5aaa3615";
89+ sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f";
90+ };
91+ }
92+ {
93+ goPackagePath = "github.com/txthinking/gotun2socks";
94+ fetch = {
95+ type = "git";
96+ url = "https://github.com/txthinking/gotun2socks";
97+ rev = "35016fdae05e78db993d43f55eb96ddbe3958252";
98+ sha256 = "11rl8pqyd6jzi5alpymzi0i5q7pk2492di44v85g7r24y6livrjg";
99+ };
100+ }
101+ {
102+ goPackagePath = "github.com/txthinking/mailx";
103+ fetch = {
104+ type = "git";
105+ url = "https://github.com/txthinking/mailx";
106+ rev = "ebc2af2e1aa8d2178c30786c18eb138fbe40010d";
107+ sha256 = "02h5b922savsljcgjz3gxkydk52zd2gbs51prz88l60n6miv9k70";
108+ };
109+ }
110+ {
111+ goPackagePath = "github.com/txthinking/socks5";
112+ fetch = {
113+ type = "git";
114+ url = "https://github.com/txthinking/socks5";
115+ rev = "254e122c4eaf8657900905ed5bed5777870b9df8";
116+ sha256 = "1q43sxzacj216mdzl44khhx51w1z78jpraw955dnjv9va0zqbhmi";
117+ };
118+ }
119+ {
120+ goPackagePath = "github.com/txthinking/x";
121+ fetch = {
122+ type = "git";
123+ url = "https://github.com/txthinking/x";
124+ rev = "e13a838cdc21596c45b4e6b6fd15c822597c9ae3";
125+ sha256 = "0l5gzhy3h3qynfkgd789hxkv433yqdn1mmk945bwjha7vrm4rx2z";
126+ };
127+ }
128+ {
129+ goPackagePath = "golang.org/x/crypto";
130+ fetch = {
131+ type = "git";
132+ url = "https://go.googlesource.com/crypto";
133+ rev = "38d8ce5564a5b71b2e3a00553993f1b9a7ae852f";
134+ sha256 = "1x52liy2540pw75sqsw4vpg41vq2dnmqpc0j5r7k6jxv6xmbr5mb";
135+ };
136+ }
137+ {
138+ goPackagePath = "golang.org/x/net";
139+ fetch = {
140+ type = "git";
141+ url = "https://go.googlesource.com/net";
142+ rev = "eb5bcb51f2a31c7d5141d810b70815c05d9c9146";
143+ sha256 = "17k4g8krxbl84gzcs275b7gsh66dzm15fdxivjnx9xz8q84l4kby";
144+ };
145+ }
146+ {
147+ goPackagePath = "golang.org/x/text";
148+ fetch = {
149+ type = "git";
150+ url = "https://go.googlesource.com/text";
151+ rev = "31e7599a6c37728c25ca34167be099d072ad335d";
152+ sha256 = "18i17j7nkkc5dl9rpzm8l345r409hfj4knfnldar684337x1irrf";
153+ };
154+ }
155+ {
156+ goPackagePath = "gopkg.in/russross/blackfriday.v2";
157+ fetch = {
158+ type = "git";
159+ url = "https://gopkg.in/russross/blackfriday.v2";
160+ rev = "d3b5b032dc8e8927d31a5071b56e14c89f045135";
161+ sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j";
162+ };
163+ }
164+ {
165+ goPackagePath = "rsc.io/qr";
166+ fetch = {
167+ type = "git";
168+ url = "https://github.com/rsc/qr";
169+ rev = "ca9a01fc2f9505024045632c50e5e8cd6142fafe";
170+ sha256 = "04yx493g0fqp8i59zjxnl4k3s0cl0kr5m8xh0ph8m10r1hkw0xr3";
171+ };
172+ }
173+]
pkgs/tools/networking/burpsuite/default.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, fetchurl, jre, runtimeShell }:
22
33let
4− version = "1.7.23";
4+ version = "1.7.36";
55 jar = fetchurl {
66 name = "burpsuite.jar";
77 url = "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar";
8− sha256 = "1y83qisn9pkn88vphpli7h8nacv8jv3sq0h04zbri25nfkgvl4an";
8+ sha256 = "12m4fn04yd89r6x4m4yd668p5v0bs9b1h6p239bjj11ykyi3g51a";
99 };
1010 launcher = ''
1111 #!${runtimeShell}
pkgs/tools/networking/i2pd/default.nix+2−2
@@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
1111
1212 name = pname + "-" + version;
1313 pname = "i2pd";
14− version = "2.23.0";
14+ version = "2.24.0";
1515
1616 src = fetchFromGitHub {
1717 owner = "PurpleI2P";
1818 repo = pname;
1919 rev = version;
20− sha256 = "0sw9fjamd5wjrsxnxsih9532yf6x3rrjmv5ybskkpk7b6acyqjj1";
20+ sha256 = "1gn8i3jxy6zwrqxmkzc1n55sw29jxdjr4ihv33q2kcp7b90b4wsq";
2121 };
2222
2323 buildInputs = with stdenv.lib; [ boost zlib openssl ]
pkgs/tools/networking/ocserv/default.nix+2−2
@@ -5,13 +5,13 @@
55
66stdenv.mkDerivation rec {
77 name = "ocserv-${version}";
8− version = "0.12.2";
8+ version = "0.12.3";
99
1010 src = fetchFromGitLab {
1111 owner = "openconnect";
1212 repo = "ocserv";
1313 rev = "ocserv_${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}";
14− sha256 = "13lijg5qkkpn35laaimpw9l5g2dnnbmqn74lpcknmp6nm6j2wvci";
14+ sha256 = "072256099l1c6p7dvvzp0gyafh1zvmmgmnpy0fcmv9sy80qg3p44";
1515 };
1616
1717 nativeBuildInputs = [ autoreconfHook pkgconfig ];
pkgs/tools/package-management/checkinstall/default.nix+1
@@ -69,5 +69,6 @@ stdenv.mkDerivation {
6969 description = "A tool for automatically generating Slackware, RPM or Debian packages when doing `make install'";
7070 maintainers = [ stdenv.lib.maintainers.eelco ];
7171 platforms = stdenv.lib.platforms.linux;
72+ license = stdenv.lib.licenses.gpl2;
7273 };
7374}
pkgs/tools/system/gotop/default.nix+4−4
@@ -1,16 +1,16 @@
11{ stdenv, buildGoPackage, fetchFromGitHub }:
22
33buildGoPackage rec {
4− name = "gotop-${version}";
5− version = "2.0.1";
4+ pname = "gotop";
5+ version = "3.0.0";
66
77 goPackagePath = "github.com/cjbassi/gotop";
88
99 src = fetchFromGitHub {
10− repo = "gotop";
1110 owner = "cjbassi";
11+ repo = pname;
1212 rev = version;
13− sha256 = "0xpm8nrn53kz65f93czflgdgr2a33qfi1w0gsgngrmaliq1vlpji";
13+ sha256 = "1kndj5qjaqgizjakh642fay2i0i1jmfjlk1p01gnjbh2b0yzvj1r";
1414 };
1515
1616 meta = with stdenv.lib; {
pkgs/tools/text/fanficfare/default.nix+16−10
@@ -1,19 +1,25 @@
1−{ stdenv, fetchurl, python27Packages }:
1+{ stdenv, fetchFromGitHub, python3Packages }:
22
3−python27Packages.buildPythonApplication rec {
4− version = "3.1.1";
5− name = "fanficfare-${version}";
6− nameprefix = "";
3+python3Packages.buildPythonApplication rec {
4+ pname = "FanFicFare";
5+ version = "3.6.0";
76
8− src = fetchurl {
9− url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz";
10− sha256 = "1wklii24vbvq2vi5pqgp3z4lazcplh2i7r2w4d8lkm6pzbw0s8px";
7+ src = python3Packages.fetchPypi {
8+ inherit pname version;
9+ sha256 = "1ir3m8wknr8shdbmbpiaw73mdpa7mvidkl6pbs9ca23mgwivxa84";
1110 };
1211
13− propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ];
12+ propagatedBuildInputs = with python3Packages; [
13+ beautifulsoup4
14+ chardet
15+ html5lib
16+ html2text
17+ ];
18+
19+ doCheck = false; # no tests exist
1420
1521 meta = with stdenv.lib; {
16− description = "FanFicFare is a tool for making eBooks from fanfiction web sites";
22+ description = "Tool for making eBooks from fanfiction web sites";
1723 homepage = https://github.com/JimmXinu/FanFicFare;
1824 license = licenses.gpl3;
1925 platforms = platforms.linux;
pkgs/tools/text/vale/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildGoPackage rec {
44 name = "vale-${version}";
5− version = "1.3.2";
5+ version = "1.4.0";
66
77 goPackagePath = "github.com/errata-ai/vale";
88
@@ -12,7 +12,7 @@ buildGoPackage rec {
1212 owner = "errata-ai";
1313 repo = "vale";
1414 rev = "v${version}";
15− sha256 = "0jpklca4m6wpndy6spj30s6ssb5y9ysyncxj7i6fg2g0m4dzzh8w";
15+ sha256 = "05vrnmw7kpgxf2989jvmkwj9c3mv3zkr4z5rpmsplnhvgsnidg4g";
1616 };
1717
1818 meta = with stdenv.lib; {
pkgs/top-level/all-packages.nix+14−5
@@ -157,6 +157,8 @@ in
157157
158158 deadcode = callPackage ../development/tools/deadcode { };
159159
160+ demoit = callPackage ../servers/demoit { };
161+
160162 diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins;
161163
162164 dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh;
@@ -860,6 +862,7 @@ in
860862
861863 aria2 = callPackage ../tools/networking/aria2 {
862864 inherit (darwin.apple_sdk.frameworks) Security;
865+ inherit (pythonPackages) sphinx;
863866 };
864867 aria = aria2;
865868
@@ -1061,6 +1064,8 @@ in
10611064
10621065 bro = callPackage ../applications/networking/ids/bro { };
10631066
1067+ brook = callPackage ../tools/networking/brook { };
1068+
10641069 broot = callPackage ../tools/misc/broot { };
10651070
10661071 bruteforce-luks = callPackage ../tools/security/bruteforce-luks { };
@@ -7709,6 +7714,7 @@ in
77097714 inherit (darwin.apple_sdk.frameworks) Security;
77107715 };
77117716 cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { };
7717+ cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { };
77127718
77137719 pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { };
77147720 rainicorn = callPackage ../development/tools/rust/rainicorn { };
@@ -8622,6 +8628,8 @@ in
86228628
86238629 cadre = callPackage ../development/tools/cadre { };
86248630
8631+ cask = callPackage ../development/tools/cask { };
8632+
86258633 casperjs = callPackage ../development/tools/casperjs {
86268634 inherit (texFunctions) fontsConf;
86278635 };
@@ -9966,7 +9974,7 @@ in
99669974 inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
99679975 };
99689976 ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix {
9969− inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
9977+ inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox;
99709978 };
99719979
99729980 # Aliases
@@ -11492,6 +11500,8 @@ in
1149211500
1149311501 libotr = callPackage ../development/libraries/libotr { };
1149411502
11503+ libow = callPackage ../development/libraries/libow { };
11504+
1149511505 libp11 = callPackage ../development/libraries/libp11 { };
1149611506
1149711507 libpar2 = callPackage ../development/libraries/libpar2 { };
@@ -17494,14 +17504,13 @@ in
1749417504 welle-io = libsForQt5.callPackage ../applications/radio/welle-io { };
1749517505
1749617506 wireshark = callPackage ../applications/networking/sniffers/wireshark {
17497− qt5 = qt59;
1749817507 inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration;
1749917508 };
1750017509 wireshark-qt = wireshark;
1750117510
1750217511 # The GTK UI is deprecated by upstream. You probably want the QT version.
17503− wireshark-gtk = wireshark.override { withGtk = true; withQt = false; };
17504− wireshark-cli = wireshark.override { withGtk = false; withQt = false; };
17512+ wireshark-gtk = throw "Not supported anymore. Use wireshark-qt or wireshark-cli instead.";
17513+ wireshark-cli = wireshark.override { withQt = false; };
1750517514
1750617515 fbida = callPackage ../applications/graphics/fbida { };
1750717516
@@ -18569,7 +18578,7 @@ in
1856918578
1857018579 mirage = callPackage ../applications/graphics/mirage { };
1857118580
18572− mixxx = callPackage ../applications/audio/mixxx {
18581+ mixxx = libsForQt5.callPackage ../applications/audio/mixxx {
1857318582 inherit (vamp) vampSDK;
1857418583 };
1857518584
pkgs/top-level/python-packages.nix+4
@@ -4422,6 +4422,8 @@ in {
44224422
44234423 xlwt = callPackage ../development/python-modules/xlwt { };
44244424
4425+ xxhash = callPackage ../development/python-modules/xxhash { };
4426+
44254427 youtube-dl = callPackage ../tools/misc/youtube-dl {};
44264428
44274429 youtube-dl-light = callPackage ../tools/misc/youtube-dl {
@@ -4433,6 +4435,8 @@ in {
44334435
44344436 zc_lockfile = callPackage ../development/python-modules/zc_lockfile { };
44354437
4438+ zerorpc = callPackage ../development/python-modules/zerorpc { };
4439+
44364440 zipstream = callPackage ../development/python-modules/zipstream { };
44374441
44384442 zodb = callPackage ../development/python-modules/zodb {};
pkgs/top-level/static.nix−3
@@ -95,9 +95,6 @@ in {
9595 static = true;
9696 shared = false;
9797 };
98− libjpeg = super.libjpeg.override {
99− static = true;
100− };
10198 gifsicle = super.gifsicle.override {
10299 static = true;
103100 };