diff --git a/doc/functions.xml b/doc/functions.xml
index 53b3654fc45..1f2d00b9e1a 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -16,6 +16,7 @@
+
diff --git a/doc/functions/appimagetools.xml b/doc/functions/appimagetools.xml
new file mode 100644
index 00000000000..270ab067bc3
--- /dev/null
+++ b/doc/functions/appimagetools.xml
@@ -0,0 +1,121 @@
+
+ pkgs.appimageTools
+
+
+ pkgs.appimageTools is a set of functions for extracting and wrapping
+ AppImage files.
+
+ They are meant to be used if traditional packaging from source is infeasible, or it would take too long.
+ To quickly run an AppImage file, pkgs.appimage-run can be used as well.
+
+
+
+
+ The appimageTools API is unstable and may be subject to
+ backwards-incompatible changes in the future.
+
+
+
+
+
+ AppImage formats
+
+
+ There are different formats for AppImages, see
+ the specification for details.
+
+
+
+
+
+ Type 1 images are ISO 9660 files that are also ELF executables.
+
+
+
+
+
+ Type 2 images are ELF executables with an appended filesystem.
+
+
+
+
+
+ They can be told apart with file -k:
+
+
+
+$ file -k type1.AppImage
+type1.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) ISO 9660 CD-ROM filesystem data 'AppImage' (Lepton 3.x), scale 0-0,
+spot sensor temperature 0.000000, unit celsius, color scheme 0, calibration: offset 0.000000, slope 0.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=d629f6099d2344ad82818172add1d38c5e11bc6d, stripped\012- data
+
+$ file -k type2.AppImage
+type2.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) (Lepton 3.x), scale 232-60668, spot sensor temperature -4.187500, color scheme 15, show scale bar, calibration: offset -0.000000, slope 0.000000 (Lepton 2.x), scale 4111-45000, spot sensor temperature 412442.250000, color scheme 3, minimum point enabled, calibration: offset -75402534979642766821519867692934234112.000000, slope 5815371847733706829839455140374904832.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=79dcc4e55a61c293c5e19edbd8d65b202842579f, stripped\012- data
+
+
+
+ Note how the type 1 AppImage is described as an ISO 9660 CD-ROM filesystem, and the type 2 AppImage is not.
+
+
+
+
+ Wrapping
+
+
+ Depending on the type of AppImage you're wrapping, you'll have to use
+ wrapType1 or wrapType2.
+
+
+
+
+appimageTools.wrapType2 { # or wrapType1
+ name = "patchwork";
+ src = fetchurl {
+ url = https://github.com/ssbc/patchwork/releases/download/v3.11.4/Patchwork-3.11.4-linux-x86_64.AppImage;
+ sha256 = "1blsprpkvm0ws9b96gb36f0rbf8f5jgmw4x6dsb1kswr4ysf591s";
+ };
+ extraPkgs = pkgs: with pkgs; [ ];
+}
+
+
+
+
+
+ name specifies the name of the resulting image.
+
+
+
+
+ src specifies the AppImage file to extract.
+
+
+
+
+ extraPkgs allows you to pass a function to include additional packages
+ inside the FHS environment your AppImage is going to run in.
+
+ There are a few ways to learn which dependencies an application needs:
+
+
+
+
+ Looking through the extracted AppImage files, reading its scripts and running patchelf and ldd on its executables.
+ This can also be done in appimage-run, by setting APPIMAGE_DEBUG_EXEC=bash.
+
+
+
+
+
+ Running strace -vfefile on the wrapped executable, looking for libraries that can't be found.
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/default.nix b/lib/default.nix
index d400907ebb0..dbb90081b2c 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -109,7 +109,7 @@ let
mkFixStrictness mkOrder mkBefore mkAfter mkAliasDefinitions
mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule
mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule
- mkAliasOptionModule mkAliasOptionModuleWithPriority doRename filterModules;
+ mkAliasOptionModule doRename filterModules;
inherit (options) isOption mkEnableOption mkSinkUndeclaredOptions
mergeDefaultOption mergeOneOption mergeEqualOption getValues
getFiles optionAttrSetToDocList optionAttrSetToDocList'
diff --git a/lib/modules.nix b/lib/modules.nix
index 5c9d66d8f97..a41c9da610a 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -596,6 +596,9 @@ rec {
forwards any definitions of boot.copyKernels to
boot.loader.grub.copyKernels while printing a warning.
+
+ This also copies over the priority from the aliased option to the
+ non-aliased option.
*/
mkRenamedOptionModule = from: to: doRename {
inherit from to;
@@ -690,16 +693,7 @@ rec {
use = id;
};
- /* Like ‘mkAliasOptionModule’, but copy over the priority of the option as well. */
- mkAliasOptionModuleWithPriority = from: to: doRename {
- inherit from to;
- visible = true;
- warn = false;
- use = id;
- withPriority = true;
- };
-
- doRename = { from, to, visible, warn, use, withPriority ? false }:
+ doRename = { from, to, visible, warn, use, withPriority ? true }:
{ config, options, ... }:
let
fromOpt = getAttrFromPath from options;
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index a72777cbf2a..eadaa0521b3 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -149,7 +149,7 @@ checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-long-list.ni
# Check loaOf with many merges of lists.
checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-many-list-merges.nix
-# Check mkAliasOptionModuleWithPriority.
+# Check mkAliasOptionModule.
checkConfigOutput "true" config.enable ./alias-with-priority.nix
checkConfigOutput "true" config.enableAlias ./alias-with-priority.nix
checkConfigOutput "false" config.enable ./alias-with-priority-can-override.nix
diff --git a/lib/tests/modules/alias-with-priority-can-override.nix b/lib/tests/modules/alias-with-priority-can-override.nix
index a6b26895f3a..9a18c9d9f61 100644
--- a/lib/tests/modules/alias-with-priority-can-override.nix
+++ b/lib/tests/modules/alias-with-priority-can-override.nix
@@ -1,5 +1,8 @@
# This is a test to show that mkAliasOptionModule sets the priority correctly
# for aliased options.
+#
+# This test shows that an alias with a high priority is able to override
+# a non-aliased option.
{ config, lib, ... }:
@@ -32,10 +35,10 @@ with lib;
imports = [
# Create an alias for the "enable" option.
- (mkAliasOptionModuleWithPriority [ "enableAlias" ] [ "enable" ])
+ (mkAliasOptionModule [ "enableAlias" ] [ "enable" ])
- # Disable the aliased option, but with a default (low) priority so it
- # should be able to be overridden by the next import.
+ # Disable the aliased option with a high priority so it
+ # should override the next import.
( { config, lib, ... }:
{
enableAlias = lib.mkForce false;
diff --git a/lib/tests/modules/alias-with-priority.nix b/lib/tests/modules/alias-with-priority.nix
index 923483684cb..a35a06fc697 100644
--- a/lib/tests/modules/alias-with-priority.nix
+++ b/lib/tests/modules/alias-with-priority.nix
@@ -1,5 +1,8 @@
# This is a test to show that mkAliasOptionModule sets the priority correctly
# for aliased options.
+#
+# This test shows that an alias with a low priority is able to be overridden
+# with a non-aliased option.
{ config, lib, ... }:
@@ -32,7 +35,7 @@ with lib;
imports = [
# Create an alias for the "enable" option.
- (mkAliasOptionModuleWithPriority [ "enableAlias" ] [ "enable" ])
+ (mkAliasOptionModule [ "enableAlias" ] [ "enable" ])
# Disable the aliased option, but with a default (low) priority so it
# should be able to be overridden by the next import.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 164b1ddb621..ae0323b891b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4313,6 +4313,15 @@
github = "sleexyz";
name = "Sean Lee";
};
+ smakarov = {
+ email = "setser200018@gmail.com";
+ github = "setser";
+ name = "Sergey Makarov";
+ keys = [{
+ longkeyid = "rsa2048/6AA23A1193B7064B";
+ fingerprint = "6F8A 18AE 4101 103F 3C54 24B9 6AA2 3A11 93B7 064B";
+ }];
+ };
smaret = {
email = "sebastien.maret@icloud.com";
github = "smaret";
diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 0785784f25a..0fc014ae439 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -54,6 +54,8 @@
to false and enable your preferred display manager.
+
+
A major refactoring of the Kubernetes module has been completed.
Refactorings primarily focus on decoupling components and enhancing
@@ -96,6 +98,13 @@
./services/misc/beanstalkd.nix
+
+
+ There is a new services.cockroachdb module for running
+ CockroachDB databases. NixOS now ships with CockroachDB 2.1.x as well, available
+ on x86_64-linux and aarch64-linux.
+
+
@@ -644,6 +653,7 @@
X.org video drivers.
The modesetting driver should take over automatically,
it is better maintained upstream and has less problems with advanced X11 features.
+ This can lead to a change in the output names used by xrandr.
Some performance regressions on some GPU models might happen.
Some OpenCL and VA-API applications might also break
(Beignet seems to provide OpenCL support with
diff --git a/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixos/modules/config/fonts/fontconfig-penultimate.nix
index 7e05e77d967..2c18244621a 100644
--- a/nixos/modules/config/fonts/fontconfig-penultimate.nix
+++ b/nixos/modules/config/fonts/fontconfig-penultimate.nix
@@ -55,7 +55,9 @@ let
localConf = pkgs.writeText "fc-local.conf" cfg.localConf;
# The configuration to be included in /etc/font/
- penultimateConf = pkgs.runCommand "font-penultimate-conf" {} ''
+ penultimateConf = pkgs.runCommand "font-penultimate-conf" {
+ preferLocalBuild = true;
+ } ''
support_folder=$out/etc/fonts/conf.d
latest_folder=$out/etc/fonts/${latestVersion}/conf.d
diff --git a/nixos/modules/config/fonts/fontconfig-ultimate.nix b/nixos/modules/config/fonts/fontconfig-ultimate.nix
index 7549dc6c065..45328f3eaf1 100644
--- a/nixos/modules/config/fonts/fontconfig-ultimate.nix
+++ b/nixos/modules/config/fonts/fontconfig-ultimate.nix
@@ -7,7 +7,7 @@ let cfg = config.fonts.fontconfig.ultimate;
latestVersion = pkgs.fontconfig.configVersion;
# The configuration to be included in /etc/font/
- confPkg = pkgs.runCommand "font-ultimate-conf" {} ''
+ confPkg = pkgs.runCommand "font-ultimate-conf" { preferLocalBuild = true; } ''
support_folder=$out/etc/fonts/conf.d
latest_folder=$out/etc/fonts/${latestVersion}/conf.d
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 12f5ca2e799..d79c43c0b5b 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -190,7 +190,7 @@ let cfg = config.fonts.fontconfig;
'';
# fontconfig configuration package
- confPkg = pkgs.runCommand "fontconfig-conf" {} ''
+ confPkg = pkgs.runCommand "fontconfig-conf" { preferLocalBuild = true; } ''
support_folder=$out/etc/fonts
latest_folder=$out/etc/fonts/${latestVersion}
diff --git a/nixos/modules/config/fonts/fontdir.nix b/nixos/modules/config/fonts/fontdir.nix
index 180e38f81f4..cc70fbf8744 100644
--- a/nixos/modules/config/fonts/fontdir.nix
+++ b/nixos/modules/config/fonts/fontdir.nix
@@ -4,7 +4,7 @@ with lib;
let
- x11Fonts = pkgs.runCommand "X11-fonts" { } ''
+ x11Fonts = pkgs.runCommand "X11-fonts" { preferLocalBuild = true; } ''
mkdir -p "$out/share/X11-fonts"
find ${toString config.fonts.fonts} \
\( -name fonts.dir -o -name '*.ttf' -o -name '*.otf' \) \
diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix
index b601e908e49..13277fe56e4 100644
--- a/nixos/modules/config/nsswitch.nix
+++ b/nixos/modules/config/nsswitch.nix
@@ -61,6 +61,15 @@ in {
};
};
+ system.nssHosts = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = [ "mdns" ];
+ description = ''
+ List of host entries to configure in /etc/nsswitch.conf.
+ '';
+ };
+
};
config = {
@@ -85,7 +94,7 @@ in {
group: ${concatStringsSep " " passwdArray}
shadow: ${concatStringsSep " " shadowArray}
- hosts: ${concatStringsSep " " hostArray}
+ hosts: ${concatStringsSep " " config.system.nssHosts}
networks: files
ethers: files
@@ -94,6 +103,8 @@ in {
rpc: files
'';
+ system.nssHosts = hostArray;
+
# Systemd provides nss-myhostname to ensure that our hostname
# always resolves to a valid IP address. It returns all locally
# configured IP addresses, or ::1 and 127.0.0.2 as
diff --git a/nixos/modules/hardware/acpilight.nix b/nixos/modules/hardware/acpilight.nix
new file mode 100644
index 00000000000..34e8a222096
--- /dev/null
+++ b/nixos/modules/hardware/acpilight.nix
@@ -0,0 +1,24 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+ cfg = config.hardware.acpilight;
+in
+{
+ options = {
+ hardware.acpilight = {
+ enable = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ Enable acpilight.
+ This will allow brightness control via xbacklight from users in the video group
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ services.udev.packages = with pkgs; [ acpilight ];
+ };
+}
diff --git a/nixos/modules/hardware/ledger.nix b/nixos/modules/hardware/ledger.nix
new file mode 100644
index 00000000000..41abe74315a
--- /dev/null
+++ b/nixos/modules/hardware/ledger.nix
@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.hardware.ledger;
+
+in {
+ options.hardware.ledger.enable = mkEnableOption "udev rules for Ledger devices";
+
+ config = mkIf cfg.enable {
+ services.udev.packages = [ pkgs.ledger-udev-rules ];
+ };
+}
diff --git a/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix b/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix
index 2cf5f13bc15..a808429c999 100644
--- a/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix
+++ b/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix
@@ -29,6 +29,7 @@ runCommand "uvcdynctrl-udev-rules-${version}"
];
dontPatchELF = true;
dontStrip = true;
+ preferLocalBuild = true;
}
''
mkdir -p "$out/lib/udev"
diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix
index e946c4abc57..ab5e7c0645f 100644
--- a/nixos/modules/installer/cd-dvd/channel.nix
+++ b/nixos/modules/installer/cd-dvd/channel.nix
@@ -13,7 +13,7 @@ let
# user, as expected by nixos-rebuild/nixos-install. FIXME: merge
# with make-channel.nix.
channelSources = pkgs.runCommand "nixos-${config.system.nixos.version}"
- { }
+ { preferLocalBuild = true; }
''
mkdir -p $out
cp -prd ${nixpkgs.outPath} $out/nixos
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
index 228ef371d25..917b3758d38 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
@@ -31,6 +31,10 @@ with lib;
# there is no power management backend such as upower).
powerManagement.enable = true;
+ # Enable sound in graphical iso's.
+ hardware.pulseaudio.enable = true;
+ hardware.pulseaudio.systemWide = true; # Needed since we run plasma as root.
+
environment.systemPackages = [
# Include gparted for partitioning disks.
pkgs.gparted
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 5f134b51939..e78673514e3 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -272,7 +272,7 @@
nzbget = 245;
mosquitto = 246;
toxvpn = 247;
- squeezelite = 248;
+ # squeezelite = 248; # DynamicUser = true
turnserver = 249;
smokeping = 250;
gocd-agent = 251;
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 75217581a94..32b3f14e82d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -44,6 +44,7 @@
./hardware/digitalbitbox.nix
./hardware/sensor/iio.nix
./hardware/ksm.nix
+ ./hardware/ledger.nix
./hardware/mcelog.nix
./hardware/network/b43.nix
./hardware/nitrokey.nix
diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix
index fba756391b1..649f5564ac6 100644
--- a/nixos/modules/profiles/graphical.nix
+++ b/nixos/modules/profiles/graphical.nix
@@ -14,5 +14,9 @@
libinput.enable = true; # for touchpad support on many laptops
};
+ # Enable sound in virtualbox appliances.
+ hardware.pulseaudio.enable = true;
+ hardware.pulseaudio.systemWide = true; # Needed since we run plasma as root.
+
environment.systemPackages = [ pkgs.glxinfo pkgs.firefox ];
}
diff --git a/nixos/modules/programs/less.nix b/nixos/modules/programs/less.nix
index d39103a5805..9fdf99e9c69 100644
--- a/nixos/modules/programs/less.nix
+++ b/nixos/modules/programs/less.nix
@@ -25,7 +25,7 @@ let
'';
lessKey = pkgs.runCommand "lesskey"
- { src = pkgs.writeText "lessconfig" configText; }
+ { src = pkgs.writeText "lessconfig" configText; preferLocalBuild = true; }
"${pkgs.less}/bin/lesskey -o $out $src";
in
diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix
index 67469be18b4..1c4ee421fc5 100644
--- a/nixos/modules/security/ca.nix
+++ b/nixos/modules/security/ca.nix
@@ -14,6 +14,7 @@ let
{ files =
cfg.certificateFiles ++
[ (builtins.toFile "extra.crt" (concatStringsSep "\n" cfg.certificates)) ];
+ preferLocalBuild = true;
}
''
cat $files > $out
diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix
index 69a2a4f8f9a..573588aaeec 100644
--- a/nixos/modules/security/sudo.nix
+++ b/nixos/modules/security/sudo.nix
@@ -215,7 +215,10 @@ in
environment.etc = singleton
{ source =
pkgs.runCommand "sudoers"
- { src = pkgs.writeText "sudoers-in" cfg.configFile; }
+ {
+ src = pkgs.writeText "sudoers-in" cfg.configFile;
+ preferLocalBuild = true;
+ }
# Make sure that the sudoers file is syntactically valid.
# (currently disabled - NIXOS-66)
"${pkgs.buildPackages.sudo}/sbin/visudo -f $src -c && cp $src $out";
diff --git a/nixos/modules/services/audio/squeezelite.nix b/nixos/modules/services/audio/squeezelite.nix
index 57ae3855993..05506f5bcc7 100644
--- a/nixos/modules/services/audio/squeezelite.nix
+++ b/nixos/modules/services/audio/squeezelite.nix
@@ -3,8 +3,7 @@
with lib;
let
-
- uid = config.ids.uids.squeezelite;
+ dataDir = "/var/lib/squeezelite";
cfg = config.services.squeezelite;
in {
@@ -17,14 +16,6 @@ in {
enable = mkEnableOption "Squeezelite, a software Squeezebox emulator";
- dataDir = mkOption {
- default = "/var/lib/squeezelite";
- type = types.str;
- description = ''
- The directory where Squeezelite stores its name file.
- '';
- };
-
extraArguments = mkOption {
default = "";
type = types.str;
@@ -46,22 +37,14 @@ in {
wantedBy = [ "multi-user.target" ];
after = [ "network.target" "sound.target" ];
description = "Software Squeezebox emulator";
- preStart = "mkdir -p ${cfg.dataDir} && chown -R squeezelite ${cfg.dataDir}";
serviceConfig = {
- ExecStart = "${pkgs.squeezelite}/bin/squeezelite -N ${cfg.dataDir}/player-name ${cfg.extraArguments}";
- User = "squeezelite";
- PermissionsStartOnly = true;
+ DynamicUser = true;
+ ExecStart = "${pkgs.squeezelite}/bin/squeezelite -N ${dataDir}/player-name ${cfg.extraArguments}";
+ StateDirectory = builtins.baseNameOf dataDir;
+ SupplementaryGroups = "audio";
};
};
- users.users.squeezelite= {
- inherit uid;
- group = "nogroup";
- extraGroups = [ "audio" ];
- description = "Squeezelite user";
- home = "${cfg.dataDir}";
- };
-
};
}
diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix
index 9daf391c73c..2136778aff4 100644
--- a/nixos/modules/services/continuous-integration/buildkite-agent.nix
+++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix
@@ -24,7 +24,7 @@ let
EOF
chmod 755 $out/${name}
'';
- in pkgs.runCommand "buildkite-agent-hooks" {} ''
+ in pkgs.runCommand "buildkite-agent-hooks" { preferLocalBuild = true; } ''
mkdir $out
${concatStringsSep "\n" (mapAttrsToList mkHookEntry (filterAttrs (n: v: v != null) cfg.hooks))}
'';
diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index a0aff1b8b5b..3ceaa6f5ff3 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -8,6 +8,7 @@ let
if (cfg.configFile == null) then
(pkgs.runCommand "config.toml" {
buildInputs = [ pkgs.remarshal ];
+ preferLocalBuild = true;
} ''
remarshal -if json -of toml \
< ${pkgs.writeText "config.json" (builtins.toJSON cfg.configOptions)} \
diff --git a/nixos/modules/services/databases/hbase.nix b/nixos/modules/services/databases/hbase.nix
index 4772e897efe..52f2d95b4e0 100644
--- a/nixos/modules/services/databases/hbase.nix
+++ b/nixos/modules/services/databases/hbase.nix
@@ -18,7 +18,7 @@ let
'';
- configDir = pkgs.runCommand "hbase-config-dir" {} ''
+ configDir = pkgs.runCommand "hbase-config-dir" { preferLocalBuild = true; } ''
mkdir -p $out
cp ${cfg.package}/conf/* $out/
rm $out/hbase-site.xml
diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix
index d7a028b25d8..888bf13c3df 100644
--- a/nixos/modules/services/databases/influxdb.nix
+++ b/nixos/modules/services/databases/influxdb.nix
@@ -98,6 +98,7 @@ let
configFile = pkgs.runCommand "config.toml" {
buildInputs = [ pkgs.remarshal ];
+ preferLocalBuild = true;
} ''
remarshal -if json -of toml \
< ${pkgs.writeText "config.json" (builtins.toJSON configOptions)} \
diff --git a/nixos/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix
index 0f05876aee3..4c97485d972 100644
--- a/nixos/modules/services/hardware/acpid.nix
+++ b/nixos/modules/services/hardware/acpid.nix
@@ -21,7 +21,7 @@ let
};
};
- acpiConfDir = pkgs.runCommand "acpi-events" {}
+ acpiConfDir = pkgs.runCommand "acpi-events" { preferLocalBuild = true; }
''
mkdir -p $out
${
diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix
index b894025c0fd..092ff051a04 100644
--- a/nixos/modules/services/hardware/tlp.nix
+++ b/nixos/modules/services/hardware/tlp.nix
@@ -17,6 +17,7 @@ tlp = pkgs.tlp.override {
confFile = pkgs.runCommand "tlp"
{ config = cfg.extraConfig;
passAsFile = [ "config" ];
+ preferLocalBuild = true;
}
''
cat ${tlp}/etc/default/tlp > $out
diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix
index 1477d273d5e..9c64160e92b 100644
--- a/nixos/modules/services/logging/logcheck.nix
+++ b/nixos/modules/services/logging/logcheck.nix
@@ -5,7 +5,7 @@ with lib;
let
cfg = config.services.logcheck;
- defaultRules = pkgs.runCommand "logcheck-default-rules" {} ''
+ defaultRules = pkgs.runCommand "logcheck-default-rules" { preferLocalBuild = true; } ''
cp -prd ${pkgs.logcheck}/etc/logcheck $out
chmod u+w $out
rm -r $out/logcheck.*
diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix
index aa019d855ea..9b707e9deb5 100644
--- a/nixos/modules/services/logging/logstash.nix
+++ b/nixos/modules/services/logging/logstash.nix
@@ -27,7 +27,10 @@ let
logstashSettingsYml = pkgs.writeText "logstash.yml" cfg.extraSettings;
- logstashSettingsDir = pkgs.runCommand "logstash-settings" {inherit logstashSettingsYml;} ''
+ logstashSettingsDir = pkgs.runCommand "logstash-settings" {
+ inherit logstashSettingsYml;
+ preferLocalBuild = true;
+ } ''
mkdir -p $out
ln -s $logstashSettingsYml $out/logstash.yml
'';
diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix
index 4276552d4f0..a870550ba50 100644
--- a/nixos/modules/services/mail/opensmtpd.nix
+++ b/nixos/modules/services/mail/opensmtpd.nix
@@ -8,7 +8,7 @@ let
conf = pkgs.writeText "smtpd.conf" cfg.serverConfiguration;
args = concatStringsSep " " cfg.extraServerArgs;
- sendmail = pkgs.runCommand "opensmtpd-sendmail" {} ''
+ sendmail = pkgs.runCommand "opensmtpd-sendmail" { preferLocalBuild = true; } ''
mkdir -p $out/bin
ln -s ${cfg.package}/sbin/smtpctl $out/bin/sendmail
'';
diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix
index b9c2a966e6f..c7f2a168f8a 100644
--- a/nixos/modules/services/misc/gitolite.nix
+++ b/nixos/modules/services/misc/gitolite.nix
@@ -110,7 +110,7 @@ in
config = mkIf cfg.enable (
let
manageGitoliteRc = cfg.extraGitoliteRc != "";
- rcDir = pkgs.runCommand "gitolite-rc" { } rcDirScript;
+ rcDir = pkgs.runCommand "gitolite-rc" { preferLocalBuild = true; } rcDirScript;
rcDirScript =
''
mkdir "$out"
diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix
index 4ccfa22c89e..95a7f2ea989 100644
--- a/nixos/modules/services/misc/home-assistant.nix
+++ b/nixos/modules/services/misc/home-assistant.nix
@@ -19,7 +19,7 @@ let
${pkgs.remarshal}/bin/json2yaml -i ${lovelaceConfigJSON} -o $out
'';
- availableComponents = pkgs.home-assistant.availableComponents;
+ availableComponents = cfg.package.availableComponents;
# Given component "parentConfig.platform", returns whether config.parentConfig
# is a list containing a set with set.platform == "platform".
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 9a8116a03e8..665215822af 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -33,7 +33,7 @@ let
sh = pkgs.runtimeShell;
binshDeps = pkgs.writeReferencesToFile sh;
in
- pkgs.runCommand "nix.conf" { extraOptions = cfg.extraOptions; } (''
+ pkgs.runCommand "nix.conf" { preferLocalBuild = true; extraOptions = cfg.extraOptions; } (''
${optionalString (!isNix20) ''
extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done)
''}
diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix
index 5f97abf1871..483bc99ad94 100644
--- a/nixos/modules/services/misc/taskserver/default.nix
+++ b/nixos/modules/services/misc/taskserver/default.nix
@@ -109,7 +109,7 @@ let
nixos-taskserver = pkgs.pythonPackages.buildPythonApplication {
name = "nixos-taskserver";
- src = pkgs.runCommand "nixos-taskserver-src" {} ''
+ src = pkgs.runCommand "nixos-taskserver-src" { preferLocalBuild = true; } ''
mkdir -p "$out"
cat "${pkgs.substituteAll {
src = ./helper-tool.py;
diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix
index 7ee870183ca..49957e65290 100644
--- a/nixos/modules/services/monitoring/apcupsd.nix
+++ b/nixos/modules/services/monitoring/apcupsd.nix
@@ -45,7 +45,7 @@ let
eventToShellCmds = event: if builtins.hasAttr event cfg.hooks then (shellCmdsForEventScript event (builtins.getAttr event cfg.hooks)) else "";
- scriptDir = pkgs.runCommand "apcupsd-scriptdir" {} (''
+ scriptDir = pkgs.runCommand "apcupsd-scriptdir" { preferLocalBuild = true; } (''
mkdir "$out"
# Copy SCRIPTDIR from apcupsd package
cp -r ${pkgs.apcupsd}/etc/apcupsd/* "$out"/
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index cdc98b407e9..f59bc56962b 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -9,8 +9,10 @@ let
dataDir = cfg.dataDir;
staticDir = cfg.dataDir + "/static";
- graphiteLocalSettingsDir = pkgs.runCommand "graphite_local_settings"
- {inherit graphiteLocalSettings;} ''
+ graphiteLocalSettingsDir = pkgs.runCommand "graphite_local_settings" {
+ inherit graphiteLocalSettings;
+ preferLocalBuild = true;
+ } ''
mkdir -p $out
ln -s $graphiteLocalSettings $out/graphite_local_settings.py
'';
diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix
index 3e1d727b416..e5496209f82 100644
--- a/nixos/modules/services/monitoring/nagios.nix
+++ b/nixos/modules/services/monitoring/nagios.nix
@@ -11,8 +11,10 @@ let
nagiosObjectDefs = cfg.objectDefs;
- nagiosObjectDefsDir = pkgs.runCommand "nagios-objects" {inherit nagiosObjectDefs;}
- "mkdir -p $out; ln -s $nagiosObjectDefs $out/";
+ nagiosObjectDefsDir = pkgs.runCommand "nagios-objects" {
+ inherit nagiosObjectDefs;
+ preferLocalBuild = true;
+ } "mkdir -p $out; ln -s $nagiosObjectDefs $out/";
nagiosCfgFile = pkgs.writeText "nagios.cfg"
''
diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix
index 1d86c5d893d..a49555cf677 100644
--- a/nixos/modules/services/monitoring/netdata.nix
+++ b/nixos/modules/services/monitoring/netdata.nix
@@ -5,7 +5,7 @@ with lib;
let
cfg = config.services.netdata;
- wrappedPlugins = pkgs.runCommand "wrapped-plugins" {} ''
+ wrappedPlugins = pkgs.runCommand "wrapped-plugins" { preferLocalBuild = true; } ''
mkdir -p $out/libexec/netdata/plugins.d
ln -s /run/wrappers/bin/apps.plugin $out/libexec/netdata/plugins.d/apps.plugin
'';
diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix
index 1b1503ab5fc..cc703573d8c 100644
--- a/nixos/modules/services/monitoring/prometheus/default.nix
+++ b/nixos/modules/services/monitoring/prometheus/default.nix
@@ -19,7 +19,7 @@ let
# Pretty-print JSON to a file
writePrettyJSON = name: x:
- pkgs.runCommand name { } ''
+ pkgs.runCommand name { preferLocalBuild = true; } ''
echo '${builtins.toJSON x}' | ${pkgs.jq}/bin/jq . > $out
'';
diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix
index 6ecb21d628d..fbded746a5f 100644
--- a/nixos/modules/services/monitoring/scollector.nix
+++ b/nixos/modules/services/monitoring/scollector.nix
@@ -5,7 +5,7 @@ with lib;
let
cfg = config.services.scollector;
- collectors = pkgs.runCommand "collectors" {}
+ collectors = pkgs.runCommand "collectors" { preferLocalBuild = true; }
''
mkdir -p $out
${lib.concatStringsSep
diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix
index 6bfcd7143e1..d8786732668 100644
--- a/nixos/modules/services/monitoring/telegraf.nix
+++ b/nixos/modules/services/monitoring/telegraf.nix
@@ -7,6 +7,7 @@ let
configFile = pkgs.runCommand "config.toml" {
buildInputs = [ pkgs.remarshal ];
+ preferLocalBuild = true;
} ''
remarshal -if json -of toml \
< ${pkgs.writeText "config.json" (builtins.toJSON cfg.extraConfig)} \
diff --git a/nixos/modules/services/monitoring/uptime.nix b/nixos/modules/services/monitoring/uptime.nix
index b4d3a264010..c0993f3bc2e 100644
--- a/nixos/modules/services/monitoring/uptime.nix
+++ b/nixos/modules/services/monitoring/uptime.nix
@@ -4,7 +4,8 @@ let
cfg = config.services.uptime;
- configDir = pkgs.runCommand "config" {} (if cfg.configFile != null then ''
+ configDir = pkgs.runCommand "config" { preferLocalBuild = true; }
+ (if cfg.configFile != null then ''
mkdir $out
ext=`echo ${cfg.configFile} | grep -o \\..*`
ln -sv ${cfg.configFile} $out/default$ext
diff --git a/nixos/modules/services/network-filesystems/beegfs.nix b/nixos/modules/services/network-filesystems/beegfs.nix
index d9dde3f6bb6..86b1bb9160f 100644
--- a/nixos/modules/services/network-filesystems/beegfs.nix
+++ b/nixos/modules/services/network-filesystems/beegfs.nix
@@ -102,7 +102,10 @@ let
# wrappers to beegfs tools. Avoid typing path of config files
utilWrappers = mapAttrsToList ( name: cfg:
- ( pkgs.runCommand "beegfs-utils-${name}" { nativeBuildInputs = [ pkgs.makeWrapper ]; } ''
+ ( pkgs.runCommand "beegfs-utils-${name}" {
+ nativeBuildInputs = [ pkgs.makeWrapper ];
+ preferLocalBuild = true;
+ } ''
mkdir -p $out/bin
makeWrapper ${pkgs.beegfs}/bin/beegfs-check-servers \
diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index 602cd50d8f5..d4fa1eccdf3 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -19,7 +19,7 @@ let
"/var/lib/ipfs/.ipfs";
# Wrapping the ipfs binary with the environment variable IPFS_PATH set to dataDir because we can't set it in the user environment
- wrapped = runCommand "ipfs" { buildInputs = [ makeWrapper ]; } ''
+ wrapped = runCommand "ipfs" { buildInputs = [ makeWrapper ]; preferLocalBuild = true; } ''
mkdir -p "$out/bin"
makeWrapper "${ipfs}/bin/ipfs" "$out/bin/ipfs" \
--set IPFS_PATH ${cfg.dataDir} \
diff --git a/nixos/modules/services/network-filesystems/openafs/client.nix b/nixos/modules/services/network-filesystems/openafs/client.nix
index 240c1392088..93d2d7fcd97 100644
--- a/nixos/modules/services/network-filesystems/openafs/client.nix
+++ b/nixos/modules/services/network-filesystems/openafs/client.nix
@@ -15,7 +15,7 @@ let
clientServDB = pkgs.writeText "client-cellServDB-${cfg.cellName}" (mkCellServDB cfg.cellName cfg.cellServDB);
- afsConfig = pkgs.runCommand "afsconfig" {} ''
+ afsConfig = pkgs.runCommand "afsconfig" { preferLocalBuild = true; } ''
mkdir -p $out
echo ${cfg.cellName} > $out/ThisCell
cat ${cellServDB} ${clientServDB} > $out/CellServDB
@@ -198,7 +198,7 @@ in
environment.etc = {
clientCellServDB = {
- source = pkgs.runCommand "CellServDB" {} ''
+ source = pkgs.runCommand "CellServDB" { preferLocalBuild = true; } ''
cat ${cellServDB} ${clientServDB} > $out
'';
target = "openafs/CellServDB";
diff --git a/nixos/modules/services/networking/dnscache.nix b/nixos/modules/services/networking/dnscache.nix
index fc30f50317f..5051fc916d9 100644
--- a/nixos/modules/services/networking/dnscache.nix
+++ b/nixos/modules/services/networking/dnscache.nix
@@ -5,7 +5,7 @@ with lib;
let
cfg = config.services.dnscache;
- dnscache-root = pkgs.runCommand "dnscache-root" {} ''
+ dnscache-root = pkgs.runCommand "dnscache-root" { preferLocalBuild = true; } ''
mkdir -p $out/{servers,ip}
${concatMapStrings (ip: ''
diff --git a/nixos/modules/services/networking/hylafax/systemd.nix b/nixos/modules/services/networking/hylafax/systemd.nix
index 91d9c1a37da..ef177e4be34 100644
--- a/nixos/modules/services/networking/hylafax/systemd.nix
+++ b/nixos/modules/services/networking/hylafax/systemd.nix
@@ -41,7 +41,7 @@ let
"$out/config.${name}"
'';
in
- pkgs.runCommand "hylafax-config-modems" {}
+ pkgs.runCommand "hylafax-config-modems" { preferLocalBuild = true; }
''mkdir --parents "$out/" ${concatStringsSep "\n" (mapModems mkLine)}'';
setupSpoolScript = pkgs.substituteAll {
diff --git a/nixos/modules/services/networking/prayer.nix b/nixos/modules/services/networking/prayer.nix
index f63f86496be..c936417e68c 100644
--- a/nixos/modules/services/networking/prayer.nix
+++ b/nixos/modules/services/networking/prayer.nix
@@ -25,7 +25,7 @@ let
${cfg.extraConfig}
'';
- prayerCfg = pkgs.runCommand "prayer.cf" { } ''
+ prayerCfg = pkgs.runCommand "prayer.cf" { preferLocalBuild = true; } ''
# We have to remove the http_port 80, or it will start a server there
cat ${prayer}/etc/prayer.cf | grep -v http_port > $out
cat ${prayerExtraCfg} >> $out
diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix
index 1ea676d0f92..f511a9af256 100644
--- a/nixos/modules/services/networking/shout.nix
+++ b/nixos/modules/services/networking/shout.nix
@@ -6,7 +6,7 @@ let
cfg = config.services.shout;
shoutHome = "/var/lib/shout";
- defaultConfig = pkgs.runCommand "config.js" {} ''
+ defaultConfig = pkgs.runCommand "config.js" { preferLocalBuild = true; } ''
EDITOR=true ${pkgs.shout}/bin/shout config --home $PWD
mv config.js $out
'';
diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix
index a1c5d879f3c..cc18f6d0064 100644
--- a/nixos/modules/services/networking/xrdp.nix
+++ b/nixos/modules/services/networking/xrdp.nix
@@ -4,7 +4,7 @@ with lib;
let
cfg = config.services.xrdp;
- confDir = pkgs.runCommand "xrdp.conf" { } ''
+ confDir = pkgs.runCommand "xrdp.conf" { preferLocalBuild = true; } ''
mkdir $out
cp ${cfg.package}/etc/xrdp/{km-*,xrdp,sesman,xrdp_keyboard}.ini $out
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 3a43ebbb889..854c76cc0a1 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -11,8 +11,9 @@ let
avahiEnabled = config.services.avahi.enable;
polkitEnabled = config.security.polkit.enable;
- additionalBackends = pkgs.runCommand "additional-cups-backends" { }
- ''
+ additionalBackends = pkgs.runCommand "additional-cups-backends" {
+ preferLocalBuild = true;
+ } ''
mkdir -p $out
if [ ! -e ${cups.out}/lib/cups/backend/smb ]; then
mkdir -p $out/lib/cups/backend
diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix
index 82b6a51028e..dc37f9bee4b 100644
--- a/nixos/modules/services/ttys/kmscon.nix
+++ b/nixos/modules/services/ttys/kmscon.nix
@@ -82,7 +82,7 @@ in {
X-RestartIfChanged=false
'';
- systemd.units."autovt@.service".unit = pkgs.runCommand "unit" { }
+ systemd.units."autovt@.service".unit = pkgs.runCommand "unit" { preferLocalBuild = true; }
''
mkdir -p $out
ln -s ${config.systemd.units."kmsconvt@.service".unit}/kmsconvt@.service $out/autovt@.service
diff --git a/nixos/modules/services/web-apps/codimd.nix b/nixos/modules/services/web-apps/codimd.nix
index a0af28eac7c..56e1de17e3c 100644
--- a/nixos/modules/services/web-apps/codimd.nix
+++ b/nixos/modules/services/web-apps/codimd.nix
@@ -6,7 +6,7 @@ let
cfg = config.services.codimd;
prettyJSON = conf:
- pkgs.runCommand "codimd-config.json" { } ''
+ pkgs.runCommand "codimd-config.json" { preferLocalBuild = true; } ''
echo '${builtins.toJSON conf}' | ${pkgs.jq}/bin/jq \
'{production:del(.[]|nulls)|del(.[][]?|nulls)}' > $out
'';
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 3fd19d425c7..1eac5be2f8d 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -217,7 +217,7 @@ let
) null ([ cfg ] ++ subservices);
documentRoot = if maybeDocumentRoot != null then maybeDocumentRoot else
- pkgs.runCommand "empty" {} "mkdir -p $out";
+ pkgs.runCommand "empty" { preferLocalBuild = true; } "mkdir -p $out";
documentRootConf = ''
DocumentRoot "${documentRoot}"
@@ -426,6 +426,7 @@ let
phpIni = pkgs.runCommand "php.ini"
{ options = concatStringsSep "\n"
([ mainCfg.phpOptions ] ++ (map (svc: svc.phpOptions) allSubservices));
+ preferLocalBuild = true;
}
''
cat ${php}/etc/php.ini > $out
diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index e871ae6ff15..6234478014c 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -116,9 +116,10 @@ let
'';
};
- mediawikiScripts = pkgs.runCommand "mediawiki-${config.id}-scripts"
- { buildInputs = [ pkgs.makeWrapper ]; }
- ''
+ mediawikiScripts = pkgs.runCommand "mediawiki-${config.id}-scripts" {
+ buildInputs = [ pkgs.makeWrapper ];
+ preferLocalBuild = true;
+ } ''
mkdir -p $out/bin
for i in changePassword.php createAndPromote.php userOptions.php edit.php nukePage.php update.php; do
makeWrapper ${php}/bin/php $out/bin/mediawiki-${config.id}-$(basename $i .php) \
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 6c733f093ba..89dc8b3795e 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -44,7 +44,25 @@ let
}
''));
- configFile = pkgs.writeText "nginx.conf" ''
+ awkFormat = pkgs.writeText "awkFormat-nginx.awk" ''
+ awk -f
+ {sub(/^[ \t]+/,"");idx=0}
+ /\{/{ctx++;idx=1}
+ /\}/{ctx--}
+ {id="";for(i=idx;i $out/nginx.conf
+ '';
+ };
+
+ pre-configFile = pkgs.writeText "pre-nginx.conf" ''
user ${cfg.user} ${cfg.group};
error_log ${cfg.logError};
daemon off;
@@ -638,10 +656,10 @@ in
preStart =
''
${cfg.preStart}
- ${cfg.package}/bin/nginx -c ${configFile} -p ${cfg.stateDir} -t
+ ${cfg.package}/bin/nginx -c ${configFile}/nginx.conf -p ${cfg.stateDir} -t
'';
serviceConfig = {
- ExecStart = "${cfg.package}/bin/nginx -c ${configFile} -p ${cfg.stateDir}";
+ ExecStart = "${cfg.package}/bin/nginx -c ${configFile}/nginx.conf -p ${cfg.stateDir}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
Restart = "always";
RestartSec = "10s";
diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix
index 97c730061bd..ffafbc5e92f 100644
--- a/nixos/modules/services/web-servers/phpfpm/default.nix
+++ b/nixos/modules/services/web-servers/phpfpm/default.nix
@@ -39,6 +39,7 @@ let
phpIni = pool: pkgs.runCommand "php.ini" {
inherit (pool) phpPackage phpOptions;
+ preferLocalBuild = true;
nixDefaults = ''
sendmail_path = "/run/wrappers/bin/sendmail -t -i"
'';
diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix
index 700202b1d28..4674ed0177e 100644
--- a/nixos/modules/services/web-servers/traefik.nix
+++ b/nixos/modules/services/web-servers/traefik.nix
@@ -8,6 +8,7 @@ let
if cfg.configFile == null then
pkgs.runCommand "config.toml" {
buildInputs = [ pkgs.remarshal ];
+ preferLocalBuild = true;
} ''
remarshal -if json -of toml \
< ${pkgs.writeText "config.json" (builtins.toJSON cfg.configOptions)} \
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 31ff60019ae..6255dce8276 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -15,7 +15,7 @@ let
'';
};
- nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" {}
+ nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; }
''
mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
cp -rf ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix
index 7c794b1ba17..de128809ce3 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix
@@ -12,9 +12,10 @@ let
# We need a few things in the environment for the greeter to run with
# fonts/icons.
- wrappedEnsoGreeter = pkgs.runCommand "lightdm-enso-os-greeter"
- { buildInputs = [ pkgs.makeWrapper ]; }
- ''
+ wrappedEnsoGreeter = pkgs.runCommand "lightdm-enso-os-greeter" {
+ buildInputs = [ pkgs.makeWrapper ];
+ preferLocalBuild = true;
+ } ''
# This wrapper ensures that we actually get themes
makeWrapper ${pkgs.lightdm-enso-os-greeter}/bin/pantheon-greeter \
$out/greeter \
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
index 76fb0e619d7..5b280b02423 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
@@ -18,9 +18,10 @@ let
# The default greeter provided with this expression is the GTK greeter.
# Again, we need a few things in the environment for the greeter to run with
# fonts/icons.
- wrappedGtkGreeter = pkgs.runCommand "lightdm-gtk-greeter"
- { buildInputs = [ pkgs.makeWrapper ]; }
- ''
+ wrappedGtkGreeter = pkgs.runCommand "lightdm-gtk-greeter" {
+ buildInputs = [ pkgs.makeWrapper ];
+ preferLocalBuild = true;
+ } ''
# This wrapper ensures that we actually get themes
makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \
$out/greeter \
diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index 4e411c8ceb0..124660a43f0 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -28,7 +28,7 @@ let
# Unpack the SLiM theme, or use the default.
slimThemesDir =
let
- unpackedTheme = pkgs.runCommand "slim-theme" {}
+ unpackedTheme = pkgs.runCommand "slim-theme" { preferLocalBuild = true; }
''
mkdir -p $out
cd $out
diff --git a/nixos/modules/services/x11/gdk-pixbuf.nix b/nixos/modules/services/x11/gdk-pixbuf.nix
index 58faa8e2f9d..2dc8eabd95a 100644
--- a/nixos/modules/services/x11/gdk-pixbuf.nix
+++ b/nixos/modules/services/x11/gdk-pixbuf.nix
@@ -10,7 +10,7 @@ let
# Generate the cache file by running gdk-pixbuf-query-loaders for each
# package and concatenating the results.
- loadersCache = pkgs.runCommand "gdk-pixbuf-loaders.cache" {} ''
+ loadersCache = pkgs.runCommand "gdk-pixbuf-loaders.cache" { preferLocalBuild = true; } ''
(
for package in ${concatStringsSep " " effectivePackages}; do
module_dir="$package/${pkgs.gdk_pixbuf.moduleDir}"
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 34fbefa4256..d84ab3ced6f 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -113,6 +113,7 @@ let
{ xfs = optionalString (cfg.useXFS != false)
''FontPath "${toString cfg.useXFS}"'';
inherit (cfg) config;
+ preferLocalBuild = true;
}
''
echo 'Section "Files"' >> $out
@@ -705,6 +706,7 @@ in
system.extraDependencies = singleton (pkgs.runCommand "xkb-validated" {
inherit (cfg) xkbModel layout xkbVariant xkbOptions;
nativeBuildInputs = [ pkgs.xkbvalidate ];
+ preferLocalBuild = true;
} ''
validate "$xkbModel" "$layout" "$xkbVariant" "$xkbOptions"
touch "$out"
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 5e27b24ac44..9984a97bbdd 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -196,9 +196,10 @@ let
''; # */
- udevRules = pkgs.runCommand "udev-rules"
- { allowedReferences = [ extraUtils ]; }
- ''
+ udevRules = pkgs.runCommand "udev-rules" {
+ allowedReferences = [ extraUtils ];
+ preferLocalBuild = true;
+ } ''
mkdir -p $out
echo 'ENV{LD_LIBRARY_PATH}="${extraUtils}/lib"' > $out/00-env.rules
@@ -298,9 +299,10 @@ let
{ object = pkgs.writeText "mdadm.conf" config.boot.initrd.mdadmConf;
symlink = "/etc/mdadm.conf";
}
- { object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu"
- { src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; }
- ''
+ { object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" {
+ src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
+ preferLocalBuild = true;
+ } ''
target=$out
${pkgs.buildPackages.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out
'';
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 9fdef0251d7..18ee2ef1b8f 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -593,7 +593,7 @@ in
services.journald.forwardToSyslog = mkOption {
default = config.services.rsyslogd.enable || config.services.syslog-ng.enable;
- defaultText = "config.services.rsyslogd.enable || config.services.syslog-ng.enable";
+ defaultText = "services.rsyslogd.enable || services.syslog-ng.enable";
type = types.bool;
description = ''
Whether to forward log messages to syslog.
@@ -652,6 +652,7 @@ in
services.logind.lidSwitchExternalPower = mkOption {
default = config.services.logind.lidSwitch;
+ defaultText = "services.logind.lidSwitch";
example = "ignore";
type = logindHandlerType;
@@ -759,7 +760,10 @@ in
environment.etc = let
# generate contents for /etc/systemd/system-generators from
# systemd.generators and systemd.generator-packages
- generators = pkgs.runCommand "system-generators" { packages = cfg.generator-packages; } ''
+ generators = pkgs.runCommand "system-generators" {
+ preferLocalBuild = true;
+ packages = cfg.generator-packages;
+ } ''
mkdir -p $out
for package in $packages
do
diff --git a/nixos/modules/tasks/filesystems/vboxsf.nix b/nixos/modules/tasks/filesystems/vboxsf.nix
index 87f1984f084..5497194f6a8 100644
--- a/nixos/modules/tasks/filesystems/vboxsf.nix
+++ b/nixos/modules/tasks/filesystems/vboxsf.nix
@@ -6,7 +6,7 @@ let
inInitrd = any (fs: fs == "vboxsf") config.boot.initrd.supportedFilesystems;
- package = pkgs.runCommand "mount.vboxsf" {} ''
+ package = pkgs.runCommand "mount.vboxsf" { preferLocalBuild = true; } ''
mkdir -p $out/bin
cp ${pkgs.linuxPackages.virtualboxGuestAdditions}/bin/mount.vboxsf $out/bin
'';
diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix
index fbe42b8e8f0..6d34f897d18 100644
--- a/nixos/modules/tasks/kbd.nix
+++ b/nixos/modules/tasks/kbd.nix
@@ -15,6 +15,7 @@ let
optimizedKeymap = pkgs.runCommand "keymap" {
nativeBuildInputs = [ pkgs.buildPackages.kbd ];
LOADKEYS_KEYMAP_PATH = "${kbdEnv}/share/keymaps/**";
+ preferLocalBuild = true;
} ''
loadkeys -b ${optionalString isUnicode "-u"} "${config.i18n.consoleKeyMap}" > $out
'';
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 815523093dd..f9b0eb330bf 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -995,7 +995,7 @@ in
'';
environment.etc."hostid" = mkIf (cfg.hostId != null)
- { source = pkgs.runCommand "gen-hostid" {} ''
+ { source = pkgs.runCommand "gen-hostid" { preferLocalBuild = true; } ''
hi="${cfg.hostId}"
${if pkgs.stdenv.isBigEndian then ''
echo -ne "\x''${hi:0:2}\x''${hi:2:2}\x''${hi:4:2}\x''${hi:6:2}" > $out
diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix
index dfb60998941..56b21a40155 100644
--- a/nixos/tests/avahi.nix
+++ b/nixos/tests/avahi.nix
@@ -2,7 +2,7 @@
import ./make-test.nix ({ pkgs, ... } : {
name = "avahi";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ eelco chaoflow ];
+ maintainers = [ eelco ];
};
nodes = let
diff --git a/nixos/tests/beanstalkd.nix b/nixos/tests/beanstalkd.nix
index 9b7ac111a57..fa2fbc2c92a 100644
--- a/nixos/tests/beanstalkd.nix
+++ b/nixos/tests/beanstalkd.nix
@@ -1,23 +1,25 @@
import ./make-test.nix ({ pkgs, lib, ... }:
let
+ pythonEnv = pkgs.python3.withPackages (p: [p.beanstalkc]);
+
produce = pkgs.writeScript "produce.py" ''
- #!${pkgs.python2.withPackages (p: [p.beanstalkc])}/bin/python
+ #!${pythonEnv.interpreter}
import beanstalkc
queue = beanstalkc.Connection(host='localhost', port=11300, parse_yaml=False);
- queue.put('this is a job')
- queue.put('this is another job')
+ queue.put(b'this is a job')
+ queue.put(b'this is another job')
'';
consume = pkgs.writeScript "consume.py" ''
- #!${pkgs.python2.withPackages (p: [p.beanstalkc])}/bin/python
+ #!${pythonEnv.interpreter}
import beanstalkc
queue = beanstalkc.Connection(host='localhost', port=11300, parse_yaml=False);
job = queue.reserve(timeout=0)
- print job.body
+ print(job.body.decode('utf-8'))
job.delete()
'';
diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix
index 27871f72b4e..3b1169a1b7f 100644
--- a/nixos/tests/bittorrent.nix
+++ b/nixos/tests/bittorrent.nix
@@ -23,7 +23,7 @@ in
{
name = "bittorrent";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ domenkozar eelco chaoflow rob bobvanderlinden ];
+ maintainers = [ domenkozar eelco rob bobvanderlinden ];
};
nodes =
diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix
index 0eae51433d2..38db64eb793 100644
--- a/nixos/tests/containers-bridge.nix
+++ b/nixos/tests/containers-bridge.nix
@@ -10,7 +10,7 @@ in
import ./make-test.nix ({ pkgs, ...} : {
name = "containers-bridge";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ aristid aszlig eelco chaoflow kampfschlaefer ];
+ maintainers = [ aristid aszlig eelco kampfschlaefer ];
};
machine =
diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix
index 782095a09da..0c101037aa7 100644
--- a/nixos/tests/containers-imperative.nix
+++ b/nixos/tests/containers-imperative.nix
@@ -3,7 +3,7 @@
import ./make-test.nix ({ pkgs, ...} : {
name = "containers-imperative";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ aristid aszlig eelco chaoflow kampfschlaefer ];
+ maintainers = [ aristid aszlig eelco kampfschlaefer ];
};
machine =
diff --git a/nixos/tests/containers-ipv4.nix b/nixos/tests/containers-ipv4.nix
index 5f83a33b107..ace68ff2df8 100644
--- a/nixos/tests/containers-ipv4.nix
+++ b/nixos/tests/containers-ipv4.nix
@@ -3,7 +3,7 @@
import ./make-test.nix ({ pkgs, ...} : {
name = "containers-ipv4";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ aristid aszlig eelco chaoflow kampfschlaefer ];
+ maintainers = [ aristid aszlig eelco kampfschlaefer ];
};
machine =
diff --git a/nixos/tests/containers-ipv6.nix b/nixos/tests/containers-ipv6.nix
index 5866e51b731..a9499d192bd 100644
--- a/nixos/tests/containers-ipv6.nix
+++ b/nixos/tests/containers-ipv6.nix
@@ -8,7 +8,7 @@ in
import ./make-test.nix ({ pkgs, ...} : {
name = "containers-ipv6";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ aristid aszlig eelco chaoflow kampfschlaefer ];
+ maintainers = [ aristid aszlig eelco kampfschlaefer ];
};
machine =
diff --git a/nixos/tests/containers-portforward.nix b/nixos/tests/containers-portforward.nix
index d2dda926fc0..ec8e9629c21 100644
--- a/nixos/tests/containers-portforward.nix
+++ b/nixos/tests/containers-portforward.nix
@@ -10,7 +10,7 @@ in
import ./make-test.nix ({ pkgs, ...} : {
name = "containers-portforward";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ aristid aszlig eelco chaoflow kampfschlaefer ianwookim ];
+ maintainers = [ aristid aszlig eelco kampfschlaefer ianwookim ];
};
machine =
diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix
index d787ac97300..e7ae023f3ff 100644
--- a/nixos/tests/elk.nix
+++ b/nixos/tests/elk.nix
@@ -13,7 +13,7 @@ let
mkElkTest = name : elk : makeTest {
inherit name;
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ eelco chaoflow offline basvandijk ];
+ maintainers = [ eelco offline basvandijk ];
};
nodes = {
one =
diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix
index 58a80243ea9..f5b946a0881 100644
--- a/nixos/tests/firefox.nix
+++ b/nixos/tests/firefox.nix
@@ -1,7 +1,7 @@
import ./make-test.nix ({ pkgs, ... }: {
name = "firefox";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ eelco chaoflow shlevy ];
+ maintainers = [ eelco shlevy ];
};
machine =
diff --git a/nixos/tests/firewall.nix b/nixos/tests/firewall.nix
index 7207a880d8e..fcf758910e0 100644
--- a/nixos/tests/firewall.nix
+++ b/nixos/tests/firewall.nix
@@ -3,7 +3,7 @@
import ./make-test.nix ( { pkgs, ... } : {
name = "firewall";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ eelco chaoflow ];
+ maintainers = [ eelco ];
};
nodes =
diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix
index 95694ea4828..b58c9e5a0e3 100644
--- a/nixos/tests/gnome3.nix
+++ b/nixos/tests/gnome3.nix
@@ -1,7 +1,7 @@
import ./make-test.nix ({ pkgs, ...} : {
name = "gnome3";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ domenkozar eelco chaoflow lethalman ];
+ maintainers = [ domenkozar eelco lethalman ];
};
machine =
diff --git a/nixos/tests/influxdb.nix b/nixos/tests/influxdb.nix
index 440049d9511..61201202204 100644
--- a/nixos/tests/influxdb.nix
+++ b/nixos/tests/influxdb.nix
@@ -3,7 +3,7 @@
import ./make-test.nix ({ pkgs, ...} : {
name = "influxdb";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ chaoflow offline ];
+ maintainers = [ offline ];
};
nodes = {
diff --git a/nixos/tests/ipv6.nix b/nixos/tests/ipv6.nix
index 97f348a9bee..14f24c29cfe 100644
--- a/nixos/tests/ipv6.nix
+++ b/nixos/tests/ipv6.nix
@@ -4,7 +4,7 @@
import ./make-test.nix ({ pkgs, ...} : {
name = "ipv6";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ eelco chaoflow ];
+ maintainers = [ eelco ];
};
nodes =
diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix
index 4f2d2085cd1..a6eec411ff2 100644
--- a/nixos/tests/jenkins.nix
+++ b/nixos/tests/jenkins.nix
@@ -6,7 +6,7 @@
import ./make-test.nix ({ pkgs, ...} : {
name = "jenkins";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ bjornfor coconnor domenkozar eelco chaoflow ];
+ maintainers = [ bjornfor coconnor domenkozar eelco ];
};
nodes = {
diff --git a/nixos/tests/kexec.nix b/nixos/tests/kexec.nix
index db596189d46..b13b4131091 100644
--- a/nixos/tests/kexec.nix
+++ b/nixos/tests/kexec.nix
@@ -3,7 +3,7 @@
import ./make-test.nix ({ pkgs, ...} : {
name = "kexec";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ eelco chaoflow ];
+ maintainers = [ eelco ];
};
machine = { ... }:
diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix
index 3dbb494b689..9844ad492e8 100644
--- a/nixos/tests/login.nix
+++ b/nixos/tests/login.nix
@@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }:
{
name = "login";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ eelco chaoflow ];
+ maintainers = [ eelco ];
};
machine =
diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index 3ad55651b11..ca28bc31cf1 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -3,7 +3,7 @@
import ./make-test.nix ({ pkgs, ...} : rec {
name = "misc";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ eelco chaoflow ];
+ maintainers = [ eelco ];
};
foo = pkgs.writeText "foo" "Hello World";
diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix
index 8146453bfd5..dadd16fd9a0 100644
--- a/nixos/tests/mumble.nix
+++ b/nixos/tests/mumble.nix
@@ -9,7 +9,7 @@ in
{
name = "mumble";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ thoughtpolice eelco chaoflow ];
+ maintainers = [ thoughtpolice eelco ];
};
nodes = {
diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix
index 95cecf17b8c..31374aaf77e 100644
--- a/nixos/tests/munin.nix
+++ b/nixos/tests/munin.nix
@@ -4,7 +4,7 @@
import ./make-test.nix ({ pkgs, ...} : {
name = "munin";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ domenkozar eelco chaoflow ];
+ maintainers = [ domenkozar eelco ];
};
nodes = {
diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix
index 84d70cf3524..c75a862106f 100644
--- a/nixos/tests/mysql-replication.nix
+++ b/nixos/tests/mysql-replication.nix
@@ -8,7 +8,7 @@ in
{
name = "mysql-replication";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ eelco chaoflow shlevy ];
+ maintainers = [ eelco shlevy ];
};
nodes = {
diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix
index 7251c4a8649..1a611779366 100644
--- a/nixos/tests/mysql.nix
+++ b/nixos/tests/mysql.nix
@@ -1,7 +1,7 @@
import ./make-test.nix ({ pkgs, ...} : {
name = "mysql";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ eelco chaoflow shlevy ];
+ maintainers = [ eelco shlevy ];
};
nodes = {
diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix
index 34229e91311..51d9cf166bb 100644
--- a/nixos/tests/nat.nix
+++ b/nixos/tests/nat.nix
@@ -24,7 +24,7 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false,
name = "nat" + (if withFirewall then "WithFirewall" else "Standalone")
+ (lib.optionalString withConntrackHelpers "withConntrackHelpers");
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ eelco chaoflow rob ];
+ maintainers = [ eelco rob ];
};
nodes =
diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix
index ce171701893..2f655336e75 100644
--- a/nixos/tests/nfs.nix
+++ b/nixos/tests/nfs.nix
@@ -20,7 +20,7 @@ in
{
name = "nfs";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ eelco chaoflow ];
+ maintainers = [ eelco ];
};
nodes =
diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix
index c66b90b802d..219a20c5c7e 100644
--- a/nixos/tests/openssh.nix
+++ b/nixos/tests/openssh.nix
@@ -5,7 +5,7 @@ let inherit (import ./ssh-keys.nix pkgs)
in {
name = "openssh";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ aszlig eelco chaoflow ];
+ maintainers = [ aszlig eelco ];
};
nodes = {
diff --git a/nixos/tests/phabricator.nix b/nixos/tests/phabricator.nix
index 20b3b838aba..db23331842c 100644
--- a/nixos/tests/phabricator.nix
+++ b/nixos/tests/phabricator.nix
@@ -1,7 +1,7 @@
import ./make-test.nix ({ pkgs, ... }: {
name = "phabricator";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ chaoflow ];
+ maintainers = [ ];
};
nodes = {
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index 7026637ead1..caa8131a4b4 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -3,7 +3,7 @@
import ./make-test.nix ({pkgs, ... }: {
name = "printing";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ domenkozar eelco chaoflow jgeerds ];
+ maintainers = [ domenkozar eelco jgeerds ];
};
nodes = {
diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix
index 18195312028..1f39e903cdd 100644
--- a/nixos/tests/proxy.nix
+++ b/nixos/tests/proxy.nix
@@ -16,7 +16,7 @@ in
{
name = "proxy";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ eelco chaoflow ];
+ maintainers = [ eelco ];
};
nodes =
diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix
index 75c82cca63f..fbb798515e1 100644
--- a/nixos/tests/quake3.nix
+++ b/nixos/tests/quake3.nix
@@ -22,7 +22,7 @@ in
rec {
name = "quake3";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ domenkozar eelco chaoflow ];
+ maintainers = [ domenkozar eelco ];
};
# TODO: lcov doesn't work atm
diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix
index 34ab0578786..bb5932c3641 100644
--- a/nixos/tests/rabbitmq.nix
+++ b/nixos/tests/rabbitmq.nix
@@ -3,7 +3,7 @@
import ./make-test.nix ({ pkgs, ... }: {
name = "rabbitmq";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ eelco chaoflow offline ];
+ maintainers = [ eelco offline ];
};
nodes = {
diff --git a/nixos/tests/subversion.nix b/nixos/tests/subversion.nix
index 6175155cdfc..e7b99b10602 100644
--- a/nixos/tests/subversion.nix
+++ b/nixos/tests/subversion.nix
@@ -34,7 +34,7 @@ in
{
name = "subversion";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ eelco chaoflow ];
+ maintainers = [ eelco ];
};
nodes =
diff --git a/nixos/tests/tomcat.nix b/nixos/tests/tomcat.nix
index af63c7ee8e0..8e7b886dd30 100644
--- a/nixos/tests/tomcat.nix
+++ b/nixos/tests/tomcat.nix
@@ -1,7 +1,7 @@
import ./make-test.nix ({ pkgs, ...} : {
name = "tomcat";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ eelco chaoflow ];
+ maintainers = [ eelco ];
};
nodes = {
diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix
index 4599885acde..8ec11ebda2c 100644
--- a/nixos/tests/trac.nix
+++ b/nixos/tests/trac.nix
@@ -1,7 +1,7 @@
import ./make-test.nix ({ pkgs, ... }: {
name = "trac";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ eelco chaoflow ];
+ maintainers = [ eelco ];
};
nodes = {
diff --git a/nixos/tests/udisks2.nix b/nixos/tests/udisks2.nix
index 8bbbe286efc..dcf869908d8 100644
--- a/nixos/tests/udisks2.nix
+++ b/nixos/tests/udisks2.nix
@@ -12,7 +12,7 @@ in
{
name = "udisks2";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ eelco chaoflow ];
+ maintainers = [ eelco ];
};
machine =
diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix
index 47717e8cf7d..12d8a050d47 100644
--- a/nixos/tests/xfce.nix
+++ b/nixos/tests/xfce.nix
@@ -1,7 +1,7 @@
import ./make-test.nix ({ pkgs, ...} : {
name = "xfce";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ eelco chaoflow shlevy ];
+ maintainers = [ eelco shlevy ];
};
machine =
diff --git a/pkgs/applications/audio/csound/csound-manual/default.nix b/pkgs/applications/audio/csound/csound-manual/default.nix
new file mode 100644
index 00000000000..f82ec7a4ea1
--- /dev/null
+++ b/pkgs/applications/audio/csound/csound-manual/default.nix
@@ -0,0 +1,44 @@
+{
+ stdenv, fetchurl, docbook_xsl,
+ docbook_xml_dtd_45, python, pygments,
+ libxslt
+}:
+
+stdenv.mkDerivation rec {
+ version = "6.12.0";
+ name = "csound-manual-${version}";
+
+ src = fetchurl {
+ url = "https://github.com/csound/manual/archive/${version}.tar.gz";
+ sha256 = "1v1scp468rnfbcajnp020kdj8zigimc2mbcwzxxqi8sf8paccdrp";
+ };
+
+
+ prePatch = ''
+ substituteInPlace manual.xml \
+ --replace "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \
+ "${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd"
+ '';
+
+ nativeBuildInputs = [ libxslt.bin ];
+
+ buildInputs = [ docbook_xsl python pygments ];
+
+ buildPhase = ''
+ make XSL_BASE_PATH=${docbook_xsl}/share/xml/docbook-xsl html-dist
+ '';
+
+ installPhase = ''
+ mkdir -p $out/share/doc/csound
+ cp -r ./html $out/share/doc/csound
+ '';
+
+ meta = {
+ description = "The Csound Canonical Reference Manual";
+ homepage = "https://github.com/csound/manual";
+ license = stdenv.lib.licenses.fdl12Plus;
+ maintainers = [ stdenv.lib.maintainers.hlolli ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
+
diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
index a285663d8ce..8547b0cc553 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -5,7 +5,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "lollypop";
- version = "0.9.915";
+ version = "0.9.921";
format = "other";
doCheck = false;
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
url = "https://gitlab.gnome.org/World/lollypop";
rev = "refs/tags/${version}";
fetchSubmodules = true;
- sha256 = "133qmqb015ghif4d4zh6sf8585fpfgbq00rv6qdj5xn13wziipwh";
+ sha256 = "0a79qnci93yicd58r6kr6yinpqz67s39h0xk5qkzlsplpbawvf3y";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix
index 20f6271c7ad..3184f89ced9 100644
--- a/pkgs/applications/audio/squeezelite/default.nix
+++ b/pkgs/applications/audio/squeezelite/default.nix
@@ -1,20 +1,26 @@
{ stdenv, fetchFromGitHub, alsaLib, faad2, flac, libmad, libvorbis, mpg123 }:
stdenv.mkDerivation {
- name = "squeezelite-git-2016-05-27";
+ name = "squeezelite-git-2018-08-14";
src = fetchFromGitHub {
- owner = "ralph-irving";
- repo = "squeezelite";
- rev = "e37ed17fed9e11a7346cbe9f1e1deeccc051f42e";
- sha256 = "15ihx2dbp4kr6k6r50g9q5npqad5zyv8nqf5cr37bhg964syvbdm";
+ owner = "ralph-irving";
+ repo = "squeezelite";
+ rev = "ecb6e3696a42113994640e5345d0b5ca2e77d28b";
+ sha256 = "0di3d5qy8fhawijq6bxy524fgffvzl08dprrws0fs2j1a70fs0fh";
};
buildInputs = [ alsaLib faad2 flac libmad libvorbis mpg123 ];
+ enableParallelBuilding = true;
+
installPhase = ''
- mkdir -p $out/bin
- cp squeezelite $out/bin
+ runHook preInstall
+
+ install -Dm755 -t $out/bin squeezelite
+ install -Dm644 -t $out/share/doc/squeezelite *.txt *.md
+
+ runHook postInstall
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index cb0aa393380..91abf2128a8 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,14 +13,14 @@ let
sha256Hash = "0fghqkc8pkb7waxclm0qq4nlnsvmv9d3fcj5nnvgbfkjyw032q42";
};
betaVersion = {
- version = "3.4.0.13"; # "Android Studio 3.4 Beta 4"
- build = "183.5304277";
- sha256Hash = "01x7xba0f5js213wgw0h1vw297vwz5q7dprnilcdydfjxwqsbr8f";
+ version = "3.4.0.14"; # "Android Studio 3.4 Beta 5"
+ build = "183.5310756";
+ sha256Hash = "0np8600qvqpw9kcmgp04i1nak1339ck1iidkzr75kigp5rgdl2bq";
};
latestVersion = { # canary & dev
- version = "3.5.0.3"; # "Android Studio 3.5 Canary 4"
- build = "183.5290690";
- sha256Hash = "0d1cl78b25pksaj0scv3hxb14bjxk3591zbc0v7dykk1gf4pvxd1";
+ version = "3.5.0.4"; # "Android Studio 3.5 Canary 5"
+ build = "183.5320907";
+ sha256Hash = "1i56r58kcwrllx3a85dhsz9m0amb7xj9ybqfkdf1a8ipv1hdqs1g";
};
in rec {
# Old alias (TODO @primeos: Remove after 19.03 is branched off):
diff --git a/pkgs/applications/editors/emacs-modes/calfw/default.nix b/pkgs/applications/editors/emacs-modes/calfw/default.nix
index 25f0db1cae8..b8c61bb97af 100644
--- a/pkgs/applications/editors/emacs-modes/calfw/default.nix
+++ b/pkgs/applications/editors/emacs-modes/calfw/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl3Plus;
- maintainers = with stdenv.lib.maintainers; [ chaoflow ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix
index 884d1724ef8..17cf213a799 100644
--- a/pkgs/applications/editors/emacs-modes/icicles/default.nix
+++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix
@@ -2,28 +2,28 @@
let
modules = [
- { name = "icicles.el"; sha256 = "0wxak7wh0rrb3h77ay2vypbb53skcfbrv71xkajhax0w12q6zpaj"; }
- { name = "icicles-chg.el"; sha256 = "0qavq9vy566l3qi9n8akrqjcgy8n6k0j8d7vsc7p1jhqvvq812gh"; }
- { name = "icicles-cmd1.el"; sha256 = "0lgk6ngl9090iqvvw1c227q7p37mr73cc6ap3ky6b0nv3ql8rkyi"; }
- { name = "icicles-cmd2.el"; sha256 = "15swxk7fr7wsqpf26xzbvyk12ikkvfcyh9w8wmnpc38dmpyq79rb"; }
+ { name = "icicles.el"; sha256 = "1744n5g2kmv3r261ipa0fhrgnapl0chxz57bbbls3bp30cnnfrs7"; }
+ { name = "icicles-chg.el"; sha256 = "058sxa8wh3vqr3zy677q6m2lfx4n477rnb8921s1p6wgs55v7dp4"; }
+ { name = "icicles-cmd1.el"; sha256 = "064hyy8nxvlg298s5qnmk7aczbasfpddhx57jxaldyyzkca3n2h5"; }
+ { name = "icicles-cmd2.el"; sha256 = "0a77fx0pxyfrg9nxvqvzz247v6cljjfz9dnfs7lc8qgdvksxs261"; }
{ name = "icicles-doc1.el"; sha256 = "04j5qvj7pqnjh8h2y2sdgi7x55czdp9xn7yysr3bzcmr1rq5p4bz"; }
{ name = "icicles-doc2.el"; sha256 = "1k8vfhi3fa4bzsxr074bw5q6srvq6z6hi61rzlxdw7pah6qf7hcz"; }
{ name = "icicles-face.el"; sha256 = "1pvygqzmh6ag0zhfjn1vhdvlhxybwxzj22ah2pc0ls80dlywhi4l"; }
- { name = "icicles-fn.el"; sha256 = "05v7sc2k2mjm1mbnlkpi01aaxnxnb40540y7g70dg534scjd7w36"; }
- { name = "icicles-mac.el"; sha256 = "0nhbwswz6xz7q4g8flszgx12q4gi4nx1d3n4jgz6svr2kk2vmlb4"; }
- { name = "icicles-mcmd.el"; sha256 = "05dniz6337v9r15w8r2zad0n2h6jlygzjp7vw75vvq8mds0acmia"; }
+ { name = "icicles-fn.el"; sha256 = "02vwa9dx9393d7kxrf443r1lj7y9ihkh25cmd418pwfgmw2yd5s7"; }
+ { name = "icicles-mac.el"; sha256 = "13nxgg9k5w39lga90jwn1c7v756dqlfln2qh312vfaxfjfijfv9r"; }
+ { name = "icicles-mcmd.el"; sha256 = "17d4zlf3r09wmarwyc1cbjv0pyklg4cdhwh3h643d4v8mhs5hnil"; }
{ name = "icicles-mode.el"; sha256 = "1xfv8nryf5y2gygg02naawzm5qhrkba3h84g43518r1xc6rgbpp6"; }
- { name = "icicles-opt.el"; sha256 = "10n4p999ylkapirs75y5fh33lpiyx42i3ajzl2zjfwyr1zksg1iz"; }
- { name = "icicles-var.el"; sha256 = "1r5gb01zg8nf2qryq9saxfpnzlymmppsk7w1g09lac35c87vh8yl"; }
+ { name = "icicles-opt.el"; sha256 = "154mgcd1ksnmlyb4ijy2njqq75i8cj4k47phplxsi648pzqnda77"; }
+ { name = "icicles-var.el"; sha256 = "0f94299q1z0va4v1s5ijpksaqlaz88ay1qbmlzq0i2wnxnsliys8"; }
];
forAll = f: map f modules;
in
stdenv.mkDerivation rec {
- version = "2018-07-02";
+ version = "2019-02-22";
name = "icicles-${version}";
- srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs/download/${name}"; inherit sha256; });
+ srcs = forAll ({name, sha256}: fetchurl { url = "https://www.emacswiki.org/emacs/download/${name}"; inherit sha256; });
buildInputs = [ emacs ];
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${name}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${name}/";
meta = {
- homepage = http://www.emacswiki.org/emacs/Icicles;
+ homepage = https://www.emacswiki.org/emacs/Icicles;
description = "Enhance Emacs minibuffer input with cycling and powerful completion";
license = stdenv.lib.licenses.gpl2Plus;
platforms = emacs.meta.platforms;
diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix
index 99ecddcb264..a8250ead7b4 100644
--- a/pkgs/applications/editors/emacs-modes/org/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl3Plus;
- maintainers = with stdenv.lib.maintainers; [ chaoflow pSub ];
+ maintainers = with stdenv.lib.maintainers; [ pSub ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix
index d9f0b211f15..852faeb7918 100644
--- a/pkgs/applications/editors/emacs/25.nix
+++ b/pkgs/applications/editors/emacs/25.nix
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
description = "The extensible, customizable GNU text editor";
homepage = https://www.gnu.org/software/emacs/;
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ];
+ maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley ];
platforms = platforms.all;
longDescription = ''
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index 4a48cde571a..6f56ba6cf49 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -133,7 +133,7 @@ stdenv.mkDerivation rec {
description = "The extensible, customizable GNU text editor";
homepage = https://www.gnu.org/software/emacs/;
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ];
+ maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley ];
platforms = platforms.all;
longDescription = ''
diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix
index 9edac16507c..82bcc403164 100644
--- a/pkgs/applications/editors/quilter/default.nix
+++ b/pkgs/applications/editors/quilter/default.nix
@@ -1,39 +1,36 @@
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, meson, ninja, python3
, gtk3, desktop-file-utils, gtksourceview, webkitgtk, gtkspell3, pantheon
-, gnome3, discount, gobject-introspection, wrapGAppsHook }:
+, libgee, discount, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "quilter";
- version = "1.6.8";
-
- name = "${pname}-${version}";
+ version = "1.7.0";
src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
- sha256 = "07i9pivpddgixn1wzbr15gvzf0n5pklx0gkjjaa35kvj2z8k31x5";
+ sha256 = "0dqji6zwpn0k89mpmh10rq59hzrq8kqr30dz1hp06ygk8rlnv2ys";
};
nativeBuildInputs = [
desktop-file-utils
- gobject-introspection
meson
ninja
+ pantheon.vala
pkgconfig
python3
- pantheon.vala
wrapGAppsHook
];
buildInputs = [
discount
- pantheon.elementary-icon-theme
- pantheon.granite
- gnome3.libgee
gtk3
gtksourceview
gtkspell3
+ libgee
+ pantheon.elementary-icon-theme
+ pantheon.granite
webkitgtk
];
diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix
index 2e7435b48bb..0257a109568 100644
--- a/pkgs/applications/graphics/antimony/default.nix
+++ b/pkgs/applications/graphics/antimony/default.nix
@@ -4,19 +4,19 @@
}:
let
- gitRev = "60a58688e552f12501980c4bdab034ab0f2ba059";
+ gitRev = "c0038e3ea82fec6119de364bcbc3370955ed46a2";
gitBranch = "develop";
gitTag = "0.9.3";
in
stdenv.mkDerivation rec {
name = "antimony-${version}";
- version = "2018-07-17";
+ version = "2018-10-20";
src = fetchFromGitHub {
owner = "mkeeter";
repo = "antimony";
rev = gitRev;
- sha256 = "0pgf6kr23xw012xsil56j5gq78mlirmrlqdm09m5wlgcf4vr6xnl";
+ sha256 = "01cjcjppbb0gvh6npcsaidzpfcfzrqhhi07z4v0jkfyi0fl125v4";
};
patches = [ ./paths-fix.patch ];
diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix
new file mode 100644
index 00000000000..87c161b9aee
--- /dev/null
+++ b/pkgs/applications/graphics/fondo/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3, glib, gsettings-desktop-schemas, gtk3, libgee, json-glib, glib-networking, libsoup, libunity, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ pname = "fondo";
+ version = "1.2.1";
+
+ src = fetchFromGitHub {
+ owner = "calo001";
+ repo = pname;
+ rev = version;
+ sha256 = "0xczqkkq54gjay7wdl8mpil7klfrpvcw2a0n1brq7qrfhsmhc7pc";
+ };
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ pantheon.vala
+ pkgconfig
+ python3
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ glib
+ glib-networking
+ gsettings-desktop-schemas
+ gtk3
+ json-glib
+ libgee
+ libsoup
+ libunity
+ pantheon.granite
+ ];
+
+ postPatch = ''
+ chmod +x meson/post_install.py
+ patchShebangs meson/post_install.py
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Find the most beautiful wallpapers for your desktop";
+ homepage = https://github.com/calo001/fondo;
+ license = licenses.agpl3Plus;
+ maintainers = with maintainers; [ worldofpeace ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix
index fd65fcd2260..e6dafe4d08a 100644
--- a/pkgs/applications/misc/calcurse/default.nix
+++ b/pkgs/applications/misc/calcurse/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "calcurse-${version}";
- version = "4.3.0";
+ version = "4.4.0";
src = fetchurl {
url = "https://calcurse.org/files/${name}.tar.gz";
- sha256 = "16jzg0nasnxdlz23i121x41pq5kbxmjzk52c5d863rg117fc7v1i";
+ sha256 = "0vw2xi6a2lrhrb8n55zq9lv4mzxhby4xdf3hmi1vlfpyrpdwkjzd";
};
buildInputs = [ ncurses gettext python3 ];
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 22badfc8cdd..8473e997e7a 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "hugo-${version}";
- version = "0.50";
+ version = "0.54.0";
goPackagePath = "github.com/gohugoio/hugo";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "gohugoio";
repo = "hugo";
rev = "v${version}";
- sha256 = "1shrw7pxwrz9g5x9bq6k5qvhn3fqmwznadpw7i07msh97p8b3dyn";
+ sha256 = "01grfbr3kpd4qf5cbcmzc6yfq34cm0nkak4pqzgrn46r254y0ymv";
};
goDeps = ./deps.nix;
diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix
index d5c24d69048..d3d300db85b 100644
--- a/pkgs/applications/misc/hugo/deps.nix
+++ b/pkgs/applications/misc/hugo/deps.nix
@@ -1,5 +1,23 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
[
-
+ {
+ goPackagePath = "github.com/gobuffalo/envy";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gobuffalo/envy";
+ rev = "v1.6.8";
+ "sha256" = "1xh26j9bji8c4hr05f89kbc4fhqniba00bdcic4gs5xfnp2vj7gk";
+ };
+ }
+ {
+ goPackagePath = "github.com/joho/godotenv";
+ fetch = {
+ type = "git";
+ url = "https://github.com/joho/godotenv";
+ rev = "v1.3.0";
+ "sha256" = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm";
+ };
+ }
{
goPackagePath = "github.com/BurntSushi/locker";
fetch = {
@@ -9,7 +27,6 @@
sha256 = "1xak4aync4klswq5217qvw191asgla51jr42y94vp109lirm5dzg";
};
}
-
{
goPackagePath = "github.com/BurntSushi/toml";
fetch = {
@@ -19,7 +36,6 @@
sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
};
}
-
{
goPackagePath = "github.com/PuerkitoBio/purell";
fetch = {
@@ -29,7 +45,6 @@
sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91";
};
}
-
{
goPackagePath = "github.com/PuerkitoBio/urlesc";
fetch = {
@@ -39,7 +54,6 @@
sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw";
};
}
-
{
goPackagePath = "github.com/alecthomas/assert";
fetch = {
@@ -49,17 +63,15 @@
sha256 = "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l";
};
}
-
{
goPackagePath = "github.com/alecthomas/chroma";
fetch = {
type = "git";
url = "https://github.com/alecthomas/chroma";
- rev = "v0.5.0";
- sha256 = "150jv4vhsdi1gj3liwkgicdrwnzgv5qkq2fwznlnzf64vmfb0b9f";
+ rev = "v0.6.2";
+ sha256 = "1bcppy1s148iikr78qjm0akahn01ywh83a8pw544prr9yc16jvmz";
};
}
-
{
goPackagePath = "github.com/alecthomas/colour";
fetch = {
@@ -69,17 +81,33 @@
sha256 = "0iq566534gbzkd16ixg7fk298wd766821vvs80838yifx9yml5vs";
};
}
-
+ {
+ goPackagePath = "github.com/alecthomas/kong";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/kong";
+ rev = "v0.1.15";
+ sha256 = "1llxabcdzlb2hard0h931knqkdnyjyz8dp3k0nli0m0mags7l31b";
+ };
+ }
{
goPackagePath = "github.com/alecthomas/repr";
fetch = {
type = "git";
url = "https://github.com/alecthomas/repr";
- rev = "117648cd9897";
- sha256 = "05v1rgzdqc8razf702laagrvhvx68xd9yxxmzd3dyz0d6425pdrp";
+ rev = "d37bc2a10ba1";
+ sha256 = "0jnx1ypdl4zi010ds2z857ajkr5cx51wkx950rfqb126hvql7svx";
+ };
+ }
+ {
+ goPackagePath = "github.com/armon/consul-api";
+ fetch = {
+ type = "git";
+ url = "https://github.com/armon/consul-api";
+ rev = "eb2c6b5be1b6";
+ sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9";
};
}
-
{
goPackagePath = "github.com/bep/debounce";
fetch = {
@@ -89,7 +117,6 @@
sha256 = "1sh4zv0hv7f454mhzpl2mbv7ar5rm00wyy5qr78x1h84bgph87wy";
};
}
-
{
goPackagePath = "github.com/bep/gitmap";
fetch = {
@@ -99,17 +126,15 @@
sha256 = "0zqdl5h4ayi2gi5aqf35f1sjszhbcriksm2bf84fkrg7ngr48jn6";
};
}
-
{
goPackagePath = "github.com/bep/go-tocss";
fetch = {
type = "git";
url = "https://github.com/bep/go-tocss";
- rev = "v0.5.0";
- sha256 = "12q7h6nydklq4kg65kcgd85209rx7zf64ba6nf3k7y16knj4233q";
+ rev = "v0.6.0";
+ sha256 = "0w5i3ig3bbdrwbrcwzx8xsxhlb8xr17jj3wdcb6klqglg7551yvm";
};
}
-
{
goPackagePath = "github.com/chaseadamsio/goorgeous";
fetch = {
@@ -119,7 +144,42 @@
sha256 = "07qdqi46klizq3wigxqbiksnlgbrdc8hvmizgzg0aas5iqy88dcb";
};
}
-
+ {
+ goPackagePath = "github.com/cheekybits/is";
+ fetch = {
+ type = "git";
+ url = "https://github.com/cheekybits/is";
+ rev = "68e9c0620927";
+ sha256 = "1mkbyzhwq3rby832ikq00nxv3jnckxsm3949wkxd8ya9js2jmg4d";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/etcd";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/etcd";
+ rev = "v3.3.10";
+ sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/go-etcd";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/go-etcd";
+ rev = "v2.0.0";
+ sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/go-semver";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/go-semver";
+ rev = "v0.2.0";
+ sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0";
+ };
+ }
{
goPackagePath = "github.com/cpuguy83/go-md2man";
fetch = {
@@ -129,7 +189,6 @@
sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2";
};
}
-
{
goPackagePath = "github.com/danwakefield/fnmatch";
fetch = {
@@ -139,7 +198,6 @@
sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz";
};
}
-
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
@@ -149,7 +207,6 @@
sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
};
}
-
{
goPackagePath = "github.com/disintegration/imaging";
fetch = {
@@ -159,7 +216,6 @@
sha256 = "1laxccmzi7q51zxn81ringmdwp8iaipivrl375yc3gq56d70sp0r";
};
}
-
{
goPackagePath = "github.com/dlclark/regexp2";
fetch = {
@@ -169,7 +225,15 @@
sha256 = "144s81ndviwhyy20ipxvvfvap8phv5p762glxrz6aqxprkxfarj5";
};
}
-
+ {
+ goPackagePath = "github.com/dustin/go-humanize";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dustin/go-humanize";
+ rev = "v1.0.0";
+ sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3";
+ };
+ }
{
goPackagePath = "github.com/eknkc/amber";
fetch = {
@@ -179,7 +243,6 @@
sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9";
};
}
-
{
goPackagePath = "github.com/fortytw2/leaktest";
fetch = {
@@ -189,7 +252,6 @@
sha256 = "1lf9l6zgzjbcc7hmcjhhg3blx0y8icyxvjmjqqwfbwdk502803ra";
};
}
-
{
goPackagePath = "github.com/fsnotify/fsnotify";
fetch = {
@@ -199,7 +261,6 @@
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
};
}
-
{
goPackagePath = "github.com/gobwas/glob";
fetch = {
@@ -209,7 +270,6 @@
sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z";
};
}
-
{
goPackagePath = "github.com/gorilla/websocket";
fetch = {
@@ -219,7 +279,6 @@
sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk";
};
}
-
{
goPackagePath = "github.com/hashicorp/go-immutable-radix";
fetch = {
@@ -229,7 +288,6 @@
sha256 = "1v3nmsnk1s8bzpclrhirz7iq0g5xxbw9q5gvrg9ss6w9crs72qr6";
};
}
-
{
goPackagePath = "github.com/hashicorp/go-uuid";
fetch = {
@@ -239,7 +297,6 @@
sha256 = "1jflywlani7583qm4ysph40hsgx3n66n5zr2k84i057fmwa1ypfy";
};
}
-
{
goPackagePath = "github.com/hashicorp/golang-lru";
fetch = {
@@ -249,7 +306,6 @@
sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f";
};
}
-
{
goPackagePath = "github.com/hashicorp/hcl";
fetch = {
@@ -259,7 +315,6 @@
sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66";
};
}
-
{
goPackagePath = "github.com/inconshreveable/mousetrap";
fetch = {
@@ -269,7 +324,6 @@
sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
};
}
-
{
goPackagePath = "github.com/jdkato/prose";
fetch = {
@@ -279,7 +333,6 @@
sha256 = "1gjqgrpc7wbqvnhgwyfhxng24qvx37qjy0x2mbikiw1vaygxqsmy";
};
}
-
{
goPackagePath = "github.com/kr/pretty";
fetch = {
@@ -289,7 +342,6 @@
sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
};
}
-
{
goPackagePath = "github.com/kr/pty";
fetch = {
@@ -299,7 +351,6 @@
sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
};
}
-
{
goPackagePath = "github.com/kr/text";
fetch = {
@@ -309,7 +360,6 @@
sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
};
}
-
{
goPackagePath = "github.com/kyokomi/emoji";
fetch = {
@@ -319,7 +369,6 @@
sha256 = "005rxyxlqcd2sfjn686xb52l11wn2w0g5jv042ka6pnsx24r812a";
};
}
-
{
goPackagePath = "github.com/magefile/mage";
fetch = {
@@ -329,7 +378,6 @@
sha256 = "177hzmmzhk7bcm3jj2cj6d5l9h5ql3cikvndhk4agkslrhwr3xka";
};
}
-
{
goPackagePath = "github.com/magiconair/properties";
fetch = {
@@ -339,17 +387,33 @@
sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
};
}
-
{
goPackagePath = "github.com/markbates/inflect";
fetch = {
type = "git";
url = "https://github.com/markbates/inflect";
- rev = "a12c3aec81a6";
- sha256 = "0mawr6z9nav4f5j0nmjdxg9lbfhr7wz8zi34g7b6wndmzyf8jbsd";
+ rev = "v1.0.0";
+ sha256 = "072a73ij23mp8vabr8xwga2kj8dimya44ciiy9g4x4r9imm86psw";
+ };
+ }
+ {
+ goPackagePath = "github.com/matryer/try";
+ fetch = {
+ type = "git";
+ url = "https://github.com/matryer/try";
+ rev = "9ac251b645a2";
+ sha256 = "19fnqmpl3p54vmxgm1hmqvdc87brqx754wf3cdhq1bj04fcbb5h9";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-colorable";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-colorable";
+ rev = "v0.0.9";
+ sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
};
}
-
{
goPackagePath = "github.com/mattn/go-isatty";
fetch = {
@@ -359,7 +423,6 @@
sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
};
}
-
{
goPackagePath = "github.com/mattn/go-runewidth";
fetch = {
@@ -369,7 +432,6 @@
sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g";
};
}
-
{
goPackagePath = "github.com/miekg/mmark";
fetch = {
@@ -379,7 +441,6 @@
sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m";
};
}
-
{
goPackagePath = "github.com/mitchellh/hashstructure";
fetch = {
@@ -389,17 +450,15 @@
sha256 = "0zgl5c03ip2yzkb9b7fq9ml08i7j8prgd46ha1fcg8c6r7k9xl3i";
};
}
-
{
goPackagePath = "github.com/mitchellh/mapstructure";
fetch = {
type = "git";
url = "https://github.com/mitchellh/mapstructure";
- rev = "v1.0.0";
- sha256 = "0f06q4fpzg0c370cvmpsl0iq2apl5nkbz5cd3nba5x5ysmshv1lm";
+ rev = "v1.1.2";
+ sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr";
};
}
-
{
goPackagePath = "github.com/muesli/smartcrop";
fetch = {
@@ -409,7 +468,6 @@
sha256 = "0xbv5wbn0z36nkw9ay3ly6z23lpsrs0khryl1w54fz85lvwh66gp";
};
}
-
{
goPackagePath = "github.com/nfnt/resize";
fetch = {
@@ -419,7 +477,6 @@
sha256 = "005cpiwq28krbjf0zjwpfh63rp4s4is58700idn24fs3g7wdbwya";
};
}
-
{
goPackagePath = "github.com/nicksnyder/go-i18n";
fetch = {
@@ -429,7 +486,6 @@
sha256 = "1nlvq85c232z5yjs86pxpmkv7hk6gb5pa6j4hhzgdz85adk2ma04";
};
}
-
{
goPackagePath = "github.com/olekukonko/tablewriter";
fetch = {
@@ -439,7 +495,6 @@
sha256 = "1274k5r9ardh1f6gsmadxmdds7zy8rkr55fb9swvnm0vazr3y01l";
};
}
-
{
goPackagePath = "github.com/pelletier/go-toml";
fetch = {
@@ -449,7 +504,6 @@
sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
};
}
-
{
goPackagePath = "github.com/pkg/errors";
fetch = {
@@ -459,7 +513,6 @@
sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
};
}
-
{
goPackagePath = "github.com/pmezard/go-difflib";
fetch = {
@@ -469,7 +522,6 @@
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
};
}
-
{
goPackagePath = "github.com/russross/blackfriday";
fetch = {
@@ -479,7 +531,6 @@
sha256 = "01z1jsdkac09cw95lqq4pahkw9xnini2mb956lvb772bby2x3dmj";
};
}
-
{
goPackagePath = "github.com/sanity-io/litter";
fetch = {
@@ -489,7 +540,6 @@
sha256 = "09nywwxxd6rmhxc7rsvs96ynjszmnvmhwr7dvh1n35hb6h9y7s2r";
};
}
-
{
goPackagePath = "github.com/sergi/go-diff";
fetch = {
@@ -499,7 +549,6 @@
sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7";
};
}
-
{
goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
fetch = {
@@ -509,17 +558,15 @@
sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h";
};
}
-
{
goPackagePath = "github.com/spf13/afero";
fetch = {
type = "git";
url = "https://github.com/spf13/afero";
- rev = "v1.1.2";
- sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k";
+ rev = "v1.2.1";
+ sha256 = "14qqj0cz6a595vn4dp747vddx05fd77jdsyl85qjmf9baymaxlam";
};
}
-
{
goPackagePath = "github.com/spf13/cast";
fetch = {
@@ -529,7 +576,6 @@
sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5";
};
}
-
{
goPackagePath = "github.com/spf13/cobra";
fetch = {
@@ -539,7 +585,6 @@
sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd";
};
}
-
{
goPackagePath = "github.com/spf13/fsync";
fetch = {
@@ -549,7 +594,6 @@
sha256 = "1vvbgxbbsc4mvi1axgqgn9pzjz1p495dsmwpc7mr8qxh8f6s0nhv";
};
}
-
{
goPackagePath = "github.com/spf13/jwalterweatherman";
fetch = {
@@ -559,7 +603,6 @@
sha256 = "1ywmkwci5zyd88ijym6f30fj5c0k2yayxarkmnazf5ybljv50q7b";
};
}
-
{
goPackagePath = "github.com/spf13/nitro";
fetch = {
@@ -569,57 +612,51 @@
sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib";
};
}
-
{
goPackagePath = "github.com/spf13/pflag";
fetch = {
type = "git";
url = "https://github.com/spf13/pflag";
- rev = "v1.0.2";
- sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2";
+ rev = "v1.0.3";
+ sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd";
};
}
-
{
goPackagePath = "github.com/spf13/viper";
fetch = {
type = "git";
url = "https://github.com/spf13/viper";
- rev = "v1.2.0";
- sha256 = "0klv7dyllvv9jkyspy4ww5nrz24ngb3adlh884cbdjn7562bhi47";
+ rev = "v1.3.1";
+ sha256 = "1190mg04718r03qriav99sf4kx2n7wdgr8vdni15f74bpbzrdjrl";
};
}
-
{
goPackagePath = "github.com/stretchr/testify";
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
- rev = "f2347ac6c9c9";
- sha256 = "0ns8zc2n8gpcsd1fdaqbq7a8d939lnaxraqx5nr2fi2zdxqyh7hm";
+ rev = "04af85275a5c";
+ sha256 = "1al7hgvg34xbajds99ss5wmlndxbzzmz5l0wrg6wchvvfaiwxlx0";
};
}
-
{
goPackagePath = "github.com/tdewolff/minify";
fetch = {
type = "git";
url = "https://github.com/tdewolff/minify";
- rev = "v2.3.6";
- sha256 = "0p4v4ab49lm5y438k5aks06fpiagbjw2j2x7i8jaa273mkgicrbb";
+ rev = "v2.3.7";
+ sha256 = "1mj1lmd8s0mrg9cfj1ihvsqrbsbpzh3icm0pmayd2r6jp6rbffw6";
};
}
-
{
goPackagePath = "github.com/tdewolff/parse";
fetch = {
type = "git";
url = "https://github.com/tdewolff/parse";
- rev = "fced451e0bed";
- sha256 = "1n6wcapk8xbck2zjxd4l5cgfn1v12rr7znrdpd5y2xp1nc3739c3";
+ rev = "v2.3.5";
+ sha256 = "05w859s31dx6525wrjryby601z9c0xpncilznk6shgqygpxda6cz";
};
}
-
{
goPackagePath = "github.com/tdewolff/test";
fetch = {
@@ -629,17 +666,33 @@
sha256 = "10vyp4bhanzg3yl9k8zqfdrxpsmx8yc53xv4lqxfymd7jjyqgssj";
};
}
-
+ {
+ goPackagePath = "github.com/ugorji/go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ugorji/go";
+ rev = "d75b2dcb6bc8";
+ sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps";
+ };
+ }
{
goPackagePath = "github.com/wellington/go-libsass";
fetch = {
type = "git";
url = "https://github.com/wellington/go-libsass";
- rev = "615eaa47ef79";
- sha256 = "0imjiskn4vq7nml5jwb1scgl61jg53cfpkjnb9rsc6m8gsd8s16s";
+ rev = "c63644206701";
+ sha256 = "1ml0fk4wldnjlkmliydnig9f3rpp3cdzwgz331mlqyadvma3c0lf";
+ };
+ }
+ {
+ goPackagePath = "github.com/xordataexchange/crypt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/xordataexchange/crypt";
+ rev = "b2862e3d0a77";
+ sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y";
};
}
-
{
goPackagePath = "github.com/yosssi/ace";
fetch = {
@@ -649,7 +702,15 @@
sha256 = "1kbvbc56grrpnl65grygd23gyn3nkkhxdg8awhzkjmd0cvki8w1f";
};
}
-
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "505ab145d0a9";
+ sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s";
+ };
+ }
{
goPackagePath = "golang.org/x/image";
fetch = {
@@ -659,7 +720,6 @@
sha256 = "1kkafy29vz5xf6r29ghbvvbwrgjxwxvzk6dsa2qhyp1ddk6l2vkz";
};
}
-
{
goPackagePath = "golang.org/x/net";
fetch = {
@@ -669,7 +729,6 @@
sha256 = "0254ld010iijygbzykib2vags1dc0wlmcmhgh4jl8iny159lhbcv";
};
}
-
{
goPackagePath = "golang.org/x/sync";
fetch = {
@@ -679,17 +738,15 @@
sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
};
}
-
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
- rev = "d0be0721c37e";
- sha256 = "081wyvfnlf842dqg03raxfz6lldlxpmyh1prix9lmrrm65arxb12";
+ rev = "b4a75ba826a6";
+ sha256 = "0kzrd2wywkcq35iakbzplqyma4bvf2ng3mzi7917kxcbdq3fflrj";
};
}
-
{
goPackagePath = "golang.org/x/text";
fetch = {
@@ -699,7 +756,6 @@
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
};
}
-
{
goPackagePath = "gopkg.in/check.v1";
fetch = {
@@ -709,14 +765,13 @@
sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
};
}
-
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
- rev = "v2.2.1";
- sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+ rev = "v2.2.2";
+ sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
};
}
]
diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix
index a79c63db163..a732a5ed536 100644
--- a/pkgs/applications/misc/notejot/default.nix
+++ b/pkgs/applications/misc/notejot/default.nix
@@ -1,36 +1,33 @@
{ stdenv, fetchFromGitHub, pkgconfig, meson, ninja, python3, pantheon
-, gtk3, gtksourceview, json-glib, gnome3, gobject-introspection, wrapGAppsHook }:
+, gtk3, gtksourceview, json-glib, gnome3, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "notejot";
- version = "1.5.4";
-
- name = "${pname}-${version}";
+ version = "1.5.5";
src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
- sha256 = "1lv4s2mqddi6lz414kqpp4vcwnkjibc0k2xhnczaa1wf3azlxjgf";
+ sha256 = "0khf6mwidybfgnq4zmhf3af4w6aicipmi12fvs722fqlf1lrkdmd";
};
nativeBuildInputs = [
- gobject-introspection
meson
ninja
+ pantheon.vala
pkgconfig
python3
- pantheon.vala
wrapGAppsHook
];
buildInputs = [
- pantheon.elementary-icon-theme
- pantheon.granite
gnome3.libgee
gtk3
gtksourceview
json-glib
+ pantheon.elementary-icon-theme
+ pantheon.granite
];
postPatch = ''
diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index 38b2d4ece4d..a3be9cad3ae 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -2,14 +2,14 @@
with python3Packages;
buildPythonApplication rec {
- version = "1.24.0";
+ version = "1.25.1";
pname = "rtv";
src = fetchFromGitHub {
owner = "michael-lazar";
repo = "rtv";
rev = "v${version}";
- sha256 = "0vzhnqys8nr6ymsi1mnv092z3i7nwyhgnj4jv6mjifak9j3164fw";
+ sha256 = "0pfsf17g37d2v1xrsbfdbv460vs7m955h6q51z71rhb840r9812p";
};
# Tests try to access network
diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix
index f9267411dda..f5c92592cd1 100644
--- a/pkgs/applications/misc/worker/default.nix
+++ b/pkgs/applications/misc/worker/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "worker-${version}";
- version = "3.15.2";
+ version = "3.15.3";
src = fetchurl {
url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz";
- sha256 = "0km17ls51vp4nxlppf58vvxxymyx6w3xlzjc8wghxpjj098v4pp8";
+ sha256 = "03dv50h68grscxiaxslzv486v1bfi8y81vrjr2gs39svw7bwz5d4";
};
buildInputs = [ libX11 ];
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index f31ff05a42b..faa5bc121cb 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -47,7 +47,7 @@ mkChromiumDerivation (base: rec {
meta = {
description = "An open source web browser from Google";
homepage = http://www.chromium.org/;
- maintainers = with maintainers; [ chaoflow bendlas ];
+ maintainers = with maintainers; [ bendlas ];
license = licenses.bsd3;
platforms = platforms.linux;
hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];
diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix
index ded2b688815..be1389c2121 100644
--- a/pkgs/applications/networking/browsers/conkeror/default.nix
+++ b/pkgs/applications/networking/browsers/conkeror/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
'';
homepage = http://conkeror.org/;
license = with licenses; [ mpl11 gpl2 lgpl21 ];
- maintainers = with maintainers; [ astsmtl chaoflow ];
+ maintainers = with maintainers; [ astsmtl ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix
index 3f019d17702..98d4e25ef87 100644
--- a/pkgs/applications/networking/charles/default.nix
+++ b/pkgs/applications/networking/charles/default.nix
@@ -1,48 +1,68 @@
-{ stdenv, fetchurl, makeDesktopItem, jre, makeWrapper }:
+{
+stdenv
+, makeWrapper
+, makeDesktopItem
+, fetchurl
+, jre
+}:
let
- desktopItem = makeDesktopItem {
- categories = "Network;Development;WebDevelopment;Java;";
- desktopName = "Charles";
- exec = "charles %F";
- genericName = "Web Debugging Proxy";
- icon = "charles-proxy";
- mimeType = "application/x-charles-savedsession;application/x-charles-savedsession+xml;application/x-charles-savedsession+json;application/har+json;application/vnd.tcpdump.pcap;application/x-charles-trace";
- name = "Charles";
- startupNotify = "true";
- };
+ generic = { version, sha256, ... }@attrs:
+ let
+ desktopItem = makeDesktopItem {
+ categories = "Network;Development;WebDevelopment;Java;";
+ desktopName = "Charles";
+ exec = "charles %F";
+ genericName = "Web Debugging Proxy";
+ icon = "charles-proxy";
+ mimeType = "application/x-charles-savedsession;application/x-charles-savedsession+xml;application/x-charles-savedsession+json;application/har+json;application/vnd.tcpdump.pcap;application/x-charles-trace";
+ name = "Charles";
+ startupNotify = "true";
+ };
-in stdenv.mkDerivation rec {
- name = "charles-${version}";
- version = "4.2.7";
+ attrs' = builtins.removeAttrs attrs ["version" "sha256"];
+ in stdenv.mkDerivation rec {
+ name = "charles-${version}";
+ inherit version;
- src = fetchurl {
- url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}.tar.gz";
+ src = fetchurl {
+ url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}.tar.gz";
+ inherit sha256;
+ };
+ buildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ makeWrapper ${jre}/bin/java $out/bin/charles \
+ --add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar"
+
+ for fn in lib/*.jar; do
+ install -D -m644 $fn $out/share/java/$(basename $fn)
+ done
+
+ mkdir -p $out/share/applications
+ ln -s ${desktopItem}/share/applications/* $out/share/applications/
+
+ mkdir -p $out/share/icons
+ cp -r icon $out/share/icons/hicolor
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Web Debugging Proxy";
+ homepage = https://www.charlesproxy.com/;
+ maintainers = [ maintainers.kalbasit ];
+ license = stdenv.lib.licenses.unfree;
+ platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+ };
+ };
+
+in rec {
+ charles4 = (generic {
+ version = "4.2.7";
sha256 = "1nycw3wpbfwj4ijjaq5k0f4xipj8j605fs0yjzgl66gmv7r583rd";
- };
-
- buildInputs = [ makeWrapper ];
-
- installPhase = ''
- makeWrapper ${jre}/bin/java $out/bin/charles \
- --add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar"
-
- for fn in lib/*.jar; do
- install -D -m644 $fn $out/share/java/$(basename $fn)
- done
-
- mkdir -p $out/share/applications
- ln -s ${desktopItem}/share/applications/* $out/share/applications/
-
- mkdir -p $out/share/icons
- cp -r icon $out/share/icons/hicolor
- '';
-
- meta = with stdenv.lib; {
- description = "Web Debugging Proxy";
- homepage = https://www.charlesproxy.com/;
- maintainers = [ maintainers.kalbasit ];
- license = stdenv.lib.licenses.unfree;
- platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
- };
+ });
+ charles3 = (generic {
+ version = "3.12.3";
+ sha256 = "13zk82ny1w5zd9qcs9qkq0kdb22ni5byzajyshpxdfm4zv6p32ss";
+ });
}
+
diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
index 8daa5d166c5..8207c2cecfa 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -1,9 +1,9 @@
{ stable, branch, version, sha256Hash }:
-{ stdenv, python36, fetchFromGitHub }:
+{ stdenv, python3, fetchFromGitHub, fetchpatch }:
let
- python = if stable then python36.override {
+ python = if stable then python3.override {
packageOverrides = self: super: {
async-timeout = super.async-timeout.overridePythonAttrs (oldAttrs: rec {
version = "2.0.1";
@@ -31,7 +31,7 @@ let
++ stdenv.lib.optional (pythonOlder "3.5") typing;
});
};
- } else python36;
+ } else python3;
in python.pkgs.buildPythonPackage {
pname = "gns3-server";
@@ -44,9 +44,14 @@ in python.pkgs.buildPythonPackage {
sha256 = sha256Hash;
};
+ postPatch = ''
+ # "typing" is only required for Python 3.4 and breaks Python 3.7:
+ sed -iE "s/.*typing.*//" requirements.txt
+ '';
+
propagatedBuildInputs = with python.pkgs; [
aiohttp-cors yarl aiohttp multidict
- jinja2 psutil zipstream raven jsonschema typing
+ jinja2 psutil zipstream raven jsonschema
(python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {})
] ++ stdenv.lib.optional (!stable) python.pkgs.distro;
diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index ae2f6f10304..e131e4c7a3c 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -1,6 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, openssl
, glibcLocales, expect, ncurses, libotr, curl, readline, libuuid
, cmocka, libmicrohttpd, stabber, expat, libmesode
+, autoconf-archive
, autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null
, notifySupport ? true, libnotify ? null, gdk_pixbuf ? null
@@ -32,7 +33,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- nativeBuildInputs = [ autoreconfHook glibcLocales pkgconfig ];
+ nativeBuildInputs = [
+ autoreconfHook autoconf-archive glibcLocales pkgconfig
+ ];
buildInputs = [
expect readline libuuid glib openssl expat ncurses libotr
@@ -58,12 +61,6 @@ stdenv.mkDerivation rec {
LC_ALL = "en_US.utf8";
- NIX_CFLAGS_COMPILE = [ ]
- ++ optionals pythonPluginSupport [ "-I${python}/include/${python.libPrefix}" ];
-
- LDFLAGS = [ ]
- ++ optionals pythonPluginSupport [ "-L${python}/lib" "-l${python.libPrefix}" ];
-
meta = {
description = "A console based XMPP client";
longDescription = ''
diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index d5dc3282a1c..93bde0b05c9 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -43,7 +43,7 @@ let
xorg.libxcb
];
- version = "3.5.2881";
+ version = "3.6.2885";
plat = {
"i686-linux" = "i386";
@@ -51,8 +51,8 @@ let
}.${stdenv.hostPlatform.system};
sha256 = {
- "i686-linux" = "0s5j6acsiymsikvah9f1ywandzvcdx5m8csrc7ymhv0gx2a9xm1d";
- "x86_64-linux" = "17siis4xws27jmhf1gyb6cvip6clak27zxckyk0b312kkc4q363i";
+ "i686-linux" = "1lj2gjv69z94dj7b4zjhls420fs5zzxkdlwv25p2gp4lkv0v6l98";
+ "x86_64-linux" = "1dl88fpy8v3aprzdp1nnwg08sy7yiljqjnpnl3rw0h5nix6xmv9v";
}.${stdenv.hostPlatform.system};
in
@@ -60,7 +60,7 @@ in
name = "wire-desktop-${version}";
src = fetchurl {
- url = "https://wire-app.wire.com/linux/debian/pool/main/wire_${version}_${plat}.deb";
+ url = "https://wire-app.wire.com/linux/debian/pool/main/Wire-${version}_${plat}.deb";
inherit sha256;
};
@@ -103,9 +103,9 @@ in
meta = with stdenv.lib; {
description = "A modern, secure messenger";
- homepage = https://wire.com/;
- license = licenses.gpl3;
+ homepage = https://wire.com/;
+ license = licenses.gpl3;
maintainers = with maintainers; [ worldofpeace ];
- platforms = [ "i686-linux" "x86_64-linux" ];
+ platforms = [ "i686-linux" "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix
index 86f945f369a..6356fcfc209 100644
--- a/pkgs/applications/networking/mailreaders/mblaze/default.nix
+++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "mblaze-${version}";
- version = "0.4";
+ version = "0.5";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
@@ -10,11 +10,15 @@ stdenv.mkDerivation rec {
owner = "chneukirchen";
repo = "mblaze";
rev = "v${version}";
- sha256 = "15ac213a17mxni3bqvzxhiln65s4almrlmv72bbcgi7cymb303rp";
+ sha256 = "0fyvydafpz7vmwgn7hc4drm9sb7367smrd07wfyizpas0gmxw2j8";
};
makeFlags = "PREFIX=$(out)";
+ postInstall = ''
+ install -Dm644 -t $out/share/zsh/site-functions contrib/_mblaze
+ '';
+
meta = with stdenv.lib; {
homepage = https://github.com/chneukirchen/mblaze;
description = "Unix utilities to deal with Maildir";
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 3afabb8bafb..dde0d480391 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -27,11 +27,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "mutt-${version}";
- version = "1.11.2";
+ version = "1.11.3";
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
- sha256 = "08w7lbhj5ba2zkjcd0cxkgfiy9y82yhg731xjg9i9292kz1x8p6s";
+ sha256 = "0h8rmcc62n1pagm7mjjccd5fxyhhi4vbvp8m88digkdf5z0g8hm5";
};
patches = optional smimeSupport (fetchpatch {
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 2fff46a1737..b6d552d96d5 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
description = "Mail indexer";
homepage = https://notmuchmail.org/;
license = licenses.gpl3;
- maintainers = with maintainers; [ chaoflow flokli garbas the-kenny ];
+ maintainers = with maintainers; [ flokli garbas the-kenny ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index af01b89dc76..c4b434dcaa4 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
buildGoPackage rec {
- name = "rclone-${version}";
- version = "1.45";
+ pname = "rclone";
+ version = "1.46";
goPackagePath = "github.com/ncw/rclone";
subPackages = [ "." ];
@@ -11,11 +11,19 @@ buildGoPackage rec {
owner = "ncw";
repo = "rclone";
rev = "v${version}";
- sha256 = "06xg0ibv9pnrnmabh1kblvxx1pk8h5rmkr9mjbymv497sx3zgz26";
+ sha256 = "1fl52dl41n76r678nzkxa2kgk9khn1fxraxgk8jd3ayc787qs9ia";
};
outputs = [ "bin" "out" "man" ];
+ # https://github.com/ncw/rclone/issues/2964
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/ncw/rclone/commit/1c1a8ef24bea9332c6c450379ed3c5d953e07508.patch";
+ sha256 = "0mq74z78lc3dhama303k712xkzz9q6p7zqlbwbl04bndqlkny03k";
+ })
+ ];
+
postInstall = ''
install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1
'';
diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix
index 67418838d74..b5b8445df45 100644
--- a/pkgs/applications/networking/weather/meteo/default.nix
+++ b/pkgs/applications/networking/weather/meteo/default.nix
@@ -1,24 +1,21 @@
{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3
, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk, geocode-glib
-, libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook }:
+, libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook, hicolor-icon-theme }:
stdenv.mkDerivation rec {
pname = "meteo";
- version = "0.8.5";
-
- name = "${pname}-${version}";
+ version = "0.9.6";
src = fetchFromGitLab {
owner = "bitseater";
repo = pname;
rev = version;
- sha256 = "1mc2djhkg0nzcjmy87l1wqwni48vgpqh8s1flr90pipk12a1mh7n";
+ sha256 = "1786s5637hc3dnnkf5vr2ngfiq73dyvx8187gx7qkh7cr8xrl50w";
};
nativeBuildInputs = [
appstream
desktop-file-utils
- gobject-introspection
meson
ninja
pkgconfig
@@ -32,9 +29,9 @@ stdenv.mkDerivation rec {
clutter-gtk
geocode-glib
gtk3
+ hicolor-icon-theme
json-glib
libappindicator
- libchamplain
libsoup
webkitgtk
];
diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index 2f736dd5856..472f6c13c56 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -13,11 +13,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "znc-${version}";
- version = "1.7.1";
+ version = "1.7.2";
src = fetchurl {
url = "https://znc.in/releases/archive/${name}.tar.gz";
- sha256 = "1i1r1lh9q2mr1bg520zrvrlwhrhy6wibrin78wjxq1gab1qymks4";
+ sha256 = "1ac2csl5jr56vahnxdynlvrhwlvcc1gqxvyifckc6cn5aj7ygd30";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix
new file mode 100644
index 00000000000..2dee39a0ad3
--- /dev/null
+++ b/pkgs/applications/office/notes-up/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchFromGitHub, pantheon, pkgconfig, cmake, ninja, gtk3, gtksourceview3, webkitgtk, gtkspell3, glib, libgee, sqlite, discount, wrapGAppsHook
+, withPantheon ? false }:
+
+stdenv.mkDerivation rec {
+ pname = "notes-up";
+ version = "1.6.3";
+
+ src = fetchFromGitHub {
+ owner = "Philip-Scott";
+ repo = "Notes-up";
+ rev = version;
+ sha256 = "06fzdb823kkami0jch9ccblsvw3x7zd1d4xz8fv3giscl3f36x4q";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ ninja
+ pantheon.vala
+ pkgconfig
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ discount
+ glib
+ gtk3
+ gtksourceview3
+ gtkspell3
+ libgee
+ pantheon.granite
+ sqlite
+ webkitgtk
+ ];
+
+ # Whether to build with contractor support (Pantheon specific)
+ cmakeFlags = if withPantheon then null else [ "-Dnoele=yes" ];
+
+ meta = with stdenv.lib; {
+ description = "Markdown notes editor and manager designed for elementary OS"
+ + stdenv.lib.optionalString withPantheon " - built with Contractor support";
+ homepage = https://github.com/Philip-Scott/Notes-up;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ davidak worldofpeace ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 67baa98d21e..fc4c18f5eb7 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -4,7 +4,7 @@
let
# if you bump version, update pkgs.tortoisehg too or ping maintainer
- version = "4.8.2";
+ version = "4.9";
name = "mercurial-${version}";
inherit (python2Packages) docutils hg-git dulwich python;
in python2Packages.buildPythonApplication {
@@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication {
src = fetchurl {
url = "https://mercurial-scm.org/release/${name}.tar.gz";
- sha256 = "1cpx8nf6vcqz92kx6b5c4900pcay8zb89gvy8y33prh5rywjq83c";
+ sha256 = "01ig0464cvy9d87rn274g39frxr0p5q4lxf1xn5k3m24grf0qq0g";
};
inherit python; # pass it so that the same version can be used in hg2git
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index b17ba7e19f4..77ee2bc10f8 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -3,7 +3,7 @@
# Derivation patches HandBrake to use Nix closure dependencies.
#
-{ stdenv, lib, fetchurl, callPackage,
+{ stdenv, lib, fetchurl,
# Main build tools
python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4,
# Processing, video codecs, containers
@@ -30,11 +30,11 @@
stdenv.mkDerivation rec {
pname = "handbrake";
- version = "1.2.1";
+ version = "1.2.2";
src = fetchurl {
url = ''https://download2.handbrake.fr/${version}/HandBrake-${version}-source.tar.bz2'';
- sha256 = "0gbqzar49c8ygz6chnsz65xgsdcwr60lbc8ivnw8i6xjggn6wc80";
+ sha256 = "0k2yaqy7zi06k8mkp9az2mn9dlgj3a1339vacakfh2nn2zsics6z";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 05105b64af7..24a1f07fb0d 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -18,7 +18,7 @@
, libcec, libcec_platform, dcadec, libuuid
, libcrossguid, libmicrohttpd
, bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp
-, libplist, p11-kit, zlib
+, libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson
, dbusSupport ? true, dbus ? null
, joystickSupport ? true, cwiid ? null
, nfsSupport ? true, libnfs ? null
@@ -40,21 +40,18 @@ assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used i
assert vdpauSupport -> libvdpau != null;
# TODO for Kodi 18.0
-# - cmake is no longer in project/cmake
-# - maybe we can remove auto{conf,make} and libtool from inputs
# - check if dbus support PR has been merged and add dbus as a buildInput
-# - try to use system ffmpeg (kodi 17 works best with bundled 3.1 with patches)
let
- kodiReleaseDate = "20171115";
- kodiVersion = "17.6";
- rel = "Krypton";
+ kodiReleaseDate = "20190129";
+ kodiVersion = "18.0";
+ rel = "Leia";
kodi_src = fetchFromGitHub {
owner = "xbmc";
repo = "xbmc";
rev = "${kodiVersion}-${rel}";
- sha256 = "1pwmmbry7dajwdpmc1mdygjvxna4kl38h32d71g10yf3mdm5wmz3";
+ sha256 = "1ci5jjvqly01lysdp6j6jrnn49z4is9z5kan5zl3cpqm9w7rqarg";
};
kodiDependency = { name, version, rev, sha256, ... } @attrs:
@@ -72,9 +69,9 @@ let
ffmpeg = kodiDependency rec {
name = "FFmpeg";
- version = "3.1.11";
- rev = "${version}-${rel}-17.5"; # TODO: change 17.5 back to ${kodiVersion}
- sha256 = "0nc4sb6v1g3l11v9h5l9n44a8r40186rcbp2xg5c7vg6wcpjid13";
+ version = "4.0.3";
+ rev = "${version}-${rel}-RC5";
+ sha256 = "0l20bysv2y711khwpnpw4dz6mzd37qllki3fnv4dx1lj8ivydrlx";
preConfigure = ''
cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} .
'';
@@ -86,29 +83,29 @@ let
# we should be able to build these externally and have kodi reference them as buildInputs.
# Doesn't work ATM though so we just use them for the src
- libdvdcss = kodiDependency {
+ libdvdcss = kodiDependency rec {
name = "libdvdcss";
- version = "20160215";
- rev = "2f12236bc1c92f73c21e973363f79eb300de603f";
- sha256 = "198r0q73i55ga1dvyqq9nfcri0zq08b94hy8671lg14i3izx44dd";
+ version = "1.4.2";
+ rev = "${version}-${rel}-Beta-5";
+ sha256 = "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl";
buildInputs = [ libdvdread ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
};
- libdvdnav = kodiDependency {
+ libdvdnav = kodiDependency rec {
name = "libdvdnav";
- version = "20170217";
- rev = "981488f7f27554b103cca10c1fbeba027396c94a";
- sha256 = "089pswc51l3avh95zl4cpsh7gh1innh7b2y4xgx840mcmy46ycr8";
+ version = "6.0.0";
+ rev = "${version}-${rel}-Alpha-3";
+ sha256 = "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb";
buildInputs = [ libdvdread ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
};
- libdvdread = kodiDependency {
+ libdvdread = kodiDependency rec {
name = "libdvdread";
- version = "20160221";
- rev = "17d99db97e7b8f23077b342369d3c22a6250affd";
- sha256 = "1gr5aq1cjr3as9mnwrw29cxn4m6f6pfrxdahkdcjy70q3ldg90sl";
+ version = "6.0.0";
+ rev = "${version}-${rel}-Alpha-3";
+ sha256 = "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59";
nativeBuildInputs = [ autoreconfHook pkgconfig ];
};
@@ -136,7 +133,7 @@ in stdenv.mkDerivation rec {
libgcrypt libgpgerror libunistring
libcrossguid cwiid libplist
bluez giflib glib harfbuzz lcms2 libpthreadstubs libXdmcp
- ffmpeg
+ ffmpeg flatbuffers fmt fstrcmp rapidjson
# libdvdcss libdvdnav libdvdread
]
++ lib.optional dbusSupport dbus
@@ -176,14 +173,10 @@ in stdenv.mkDerivation rec {
doCheck = false;
postPatch = ''
- substituteInPlace xbmc/linux/LinuxTimezone.cpp \
+ substituteInPlace xbmc/platform/linux/LinuxTimezone.cpp \
--replace 'usr/share/zoneinfo' 'etc/zoneinfo'
'';
- preConfigure = ''
- cd project/cmake
- '';
-
postInstall = ''
for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p \
@@ -209,6 +202,6 @@ in stdenv.mkDerivation rec {
homepage = https://kodi.tv/;
license = licenses.gpl2;
platforms = platforms.linux;
- maintainers = with maintainers; [ domenkozar titanous edwtjo peterhoeg ];
+ maintainers = with maintainers; [ domenkozar titanous edwtjo peterhoeg sephalon ];
};
}
diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 196852933a9..29fbf79c662 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -1,13 +1,14 @@
{ stdenv, callPackage, fetchurl, fetchFromGitHub, unzip
-, cmake, kodiPlain, libcec_platform, tinyxml
+, cmake, kodiPlain, libcec_platform, tinyxml, rapidxml
, steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib
-, python2Packages }:
+, python2Packages, expat, glib, nspr, nss }:
with stdenv.lib;
let self = rec {
pluginDir = "/share/kodi/addons";
+ rel = "Leia";
kodi = kodiPlain;
@@ -54,6 +55,8 @@ let self = rec {
dontStrip = true;
+ extraRuntimeDependencies = [ ];
+
installPhase = ''
${if isNull sourceDir then "" else "cd $src/$sourceDir"}
d=$out${pluginDir}/${namespace}
@@ -64,7 +67,8 @@ let self = rec {
'';
} // args));
- mkKodiABIPlugin = { plugin, namespace, version, extraBuildInputs ? [], ... }@args:
+ mkKodiABIPlugin = { plugin, namespace, version, extraBuildInputs ? [],
+ extraRuntimeDependencies ? [], extraInstallPhase ? "", ... }@args:
toKodiPlugin (stdenv.mkDerivation (rec {
name = "kodi-plugin-${plugin}-${version}";
@@ -73,6 +77,8 @@ let self = rec {
buildInputs = [ cmake kodiPlain kodi-platform libcec_platform ]
++ extraBuildInputs;
+ inherit extraRuntimeDependencies;
+
# disables check ensuring install prefix is that of kodi
cmakeFlags = [
"-DOVERRIDE_PATHS=1"
@@ -84,6 +90,7 @@ let self = rec {
installPhase = let n = namespace; in ''
make install
ln -s $out/lib/addons/${n}/${n}.so.${version} $out${pluginDir}/${n}/${n}.so.${version}
+ ${extraInstallPhase}
'';
} // args));
@@ -212,14 +219,14 @@ let self = rec {
joystick = mkKodiABIPlugin rec {
namespace = "peripheral.joystick";
- version = "1.3.2";
+ version = "1.4.7";
plugin = namespace;
src = fetchFromGitHub {
- owner = "kodi-game";
+ owner = "xbmc";
repo = namespace;
- rev = "96171dd32899553ffe8fc775fca66e8df5ff5cf1";
- sha256 = "18m61v8z9fbh4imvzhh4g9629r9df49g2yk9ycaczirg131dhfbh";
+ rev = "v${version}";
+ sha256 = "03gsp4kg41s3n4ib4wsv7m3krfipgwc2z07i4mnd5zvg0c4xrmap";
};
meta = {
@@ -282,14 +289,14 @@ let self = rec {
steam-controller = mkKodiABIPlugin rec {
namespace = "peripheral.steamcontroller";
- version = "0.9.0";
+ version = "0.10.0";
plugin = namespace;
src = fetchFromGitHub {
owner = "kodi-game";
repo = namespace;
- rev = "76f640fad4f68118f4fab6c4c3338d13daca7074";
- sha256 = "0yqlfdiiymb8z6flyhpval8w3kdc9qv3mli3jg1xn5ac485nxsxh";
+ rev = "ea345392ab5aa4485f3a48d2037fa8a8e8ab82de";
+ sha256 = "1hbd8fdvn7xkr9csz1g9wah78nhnq1rkazl4zwa31y70830k3279";
};
extraBuildInputs = [ libusb ];
@@ -355,13 +362,13 @@ let self = rec {
plugin = "pvr-hts";
namespace = "pvr.hts";
- version = "3.4.16";
+ version = "4.4.14";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.hts";
- rev = "b39e4e9870d68841279cbc7d7214f3ad9b27f330";
- sha256 = "0pmlgqr4kd0gvckz77mj6v42kcx6lb23anm8jnf2fbn877snnijx";
+ rev = "${version}-${rel}";
+ sha256 = "1bcwcwd2yjhw85yk6lyhf0iqiclrsz7r7vpbxgc650fwqbb146gr";
};
meta = {
@@ -377,13 +384,13 @@ let self = rec {
plugin = "pvr-hdhomerun";
namespace = "pvr.hdhomerun";
- version = "2.4.7";
+ version = "3.5.0";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.hdhomerun";
- rev = "60d89d16dd953d38947e8a6da2f8bb84a0f764ef";
- sha256 = "0dvdv0vk2q12nj0i5h51iaypy3i7jfsxjyxwwpxfy82y8260ragy";
+ rev = "${version}-${rel}";
+ sha256 = "1zrkvfn0im2qmvqm93pa3cg8xkxv61sxlj8nsz4r5z9v9nhqadf6";
};
meta = {
@@ -401,13 +408,13 @@ let self = rec {
plugin = "pvr-iptvsimple";
namespace = "pvr.iptvsimple";
- version = "2.4.14";
+ version = "3.5.7";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.iptvsimple";
- rev = "2a649d7e21b64c4fa4a8b14c2cc139261eebc7e8";
- sha256 = "1f1im2gachrxnr3z96h5cg2c13vapgkvkdwvrbl4hxlnyp1a6jyz";
+ rev = "${version}-${rel}";
+ sha256 = "17znib7c491h2ii4gagxradh0jyvgga0d548gbk4yjj2nc9qqc6d";
};
meta = {
@@ -418,7 +425,7 @@ let self = rec {
license = licenses.gpl2Plus;
};
- extraBuildInputs = [ zlib ];
+ extraBuildInputs = [ zlib rapidxml ];
};
osmc-skin = mkKodiPlugin rec {
@@ -470,4 +477,33 @@ let self = rec {
};
});
+ inputstream-adaptive = mkKodiABIPlugin rec {
+
+ plugin = "inputstream-adaptive";
+ namespace = "inputstream.adaptive";
+ version = "2.3.12";
+
+ src = fetchFromGitHub {
+ owner = "peak3d";
+ repo = "inputstream.adaptive";
+ rev = "${version}";
+ sha256 = "09d9b35mpaf3g5m51viyan9hv7d2i8ndvb9wm0j7rs5gwsf0k71z";
+ };
+
+ extraBuildInputs = [ expat ];
+
+ extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ];
+
+ extraInstallPhase = let n = namespace; in ''
+ ln -s $out/lib/addons/${n}/libssd_wv.so $out/${pluginDir}/${n}/libssd_wv.so
+ '';
+
+ meta = {
+ homepage = https://github.com/peak3d/inputstream.adaptive;
+ description = "Kodi inputstream addon for several manifest types";
+ platforms = platforms.all;
+ maintainers = with maintainers; [ sephalon ];
+ };
+ };
+
}; in self
diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix
index d0dc9274a10..b4365eed949 100644
--- a/pkgs/applications/video/kodi/wrapper.nix
+++ b/pkgs/applications/video/kodi/wrapper.nix
@@ -14,7 +14,10 @@ buildEnv {
do
makeWrapper ${kodi}/bin/$exe $out/bin/$exe \
--prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath plugins} \
- --prefix KODI_HOME : $out/share/kodi
+ --prefix KODI_HOME : $out/share/kodi \
+ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
+ (stdenv.lib.concatMap
+ (plugin: plugin.extraRuntimeDependencies) plugins)}"
done
'';
diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix
index 34efffc21d7..cceed556f97 100644
--- a/pkgs/applications/video/mediathekview/default.nix
+++ b/pkgs/applications/video/mediathekview/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)";
homepage = https://mediathekview.de/;
license = licenses.gpl3;
- maintainers = with maintainers; [ chaoflow moredread ];
+ maintainers = with maintainers; [ moredread ];
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix
index f277bafa214..778006a40f0 100644
--- a/pkgs/applications/virtualization/firecracker/default.nix
+++ b/pkgs/applications/virtualization/firecracker/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, stdenv }:
let
- version = "0.14.0";
+ version = "0.15.0";
baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download";
fetchbin = name: sha256: fetchurl {
@@ -9,8 +9,8 @@ let
inherit sha256;
};
- firecracker-bin = fetchbin "firecracker" "02d7s2hzhl13k5linlav7yc4kg9v70sccc3ysfgaqq8hz7zfqywg";
- jailer-bin = fetchbin "jailer" "120n14zjnm21s39dza99p003bn5n0n5fzcyaw4l6laq336r24gvi";
+ firecracker-bin = fetchbin "firecracker" "06b9pj9s4i0wqbh24frsza2j28n7qflp623vwvar5k18jq6jixd0";
+ jailer-bin = fetchbin "jailer" "17nbsg3yi9rif9qxgp483b2qx0jn2sn1hlvk63gl8m54mnxzmcr3";
in
stdenv.mkDerivation {
name = "firecracker-${version}";
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 8304dd15597..bd148733bc5 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -19,9 +19,10 @@ with stdenv.lib;
let
python = python2;
buildType = "release";
- # Remember to change the extpackRev and version in extpack.nix as well.
- main = "1m48ywa913g6zgqslvrihxs2fbr4gmljypbdpjma2hck6isyi02m";
- version = "5.2.22";
+ # Remember to change the extpackRev and version in extpack.nix and
+ # guest-additions/default.nix as well.
+ main = "0rylf1g0vmv0q19iyvyq4dj5h9yvyqqnmmqaqrx93qrv8s1ybssd";
+ version = "5.2.26";
in stdenv.mkDerivation {
name = "virtualbox-${version}";
diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix
index d2c513e899a..96b4c7a8fbb 100644
--- a/pkgs/applications/virtualization/virtualbox/extpack.nix
+++ b/pkgs/applications/virtualization/virtualbox/extpack.nix
@@ -2,7 +2,7 @@
with lib;
-let version = "5.2.22";
+let version = "5.2.26";
in
fetchurl rec {
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack";
@@ -10,7 +10,7 @@ fetchurl rec {
sha256 =
# Manually sha256sum the extensionPack file, must be hex!
# Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
- let value = "779250666551b2f5426e86c2d21ceb0209b46174536971611025f753535131ef";
+ let value = "4b7caa9b722840d49f154c3e5efb6463b1b7129f09973a25813dfdbccd9debb7";
in assert (builtins.stringLength value) == 64; value;
meta = {
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 259f2b268fe..ccfedd1b2e1 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
- sha256 = "e51e33500a265b5c2d7bb2d03d32208df880523dfcb1e2dde2c78a0e0daa0603";
+ sha256 = "0f3w9wjd5aj2khzqh37vdg86wqbbx4gx9aidaai9syn9sk8ca9xr";
};
KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
new file mode 100644
index 00000000000..ef7da72fda9
--- /dev/null
+++ b/pkgs/build-support/appimage/default.nix
@@ -0,0 +1,176 @@
+{ pkgs, stdenv, libarchive, patchelf, zlib, buildFHSUserEnv, writeScript }:
+
+rec {
+ # Both extraction functions could be unified, but then
+ # it would depend on libmagic to correctly identify ISO 9660s
+
+ extractType1 = { name, src }: stdenv.mkDerivation {
+ name = "${name}-extracted";
+ inherit src;
+
+ nativeBuildInputs = [ libarchive ];
+ buildCommand = ''
+ mkdir $out
+ bsdtar -x -C $out -f $src
+ '';
+ };
+
+ extractType2 = { name, src }: stdenv.mkDerivation {
+ name = "${name}-extracted";
+ inherit src;
+
+ nativeBuildInputs = [ patchelf ];
+ buildCommand = ''
+ install $src ./appimage
+ patchelf \
+ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+ --replace-needed libz.so.1 ${zlib}/lib/libz.so.1 \
+ ./appimage
+
+ ./appimage --appimage-extract
+
+ cp -rv squashfs-root $out
+ '';
+ };
+
+ wrapAppImage = { name, src, extraPkgs }: buildFHSUserEnv (defaultFhsEnvArgs // {
+ inherit name;
+
+ targetPkgs = pkgs: defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs;
+
+ runScript = writeScript "run" ''
+ #!${stdenv.shell}
+
+ export APPDIR=${src}
+ export APPIMAGE_SILENT_INSTALL=1
+ cd $APPDIR
+ exec ./AppRun "$@"
+ '';
+ });
+
+ wrapType1 = args@{ name, src, extraPkgs ? pkgs: [] }: wrapAppImage {
+ inherit name extraPkgs;
+ src = extractType1 { inherit name src; };
+ };
+
+ wrapType2 = args@{ name, src, extraPkgs ? pkgs: [] }: wrapAppImage {
+ inherit name extraPkgs;
+ src = extractType2 { inherit name src; };
+ };
+
+ defaultFhsEnvArgs = {
+ name = "appimage-env";
+
+ # Most of the packages were taken from the Steam chroot
+ targetPkgs = pkgs: with pkgs; [
+ gtk3
+ bashInteractive
+ gnome3.zenity
+ python2
+ xorg.xrandr
+ which
+ perl
+ xdg_utils
+ iana-etc
+ krb5
+ ];
+
+ multiPkgs = pkgs: with pkgs; [
+ desktop-file-utils
+ xorg.libXcomposite
+ xorg.libXtst
+ xorg.libXrandr
+ xorg.libXext
+ xorg.libX11
+ xorg.libXfixes
+ libGL
+
+ gst_all_1.gstreamer
+ gst_all_1.gst-plugins-ugly
+ libdrm
+ xorg.xkeyboardconfig
+ xorg.libpciaccess
+
+ glib
+ gtk2
+ bzip2
+ zlib
+ gdk_pixbuf
+
+ xorg.libXinerama
+ xorg.libXdamage
+ xorg.libXcursor
+ xorg.libXrender
+ xorg.libXScrnSaver
+ xorg.libXxf86vm
+ xorg.libXi
+ xorg.libSM
+ xorg.libICE
+ gnome2.GConf
+ freetype
+ (curl.override { gnutlsSupport = true; sslSupport = false; })
+ nspr
+ nss
+ fontconfig
+ cairo
+ pango
+ expat
+ dbus
+ cups
+ libcap
+ SDL2
+ libusb1
+ udev
+ dbus-glib
+ libav
+ atk
+ at-spi2-atk
+ libudev0-shim
+ networkmanager098
+
+ xorg.libXt
+ xorg.libXmu
+ xorg.libxcb
+ libGLU
+ libuuid
+ libogg
+ libvorbis
+ SDL
+ SDL2_image
+ glew110
+ openssl
+ libidn
+ tbb
+ wayland
+ mesa_noglu
+ libxkbcommon
+
+ flac
+ freeglut
+ libjpeg
+ libpng12
+ libsamplerate
+ libmikmod
+ libtheora
+ libtiff
+ pixman
+ speex
+ SDL_image
+ SDL_ttf
+ SDL_mixer
+ SDL2_ttf
+ SDL2_mixer
+ gstreamer
+ gst-plugins-base
+ libappindicator-gtk2
+ libcaca
+ libcanberra
+ libgcrypt
+ libvpx
+ librsvg
+ xorg.libXft
+ libvdpau
+ alsaLib
+ ];
+ };
+}
diff --git a/pkgs/build-support/closure-info.nix b/pkgs/build-support/closure-info.nix
index 28f2802a5bc..24795a724ec 100644
--- a/pkgs/build-support/closure-info.nix
+++ b/pkgs/build-support/closure-info.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation {
exportReferencesGraph.closure = rootPaths;
+ preferLocalBuild = true;
+
PATH = "${buildPackages.coreutils}/bin:${buildPackages.jq}/bin";
builder = builtins.toFile "builder"
diff --git a/pkgs/build-support/nix-prefetch-github/default.nix b/pkgs/build-support/nix-prefetch-github/default.nix
index 48297e583af..b0fd55260fd 100644
--- a/pkgs/build-support/nix-prefetch-github/default.nix
+++ b/pkgs/build-support/nix-prefetch-github/default.nix
@@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "nix-prefetch-github";
- version = "1.3";
+ version = "2.0";
src = fetchFromGitHub {
owner = "seppeljordan";
repo = "nix-prefetch-github";
- rev = "${version}";
- sha256 = "1rinbv1q4q8m27ih6l81w1lsmwn6cz7q3iyjiycklywpi8684dh6";
+ rev = "v${version}";
+ sha256 = "06vxy26d1s7azb9amxdf83i8kxgs2sbjsy0d3mjhwffga13b4igc";
};
propagatedBuildInputs = with python3.pkgs; [
diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix
index 51921fdfbdc..5ae8985e3ab 100644
--- a/pkgs/build-support/skaware/build-skaware-package.nix
+++ b/pkgs/build-support/skaware/build-skaware-package.nix
@@ -19,6 +19,10 @@ in {
# mostly for moving and deleting files from the build directory
# : lines
, postInstall
+ # packages with setup hooks that should be run
+ # (see definition of `makeSetupHook`)
+ # : list drv
+, setupHooks ? []
# : list Maintainer
, maintainers ? []
@@ -82,6 +86,8 @@ in stdenv.mkDerivation {
dontDisableStatic = true;
enableParallelBuilding = true;
+ nativeBuildInputs = setupHooks;
+
configureFlags = configureFlags ++ [
"--enable-absolute-paths"
(if stdenv.isDarwin
diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix
index d839d4a3dd8..79e573087a4 100644
--- a/pkgs/data/themes/plata/default.nix
+++ b/pkgs/data/themes/plata/default.nix
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
name = "plata-theme-${version}";
- version = "0.4.9";
+ version = "0.5.0";
src = fetchFromGitLab {
owner = "tista500";
repo = "plata-theme";
rev = version;
- sha256 = "0kj04nj265rgkbbhzhz9f7q6z5yr1dxmcrnq1b5ldha3xqrq2pv9";
+ sha256 = "16kpdil2bmapbd0g2znwz4ddplykzabydw6g2i8wxs9c5r1hx0q5";
};
preferLocalBuild = true;
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index d0f3426a3cd..5e90998b539 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -12,13 +12,13 @@
let
pname = "gnome-control-center";
- version = "3.30.2";
+ version = "3.30.3";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0rn4r0ng4pd9smpay4rf4dkcl09b2ipr9srryybhd1srmd02ps51";
+ sha256 = "0gih1cmqbv803kp30704sllghb0impa0mmv3j8pndfg4zr2mnq9r";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
index 59191bddd9a..175118ac5ff 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
@@ -1,19 +1,16 @@
--- a/libgnome-desktop/gnome-desktop-thumbnail-script.c
+++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c
-@@ -504,14 +504,10 @@
+@@ -536,10 +536,9 @@ add_bwrap (GPtrArray *array,
g_return_val_if_fail (script->s_infile != NULL, FALSE);
add_args (array,
- "bwrap",
- "--ro-bind", "/usr", "/usr",
-- "--ro-bind", "/lib", "/lib",
-- "--ro-bind", "/lib64", "/lib64",
-+ "@bubblewrap_bin@",
-+ "--ro-bind", "/nix/store", "/nix/store",
- "--proc", "/proc",
- "--dev", "/dev",
-- "--symlink", "usr/bin", "/bin",
-- "--symlink", "usr/sbin", "/sbin",
- "--chdir", "/",
- "--setenv", "GIO_USE_VFS", "local",
- "--unshare-all",
+- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache",
+- NULL);
++ "@bubblewrap_bin@",
++ "--ro-bind", "/nix/store", "/nix/store",
++ NULL);
+
+ /* These directories might be symlinks into /usr/... */
+ for (i = 0; i < G_N_ELEMENTS (usrmerged_dirs); i++)
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index b98a6a2d676..6161ccde675 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "gnome-desktop-${version}";
- version = "3.30.2";
+ version = "3.30.2.1";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0k6iccfj9naw42dl2mgljfvk12dmvg06plg86qd81nksrf9ycxal";
+ sha256 = "07s95fpfl3kjq51yxbrx6q87w812pq6bl0xdn0zzyi6qvg33m00v";
};
enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
index f797c6b8914..d12e558c276 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
@@ -6,13 +6,13 @@
let
pname = "gnome-online-accounts";
- version = "3.30.1";
+ version = "3.30.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0havx26cfy0ln17jzmzbrrx35afknv2s9mdy34j0p7wmbqr8m5ky";
+ sha256 = "1p1gdgryziklrgngn6m13xnvfx4gb01h723nndfi9944r24fbiq5";
};
outputs = [ "out" "man" "dev" "devdoc" ];
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 85b4990c471..518b0ec1c48 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo
+{ fetchurl, fetchpatch, stdenv, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo
, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
, gsettings-desktop-schemas, glib, gtk3, gnome-desktop
@@ -13,6 +13,16 @@ stdenv.mkDerivation rec {
sha256 = "0qr3w480p31nbiad49213rj9rk6p9fl82a68pzznpz36p30dq96z";
};
+ patches = [
+ # https://gitlab.gnome.org/GNOME/mutter/issues/270
+ # Fixes direction of the desktop switching animation when using workspace
+ # grid extension with desktops arranged horizontally.
+ (fetchpatch {
+ url = https://gitlab.gnome.org/GNOME/mutter/commit/92cccf53dfe9e077f1d61ac4f896fd391f8cb689.patch;
+ sha256 = "11vmypypjss50xg7hhdbqrxvgqlxx4lnwy59089qsfl3akg4kk2i";
+ })
+ ];
+
configureFlags = [
"--with-x"
"--disable-static"
diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
index be9fbe943be..c522fbec57b 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -1,63 +1,71 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_40, enchant
-, wrapGAppsHook, gdk_pixbuf, cmake, ninja, desktop-file-utils
-, libnotify, libcanberra-gtk3, libsecret, gmime, isocodes
-, gobject-introspection, libpthreadstubs, sqlite, gcr, libgee
-, gsettings-desktop-schemas, adwaita-icon-theme
-, gnome3, librsvg, gnome-doc-utils, webkitgtk, fetchpatch }:
+{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk3, vala, enchant2, wrapGAppsHook, meson, ninja
+, desktop-file-utils, gnome-online-accounts, gsettings-desktop-schemas, adwaita-icon-theme
+, libnotify, libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext
+, sqlite, gcr, json-glib, itstool, libgee, gnome3, webkitgtk, python3
+, xvfb_run, dbus, shared-mime-info, libunwind, glib-networking }:
-let
- pname = "geary";
- version = "0.12.4";
-in
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
+ pname = "geary";
+ version = "0.13.1";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "01ykhkjfkprvh9kp4rzrl6xs2pqibiw44ckvqsn5cs3xy2rlq8mm";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "0h9pf2mdskq7mylib1m9hw86nwfmdzyngjl7ywangqipm1k5svjx";
};
patches = [
- # Fix build with webkitgtk-2.22
+ # gobject-introspection is not needed
+ # https://gitlab.gnome.org/GNOME/geary/merge_requests/138
(fetchpatch {
- url = https://gitlab.gnome.org/GNOME/geary/commit/5d0f711426d76f878cf9b71f7e8f785199c7cde1.patch;
- sha256 = "1yifng5lfsc6wp7irmi8gjdcfig1cr0chf7rdv3asrk567nmwrsi";
+ url = https://gitlab.gnome.org/GNOME/geary/commit/d2f1b1076aa942d140e83fdf03b66621c11229f5.patch;
+ sha256 = "1dsj4ybnibpi572w9hafm0w90jbjv7wzdl6j8d4c2qg5h7knlvfk";
})
+ # Fixes tests on Aarch64
+ # https://gitlab.gnome.org/GNOME/geary/issues/259
(fetchpatch {
- url = https://gitlab.gnome.org/GNOME/geary/commit/0d966950a2cba888873cd3a7f4f42bb7a017dc6d.patch;
- sha256 = "1y6v4fnik4w3paj9nl0yqs54998sx1zr9w3940d579p6dsa8f3fg";
- })
- (fetchpatch {
- url = https://gitlab.gnome.org/GNOME/geary/commit/e091f24b00ec421e1aadd5e360d1550e658ad5ef.patch;
- sha256 = "0d5hc4h9c1hnn2sk18nkpmzdvwm3h746n2zj8n22ax9rj6lxl38l";
- })
- # Fix build with vala 0.40.12
- # See: https://gitlab.gnome.org/GNOME/vala/blob/0.40.12/NEWS#L22
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/geary/commit/088cb2c0aa35ad4b54ea5a0a2edaf0ff96c64b45.patch";
- sha256 = "0cnjmbd3snm8ggmprqa32f7i3w86gs3ylab9p5ffj921dcpvvlb2";
+ url = https://gitlab.gnome.org/GNOME/geary/commit/9c3fdbfb5c792daeb9c3924f798fa83a15096d8a.patch;
+ sha256 = "1ihjxnaj0g6gx264kd8cbhs88yp37vwmmcd3lvmz44agf7qcv2ri";
})
];
- nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobject-introspection ];
+ nativeBuildInputs = [
+ desktop-file-utils gettext itstool libxml2 meson ninja
+ pkgconfig vala wrapGAppsHook python3
+ ];
+
buildInputs = [
- gtk3 enchant webkitgtk libnotify libcanberra-gtk3 libgee libsecret gmime sqlite
- libpthreadstubs gsettings-desktop-schemas gcr isocodes
- gdk_pixbuf librsvg adwaita-icon-theme
+ adwaita-icon-theme enchant2 gcr gmime gnome-online-accounts
+ gsettings-desktop-schemas gtk3 isocodes json-glib libcanberra-gtk3
+ libgee libnotify libsecret sqlite webkitgtk glib-networking
+ libunwind
];
- cmakeFlags = [
- "-DISOCODES_DIRECTORY=${isocodes}/share/xml/iso-codes"
+ checkInputs = [ xvfb_run dbus ];
+
+ mesonFlags = [
+ "-Dcontractor=true" # install the contractor file (Pantheon specific)
];
- # TODO: This is bad, upstream should fix their code.
- PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${webkitgtk.dev}/share/gir-1.0";
+ postPatch = ''
+ chmod +x build-aux/post_install.py
+ patchShebangs build-aux/post_install.py
+ '';
preFixup = ''
# Add geary to path for geary-attach
gappsWrapperArgs+=(--prefix PATH : "$out/bin")
'';
+ doCheck = true;
+
+ checkPhase = ''
+ NO_AT_BRIDGE=1 \
+ XDG_DATA_DIRS=:$XDG_DATA_DIRS:${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${shared-mime-info}/share \
+ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
+ --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+ meson test -v --no-stdsplit
+ '';
+
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
@@ -69,7 +77,7 @@ stdenv.mkDerivation rec {
homepage = https://wiki.gnome.org/Apps/Geary;
description = "Mail client for GNOME 3";
maintainers = gnome3.maintainers;
- license = licenses.lgpl2;
+ license = licenses.lgpl21Plus;
platforms = platforms.linux;
};
}
diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix
index a7b8a01eeb0..27e6e02a4a3 100644
--- a/pkgs/desktops/pantheon/default.nix
+++ b/pkgs/desktops/pantheon/default.nix
@@ -62,6 +62,8 @@ lib.makeScope pkgs.newScope (self: with self; {
elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { };
+ notes-up = pkgs.notes-up.override { withPantheon = true; };
+
#### APPS
elementary-calculator = callPackage ./apps/elementary-calculator { };
diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix
index 345bd125025..09422a7a862 100644
--- a/pkgs/development/compilers/arachne-pnr/default.nix
+++ b/pkgs/development/compilers/arachne-pnr/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "2018.09.08";
src = fetchFromGitHub {
- owner = "cseed";
+ owner = "yosyshq";
repo = "arachne-pnr";
rev = "840bdfdeb38809f9f6af4d89dd7b22959b176fdd";
sha256 = "1dqvjvgvsridybishv4pnigw9gypxh7r7nrqp9z9qq92v7c5rxzl";
diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix
index 6130608062d..a9f0e3ec0a5 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/pkgs/development/compilers/dmd/default.nix
@@ -14,7 +14,7 @@ let
name = "dmd.conf";
text = (lib.generators.toINI {} {
"Environment" = {
- DFLAGS = ''-I$@out@/include/d2 -L-L$@out@/lib -fPIC ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}'';
+ DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}'';
};
});
};
@@ -135,15 +135,15 @@ stdenv.mkDerivation rec {
cd ../druntime
mkdir $out/include
- mkdir $out/include/d2
- cp -r import/* $out/include/d2
+ mkdir $out/include/dmd
+ cp -r import/* $out/include/dmd
cd ../phobos
mkdir $out/lib
cp generated/${osname}/release/${bits}/libphobos2.* $out/lib
- cp -r std $out/include/d2
- cp -r etc $out/include/d2
+ cp -r std $out/include/dmd
+ cp -r etc $out/include/dmd
wrapProgram $out/bin/dmd \
--prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 66b98cc6d64..ce3395f0be0 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -37,7 +37,7 @@ assert langGo -> langCC;
with stdenv.lib;
with builtins;
-let version = "8.2.0";
+let version = "8.3.0";
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@@ -132,7 +132,7 @@ stdenv.mkDerivation ({
src = fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
- sha256 = "10007smilswiiv2ymazr3b6x2i933c0ycxrr529zh4r6p823qv0r";
+ sha256 = "0b3xv411xhlnjmin2979nxcbnidgvzqdf4nbhix99x60dkzavfk4";
};
inherit patches;
diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix
index 156657d61d6..ef07b01a750 100644
--- a/pkgs/development/compilers/nextpnr/default.nix
+++ b/pkgs/development/compilers/nextpnr/default.nix
@@ -27,13 +27,13 @@ let
in
stdenv.mkDerivation rec {
name = "nextpnr-${version}";
- version = "2019.01.08";
+ version = "2019.02.20";
src = fetchFromGitHub {
owner = "yosyshq";
repo = "nextpnr";
- rev = "c1d15c749c2aa105ee7b38ebe1b60a27e3743e8c";
- sha256 = "082ac03s6164s7dwz1l9phshl8m1lizn45jykabrhks5jcccchbh";
+ rev = "e8d3aaaf34895a073e4023192d97fc936d090990";
+ sha256 = "0ijqpjnn7x16crd6cmd4nmgay320flizmjb7bbvg9hv464z3p4x7";
};
nativeBuildInputs = [ cmake makeWrapper ];
diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index ae36041b33e..0d319d235fd 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "nim-${version}";
- version = "0.19.0";
+ version = "0.19.4";
src = fetchurl {
url = "https://nim-lang.org/download/${name}.tar.xz";
- sha256 = "0biwvw1gividp5lkf0daq1wp9v6ms4xy6dkf5zj0sn9w4m3n76d1";
+ sha256 = "0k59dhfsg5wnkc3nxg5a336pjd9jnfxabns63bl9n28iwdg16hgl";
};
doCheck = !stdenv.isDarwin;
diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index 1afeae73f2f..7167a967c1c 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -8,14 +8,14 @@ with builtins;
stdenv.mkDerivation rec {
name = "yosys-${version}";
- version = "2019.01.08";
+ version = "2019.02.22";
srcs = [
(fetchFromGitHub {
owner = "yosyshq";
repo = "yosys";
- rev = "2a2e0a4722ded7628b71f436b94a06aebd57bb62";
- sha256 = "19wzh7yssk90s58l2f89m0q5bjjrjpkhvikf5zc0563wccvl712c";
+ rev = "c521f4632f1c82b48a5538c832980668044e8fd9";
+ sha256 = "18pg1ry5qhhx8c49n2gqwlf55sd9bfsfk3khfyh1a1vjh1qpfgdf";
name = "yosys";
})
diff --git a/pkgs/development/interpreters/python/cpython/2.7/boot.nix b/pkgs/development/interpreters/python/cpython/2.7/boot.nix
index ccb366903c5..9e38e825074 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/boot.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/boot.nix
@@ -98,6 +98,6 @@ stdenv.mkDerivation rec {
'';
license = stdenv.lib.licenses.psfl;
platforms = stdenv.lib.platforms.all;
- maintainers = with stdenv.lib.maintainers; [ lnl7 chaoflow domenkozar ];
+ maintainers = with stdenv.lib.maintainers; [ lnl7 domenkozar ];
};
}
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix
index 3885b43960f..7727b984d96 100644
--- a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
cp -R ./ $out/share/doc/python27/html
'';
meta = {
- maintainers = [ lib.maintainers.chaoflow ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix
index d8dde17ac66..0c9673b7d7a 100644
--- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
cp -R ./ $out/share/doc/python27/pdf-a4
'';
meta = {
- maintainers = [ lib.maintainers.chaoflow ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix
index 32581cd229a..9b0018e7cd7 100644
--- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
cp -R ./ $out/share/doc/python27/pdf-letter
'';
meta = {
- maintainers = [ lib.maintainers.chaoflow ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix
index 59019238301..b7bcfb51d29 100644
--- a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
cp -R ./ $out/share/doc/python27/text
'';
meta = {
- maintainers = [ lib.maintainers.chaoflow ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/interpreters/python/cpython/docs/template.nix b/pkgs/development/interpreters/python/cpython/docs/template.nix
index cc92f71bc1e..4a0c84fb272 100644
--- a/pkgs/development/interpreters/python/cpython/docs/template.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/template.nix
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
cp -R ./ $out/share/doc/pythonMAJORMINOR/TYPE
'';
meta = {
- maintainers = [ lib.maintainers.chaoflow ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix
index 428114986d1..9577bfe9e8a 100644
--- a/pkgs/development/libraries/clutter-gst/default.nix
+++ b/pkgs/development/libraries/clutter-gst/default.nix
@@ -1,17 +1,17 @@
-{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl, gnome3 }:
+{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl, gnome3, gdk_pixbuf }:
let
pname = "clutter-gst";
- version = "3.0.26";
+ version = "3.0.27";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0fnblqm4igdx4rn3681bp1gm1y2i00if3iblhlm0zv6ck9nqlqfq";
+ sha256 = "17czmpl92dzi4h3rn5rishk015yi3jwiw29zv8qan94xcmnbssgy";
};
- propagatedBuildInputs = [ clutter gtk3 glib cogl ];
+ propagatedBuildInputs = [ clutter gtk3 glib cogl gdk_pixbuf ];
nativeBuildInputs = [ pkgconfig ];
postBuild = "rm -rf $out/share/gtk-doc";
diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/development/libraries/gmime/2.nix
index 1c6dfc4a852..b373095a814 100644
--- a/pkgs/development/libraries/gmime/2.nix
+++ b/pkgs/development/libraries/gmime/2.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/jstedfast/gmime/;
description = "A C/C++ library for creating, editing and parsing MIME messages and structures";
license = licenses.lgpl21Plus;
- maintainers = with maintainers; [ chaoflow ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix
index d036140567f..699d2854f3d 100644
--- a/pkgs/development/libraries/gmime/3.nix
+++ b/pkgs/development/libraries/gmime/3.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/jstedfast/gmime/;
description = "A C/C++ library for creating, editing and parsing MIME messages and structures";
license = licenses.lgpl21Plus;
- maintainers = with maintainers; [ chaoflow ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 7368cb2c236..7c364c0fcdf 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -23,6 +23,10 @@ stdenv.mkDerivation {
postPatch = ''
patchShebangs src/gen-def.py
patchShebangs test
+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ # ApplicationServices.framework headers have cast-align warnings.
+ substituteInPlace src/hb.hh \
+ --replace '#pragma GCC diagnostic error "-Wcast-align"' ""
'';
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix
index 498858d52e9..e3a6580038a 100644
--- a/pkgs/development/libraries/libgit2-glib/default.nix
+++ b/pkgs/development/libraries/libgit2-glib/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "libgit2-glib";
- version = "0.27.7";
+ version = "0.27.8";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1hpgs8dx0dk25mc8jsizi2cwwhnmahrn3dyry9p7a1g48mnxyc8i";
+ sha256 = "0d8rwgf69424ijy6fjbk3m863y9ml5bq7mshlqw7xqk9zngdd6f1";
};
postPatch = ''
diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix
index 20a9bb91604..0951ab1fe0c 100644
--- a/pkgs/development/libraries/libgnomekbd/default.nix
+++ b/pkgs/development/libraries/libgnomekbd/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libgnomekbd";
- version = "3.26.0";
+ version = "3.26.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "ea3b418c57c30615f7ee5b6f718def7c9d09ce34637324361150744258968875";
+ sha256 = "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp";
};
passthru = {
diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/development/libraries/libgumath/default.nix
new file mode 100644
index 00000000000..d5d35678b4f
--- /dev/null
+++ b/pkgs/development/libraries/libgumath/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, fetchFromGitHub
+, libndtypes
+, libxnd
+}:
+
+stdenv.mkDerivation rec {
+ name = "libgumath-${version}";
+ version = "unstable-2018-11-27";
+
+ src = fetchFromGitHub {
+ owner = "plures";
+ repo = "gumath";
+ rev = "5a9d27883b40432246d6a93cd6133157267fd166";
+ sha256 = "0w2qzp7anxd1wzkvv5r2pdkkpgrnqzgrq47lrvpqc1i1wqzcwf0w";
+ };
+
+ buildInputs = [ libndtypes libxnd ];
+
+ # Override linker with cc (symlink to either gcc or clang)
+ # Library expects to use cc for linking
+ configureFlags = [
+ "LD=${stdenv.cc.targetPrefix}cc"
+ ];
+
+ doCheck = true;
+
+ meta = with stdenv.lib; {
+ description = "Library supporting function dispatch on general data containers. C base and Python wrapper";
+ homepage = https://xnd.io/;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix
index 925154e1d45..51e4deed462 100644
--- a/pkgs/development/libraries/libndtypes/default.nix
+++ b/pkgs/development/libraries/libndtypes/default.nix
@@ -1,27 +1,28 @@
-{ lib
-, stdenv
+{ stdenv
, fetchFromGitHub
}:
stdenv.mkDerivation rec {
name = "libndtypes-${version}";
- version = "0.2.0dev3";
+ version = "unstable-2018-11-27";
src = fetchFromGitHub {
owner = "plures";
repo = "ndtypes";
- rev = "v${version}";
- sha256 = "0dpvv13mrid8l5zkjlz18qvirz3nr0v98agx9bcvkqbiahlfgjli";
+ rev = "4d810d0c4d54c81a7136f313f0ae6623853d574a";
+ sha256 = "1kk1sa7f17ffh49jc1qlizlsj536fr3s4flb6x4rjyi81rp7psb9";
};
# Override linker with cc (symlink to either gcc or clang)
# Library expects to use cc for linking
configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ];
- meta = {
+ doCheck = true;
+
+ meta = with stdenv.lib; {
description = "Dynamic types for data description and in-memory computations";
homepage = https://xnd.io/;
- license = lib.licenses.bsdOriginal;
- maintainers = with lib.maintainers; [ costrouc ];
+ license = licenses.bsdOriginal;
+ maintainers = [ maintainers.costrouc ];
};
}
diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix
index 6b9375c7381..cb93ec63e67 100644
--- a/pkgs/development/libraries/libxnd/default.nix
+++ b/pkgs/development/libraries/libxnd/default.nix
@@ -6,23 +6,32 @@
stdenv.mkDerivation rec {
name = "libxnd-${version}";
- version = "0.2.0dev3";
+ version = "unstable-2018-11-27";
src = fetchFromGitHub {
owner = "plures";
repo = "xnd";
- rev = "v${version}";
- sha256 = "0byq7jspyr2wxrhihw4q7nf0y4sb6j5ax0ndd5dnq5dz88c7qqm2";
+ rev = "8a9f3bd1d01d872828b40bc9dbd0bc0184524da3";
+ sha256 = "10jh2kqvhpzwy50adayh9az7z2lm16yxy4flrh99alzzbqdyls44";
};
buildInputs = [ libndtypes ];
# Override linker with cc (symlink to either gcc or clang)
# Library expects to use cc for linking
- configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ];
+ configureFlags = [
+ # Override linker with cc (symlink to either gcc or clang)
+ # Library expects to use cc for linking
+ "LD=${stdenv.cc.targetPrefix}cc"
+ # needed for tests
+ "--with-includes=${libndtypes}/include"
+ "--with-libs=${libndtypes}/lib"
+ ];
+
+ doCheck = true;
meta = {
- description = "General container that maps a wide range of Python values directly to memory";
+ description = "C library for managing typed memory blocks and Python container module";
homepage = https://xnd.io/;
license = lib.licenses.bsdOriginal;
maintainers = with lib.maintainers; [ costrouc ];
diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix
index 31056d0a4ed..531261a58ca 100644
--- a/pkgs/development/libraries/live555/default.nix
+++ b/pkgs/development/libraries/live555/default.nix
@@ -3,14 +3,14 @@
# Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD
stdenv.mkDerivation rec {
name = "live555-${version}";
- version = "2018.12.14";
+ version = "2019.02.03";
src = fetchurl { # the upstream doesn't provide a stable URL
urls = [
"mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"
"https://download.videolan.org/contrib/live555/live.${version}.tar.gz"
];
- sha256 = "0irafygp23m2xmjv06qgs1sccymbwqvn51wggk0c60lnj1v1zhwd";
+ sha256 = "04474r1drvgjpk33yjj79dq2hq15ncw8y3w6g9625zryan8qv4qw";
};
postPatch = ''
diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix
index 6a4a033e1c2..c8c66969ef9 100644
--- a/pkgs/development/libraries/openfst/default.nix
+++ b/pkgs/development/libraries/openfst/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "openfst";
- version = "1.6.9";
+ version = "1.7.1";
src = fetchurl {
url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${name}.tar.gz";
- sha256 = "1nlbk7qarz2qv3apz1cxf5avjhlqfq2r8kxad0095kfyqz05jnfy";
+ sha256 = "0x9wfcqd8hq4h349s7j77sr60h8xjdfshqw1m3a2n6z5bdr9qkm1";
};
meta = {
description = "Library for working with finite-state transducers";
diff --git a/pkgs/development/libraries/rapidxml/default.nix b/pkgs/development/libraries/rapidxml/default.nix
new file mode 100644
index 00000000000..99f88091690
--- /dev/null
+++ b/pkgs/development/libraries/rapidxml/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+ pname = "rapidxml";
+ version = "1.13";
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/${pname}/${name}.zip";
+ sha256 = "0w9mbdgshr6sh6a5jr10lkdycjyvapbj7wxwz8hbp0a96y3biw63";
+ };
+
+ nativeBuildInputs = [ unzip ];
+
+ installPhase = ''
+ mkdir -p $out/include/${pname}
+ cp * $out/include/${pname}
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Fast XML DOM-style parser in C++";
+ homepage = "http://rapidxml.sourceforge.net/";
+ license = licenses.boost;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ cpages ];
+ };
+}
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index f4a97b7cf85..2ae3bd2b9c8 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -126,7 +126,8 @@ stdenv.mkDerivation rec {
NO_STATIC = true;
CROSS = stdenv.hostPlatform != stdenv.buildPlatform;
HOSTCC = "cc";
- NO_BINARY_MODE = stdenv.hostPlatform != stdenv.buildPlatform;
+ # Makefile.system only checks defined status
+ NO_BINARY_MODE = toString (stdenv.hostPlatform != stdenv.buildPlatform);
});
doCheck = true;
diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix
index b33180cec42..abe444c63c3 100644
--- a/pkgs/development/libraries/sundials/default.nix
+++ b/pkgs/development/libraries/sundials/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "sundials";
- version = "4.0.2";
+ version = "4.1.0";
src = fetchurl {
url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
- sha256 = "0xfk0icsi63yi1dby4rn02ppwkzfykciw6q03bk454gdia9xcmk6";
+ sha256 = "19ca4nmlf6i9ijqcibyvpprxzsdfnackgjs6dw51fq13gg1f2398";
};
preConfigure = ''
diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix
index 2d3af9b70c5..7121b6fed02 100644
--- a/pkgs/development/libraries/vapoursynth/default.nix
+++ b/pkgs/development/libraries/vapoursynth/default.nix
@@ -12,13 +12,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "vapoursynth-${version}";
- version = "R44";
+ version = "R45.1";
src = fetchFromGitHub {
owner = "vapoursynth";
repo = "vapoursynth";
rev = version;
- sha256 = "1270cggvk9nvy5g2z289nwhyvl4364yzirfn5jsa9i9ljfp00qml";
+ sha256 = "09fj4k75cksx1imivqfyr945swlr8k392kkdgzldwc4404qv82s6";
};
nativeBuildInputs = [ pkgconfig autoreconfHook nasm ];
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 35e3cc78b53..76c345c6b7e 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -31,7 +31,7 @@ let
description = "Search engine library";
homepage = https://xapian.org/;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ chaoflow ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
};
diff --git a/pkgs/development/libraries/xavs/default.nix b/pkgs/development/libraries/xavs/default.nix
index adace96afad..31c31164e01 100644
--- a/pkgs/development/libraries/xavs/default.nix
+++ b/pkgs/development/libraries/xavs/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "0drw16wm95dqszpl7j33y4gckz0w0107lnz6wkzb66f0dlbv48cf";
};
+ enableParallelBuilding = true;
+
patchPhase = ''
patchShebangs configure
patchShebangs config.sub
@@ -18,7 +20,16 @@ stdenv.mkDerivation rec {
patchShebangs tools/patcheck
patchShebangs tools/regression-test.pl
patchShebangs tools/xavs-format
- '';
+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ substituteInPlace config.guess --replace 'uname -p' 'uname -m'
+ substituteInPlace configure \
+ --replace '-O4' '-O3' \
+ --replace ' -s ' ' ' \
+ --replace 'LDFLAGS -s' 'LDFLAGS' \
+ --replace '-dynamiclib' ' ' \
+ --replace '-falign-loops=16' ' '
+ substituteInPlace Makefile --replace '-Wl,-soname,' ' '
+ '';
configureFlags = [
"--enable-pic"
@@ -31,7 +42,7 @@ stdenv.mkDerivation rec {
description = "AVS encoder and decoder";
homepage = http://xavs.sourceforge.net/;
license = licenses.lgpl2;
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ codyopel ];
};
}
diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock
index 988b4195aa2..89ba7cec32f 100644
--- a/pkgs/development/mobile/cocoapods/Gemfile.lock
+++ b/pkgs/development/mobile/cocoapods/Gemfile.lock
@@ -9,10 +9,10 @@ GEM
tzinfo (~> 1.1)
atomos (0.1.3)
claide (1.0.2)
- cocoapods (1.6.0)
+ cocoapods (1.6.1)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
- cocoapods-core (= 1.6.0)
+ cocoapods-core (= 1.6.1)
cocoapods-deintegrate (>= 1.0.2, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -26,13 +26,13 @@ GEM
gh_inspector (~> 1.0)
molinillo (~> 0.6.6)
nap (~> 1.0)
- ruby-macho (~> 1.3, >= 1.3.1)
- xcodeproj (>= 1.8.0, < 2.0)
- cocoapods-core (1.6.0)
+ ruby-macho (~> 1.4)
+ xcodeproj (>= 1.8.1, < 2.0)
+ cocoapods-core (1.6.1)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
- cocoapods-deintegrate (1.0.2)
+ cocoapods-deintegrate (1.0.3)
cocoapods-downloader (1.2.2)
cocoapods-plugins (1.0.0)
nap
@@ -55,11 +55,11 @@ GEM
nanaimo (0.2.6)
nap (1.1.0)
netrc (0.11.0)
- ruby-macho (1.3.1)
+ ruby-macho (1.4.0)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
- xcodeproj (1.8.0)
+ xcodeproj (1.8.1)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix
index 4239b29a2c3..8cd829d56ab 100644
--- a/pkgs/development/mobile/cocoapods/gemset.nix
+++ b/pkgs/development/mobile/cocoapods/gemset.nix
@@ -40,10 +40,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "173zvbld289ikvicwj2gqsv9hkvbxz7cswx21c7mh0gznsad1gsx";
+ sha256 = "0sjipdbybs2ikjz9drpwfq1msisha3cbf3508ywaj5w3i481av37";
type = "gem";
};
- version = "1.6.0";
+ version = "1.6.1";
};
cocoapods-core = {
dependencies = ["activesupport" "fuzzy_match" "nap"];
@@ -51,18 +51,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1q0xd24pqa1biqrg597yhsrgzgi4msk3nr00gfxi40nfqnryvmyl";
+ sha256 = "03g31gn8k9q8ky1qhg9i2xawg6xdpl8x3mq4fdah17jclsg8y0sh";
type = "gem";
};
- version = "1.6.0";
+ version = "1.6.1";
};
cocoapods-deintegrate = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "10b49glw3jd0r1vj36zb0vz2idwgziq8qgzf7yjkrsm41xm098zz";
+ sha256 = "0m3hi4va9cr7anxkjf44as14j1hsrvw00bzvz7c906hyb8qcm4fp";
type = "gem";
};
- version = "1.0.2";
+ version = "1.0.3";
};
cocoapods-downloader = {
groups = ["default"];
@@ -224,10 +226,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "106xrrinbhxd8z6x94j32abgd2w3rml0afj2rk2n6jshyj6141al";
+ sha256 = "0lhdjn91jkifsy2hzq2hgcm0pp8pbik87m58zmw1ifh6hkp9adjb";
type = "gem";
};
- version = "1.3.1";
+ version = "1.4.0";
};
thread_safe = {
source = {
@@ -252,9 +254,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1hyahdwz0nfmzw9v6h5rwvnj5hxa0jwqyagmpn1k1isxb1vks70w";
+ sha256 = "13z3109lwq632vhazndqjlccpwadljg58sflbyl0m57j9d4blv2y";
type = "gem";
};
- version = "1.8.0";
+ version = "1.8.1";
};
}
\ No newline at end of file
diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index aac94fe6130..b3c8d380819 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -173,7 +173,7 @@ stdenv.mkDerivation ({
echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products
${stdenv.lib.optionalString enableWirelessDistribution ''
- appname="$(basename "$out/*.ipa" .ipa)"
+ appname="$(basename $out/*.ipa .ipa)"
bundleId=$(grep '[a-zA-Z0-9.]*' tiapp.xml | sed -e 's|||' -e 's|||' -e 's/ //g')
version=$(grep '[a-zA-Z0-9.]*' tiapp.xml | sed -e 's|||' -e 's|||' -e 's/ //g')
diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix
index e3e056f5442..c6047f4ea1b 100644
--- a/pkgs/development/ocaml-modules/atd/default.nix
+++ b/pkgs/development/ocaml-modules/atd/default.nix
@@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "atd";
version = "2.0.0";
+ minimumOCamlVersion = "4.02";
+
src = fetchFromGitHub {
owner = "mjambon";
repo = pname;
diff --git a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix
index fd3e7d58ae3..38673fb9ddc 100644
--- a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix
+++ b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix
@@ -1,6 +1,7 @@
{ buildDunePackage, bisect_ppx, ocamlbuild }:
buildDunePackage rec {
+ minimumOCamlVersion = "4.02";
inherit (bisect_ppx) version src meta;
pname = "bisect_ppx-ocamlbuild";
propagatedBuildInputs = [ ocamlbuild ];
diff --git a/pkgs/development/ocaml-modules/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix
index a5164ab7fa9..87d9ac7a324 100644
--- a/pkgs/development/ocaml-modules/dtoa/default.nix
+++ b/pkgs/development/ocaml-modules/dtoa/default.nix
@@ -4,7 +4,7 @@ buildDunePackage rec {
pname = "dtoa";
version = "0.3.1";
- minimumOCamlVersion = "4.01";
+ minimumOCamlVersion = "4.02";
src = fetchurl {
url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
diff --git a/pkgs/development/ocaml-modules/opti/default.nix b/pkgs/development/ocaml-modules/opti/default.nix
index 7b084e61688..f6552d57683 100644
--- a/pkgs/development/ocaml-modules/opti/default.nix
+++ b/pkgs/development/ocaml-modules/opti/default.nix
@@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "opti";
version = "1.0.3";
+ minimumOCamlVersion = "4.02";
+
src = fetchurl {
url = "https://github.com/magnusjonsson/opti/releases/download/${version}/opti-${version}.tbz";
sha256 = "ed9ba56dc06e9d2b1bf097964cc65ea37db787d4f239c13d0dd74693f5b50a1e";
diff --git a/pkgs/development/ocaml-modules/wtf8/default.nix b/pkgs/development/ocaml-modules/wtf8/default.nix
index 7f3686abb51..4c820d13808 100644
--- a/pkgs/development/ocaml-modules/wtf8/default.nix
+++ b/pkgs/development/ocaml-modules/wtf8/default.nix
@@ -4,7 +4,7 @@ buildDunePackage rec {
pname = "wtf8";
version = "1.0.1";
- minimumOCamlVersion = "4.01";
+ minimumOCamlVersion = "4.02";
src = fetchurl {
url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
diff --git a/pkgs/development/python-modules/aioimaplib/default.nix b/pkgs/development/python-modules/aioimaplib/default.nix
index 59401269393..9003618a0fd 100644
--- a/pkgs/development/python-modules/aioimaplib/default.nix
+++ b/pkgs/development/python-modules/aioimaplib/default.nix
@@ -1,24 +1,24 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, pythonOlder, isPy36
, nose, asynctest, mock, pytz, tzlocal, imaplib2, docutils, pyopenssl }:
buildPythonPackage rec {
pname = "aioimaplib";
- version = "0.7.14";
+ version = "0.7.15";
# PyPI tarball doesn't ship tests
src = fetchFromGitHub {
owner = "bamthomas";
repo = pname;
rev = version;
- sha256 = "150v3czh53sqakfqgjyj1w39mdfcxmpnrk2pbmq63jkq7r6njl0l";
+ sha256 = "15nny3y8pwaizq1zmkg43ym5jszk2hs010z12yn2d0j1fibymwbj";
};
- disabled = pythonOlder "3.4";
+ disabled = !(isPy3k && pythonOlder "3.7");
checkInputs = [ nose asynctest mock pytz tzlocal imaplib2 docutils pyopenssl ];
# https://github.com/bamthomas/aioimaplib/issues/35
- doCheck = false;
+ doCheck = !isPy36;
meta = with lib; {
description = "Python asyncio IMAP4rev1 client library";
diff --git a/pkgs/development/python-modules/beanstalkc/default.nix b/pkgs/development/python-modules/beanstalkc/default.nix
index 9ac9cf831eb..e83a9f67789 100644
--- a/pkgs/development/python-modules/beanstalkc/default.nix
+++ b/pkgs/development/python-modules/beanstalkc/default.nix
@@ -1,14 +1,18 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ stdenv, fetchFromGitHub, buildPythonPackage }:
buildPythonPackage rec {
pname = "beanstalkc";
- version = "0.4.0";
+ version = "0.5.2";
- src = fetchPypi {
- inherit pname version;
- sha256 = "98978e57797320146f4b233286d9a02f65d20bad0168424118839fc608085280";
+ src = fetchFromGitHub {
+ owner = "bosondata";
+ repo = "beanstalkc";
+ rev = "v${version}";
+ sha256 = "1dpb1yimp2pfnikmgsb2fr9x6h8riixlsx3xfqphnfvrid49vw5s";
};
+ doCheck = false;
+
meta = {
description = "A simple beanstalkd client library for Python";
maintainers = with stdenv.lib.maintainers; [ aanderse ];
diff --git a/pkgs/development/python-modules/contextvars/default.nix b/pkgs/development/python-modules/contextvars/default.nix
index 12914617b8f..27ee2fc82f9 100644
--- a/pkgs/development/python-modules/contextvars/default.nix
+++ b/pkgs/development/python-modules/contextvars/default.nix
@@ -10,6 +10,8 @@ buildPythonPackage rec {
sha256 = "09fnni8cyxm070bfv9ay030qbyk0dfds5nq77s0p38h33hp08h93";
};
+ # pull request for this patch is https://github.com/MagicStack/contextvars/pull/9
+ patches = [ ./immutables_version.patch ];
propagatedBuildInputs = [ immutables ];
meta = {
diff --git a/pkgs/development/python-modules/contextvars/immutables_version.patch b/pkgs/development/python-modules/contextvars/immutables_version.patch
new file mode 100644
index 00000000000..733c0502a66
--- /dev/null
+++ b/pkgs/development/python-modules/contextvars/immutables_version.patch
@@ -0,0 +1,11 @@
+--- ./setup.py 2018-07-30 15:40:14.000000000 +0000
++++ ./setup.py 2019-02-12 18:33:24.984430303 +0000
+@@ -17,7 +17,7 @@
+ packages=['contextvars'],
+ provides=['contextvars'],
+ install_requires=[
+- 'immutables==0.6',
++ 'immutables>=0.6',
+ ],
+ license='Apache License, Version 2.0',
+ classifiers=[
diff --git a/pkgs/development/python-modules/dask-mpi/default.nix b/pkgs/development/python-modules/dask-mpi/default.nix
new file mode 100644
index 00000000000..1bba260e2a0
--- /dev/null
+++ b/pkgs/development/python-modules/dask-mpi/default.nix
@@ -0,0 +1,36 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, dask
+, distributed
+, mpi4py
+, pytest
+, requests
+}:
+
+buildPythonPackage rec {
+ version = "1.0.2";
+ pname = "dask-mpi";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1apzzh90gl9jx43z0gjmgpniplhvqziafi2l8688a0g01vw7ibjv";
+ };
+
+ checkInputs = [ pytest requests ];
+ propagatedBuildInputs = [ dask distributed mpi4py ];
+
+ checkPhase = ''
+ py.test dask_mpi
+ '';
+
+ # hardcoded mpirun path in tests
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/dask/dask-mpi;
+ description = "Deploy Dask using mpi4py";
+ license = licenses.bsd3;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/gumath/default.nix b/pkgs/development/python-modules/gumath/default.nix
new file mode 100644
index 00000000000..b066f323d68
--- /dev/null
+++ b/pkgs/development/python-modules/gumath/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, numba
+, ndtypes
+, xnd
+, libndtypes
+, libxnd
+, libgumath
+, isPy27
+}:
+
+buildPythonPackage {
+ pname = "gumath";
+ disabled = isPy27;
+ inherit (libgumath) src version meta;
+
+ checkInputs = [ numba ];
+ propagatedBuildInputs = [ ndtypes xnd ];
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace 'add_include_dirs = [".", "libgumath", "ndtypes/python/ndtypes", "xnd/python/xnd"] + INCLUDES' \
+ 'add_include_dirs = [".", "${libndtypes}/include", "${libxnd}/include", "${libgumath}/include"]' \
+ --replace 'add_library_dirs = ["libgumath", "ndtypes/libndtypes", "xnd/libxnd"] + LIBS' \
+ 'add_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib", "${libgumath}/lib"]' \
+ --replace 'add_runtime_library_dirs = ["$ORIGIN"]' \
+ 'add_runtime_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib", "${libgumath}/lib"]'
+ '';
+}
diff --git a/pkgs/development/python-modules/ndtypes/default.nix b/pkgs/development/python-modules/ndtypes/default.nix
new file mode 100644
index 00000000000..2110f3628a8
--- /dev/null
+++ b/pkgs/development/python-modules/ndtypes/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, numpy
+, libndtypes
+, isPy27
+}:
+
+buildPythonPackage {
+ pname = "ndtypes";
+ disabled = isPy27;
+ inherit (libndtypes) version src meta;
+
+ propagatedBuildInputs = [ numpy ];
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace 'include_dirs = ["libndtypes"]' \
+ 'include_dirs = ["${libndtypes}/include"]' \
+ --replace 'library_dirs = ["libndtypes"]' \
+ 'library_dirs = ["${libndtypes}/lib"]' \
+ --replace 'runtime_library_dirs = ["$ORIGIN"]' \
+ 'runtime_library_dirs = ["${libndtypes}/lib"]'
+ '';
+
+ postInstall = ''
+ mkdir $out/include
+ cp python/ndtypes/*.h $out/include
+ '';
+}
diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix
index 62ff439afbb..d9168f291c0 100644
--- a/pkgs/development/python-modules/pyside/apiextractor.nix
+++ b/pkgs/development/python-modules/pyside/apiextractor.nix
@@ -19,7 +19,7 @@ in stdenv.mkDerivation {
description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process";
license = stdenv.lib.licenses.gpl2;
homepage = http://www.pyside.org/docs/apiextractor/;
- maintainers = [ stdenv.lib.maintainers.chaoflow ];
+ maintainers = [ ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix
index e6ac4281362..1d61854cb67 100644
--- a/pkgs/development/python-modules/pyside/default.nix
+++ b/pkgs/development/python-modules/pyside/default.nix
@@ -21,7 +21,6 @@ buildPythonPackage rec {
description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework";
license = lib.licenses.lgpl21;
homepage = http://www.pyside.org;
- maintainers = [ lib.maintainers.chaoflow ];
broken = true;
};
}
diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix
index 9ad65dc76e0..0950726172d 100644
--- a/pkgs/development/python-modules/pyside/generatorrunner.nix
+++ b/pkgs/development/python-modules/pyside/generatorrunner.nix
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process";
license = stdenv.lib.licenses.gpl2;
homepage = http://www.pyside.org/docs/generatorrunner/;
- maintainers = [ stdenv.lib.maintainers.chaoflow ];
+ maintainers = [ ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix
index 2bf1c4468dd..42ad55ad0b9 100644
--- a/pkgs/development/python-modules/pyside/shiboken.nix
+++ b/pkgs/development/python-modules/pyside/shiboken.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code";
license = lib.licenses.gpl2;
homepage = http://www.pyside.org/docs/shiboken/;
- maintainers = [ lib.maintainers.chaoflow ];
+ maintainers = [ ];
platforms = lib.platforms.all;
};
}
diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix
index a56899f8d0b..abb0bdebd5d 100644
--- a/pkgs/development/python-modules/pyside/tools.nix
+++ b/pkgs/development/python-modules/pyside/tools.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework";
license = lib.licenses.gpl2;
homepage = http://www.pyside.org;
- maintainers = [ lib.maintainers.chaoflow ];
+ maintainers = [ ];
platforms = lib.platforms.all;
};
}
diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix
new file mode 100644
index 00000000000..d3d78620a3d
--- /dev/null
+++ b/pkgs/development/python-modules/sparse/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, numpy
+, scipy
+, numba
+, pytest
+}:
+
+buildPythonPackage rec {
+ pname = "sparse";
+ version = "0.6.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "2ac6fcbf68b38b999eae98467cf4880b942c13a72036868f78d65a10aeba808d";
+ };
+
+ checkInputs = [ pytest ];
+ propagatedBuildInputs = [
+ numpy
+ scipy
+ numba
+ ];
+
+ checkPhase = ''
+ pytest sparse
+ '';
+
+ meta = with lib; {
+ description = "Sparse n-dimensional arrays computations";
+ homepage = https://github.com/pydata/sparse/;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/xnd/default.nix b/pkgs/development/python-modules/xnd/default.nix
new file mode 100644
index 00000000000..8ffb8f96936
--- /dev/null
+++ b/pkgs/development/python-modules/xnd/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, ndtypes
+, libndtypes
+, libxnd
+, isPy27
+}:
+
+buildPythonPackage {
+ pname = "xnd";
+ disabled = isPy27;
+ inherit (libxnd) version src meta;
+
+ propagatedBuildInputs = [ ndtypes ];
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace 'include_dirs = ["libxnd", "ndtypes/python/ndtypes"] + INCLUDES' \
+ 'include_dirs = ["${libndtypes}/include", "${ndtypes}/include", "${libxnd}/include"]' \
+ --replace 'library_dirs = ["libxnd", "ndtypes/libndtypes"] + LIBS' \
+ 'library_dirs = ["${libndtypes}/lib", "${libxnd}/lib"]' \
+ --replace 'runtime_library_dirs = ["$ORIGIN"]' \
+ 'runtime_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib"]' \
+ '';
+
+ postInstall = ''
+ mkdir $out/include
+ cp python/xnd/*.h $out/include
+ '';
+}
diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix
index e60729dc8b9..97140d10ca2 100644
--- a/pkgs/development/tools/analysis/pmd/default.nix
+++ b/pkgs/development/tools/analysis/pmd/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "pmd-${version}";
- version = "6.10.0";
+ version = "6.11.0";
buildInputs = [ unzip ];
src = fetchurl {
url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip";
- sha256 = "1yzgin2lbhfswb07mm14wq8rn129kpfjidd8nv9pg77ywhnbwqmb";
+ sha256 = "0mg32bnl6j4p15akdhfc0wgilqvyphcgjimlaqq3jz51dmlr9scb";
};
installPhase = ''
diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix
index c9332163809..f50191d7dad 100644
--- a/pkgs/development/tools/dive/default.nix
+++ b/pkgs/development/tools/dive/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "dive";
- version = "0.5.0";
+ version = "0.6.0";
goPackagePath = "github.com/wagoodman/dive";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "wagoodman";
repo = "dive";
rev = "v${version}";
- sha256 = "159m36p7b0ygdp42qdmmz02rhrkymh8m6yl21m1ixd4c2pjkjhns";
+ sha256 = "05n19a5q1yi8r6r72z634z93lz2i347zccs9qm7gx5h86nh147zd";
};
goDeps = ./deps.nix;
@@ -21,6 +21,6 @@ buildGoPackage rec {
description = "A tool for exploring each layer in a docker image";
homepage = https://github.com/wagoodman/dive;
license = licenses.mit;
- maintainers = [ maintainers.marsam ];
+ maintainers = with maintainers; [ marsam spacekookie ];
};
}
diff --git a/pkgs/development/tools/dive/deps.nix b/pkgs/development/tools/dive/deps.nix
index c140b2ae774..99fe79c1814 100644
--- a/pkgs/development/tools/dive/deps.nix
+++ b/pkgs/development/tools/dive/deps.nix
@@ -709,4 +709,24 @@
sha256 = "0rinkyx3r2bq45mgcasnn5jb07cwbv3p3s2wwcrzxsarsj6wa5lc";
};
}
+
+ {
+ goPackagePath = "github.com/logrusorgru/aurora";
+ fetch = {
+ type = "git";
+ url = "https://github.com/logrusorgru/aurora";
+ rev = "a7b3b318ed4e";
+ sha256 = "1dldc270z42zm2d377ks7sa5059janjcjhv3inza3rjvapknsrcb";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/wagoodman/keybinding";
+ fetch = {
+ type = "git";
+ url = "https://github.com/wagoodman/keybinding";
+ rev = "6a824da6df05";
+ sha256 = "0f59idv5xia7w53363ym0qywvp0aas2kmk93rnndf2s7cs2f1d3l";
+ };
+ }
]
diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix
index 5cec122950f..b149703241e 100644
--- a/pkgs/development/tools/icestorm/default.nix
+++ b/pkgs/development/tools/icestorm/default.nix
@@ -11,13 +11,13 @@ in
stdenv.mkDerivation rec {
name = "icestorm-${version}";
- version = "2018.12.31";
+ version = "2019.02.23";
src = fetchFromGitHub {
owner = "cliffordwolf";
repo = "icestorm";
- rev = "c0cbae88ab47a3879aacf80d53b6a85710682a6b";
- sha256 = "0bqm0rpywm64yvbq75klpyzb1g9sdsp1kvdlyqg4hvm8jw9w8lya";
+ rev = "3a2bfee5cbc0558641668114260d3f644d6b7c83";
+ sha256 = "1avc9b6w3xbmpq4y4lf9b5mym6aygh5hngzyasa9jyj0cx8mxcpf";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix
index 1a421cc47ed..dbda476171a 100644
--- a/pkgs/development/tools/jbake/default.nix
+++ b/pkgs/development/tools/jbake/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchzip, makeWrapper, jre }:
stdenv.mkDerivation rec {
- version = "2.6.3";
+ version = "2.6.4";
name = "jbake-${version}";
src = fetchzip {
url = "https://dl.bintray.com/jbake/binary/${name}-bin.zip";
- sha256 = "000ax5vzirrhiykk86fmy4hibhl3pab0gkh5y35hiwhzhw5rwzk8";
+ sha256 = "0zgp0wwxxmi13v5q5jvr610igx2vxg0bwck9j1imnn9ciakg1aaw";
};
buildInputs = [ makeWrapper jre ];
diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index be6bb73aab8..d9e563952ea 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -2,7 +2,7 @@
, lambdaTerm, cppo, makeWrapper
}:
-if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+if !stdenv.lib.versionAtLeast ocaml.version "4.03"
then throw "utop is not available for OCaml ${ocaml.version}"
else
diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix
index 3bba4237cf8..9416b9e4f3e 100644
--- a/pkgs/development/tools/react-native-debugger/default.nix
+++ b/pkgs/development/tools/react-native-debugger/default.nix
@@ -38,11 +38,11 @@ let
];
in stdenv.mkDerivation rec {
name = "react-native-debugger-${version}";
- version = "0.8.1";
+ version = "0.8.2";
src = fetchurl {
url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip";
- sha256 = "180rvcnr3xxg7nb5g4b45l9a67h2dx8ps0l05r6ph3f71kzh4dd9";
+ sha256 = "0ljhpqanl9rjk9n69if1vrfvac0s73f8by0k6sa4ngvgqzgvq3kb";
};
buildInputs = [ unzip ];
diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix
index 11de0bec425..2e9093bfae6 100644
--- a/pkgs/development/tools/skaffold/default.nix
+++ b/pkgs/development/tools/skaffold/default.nix
@@ -2,9 +2,9 @@
buildGoPackage rec {
name = "skaffold-${version}";
- version = "0.19.0";
- # rev is the 0.19.0 commit, mainly for skaffold version command output
- rev = "9eb0dfc1bf634b97462c66b4dfb80e4cea378ade";
+ version = "0.21.1";
+ # rev is the 0.21.1 commit, mainly for skaffold version command output
+ rev = "a73671cb547a80d3437f78d046bc500269673ea3";
goPackagePath = "github.com/GoogleContainerTools/skaffold";
subPackages = ["cmd/skaffold"];
@@ -20,7 +20,7 @@ buildGoPackage rec {
owner = "GoogleContainerTools";
repo = "skaffold";
rev = "v${version}";
- sha256 = "0s7dyfdmgslwnmbkzyqvf2622gj5d7vx9igwz3bf6dpaz382mk6h";
+ sha256 = "0n4gqri4rmah1brckj9d4vidm6faabvwfy5smhpl3f6flyv3slsy";
};
meta = {
diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix
index 966c50404d4..eeef99991db 100644
--- a/pkgs/development/tools/trellis/default.nix
+++ b/pkgs/development/tools/trellis/default.nix
@@ -8,21 +8,21 @@ let
in
stdenv.mkDerivation rec {
name = "trellis-${version}";
- version = "2018.12.20";
+ version = "2019.02.21";
srcs = [
(fetchFromGitHub {
owner = "symbiflow";
repo = "prjtrellis";
- rev = "b947028a6ac6494b6000c6e1ab5aa0db813e8544";
- sha256 = "14dcsl2drx3xaqvpawp0j7088cijxcr5018yji48rmbl85763aw9";
+ rev = "90910577671cdd950e56df6cb29d848dadea9467";
+ sha256 = "0j5gnkqfkp8k01wmzsplg713dmw1zvg04hsy33bzbyxaqviybdip";
name = "trellis";
})
(fetchFromGitHub {
owner = "symbiflow";
repo = "prjtrellis-db";
- rev = "670d04f0b8412193d5e974eea67f2bb7355aa1ec";
- sha256 = "1hm385rg1jq9qbq63g5134gq9xpfadvpahxvzwpv0q543brkg730";
+ rev = "d0b219af41ae3da6150645fbc5cc5613b530603f";
+ sha256 = "1mnzvrqrcbfypvbagwyf6arv3kmj6q7n27gcmyk6ap2xnavkx4bq";
name = "database";
})
];
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index 0f9b4efd61d..c9a227b98db 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -33,10 +33,10 @@ let
# when updating, also update rev-manual to a recent version of
# https://github.com/dae/ankidocs
# The manual is distributed independently of the software.
- version = "2.1.8";
- sha256-pkg = "08wb9hwpmbq7636h7sinim33qygdwwlh3frqqh2gfgm49f46di2p";
- rev-manual = "3a3d32dd9bfee6f5a7f5bdad2d70938874c881fa";
- sha256-manual = "1kz9ywbb6f42krxg8c5cwpjsnzm863vnkkn07szb3m1j85c10gjy";
+ version = "2.1.9";
+ sha256-pkg = "0p4admjxs0gwc54hby9kc1isg99ghxd5kpy08w9hrk3mcyq74z3i";
+ rev-manual = "c2c443bf991089534b0193029f6ee34908124e80";
+ sha256-manual = "1jwm5zrydc6qis7zslfqj56d083kpbzbl51n0x4czhskm9pjh7qd";
manual = stdenv.mkDerivation {
name = "anki-manual-${version}";
diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix
index ad3baa9d22a..f84b83a3010 100644
--- a/pkgs/games/ivan/default.nix
+++ b/pkgs/games/ivan/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "ivan-${version}";
- version = "055";
+ version = "056";
src = fetchFromGitHub {
owner = "Attnam";
repo = "ivan";
rev = "v${version}";
- sha256 = "10qrwzwfzqs7f663x1cbbhisz60axcl51glxq33zaxl0jwnmma2p";
+ sha256 = "07mj3b2p3n3bq7rwi31y0vywnr4namqbcnz4c53kl38ajw9viyf0";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix
index 301249789da..d4945d43c7d 100644
--- a/pkgs/games/privateer/default.nix
+++ b/pkgs/games/privateer/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
license = licenses.gpl2Plus; # and a special license for art data
# https://sourceforge.net/p/privateer/code/HEAD/tree/privgold/trunk/data/art-license.txt
- maintainers = with maintainers; [ chaoflow ];
+ maintainers = with maintainers; [ ];
platforms = with platforms; linux ++ darwin;
hydraPlatforms = [];
broken = true; # it won't build
diff --git a/pkgs/misc/acpilight/default.nix b/pkgs/misc/acpilight/default.nix
new file mode 100644
index 00000000000..20efe634285
--- /dev/null
+++ b/pkgs/misc/acpilight/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchgit, python36, udev, coreutils }:
+
+stdenv.mkDerivation rec {
+ pname = "acpilight";
+ version = "1.1";
+
+ src = fetchgit {
+ url = "https://gitlab.com/wavexx/acpilight.git";
+ rev = "v${version}";
+ sha256 = "0kykrl71fb146vaq8207c3qp03h2djkn8hn6psryykk8gdzkv3xd";
+ };
+
+ pyenv = python36.withPackages (pythonPackages: with pythonPackages; [
+ ConfigArgParse
+ ]);
+
+ postConfigure = ''
+ substituteInPlace 90-backlight.rules --replace /bin ${coreutils}/bin
+ '';
+
+ buildInputs = [ pyenv udev ];
+
+ makeFlags = [ "DESTDIR=$(out) prefix=" ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://gitlab.com/wavexx/acpilight";
+ description = "ACPI backlight control";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ "smakarov" ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index 348b7c6550e..3d2eafee168 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -9,11 +9,11 @@ let
in stdenv.mkDerivation rec {
name = "cups-filters-${version}";
- version = "1.21.6";
+ version = "1.22.0";
src = fetchurl {
url = "https://openprinting.org/download/cups-filters/${name}.tar.xz";
- sha256 = "0k0x9p40bahq44189vy9zai2ia9i91h26chrddr0m9agzsy5s3k3";
+ sha256 = "0gdv33g7dr1i7756n07zwgsv9b1i15rp7n1z1xr3n8f59br4fds4";
};
nativeBuildInputs = [ pkgconfig makeWrapper ];
diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix
index db2afa5ba63..991be274ecc 100644
--- a/pkgs/misc/gnash/default.nix
+++ b/pkgs/misc/gnash/default.nix
@@ -14,10 +14,10 @@
, enableQt ? false, qt4 ? null
# media
-, enableFFmpeg ? true, ffmpeg_2 ? null
+, enableFFmpeg ? true, ffmpeg_2 ? null
# misc
-, enableJemalloc ? true, jemalloc ? null
+, enableJemalloc ? true, jemalloc ? null
, enableHwAccel ? true
, enablePlugins ? false, xulrunner ? null, npapi_sdk ? null
}:
@@ -66,12 +66,12 @@ assert length renderers == 0 -> throw "at least one renderer must be enabled";
stdenv.mkDerivation rec {
name = "gnash-${version}";
- version = "0.8.11-2017-03-08";
+ version = "0.8.11-2019-30-01";
src = fetchgit {
url = "git://git.sv.gnu.org/gnash.git";
- rev = "8a11e60585db4ed6bc4eafadfbd9b3123ced45d9";
- sha256 = "1qas084gc4s9cb2jbwi2s1h4hk7m92xmrsb596sd14h0i44dai02";
+ rev = "583ccbc1275c7701dc4843ec12142ff86bb305b4";
+ sha256 = "0fh0bljn0i6ypyh6l99afi855p7ki7lm869nq1qj6k8hrrwhmfry";
};
postPatch = ''
diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix
index c6920eab855..f4c83a58823 100644
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
homepage = https://gitlab.com/cryptsetup/cryptsetup/;
description = "LUKS for dm-crypt";
license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [ chaoflow ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 61dbf2393bb..18911044579 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -636,6 +636,8 @@ let
MLX4_EN_VXLAN = whenOlder "4.8" yes;
MLX5_CORE_EN = option yes;
+ PSI = whenAtLeast "4.20" yes;
+
MODVERSIONS = whenOlder "4.9" yes;
MOUSE_PS2_ELANTECH = yes; # Elantech PS/2 protocol extension
MTRR_SANITIZER = yes;
diff --git a/pkgs/os-specific/linux/ledger-udev-rules/default.nix b/pkgs/os-specific/linux/ledger-udev-rules/default.nix
new file mode 100644
index 00000000000..28027fd4510
--- /dev/null
+++ b/pkgs/os-specific/linux/ledger-udev-rules/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "ledger-udev-rules";
+ version = "unstable-2019-02-13";
+
+ src = fetchFromGitHub {
+ owner = "LedgerHQ";
+ repo = "udev-rules";
+ rev = "20cc1651eb551c4855aaa56628c77eaeb3031c22";
+ sha256 = "0riydkc4in10pv4qlrvbg3w78qsvxly5caa3zwyqcmsm5fmprqky";
+ };
+
+ dontBuild = true;
+ dontConfigure = true;
+
+ installPhase = ''
+ mkdir -p $out/lib/udev/rules.d
+ cp 20-hw1.rules $out/lib/udev/rules.d/20-ledger.rules
+ '';
+
+ meta = with stdenv.lib; {
+ description = "udev rules for Ledger devices";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ asymmetric ];
+ platforms = platforms.linux;
+ homepage = https://github.com/LedgerHQ/udev-rules;
+ };
+}
diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix
index f24f5a5d06f..54fdfb354d1 100644
--- a/pkgs/os-specific/linux/powertop/default.nix
+++ b/pkgs/os-specific/linux/powertop/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
description = "Analyze power consumption on Intel-based laptops";
homepage = https://01.org/powertop;
license = licenses.gpl2;
- maintainers = with maintainers; [ chaoflow fpletz ];
+ maintainers = with maintainers; [ fpletz ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/pkgs/os-specific/linux/pscircle/default.nix
index 1efbd7bc2c9..b6c16948339 100644
--- a/pkgs/os-specific/linux/pscircle/default.nix
+++ b/pkgs/os-specific/linux/pscircle/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "pscircle-${version}";
- version = "1.1.0";
+ version = "1.3.0";
src = fetchFromGitLab {
owner = "mildlyparallel";
repo = "pscircle";
rev = "v${version}";
- sha256 = "1sxdnhkcr26l29nk0zi1zkvkd7128xglfql47rdb1bx940vflgb6";
+ sha256 = "0qsif00dkqa8ky3vl2ycx5anx2yk62nrv47f5lrlqzclz91f00fx";
};
buildInputs = [
diff --git a/pkgs/os-specific/linux/wpa_supplicant/build-fix.patch b/pkgs/os-specific/linux/wpa_supplicant/build-fix.patch
deleted file mode 100644
index a186cdad969..00000000000
--- a/pkgs/os-specific/linux/wpa_supplicant/build-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
-index 0f82af9..70564ff 100644
---- a/wpa_supplicant/Makefile
-+++ b/wpa_supplicant/Makefile
-@@ -1558,6 +1558,7 @@ OBJS += $(CONFIG_MAIN).o
- ifdef CONFIG_PRIVSEP
- OBJS_priv += $(OBJS_d) ../src/drivers/drivers.o
- OBJS_priv += $(OBJS_l2)
-+OBJS_priv += ../src/crypto/crypto_openssl.o
- OBJS_priv += ../src/utils/os_$(CONFIG_OS).o
- OBJS_priv += ../src/utils/$(CONFIG_ELOOP).o
- OBJS_priv += ../src/utils/common.o
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index 176eef3b861..8b8c23739c2 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, openssl, pkgconfig, libnl
+{ stdenv, fetchpatch, fetchurl, openssl, pkgconfig, libnl
, dbus, readline ? null, pcsclite ? null
}:
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "2.6";
+ version = "2.7";
name = "wpa_supplicant-${version}";
src = fetchurl {
url = "https://w1.fi/releases/${name}.tar.gz";
- sha256 = "0l0l5gz3d5j9bqjsbjlfcv4w4jwndllp9fmyai4x9kg6qhs6v4xl";
+ sha256 = "0x1hqyahq44jyla8jl6791nnwrgicrhidadikrnqxsm2nw36pskn";
};
# TODO: Patch epoll so that the dbus actually responds
@@ -82,46 +82,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
patches = [
- ./build-fix.patch
-
- # KRACKAttack.com
- (fetchurl {
- url = "http://w1.fi/security/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch";
- sha256 = "02zl2x4pxay666yq18g4f3byccrzipfjbky1ydw62v15h76174aj";
- })
- (fetchurl {
- url = "http://w1.fi/security/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch";
- sha256 = "1mrmqg00x1bqa43dyhxb14msk74lh3kvr4avni43c3qpfjmlfvfq";
- })
- (fetchurl {
- url = "http://w1.fi/security/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch";
- sha256 = "10byyi8wfpcc8i788ag7ndycd3xvq2iwnssyb3rwf34sfcv5wlyl";
- })
- (fetchurl {
- url = "http://w1.fi/security/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch";
- sha256 = "02z2rsbh4sw81wsc56xjbblbi76ii0clmpnr1m1szdb1h5s58fkr";
- })
- (fetchurl {
- url = "http://w1.fi/security/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch";
- sha256 = "17pbrn5h6l5v14y6gn2yr2knqya9i0n2vyq4ck8hasb00yz8lz0l";
- })
- (fetchurl {
- url = "http://w1.fi/security/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch";
- sha256 = "19mgcqbdyzm4myi182jcn1rn26xi3jib74cpxbbrx1gaccxlsvar";
- })
- (fetchurl { # wpa-supplicant only
- url = "http://w1.fi/security/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch";
- sha256 = "0di71j8762dkvr0c7h5mrbkqyfdy8mljvnp0dk2qhbgc9bw7m8f5";
- })
- (fetchurl {
- url = "http://w1.fi/security/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch";
- sha256 = "1ca312cixbld70rp12q7h66lnjjxzz0qag0ii2sg6cllgf2hv168";
- })
-
- # Unauthenticated EAPOL-Key decryption (CVE-2018-14526)
- (fetchurl {
- url = "https://w1.fi/security/2018-1/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch";
- sha256 = "0z0zxc9wrikmvciyqpdhx0l5v7qsd8c6b5ph9h5rniqllpr3q34n";
+ (fetchpatch {
+ name = "build-fix.patch";
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-wireless/wpa_supplicant/files/wpa_supplicant-2.7-fix-undefined-remove-ie.patch?id=e0288112138a70a8acc3ae0196772fd7ccb677ce";
+ sha256 = "0ysazfcyn195mvkb1v10mgzzmpmqgv5kwqxwzfbsfhzq5bbaihld";
})
];
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index a8db20cede7..a6f1629a4b2 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "caddy-${version}";
- version = "0.11.1";
+ version = "0.11.4";
goPackagePath = "github.com/mholt/caddy";
@@ -12,7 +12,7 @@ buildGoPackage rec {
owner = "mholt";
repo = "caddy";
rev = "v${version}";
- sha256 = "0v35d3dy0f88wgk1vzznbx7p15vjjf7xm3qfi2c3192rsxgzvy0l";
+ sha256 = "1h7zx5gzv40xkxab8pc6hgd9zkpbnhiy1hnldriybpf2ya2lac9a";
};
buildFlagsArray = ''
diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix
index c1c70955d1f..1f5ba6150ed 100644
--- a/pkgs/servers/sql/cockroachdb/default.nix
+++ b/pkgs/servers/sql/cockroachdb/default.nix
@@ -13,13 +13,13 @@ let
in
buildGoPackage rec {
name = "cockroach-${version}";
- version = "2.1.3";
+ version = "2.1.5";
goPackagePath = "github.com/cockroachdb/cockroach";
src = fetchurl {
url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz";
- sha256 = "0glk2qg4dq7gzkr6wjamxksjn668zsny8mmd0jph4w7166hm3n0n";
+ sha256 = "0bdbkz917175vp28kc513996ik0m61hfbvnqnv0alxv0mfx8djzn";
};
inherit nativeBuildInputs buildInputs;
diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix
index 674d96e5462..e05d9e919d1 100644
--- a/pkgs/servers/tvheadend/default.nix
+++ b/pkgs/servers/tvheadend/default.nix
@@ -3,7 +3,7 @@
, which, zlib }:
let
- version = "4.2.7";
+ version = "4.2.8";
in stdenv.mkDerivation rec {
name = "tvheadend-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
owner = "tvheadend";
repo = "tvheadend";
rev = "v${version}";
- sha256 = "09q6lddkld22z9nbxx5v3v3z5yvcnl4lgjirvrdprwkv67fld70g";
+ sha256 = "1xq059r2bplaa0nd0wkhw80jfwd962x0h5hgd7fz2yp6largw34m";
};
buildInputs = [
diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix
index 768fdf0b46f..297a0215aac 100644
--- a/pkgs/servers/uftp/default.nix
+++ b/pkgs/servers/uftp/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "uftp-${version}";
- version = "4.9.8";
+ version = "4.9.9";
src = fetchurl {
url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz";
- sha256 = "16g54372xy5apk485xz9bp1hfci15mssw7m7givls4lpwhc67379";
+ sha256 = "0j5af6vicv6zhyjmqnlba10c86qb9nz61wk98985fggwi1dcfjy0";
};
buildInputs = [ openssl ];
diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix
index 29e79c0e503..b68a25630a1 100644
--- a/pkgs/shells/zsh/antibody/default.nix
+++ b/pkgs/shells/zsh/antibody/default.nix
@@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "antibody-${version}";
- version = "4.0.2";
+ pname = "antibody";
+ version = "4.1.0";
goPackagePath = "github.com/getantibody/antibody";
src = fetchFromGitHub {
- owner = "getantibody";
- repo = "antibody";
+ owner = "getantibody";
+ repo = "antibody";
rev = "v${version}";
- sha256 = "1lq0bd2l928bgwqiq3fa5ippjhnsfgwdqn6nd3hfis8bijrwc5jv";
+ sha256 = "027qh535cpk5mbxav199vvzhwfkcs0lm7skgfhshpzps1yw4w4mb";
};
goDeps = ./deps.nix;
diff --git a/pkgs/shells/zsh/antibody/deps.nix b/pkgs/shells/zsh/antibody/deps.nix
index bdd53a9d142..86263b43944 100644
--- a/pkgs/shells/zsh/antibody/deps.nix
+++ b/pkgs/shells/zsh/antibody/deps.nix
@@ -1,73 +1,110 @@
-[{
- goPackagePath = "github.com/getantibody/folder";
- fetch = {
- type = "git";
- url = "https://github.com/getantibody/folder";
- rev = "479aa91767d47bc27599e6ebc7fd07945dd38132";
- sha256 = "0mzc2x7897f17kj2v807d8cqzgclq9bsz2xqz81j1k85g53l513j";
- };
-}{
- goPackagePath = "github.com/alecthomas/units";
- fetch = {
- type = "git";
- url = "https://github.com/alecthomas/units";
- rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
- sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
- };
-}{
- goPackagePath = "github.com/alecthomas/template";
- fetch = {
- type = "git";
- url = "https://github.com/alecthomas/template";
- rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
- sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
- };
-}{
- goPackagePath = "github.com/caarlos0/gohome";
- fetch = {
- type = "git";
- url = "https://github.com/caarlos0/gohome";
- rev = "75f08ebc60b144c5c3178115baedce176fdcfe99";
- sha256 = "04950r9lzhgkksgqbnlfx0m3n7zqfif3l8fixwb7f271a880i4gz";
- };
-}{
- goPackagePath = "github.com/alecthomas/kingpin";
- fetch = {
- type = "git";
- url = "https://github.com/alecthomas/kingpin";
- rev = "a39589180ebd6bbf43076e514b55f20a95d43086";
- sha256 = "0b00bfiwl76qflnmnk3cnlaii6wxgzzdnby99cxdych4f8qmzlv3";
- };
-}{
- goPackagePath = "golang.org/x/sync";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sync";
- rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
- sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
- };
-}{
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "1a580b3eff7814fc9b40602fd35256c63b50f491";
- sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7";
- };
-}{
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
- sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
- };
-}{
- goPackagePath = "golang.org/x/net";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/net";
- rev = "2491c5de3490fced2f6cff376127c667efeed857";
- sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3";
- };
-}]
+[
+ {
+ goPackagePath = "github.com/alecthomas/kingpin";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/kingpin";
+ rev = "a39589180ebd";
+ sha256 = "0b00bfiwl76qflnmnk3cnlaii6wxgzzdnby99cxdych4f8qmzlv3";
+ };
+ }
+ {
+ goPackagePath = "github.com/alecthomas/template";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/template";
+ rev = "a0175ee3bccc";
+ sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+ };
+ }
+ {
+ goPackagePath = "github.com/alecthomas/units";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/units";
+ rev = "2efee857e7cf";
+ sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+ };
+ }
+ {
+ goPackagePath = "github.com/caarlos0/gohome";
+ fetch = {
+ type = "git";
+ url = "https://github.com/caarlos0/gohome";
+ rev = "75f08ebc60b1";
+ sha256 = "04950r9lzhgkksgqbnlfx0m3n7zqfif3l8fixwb7f271a880i4gz";
+ };
+ }
+ {
+ goPackagePath = "github.com/davecgh/go-spew";
+ fetch = {
+ type = "git";
+ url = "https://github.com/davecgh/go-spew";
+ rev = "v1.1.1";
+ sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+ };
+ }
+ {
+ goPackagePath = "github.com/getantibody/folder";
+ fetch = {
+ type = "git";
+ url = "https://github.com/getantibody/folder";
+ rev = "v1.0.0";
+ sha256 = "0mzc2x7897f17kj2v807d8cqzgclq9bsz2xqz81j1k85g53l513j";
+ };
+ }
+ {
+ goPackagePath = "github.com/pmezard/go-difflib";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pmezard/go-difflib";
+ rev = "v1.0.0";
+ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/testify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/testify";
+ rev = "v1.2.2";
+ sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "1a580b3eff78";
+ sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "2491c5de3490";
+ sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sync";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sync";
+ rev = "1d60e4601c6f";
+ sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "7c87d13f8e83";
+ sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
+ };
+ }
+]
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 3e4b756044b..c9a93db2d98 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -78,7 +78,7 @@ EOF
'';
license = "MIT-like";
homepage = http://www.zsh.org/;
- maintainers = with stdenv.lib.maintainers; [ chaoflow pSub ];
+ maintainers = with stdenv.lib.maintainers; [ pSub ];
platforms = stdenv.lib.platforms.unix;
};
diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix
index e3916b0f8a9..58798a92b15 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -63,8 +63,8 @@ in rec {
};
ansible_2_7 = generic {
- version = "2.7.5";
- sha256 = "1fsif2jmkrrgiawsd8r6sxrqvh01fvrmdhas0p540a6i9fby3yda";
+ version = "2.7.6";
+ sha256 = "0f7b2ghm34ql8yv90wr0ngd6w7wyvnlcxpc3snkj86kcjsnmx1bd";
};
ansible2 = ansible_2_7;
diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix
index 4133478dbf9..fbb3065b1e0 100644
--- a/pkgs/tools/backup/burp/default.nix
+++ b/pkgs/tools/backup/burp/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "burp-${version}";
- version = "2.1.32";
+ version = "2.2.16";
src = fetchFromGitHub {
owner = "grke";
repo = "burp";
rev = version;
- sha256 = "1izs5vavffvj6z478s5x1shg71p2v5bnnrsam1avs21ylxbfnxi5";
+ sha256 = "0xzbmbxfqw8iz7ngmx6jlxs874wkl06jjb0xmm7258np7z4r4jn4";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix
index dfd522f5a09..4e2f8eaf5c9 100644
--- a/pkgs/tools/filesystems/cryfs/default.nix
+++ b/pkgs/tools/filesystems/cryfs/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "cryfs-${version}";
- version = "0.9.9";
+ version = "0.9.10";
src = fetchFromGitHub {
owner = "cryfs";
repo = "cryfs";
rev = "${version}";
- sha256 = "07f2k2b595m3vkwwlmlc0m7px0nwrrzrph3z6sss9354m0b0lcri";
+ sha256 = "04yqpad8x0hiiwpykcn3swi0py6sg9xid6g15ny2qs4j3llin5ry";
};
prePatch = ''
diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix
index 9fe4f90f258..b5f3a2f3e1f 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
homepage = http://code.google.com/p/cryptsetup/;
description = "LUKS for dm-crypt";
license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [ chaoflow ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix
index 1b179d32870..cc872ff5339 100644
--- a/pkgs/tools/misc/bdf2psf/default.nix
+++ b/pkgs/tools/misc/bdf2psf/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "bdf2psf-${version}";
- version = "1.188";
+ version = "1.189";
src = fetchurl {
url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
- sha256 = "1g9i50a3x9p7kbyjg7z8xgxcknqxkxvzb0gg2jl2zgwjsyvjy5wn";
+ sha256 = "0i4q4qdf5w96wkhc5lb2h7mdj0wfzqr3a265jp4wzyzgybayfz33";
};
buildInputs = [ dpkg ];
diff --git a/pkgs/tools/misc/dasht/default.nix b/pkgs/tools/misc/dasht/default.nix
new file mode 100644
index 00000000000..e1286820797
--- /dev/null
+++ b/pkgs/tools/misc/dasht/default.nix
@@ -0,0 +1,64 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, makeWrapper
+, coreutils
+, gnused
+, gnugrep
+, sqlite
+, wget
+, w3m
+, socat
+, gawk
+}:
+
+stdenv.mkDerivation rec {
+ pname = "dasht";
+ version = "2.3.0";
+
+ src = fetchFromGitHub {
+ owner = "sunaku";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0d0pcjalba58nvxdgn39m4b6n9ifajf3ygyjaqgvzwxzgpzw0a60";
+ };
+
+ deps = lib.makeBinPath [
+ coreutils
+ gnused
+ gnugrep
+ sqlite
+ wget
+ w3m
+ socat
+ gawk
+ (placeholder "out")
+ ];
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin
+ cp bin/* $out/bin/
+
+ mkdir -p $out/share/man/man1
+ cp man/man1/* $out/share/man/man1/
+
+ for i in $out/bin/*; do
+ echo "Wrapping $i"
+ wrapProgram $i --prefix PATH : ${deps};
+ done;
+
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "Search API docs offline, in terminal or browser";
+ homepage = "https://sunaku.github.io/dasht/man";
+ license = stdenv.lib.licenses.isc;
+ platforms = stdenv.lib.platforms.unix; #cannot test other
+ maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
+ };
+}
diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/tools/misc/dtach/default.nix
index 0367ab53835..c50e3adb6ab 100644
--- a/pkgs/tools/misc/dtach/default.nix
+++ b/pkgs/tools/misc/dtach/default.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;
- maintainers = [ stdenv.lib.maintainers.chaoflow ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index f0dc3ab6460..770f4ae67f4 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, skawarePackages }:
+{ stdenv, skawarePackages, makeWrapper }:
with skawarePackages;
@@ -11,6 +11,8 @@ buildPackage {
outputs = [ "bin" "lib" "dev" "doc" "out" ];
+ setupHooks = [ makeWrapper ];
+
# TODO: nsss support
configureFlags = [
"--libdir=\${lib}/lib"
@@ -30,6 +32,11 @@ buildPackage {
mv doc $doc/share/doc/execline/html
mv examples $doc/share/doc/execline/examples
+
+ # finally, add all tools to PATH so they are available
+ # from within execlineb scripts by default
+ wrapProgram $bin/bin/execlineb \
+ --suffix PATH : $bin/bin
'';
}
diff --git a/pkgs/tools/misc/fltrdr/default.nix b/pkgs/tools/misc/fltrdr/default.nix
new file mode 100644
index 00000000000..3d99a0e27e3
--- /dev/null
+++ b/pkgs/tools/misc/fltrdr/default.nix
@@ -0,0 +1,40 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+}:
+
+stdenv.mkDerivation rec {
+ name = "fltrdr-${version}";
+ version = "0.1.1";
+
+ src = fetchFromGitHub {
+ repo = "fltrdr";
+ owner = "octobanana";
+ rev = "${version}";
+ sha256 = "1gglv7hwszk09ywjq6s169cdzr77sjklj89k5p24if24v93yffpf";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://octobanana.com/software/fltrdr;
+ description = "A TUI text reader for the terminal";
+
+ longDescription = ''
+ Fltrdr, or flat-reader, is an interactive text reader for the terminal. It
+ is flat in the sense that the reader is word-based. It creates a
+ horizontal stream of words, ignoring all newline characters and reducing
+ extra whitespace. Its purpose is to facilitate reading, scanning, and
+ searching text. The program has a play mode that moves the reader forward
+ one word at a time, along with a configurable words per minute (WPM),
+ setting.
+ '';
+
+ platforms = platforms.linux; # can only test linux
+ license = licenses.mit;
+ maintainers = [ maintainers.matthiasbeyer ];
+ };
+}
+
diff --git a/pkgs/tools/misc/fluentd/Gemfile b/pkgs/tools/misc/fluentd/Gemfile
index 2c4fbc84963..3933eb13180 100644
--- a/pkgs/tools/misc/fluentd/Gemfile
+++ b/pkgs/tools/misc/fluentd/Gemfile
@@ -11,4 +11,3 @@ gem 'fluent-plugin-scribe'
gem 'fluent-plugin-mongo'
gem 'fluent-plugin-webhdfs'
gem 'fluent-plugin-rewrite-tag-filter'
-
diff --git a/pkgs/tools/misc/fluentd/Gemfile.lock b/pkgs/tools/misc/fluentd/Gemfile.lock
index 2f9485d9577..d5f78e807ff 100644
--- a/pkgs/tools/misc/fluentd/Gemfile.lock
+++ b/pkgs/tools/misc/fluentd/Gemfile.lock
@@ -1,121 +1,678 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (5.0.1)
- concurrent-ruby (~> 1.0, >= 1.0.2)
- i18n (~> 0.7)
- minitest (~> 5.1)
- tzinfo (~> 1.1)
- addressable (2.5.0)
- public_suffix (~> 2.0, >= 2.0.2)
- aws-sdk (2.7.0)
- aws-sdk-resources (= 2.7.0)
- aws-sdk-core (2.7.0)
+ addressable (2.5.2)
+ public_suffix (>= 2.0.2, < 4.0)
+ aws-eventstream (1.0.1)
+ aws-partitions (1.96.0)
+ aws-sdk (3.0.1)
+ aws-sdk-resources (~> 3)
+ aws-sdk-acm (1.9.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-acmpca (1.2.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-alexaforbusiness (1.6.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-apigateway (1.13.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-applicationautoscaling (1.11.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-applicationdiscoveryservice (1.2.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-appstream (1.13.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-appsync (1.4.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-athena (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-autoscaling (1.6.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-autoscalingplans (1.3.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-batch (1.5.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-budgets (1.8.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-cloud9 (1.2.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-clouddirectory (1.5.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-cloudformation (1.6.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-cloudfront (1.4.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-cloudhsm (1.4.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-cloudhsmv2 (1.2.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-cloudsearch (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-cloudsearchdomain (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-cloudtrail (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-cloudwatch (1.6.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-cloudwatchevents (1.4.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-cloudwatchlogs (1.4.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-codebuild (1.12.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-codecommit (1.4.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-codedeploy (1.6.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-codepipeline (1.5.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-codestar (1.2.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-cognitoidentity (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-cognitoidentityprovider (1.5.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-cognitosync (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-comprehend (1.2.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-configservice (1.12.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-connect (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-core (3.22.1)
+ aws-eventstream (~> 1.0)
+ aws-partitions (~> 1.0)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.7.0)
- aws-sdk-core (= 2.7.0)
- aws-sigv4 (1.0.0)
- bson (1.12.5)
- bzip2-ffi (1.0.0)
- ffi (~> 1.0)
- concurrent-ruby (1.0.4)
- cool.io (1.4.5)
- elasticsearch (1.0.18)
- elasticsearch-api (= 1.0.18)
- elasticsearch-transport (= 1.0.18)
- elasticsearch-api (1.0.18)
+ aws-sdk-costandusagereportservice (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-costexplorer (1.7.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-databasemigrationservice (1.7.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-datapipeline (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-dax (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-devicefarm (1.7.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-directconnect (1.2.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-directoryservice (1.3.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-dlm (1.0.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-dynamodb (1.8.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-dynamodbstreams (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-ec2 (1.38.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-ecr (1.4.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-ecs (1.15.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-efs (1.2.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-eks (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-elasticache (1.4.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-elasticbeanstalk (1.8.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-elasticloadbalancing (1.3.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-elasticloadbalancingv2 (1.11.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-elasticsearchservice (1.6.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-elastictranscoder (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-emr (1.3.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-firehose (1.4.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-fms (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-gamelift (1.5.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-glacier (1.8.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-glue (1.10.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-greengrass (1.4.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-guardduty (1.5.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-health (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-iam (1.6.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-importexport (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv2 (~> 1.0)
+ aws-sdk-inspector (1.5.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-iot (1.9.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-iot1clickdevicesservice (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-iot1clickprojects (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-iotanalytics (1.2.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-iotdataplane (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-iotjobsdataplane (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-kinesis (1.3.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-kinesisanalytics (1.3.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-kinesisvideo (1.2.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-kinesisvideoarchivedmedia (1.2.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-kinesisvideomedia (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-kms (1.6.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-lambda (1.8.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-lambdapreview (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-lex (1.4.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-lexmodelbuildingservice (1.6.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-lightsail (1.5.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-machinelearning (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-macie (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-marketplacecommerceanalytics (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-marketplaceentitlementservice (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-marketplacemetering (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-mediaconvert (1.5.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-medialive (1.8.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-mediapackage (1.2.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-mediastore (1.2.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-mediastoredata (1.2.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-mediatailor (1.2.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-migrationhub (1.3.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-mobile (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-mq (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-mturk (1.4.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-neptune (1.2.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-opsworks (1.4.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-opsworkscm (1.3.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-organizations (1.10.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-pi (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-pinpoint (1.6.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-polly (1.6.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-pricing (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-rds (1.23.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-redshift (1.5.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-rekognition (1.5.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-resourcegroups (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-resourcegroupstaggingapi (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-resources (3.22.0)
+ aws-sdk-acm (~> 1)
+ aws-sdk-acmpca (~> 1)
+ aws-sdk-alexaforbusiness (~> 1)
+ aws-sdk-apigateway (~> 1)
+ aws-sdk-applicationautoscaling (~> 1)
+ aws-sdk-applicationdiscoveryservice (~> 1)
+ aws-sdk-appstream (~> 1)
+ aws-sdk-appsync (~> 1)
+ aws-sdk-athena (~> 1)
+ aws-sdk-autoscaling (~> 1)
+ aws-sdk-autoscalingplans (~> 1)
+ aws-sdk-batch (~> 1)
+ aws-sdk-budgets (~> 1)
+ aws-sdk-cloud9 (~> 1)
+ aws-sdk-clouddirectory (~> 1)
+ aws-sdk-cloudformation (~> 1)
+ aws-sdk-cloudfront (~> 1)
+ aws-sdk-cloudhsm (~> 1)
+ aws-sdk-cloudhsmv2 (~> 1)
+ aws-sdk-cloudsearch (~> 1)
+ aws-sdk-cloudsearchdomain (~> 1)
+ aws-sdk-cloudtrail (~> 1)
+ aws-sdk-cloudwatch (~> 1)
+ aws-sdk-cloudwatchevents (~> 1)
+ aws-sdk-cloudwatchlogs (~> 1)
+ aws-sdk-codebuild (~> 1)
+ aws-sdk-codecommit (~> 1)
+ aws-sdk-codedeploy (~> 1)
+ aws-sdk-codepipeline (~> 1)
+ aws-sdk-codestar (~> 1)
+ aws-sdk-cognitoidentity (~> 1)
+ aws-sdk-cognitoidentityprovider (~> 1)
+ aws-sdk-cognitosync (~> 1)
+ aws-sdk-comprehend (~> 1)
+ aws-sdk-configservice (~> 1)
+ aws-sdk-connect (~> 1)
+ aws-sdk-costandusagereportservice (~> 1)
+ aws-sdk-costexplorer (~> 1)
+ aws-sdk-databasemigrationservice (~> 1)
+ aws-sdk-datapipeline (~> 1)
+ aws-sdk-dax (~> 1)
+ aws-sdk-devicefarm (~> 1)
+ aws-sdk-directconnect (~> 1)
+ aws-sdk-directoryservice (~> 1)
+ aws-sdk-dlm (~> 1)
+ aws-sdk-dynamodb (~> 1)
+ aws-sdk-dynamodbstreams (~> 1)
+ aws-sdk-ec2 (~> 1)
+ aws-sdk-ecr (~> 1)
+ aws-sdk-ecs (~> 1)
+ aws-sdk-efs (~> 1)
+ aws-sdk-eks (~> 1)
+ aws-sdk-elasticache (~> 1)
+ aws-sdk-elasticbeanstalk (~> 1)
+ aws-sdk-elasticloadbalancing (~> 1)
+ aws-sdk-elasticloadbalancingv2 (~> 1)
+ aws-sdk-elasticsearchservice (~> 1)
+ aws-sdk-elastictranscoder (~> 1)
+ aws-sdk-emr (~> 1)
+ aws-sdk-firehose (~> 1)
+ aws-sdk-fms (~> 1)
+ aws-sdk-gamelift (~> 1)
+ aws-sdk-glacier (~> 1)
+ aws-sdk-glue (~> 1)
+ aws-sdk-greengrass (~> 1)
+ aws-sdk-guardduty (~> 1)
+ aws-sdk-health (~> 1)
+ aws-sdk-iam (~> 1)
+ aws-sdk-importexport (~> 1)
+ aws-sdk-inspector (~> 1)
+ aws-sdk-iot (~> 1)
+ aws-sdk-iot1clickdevicesservice (~> 1)
+ aws-sdk-iot1clickprojects (~> 1)
+ aws-sdk-iotanalytics (~> 1)
+ aws-sdk-iotdataplane (~> 1)
+ aws-sdk-iotjobsdataplane (~> 1)
+ aws-sdk-kinesis (~> 1)
+ aws-sdk-kinesisanalytics (~> 1)
+ aws-sdk-kinesisvideo (~> 1)
+ aws-sdk-kinesisvideoarchivedmedia (~> 1)
+ aws-sdk-kinesisvideomedia (~> 1)
+ aws-sdk-kms (~> 1)
+ aws-sdk-lambda (~> 1)
+ aws-sdk-lambdapreview (~> 1)
+ aws-sdk-lex (~> 1)
+ aws-sdk-lexmodelbuildingservice (~> 1)
+ aws-sdk-lightsail (~> 1)
+ aws-sdk-machinelearning (~> 1)
+ aws-sdk-macie (~> 1)
+ aws-sdk-marketplacecommerceanalytics (~> 1)
+ aws-sdk-marketplaceentitlementservice (~> 1)
+ aws-sdk-marketplacemetering (~> 1)
+ aws-sdk-mediaconvert (~> 1)
+ aws-sdk-medialive (~> 1)
+ aws-sdk-mediapackage (~> 1)
+ aws-sdk-mediastore (~> 1)
+ aws-sdk-mediastoredata (~> 1)
+ aws-sdk-mediatailor (~> 1)
+ aws-sdk-migrationhub (~> 1)
+ aws-sdk-mobile (~> 1)
+ aws-sdk-mq (~> 1)
+ aws-sdk-mturk (~> 1)
+ aws-sdk-neptune (~> 1)
+ aws-sdk-opsworks (~> 1)
+ aws-sdk-opsworkscm (~> 1)
+ aws-sdk-organizations (~> 1)
+ aws-sdk-pi (~> 1)
+ aws-sdk-pinpoint (~> 1)
+ aws-sdk-polly (~> 1)
+ aws-sdk-pricing (~> 1)
+ aws-sdk-rds (~> 1)
+ aws-sdk-redshift (~> 1)
+ aws-sdk-rekognition (~> 1)
+ aws-sdk-resourcegroups (~> 1)
+ aws-sdk-resourcegroupstaggingapi (~> 1)
+ aws-sdk-route53 (~> 1)
+ aws-sdk-route53domains (~> 1)
+ aws-sdk-s3 (~> 1)
+ aws-sdk-sagemaker (~> 1)
+ aws-sdk-sagemakerruntime (~> 1)
+ aws-sdk-secretsmanager (~> 1)
+ aws-sdk-serverlessapplicationrepository (~> 1)
+ aws-sdk-servicecatalog (~> 1)
+ aws-sdk-servicediscovery (~> 1)
+ aws-sdk-ses (~> 1)
+ aws-sdk-shield (~> 1)
+ aws-sdk-simpledb (~> 1)
+ aws-sdk-sms (~> 1)
+ aws-sdk-snowball (~> 1)
+ aws-sdk-sns (~> 1)
+ aws-sdk-sqs (~> 1)
+ aws-sdk-ssm (~> 1)
+ aws-sdk-states (~> 1)
+ aws-sdk-storagegateway (~> 1)
+ aws-sdk-support (~> 1)
+ aws-sdk-swf (~> 1)
+ aws-sdk-transcribeservice (~> 1)
+ aws-sdk-translate (~> 1)
+ aws-sdk-waf (~> 1)
+ aws-sdk-wafregional (~> 1)
+ aws-sdk-workdocs (~> 1)
+ aws-sdk-workmail (~> 1)
+ aws-sdk-workspaces (~> 1)
+ aws-sdk-xray (~> 1)
+ aws-sdk-route53 (1.10.1)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-route53domains (1.3.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-s3 (1.17.0)
+ aws-sdk-core (~> 3, >= 3.21.2)
+ aws-sdk-kms (~> 1)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-sagemaker (1.11.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-sagemakerruntime (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-secretsmanager (1.10.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-serverlessapplicationrepository (1.4.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-servicecatalog (1.6.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-servicediscovery (1.3.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-ses (1.8.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-shield (1.3.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-simpledb (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv2 (~> 1.0)
+ aws-sdk-sms (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-snowball (1.3.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-sns (1.3.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-sqs (1.4.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-ssm (1.18.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-states (1.3.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-storagegateway (1.6.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-support (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-swf (1.1.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-transcribeservice (1.3.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-translate (1.2.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-waf (1.5.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-wafregional (1.5.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-workdocs (1.2.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-workmail (1.2.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-workspaces (1.3.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sdk-xray (1.3.0)
+ aws-sdk-core (~> 3)
+ aws-sigv4 (~> 1.0)
+ aws-sigv2 (1.0.1)
+ aws-sigv4 (1.0.3)
+ bson (4.3.0)
+ cool.io (1.5.3)
+ dig_rb (1.0.1)
+ elasticsearch (6.1.0)
+ elasticsearch-api (= 6.1.0)
+ elasticsearch-transport (= 6.1.0)
+ elasticsearch-api (6.1.0)
multi_json
- elasticsearch-transport (1.0.18)
+ elasticsearch-transport (6.1.0)
faraday
multi_json
- excon (0.54.0)
- faraday (0.11.0)
+ excon (0.62.0)
+ faraday (0.15.2)
multipart-post (>= 1.2, < 3)
- ffi (1.9.17)
- fluent-mixin-config-placeholders (0.4.0)
- fluentd
- uuidtools (>= 2.1.5)
- fluent-mixin-plaintextformatter (0.2.6)
- fluentd
- ltsv
- fluent-plugin-elasticsearch (1.9.2)
- elasticsearch (< 1.1)
+ fluent-config-regexp-type (1.0.0)
+ fluentd (> 1.0.0, < 2)
+ fluent-plugin-elasticsearch (2.11.1)
+ elasticsearch
excon
- fluentd (>= 0.10.43)
- fluent-plugin-kafka (0.5.0)
+ fluentd (>= 0.14.20)
+ fluent-plugin-kafka (0.7.4)
fluentd (>= 0.10.58, < 2)
ltsv
- ruby-kafka (= 0.3.16.beta2)
- fluent-plugin-kinesis (1.1.2)
- aws-sdk (~> 2)
- concurrent-ruby (~> 1)
- fluentd (>= 0.10.58, < 2)
- os (>= 0.9.6)
- protobuf (>= 3.5.5)
- fluent-plugin-mongo (0.7.16)
- fluentd (>= 0.10.58, < 2)
- mongo (~> 1.9)
- fluent-plugin-record-reformer (0.8.2)
+ ruby-kafka (>= 0.4.1, < 1.0.0)
+ fluent-plugin-kinesis (2.1.1)
+ aws-sdk (>= 2.9.9, < 4)
+ fluentd (>= 0.12.35, < 2)
+ google-protobuf (~> 3)
+ fluent-plugin-mongo (1.1.1)
+ fluentd (>= 0.14.12, < 2)
+ mongo (~> 2.2.0)
+ fluent-plugin-record-reformer (0.9.1)
fluentd
- fluent-plugin-rewrite-tag-filter (1.5.5)
- fluentd
- fluent-plugin-s3 (0.8.0)
- aws-sdk (>= 2.3.22, < 3)
- fluentd (>= 0.10.58, < 2)
+ fluent-plugin-rewrite-tag-filter (2.1.0)
+ fluent-config-regexp-type
+ fluentd (>= 0.14.2, < 2)
+ fluent-plugin-s3 (1.1.3)
+ aws-sdk-s3 (~> 1.0)
+ aws-sdk-sqs (~> 1.0)
+ fluentd (>= 0.14.2, < 2)
fluent-plugin-scribe (0.10.14)
fluentd
thrift (~> 0.8.0)
- fluent-plugin-webhdfs (0.5.2)
- bzip2-ffi
- fluent-mixin-config-placeholders (>= 0.3.0)
- fluent-mixin-plaintextformatter (>= 0.2.1)
- fluentd (>= 0.10.59)
+ fluent-plugin-webhdfs (1.2.3)
+ fluentd (>= 0.14.4)
webhdfs (>= 0.6.0)
- fluentd (0.14.11)
- cool.io (~> 1.4.5)
+ fluentd (1.2.3)
+ cool.io (>= 1.4.5, < 2.0.0)
+ dig_rb (~> 1.0.0)
http_parser.rb (>= 0.5.1, < 0.7.0)
msgpack (>= 0.7.0, < 2.0.0)
serverengine (>= 2.0.4, < 3.0.0)
sigdump (~> 0.2.2)
- strptime (~> 0.1.7)
+ strptime (>= 0.2.2, < 1.0.0)
tzinfo (~> 1.0)
tzinfo-data (~> 1.0)
yajl-ruby (~> 1.0)
+ google-protobuf (3.6.0)
http_parser.rb (0.6.0)
- i18n (0.7.0)
- jmespath (1.3.1)
+ jmespath (1.4.0)
ltsv (0.1.0)
- middleware (0.1.0)
- minitest (5.10.1)
- mongo (1.12.5)
- bson (= 1.12.5)
- msgpack (1.0.2)
- multi_json (1.12.1)
+ mongo (2.2.7)
+ bson (~> 4.0)
+ msgpack (1.2.4)
+ multi_json (1.13.1)
multipart-post (2.0.0)
- os (0.9.6)
- protobuf (3.6.12)
- activesupport (>= 3.2)
- middleware
- thor
- thread_safe
- public_suffix (2.0.5)
- ruby-kafka (0.3.16.beta2)
- serverengine (2.0.4)
+ public_suffix (3.0.2)
+ ruby-kafka (0.6.7)
+ serverengine (2.0.7)
sigdump (~> 0.2.2)
sigdump (0.2.4)
- strptime (0.1.9)
- thor (0.19.4)
- thread_safe (0.3.5)
+ strptime (0.2.3)
+ thread_safe (0.3.6)
thrift (0.8.0)
- tzinfo (1.2.2)
+ tzinfo (1.2.5)
thread_safe (~> 0.1)
- tzinfo-data (1.2016.10)
+ tzinfo-data (1.2018.5)
tzinfo (>= 1.0.0)
- uuidtools (2.1.5)
webhdfs (0.8.0)
addressable
- yajl-ruby (1.3.0)
+ yajl-ruby (1.4.0)
PLATFORMS
ruby
@@ -133,4 +690,4 @@ DEPENDENCIES
fluentd
BUNDLED WITH
- 1.12.5
+ 1.16.2
diff --git a/pkgs/tools/misc/fluentd/gemset.nix b/pkgs/tools/misc/fluentd/gemset.nix
index 1c508e7b58e..8a3c212d055 100644
--- a/pkgs/tools/misc/fluentd/gemset.nix
+++ b/pkgs/tools/misc/fluentd/gemset.nix
@@ -1,205 +1,1510 @@
{
- activesupport = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "08bnl0nr9csjgkgz6xf8dyg7rccinmfrmn235z3bfaz8ihz15d1d";
- type = "gem";
- };
- version = "5.0.1";
- };
addressable = {
+ dependencies = ["public_suffix"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1j5r0anj8m4qlf2psnldip4b8ha2bsscv11lpdgnfh4nnchzjnxw";
+ sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
type = "gem";
};
- version = "2.5.0";
+ version = "2.5.2";
+ };
+ aws-eventstream = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0gdiwkg24jpx5f3bkw6vchgliicn6v9bpm09j0dldaxsca66q0wy";
+ type = "gem";
+ };
+ version = "1.0.1";
+ };
+ aws-partitions = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1gqkj0fq1rlrsfr1s3dgrhz4dikxlkrbrkp0i2013aa3lcsm8hqm";
+ type = "gem";
+ };
+ version = "1.96.0";
};
aws-sdk = {
+ dependencies = ["aws-sdk-resources"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19s7ialas1yrc54g50yfa37z7m8dq4gqbf8dvlfg8qmpdijjxy3l";
+ sha256 = "0z01jdka7akshp524xprqaakpavzjadh0kmwmz8mwk5i1yiakba3";
type = "gem";
};
- version = "2.7.0";
+ version = "3.0.1";
+ };
+ aws-sdk-acm = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0r6m6l8jbnhcvs6xighgcpc8li8pnjr33l34fqgnbxbbkybwnhl0";
+ type = "gem";
+ };
+ version = "1.9.0";
+ };
+ aws-sdk-acmpca = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "13ggvcyijmhdwiw1ym21pxac4hf7wmndy5l5g1mmd2r6mlz08n6b";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ aws-sdk-alexaforbusiness = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1bn1460ga5b1nair735nf8cg4hrgh499kdwn9r75d5mjfd4yxg1s";
+ type = "gem";
+ };
+ version = "1.6.0";
+ };
+ aws-sdk-apigateway = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1v1p15lx6k9iyx226h6w9pp16frhnpl1xxwm1c0q39a5f9k7vyl7";
+ type = "gem";
+ };
+ version = "1.13.0";
+ };
+ aws-sdk-applicationautoscaling = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1sf117qwmw3qdvydr6sn70vm9ygpnr1mgqic2vc1y6s85rzfh4z2";
+ type = "gem";
+ };
+ version = "1.11.0";
+ };
+ aws-sdk-applicationdiscoveryservice = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0n770ra6d2bc23rq66x5rd2ck0c0h0ivgxcdgi7kmvkjrh09fslj";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ aws-sdk-appstream = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "04y4s4pkwvl72a2jzrscki68p6klh9g6vxi86whi4hsg05imj909";
+ type = "gem";
+ };
+ version = "1.13.0";
+ };
+ aws-sdk-appsync = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1kk4r6272fniq5dx50f3k0wz8pjysbvxs26jyvr5af97ayndks1n";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
+ aws-sdk-athena = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1q9igjjw0jc860dns4mh8l1bm0s1q4bpfrzkgczij5vx3rp3jpqv";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-autoscaling = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "15hvj08avacvkkrm60rdv39k58zxaqsigrlfjgfiki7vcrrqm19j";
+ type = "gem";
+ };
+ version = "1.6.0";
+ };
+ aws-sdk-autoscalingplans = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0djk1z0q92cclr0757qvphj63x20a1ygzp3c9w1ycc6b3n7j5a0r";
+ type = "gem";
+ };
+ version = "1.3.0";
+ };
+ aws-sdk-batch = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "18yr41pgl11x1vfc7w4f7n5v8vbhz4vb05q1fckqcwmwrwcqwycn";
+ type = "gem";
+ };
+ version = "1.5.0";
+ };
+ aws-sdk-budgets = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1xdwr9c0wcys9gljl2q0bvrjvlk6q676gsr2159qdh0px1s9f8cd";
+ type = "gem";
+ };
+ version = "1.8.0";
+ };
+ aws-sdk-cloud9 = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0vs7jgg1fjz0kn1772mbk55q5ia8k8045bl38wsh23yz9naf7wrb";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ aws-sdk-clouddirectory = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0zkbqj3nf9pdyzyk9z1xm9qkslghljhwzma10mrpg2wkic8in2zg";
+ type = "gem";
+ };
+ version = "1.5.0";
+ };
+ aws-sdk-cloudformation = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1q75h9nbhkrs3rblc5bdf2v1yamskgjkz5rlzlikpp1x08alll2x";
+ type = "gem";
+ };
+ version = "1.6.0";
+ };
+ aws-sdk-cloudfront = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0wzhhv2hnxy0h3zcbppdzym1zmsgmv6fqkdcdghh5ys9mj4wnq86";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
+ aws-sdk-cloudhsm = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1zjdql9x8cpjikjc6q4g8vmdi1xq27q7vwns8flib9cklbkb615k";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
+ aws-sdk-cloudhsmv2 = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "09pw8dgay7vrmwfjz5dzjrci1q6iqazna36d5vhp3raw4drb5q0c";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ aws-sdk-cloudsearch = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1k702nm5aqxhgyc2gvjx8c5abg2b004apsgwfv6pi4szcbd3c4bq";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-cloudsearchdomain = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0kc6d3dy7vdydwnhzddnfkrrdspsxzc1h91yml6jskr5p6ccc6mb";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-cloudtrail = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "11lj0qw9w7cmxwgfdwvhfx6pfx5dx3b2mcsg0fmy0k8pl18zp4rr";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-cloudwatch = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1xmpmwzra3b5gracca050zs0lrsq28sc34x7qx8c0cr05jlkjjig";
+ type = "gem";
+ };
+ version = "1.6.0";
+ };
+ aws-sdk-cloudwatchevents = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0qr2mlx7w2wb168vldm0ci7z7jf8mjmp73i50048pa6yqsn5jg42";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
+ aws-sdk-cloudwatchlogs = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "16fwk4hxycqq8kkv1asiimr5h5dcrnh22ix9z7vzg6gd3w4cx8yl";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
+ aws-sdk-codebuild = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1x88dg1ygffxlvw9hl9xj7nfvd311vic49sjwrq171ily9drd8dp";
+ type = "gem";
+ };
+ version = "1.12.0";
+ };
+ aws-sdk-codecommit = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "17xch4hwf5i7vvpq3mi6hg120jdjxw9qplhi7d48ch20w5w2nn3k";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
+ aws-sdk-codedeploy = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "18qpmbaqwnbw91hbm64fixn4dba35fhr7x770lvly885i8srbv44";
+ type = "gem";
+ };
+ version = "1.6.0";
+ };
+ aws-sdk-codepipeline = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1n0v9ml7bfdr30py24ab7jhh35ni17m2c7rr16d55sp14j6583ax";
+ type = "gem";
+ };
+ version = "1.5.0";
+ };
+ aws-sdk-codestar = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0dd3l6igidddxy4flw3wry0mv2lr559vvfafjwna7ilj3v311dz2";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ aws-sdk-cognitoidentity = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "014b9d7iai5sinjfs2qar3wwnhhb3cd35867jiwkqwhyga30r70p";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-cognitoidentityprovider = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0jlk4ysr1lbn94p16p7z0hr0m7pr47447g632fd0ss1hw7ap4csw";
+ type = "gem";
+ };
+ version = "1.5.0";
+ };
+ aws-sdk-cognitosync = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1d5fxq99sfwv4c7jgx65yrhxp9qg524bd8bsfamhakn0rlwi4iny";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-comprehend = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0l50mvlrarqhb7d469czi3p7rimjwzcwp52bhklxbx6lmv3il23p";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ aws-sdk-configservice = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "11lzxili2c17m6h8y6ngl7z7h0rf7jwwaim4dq2pdf2qi2k5mh70";
+ type = "gem";
+ };
+ version = "1.12.0";
+ };
+ aws-sdk-connect = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "15xz6v48y4nn1yrr2n8d2w0z7g52cqyjrkjxyhgdv6967yby4qw2";
+ type = "gem";
+ };
+ version = "1.1.0";
};
aws-sdk-core = {
+ dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0a9sgff43s3zhpcmisk1bp6vvlpawa617svfhz84xwa6lmik9sp4";
+ sha256 = "1dhii8d1ra9rbh3n0v5s2p4dg5mrwj44sl0mfcan40s1crcrm3m8";
type = "gem";
};
- version = "2.7.0";
+ version = "3.22.1";
+ };
+ aws-sdk-costandusagereportservice = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "04sady26xlvkrmym4bmdbkc1d472kjlxsgr9awa205ih0bxsaffn";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-costexplorer = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ddd92nny926ipzgmr2gg9qh64iv96cd35zwsbwn7ns8mnndxa4q";
+ type = "gem";
+ };
+ version = "1.7.0";
+ };
+ aws-sdk-databasemigrationservice = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0slj051gw3mr155cwmj67d95wywq4v14ri6xhnkfx07sqp4i8z9a";
+ type = "gem";
+ };
+ version = "1.7.0";
+ };
+ aws-sdk-datapipeline = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0r2jnvbcbqkg5k42ly1x2w4g97rl4km1m3bwjvwl7q8c9fbrzpby";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-dax = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0m6l7p2g667c54jxbdpb1zkin5damiq3x34aw5b3b88wk9nm8pfy";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-devicefarm = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "02bzffmwrbw5irg94iki16ybg0wb926vsfvd4ziv890fc8n239ya";
+ type = "gem";
+ };
+ version = "1.7.0";
+ };
+ aws-sdk-directconnect = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "03jshg8ax2cww8zvf2lvf542xllgpv38i2iqnv79y62s9a26g4l5";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ aws-sdk-directoryservice = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0mmjxk34gids533s2x1ay4s9zzrvad16djf1m6xib6ys9bja1x27";
+ type = "gem";
+ };
+ version = "1.3.0";
+ };
+ aws-sdk-dlm = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0j6r629wqg08zr9ndisy3d27hqj32kimlrfkigw276mnx2v507cn";
+ type = "gem";
+ };
+ version = "1.0.0";
+ };
+ aws-sdk-dynamodb = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0id29l91wpd9az9axsfmiqdwlh0qx4m1ci7fwzxm7ac6yjq4p7gr";
+ type = "gem";
+ };
+ version = "1.8.0";
+ };
+ aws-sdk-dynamodbstreams = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "03b2wrkxp9cpr0akxqgn5hss9l2yzqa7kl9j0isyh968rbdzaxla";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-ec2 = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "17144h9892pf8hn5c5lnid47q2dilyb5hxzf8pj7z3pkra5yn5aw";
+ type = "gem";
+ };
+ version = "1.38.0";
+ };
+ aws-sdk-ecr = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "01x7m60sqfdkfiif1fxknl9p97076ndwr71s5aixq688plf7zybf";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
+ aws-sdk-ecs = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "16czi8zgy8s1p0skcxwr4lcbfwp0g9c8ppbd3ymjchm75rdrg47g";
+ type = "gem";
+ };
+ version = "1.15.0";
+ };
+ aws-sdk-efs = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0fi1a99fh62ma1xy4axh5cpach3fclajd30jp8kig9bxyaspsf2c";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ aws-sdk-eks = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1sgyja0kdj68vcqzmckxmik7ibp4rmyiw8vl6zyp3ihkqpvwf5ns";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-elasticache = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0wy4w8gcdnn4ckyc0aa9p293fnwlv8ihyvmxflzjkigallxa23vc";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
+ aws-sdk-elasticbeanstalk = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "10f9lg288m74ssm24m7mhphi4h6km84pak0bpg7gd4rnrw4fdw1f";
+ type = "gem";
+ };
+ version = "1.8.0";
+ };
+ aws-sdk-elasticloadbalancing = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1dz9gx4c83s1qb03kqng5vh9kjihi0jv02j3ndp2z5z10cpncf3p";
+ type = "gem";
+ };
+ version = "1.3.0";
+ };
+ aws-sdk-elasticloadbalancingv2 = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1qs1gjjnvhx1ijm7mr5aa0cv7sanvm81l8kpx1y57zrpa5ikp3r7";
+ type = "gem";
+ };
+ version = "1.11.0";
+ };
+ aws-sdk-elasticsearchservice = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0zhylvqwln0vz5qhd1vj89s7fwdk330wksp206dphscmqjra0ggz";
+ type = "gem";
+ };
+ version = "1.6.0";
+ };
+ aws-sdk-elastictranscoder = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1r9waa8jksznqwvlrapf71j8ga6cjm9j6qjrssqps083kxg0sad1";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-emr = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0mkb4302iczxmn7al36f151xvjnf8v0r559p4wn6jginvgwxk48n";
+ type = "gem";
+ };
+ version = "1.3.0";
+ };
+ aws-sdk-firehose = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0yc2kvnf0hdlpfh3i51m44775vws3k84wvlhnvj68nm5jszhhx7b";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
+ aws-sdk-fms = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1lqh6pxg3ki2k539xm99p63fai8grswpkyd5nj8dl4pwsqn4xx57";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-gamelift = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0wfyq9m0dv9isdriin285daj5b90bbkrk5b0ss0awhcqwarlj29i";
+ type = "gem";
+ };
+ version = "1.5.0";
+ };
+ aws-sdk-glacier = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0vlg62v7zraz5f7h13wws9cga4sdv62v6lsfkqn2ai6n1ks80c02";
+ type = "gem";
+ };
+ version = "1.8.0";
+ };
+ aws-sdk-glue = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1rlq8hchn6dkccwdrd27lizfghmgf4lcrdcblhs14sxmwk0jzl25";
+ type = "gem";
+ };
+ version = "1.10.0";
+ };
+ aws-sdk-greengrass = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "05cjp6jvcnzg3jxwcggg31l0sqb743b6x66230nb5ahf7l8sq4fx";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
+ aws-sdk-guardduty = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0l2fbhm1d5mgkvrz8jgny2zcd4zzijwy8s4f4p91kn22m1s74cg4";
+ type = "gem";
+ };
+ version = "1.5.0";
+ };
+ aws-sdk-health = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0b3zgjwh2drkxcbmglw9vz9b8wir0qwxihf2yrra33qhcxvlf29q";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-iam = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1wch93pvh5y16ldn1b42igrj0q76j7mfwvkwqnlk8197wpmyzl8z";
+ type = "gem";
+ };
+ version = "1.6.0";
+ };
+ aws-sdk-importexport = {
+ dependencies = ["aws-sdk-core" "aws-sigv2"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0clry5ch04npyrgz61xrwwj6kwqai5d9c933rd17jx0r7dm2x5zb";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-inspector = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0blgc82naibxdv5zv7brc8kdp4mnqimxc3lsb2fahn9av4bdh4zf";
+ type = "gem";
+ };
+ version = "1.5.0";
+ };
+ aws-sdk-iot = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "00paa2lhahcfk1kk8zka7zb3hnia1qj6i8rv5ybapgdq9rj4936q";
+ type = "gem";
+ };
+ version = "1.9.0";
+ };
+ aws-sdk-iot1clickdevicesservice = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0k1if31wsy3dpk4mhwc6s86432g8jbbb1w4gpj85qlydrk2c7y96";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-iot1clickprojects = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "12r1pkzixj2g0i9mz7ywsr5qlz19868d8qb4www4s45h6qjwxwnz";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-iotanalytics = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0a69cv9nypykg6il99znymfm09da4hlh3d6i13kj8gma5q7prnq6";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ aws-sdk-iotdataplane = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0777k6l8phrby6ar5zpbhsp4i77d8bfs5z57axn6ir1q4dalgza5";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-iotjobsdataplane = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "05awqr95nlral8f8il5n27swri3vq9y60mhqz9qmhld8w3cwwspj";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-kinesis = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1kw8ksdy6mylrzdswvxxdjb8wim9agdgxpjp3a1aqa72nlswq3nx";
+ type = "gem";
+ };
+ version = "1.3.0";
+ };
+ aws-sdk-kinesisanalytics = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1krdg2qvm2if5npbpw4bk2i1kz51bknfy1j5gaiiym1mmrz7lrap";
+ type = "gem";
+ };
+ version = "1.3.0";
+ };
+ aws-sdk-kinesisvideo = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1299hi3296i3wjmy8cjzpy10bzpljb638yrbyash39y3znaxk2i8";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ aws-sdk-kinesisvideoarchivedmedia = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "17sap4wdpi6l6h8yfm9yzjniv4cps5q3wrhdjp6slwrmhrmq2gpx";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ aws-sdk-kinesisvideomedia = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0rzwpjnym78i5g6427w7war436qnl77qjaiwwh5avrvy12lfjyrb";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-kms = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1y41nf5p94r2mrmpxx2icylz7g1jm72d1awwpjfrw5zlxbzi8jgj";
+ type = "gem";
+ };
+ version = "1.6.0";
+ };
+ aws-sdk-lambda = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0ng2k320s81d5v1g2ihjvkmspnyfkcb9v2fc25mszwg9gwq4mhz1";
+ type = "gem";
+ };
+ version = "1.8.0";
+ };
+ aws-sdk-lambdapreview = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ys1zpc7jmzn4vs01z5qw7rkg4732fbzpiwj5p0gpgy151hip110";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-lex = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1g67akcqmv1i1k4a370vwnb1qkmfl7smfllbw84kd062h8m1h2vl";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
+ aws-sdk-lexmodelbuildingservice = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0awdfirdc2wn4xaqxkizlxy604gwna55mn261fjwj6a3jp83pb1z";
+ type = "gem";
+ };
+ version = "1.6.0";
+ };
+ aws-sdk-lightsail = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0gxs8b3grk4dwsldszvkz31w3lypdnyqhqs1c3w7f18b66p5l714";
+ type = "gem";
+ };
+ version = "1.5.0";
+ };
+ aws-sdk-machinelearning = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1rf84hxrqgzpmr08h14p1070x8cs3x5gxn48l1ia1bdlfjvllv2f";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-macie = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0l20rk8r0k6n81vfy132l5xbaxr4h58ykvyhka0xrb2fys5kr704";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-marketplacecommerceanalytics = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0mcbk1gwqpfxg9wrf1vd9c4s97d46p425yx4m7fx6z73fb26ckp3";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-marketplaceentitlementservice = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "17r2c9ir63wbhpl4kz3pwkavjqvi73jpx3vpbm8172zqai72m2qw";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-marketplacemetering = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "05snignv3fjdfpjw771daxkkm7hlc7wbsi43ajjwvrxzl8apgkl1";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-mediaconvert = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0hdliqi7rxhp02rnnnvrkg1pn5rbss577f5di4h1pbcmw29zqa2p";
+ type = "gem";
+ };
+ version = "1.5.0";
+ };
+ aws-sdk-medialive = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "03pr959i5lnsdw4vagdhfcjfrm01h055j83abs9w2gs4asmknyi9";
+ type = "gem";
+ };
+ version = "1.8.0";
+ };
+ aws-sdk-mediapackage = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "190ca52xzdgnfn73qwv4kc2jix2a3s7gxx6a2nij47ak5bs8qhhn";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ aws-sdk-mediastore = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1m7xjz0xpnwvsm35m2wnp9ja8sqhk5w09jf92frim482vyddk46n";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ aws-sdk-mediastoredata = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1da6wd4nrf99mxyv9fay4bbk3n64swzr8989dfjipqa8rpnry9dq";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ aws-sdk-mediatailor = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1rm8f2ln263mabj5ia880h8464pxqg7cp1b1dy6mggbj77v4qyw7";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ aws-sdk-migrationhub = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1vaswa6f4hd7gf5y2rn6jn4rxx4i3dhyngb6446llwc218qqcp5x";
+ type = "gem";
+ };
+ version = "1.3.0";
+ };
+ aws-sdk-mobile = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1kvx23q0dcf4kznf72fq6vrz2wzprim1n87a7jwwvqp1cm8dkh9s";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-mq = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1h258myrx75zvicpdb06bbls4d0fnpfqfp16yc0j5lmqdr6p74qn";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-mturk = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0kb5ii2lqiq8va1plyrna0zczgc9p2dgv0a17xx9pzfg2djvc7vz";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
+ aws-sdk-neptune = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1rddn8y1cwnj5zahvln643sfb4ayddqmydrxibf5j1nqsvv46lg7";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ aws-sdk-opsworks = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1mkjf0694daikkqsqygq1f34zw4wiwg57p8vxlwx5fxjbgwfi01a";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
+ aws-sdk-opsworkscm = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "06067wx6ihk9kj11789dlzag3j2b7zxk9yil4zxy0gv95w37ypzg";
+ type = "gem";
+ };
+ version = "1.3.0";
+ };
+ aws-sdk-organizations = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1jhll8rgp78pwsd5wgfg4nwxkyzahlh0xrnddw3cx9qhzcb001xn";
+ type = "gem";
+ };
+ version = "1.10.0";
+ };
+ aws-sdk-pi = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xm7d9ssn4q2107gp90qsi8vjg87wdl5py55qq76m79xmp2i08wi";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-pinpoint = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "023yvhr6xdisyyx9p104hyaq2vy9rs0n43h2dc5nbm58a1bm2zsn";
+ type = "gem";
+ };
+ version = "1.6.0";
+ };
+ aws-sdk-polly = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0g98zchw6ycnz3anvpc6glxj9kal71mn78gr2i37awb6z0j3mk1g";
+ type = "gem";
+ };
+ version = "1.6.0";
+ };
+ aws-sdk-pricing = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1hm8m1jhf6qfpy1866ykvvnc51mfbp89mfby6z6yxy00fz6mvax5";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-rds = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "009ns5wfcrxan5hhzsj7gpcwnni2ydq79mk2i3lj4gw87k9kr9zx";
+ type = "gem";
+ };
+ version = "1.23.0";
+ };
+ aws-sdk-redshift = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0rp9zm846rx9vm2qvh238gzixbb7r58xbrrfk0ipsrw6v19b4my4";
+ type = "gem";
+ };
+ version = "1.5.0";
+ };
+ aws-sdk-rekognition = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1j399i23anlj252rwnj3dcm66787nspfj8hyazfsgb5ww7b2day3";
+ type = "gem";
+ };
+ version = "1.5.0";
+ };
+ aws-sdk-resourcegroups = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0f878grncnyxlkml525apx3l28mmq96gfi5vpcjhcw9apz58qclf";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-resourcegroupstaggingapi = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0wr75f1gi449x12hai1yjzrlw6cql3z4jyc1hd68wppyf6f1s8kw";
+ type = "gem";
+ };
+ version = "1.1.0";
};
aws-sdk-resources = {
+ dependencies = ["aws-sdk-acm" "aws-sdk-acmpca" "aws-sdk-alexaforbusiness" "aws-sdk-apigateway" "aws-sdk-applicationautoscaling" "aws-sdk-applicationdiscoveryservice" "aws-sdk-appstream" "aws-sdk-appsync" "aws-sdk-athena" "aws-sdk-autoscaling" "aws-sdk-autoscalingplans" "aws-sdk-batch" "aws-sdk-budgets" "aws-sdk-cloud9" "aws-sdk-clouddirectory" "aws-sdk-cloudformation" "aws-sdk-cloudfront" "aws-sdk-cloudhsm" "aws-sdk-cloudhsmv2" "aws-sdk-cloudsearch" "aws-sdk-cloudsearchdomain" "aws-sdk-cloudtrail" "aws-sdk-cloudwatch" "aws-sdk-cloudwatchevents" "aws-sdk-cloudwatchlogs" "aws-sdk-codebuild" "aws-sdk-codecommit" "aws-sdk-codedeploy" "aws-sdk-codepipeline" "aws-sdk-codestar" "aws-sdk-cognitoidentity" "aws-sdk-cognitoidentityprovider" "aws-sdk-cognitosync" "aws-sdk-comprehend" "aws-sdk-configservice" "aws-sdk-connect" "aws-sdk-costandusagereportservice" "aws-sdk-costexplorer" "aws-sdk-databasemigrationservice" "aws-sdk-datapipeline" "aws-sdk-dax" "aws-sdk-devicefarm" "aws-sdk-directconnect" "aws-sdk-directoryservice" "aws-sdk-dlm" "aws-sdk-dynamodb" "aws-sdk-dynamodbstreams" "aws-sdk-ec2" "aws-sdk-ecr" "aws-sdk-ecs" "aws-sdk-efs" "aws-sdk-eks" "aws-sdk-elasticache" "aws-sdk-elasticbeanstalk" "aws-sdk-elasticloadbalancing" "aws-sdk-elasticloadbalancingv2" "aws-sdk-elasticsearchservice" "aws-sdk-elastictranscoder" "aws-sdk-emr" "aws-sdk-firehose" "aws-sdk-fms" "aws-sdk-gamelift" "aws-sdk-glacier" "aws-sdk-glue" "aws-sdk-greengrass" "aws-sdk-guardduty" "aws-sdk-health" "aws-sdk-iam" "aws-sdk-importexport" "aws-sdk-inspector" "aws-sdk-iot" "aws-sdk-iot1clickdevicesservice" "aws-sdk-iot1clickprojects" "aws-sdk-iotanalytics" "aws-sdk-iotdataplane" "aws-sdk-iotjobsdataplane" "aws-sdk-kinesis" "aws-sdk-kinesisanalytics" "aws-sdk-kinesisvideo" "aws-sdk-kinesisvideoarchivedmedia" "aws-sdk-kinesisvideomedia" "aws-sdk-kms" "aws-sdk-lambda" "aws-sdk-lambdapreview" "aws-sdk-lex" "aws-sdk-lexmodelbuildingservice" "aws-sdk-lightsail" "aws-sdk-machinelearning" "aws-sdk-macie" "aws-sdk-marketplacecommerceanalytics" "aws-sdk-marketplaceentitlementservice" "aws-sdk-marketplacemetering" "aws-sdk-mediaconvert" "aws-sdk-medialive" "aws-sdk-mediapackage" "aws-sdk-mediastore" "aws-sdk-mediastoredata" "aws-sdk-mediatailor" "aws-sdk-migrationhub" "aws-sdk-mobile" "aws-sdk-mq" "aws-sdk-mturk" "aws-sdk-neptune" "aws-sdk-opsworks" "aws-sdk-opsworkscm" "aws-sdk-organizations" "aws-sdk-pi" "aws-sdk-pinpoint" "aws-sdk-polly" "aws-sdk-pricing" "aws-sdk-rds" "aws-sdk-redshift" "aws-sdk-rekognition" "aws-sdk-resourcegroups" "aws-sdk-resourcegroupstaggingapi" "aws-sdk-route53" "aws-sdk-route53domains" "aws-sdk-s3" "aws-sdk-sagemaker" "aws-sdk-sagemakerruntime" "aws-sdk-secretsmanager" "aws-sdk-serverlessapplicationrepository" "aws-sdk-servicecatalog" "aws-sdk-servicediscovery" "aws-sdk-ses" "aws-sdk-shield" "aws-sdk-simpledb" "aws-sdk-sms" "aws-sdk-snowball" "aws-sdk-sns" "aws-sdk-sqs" "aws-sdk-ssm" "aws-sdk-states" "aws-sdk-storagegateway" "aws-sdk-support" "aws-sdk-swf" "aws-sdk-transcribeservice" "aws-sdk-translate" "aws-sdk-waf" "aws-sdk-wafregional" "aws-sdk-workdocs" "aws-sdk-workmail" "aws-sdk-workspaces" "aws-sdk-xray"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1b5z25n4bgzwkzmzx2q6ik2y74jinyphmrh38lnrn9im6pmmvy3w";
+ sha256 = "15z91flcf5daz7v5sfrib5sxm4gk6w66jlh93is0ixr6hwanqb2h";
type = "gem";
};
- version = "2.7.0";
+ version = "3.22.0";
+ };
+ aws-sdk-route53 = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ga3rd1b3fgg8z46490gjkf2a7j1vys7mf3wi4qmwg8ijs8gva4c";
+ type = "gem";
+ };
+ version = "1.10.1";
+ };
+ aws-sdk-route53domains = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "02nzhks6kjpdakm3xcc5373g3dnn45a9gr70vc8jhdjyarhcasbk";
+ type = "gem";
+ };
+ version = "1.3.0";
+ };
+ aws-sdk-s3 = {
+ dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0sxd6iwyg54qdzqxqhww1qnhg4z1il1impkg2g8ksgr9q2ykf4jd";
+ type = "gem";
+ };
+ version = "1.17.0";
+ };
+ aws-sdk-sagemaker = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "11arjp9mcgy3b8rp6dpdla0zcsrv40sw7cc0azplayk5n6cislx1";
+ type = "gem";
+ };
+ version = "1.11.0";
+ };
+ aws-sdk-sagemakerruntime = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1zyinypfjsf7kp6dh7wbk3f5x3qhj8p76pv332pknrgk94v6rn3i";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-secretsmanager = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1b5xk5icz664rjjcy9ijwfg4nr1chg0pbxyrmzy0agh88vxgp71z";
+ type = "gem";
+ };
+ version = "1.10.0";
+ };
+ aws-sdk-serverlessapplicationrepository = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1n7lzzvpyryv1v3pai3yxk2w95zk2yglmdh0k3h84n6z3w6jlgr3";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
+ aws-sdk-servicecatalog = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "13dhxxp1nmzs71ripdi4yas1wm17w3ks22by6qlbnqy9zwb0r6jg";
+ type = "gem";
+ };
+ version = "1.6.0";
+ };
+ aws-sdk-servicediscovery = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "033fynzwr4j6idlk3p5rqk94n0ayxrwjcziky5hnfj2aic2yj3lf";
+ type = "gem";
+ };
+ version = "1.3.0";
+ };
+ aws-sdk-ses = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0aa3vq1lscb5cmcc10s38pdw2crdsfjd4gpb6d9j5d5z8wbpqjhz";
+ type = "gem";
+ };
+ version = "1.8.0";
+ };
+ aws-sdk-shield = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "12imklik3j9l4fchyj4q6wpiw27kkm4m29accjwkxxikh70w9q0l";
+ type = "gem";
+ };
+ version = "1.3.0";
+ };
+ aws-sdk-simpledb = {
+ dependencies = ["aws-sdk-core" "aws-sigv2"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "16qrczxn096aanan2qrvbbk398sqlfiawviz72z9y31pxds7699d";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-sms = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1d16b5s6x894fagk6mzvli4n9rpsv4gx1xw445nl49jc8z3b941l";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-snowball = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "17kk7n83zbhms7bvavlasw13ydsiqzm8l2p6dpsa3cjqvs7bn9bw";
+ type = "gem";
+ };
+ version = "1.3.0";
+ };
+ aws-sdk-sns = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0pkv99yqilpklrhwhxr5lv0xma1irk0j7q5myw220yl84d7c6m04";
+ type = "gem";
+ };
+ version = "1.3.0";
+ };
+ aws-sdk-sqs = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0m4lk45bfanxyq3rz428az2bbz2g3xbzq40754d81m0b17kyz6nc";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
+ aws-sdk-ssm = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0w5idgdqp3z9s0cf84r66ha1npjhszp0zd3w43rlp96m1z9m8pk8";
+ type = "gem";
+ };
+ version = "1.18.0";
+ };
+ aws-sdk-states = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0sg5z9mgn76l81zgigxrxwnn710gigp6iragc3gvz0cdfwwzd33f";
+ type = "gem";
+ };
+ version = "1.3.0";
+ };
+ aws-sdk-storagegateway = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "078j56x8jllk5dsb8crk33336kmcgs83p2achlw5j10mlfzlra6z";
+ type = "gem";
+ };
+ version = "1.6.0";
+ };
+ aws-sdk-support = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0bg642zz7nn3dfr039pgry44js9jlr31yq47rsqzhl6p3qh9yisi";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-swf = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "108gzaw0y83vncbv6rzaww4950cycwh8crcw3vf2av6w0mbqi61f";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-sdk-transcribeservice = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1z66aqfh1s561wa9dqasvbb4shxb2chp12i8h6hs6lxsrpihxbi0";
+ type = "gem";
+ };
+ version = "1.3.0";
+ };
+ aws-sdk-translate = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "17wprz7c8h8bfi1pv8pw2jll4iaixs9v2zd6iyy33zy0ssyzp9jc";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ aws-sdk-waf = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1kxaspfpgsrwm1vdyqhbjw1l40z5ygkx9if5lfqh80906rns9gwz";
+ type = "gem";
+ };
+ version = "1.5.0";
+ };
+ aws-sdk-wafregional = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ryrx7zh7dmxzrvky3kx6dvz22v0s919jkdhqh8rx65p97ikml2c";
+ type = "gem";
+ };
+ version = "1.5.0";
+ };
+ aws-sdk-workdocs = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "07grgjkzg31n3k0ig70gj6pjix44jwnl54lw4pn4yqld3472r296";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ aws-sdk-workmail = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "04yak9s80kcx0vnz9ghbis5qj274rpkwga2391kky8r2gf40lpn2";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ aws-sdk-workspaces = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1vq0bayq1ryzd9z4y70w39h1ag2jj6k59bv72agdafrszv13fggf";
+ type = "gem";
+ };
+ version = "1.3.0";
+ };
+ aws-sdk-xray = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "00n7nrx5qfbcv94hdlh623nhv269z9abfkb6mj5dmjw4hzpm8d31";
+ type = "gem";
+ };
+ version = "1.3.0";
+ };
+ aws-sigv2 = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1191i9c0kkiyfs3vfwgfxc8kq19rg1q4lkackz56yffv05yp5ng3";
+ type = "gem";
+ };
+ version = "1.0.1";
};
aws-sigv4 = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0cnrfxbaxn86qrxhfidg10f89ka1hddihakdhcvnri0dljaw7dsz";
+ sha256 = "1hzndv113i6bgy2n72i5l3mwn8vjnb6hhjxfkpn9mm2p5ra77yk7";
type = "gem";
};
- version = "1.0.0";
+ version = "1.0.3";
};
bson = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12zcsfr72hr0w1qyxv1iz587nzganpclvimyx5y02gg1hij8hz6b";
+ sha256 = "07baxjrd8rb5gfsv7hh1akjqcpwih76f1711bwjzp228c79ny2na";
type = "gem";
};
- version = "1.12.5";
- };
- bzip2-ffi = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1y5jlcz1vb0v3rbmsbbrarfglcmzdhr5jhlfc5wjnhz2zpybsz3y";
- type = "gem";
- };
- version = "1.0.0";
- };
- concurrent-ruby = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0p7ji1h1l407kci9w4b4yspzd58ssmlx7p91npx55kw08836dlpb";
- type = "gem";
- };
- version = "1.0.4";
+ version = "4.3.0";
};
"cool.io" = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1x5fkyjdjwk68sg7fwxhx2k3hzxkkm6frnd2yix7brxdh06fp0k1";
+ sha256 = "03wwgs427nmic6aa365d7kyfbljpb1ra6syywffxfmz9382xswcp";
type = "gem";
};
- version = "1.4.5";
+ version = "1.5.3";
+ };
+ dig_rb = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "12dbb1pl2vr9z7yy2zsbsjaj4hw89y56wll6kd8422mylmcw7bx4";
+ type = "gem";
+ };
+ version = "1.0.1";
};
elasticsearch = {
+ dependencies = ["elasticsearch-api" "elasticsearch-transport"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1wdy17i56b4m7akp7yavnr8vhfhyz720waphmixq05dj21b11hl0";
+ sha256 = "162a7aiajs7w3rak21y6jidik7zhkm104wcx25190llyqbqkvlp9";
type = "gem";
};
- version = "1.0.18";
+ version = "6.1.0";
};
elasticsearch-api = {
+ dependencies = ["multi_json"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1v6nb3ajz5rack3p4b4nz37hs0zb9x738h2ms8cc4plp6wqh1w5s";
+ sha256 = "0q9shhpifl6cir68zxv30mjjybxsx39asqnircrgs4lqsb20j1n7";
type = "gem";
};
- version = "1.0.18";
+ version = "6.1.0";
};
elasticsearch-transport = {
+ dependencies = ["faraday" "multi_json"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0smfrz8nq49hgf67y5ayxa9i4rmmi0q4m51l0h499ykq4cvcwv6i";
+ sha256 = "1dmb587mp526q1wvb1j13rjj13vxl4fcpmm899ipyr88spld5vc7";
type = "gem";
};
- version = "1.0.18";
+ version = "6.1.0";
};
excon = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0j4b6s90v84r4wrhbg4rzjfjg9sfisq50fjd3hh9p6yrkm86wbd3";
+ sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2";
type = "gem";
};
- version = "0.54.0";
+ version = "0.62.0";
};
faraday = {
+ dependencies = ["multipart-post"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "18p1csdivgwmshfw3mb698a3bn0yrykg30khk5qxjf6n168g91jr";
+ sha256 = "14lg0c4bphk16rccc5jmaan6nfcvmy0caiahpc61f9zfwpsj7ymg";
type = "gem";
};
- version = "0.11.0";
+ version = "0.15.2";
};
- ffi = {
+ fluent-config-regexp-type = {
+ dependencies = ["fluentd"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07hnyr47mndsjfanzh348wm3fxjx9nx68mdb3cpsdvfqrxnz97s7";
+ sha256 = "0hk0vxcmlbid7n6piyv3x83j5gyiz7in397l9x3c6nh69wicy7gm";
type = "gem";
};
- version = "1.9.17";
- };
- fluent-mixin-config-placeholders = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "14b4lqy91jgpky6g7h0vyfy2rr1qavmjzzgnmhwajfzxgw9y2jvi";
- type = "gem";
- };
- version = "0.4.0";
- };
- fluent-mixin-plaintextformatter = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0gliangfr07060ya9sawkyfx2vz7vdygys65f83czawhckvvm75n";
- type = "gem";
- };
- version = "0.2.6";
+ version = "1.0.0";
};
fluent-plugin-elasticsearch = {
+ dependencies = ["elasticsearch" "excon" "fluentd"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0q0v8jxpwrkh1z5qh0chwrssz93nldka4jwfn32hlqhnmb99q8i1";
+ sha256 = "1jh7wpj46753mii98ddafl5yas0iw8dc1b87lzgdyfri9z8cbfv1";
type = "gem";
};
- version = "1.9.2";
+ version = "2.11.1";
};
fluent-plugin-kafka = {
+ dependencies = ["fluentd" "ltsv" "ruby-kafka"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0sd025xsl1cnjs11wasg0di2k02rx9ifaj49n28ak363df6vsqgf";
+ sha256 = "16r7ydlnb1ba7adk3f95v3x1qjk22cifd9bvz71099m17njw56g1";
type = "gem";
};
- version = "0.5.0";
+ version = "0.7.4";
};
fluent-plugin-kinesis = {
+ dependencies = ["aws-sdk" "fluentd" "google-protobuf"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "119ngswi9q0p5hh5ldan9pzrgd1lfsbkr5f56hy1k4gfss4kmq27";
+ sha256 = "14hsvbskfviq11408qglqx1434hv6i7qbgqy8nnii8a657fccvxy";
type = "gem";
};
- version = "1.1.2";
+ version = "2.1.1";
};
fluent-plugin-mongo = {
+ dependencies = ["fluentd" "mongo"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1x7n8cknqh956yx3c9hv2g535x4kcixmnxw3fvcspjbqprrd1s91";
+ sha256 = "1w7fla5172x7bll10zja0sg4n0gzkqa191jf6zradhb6416qd355";
type = "gem";
};
- version = "0.7.16";
+ version = "1.1.1";
};
fluent-plugin-record-reformer = {
+ dependencies = ["fluentd"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1q2pws1mqp6pkb00ix6wjkxklckqb4wcbp79lpyk0b644bk9hqzb";
+ sha256 = "1gwfrfyi9is4l9q4ih3c4l3c9qvyh00jnd2qajdpdh5xjj2m7akn";
type = "gem";
};
- version = "0.8.2";
+ version = "0.9.1";
};
fluent-plugin-rewrite-tag-filter = {
+ dependencies = ["fluent-config-regexp-type" "fluentd"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1avxvvmfm7bl7fpa2p73295kydh1nbsgdvsr7bsyrb77z1s1m86z";
+ sha256 = "1xra33l2pid84qmgr0ni9dmd114l035z9j4g66wdfyihncnaaamp";
type = "gem";
};
- version = "1.5.5";
+ version = "2.1.0";
};
fluent-plugin-s3 = {
+ dependencies = ["aws-sdk-s3" "aws-sdk-sqs" "fluentd"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nxvk5n76pw4r37lv8vfl1cd0yjxnlj5wlwyk8f1lvp9ma5zlzmg";
+ sha256 = "102d85igcnnlha8j0vw3pvc0425d38c9r0pryqhz7v1j4p2igi27";
type = "gem";
};
- version = "0.8.0";
+ version = "1.1.3";
};
fluent-plugin-scribe = {
+ dependencies = ["fluentd" "thrift"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00m19w7p22adq0yx1h7h2h4ckw9kh5j458a8lawgmbazw2dz0zxi";
@@ -208,20 +1513,30 @@
version = "0.10.14";
};
fluent-plugin-webhdfs = {
+ dependencies = ["fluentd" "webhdfs"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0kb9cgrgvh61pqqzv2csnibmp2jwh4hyjyvrh2npkk59k3jp54ad";
+ sha256 = "1yyv3f0g30x9dzhq74b5cq8z0wbyppw9bb6152v6yrwz25b16231";
type = "gem";
};
- version = "0.5.2";
+ version = "1.2.3";
};
fluentd = {
+ dependencies = ["cool.io" "dig_rb" "http_parser.rb" "msgpack" "serverengine" "sigdump" "strptime" "tzinfo" "tzinfo-data" "yajl-ruby"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0w1bg3nrn6gwhyp8xlpbs9rcajkddnvw6jhn7kvzydp70g2aydhz";
+ sha256 = "02a7xzpq3vs3lgwawygbkzbsjr2p46945l6wc3bkvws47v33yr4d";
type = "gem";
};
- version = "0.14.11";
+ version = "1.2.3";
+ };
+ google-protobuf = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "10r48i7g0387sd8a1cl8n2da54ar9nw29jshmydwmdrb8y5v5nic";
+ type = "gem";
+ };
+ version = "3.6.0";
};
"http_parser.rb" = {
source = {
@@ -230,21 +1545,13 @@
};
version = "0.6.0";
};
- i18n = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758";
- type = "gem";
- };
- version = "0.7.0";
- };
jmespath = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07w8ipjg59qavijq59hl82zs74jf3jsp7vxl9q3a2d0wpv5akz3y";
+ sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf";
type = "gem";
};
- version = "1.3.1";
+ version = "1.4.0";
};
ltsv = {
source = {
@@ -254,45 +1561,30 @@
};
version = "0.1.0";
};
- middleware = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0703nkf2v371wqr41c04x5qid7ww45cxqv3hnlg07if3b3xrm9xl";
- type = "gem";
- };
- version = "0.1.0";
- };
- minitest = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1yk2m8sp0p5m1niawa3ncg157a4i0594cg7z91rzjxv963rzrwab";
- type = "gem";
- };
- version = "5.10.1";
- };
mongo = {
+ dependencies = ["bson"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0658pn2hbyfvbnpp3wdh3irin0wpikm6y2qbhnx07w54jbkmgh5p";
+ sha256 = "0qdy2prwr9hv9691xxl0zqgp1s24jm6pknd2vq829yy6a1fv8f87";
type = "gem";
};
- version = "1.12.5";
+ version = "2.2.7";
};
msgpack = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1fb2my91j08plsbbry5kilsrh7slmzgbbf6f55zy6xk28p9036lg";
+ sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864";
type = "gem";
};
- version = "1.0.2";
+ version = "1.2.4";
};
multi_json = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk";
+ sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
type = "gem";
};
- version = "1.12.1";
+ version = "1.13.1";
};
multipart-post = {
source = {
@@ -301,45 +1593,30 @@
};
version = "2.0.0";
};
- os = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz";
- type = "gem";
- };
- version = "0.9.6";
- };
- protobuf = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0cvkfp7574dr6wqpgafl3pg9niqfri3dh2fxb2f8qaapcgfgcaq6";
- type = "gem";
- };
- version = "3.6.12";
- };
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q";
+ sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
type = "gem";
};
- version = "2.0.5";
+ version = "3.0.2";
};
ruby-kafka = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "112avql9nf0hq07zvh47fyx7na721bj4zfpf43ip471l6k2ksrf5";
+ sha256 = "1k9p93zgyify9barnzc4di09pm8bdaywqx68149bmw0zzhghqdqa";
type = "gem";
};
- version = "0.3.16.beta2";
+ version = "0.6.7";
};
serverengine = {
+ dependencies = ["sigdump"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0f08kbiqg9yp5fxdw5blsrnq383a9g4n830g1ypppb7ddv61sbmi";
+ sha256 = "1gkm880njsi9x6vpb5grsspxb097hi8898drlbbkj1wl9qf2xv8l";
type = "gem";
};
- version = "2.0.4";
+ version = "2.0.7";
};
sigdump = {
source = {
@@ -352,25 +1629,18 @@
strptime = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1avbl1fj4y5qx9ywkxpcjjxxpjj6h7r1dqlnddhk5wqg6ypq8lsb";
+ sha256 = "1yj5wwa7wbhgi7w8d9ihpzpf99niw956fhyxddhayj09fgmdcxd8";
type = "gem";
};
- version = "0.1.9";
- };
- thor = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "01n5dv9kql60m6a00zc0r66jvaxx98qhdny3klyj0p3w34pad2ns";
- type = "gem";
- };
- version = "0.19.4";
+ version = "0.2.3";
};
thread_safe = {
source = {
- sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr";
+ remotes = ["https://rubygems.org"];
+ sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
type = "gem";
};
- version = "0.3.5";
+ version = "0.3.6";
};
thrift = {
source = {
@@ -383,28 +1653,23 @@
tzinfo = {
dependencies = ["thread_safe"];
source = {
- sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx";
+ remotes = ["https://rubygems.org"];
+ sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
type = "gem";
};
- version = "1.2.2";
+ version = "1.2.5";
};
tzinfo-data = {
+ dependencies = ["tzinfo"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01nr50alfm1fyzlcbzvfbpnsq37yb3h676f9n3z0iyp4s4766psf";
+ sha256 = "1fkihwl9k9pmygl6c4kdlzqv51hn33bvjnxs4q48gs4s63d8gva2";
type = "gem";
};
- version = "1.2016.10";
- };
- uuidtools = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0zjvq1jrrnzj69ylmz1xcr30skf9ymmvjmdwbvscncd7zkr8av5g";
- type = "gem";
- };
- version = "2.1.5";
+ version = "1.2018.5";
};
webhdfs = {
+ dependencies = ["addressable"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gs6xb9dz9bp5xc38yplfy48jcgj7jrj0zg0vgi7ydkxnkzkhbf2";
@@ -415,9 +1680,9 @@
yajl-ruby = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0sah2lpvpsh555dcnhgcqylinjj5544md9dh1a0a13da0qv1p57i";
+ sha256 = "01bk8pi6h9wdm0ikjqvl1nxlkrxv3q74m3yfg64va9wvk9sqjvvw";
type = "gem";
};
- version = "1.3.0";
+ version = "1.4.0";
};
}
\ No newline at end of file
diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix
index 52cc5671531..858b45813d5 100644
--- a/pkgs/tools/misc/skim/default.nix
+++ b/pkgs/tools/misc/skim/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
name = "skim-${version}";
- version = "0.5.4";
+ version = "0.5.5";
src = fetchFromGitHub {
owner = "lotabout";
repo = "skim";
rev = "v${version}";
- sha256 = "1mn0wa10f9ik6ddhwjdd1n15gdif10284zpwbrwprya643959aj2";
+ sha256 = "1z9xjqr72r855899pgfrigdzcir18rpp0nh33r7jdz24q57zya10";
};
outputs = [ "out" "vim" ];
diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix
index 43814a3f613..9caf4cf07b8 100644
--- a/pkgs/tools/misc/yubikey-personalization/default.nix
+++ b/pkgs/tools/misc/yubikey-personalization/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "yubikey-personalization-${version}";
- version = "1.19.0";
+ version = "1.19.3";
src = fetchurl {
url = "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${version}.tar.gz";
- sha256 = "104lc0nnqdr365fa7c4vrq67rxp1dp8idndsh9jlhnj9dnhszj1b";
+ sha256 = "0jhvnavjrpwzmmjcw486df5s48j53njqgyz36yz3dskbaz3kwlfr";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix
index 8bb092f122b..7c0c69e1de0 100644
--- a/pkgs/tools/networking/aircrack-ng/default.nix
+++ b/pkgs/tools/networking/aircrack-ng/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
description = "Wireless encryption cracking tools";
homepage = http://www.aircrack-ng.org/;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ domenkozar garbas chaoflow ];
+ maintainers = with maintainers; [ domenkozar garbas ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix
index 7a133a0a0cb..6181093a193 100644
--- a/pkgs/tools/networking/getmail/default.nix
+++ b/pkgs/tools/networking/getmail/default.nix
@@ -2,11 +2,11 @@
python2Packages.buildPythonApplication rec {
pname = "getmail";
- version = "5.10";
+ version = "5.13";
src = fetchurl {
url = "http://pyropus.ca/software/getmail/old-versions/${pname}-${version}.tar.gz";
- sha256 = "0qc4gp66mhaxyjj7pfz9v69kxnw76my4zw07hvc4f3kj3balkygx";
+ sha256 = "178a1c37z1aia5m2mbq9gyv6hylnxg9g3lp3njcrz7phfmj2zm84";
};
doCheck = false;
diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix
index af42b579a42..75ce3344e20 100644
--- a/pkgs/tools/package-management/appimage-run/default.nix
+++ b/pkgs/tools/package-management/appimage-run/default.nix
@@ -1,120 +1,12 @@
{ stdenv, writeScript, buildFHSUserEnv, coreutils, file, libarchive
-, extraPkgs ? pkgs: [] }:
+, extraPkgs ? pkgs: [], appimageTools }:
-buildFHSUserEnv {
+let
+ fhsArgs = appimageTools.defaultFhsEnvArgs;
+in buildFHSUserEnv (fhsArgs // {
name = "appimage-run";
- # Most of the packages were taken from the Steam chroot
- targetPkgs = pkgs: with pkgs; [
- gtk3
- bashInteractive
- gnome3.zenity
- python2
- xorg.xrandr
- which
- perl
- xdg_utils
- iana-etc
- ] ++ extraPkgs pkgs;
-
- multiPkgs = pkgs: with pkgs; [
- desktop-file-utils
- xorg.libXcomposite
- xorg.libXtst
- xorg.libXrandr
- xorg.libXext
- xorg.libX11
- xorg.libXfixes
- libGL
-
- gst_all_1.gstreamer
- gst_all_1.gst-plugins-ugly
- libdrm
- xorg.xkeyboardconfig
- xorg.libpciaccess
-
- glib
- gtk2
- bzip2
- zlib
- gdk_pixbuf
-
- xorg.libXinerama
- xorg.libXdamage
- xorg.libXcursor
- xorg.libXrender
- xorg.libXScrnSaver
- xorg.libXxf86vm
- xorg.libXi
- xorg.libSM
- xorg.libICE
- gnome2.GConf
- freetype
- (curl.override { gnutlsSupport = true; sslSupport = false; })
- nspr
- nss
- fontconfig
- cairo
- pango
- expat
- dbus
- cups
- libcap
- SDL2
- libusb1
- udev
- dbus-glib
- libav
- atk
- at-spi2-atk
- libudev0-shim
- networkmanager098
-
- xorg.libXt
- xorg.libXmu
- xorg.libxcb
- libGLU
- libuuid
- libogg
- libvorbis
- SDL
- SDL2_image
- glew110
- openssl
- libidn
- tbb
- wayland
- mesa_noglu
- libxkbcommon
-
- flac
- freeglut
- libjpeg
- libpng12
- libsamplerate
- libmikmod
- libtheora
- libtiff
- pixman
- speex
- SDL_image
- SDL_ttf
- SDL_mixer
- SDL2_ttf
- SDL2_mixer
- gstreamer
- gst-plugins-base
- libappindicator-gtk2
- libcaca
- libcanberra
- libgcrypt
- libvpx
- librsvg
- xorg.libXft
- libvdpau
- alsaLib
- strace
- ];
+ targetPkgs = pkgs: fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs;
runScript = writeScript "appimage-exec" ''
#!${stdenv.shell}
@@ -153,4 +45,4 @@ buildFHSUserEnv {
exec ./AppRun
'';
-}
+})
diff --git a/pkgs/tools/package-management/apt-dater/default.nix b/pkgs/tools/package-management/apt-dater/default.nix
index 988147d7ab0..2912999fafa 100644
--- a/pkgs/tools/package-management/apt-dater/default.nix
+++ b/pkgs/tools/package-management/apt-dater/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "apt-dater-${version}";
- version = "1.0.3";
+ version = "1.0.4";
src = fetchFromGitHub {
owner = "DE-IBH";
repo = "apt-dater";
rev = "v${version}";
- sha256 = "1flr6cm72cywmwp5h7pbmmpq057xsi9shkczyplxqaqrb2gns5fl";
+ sha256 = "1r6gz9jkh1wxi11mcq5p9mqg0szclsaq8ic79vnfnbjdrmmdfi4y";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 76d11a03fc4..2777fbcc903 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -164,13 +164,13 @@ in rec {
};
nixUnstable = lib.lowPrio (common rec {
- name = "nix-2.2${suffix}";
- suffix = "pre6600_85488a93";
+ name = "nix-2.3${suffix}";
+ suffix = "pre6631_e58a7144";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
- rev = "85488a93ec3b07210339f2b05aa93e970f9ac3be";
- sha256 = "1n5dp7p2lzpnj7f834d25k020v16gnnsm56jz46y87v2x7b69ccm";
+ rev = "e58a71442ad4a538b48fc7a9938c3690628c4741";
+ sha256 = "1hbjhnvjbh8bi8cjjgyrj4z1gw03ws12m2wi5azzj3rmhnh4c802";
};
fromGit = true;
});
diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix
index ba7d1a336a0..cb1780a6903 100644
--- a/pkgs/tools/text/vale/default.nix
+++ b/pkgs/tools/text/vale/default.nix
@@ -2,19 +2,19 @@
buildGoPackage rec {
name = "vale-${version}";
- version = "1.3.0";
+ version = "1.3.2";
goPackagePath = "github.com/errata-ai/vale";
+ subPackages = [ "." ];
+
src = fetchFromGitHub {
owner = "errata-ai";
repo = "vale";
rev = "v${version}";
- sha256 = "1yfrn27z3ifdlvalgrnhdrkhxkh09xpyv681sr01wc2hxq6v3hqn";
+ sha256 = "0jpklca4m6wpndy6spj30s6ssb5y9ysyncxj7i6fg2g0m4dzzh8w";
};
- doCheck = true;
-
meta = with stdenv.lib; {
homepage = https://errata-ai.github.io/vale/;
description = "A syntax-aware linter for prose built with speed and extensibility in mind";
diff --git a/pkgs/tools/virtualization/awless/default.nix b/pkgs/tools/virtualization/awless/default.nix
index ff9a13c500b..37c3248b83e 100644
--- a/pkgs/tools/virtualization/awless/default.nix
+++ b/pkgs/tools/virtualization/awless/default.nix
@@ -2,15 +2,15 @@
buildGoPackage rec {
name = "awless-${version}";
- version = "0.0.14";
+ version = "0.1.11";
goPackagePath = "github.com/wallix/awless";
src = fetchFromGitHub {
owner = "wallix";
repo = "awless";
- rev = version;
- sha256 = "1syxw8d9y1b4bdb1arsx05m5mxnd0dqp3nj7fk5j1v7cnnbja3hj";
+ rev = "v${version}";
+ sha256 = "187i21yrm10r3f5naj3jl0rmydr5dkhmdhxs90hhf8hjp59a89kg";
};
meta = with stdenv.lib; {
@@ -18,6 +18,6 @@ buildGoPackage rec {
description = "A Mighty CLI for AWS";
platforms = with platforms; linux ++ darwin;
license = licenses.asl20;
- maintainers = with maintainers; [ pradeepchhetri ];
+ maintainers = with maintainers; [ pradeepchhetri swdunlop ];
};
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fbbed4edf57..13619ed287e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -35,7 +35,7 @@ in
stdenvNoCC = stdenv.override { cc = null; extraAttrs.noCC = true; };
- stdenvNoLibs = let
+ mkStdenvNoLibs = stdenv: let
bintools = stdenv.cc.bintools.override {
libc = null;
noLibc = true;
@@ -51,6 +51,11 @@ in
lib.mapNullable (rs: rs ++ [ bintools ]) (stdenv.allowedRequisites or null);
};
+ stdenvNoLibs = mkStdenvNoLibs stdenv;
+
+ gccStdenvNoLibs = mkStdenvNoLibs gccStdenv;
+ clangStdenvNoLibs = mkStdenvNoLibs clangStdenv;
+
# For convenience, allow callers to get the path to Nixpkgs.
path = ../..;
@@ -64,6 +69,14 @@ in
# inside the set for derivations.
recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; };
+ # This is intended to be the reverse of recurseIntoAttrs, as it is
+ # defined now it exists mainly for documentation purposes, but you
+ # can also override this with recurseIntoAttrs to recurseInto all
+ # the Attrs which is useful for testing massive changes. Ideally,
+ # every package subset not marked with recurseIntoAttrs should be
+ # marked with this.
+ dontRecurseIntoAttrs = x: x;
+
stringsWithDeps = lib.stringsWithDeps;
### Evaluating the entire Nixpkgs naively will fail, make failure fast
@@ -105,6 +118,8 @@ in
autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; }
../build-support/setup-hooks/auto-patchelf.sh;
+ appimageTools = callPackage ../build-support/appimage { };
+
ensureNewerSourcesHook = { year }: makeSetupHook {}
(writeScript "ensure-newer-sources-hook.sh" ''
postUnpackHooks+=(_ensureNewerSources)
@@ -945,7 +960,11 @@ in
bluemix-cli = callPackage ../tools/admin/bluemix-cli { };
- charles = callPackage ../applications/networking/charles { };
+ charles = charles4;
+ inherit (callPackage ../applications/networking/charles {})
+ charles3
+ charles4
+ ;
libqmatrixclient = libsForQt5.callPackage ../development/libraries/libqmatrixclient { };
@@ -1649,7 +1668,7 @@ in
roundcube = callPackage ../servers/roundcube { };
- roundcubePlugins = callPackage ../servers/roundcube/plugins { };
+ roundcubePlugins = dontRecurseIntoAttrs (callPackage ../servers/roundcube/plugins { });
rsbep = callPackage ../tools/backup/rsbep { };
@@ -2451,7 +2470,7 @@ in
emscripten = callPackage ../development/compilers/emscripten { };
- emscriptenfastcompPackages = callPackage ../development/compilers/emscripten/fastcomp { };
+ emscriptenfastcompPackages = dontRecurseIntoAttrs (callPackage ../development/compilers/emscripten/fastcomp { });
emscriptenfastcomp = emscriptenfastcompPackages.emscriptenfastcomp;
@@ -2637,6 +2656,8 @@ in
flatpak-builder = callPackage ../development/tools/flatpak-builder { };
+ fltrdr = callPackage ../tools/misc/fltrdr { stdenv = gcc8Stdenv; };
+
figlet = callPackage ../tools/misc/figlet { };
file = callPackage ../tools/misc/file {
@@ -2783,9 +2804,9 @@ in
fusuma = callPackage ../tools/inputmethods/fusuma {};
- fdbPackages = callPackage ../servers/foundationdb {
+ fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb {
stdenv49 = overrideCC stdenv gcc49;
- };
+ });
inherit (fdbPackages)
foundationdb51
@@ -3885,17 +3906,17 @@ in
openssl = openssl_1_1;
};
- nodePackages_10_x = callPackage ../development/node-packages/default-v10.nix {
+ nodePackages_10_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v10.nix {
nodejs = pkgs.nodejs-10_x;
- };
+ });
- nodePackages_8_x = callPackage ../development/node-packages/default-v8.nix {
+ nodePackages_8_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v8.nix {
nodejs = pkgs.nodejs-8_x;
- };
+ });
- nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix {
+ nodePackages_6_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v6.nix {
nodejs = pkgs.nodejs-6_x;
- };
+ });
nodePackages = nodePackages_10_x;
@@ -3949,6 +3970,8 @@ in
libhandy = callPackage ../development/libraries/libhandy { };
+ libgumath = callPackage ../development/libraries/libgumath { };
+
libipfix = callPackage ../development/libraries/libipfix { };
libircclient = callPackage ../development/libraries/libircclient { };
@@ -4501,6 +4524,8 @@ in
notify-osd = callPackage ../applications/misc/notify-osd { };
+ notes-up = callPackage ../applications/office/notes-up { };
+
notify-osd-customizable = callPackage ../applications/misc/notify-osd-customizable { };
nox = callPackage ../tools/package-management/nox { };
@@ -4709,10 +4734,6 @@ in
pandoc = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.pandoc) (drv: {
configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"];
buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed];
- postInstall = ''
- mkdir -p $out/share/man/man1
- cp man/pandoc.1 $out/share/man/man1/
- '';
# Newer tasty version works
# https://github.com/jgm/pandoc/commit/3bf398b15ff28a39133a8ce27ba3d2728d255b17#diff-d37211f38c72504621b9d03eef12ffd7
# Note the patch doesn't apply because we fetch the cabal file from elsewhere
@@ -4889,7 +4910,7 @@ in
plan9port = callPackage ../tools/system/plan9port { };
- platformioPackages = callPackage ../development/arduino/platformio { };
+ platformioPackages = dontRecurseIntoAttrs (callPackage ../development/arduino/platformio { });
platformio = platformioPackages.platformio-chrootenv;
platinum-searcher = callPackage ../tools/text/platinum-searcher { };
@@ -6532,6 +6553,8 @@ in
dash = callPackage ../shells/dash { };
+ dasht = callPackage ../tools/misc/dasht { };
+
dashing = callPackage ../tools/misc/dashing { };
es = callPackage ../shells/es { };
@@ -7033,9 +7056,9 @@ in
haskell = callPackage ./haskell-packages.nix { };
- haskellPackages = haskell.packages.ghc863.override {
+ haskellPackages = dontRecurseIntoAttrs (haskell.packages.ghc863.override {
overrides = config.haskellPackageOverrides or haskell.packageOverrides;
- };
+ });
inherit (haskellPackages) ghc;
@@ -7124,9 +7147,9 @@ in
icedtea_web = icedtea8_web;
- idrisPackages = callPackage ../development/idris-modules {
+ idrisPackages = dontRecurseIntoAttrs (callPackage ../development/idris-modules {
idris-no-deps = haskellPackages.idris;
- };
+ });
idris = idrisPackages.with-packages [ idrisPackages.base ] ;
@@ -8549,7 +8572,9 @@ in
librarian-puppet-go = callPackage ../development/tools/librarian-puppet-go { };
- libgcc = callPackage ../development/libraries/gcc/libgcc { };
+ libgcc = callPackage ../development/libraries/gcc/libgcc {
+ stdenvNoLibs = gccStdenvNoLibs; # cannot be built with clang it seems
+ };
libstdcxx5 = callPackage ../development/libraries/gcc/libstdc++/5.nix { };
@@ -9078,7 +9103,7 @@ in
selendroid = callPackage ../development/tools/selenium/selendroid { };
- sconsPackages = callPackage ../development/tools/build-managers/scons { };
+ sconsPackages = dontRecurseIntoAttrs (callPackage ../development/tools/build-managers/scons { });
scons = sconsPackages.scons_latest;
mill = callPackage ../development/tools/build-managers/mill { };
@@ -10056,7 +10081,7 @@ in
# A GMP fork
mpir = callPackage ../development/libraries/mpir {};
- gns3Packages = callPackage ../applications/networking/gns3 { };
+ gns3Packages = dontRecurseIntoAttrs (callPackage ../applications/networking/gns3 { });
gns3-gui = gns3Packages.guiStable;
gns3-server = gns3Packages.serverStable;
@@ -12343,6 +12368,8 @@ in
rapidjson = callPackage ../development/libraries/rapidjson {};
+ rapidxml = callPackage ../development/libraries/rapidxml {};
+
raul = callPackage ../development/libraries/audio/raul { };
readline = readline6;
@@ -13315,8 +13342,8 @@ in
quicklispPackagesFor = clwrapper: callPackage ../development/lisp-modules/quicklisp-to-nix.nix {
inherit clwrapper;
};
- quicklispPackagesClisp = quicklispPackagesFor (wrapLisp clisp);
- quicklispPackagesSBCL = quicklispPackagesFor (wrapLisp sbcl);
+ quicklispPackagesClisp = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp clisp));
+ quicklispPackagesSBCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp sbcl));
quicklispPackages = quicklispPackagesSBCL;
quicklispPackages_asdf_3_1 = quicklispPackagesFor
((wrapLisp sbcl).override { asdf = asdf_3_1; });
@@ -13378,9 +13405,9 @@ in
packages = [];
};
- rPackages = callPackage ../development/r-modules {
+ rPackages = dontRecurseIntoAttrs (callPackage ../development/r-modules {
overrides = (config.rPackageOverrides or (p: {})) pkgs;
- };
+ });
### SERVERS
@@ -13415,7 +13442,7 @@ in
subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; };
};
- apacheHttpdPackages_2_4 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4;
+ apacheHttpdPackages_2_4 = dontRecurseIntoAttrs (apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4);
apacheHttpdPackages = apacheHttpdPackages_2_4;
appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { };
@@ -14402,9 +14429,9 @@ in
inherit (linuxPackages) kernel;
};
- fusePackages = callPackage ../os-specific/linux/fuse {
+ fusePackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/fuse {
utillinux = utillinuxMinimal;
- };
+ });
fuse = lowPrio fusePackages.fuse_2;
fuse3 = fusePackages.fuse_3;
fuse-common = hiPrio fusePackages.fuse_3.common;
@@ -14693,7 +14720,7 @@ in
nvidiabl = callPackage ../os-specific/linux/nvidiabl { };
- nvidiaPackages = callPackage ../os-specific/linux/nvidia-x11 { };
+ nvidiaPackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { });
nvidia_x11_legacy304 = nvidiaPackages.legacy_304;
nvidia_x11_legacy340 = nvidiaPackages.legacy_340;
@@ -15633,6 +15660,8 @@ in
league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {};
+ ledger-udev-rules = callPackage ../os-specific/linux/ledger-udev-rules {};
+
inherit (callPackages ../data/fonts/redhat-liberation-fonts { })
liberation_ttf_v1
liberation_ttf_v2
@@ -15890,12 +15919,12 @@ in
source-han-code-jp = callPackage ../data/fonts/source-han-code-jp { };
- sourceHanSansPackages = callPackage ../data/fonts/source-han-sans { };
+ sourceHanSansPackages = dontRecurseIntoAttrs (callPackage ../data/fonts/source-han-sans { });
source-han-sans-japanese = sourceHanSansPackages.japanese;
source-han-sans-korean = sourceHanSansPackages.korean;
source-han-sans-simplified-chinese = sourceHanSansPackages.simplified-chinese;
source-han-sans-traditional-chinese = sourceHanSansPackages.traditional-chinese;
- sourceHanSerifPackages = callPackage ../data/fonts/source-han-serif { };
+ sourceHanSerifPackages = dontRecurseIntoAttrs (callPackage ../data/fonts/source-han-serif { });
source-han-serif-japanese = sourceHanSerifPackages.japanese;
source-han-serif-korean = sourceHanSerifPackages.korean;
source-han-serif-simplified-chinese = sourceHanSerifPackages.simplified-chinese;
@@ -16101,7 +16130,7 @@ in
gconf = gnome2.GConf;
};
- atomPackages = callPackage ../applications/editors/atom { };
+ atomPackages = dontRecurseIntoAttrs (callPackage ../applications/editors/atom { });
inherit (atomPackages) atom atom-beta;
@@ -16439,6 +16468,11 @@ in
fluidsynth = fluidsynth_1;
};
+ csound-manual = callPackage ../applications/audio/csound/csound-manual {
+ python = python27;
+ pygments = python27Packages.pygments;
+ };
+
csound-qt = callPackage ../applications/audio/csound/csound-qt {
python = python27;
qmake = qt59.qmake;
@@ -16871,8 +16905,8 @@ in
cask = callPackage ../applications/editors/emacs-modes/cask { };
};
- emacs25Packages = emacsPackagesFor emacs25 pkgs.emacs25Packages;
- emacs26Packages = emacsPackagesFor emacs26 pkgs.emacs26Packages;
+ emacs25Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs25 pkgs.emacs25Packages);
+ emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26 pkgs.emacs26Packages);
emacsPackagesNgFor = emacs: import ./emacs-packages.nix {
inherit lib newScope stdenv;
@@ -16897,9 +16931,10 @@ in
};
};
- emacs25PackagesNg = emacsPackagesNgFor emacs25;
+ emacs25PackagesNg = dontRecurseIntoAttrs (emacsPackagesNgFor emacs25);
+ emacs26PackagesNg = dontRecurseIntoAttrs (emacsPackagesNgFor emacs26);
+
emacs25WithPackages = emacs25PackagesNg.emacsWithPackages;
- emacs26PackagesNg = emacsPackagesNgFor emacs26;
emacs26WithPackages = emacs26PackagesNg.emacsWithPackages;
emacsWithPackages = emacsPackagesNg.emacsWithPackages;
@@ -17015,6 +17050,8 @@ in
focuswriter = libsForQt5.callPackage ../applications/editors/focuswriter { };
+ fondo = callPackage ../applications/graphics/fondo { };
+
font-manager = callPackage ../applications/misc/font-manager { };
foo-yc20 = callPackage ../applications/audio/foo-yc20 { };
@@ -19521,7 +19558,7 @@ in
taskserver = callPackage ../servers/misc/taskserver { };
- tdesktopPackages = callPackage ../applications/networking/instant-messengers/telegram/tdesktop { };
+ tdesktopPackages = dontRecurseIntoAttrs (callPackage ../applications/networking/instant-messengers/telegram/tdesktop { });
tdesktop = tdesktopPackages.stable;
telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { };
@@ -19935,7 +19972,7 @@ in
weechat = wrapWeechat weechat-unwrapped { };
- weechatScripts = callPackage ../applications/networking/irc/weechat/scripts { };
+ weechatScripts = dontRecurseIntoAttrs (callPackage ../applications/networking/irc/weechat/scripts { });
westonLite = weston.override {
pango = null;
@@ -20074,6 +20111,7 @@ in
++ optional (config.kodi.enablePVRHTS or false) pvr-hts
++ optional (config.kodi.enablePVRHDHomeRun or false) pvr-hdhomerun
++ optional (config.kodi.enablePVRIPTVSimple or false) pvr-iptvsimple
+ ++ optional (config.kodi.enableInputStreamAdaptive or false) inputstream-adaptive
);
};
@@ -20985,7 +21023,7 @@ in
stockfish = callPackage ../games/stockfish { };
- steamPackages = callPackage ../games/steam { };
+ steamPackages = dontRecurseIntoAttrs (callPackage ../games/steam { });
steam = steamPackages.steam-chrootenv;
@@ -21090,7 +21128,7 @@ in
ue4demos = recurseIntoAttrs (callPackage ../games/ue4demos { });
- ut2004Packages = callPackage ../games/ut2004 { };
+ ut2004Packages = dontRecurseIntoAttrs (callPackage ../games/ut2004 { });
ut2004demo = res.ut2004Packages.ut2004 [ res.ut2004Packages.ut2004-demo ];
@@ -21199,9 +21237,9 @@ in
keen4 = callPackage ../games/keen4 { };
- zeroadPackages = callPackage ../games/0ad {
+ zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad {
wxGTK = wxGTK30;
- };
+ });
zeroad = zeroadPackages.zeroad;
@@ -22136,6 +22174,8 @@ in
### MISC
+ acpilight = callPackage ../misc/acpilight { };
+
android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { };
antimicro = libsForQt5.callPackage ../tools/misc/antimicro { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index debc381eca7..fd3f589fa30 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -268,7 +268,7 @@ in {
bayespy = callPackage ../development/python-modules/bayespy { };
- beanstalkc = disabledIf isPy3k (callPackage ../development/python-modules/beanstalkc {});
+ beanstalkc = callPackage ../development/python-modules/beanstalkc { };
bitarray = callPackage ../development/python-modules/bitarray { };
@@ -418,6 +418,8 @@ in {
guestfs = callPackage ../development/python-modules/guestfs { };
+ gumath = callPackage ../development/python-modules/gumath { };
+
h5py = callPackage ../development/python-modules/h5py {
hdf5 = pkgs.hdf5;
};
@@ -496,6 +498,8 @@ in {
nbval = callPackage ../development/python-modules/nbval { };
+ ndtypes = callPackage ../development/python-modules/ndtypes { };
+
nest-asyncio = callPackage ../development/python-modules/nest-asyncio { };
neuron = pkgs.neuron.override {
@@ -812,6 +816,8 @@ in {
snapcast = callPackage ../development/python-modules/snapcast { };
+ sparse = callPackage ../development/python-modules/sparse { };
+
spglib = callPackage ../development/python-modules/spglib { };
sslib = callPackage ../development/python-modules/sslib { };
@@ -1619,6 +1625,8 @@ in {
dask-ml = callPackage ../development/python-modules/dask-ml { };
+ dask-mpi = callPackage ../development/python-modules/dask-mpi { };
+
dask-xgboost = callPackage ../development/python-modules/dask-xgboost { };
datrie = callPackage ../development/python-modules/datrie { };
@@ -2790,6 +2798,8 @@ in {
xdis = callPackage ../development/python-modules/xdis { };
+ xnd = callPackage ../development/python-modules/xnd { };
+
uncompyle6 = callPackage ../development/python-modules/uncompyle6 { };
lsi = callPackage ../development/python-modules/lsi { };