diff options
77 files changed, 2235 insertions, 1722 deletions
diff --git a/doc/builders/packages/eclipse.section.md b/doc/builders/packages/eclipse.section.md new file mode 100644 index 00000000000..faabb188450 --- /dev/null +++ b/doc/builders/packages/eclipse.section.md @@ -0,0 +1,64 @@ +# Eclipse {#sec-eclipse} + +The Nix expressions related to the Eclipse platform and IDE are in [`pkgs/applications/editors/eclipse`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/eclipse). + +Nixpkgs provides a number of packages that will install Eclipse in its various forms. These range from the bare-bones Eclipse Platform to the more fully featured Eclipse SDK or Scala-IDE packages and multiple version are often available. It is possible to list available Eclipse packages by issuing the command: + +```ShellSession +$ nix-env -f '<nixpkgs>' -qaP -A eclipses --description +``` + +Once an Eclipse variant is installed it can be run using the `eclipse` command, as expected. From within Eclipse it is then possible to install plugins in the usual manner by either manually specifying an Eclipse update site or by installing the Marketplace Client plugin and using it to discover and install other plugins. This installation method provides an Eclipse installation that closely resemble a manually installed Eclipse. + +If you prefer to install plugins in a more declarative manner then Nixpkgs also offer a number of Eclipse plugins that can be installed in an _Eclipse environment_. This type of environment is created using the function `eclipseWithPlugins` found inside the `nixpkgs.eclipses` attribute set. This function takes as argument `{ eclipse, plugins ? [], jvmArgs ? [] }` where `eclipse` is a one of the Eclipse packages described above, `plugins` is a list of plugin derivations, and `jvmArgs` is a list of arguments given to the JVM running the Eclipse. For example, say you wish to install the latest Eclipse Platform with the popular Eclipse Color Theme plugin and also allow Eclipse to use more RAM. You could then add + +```nix +packageOverrides = pkgs: { + myEclipse = with pkgs.eclipses; eclipseWithPlugins { + eclipse = eclipse-platform; + jvmArgs = [ "-Xmx2048m" ]; + plugins = [ plugins.color-theme ]; + }; +} +``` + +to your Nixpkgs configuration (`~/.config/nixpkgs/config.nix`) and install it by running `nix-env -f '<nixpkgs>' -iA myEclipse` and afterward run Eclipse as usual. It is possible to find out which plugins are available for installation using `eclipseWithPlugins` by running + +```ShellSession +$ nix-env -f '<nixpkgs>' -qaP -A eclipses.plugins --description +``` + +If there is a need to install plugins that are not available in Nixpkgs then it may be possible to define these plugins outside Nixpkgs using the `buildEclipseUpdateSite` and `buildEclipsePlugin` functions found in the `nixpkgs.eclipses.plugins` attribute set. Use the `buildEclipseUpdateSite` function to install a plugin distributed as an Eclipse update site. This function takes `{ name, src }` as argument where `src` indicates the Eclipse update site archive. All Eclipse features and plugins within the downloaded update site will be installed. When an update site archive is not available then the `buildEclipsePlugin` function can be used to install a plugin that consists of a pair of feature and plugin JARs. This function takes an argument `{ name, srcFeature, srcPlugin }` where `srcFeature` and `srcPlugin` are the feature and plugin JARs, respectively. + +Expanding the previous example with two plugins using the above functions we have + +```nix +packageOverrides = pkgs: { + myEclipse = with pkgs.eclipses; eclipseWithPlugins { + eclipse = eclipse-platform; + jvmArgs = [ "-Xmx2048m" ]; + plugins = [ + plugins.color-theme + (plugins.buildEclipsePlugin { + name = "myplugin1-1.0"; + srcFeature = fetchurl { + url = "http://…/features/myplugin1.jar"; + sha256 = "123…"; + }; + srcPlugin = fetchurl { + url = "http://…/plugins/myplugin1.jar"; + sha256 = "123…"; + }; + }); + (plugins.buildEclipseUpdateSite { + name = "myplugin2-1.0"; + src = fetchurl { + stripRoot = false; + url = "http://…/myplugin2.zip"; + sha256 = "123…"; + }; + }); + ]; + }; +} +``` diff --git a/doc/builders/packages/eclipse.xml b/doc/builders/packages/eclipse.xml deleted file mode 100644 index fc5094ed8f3..00000000000 --- a/doc/builders/packages/eclipse.xml +++ /dev/null @@ -1,72 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xml:id="sec-eclipse"> - <title>Eclipse</title> - - <para> - The Nix expressions related to the Eclipse platform and IDE are in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/eclipse"><filename>pkgs/applications/editors/eclipse</filename></link>. - </para> - - <para> - Nixpkgs provides a number of packages that will install Eclipse in its various forms. These range from the bare-bones Eclipse Platform to the more fully featured Eclipse SDK or Scala-IDE packages and multiple version are often available. It is possible to list available Eclipse packages by issuing the command: -<screen> -<prompt>$ </prompt>nix-env -f '<nixpkgs>' -qaP -A eclipses --description -</screen> - Once an Eclipse variant is installed it can be run using the <command>eclipse</command> command, as expected. From within Eclipse it is then possible to install plugins in the usual manner by either manually specifying an Eclipse update site or by installing the Marketplace Client plugin and using it to discover and install other plugins. This installation method provides an Eclipse installation that closely resemble a manually installed Eclipse. - </para> - - <para> - If you prefer to install plugins in a more declarative manner then Nixpkgs also offer a number of Eclipse plugins that can be installed in an <emphasis>Eclipse environment</emphasis>. This type of environment is created using the function <varname>eclipseWithPlugins</varname> found inside the <varname>nixpkgs.eclipses</varname> attribute set. This function takes as argument <literal>{ eclipse, plugins ? [], jvmArgs ? [] }</literal> where <varname>eclipse</varname> is a one of the Eclipse packages described above, <varname>plugins</varname> is a list of plugin derivations, and <varname>jvmArgs</varname> is a list of arguments given to the JVM running the Eclipse. For example, say you wish to install the latest Eclipse Platform with the popular Eclipse Color Theme plugin and also allow Eclipse to use more RAM. You could then add -<screen> -packageOverrides = pkgs: { - myEclipse = with pkgs.eclipses; eclipseWithPlugins { - eclipse = eclipse-platform; - jvmArgs = [ "-Xmx2048m" ]; - plugins = [ plugins.color-theme ]; - }; -} -</screen> - to your Nixpkgs configuration (<filename>~/.config/nixpkgs/config.nix</filename>) and install it by running <command>nix-env -f '<nixpkgs>' -iA myEclipse</command> and afterward run Eclipse as usual. It is possible to find out which plugins are available for installation using <varname>eclipseWithPlugins</varname> by running -<screen> -<prompt>$ </prompt>nix-env -f '<nixpkgs>' -qaP -A eclipses.plugins --description -</screen> - </para> - - <para> - If there is a need to install plugins that are not available in Nixpkgs then it may be possible to define these plugins outside Nixpkgs using the <varname>buildEclipseUpdateSite</varname> and <varname>buildEclipsePlugin</varname> functions found in the <varname>nixpkgs.eclipses.plugins</varname> attribute set. Use the <varname>buildEclipseUpdateSite</varname> function to install a plugin distributed as an Eclipse update site. This function takes <literal>{ name, src }</literal> as argument where <literal>src</literal> indicates the Eclipse update site archive. All Eclipse features and plugins within the downloaded update site will be installed. When an update site archive is not available then the <varname>buildEclipsePlugin</varname> function can be used to install a plugin that consists of a pair of feature and plugin JARs. This function takes an argument <literal>{ name, srcFeature, srcPlugin }</literal> where <literal>srcFeature</literal> and <literal>srcPlugin</literal> are the feature and plugin JARs, respectively. - </para> - - <para> - Expanding the previous example with two plugins using the above functions we have -<screen> -packageOverrides = pkgs: { - myEclipse = with pkgs.eclipses; eclipseWithPlugins { - eclipse = eclipse-platform; - jvmArgs = [ "-Xmx2048m" ]; - plugins = [ - plugins.color-theme - (plugins.buildEclipsePlugin { - name = "myplugin1-1.0"; - srcFeature = fetchurl { - url = "http://…/features/myplugin1.jar"; - sha256 = "123…"; - }; - srcPlugin = fetchurl { - url = "http://…/plugins/myplugin1.jar"; - sha256 = "123…"; - }; - }); - (plugins.buildEclipseUpdateSite { - name = "myplugin2-1.0"; - src = fetchurl { - stripRoot = false; - url = "http://…/myplugin2.zip"; - sha256 = "123…"; - }; - }); - ]; - }; -} -</screen> - </para> -</section> diff --git a/doc/builders/packages/index.xml b/doc/builders/packages/index.xml index e4f8a1d3120..fac82180b26 100644 --- a/doc/builders/packages/index.xml +++ b/doc/builders/packages/index.xml @@ -7,7 +7,7 @@ </para> <xi:include href="citrix.xml" /> <xi:include href="dlib.xml" /> - <xi:include href="eclipse.xml" /> + <xi:include href="eclipse.section.xml" /> <xi:include href="elm.section.xml" /> <xi:include href="emacs.section.xml" /> <xi:include href="firefox.section.xml" /> diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f46e36c9899..498fc61878c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3499,6 +3499,12 @@ githubId = 6893840; name = "Yacine Hmito"; }; + graham33 = { + email = "graham@grahambennett.org"; + github = "graham33"; + githubId = 10908649; + name = "Graham Bennett"; + }; grahamc = { email = "graham@grahamc.com"; github = "grahamc"; diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 6e3ddb875e1..7bc55e67134 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -585,6 +585,22 @@ EOF return $config; } +sub generateXserverConfig { + my $xserverEnabled = "@xserverEnabled@"; + + my $config = ""; + if ($xserverEnabled eq "1") { + $config = <<EOF; + # Enable the X11 windowing system. + services.xserver.enable = true; +EOF + } else { + $config = <<EOF; + # Enable the X11 windowing system. + # services.xserver.enable = true; +EOF + } +} if ($showHardwareConfig) { print STDOUT $hwConfig; @@ -630,6 +646,8 @@ EOF my $networkingDhcpConfig = generateNetworkingDhcpConfig(); + my $xserverConfig = generateXserverConfig(); + (my $desktopConfiguration = <<EOF)=~s/^/ /gm; @desktopConfiguration@ EOF diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index ada5f574856..a9e5641b05a 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -36,6 +36,7 @@ let path = lib.optionals (lib.elem "btrfs" config.boot.supportedFilesystems) [ pkgs.btrfs-progs ]; perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/${pkgs.perl.libPrefix}"; inherit (config.system.nixos-generate-config) configuration desktopConfiguration; + xserverEnabled = config.services.xserver.enable; }; nixos-option = @@ -87,8 +88,8 @@ in desktopConfiguration = mkOption { internal = true; - type = types.str; - default = ""; + type = types.listOf types.lines; + default = []; description = '' Text to preseed the desktop configuration that <literal>nixos-generate-config</literal> saves to <literal>/etc/nixos/configuration.nix</literal>. @@ -136,6 +137,8 @@ in # keyMap = "us"; # }; + $xserverConfig + $desktopConfiguration # Configure keymap in X11 # services.xserver.layout = "us"; diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index 37e5f7719b7..24aea356de4 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -450,7 +450,7 @@ in { else { PORT = toString(cfg.streamingPort); } ); serviceConfig = { - ExecStart = "${pkgs.nodejs-slim}/bin/node streaming"; + ExecStart = "${cfg.package}/run-streaming.sh"; Restart = "always"; RestartSec = 20; EnvironmentFile = "/var/lib/mastodon/.secrets_env"; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 671301246a8..99e6edfba26 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -197,12 +197,11 @@ in config = mkMerge [ (mkIf (cfg.enable || flashbackEnabled) { # Seed our configuration into nixos-generate-config - system.nixos-generate-config.desktopConfiguration = '' + system.nixos-generate-config.desktopConfiguration = ['' # Enable the GNOME 3 Desktop Environment. - services.xserver.enable = true; services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome3.enable = true; - ''; + '']; services.gnome3.core-os-services.enable = true; services.gnome3.core-shell.enable = true; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index d6cf86d3a2e..44ee079b817 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -184,12 +184,11 @@ in config = mkMerge [ (mkIf cfg.enable { # Seed our configuration into nixos-generate-config - system.nixos-generate-config.desktopConfiguration = '' + system.nixos-generate-config.desktopConfiguration = ['' # Enable the Plasma 5 Desktop Environment. - services.xserver.enable = true; services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; - ''; + '']; services.xserver.desktopManager.session = singleton { name = "plasma5"; diff --git a/nixos/tests/nixos-generate-config.nix b/nixos/tests/nixos-generate-config.nix index 5daa55a8abb..7bf8d4da7b6 100644 --- a/nixos/tests/nixos-generate-config.nix +++ b/nixos/tests/nixos-generate-config.nix @@ -11,12 +11,11 @@ import ./make-test-python.nix ({ lib, ... } : { } ''; - system.nixos-generate-config.desktopConfiguration = '' + system.nixos-generate-config.desktopConfiguration = ['' # DESKTOP - # services.xserver.enable = true; - # services.xserver.displayManager.gdm.enable = true; - # services.xserver.desktopManager.gnome3.enable = true; - ''; + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome3.enable = true; + '']; }; testScript = '' start_all() diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index 5d89813216d..ac405cde644 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -1,7 +1,7 @@ { mkDerivation , lib -, stdenv , fetchFromGitHub +, fetchpatch , qmake , pkg-config , qttools @@ -21,10 +21,15 @@ mkDerivation rec { sha256 = "0iddqfw951dw9xpl4w7310sl4z544507ppb12i8g4fzvlxfw2ifc"; }; - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace BambooTracker/BambooTracker.pro \ - --replace '# Temporary known-error downgrades here' 'CPP_WARNING_FLAGS += -Wno-missing-braces' - ''; + # TODO Remove when updating past 0.4.6 + # Fixes build failure on darwin + patches = [ + (fetchpatch { + name = "bambootracker-Add_braces_in_initialization_of_std-array.patch"; + url = "https://github.com/rerrahkr/BambooTracker/commit/0fc96c60c7ae6c2504ee696bb7dec979ac19717d.patch"; + sha256 = "1z28af46mqrgnyrr4i8883gp3wablkk8rijnj0jvpq01s4m2sfjn"; + }) + ]; nativeBuildInputs = [ qmake qttools pkg-config ]; @@ -40,6 +45,5 @@ mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.all; maintainers = with maintainers; [ OPNA2608 ]; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/editors/qemacs/default.nix b/pkgs/applications/editors/qemacs/default.nix new file mode 100644 index 00000000000..065dccb2b21 --- /dev/null +++ b/pkgs/applications/editors/qemacs/default.nix @@ -0,0 +1,24 @@ +{ fetchurl, lib, stdenv, xlibsWrapper, libXv, libpng }: + +stdenv.mkDerivation rec { + pname = "qemacs"; + version = "0.3.3"; + + src = fetchurl { + url = "https://bellard.org/${pname}/${pname}-${version}.tar.gz"; + sha256 = "156z4wpj49i6j388yjird5qvrph7hz0grb4r44l4jf3q8imadyrg"; + }; + + buildInputs = [ xlibsWrapper libpng libXv ]; + + preInstall = '' + mkdir -p $out/bin $out/man + ''; + + meta = with lib; { + homepage = "https://bellard.org/qemacs/"; + description = "Very small but powerful UNIX editor"; + license = licenses.lgpl2Only; + maintainers = with maintainers; [ iblech ]; + }; +} diff --git a/pkgs/applications/graphics/tev/default.nix b/pkgs/applications/graphics/tev/default.nix index ac8da654f05..3c48bbab0b8 100644 --- a/pkgs/applications/graphics/tev/default.nix +++ b/pkgs/applications/graphics/tev/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "tev"; - version = "1.16"; + version = "1.17"; src = fetchFromGitHub { owner = "Tom94"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0fn5j9klzrjvz3bq8p9yp9nqikn2fr7bp98c1sxwpwwaadkqy9xf"; + sha256 = "12wsy2zdfhg0ygkpvz58rk86qiy259fi9grb0jxiz8zcyd6x1ngk"; }; nativeBuildInputs = [ cmake wrapGAppsHook ]; @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { --replace "/usr/" "''${out}/" ''; + cmakeFlags = [ + "-DTEV_DEPLOY=1" # Only relevant not to append "dev" to the version + ]; + postInstall = '' wrapProgram $out/bin/tev \ "''${gappsWrapperArgs[@]}" \ diff --git a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix index e956715d9b0..988b2d02df9 100644 --- a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix +++ b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "starboard-octant-plugin"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-u+yxAGVVFsZpiexToNDUfQATsYOkKWHkYF9roK0OInY="; + sha256 = "sha256-wis2ECCVXQeD7GiCMJQai+wDM8QJ1j5dPnE5O/I3wpM="; }; - vendorSha256 = "sha256-c5sel3xs4npTENqRQu8d9hUOK1OFQodF3M0ZpUpr1po="; + vendorSha256 = "sha256-T0wDbAl5GXphZIBrM36OwRCojnJ/cbXNqsjtCzUDZ6s="; buildFlagsArray = [ "-ldflags=" "-s" "-w" ]; diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 3d22dca36d9..b3d8a5b3fea 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, libsForQt5 }: let - stableVersion = "2.2.17"; + stableVersion = "2.2.18"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -26,8 +26,8 @@ let }; mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "0dfyxr983w6lmbcvaf32bnm9cz7y7fp9jfaz8zxp1dvr6dr06cmv"; - serverSrcHash = "0m5ajd2zkafx89hvp202m351h1dygfc3jssl3m7nd7r42csyi2vj"; + guiSrcHash = "118z6asl6hsv0777rld4plnrwzkbkh3gb9lg9i6bqrjs93p028fw"; + serverSrcHash = "0gd37zpvibhlvqqpflpwlrgg8g9rpbxwi9w9fsym00mfwf7sdd3b"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index a5f21f11dfe..f5f20202fc2 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.20", + "version": "1.7.21", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 7da0186022a..f706a4399be 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.20"; + version = "1.7.21"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "sha256-kQMswcEGsefQ8HCWxYPgvxOKP5cgvXx8oCl5Inh6sOg="; + sha256 = "sha256-tpFiKaJB6KN97ipN3OCTyxpiS0b980MQ1Ynxj8CjCuI="; }; in mkYarnPackage rec { name = "element-desktop-${version}"; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 6ee48d53288..285e525efbb 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.20"; + version = "1.7.21"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "sha256-8R7l/Pmymd5+/Fri7z2/TDj1h2FL0QgLICoXajePing="; + sha256 = "sha256-JJXl+jDlXw8fZ1ZeeAACvilbqG9zanCmBsHy6BEla8M="; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 601489d4532..0ef024225f6 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.7.4"; + version = "0.8.0"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - sha256 = "18dv2944nsryl6372jqgb52z3s1grvgfc5sb1b1rgn0y84g8g46n"; + sha256 = "sha256-0YzeGtdsCUG8N7Av/zzHoC9KKu1rqjQDToaOEXzuoJc="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; diff --git a/pkgs/applications/networking/ncgopher/default.nix b/pkgs/applications/networking/ncgopher/default.nix index 2e5e840d50d..69f214cc571 100644 --- a/pkgs/applications/networking/ncgopher/default.nix +++ b/pkgs/applications/networking/ncgopher/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "ncgopher"; - version = "0.1.5"; + version = "0.2.0"; src = fetchFromGitHub { owner = "jansc"; repo = "ncgopher"; rev = "v${version}"; - sha256 = "1mv89sanmr49b9za95jl5slpq960b246j2054r8xfafzqmbp44af"; + sha256 = "sha256-Yny5zZe5x7/pWda839HcFkHFuL/jl1Q7ykTZzKy871I="; }; - cargoSha256 = "12r4vgrg2bkr3p61yxcsg02kppg84vn956l0v1vb08i94rxzc8zk"; + cargoSha256 = "sha256-IsRaDhnRamMSbtXG1r1j0jZYjFiSjRdwOaUVyqy4ZJw="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 14d8d0c13fe..aed59e05a98 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, edk2, util-linux, nasm, iasl , csmSupport ? false, seabios ? null , secureBoot ? false +, httpSupport ? false }: assert csmSupport -> seabios != null; @@ -30,7 +31,8 @@ edk2.mkDerivation projectDscPath { buildFlags = lib.optional secureBoot "-DSECURE_BOOT_ENABLE=TRUE" - ++ lib.optionals csmSupport [ "-D CSM_ENABLE" "-D FD_SIZE_2MB" ]; + ++ lib.optionals csmSupport [ "-D CSM_ENABLE" "-D FD_SIZE_2MB" ] + ++ lib.optionals httpSupport [ "-DNETWORK_HTTP_ENABLE=TRUE" "-DNETWORK_HTTP_BOOT_ENABLE=TRUE" ]; postPatch = lib.optionalString csmSupport '' cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 4a1a305d127..31828bad0af 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "3.38.1"; + version = "3.38.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "APbWaJzCLePABb2H1MLr9yAGTLjcahiHgW+LfggrLmM="; + sha256 = "J9QZ1f7WMF4HRijtz94MtzT//aIF1jysMjORwEkDvZQ="; }; postPatch = '' diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix index db7a6ba0920..0ea59c3fc42 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "gnome-autoar"; - version = "0.2.4"; + version = "0.3.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0yk56ch46n3wfy633mq31kif9n7v06rlij4vqbsbn6l4z1vw6d0a"; + sha256 = "0ssqckfkyldwld88zizy446y2359rg40lnrcm3sjpjhc2b015hgj"; }; passthru = { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { platforms = platforms.linux; maintainers = teams.gnome.members; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; description = "Library to integrate compressed files management with GNOME"; }; } diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix new file mode 100644 index 00000000000..15e1279eba8 --- /dev/null +++ b/pkgs/development/compilers/go/1.16.nix @@ -0,0 +1,267 @@ +{ lib, stdenv, fetchurl, tzdata, iana-etc, runCommand +, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation, xcbuild +, mailcap, runtimeShell +, buildPackages +, pkgsBuildTarget +, fetchpatch +, callPackage +}: + +let + + inherit (lib) optionals optionalString; + + go_bootstrap = callPackage ./bootstrap.nix { + inherit Security; + }; + + goBootstrap = runCommand "go-bootstrap" {} '' + mkdir $out + cp -rf ${go_bootstrap}/* $out/ + chmod -R u+w $out + find $out -name "*.c" -delete + cp -rf $out/bin/* $out/share/go/bin/ + ''; + + goarch = platform: { + "i686" = "386"; + "x86_64" = "amd64"; + "aarch64" = "arm64"; + "arm" = "arm"; + "armv5tel" = "arm"; + "armv6l" = "arm"; + "armv7l" = "arm"; + "powerpc64le" = "ppc64le"; + }.${platform.parsed.cpu.name} or (throw "Unsupported system"); + + # We need a target compiler which is still runnable at build time, + # to handle the cross-building case where build != host == target + targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; +in + +stdenv.mkDerivation rec { + pname = "go"; + version = "1.16"; + + src = fetchurl { + url = "https://dl.google.com/go/go${version}.src.tar.gz"; + sha256 = "0nn98xiw8zrvxf9f36p8dzc7ihrrkakr0g9jiy4haqb5alyhd23n"; + }; + + # perl is used for testing go vet + nativeBuildInputs = [ perl which pkg-config patch procps ]; + buildInputs = [ cacert pcre ] + ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; + + propagatedBuildInputs = optionals stdenv.isDarwin [ xcbuild ]; + + depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ]; + + hardeningDisable = [ "all" ]; + + prePatch = '' + patchShebangs ./ # replace /bin/bash + + # This source produces shell script at run time, + # and thus it is not corrected by patchShebangs. + substituteInPlace misc/cgo/testcarchive/carchive_test.go \ + --replace '#!/usr/bin/env bash' '#!${runtimeShell}' + + # Patch the mimetype database location which is missing on NixOS. + # but also allow static binaries built with NixOS to run outside nix + sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/net/{listen,parse}_test.go + rm src/syscall/exec_linux_test.go + + # !!! substituteInPlace does not seems to be effective. + # The os test wants to read files in an existing path. Just don't let it be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go + # Fails on aarch64 + sed -i '/TestFallocate/aif true \{ return\; \}' src/cmd/link/internal/ld/fallocate_test.go + # Skip this test since ssl patches mess it up. + sed -i '/TestLoadSystemCertsLoadColonSeparatedDirs/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go + # Disable another PIE test which breaks. + sed -i '/TestTrivialPIE/aif true \{ return\; \}' misc/cgo/testshared/shared_test.go + # Disable the BuildModePie test + sed -i '/TestBuildmodePIE/aif true \{ return\; \}' src/cmd/go/go_test.go + # Disable the unix socket test + sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go + # Disable the hostname test + sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go + # ParseInLocation fails the test + sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go + # Remove the api check as it never worked + sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go + # Remove the coverage test as we have removed this utility + sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go + # Remove the timezone naming test + sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go + # Remove disable setgid test + sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go + # Remove cert tests that conflict with NixOS's cert resolution + sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go + # TestWritevError hangs sometimes + sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go + # TestVariousDeadlines fails sometimes + sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go + + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go + + # Disable cgo lookup tests not works, they depend on resolver + rm src/net/cgo_unix_test.go + + '' + optionalString stdenv.isLinux '' + # prepend the nix path to the zoneinfo files but also leave the original value for static binaries + # that run outside a nix server + sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go + + '' + optionalString stdenv.isAarch32 '' + echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash + '' + optionalString stdenv.isDarwin '' + substituteInPlace src/race.bash --replace \ + "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true + sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go + sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go + sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go + + sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go + sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go + + sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go + sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go + + sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go + + sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go + + # TestCurrent fails because Current is not implemented on Darwin + sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go + sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go + + touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd + ''; + + patches = [ + ./remove-tools-1.11.patch + ./ssl-cert-file-1.16.patch + ./remove-test-pie-1.15.patch + ./creds-test.patch + ./go-1.9-skip-flaky-19608.patch + ./go-1.9-skip-flaky-20072.patch + ./skip-external-network-tests-1.16.patch + ./skip-nohup-tests.patch + ./skip-cgo-tests-1.15.patch + ./go_no_vendor_checks-1.16.patch + ] ++ [ + # breaks under load: https://github.com/golang/go/issues/25628 + (if stdenv.isAarch32 + then ./skip-test-extra-files-on-aarch32-1.14.patch + else ./skip-test-extra-files-on-386-1.14.patch) + ]; + + postPatch = '' + find . -name '*.orig' -exec rm {} ';' + ''; + + GOOS = stdenv.targetPlatform.parsed.kernel.name; + GOARCH = goarch stdenv.targetPlatform; + # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. + # Go will nevertheless build a for host system that we will copy over in + # the install phase. + GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; + GOHOSTARCH = goarch stdenv.buildPlatform; + + # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those + # to be different from CC/CXX + CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${targetCC}/bin/${targetCC.targetPrefix}cc" + else + null; + CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${targetCC}/bin/${targetCC.targetPrefix}c++" + else + null; + + GOARM = toString (lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); + GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = 1; + # Hopefully avoids test timeouts on Hydra + GO_TEST_TIMEOUT_SCALE = 3; + + # Indicate that we are running on build infrastructure + # Some tests assume things like home directories and users exists + GO_BUILDER_NAME = "nix"; + + GOROOT_BOOTSTRAP="${goBootstrap}/share/go"; + + postConfigure = '' + export GOCACHE=$TMPDIR/go-cache + # this is compiled into the binary + export GOROOT_FINAL=$out/share/go + + export PATH=$(pwd)/bin:$PATH + + ${optionalString (stdenv.buildPlatform != stdenv.targetPlatform) '' + # Independent from host/target, CC should produce code for the building system. + # We only set it when cross-compiling. + export CC=${buildPackages.stdenv.cc}/bin/cc + ''} + ulimit -a + ''; + + postBuild = '' + (cd src && ./make.bash) + ''; + + doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; + + checkPhase = '' + runHook preCheck + (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) + runHook postCheck + ''; + + preInstall = '' + rm -r pkg/obj + # Contains the wrong perl shebang when cross compiling, + # since it is not used for anything we can deleted as well. + rm src/regexp/syntax/make_perl_groups.pl + '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' + mv bin/*_*/* bin + rmdir bin/*_* + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} + ''} + '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' + rm -rf bin/*_* + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} + ''} + '' else ""); + + installPhase = '' + runHook preInstall + mkdir -p $GOROOT_FINAL + cp -a bin pkg src lib misc api doc $GOROOT_FINAL + ln -s $GOROOT_FINAL/bin $out/bin + runHook postInstall + ''; + + disallowedReferences = [ goBootstrap ]; + + meta = with lib; { + homepage = "http://golang.org/"; + description = "The Go Programming language"; + license = licenses.bsd3; + maintainers = teams.golang.members; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/development/compilers/go/go_no_vendor_checks-1.16.patch b/pkgs/development/compilers/go/go_no_vendor_checks-1.16.patch new file mode 100644 index 00000000000..9edf6efa851 --- /dev/null +++ b/pkgs/development/compilers/go/go_no_vendor_checks-1.16.patch @@ -0,0 +1,23 @@ +Starting from go1.14, go verifes that vendor/modules.txt matches the requirements +and replacements listed in the main module go.mod file, and it is a hard failure if +vendor/modules.txt is missing. + +Relax module consistency checks and switch back to pre go1.14 behaviour if +vendor/modules.txt is missing regardless of go version requirement in go.mod. + +This has been ported from FreeBSD: https://reviews.freebsd.org/D24122 +See https://github.com/golang/go/issues/37948 for discussion. + +diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go +index d8fd91f1fe..8bc08e6fed 100644 +--- a/src/cmd/go/internal/modload/vendor.go ++++ b/src/cmd/go/internal/modload/vendor.go +@@ -133,7 +133,7 @@ func checkVendorConsistency() { + readVendorList() + + pre114 := false +- if semver.Compare(index.goVersionV, "v1.14") < 0 { ++ if semver.Compare(index.goVersionV, "v1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { + // Go versions before 1.14 did not include enough information in + // vendor/modules.txt to check for consistency. + // If we know that we're on an earlier version, relax the consistency check. diff --git a/pkgs/development/compilers/go/skip-external-network-tests-1.16.patch b/pkgs/development/compilers/go/skip-external-network-tests-1.16.patch new file mode 100644 index 00000000000..8f1eb6be7bb --- /dev/null +++ b/pkgs/development/compilers/go/skip-external-network-tests-1.16.patch @@ -0,0 +1,33 @@ +diff --git a/src/internal/testenv/testenv.go b/src/internal/testenv/testenv.go +index c902b1404f..66016088a2 100644 +--- a/src/internal/testenv/testenv.go ++++ b/src/internal/testenv/testenv.go +@@ -163,13 +163,15 @@ func MustHaveExecPath(t testing.TB, path string) { + // HasExternalNetwork reports whether the current system can use + // external (non-localhost) networks. + func HasExternalNetwork() bool { +- return !testing.Short() && runtime.GOOS != "js" ++ // Nix sandbox does not external network in sandbox ++ return false + } + + // MustHaveExternalNetwork checks that the current system can use + // external (non-localhost) networks. + // If not, MustHaveExternalNetwork calls t.Skip with an explanation. + func MustHaveExternalNetwork(t testing.TB) { ++ t.Skipf("Nix sandbox does not have networking") + if runtime.GOOS == "js" { + t.Skipf("skipping test: no external network on %s", runtime.GOOS) + } +diff --git a/src/net/dial_test.go b/src/net/dial_test.go +index 57cf5554ad..d00be53b2c 100644 +--- a/src/net/dial_test.go ++++ b/src/net/dial_test.go +@@ -990,6 +990,7 @@ func TestDialerControl(t *testing.T) { + // except that it won't skip testing on non-mobile builders. + func mustHaveExternalNetwork(t *testing.T) { + t.Helper() ++ t.Skipf("Nix sandbox does not have networking") + mobile := runtime.GOOS == "android" || runtime.GOOS == "ios" + if testenv.Builder() == "" || mobile { + testenv.MustHaveExternalNetwork(t) diff --git a/pkgs/development/compilers/go/ssl-cert-file-1.16.patch b/pkgs/development/compilers/go/ssl-cert-file-1.16.patch new file mode 100644 index 00000000000..f4bc16e5b8c --- /dev/null +++ b/pkgs/development/compilers/go/ssl-cert-file-1.16.patch @@ -0,0 +1,34 @@ +diff --git a/src/crypto/x509/root.go b/src/crypto/x509/root.go +index ac92915128..fb1d70c735 100644 +--- a/src/crypto/x509/root.go ++++ b/src/crypto/x509/root.go +@@ -6,7 +6,11 @@ package x509 + + //go:generate go run root_ios_gen.go -version 55161.140.3 + +-import "sync" ++import ( ++ "io/ioutil" ++ "os" ++ "sync" ++) + + var ( + once sync.Once +@@ -20,6 +24,16 @@ func systemRootsPool() *CertPool { + } + + func initSystemRoots() { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots := NewCertPool() ++ roots.AppendCertsFromPEM(data) ++ systemRoots = roots ++ return ++ } ++ } ++ + systemRoots, systemRootsErr = loadSystemRoots() + if systemRootsErr != nil { + systemRoots = nil diff --git a/pkgs/development/compilers/miranda/default.nix b/pkgs/development/compilers/miranda/default.nix index 298cb5e21ea..ab34f833d75 100644 --- a/pkgs/development/compilers/miranda/default.nix +++ b/pkgs/development/compilers/miranda/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; makeFlags = [ - "CC=cc" + "CC=${stdenv.cc.targetPrefix}cc" "CFLAGS=-O2" "PREFIX=${placeholder "out"}" ]; @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs quotehostinfo + substituteInPlace Makefile --replace strip '${stdenv.cc.targetPrefix}strip' ''; meta = with lib; { diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b06dd898bec..6928bba47fa 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -17052,15 +17052,15 @@ self: { "Rattus" = callPackage ({ mkDerivation, base, Cabal, containers, ghc, ghc-prim - , simple-affine-space, transformers + , simple-affine-space }: mkDerivation { pname = "Rattus"; - version = "0.5"; - sha256 = "1dh6ln8awqhgnk7hqh4zdkv4pqy3wmsqbmqrd016raf8vjbc1i3m"; + version = "0.4"; + sha256 = "1sgr33yq5l43k3b8nwx7m6wrygv5k8d8yigzms3p6pq5pk3g5sq1"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ - base containers ghc ghc-prim simple-affine-space transformers + base containers ghc ghc-prim simple-affine-space ]; testHaskellDepends = [ base containers ]; description = "A modal FRP language"; @@ -21177,12 +21177,12 @@ self: { platforms = lib.platforms.none; }) {}; - "Win32_2_11_1_0" = callPackage + "Win32_2_11_0_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "Win32"; - version = "2.11.1.0"; - sha256 = "18rsfx3ca8r7y4ifxn1mggn8j6ppgkn698wsq0pwqb63riva09rk"; + version = "2.11.0.0"; + sha256 = "179v0jypafjnh98gl8wr6z6pq1r5h740xzm2b6axd2d33zlnacfm"; description = "A binding to Windows Win32 API"; license = lib.licenses.bsd3; platforms = lib.platforms.none; @@ -24505,31 +24505,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "aeson-combinators_0_0_4_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion - , deepseq, doctest, fail, hspec, scientific, text, time - , time-compat, unordered-containers, utf8-string, uuid-types - , vector, void - }: - mkDerivation { - pname = "aeson-combinators"; - version = "0.0.4.1"; - sha256 = "1nvw5n7kfqrrci76350zd3mqvssb775ka4044kxgw0bhdzy3gcpg"; - libraryHaskellDepends = [ - aeson base bytestring containers fail scientific text time - time-compat unordered-containers uuid-types vector void - ]; - testHaskellDepends = [ - aeson base bytestring doctest hspec text utf8-string - ]; - benchmarkHaskellDepends = [ - aeson base bytestring criterion deepseq text - ]; - description = "Aeson combinators for dead simple JSON decoding"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "aeson-commit" = callPackage ({ mkDerivation, aeson, aeson-qq, base, mtl, tasty, tasty-hspec , text @@ -31899,10 +31874,10 @@ self: { }: mkDerivation { pname = "approx"; - version = "0.1.0.1"; - sha256 = "0vzi0ai7lf7ji2lbf9v412fvrins7acy0dqs4j8ylfd1chck1w99"; + version = "0.1.0.0"; + sha256 = "1vc6k0w4zr355gfvprb5syh5jpmkdvp6wjibi4l95q9zwwdwhjn2"; revision = "1"; - editedCabalFile = "0kj9qqfv8fzg5b6l33avflxjlmd52wjsjridff1d5n071dnif37y"; + editedCabalFile = "0k34bjsazp4wbv7zzmvh5vnqv7yzyq20h99q30mcrn4g2bvpc0q1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -31915,7 +31890,7 @@ self: { base containers hashable QuickCheck text time unordered-containers vector ]; - description = "Easy-to-use emulation of approximate, ranges and tolerances in Haskell"; + description = "Easy-to-use reasonable way of emulating approximate in Haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; @@ -33841,8 +33816,8 @@ self: { pname = "asn1-encoding"; version = "0.9.6"; sha256 = "02nsr30h5yic1mk7znf0q4z3n560ip017n60hg7ya25rsfmxxy6r"; - revision = "2"; - editedCabalFile = "16503ryhq15f2rfdav2qnkq11dg2r3vk3f9v64q9dmxf8dh8zv97"; + revision = "1"; + editedCabalFile = "19nq8g1v323p47cqlc4m9r6li35dd3cmcd7k486jw24cijkdjm9n"; libraryHaskellDepends = [ asn1-types base bytestring hourglass ]; testHaskellDepends = [ asn1-types base bytestring hourglass mtl tasty tasty-quickcheck @@ -34017,8 +33992,6 @@ self: { pname = "assoc"; version = "1.0.2"; sha256 = "0kqlizznjy94fm8zr1ng633yxbinjff7cnsiaqs7m33ix338v66q"; - revision = "1"; - editedCabalFile = "17ycclzwnysca80frsyyb6sdd2r5p83lkgwxjjnjg6j62pvf8958"; libraryHaskellDepends = [ base bifunctors tagged ]; description = "swap and assoc: Symmetric and Semigroupy Bifunctors"; license = lib.licenses.bsd3; @@ -47403,23 +47376,15 @@ self: { broken = true; }) {}; - "bytestring_0_11_1_0" = callPackage - ({ mkDerivation, base, deepseq, dlist, ghc-prim, integer-gmp - , random, tasty, tasty-bench, tasty-hunit, tasty-quickcheck - , transformers - }: + "bytestring_0_11_0_0" = callPackage + ({ mkDerivation, base, deepseq, ghc-prim, integer-gmp }: mkDerivation { pname = "bytestring"; - version = "0.11.1.0"; - sha256 = "1a29kwczd1hcpir691x936i9c5ys9d7m1lyby48djs9w54ksy1jw"; + version = "0.11.0.0"; + sha256 = "03fwkbn52946y2l1ddrqq1jp8l9bhgi0gwxpz1wqqsn6n2vz5rrj"; + revision = "1"; + editedCabalFile = "0qhx61v75cqpgrb88h5gpc4a6vg17dgrw555q2kgi2hvip61z5lr"; libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ]; - testHaskellDepends = [ - base deepseq dlist ghc-prim tasty tasty-hunit tasty-quickcheck - transformers - ]; - benchmarkHaskellDepends = [ - base deepseq dlist random tasty-bench - ]; description = "Fast, compact, strict and lazy byte strings with a list interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -50694,8 +50659,8 @@ self: { }: mkDerivation { pname = "capnp"; - version = "0.10.0.1"; - sha256 = "1p5vx7gcswz08f790swb8pi2ckbphqr76j8gav4rvrbalscd3zvf"; + version = "0.10.0.0"; + sha256 = "054cy2rr2hg0brrbxff4my3q2fzr1qk7ik2xyip65dq54958ibqk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57140,24 +57105,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "cmdargs_0_10_21" = callPackage - ({ mkDerivation, base, filepath, process, template-haskell - , transformers - }: - mkDerivation { - pname = "cmdargs"; - version = "0.10.21"; - sha256 = "0xfabq187n1vqrnnm4ciprpl0dcjq97rksyjnpcniwva9rffmn7p"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base filepath process template-haskell transformers - ]; - description = "Command line argument processing"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "cmdargs-browser" = callPackage ({ mkDerivation, base, bytestring, cmdargs, directory, filepath , http-types, js-jquery, process, text, transformers, wai @@ -58092,8 +58039,8 @@ self: { }: mkDerivation { pname = "coinbase-pro"; - version = "0.9.0.0"; - sha256 = "1wnjpm49gy75nl3m01bablchbk7clsgf4x53xqx5k2bsvn1xd1n1"; + version = "0.8.0.0"; + sha256 = "021c05qkrvgxlylvrrlb81bjxl49v5varn0fi5wqs5sda15766n3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65368,24 +65315,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "criterion-cmp" = callPackage - ({ mkDerivation, ansi-terminal, base, boxes, bytestring, cassava - , containers, filepath, optparse-applicative, vector - }: - mkDerivation { - pname = "criterion-cmp"; - version = "0.1.0.0"; - sha256 = "0p9l9c89bg1n7xjdq3npvknlfb36gkvpgwhq7i0qd2g20ysdxppd"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - ansi-terminal base boxes bytestring cassava containers filepath - optparse-applicative vector - ]; - description = "A simple tool for comparing in Criterion benchmark results"; - license = lib.licenses.bsd3; - }) {}; - "criterion-compare" = callPackage ({ mkDerivation, base, bytestring, cassava, Chart, Chart-diagrams , clay, colour, containers, data-default, filepath, lens, lucid @@ -73688,8 +73617,8 @@ self: { pname = "dhall"; version = "1.38.0"; sha256 = "0ifxi9i7ply640s2cgljjczvmblgz0ryp2p9yxgng3qm5ai58229"; - revision = "2"; - editedCabalFile = "13ppbn4kcrfls9fm9sqjwa4hb4nj8q6fqfxj3a62vck7qc1rbvn0"; + revision = "1"; + editedCabalFile = "067hh41cnmjskf3y3kzlwsisw6v5bh9mbmhg5jfapm1y5xp6gw9r"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -73731,8 +73660,6 @@ self: { pname = "dhall-bash"; version = "1.0.36"; sha256 = "0hg45xjl1pcla9xbds40qrxcx2h6b4ysw8kbx8hpnaqaazr2jrw0"; - revision = "1"; - editedCabalFile = "1jc74gydr3yx01xp1a69a3g9mbfqyzsmv1053xm51bcxxv6p6z9d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73776,8 +73703,8 @@ self: { pname = "dhall-docs"; version = "1.0.4"; sha256 = "0x6x5b9kh0in35jsgj2dghyxsqjdjrw7s9kngyjcn7v2ycklcifl"; - revision = "3"; - editedCabalFile = "116m74khdfx57ghrid1myqyj8acrhzhnjzjmxnsn3yghdan29797"; + revision = "2"; + editedCabalFile = "1y8aaph8zg3lp53apvkg0s6zviz3sa82qq1dnbqn6xjgb1dqjr7z"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -73843,8 +73770,8 @@ self: { pname = "dhall-json"; version = "1.7.5"; sha256 = "1fpkp8xkcw2abcigypyl0ji6910jyshlqwhf48yfwn6dsgbyw6iy"; - revision = "2"; - editedCabalFile = "0181ma0qzkcfg4g5fcyivmjfn542m9cmq74r6hxilfjvfzhk7fqw"; + revision = "1"; + editedCabalFile = "0vl9vb84r1fz80jvqxaq4624pk67hxkm3vsx5j0l3bz8mk439yzn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73894,8 +73821,8 @@ self: { pname = "dhall-lsp-server"; version = "1.0.13"; sha256 = "0cj51xdmpp0w7ndzbz4yn882agvhbnsss3myqlhfi4y91lb8f1ak"; - revision = "3"; - editedCabalFile = "19c902vjdnikwma21gjggpc7x9sjdqbirksqw85f1n9jkrbya375"; + revision = "2"; + editedCabalFile = "1gmcfp6i36y00z4gyllcq62rgpjz2x7fgdy4n6d24ygczpqbwy9k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74038,8 +73965,6 @@ self: { pname = "dhall-yaml"; version = "1.2.5"; sha256 = "0fax4p85344yrzk1l21j042mm02p0idp396vkq71x3dpiniq0mwf"; - revision = "1"; - editedCabalFile = "034rykrnmsnc9v9hsblkzjp26b8wv265sd31gwhqxy2358y4s33h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74744,23 +74669,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "diagrams-solve_0_1_3" = callPackage - ({ mkDerivation, base, deepseq, tasty, tasty-hunit - , tasty-quickcheck - }: - mkDerivation { - pname = "diagrams-solve"; - version = "0.1.3"; - sha256 = "09qqwcvbvd3a0j5fnp40dbzw0i3py9c7kgizj2aawajwbyjvpd17"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base deepseq tasty tasty-hunit tasty-quickcheck - ]; - description = "Pure Haskell solver routines used by diagrams"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "diagrams-svg" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, colour , containers, diagrams-core, diagrams-lib, filepath, hashable @@ -85824,23 +85732,17 @@ self: { "evdev" = callPackage ({ mkDerivation, base, bytestring, c2hs, containers, extra - , filepath-bytestring, libevdev, monad-loops, rawfilepath, tasty - , tasty-hunit, tasty-quickcheck, time, unix + , libevdev, monad-loops, time, unix }: mkDerivation { pname = "evdev"; - version = "2.1.0"; - sha256 = "1gzf9hpsi2dmcgsifq5z91ing9b5k56mm2hx9wbsa180pmq30lj3"; + version = "2.0.0.1"; + sha256 = "0ryq50g7z70rnv07pnvwssl0qrvhbljkq9yk1z8gj9kvqdsw9cmg"; libraryHaskellDepends = [ - base bytestring containers extra filepath-bytestring monad-loops - rawfilepath time unix + base bytestring containers extra monad-loops time unix ]; libraryPkgconfigDepends = [ libevdev ]; libraryToolDepends = [ c2hs ]; - testHaskellDepends = [ - base bytestring containers extra filepath-bytestring monad-loops - rawfilepath tasty tasty-hunit tasty-quickcheck time unix - ]; description = "Bindings to libevdev"; license = lib.licenses.bsd3; }) {inherit (pkgs) libevdev;}; @@ -85853,8 +85755,6 @@ self: { pname = "evdev-streamly"; version = "0.0.1.0"; sha256 = "1bzmxkg5y7w6v5l6q5vzhr19j5vwbx4p4qxdq72f7f714ihn8nyp"; - revision = "1"; - editedCabalFile = "02xnb49zwr39ziq2xrwnnddzxr1ppwig441i3074g1w0ng5cf2gj"; libraryHaskellDepends = [ base bytestring containers evdev extra posix-paths rawfilepath streamly streamly-fsnotify unix @@ -86822,8 +86722,8 @@ self: { }: mkDerivation { pname = "exh"; - version = "1.0.2"; - sha256 = "10pvr8ya2f7arp8cqi4g97dpqin1h8n0xmnihqszchcils0v2ayn"; + version = "1.0.0"; + sha256 = "0s5br96spx4v67mvl09w4kpcwvps65zp6qx5qpvrq63a0ncclp7l"; libraryHaskellDepends = [ aeson base bytestring conduit containers html-conduit http-client in-other-words language-javascript megaparsec optics-core optics-th @@ -101593,23 +101493,6 @@ self: { license = lib.licenses.bsd2; }) {}; - "ghc-typelits-natnormalise_0_7_4" = callPackage - ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra - , integer-gmp, tasty, tasty-hunit, template-haskell, transformers - }: - mkDerivation { - pname = "ghc-typelits-natnormalise"; - version = "0.7.4"; - sha256 = "0d8wwb1i6jj11cylf2n42r08hfygv9gwy89xyxp4kdclyw9mfwrp"; - libraryHaskellDepends = [ - base containers ghc ghc-tcplugins-extra integer-gmp transformers - ]; - testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; - description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; - license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; - }) {}; - "ghc-typelits-presburger" = callPackage ({ mkDerivation, base, containers, equational-reasoning, ghc , ghc-tcplugins-extra, mtl, pretty, reflection, syb, tasty @@ -102293,17 +102176,17 @@ self: { "ghcprofview" = callPackage ({ mkDerivation, aeson, base, containers, ghc-prof, gi-gtk - , haskell-gi-base, mtl, regex-tdfa, scientific, text + , haskell-gi-base, regex-tdfa, regex-tdfa-text, scientific, text }: mkDerivation { pname = "ghcprofview"; - version = "0.1.0.1"; - sha256 = "0lk5ky0vrymzhdzfrdvq25kpphg69f1m6524jhr57dnss5syz1iv"; + version = "0.1.0.0"; + sha256 = "103186dik439sdzz1w6dr98s1sfghjxdkp51mh18wrcwdbdb9r3a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base containers ghc-prof gi-gtk haskell-gi-base mtl - regex-tdfa scientific text + aeson base containers ghc-prof gi-gtk haskell-gi-base regex-tdfa + regex-tdfa-text scientific text ]; description = "GHC .prof files viewer"; license = lib.licenses.bsd3; @@ -105670,8 +105553,8 @@ self: { }: mkDerivation { pname = "gltf-codec"; - version = "0.1.0.3"; - sha256 = "0kgkzskn2k9zgihrb1v9xy5yfjlggmpj15g1bdgx7faipksaa3fb"; + version = "0.1.0.2"; + sha256 = "07zf9lzin22clixmvgvam6h995jfq2wzqz4498qv60jlcj88zzmh"; libraryHaskellDepends = [ aeson base base64-bytestring binary bytestring scientific text unordered-containers vector @@ -115913,8 +115796,8 @@ self: { }: mkDerivation { pname = "happstack-authenticate"; - version = "2.4.1.1"; - sha256 = "164pjybk054a3h3ydfakzibngpmp8a4cbzg0sip9slfb739nz25j"; + version = "2.4.1"; + sha256 = "1166ccqpjwr331chf7hi4n42m2frahpf93ardfjgv8x6d0p5pfss"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson authenticate base base64-bytestring boomerang @@ -118454,8 +118337,6 @@ self: { pname = "haskell-language-server"; version = "0.9.0.0"; sha256 = "0wzwadmrw57dqp9mszr4nmcnrwa01kav70z0wqkh8g2ag0kv3nfm"; - revision = "3"; - editedCabalFile = "02dvw9d9c7wja6y8q5ncjks5hjxjplnfn9jnw9cqzfyi97pv4cm6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120298,14 +120179,14 @@ self: { "haskellish" = callPackage ({ mkDerivation, base, containers, haskell-src-exts, mtl - , template-haskell, text + , template-haskell }: mkDerivation { pname = "haskellish"; - version = "0.2.4.2"; - sha256 = "1d7rpb9l1ycmcr8ahxjb5p2v3qdlwnjdxkm292bnakvwazgnq7cw"; + version = "0.2.3.1"; + sha256 = "0285mk3s1gl0xxwcqd22v800pcg75ml676nzs5pb96ybfniqksl0"; libraryHaskellDepends = [ - base containers haskell-src-exts mtl template-haskell text + base containers haskell-src-exts mtl template-haskell ]; description = "For parsing Haskell-ish languages"; license = lib.licenses.bsd3; @@ -120785,8 +120666,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.46.0"; - sha256 = "18iig8wbbgknzgzjxicjhpbhp7a9wzq1nrvixfwf4gpdlxmzq18y"; + version = "0.42.2"; + sha256 = "03xys3m0cdkjbabcrgc96sdb8ws3rrzq794ggnkwigwzgnav0gm0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120830,8 +120711,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.45.0"; - sha256 = "1hzlc8w9xmbwsvz6j74pxbkxla9a0wdgill81vn8g3zk4r7z0xx5"; + version = "0.42.1"; + sha256 = "17yfbd4vp9xx551bybpkiiv6w1x8067xmyrfff7zak3glzb3piva"; libraryHaskellDepends = [ aeson base bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl network @@ -127152,39 +127033,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "hie-bios_0_7_3" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , conduit, conduit-extra, containers, cryptohash-sha1, deepseq - , directory, extra, file-embed, filepath, ghc, hslogger - , hspec-expectations, optparse-applicative, process, tasty - , tasty-expected-failure, tasty-hunit, temporary, text, time - , transformers, unix-compat, unordered-containers, vector, yaml - }: - mkDerivation { - pname = "hie-bios"; - version = "0.7.3"; - sha256 = "0njgxy8dx43smqk4wv3zg0c8a7llbgnz4fbil9dw53yx2xncgapi"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring conduit conduit-extra - containers cryptohash-sha1 deepseq directory extra file-embed - filepath ghc hslogger process temporary text time transformers - unix-compat unordered-containers vector yaml - ]; - executableHaskellDepends = [ - base directory filepath ghc optparse-applicative - ]; - testHaskellDepends = [ - base directory extra filepath ghc hspec-expectations tasty - tasty-expected-failure tasty-hunit temporary text - unordered-containers yaml - ]; - description = "Set up a GHC API session"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "hie-compat" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, ghc, ghc-boot, transformers @@ -127901,23 +127749,23 @@ self: { "hinit" = callPackage ({ mkDerivation, base, Cabal, containers, directory, exceptions - , fused-effects, Glob, haskeline, megaparsec, mustache, optics-core - , optparse-applicative, parser-combinators, path, path-io + , fused-effects, generic-lens, Glob, haskeline, lens, megaparsec + , mustache, optparse-applicative, parser-combinators, path, path-io , prettyprinter, prettyprinter-ansi-terminal, process , quickcheck-text, spdx-license, string-interpolate, text, time , tomland }: mkDerivation { pname = "hinit"; - version = "0.2.1"; - sha256 = "10lhx18g50f24l867kjqgb2qpky3vvx7w7s4sc3pidr3hc0ams3g"; + version = "0.2.0"; + sha256 = "1iklwj1kzv7nbb4bnrj0idfb0k26jjpw51mkbib73j4jpciah01v"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base Cabal containers directory exceptions fused-effects Glob - haskeline megaparsec mustache optics-core optparse-applicative - parser-combinators path path-io prettyprinter + base Cabal containers directory exceptions fused-effects + generic-lens Glob haskeline lens megaparsec mustache + optparse-applicative parser-combinators path path-io prettyprinter prettyprinter-ansi-terminal process spdx-license string-interpolate text time tomland ]; @@ -134344,18 +134192,6 @@ self: { broken = true; }) {}; - "hs-swisstable-hashtables-class" = callPackage - ({ mkDerivation, base, hashtables, swisstable }: - mkDerivation { - pname = "hs-swisstable-hashtables-class"; - version = "0.1.0.0"; - sha256 = "15zc24ai13x11ksyhsrs05v9vh93mdlmx9p3rg3lkllqjqy6b35m"; - libraryHaskellDepends = [ base hashtables swisstable ]; - testHaskellDepends = [ base hashtables swisstable ]; - description = "Data.HashTable.Class instance definition for Data.HashTable.ST.Swiss"; - license = lib.licenses.bsd3; - }) {}; - "hs-twitter" = callPackage ({ mkDerivation, base, HTTP, json, mime, network, old-locale , old-time, random, utf8-string @@ -143838,22 +143674,6 @@ self: { broken = true; }) {}; - "ice40-prim" = callPackage - ({ mkDerivation, base, Cabal, clash-prelude, ghc-typelits-extra - , ghc-typelits-knownnat, ghc-typelits-natnormalise, interpolate - }: - mkDerivation { - pname = "ice40-prim"; - version = "0.1.0.0"; - sha256 = "00l0kwwayf0bark2yqjrx8imr8997d5mrnhjf3zsayxk9a521j99"; - libraryHaskellDepends = [ - base Cabal clash-prelude ghc-typelits-extra ghc-typelits-knownnat - ghc-typelits-natnormalise interpolate - ]; - description = "Lattice iCE40 Primitive IP"; - license = lib.licenses.bsd3; - }) {}; - "icepeak" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , directory, hashable, hspec, hspec-core, hspec-expectations @@ -150882,22 +150702,6 @@ self: { license = lib.licenses.mit; }) {}; - "jira-wiki-markup_1_3_3" = callPackage - ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }: - mkDerivation { - pname = "jira-wiki-markup"; - version = "1.3.3"; - sha256 = "0sgm9x2bdwazhj598aix2xyshjy6cvai4sgq5zz8gxv2l6prfbr7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base mtl parsec text ]; - executableHaskellDepends = [ base text ]; - testHaskellDepends = [ base parsec tasty tasty-hunit text ]; - description = "Handle Jira wiki markup"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - }) {}; - "jmacro" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , haskell-src-exts, haskell-src-meta, mtl, parseargs, parsec @@ -155429,8 +155233,10 @@ self: { }: mkDerivation { pname = "kqueue"; - version = "0.2.1"; - sha256 = "0svrswcglipmm47lnqi41hcsn1gvkcniva6qajwqxrdr0wvvhgdi"; + version = "0.2"; + sha256 = "0sbkyq17i41kln7scrfc9kdzsbyb787z33kzpkdz2vrziapns33h"; + revision = "3"; + editedCabalFile = "17wanwn4pmh6z6v7ncg50q4sgg87lllld50wa5j5mmb07q4c3mj7"; libraryHaskellDepends = [ base directory filepath mtl time unix ]; libraryToolDepends = [ c2hs ]; description = "A binding to the kqueue event library"; @@ -161559,8 +161365,8 @@ self: { ({ mkDerivation, base, bytestring, libtelnet }: mkDerivation { pname = "libtelnet"; - version = "0.1.0.1"; - sha256 = "13g7wpibjncj9h6yva8gj9fqs8j806r1vnina78wgv8f980dqxks"; + version = "0.1.0.0"; + sha256 = "0s2ldi4ikjdvki8r190mnkjd0jkahn8ln6gvqb8bn5d291j19nmc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -166430,8 +166236,8 @@ self: { }: mkDerivation { pname = "lsp"; - version = "1.1.1.0"; - sha256 = "04ndz4v1mwga13qndmnaaj145y5zqw7zv64px7ak26qvd1m26h9r"; + version = "1.0.0.1"; + sha256 = "1h7ymzzm00dnvbqxz4g0zp3mvm6v9bjbgkazz514wqrcmma27cm1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166505,27 +166311,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "lsp-test_0_13_0_0" = callPackage + "lsp-test_0_12_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default - , Diff, directory, filepath, Glob, hspec, lens, lsp-types, mtl - , parser-combinators, process, some, text, time, transformers, unix + , Diff, directory, filepath, Glob, haskell-lsp, hspec, lens, mtl + , parser-combinators, process, text, transformers, unix , unordered-containers }: mkDerivation { pname = "lsp-test"; - version = "0.13.0.0"; - sha256 = "1xyxmzcd6r56jj1k11lz1g6yld5q3k6cgb0bsf45px120dsf1dpy"; + version = "0.12.0.0"; + sha256 = "1zc43j7xyfxv2i9vinx82yhkrr6m4gz46jwn9p39k76ld6j8nzpd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async base bytestring conduit conduit-parse containers data-default Diff directory filepath Glob - lens lsp-types mtl parser-combinators process some text time - transformers unix unordered-containers + haskell-lsp lens mtl parser-combinators process text transformers + unix unordered-containers ]; testHaskellDepends = [ - aeson base data-default directory filepath hspec lens lsp-types + aeson base data-default directory filepath haskell-lsp hspec lens text unordered-containers ]; description = "Functional test framework for LSP servers"; @@ -166535,20 +166341,20 @@ self: { "lsp-types" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers - , data-default, deepseq, dependent-sum, dependent-sum-template - , directory, filepath, hashable, hslogger, lens, network-uri - , rope-utf16-splay, scientific, some, template-haskell, temporary - , text, unordered-containers + , data-default, deepseq, dependent-sum-template, directory + , filepath, hashable, hslogger, lens, network-uri, rope-utf16-splay + , scientific, some, template-haskell, temporary, text + , unordered-containers }: mkDerivation { pname = "lsp-types"; - version = "1.1.0.0"; - sha256 = "19lkdqwh9a5rsx5nby37v54zhwyja306z0dyslsmdmwqw92qxx54"; + version = "1.0.0.1"; + sha256 = "1yrm42qsbqk94ql0khifcpvicy9lbvwwrvnr41lplbb1vhqvqc27"; libraryHaskellDepends = [ aeson base binary bytestring containers data-default deepseq - dependent-sum dependent-sum-template directory filepath hashable - hslogger lens network-uri rope-utf16-splay scientific some - template-haskell temporary text unordered-containers + dependent-sum-template directory filepath hashable hslogger lens + network-uri rope-utf16-splay scientific some template-haskell + temporary text unordered-containers ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = lib.licenses.mit; @@ -174814,20 +174620,20 @@ self: { }) {}; "mmsyn7l" = callPackage - ({ mkDerivation, base, directory, mmsyn2-array, mmsyn3 - , mmsyn7ukr-common, process + ({ mkDerivation, base, directory, mmsyn2, mmsyn3, mmsyn7ukr + , process, vector }: mkDerivation { pname = "mmsyn7l"; - version = "0.9.0.0"; - sha256 = "0j8xi8jxak818sw310srxljrywggsa8ss1l4yw0razsa28h92nxq"; + version = "0.8.0.0"; + sha256 = "0w1k89phzxyq2nwzr0vn313rlp0f7d62vhdvq113pqszbdbjh6gd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base directory mmsyn2-array mmsyn3 mmsyn7ukr-common process + base directory mmsyn2 mmsyn3 mmsyn7ukr process vector ]; executableHaskellDepends = [ - base directory mmsyn2-array mmsyn3 mmsyn7ukr-common process + base directory mmsyn2 mmsyn3 mmsyn7ukr process vector ]; description = "Modifies the amplitudes of the Ukrainian sounds representations created by mmsyn7ukr package"; license = lib.licenses.mit; @@ -175135,33 +174941,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "modern-uri_0_3_4_0" = callPackage - ({ mkDerivation, base, bytestring, containers, contravariant - , criterion, deepseq, exceptions, hspec, hspec-discover - , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck - , reflection, tagged, template-haskell, text, weigh - }: - mkDerivation { - pname = "modern-uri"; - version = "0.3.4.0"; - sha256 = "1jb1bj2jgxhhvkc50h1c11c3zd66bpbi67b1h6b8773h0yiqffvk"; - libraryHaskellDepends = [ - base bytestring containers contravariant deepseq exceptions - megaparsec mtl profunctors QuickCheck reflection tagged - template-haskell text - ]; - testHaskellDepends = [ - base bytestring hspec hspec-megaparsec megaparsec QuickCheck text - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq megaparsec text weigh - ]; - description = "Modern library for working with URIs"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "modify-fasta" = callPackage ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split @@ -179411,8 +179190,8 @@ self: { }: mkDerivation { pname = "mu-rpc"; - version = "0.5.0.1"; - sha256 = "0r5kbi378iwg5b578dydvv4smy2xqn4y33h015fp5nyphxz83173"; + version = "0.5.0.0"; + sha256 = "15a950ig348h0fxfvzq4pj8s8rryn18cd26vmrcmx7s6w32zlzyr"; libraryHaskellDepends = [ aeson base conduit http-types mtl mu-schema sop-core template-haskell text wai @@ -181074,8 +180853,6 @@ self: { pname = "mwc-random"; version = "0.15.0.1"; sha256 = "1p8c5g4hb72k90ai39rgpn6cr942i6636l1y0zfp9xgjb3v0a2q3"; - revision = "1"; - editedCabalFile = "1ay26mvzxqw6rzw3hkib1j12gk6fa2hsilz12q8vhp646bqqc744"; libraryHaskellDepends = [ base math-functions primitive random time vector ]; @@ -183100,6 +182877,8 @@ self: { ]; description = "An MQTT Protocol Implementation"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "net-mqtt-lens" = callPackage @@ -183116,6 +182895,8 @@ self: { ]; description = "Optics for net-mqtt"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "net-mqtt-rpc" = callPackage @@ -183137,6 +182918,8 @@ self: { ]; description = "Make RPC calls via an MQTT broker"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "net-spider" = callPackage @@ -183965,8 +183748,6 @@ self: { pname = "network-byte-order"; version = "0.1.6"; sha256 = "0pnwcg13k4qw82n0zc1xibyc24sc77y79j5a62pqdmjrnz4wrc7j"; - revision = "1"; - editedCabalFile = "0fpyfd1adg9fr7w6afxkx306c0kaz3ji3x78sl29v9j3mh4vdn13"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring doctest ]; description = "Network byte order utilities"; @@ -197082,8 +196863,8 @@ self: { pname = "perfect-vector-shuffle"; version = "0.1.1.1"; sha256 = "1z4iv4sv9ld0gvdfa46ll5bsbxi9lckh69paip1c5ijcg78vy5y0"; - revision = "5"; - editedCabalFile = "0lppvhpfpfzcpdm4fxmsps8s272gz3wd2h5xc1w1908b7qqln0rw"; + revision = "4"; + editedCabalFile = "14q0773vxmkh4nwskiq85ch175jq12xms2lypaddglciykqs6ml6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -198933,8 +198714,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-base"; - version = "0.2.0.0"; - sha256 = "1382i77ci70ax7lvbkqqvg1wr2pp5irl8wxvypngr15czqgj7sca"; + version = "0.1.0.0"; + sha256 = "0fd2pslmgm5bvv0yiza87vp61601pl1c69xa5snbgrnb2mlp6f98"; libraryHaskellDepends = [ base phonetic-languages-permutations-array subG ]; @@ -200125,23 +199906,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "pipes-bytestring_2_1_7" = callPackage - ({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse - , stringsearch, transformers - }: - mkDerivation { - pname = "pipes-bytestring"; - version = "2.1.7"; - sha256 = "0ch7145pv4f56601ysdj5gqqwsh5ag2zh34ydswg62fqi8z8cxvc"; - libraryHaskellDepends = [ - base bytestring pipes pipes-group pipes-parse stringsearch - transformers - ]; - description = "ByteString support for pipes"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "pipes-bzip" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, bzlib , data-default, directory, hspec, MonadRandom, mtl, pipes @@ -200802,18 +200566,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "pipes-parse_3_0_9" = callPackage - ({ mkDerivation, base, pipes, transformers }: - mkDerivation { - pname = "pipes-parse"; - version = "3.0.9"; - sha256 = "05cd0j1avkzmryf3869hfpvd9xmzbpz4kc65srswx36n06dkz5x3"; - libraryHaskellDepends = [ base pipes transformers ]; - description = "Parsing infrastructure for the pipes ecosystem"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "pipes-postgresql-simple" = callPackage ({ mkDerivation, async, base, bytestring, exceptions, mtl, pipes , pipes-concurrency, pipes-safe, postgresql-simple, stm, text @@ -200922,23 +200674,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "pipes-safe_2_3_3" = callPackage - ({ mkDerivation, base, containers, exceptions, monad-control, mtl - , pipes, primitive, transformers, transformers-base - }: - mkDerivation { - pname = "pipes-safe"; - version = "2.3.3"; - sha256 = "19gp93x5m1bnq240bj3v33pglf9r5gzji39fsjcazji837czghab"; - libraryHaskellDepends = [ - base containers exceptions monad-control mtl pipes primitive - transformers transformers-base - ]; - description = "Safety for the pipes ecosystem"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "pipes-shell" = callPackage ({ mkDerivation, async, base, bytestring, directory, hspec, pipes , pipes-bytestring, pipes-safe, process, stm, stm-chans, text @@ -201199,21 +200934,6 @@ self: { broken = true; }) {}; - "pixel-printer" = callPackage - ({ mkDerivation, base, JuicyPixels, lens }: - mkDerivation { - pname = "pixel-printer"; - version = "0.1.0"; - sha256 = "1cx485lvd5z6895jv1iiq93kspch78w9m730ggw6nvf0rimvazyy"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base JuicyPixels lens ]; - executableHaskellDepends = [ base JuicyPixels ]; - testHaskellDepends = [ base ]; - description = "A program for turning pixel art into 3D prints"; - license = lib.licenses.gpl3; - }) {}; - "pixela" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default-class , http-client, http-client-tls, http-types, split, text, time @@ -213653,8 +213373,8 @@ self: { pname = "random"; version = "1.2.0"; sha256 = "1pmr7zbbqg58kihhhwj8figf5jdchhi7ik2apsyxbgsqq3vrqlg4"; - revision = "5"; - editedCabalFile = "1jai1pcs39ijdhxc8q36x1yayr8rsblhx3y88paf4bqxrks2vmrh"; + revision = "4"; + editedCabalFile = "08mq836ganl3sq6mfn3hrj6xm0h30klp21y7gbd9md2882agndrk"; libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ]; testHaskellDepends = [ base bytestring containers doctest mwc-random primitive smallcheck @@ -213721,24 +213441,6 @@ self: { license = lib.licenses.mit; }) {}; - "random-bytestring_0_1_4" = callPackage - ({ mkDerivation, async, base, bytestring, criterion, cryptonite - , entropy, ghc-prim, mwc-random, pcg-random, primitive, random - }: - mkDerivation { - pname = "random-bytestring"; - version = "0.1.4"; - sha256 = "0f4n41gqxxggadysvx3vg2iq89z7i7692ccrfmiajq73lbp6y34j"; - libraryHaskellDepends = [ base bytestring mwc-random pcg-random ]; - benchmarkHaskellDepends = [ - async base bytestring criterion cryptonite entropy ghc-prim - mwc-random pcg-random primitive random - ]; - description = "Efficient generation of random bytestrings"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - }) {}; - "random-class" = callPackage ({ mkDerivation, base, primitive, transformers, util }: mkDerivation { @@ -221415,8 +221117,8 @@ self: { }: mkDerivation { pname = "rhbzquery"; - version = "0.4.3"; - sha256 = "13brargymd1c9b0csaprj85qdqg98bzj3z2smbb0v66myj48v6fp"; + version = "0.4.2"; + sha256 = "1j9nxizi1wsgz5gamdn9izy4aq6ci41gbkvsw7bbpc8fnvv5gpd2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -225690,16 +225392,16 @@ self: { , containers, crackNum, deepseq, directory, doctest, filepath , gauge, Glob, hlint, mtl, pretty, process, QuickCheck, random , silently, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck - , template-haskell, text, time, transformers, uniplate, z3 + , template-haskell, time, transformers, uniplate, z3 }: mkDerivation { pname = "sbv"; - version = "8.10"; - sha256 = "1j9hy840dl78rr1ixhlz24wwymbpiv46hpz8i6dd0gngrfha09ji"; + version = "8.9"; + sha256 = "1h8bhi1pjlg0v16wwqcvil7gq98b6dn8ckzmrsgb8sc3qz0nxj51"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers crackNum deepseq directory filepath mtl - pretty process QuickCheck random syb template-haskell text time + pretty process QuickCheck random syb template-haskell time transformers uniplate ]; testHaskellDepends = [ @@ -225710,7 +225412,7 @@ self: { testSystemDepends = [ z3 ]; benchmarkHaskellDepends = [ base bench-show containers crackNum deepseq directory filepath - gauge mtl process random silently syb text time + gauge mtl process random silently syb time ]; description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; license = lib.licenses.bsd3; @@ -232015,39 +231717,14 @@ self: { license = lib.licenses.mit; }) {}; - "serversession_1_0_2" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , containers, data-default, hashable, hspec, nonce, path-pieces - , persistent-test, QuickCheck, text, time, transformers - , unordered-containers - }: - mkDerivation { - pname = "serversession"; - version = "1.0.2"; - sha256 = "02ynhgq6gn5ddx2yd8ns8ay0rrhzln2h6jrmnwk7x1fqqfvzx0jf"; - libraryHaskellDepends = [ - aeson base base64-bytestring bytestring data-default hashable nonce - path-pieces persistent-test text time transformers - unordered-containers - ]; - testHaskellDepends = [ - aeson base base64-bytestring bytestring containers data-default - hspec nonce path-pieces QuickCheck text time transformers - unordered-containers - ]; - description = "Secure, modular server-side sessions"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - }) {}; - "serversession-backend-acid-state" = callPackage ({ mkDerivation, acid-state, base, containers, hspec, mtl, safecopy , serversession, unordered-containers }: mkDerivation { pname = "serversession-backend-acid-state"; - version = "1.0.4"; - sha256 = "1mchxnkrpa6grp8h5iji40fyhya2lvb433yby4iymaaakzgjs19z"; + version = "1.0.3"; + sha256 = "1rkw5an7lwx05063caqjhvf449jxij2zrbymg64p600mngb1flq0"; libraryHaskellDepends = [ acid-state base containers mtl safecopy serversession unordered-containers @@ -232071,8 +231748,8 @@ self: { }: mkDerivation { pname = "serversession-backend-persistent"; - version = "1.0.5"; - sha256 = "1mcaqafyr5x0v475j7rs2z4059jggzfj8rky66ls0mlvd9br91s0"; + version = "1.0.4"; + sha256 = "074pxfv1yj6ffxp4bg0ia20w7ikdja3g3k1l93nnjcni13zddwn7"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cereal path-pieces persistent serversession tagged text time transformers @@ -232097,8 +231774,8 @@ self: { }: mkDerivation { pname = "serversession-backend-redis"; - version = "1.0.4"; - sha256 = "1rrz2p103271pyhdlbwim8vz91yl1qip0lagf74d277x74v9hyp5"; + version = "1.0.3"; + sha256 = "059nak15x4cbwmfbvfih6ndwa6i5jhcba22h9gz44f6s84vhljyf"; libraryHaskellDepends = [ base bytestring hedis path-pieces serversession tagged text time transformers unordered-containers @@ -234699,8 +234376,8 @@ self: { }: mkDerivation { pname = "signable"; - version = "0.3"; - sha256 = "1bh4i93333s3yldn4nnl4xv4gb92ggdwap6im9f259cfg1v22d2q"; + version = "0.2"; + sha256 = "1p1g6jhxgskl890g84nw8d465pan9d3prbc4jvyn8502bx00w01s"; libraryHaskellDepends = [ asn1-encoding asn1-types base binary bytestring casing cryptonite memory microlens pem proto-lens proto-lens-runtime @@ -246453,8 +246130,8 @@ self: { pname = "streamproc"; version = "1.6.2"; sha256 = "1wl44n4nav4h203mzfdf1bd5nh4v23dib54lvxka1rl3zymgyvp7"; - revision = "2"; - editedCabalFile = "1j3frdzhlvmggqq07b7kiz6h7mim64n2frsb2d3hzsjd7jym526j"; + revision = "1"; + editedCabalFile = "19c51gks028x8mnywkx1nz0s6bwn2mxs5ddmaj2q8n9l5pvfkcgs"; libraryHaskellDepends = [ base ]; description = "Stream Processer Arrow"; license = lib.licenses.bsd3; @@ -246892,35 +246569,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "string-interpolate_0_3_1_0" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, formatting - , haskell-src-exts, haskell-src-meta, hspec, hspec-core - , interpolate, neat-interpolation, QuickCheck, quickcheck-instances - , quickcheck-text, quickcheck-unicode, split, template-haskell - , text, text-conversions, unordered-containers, utf8-string - }: - mkDerivation { - pname = "string-interpolate"; - version = "0.3.1.0"; - sha256 = "0hyrcndhwd06phlmykyz7bklj5gnj4amcn11ckfvw0iws3sksl8d"; - libraryHaskellDepends = [ - base bytestring haskell-src-exts haskell-src-meta split - template-haskell text text-conversions utf8-string - ]; - testHaskellDepends = [ - base bytestring hspec hspec-core QuickCheck quickcheck-instances - quickcheck-text quickcheck-unicode template-haskell text - unordered-containers - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq formatting interpolate - neat-interpolation QuickCheck text - ]; - description = "Haskell string/text/bytestring interpolation that just works"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "string-isos" = callPackage ({ mkDerivation, base, bytestring, mono-traversable, safe, text , type-iso @@ -249319,28 +248967,6 @@ self: { broken = true; }) {}; - "swisstable" = callPackage - ({ mkDerivation, base, criterion, deepseq, hashable, hashtables - , primitive, QuickCheck, tasty, tasty-discover, tasty-hunit, vector - }: - mkDerivation { - pname = "swisstable"; - version = "0.1.0.2"; - sha256 = "0zffsavnxnwhzxgbwpqg38gnjywgfdk60hbg0wvpggk1zaw0ylr1"; - libraryHaskellDepends = [ base hashable primitive vector ]; - testHaskellDepends = [ - base hashable primitive QuickCheck tasty tasty-discover tasty-hunit - vector - ]; - testToolDepends = [ tasty-discover ]; - benchmarkHaskellDepends = [ - base criterion deepseq hashable hashtables primitive QuickCheck - vector - ]; - description = "SwissTable hash map"; - license = lib.licenses.bsd3; - }) {}; - "sws" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring , containers, cryptonite, directory, filepath, hourglass @@ -257554,8 +257180,6 @@ self: { pname = "these"; version = "1.1.1.1"; sha256 = "027m1gd7i6jf2ppfkld9qrv3xnxg276587pmx10z9phpdvswk66p"; - revision = "1"; - editedCabalFile = "1bzi28jvaxil9rc6z1hkf87pfjsa3r5gfc9n0ixffnnv519cd0g9"; libraryHaskellDepends = [ assoc base binary deepseq hashable ]; description = "An either-or-both data type"; license = lib.licenses.bsd3; @@ -258576,8 +258200,6 @@ self: { pname = "time-compat"; version = "1.9.5"; sha256 = "19p3056i6kh8lgcdsnwsh8pj80xyi23kmw9n7hmdacczs5kv49ii"; - revision = "1"; - editedCabalFile = "1f6r8cyfgzpfg9nrsqbf99pi44fyds9wcmgwxb4s0zmlb5dbv1m5"; libraryHaskellDepends = [ base base-orphans deepseq time ]; testHaskellDepends = [ base base-compat deepseq HUnit QuickCheck tagged tasty tasty-hunit @@ -260556,38 +260178,6 @@ self: { license = lib.licenses.mpl20; }) {}; - "tomland_1_3_2_0" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , hashable, hedgehog, hspec, hspec-golden, hspec-hedgehog - , hspec-megaparsec, markdown-unlit, megaparsec, mtl - , parser-combinators, text, time, transformers - , unordered-containers, validation-selective - }: - mkDerivation { - pname = "tomland"; - version = "1.3.2.0"; - sha256 = "0yj39mh4z3v3jqri38s3ylrglv657g3m7gqr2rz8ydlvx2draknc"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers deepseq hashable megaparsec mtl - parser-combinators text time transformers unordered-containers - validation-selective - ]; - executableHaskellDepends = [ - base bytestring containers hashable text time unordered-containers - ]; - executableToolDepends = [ markdown-unlit ]; - testHaskellDepends = [ - base bytestring containers directory hashable hedgehog hspec - hspec-golden hspec-hedgehog hspec-megaparsec megaparsec text time - unordered-containers - ]; - description = "Bidirectional TOML serialization"; - license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; - }) {}; - "tomlcheck" = callPackage ({ mkDerivation, base, htoml-megaparsec, megaparsec , optparse-applicative, text @@ -266212,32 +265802,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "ua-parser_0_7_6_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, criterion, data-default - , deepseq, file-embed, filepath, HUnit, pcre-light, tasty - , tasty-hunit, tasty-quickcheck, text, yaml - }: - mkDerivation { - pname = "ua-parser"; - version = "0.7.6.0"; - sha256 = "0sakvmmf6p2ca0dbkwqdj5cv93gp78srw0zc4f1skcgndkmxwk6l"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring data-default file-embed pcre-light text yaml - ]; - testHaskellDepends = [ - aeson base bytestring data-default file-embed filepath HUnit - pcre-light tasty tasty-hunit tasty-quickcheck text yaml - ]; - benchmarkHaskellDepends = [ - aeson base bytestring criterion data-default deepseq file-embed - filepath pcre-light text yaml - ]; - description = "A library for parsing User-Agent strings, official Haskell port of ua-parser"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "uacpid" = callPackage ({ mkDerivation, base, containers, directory, filepath, hslogger , mtl, network, process, regex-compat, time, time-locale-compat @@ -270230,8 +269794,8 @@ self: { pname = "uuid"; version = "1.3.13"; sha256 = "09xhk42yhxvqmka0iqrv3338asncz8cap3j0ic0ps896f2581b6z"; - revision = "5"; - editedCabalFile = "0hv9xrs6n005cid9laxbimyg5cxywvcd0fh8pyadqqvk3b8zlj9d"; + revision = "3"; + editedCabalFile = "1p2srrapgx1f3zkdjjzm5g0dyfpg1h2g056la85xmpyjs77la2rq"; libraryHaskellDepends = [ base binary bytestring cryptohash-md5 cryptohash-sha1 entropy network-info random text time uuid-types @@ -270350,8 +269914,8 @@ self: { pname = "uuid-types"; version = "1.0.3"; sha256 = "1zdka5jnm1h6k36w3nr647yf3b5lqb336g3fkprhd6san9x52xlj"; - revision = "4"; - editedCabalFile = "0ipwfd5y8021ygpadjjhchw5irm0x27dlv1k2hf4znza5v7hadcn"; + revision = "3"; + editedCabalFile = "0znx08r25sgs5j7ix8i9aikhgad0kc9i6vgkg0g3jzxk5haal9sf"; libraryHaskellDepends = [ base binary bytestring deepseq hashable random text ]; @@ -272045,8 +271609,8 @@ self: { }: mkDerivation { pname = "vega-view"; - version = "0.3.1.7"; - sha256 = "1181gfxyxf2m3m23xg89kmmp8aizrm9sm908ydbkw885idh2k5x0"; + version = "0.3.1.6"; + sha256 = "0s9d3g47qnzcpi2p1z60axrr53jbc6q4qyma88qxsrf6ava115ar"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -283275,23 +282839,6 @@ self: { broken = true; }) {inherit (pkgs) libdevil;}; - "yasi" = callPackage - ({ mkDerivation, base, bytestring, hedgehog, tasty, tasty-discover - , tasty-hedgehog, tasty-hunit, template-haskell, text - }: - mkDerivation { - pname = "yasi"; - version = "0.1.1.1"; - sha256 = "0b3ajgxf8bk2pjfwqmf748x1yzyq9knjsya2xzkdrjs5vffg1j9k"; - libraryHaskellDepends = [ base bytestring template-haskell text ]; - testHaskellDepends = [ - base hedgehog tasty tasty-hedgehog tasty-hunit text - ]; - testToolDepends = [ tasty-discover ]; - description = "Yet another string interpolator"; - license = lib.licenses.cc0; - }) {}; - "yate" = callPackage ({ mkDerivation, aeson, attoparsec, base, hspec, mtl, scientific , template-haskell, text, unordered-containers, vector diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index 5f9936c5124..e7a15d5d869 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -2,8 +2,13 @@ set -eu -o pipefail DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -node2nix=$(nix-build ../../.. --no-out-link -A nodePackages.node2nix) - +node2nix=$(nix-build ../../.. -A nodePackages.node2nix) cd ${DIR} rm -f ./node-env.nix ${node2nix}/bin/node2nix -i node-packages.json -o node-packages.nix -c composition.nix +# using --no-out-link in nix-build argument would cause the +# gc to run before the script finishes +# which would cause a failure +# it's safer to just remove the link after the script finishes +# see https://github.com/NixOS/nixpkgs/issues/112846 for more details +rm ./result diff --git a/pkgs/development/ocaml-modules/base64/default.nix b/pkgs/development/ocaml-modules/base64/default.nix index de0bc13e283..efb7f41b95d 100644 --- a/pkgs/development/ocaml-modules/base64/default.nix +++ b/pkgs/development/ocaml-modules/base64/default.nix @@ -1,20 +1,21 @@ -{ lib, fetchurl, buildDunePackage, alcotest, bos, dune-configurator }: +{ lib, fetchurl, buildDunePackage, ocaml, alcotest, bos, rresult }: buildDunePackage rec { pname = "base64"; - version = "3.4.0"; + version = "3.5.0"; + + minimumOCamlVersion = "4.03"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/ocaml-base64/releases/download/v${version}/base64-v${version}.tbz"; - sha256 = "0d0n5gd4nkdsz14jnxq13f1f7rzxmndg5xql039a8wfppmazd70w"; + sha256 = "sha256-WJ3pwAV46/54QZismBjTWGxHSyMWts0+HEbMsfYq46Q="; }; - buildInputs = [ bos dune-configurator ]; - - doCheck = true; - checkInputs = [ alcotest ]; + # otherwise fmt breaks evaluation + doCheck = lib.versionAtLeast ocaml.version "4.05"; + checkInputs = [ alcotest bos rresult ]; meta = { homepage = "https://github.com/mirage/ocaml-base64"; diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index 29b18e0bf98..5632cfbb7c3 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -533,6 +533,14 @@ rec { propagatedBuildInputs = [ ppxlib ]; }; + ppx_log = janePackage { + pname = "ppx_log"; + hash = "10hnr5lpww3fw0bnidzngalbgy0j1wvz1g5ki9c9h558pnpvsazr"; + minimumOCamlVersion = "4.08.0"; + meta.description = "Ppx_sexp_message-like extension nodes for lazily rendering log messages"; + propagatedBuildInputs = [ async_unix ppx_jane sexplib ]; + }; + ppx_module_timer = janePackage { pname = "ppx_module_timer"; hash = "163q1rpblwv82fxwyf0p4j9zpsj0jzvkfmzb03r0l49gqhn89mp6"; diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix index ba571b32084..7525a10030e 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix @@ -6,6 +6,8 @@ buildDunePackage rec { minimumOCamlVersion = "4.03"; + useDune2 = true; + src = fetchurl { url = "https://github.com/gildor478/ocaml-gettext/releases/download/v${version}/gettext-v${version}.tbz"; sha256 = "19ynsldb21r539fiwz1f43apsdnx7hj2a2d9qr9wg2hva9y2qrwb"; diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix index b18c0abc530..51e902b9140 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix @@ -1,14 +1,16 @@ -{ lib, buildDunePackage, ocaml_gettext, ounit }: +{ buildDunePackage, ocaml_gettext, dune-configurator, ounit }: buildDunePackage rec { pname = "gettext-stub"; - inherit (ocaml_gettext) src version meta; + inherit (ocaml_gettext) src version useDune2 meta; + + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ ocaml_gettext ]; doCheck = true; - checkInputs = lib.optional doCheck ounit; + checkInputs = [ ounit ]; } diff --git a/pkgs/development/ocaml-modules/ounit2/default.nix b/pkgs/development/ocaml-modules/ounit2/default.nix index 52676a1c88d..0b68609584d 100644 --- a/pkgs/development/ocaml-modules/ounit2/default.nix +++ b/pkgs/development/ocaml-modules/ounit2/default.nix @@ -6,6 +6,8 @@ buildDunePackage rec { pname = "ounit2"; version = "2.2.4"; + useDune2 = lib.versionAtLeast ocaml.version "4.08"; + src = fetchurl { url = "https://github.com/gildor478/ounit/releases/download/v${version}/ounit-v${version}.tbz"; sha256 = "0i9kiqbf2dp12c4qcvbn4abdpdp6h4g5z54ycsh0q8jpv6jnkh5m"; diff --git a/pkgs/development/ocaml-modules/stdint/default.nix b/pkgs/development/ocaml-modules/stdint/default.nix index bffef61956e..c849ffee479 100644 --- a/pkgs/development/ocaml-modules/stdint/default.nix +++ b/pkgs/development/ocaml-modules/stdint/default.nix @@ -1,18 +1,39 @@ -{ lib, fetchFromGitHub, buildDunePackage }: +{ lib, fetchurl, fetchpatch, buildDunePackage, qcheck }: buildDunePackage rec { pname = "stdint"; - version = "0.6.0"; + version = "0.7.0"; - minimumOCamlVersion = "4.07"; + useDune2 = true; - src = fetchFromGitHub { - owner = "andrenth"; - repo = "ocaml-stdint"; - rev = version; - sha256 = "19ccxs0vij81vyc9nqc9kbr154ralb9dgc2y2nr71a5xkx6xfn0y"; + minimumOCamlVersion = "4.03"; + + src = fetchurl { + url = "https://github.com/andrenth/ocaml-stdint/releases/download/${version}/stdint-${version}.tbz"; + sha256 = "4fcc66aef58e2b96e7af3bbca9d910aa239e045ba5fb2400aaef67d0041252dc"; }; + patches = [ + # fix test bug, remove at next release + (fetchpatch { + url = "https://github.com/andrenth/ocaml-stdint/commit/fc64293f99f597cdfd4470954da6fb323988e2af.patch"; + sha256 = "0nxck14vfjfzldsf8cdj2jg1cvhnyh37hqnrcxbdkqmpx4rxkbxs"; + }) + ]; + + # disable remaining broken tests, see + # https://github.com/andrenth/ocaml-stdint/issues/59 + postPatch = '' + substituteInPlace tests/stdint_test.ml \ + --replace 'test "An integer should perform left-shifts correctly"' \ + 'skip "An integer should perform left-shifts correctly"' \ + --replace 'test "Logical shifts must not sign-extend"' \ + 'skip "Logical shifts must not sign-extend"' + ''; + + doCheck = true; + checkInputs = [ qcheck ]; + meta = { description = "Various signed and unsigned integers for OCaml"; homepage = "https://github.com/andrenth/ocaml-stdint"; diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index 020b256c72f..433e3f9cb10 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -1,12 +1,15 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, uunf }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, uunf, uucd }: let pname = "uucp"; - version = "11.0.0"; + version = "13.0.0"; webpage = "https://erratique.ch/software/${pname}"; + minimumOCamlVersion = "4.03"; + doCheck = true; in -assert lib.versionAtLeast ocaml.version "4.01"; +assert lib.assertMsg (lib.versionAtLeast ocaml.version minimumOCamlVersion) + "${pname} needs at least OCaml ${minimumOCamlVersion}"; stdenv.mkDerivation { @@ -14,17 +17,29 @@ stdenv.mkDerivation { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "0pidg2pmqsifmk4xx9cc5p5jprhg26xb68g1xddjm7sjzbdzhlm4"; + sha256 = "sha256-OPpHbCOC/vMFdyHwyhCSisUv2PyO8xbeY2oq1a9HbqY="; }; buildInputs = [ ocaml findlib ocamlbuild topkg uutf uunf ]; propagatedBuildInputs = [ uchar ]; - buildPhase = "${topkg.buildPhase} --with-cmdliner false"; + buildPhase = '' + runHook preBuild + ${topkg.buildPhase} --with-cmdliner false --tests ${lib.boolToString doCheck} + runHook postBuild + ''; inherit (topkg) installPhase; + inherit doCheck; + checkPhase = '' + runHook preCheck + ${topkg.run} test + runHook postCheck + ''; + checkInputs = [ uucd ]; + meta = with lib; { description = "An OCaml library providing efficient access to a selection of character properties of the Unicode character database"; homepage = webpage; diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index d1dcce9699b..9b6e5da6263 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -1,20 +1,31 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, pytestCheckHook +}: buildPythonPackage rec { pname = "ConfigArgParse"; - version = "1.2.3"; + version = "1.3"; - src = fetchPypi { - inherit pname version; - sha256 = "1p1pzpf5qpf80bfxsx1mbw9blyhhypjvhl3i60pbmhfmhvlpplgd"; + src = fetchFromGitHub { + owner = "bw2"; + repo = pname; + rev = version; + sha256 = "147x781lgahn9r3gbhayhx1pf0iysf7q1hnr3kypy3p2k9v7a9mh"; }; - # no tests in tarball - doCheck = false; + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "configargparse" ]; meta = with lib; { description = "A drop-in replacement for argparse"; - homepage = "https://github.com/zorro3/ConfigArgParse"; + homepage = "https://github.com/bw2/ConfigArgParse"; license = licenses.mit; maintainers = [ maintainers.willibutz ]; }; diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 75f4908b63b..d0ad132991f 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.19.1"; + version = "4.20.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "16jz3g4jzfdc43hs33b59vzd9m233qgflvy3ycdynifqk16lqsp2"; + sha256 = "0yj83vsjh23g7gkmq6svbgc898x3qgygkhvpcbpycvmpwxxqxh1v"; }; # all dependencies are optional, but diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index daa181a9cfc..961137ed9ab 100644 --- a/pkgs/development/python-modules/hatasmota/default.nix +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.2.8"; + version = "0.2.9"; src = fetchFromGitHub { owner = "emontnemery"; repo = pname; rev = version; - sha256 = "sha256-DuVpo+g5VS7bkj/DZi0vNOAPjPkzfIA5I2BD5KJ/rNQ="; + sha256 = "sha256-+4jlzemF5f4Qz4QHDaErsmVHq1Pjn/vsvoq/oCbW/hI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 704d9174ebd..85f07b182d8 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -1,33 +1,39 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi , fetchzip , alembic -, ipython -, jinja2 -, python-oauth2 -, prometheus_client , async_generator +, certipy +, dateutil +, entrypoints +, jinja2 +, jupyter-telemetry +, oauthlib , pamela +, prometheus_client +, requests , sqlalchemy , tornado , traitlets -, requests -, notebook -, pythonOlder , nodePackages -, oauthlib -, certipy -, jupyter-telemetry +, beautifulsoup4 +, cryptography +, notebook +, pytest-asyncio +, pytestCheckHook +, requests-mock +, virtualenv }: let # js/css assets that setup.py tries to fetch via `npm install` when building - # from source. + # from source. https://github.com/jupyterhub/jupyterhub/blob/master/package.json bootstrap = fetchzip { - url = "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz"; - sha256 = "0r7s54bbf68ri1na9bbabyf12mcpb6zk5ja2q6z82aw1fa4xi3yd"; + url = "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz"; + sha256 = "1ywmxqdccg0mgx0xknrn1hlrfnhcwphc12y9l91zizx26fqfmzgc"; }; font-awesome = fetchzip { @@ -36,30 +42,30 @@ let }; jquery = fetchzip { - url = "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz"; - sha256 = "1j6y18miwzafdj8kfpwbmbn9qvgnbnpc7l4arqrhqj33m04xrlgi"; + url = "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz"; + sha256 = "0yi9ql493din1qa1s923nd5zvd0klk1sx00xj1wx2yambmq86vm9"; }; moment = fetchzip { - url = "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz"; - sha256 = "12gb3p0rz5wyjwykv9g0pix7dd352lx1z7rzdjsf2brhwc4ffyip"; + url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz"; + sha256 = "0ifzzla4zffw23g3xvhwx3fj3jny6cjzxfzl1x0317q8wa0c7w5i"; }; requirejs = fetchzip { - url = "https://registry.npmjs.org/requirejs/-/requirejs-2.3.4.tgz"; - sha256 = "0q6mkj0iv341kks06dya6lfs2kdw0n6vc7n4a7aa3ia530fk9vja"; + url = "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz"; + sha256 = "165hkli3qcd59cjqvli9r5f92i0h7czkmhcg1cgwamw2d0b7xibz"; }; in buildPythonPackage rec { pname = "jupyterhub"; - version = "1.1.0"; - disabled = pythonOlder "3.5"; + version = "1.3.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1mqknz0rxqzx4nc57vscvfh2d4znzlzpy83ancqxdaq3b8i70al5"; + sha256 = "13pf6qhimpaxj20871ff5rvwwan59320cdhhrn9cfh6314971zq5"; }; # Most of this only applies when building from source (e.g. js/css assets are @@ -86,12 +92,7 @@ buildPythonPackage rec { "'${nodePackages.configurable-http-proxy}/bin/configurable-http-proxy'" substituteInPlace setup.py --replace \ - "'npm', 'run', 'lessc', '--'" \ - "'${nodePackages.less}/bin/lessc'" - - substituteInPlace setup.py --replace \ - "'npm', 'install', '--progress=false'" \ - "'true'" + "'npm'" "'true'" declare -A deps deps[bootstrap]=${bootstrap} @@ -109,14 +110,45 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - alembic ipython jinja2 pamela python-oauth2 requests sqlalchemy tornado - traitlets prometheus_client async_generator notebook certipy oauthlib + # https://github.com/jupyterhub/jupyterhub/blob/master/requirements.txt + alembic + async_generator + certipy + dateutil + entrypoints + jinja2 jupyter-telemetry + oauthlib + pamela + prometheus_client + requests + sqlalchemy + tornado + traitlets ]; - # Disable tests because they take an excessive amount of time to complete. - doCheck = false; + preCheck = '' + substituteInPlace jupyterhub/tests/test_spawner.py --replace \ + "'jupyterhub-singleuser'" "'$out/bin/jupyterhub-singleuser'" + ''; + checkInputs = [ + # https://github.com/jupyterhub/jupyterhub/blob/master/dev-requirements.txt + beautifulsoup4 + cryptography + notebook + pytest-asyncio + pytestCheckHook + requests-mock + virtualenv + ]; + + disabledTests = [ + # Tries to install older versions through pip + "test_upgrade" + # Testcase fails to find requests import + "test_external_service" + ]; meta = with lib; { description = "Serves multiple Jupyter notebook instances"; diff --git a/pkgs/development/python-modules/modeled/default.nix b/pkgs/development/python-modules/modeled/default.nix index 66fe63e3daf..acf8ee4c112 100644 --- a/pkgs/development/python-modules/modeled/default.nix +++ b/pkgs/development/python-modules/modeled/default.nix @@ -24,9 +24,11 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "modeled" ]; + meta = with lib; { description = "Universal data modeling for Python"; - homepage = "https://bitbucket.org/userzimmermann/python-modeled"; + homepage = "https://github.com/modeled/modeled"; license = licenses.lgpl3Only; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 2394e32403f..234c4edd1ae 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -1,41 +1,42 @@ { lib , buildPythonPackage +, pythonOlder +, fetchPypi +, google_api_python_client +, google-auth-oauthlib , jupyterhub -, globus-sdk , mwoauth -, codecov -, flake8 , pyjwt -, pytest -, pytestcov -, pytest-tornado +, pytest-asyncio +, pytestCheckHook , requests-mock -, pythonOlder -, fetchPypi }: buildPythonPackage rec { pname = "oauthenticator"; - version = "0.12.3"; + version = "0.13.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f86e18e954ae37796ee149fe01ab0be0707d9e0415d62336ba3447e7b4383461"; + sha256 = "5202adcd96ddbbccbc267da02f2d14e977300c81291aaa77be4fd9f2e27cfa37"; }; - checkPhase = '' - py.test oauthenticator/tests - ''; - - # No tests in archive - doCheck = false; - - checkInputs = [ globus-sdk mwoauth codecov flake8 pytest - pytestcov pytest-tornado requests-mock pyjwt ]; - - propagatedBuildInputs = [ jupyterhub ]; - - disabled = pythonOlder "3.4"; + propagatedBuildInputs = [ + jupyterhub + ]; + + pytestFlagsArray = [ "oauthenticator/tests" ]; + + checkInputs = [ + google_api_python_client + google-auth-oauthlib + mwoauth + pyjwt + pytest-asyncio + pytestCheckHook + requests-mock + ]; meta = with lib; { description = "Authenticate JupyterHub users with common OAuth providers, including GitHub, Bitbucket, and more."; diff --git a/pkgs/development/python-modules/python-engineio/3.nix b/pkgs/development/python-modules/python-engineio/3.nix new file mode 100644 index 00000000000..e4c71782f99 --- /dev/null +++ b/pkgs/development/python-modules/python-engineio/3.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, eventlet +, iana-etc +, libredirect +, mock +, requests +, six +, tornado +, websocket_client +, websockets +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "python-engineio"; + version = "3.14.2"; + + src = fetchFromGitHub { + owner = "miguelgrinberg"; + repo = "python-engineio"; + rev = "v${version}"; + sha256 = "1r3gvizrknbv036pvxid1l726wkb0l43bdaz5y879s7j3ipyb464"; + }; + + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + aiohttp + eventlet + mock + requests + tornado + websocket_client + websockets + pytestCheckHook + ]; + + preCheck = lib.optionalString stdenv.isLinux '' + echo "nameserver 127.0.0.1" > resolv.conf + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \ + LD_PRELOAD=${libredirect}/lib/libredirect.so + ''; + postCheck = '' + unset NIX_REDIRECTS LD_PRELOAD + ''; + + # somehow effective log level does not change? + disabledTests = [ "test_logger" ]; + pythonImportsCheck = [ "engineio" ]; + + meta = with lib; { + description = "Python based Engine.IO client and server v3.x"; + longDescription = '' + Engine.IO is a lightweight transport protocol that enables real-time + bidirectional event-based communication between clients and a server. + ''; + homepage = "https://github.com/miguelgrinberg/python-engineio/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ graham33 ]; + }; +} diff --git a/pkgs/development/python-modules/python-socketio/4.nix b/pkgs/development/python-modules/python-socketio/4.nix new file mode 100644 index 00000000000..3a6f5d87fdd --- /dev/null +++ b/pkgs/development/python-modules/python-socketio/4.nix @@ -0,0 +1,47 @@ +{ lib +, bidict +, buildPythonPackage +, fetchFromGitHub +, mock +, pytestCheckHook +, python-engineio_3 +}: + +buildPythonPackage rec { + pname = "python-socketio"; + version = "4.6.1"; + + src = fetchFromGitHub { + owner = "miguelgrinberg"; + repo = "python-socketio"; + rev = "v${version}"; + sha256 = "14dijag17v84v0pp9qi89h5awb4h4i9rj0ppkixqv6is9z9lflw5"; + }; + + propagatedBuildInputs = [ + bidict + python-engineio_3 + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "socketio" ]; + + # pytestCheckHook seems to change the default log level to WARNING, but the + # tests assert it is ERROR + disabledTests = [ "test_logger" ]; + + meta = with lib; { + description = "Python Socket.IO server and client 4.x"; + longDescription = '' + Socket.IO is a lightweight transport protocol that enables real-time + bidirectional event-based communication between clients and a server. + ''; + homepage = "https://github.com/miguelgrinberg/python-socketio/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ graham33 ]; + }; +} diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index e9c2ae146b0..8eb58b244e1 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { Socket.IO is a lightweight transport protocol that enables real-time bidirectional event-based communication between clients and a server. ''; - homepage = "https://github.com/miguelgrinberg/python-engineio/"; + homepage = "https://github.com/miguelgrinberg/python-socketio/"; license = with licenses; [ mit ]; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/robotframework-tools/default.nix b/pkgs/development/python-modules/robotframework-tools/default.nix index 9b90b25bfb7..5e8ca33fffb 100644 --- a/pkgs/development/python-modules/robotframework-tools/default.nix +++ b/pkgs/development/python-modules/robotframework-tools/default.nix @@ -8,7 +8,7 @@ , six , zetup , modeled -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -20,9 +20,7 @@ buildPythonPackage rec { sha256 = "0377ikajf6c3zcy3lc0kh4w9zmlqyplk2c2hb0yyc7h3jnfnya96"; }; - nativeBuildInputs = [ - zetup - ]; + nativeBuildInputs = [ zetup ]; propagatedBuildInputs = [ robotframework @@ -32,19 +30,21 @@ buildPythonPackage rec { modeled ]; - checkInputs = [ - pytest - ]; - - checkPhase = '' - # tests require network - pytest test --ignore test/remote/test_remote.py + postPatch = '' + # Remove upstream's selfmade approach to collect the dependencies + # https://github.com/userzimmermann/robotframework-tools/issues/1 + substituteInPlace setup.py --replace \ + "setup_requires=SETUP_REQUIRES + (zfg.SETUP_REQUIRES or [])," "" ''; + checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "test" ]; + pythonImportsCheck = [ "robottools" ]; + meta = with lib; { description = "Python Tools for Robot Framework and Test Libraries"; - homepage = "https://bitbucket.org/userzimmermann/robotframework-tools"; - license = licenses.gpl3; + homepage = "https://github.com/userzimmermann/robotframework-tools"; + license = licenses.gpl3Plus; maintainers = [ maintainers.costrouc ]; }; } diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 27f7b68fe89..1bc73a37734 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "uvloop"; - version = "0.15.0"; + version = "0.15.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0rfhr84km8k5gj0036b2pznwmc8macx56vkxc3aksvns95dksl0s"; + sha256 = "1p33xfzcy60qqca3rplzbh8h4x7x9l77vi6zbyy9md5z2a0q4ikq"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index 85e950b830e..3862a8e757d 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -1,6 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi -, setuptools_scm, pathpy, nbconvert -, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, nbconvert +, pathpy +, pytestCheckHook +, setuptools-scm +}: buildPythonPackage rec { pname = "zetup"; @@ -11,18 +16,25 @@ buildPythonPackage rec { sha256 = "b8a9bdcfa4b705d72b55b218658bc9403c157db7b57a14158253c98d03ab713d"; }; - # Python 3.8 compatibility + # Python > 3.7 compatibility postPatch = '' substituteInPlace zetup/zetup_config.py \ - --replace "'3.7']" "'3.7', '3.8']" + --replace "'3.7']" "'3.7', '3.8', '3.9', '3.10']" ''; checkPhase = '' py.test test -k "not TestObject" --deselect=test/test_zetup_config.py::test_classifiers ''; - checkInputs = [ pytest pathpy nbconvert ]; - propagatedBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ setuptools-scm ]; + + checkInputs = [ + pathpy + nbconvert + pytestCheckHook + ]; + + pythonImportsCheck = [ "zetup" ]; meta = with lib; { description = "Zimmermann's Extensible Tools for Unified Project setups"; diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index 1482a872dff..f579b108eb9 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -5534,7 +5534,7 @@ in with self; { arrApply = derive2 { name="arrApply"; version="2.1"; sha256="0qy7iwi580rrf3sycsbv6qgxsqcdy9pdbnkdrx81j68qni9iw737"; depends=[Rcpp RcppArmadillo]; }; arrangements = derive2 { name="arrangements"; version="1.1.9"; sha256="0nrlyxgn6667l2rb1q5rvps1anld9aq88qqr3ch2i6zchnqxrdg9"; depends=[gmp R6]; }; arrayhelpers = derive2 { name="arrayhelpers"; version="1.1-0"; sha256="02rl530qxi1idiqpmzg5wr9vl5c7phizhpj64k5pn8xq9zfxbpaz"; depends=[svUnit]; }; - arrow = derive2 { name="arrow"; version="2.0.0"; sha256="0n9g8j7bis7aga2icc8gd6mv7fnh2d5m7fy62fqs4z69l69y19r8"; depends=[assertthat bit64 cpp11 purrr R6 rlang tidyselect vctrs]; }; + arrow = derive { snapshot = "2021-02-01"; } { name="arrow"; version="3.0.0"; sha256="0wgdj6fr4vbz91s76gfwyv2q66p8z3fwf9zgk4112rjhj60q7qfq"; depends=[assertthat bit64 cpp11 purrr R6 rlang tidyselect vctrs]; }; ars = derive2 { name="ars"; version="0.6"; sha256="0zs1rk3i7pc9wcvxrvjcls194mfbvmkz7cb6pwd1cm3fzjwsyxsp"; depends=[]; }; arse = derive2 { name="arse"; version="1.0.0"; sha256="0ssaalc058m09gfcr1n0s729rx2plia3zkhlynj67drclyvhyb0i"; depends=[dplyr pracma]; }; arsenal = derive2 { name="arsenal"; version="3.5.0"; sha256="0avi434wkk3w7axd89a4jwsbb11fi0239mkkla6zasnjwbqgjim0"; depends=[knitr]; }; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index e827c9b807f..fe823c17d93 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -231,6 +231,7 @@ let }; packagesWithNativeBuildInputs = { + arrow = [ pkgs.pkgconfig pkgs.arrow-cpp ]; adimpro = [ pkgs.imagemagick ]; animation = [ pkgs.which ]; audio = [ pkgs.portaudio ]; diff --git a/pkgs/development/tools/chefdk/Gemfile b/pkgs/development/tools/chefdk/Gemfile index 47451c66d27..0717cd32232 100644 --- a/pkgs/development/tools/chefdk/Gemfile +++ b/pkgs/development/tools/chefdk/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'chef-dk', '4.7.73' +gem 'chef-dk', '4.13.3' gem 'pry' gem 'test-kitchen' gem 'inspec' diff --git a/pkgs/development/tools/chefdk/Gemfile.lock b/pkgs/development/tools/chefdk/Gemfile.lock index ce23018bd73..1f71a4a7132 100644 --- a/pkgs/development/tools/chefdk/Gemfile.lock +++ b/pkgs/development/tools/chefdk/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.2.4.1) + activesupport (5.2.4.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -9,166 +9,213 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) app_conf (0.4.2) - ast (2.4.0) - aws-eventstream (1.0.3) - aws-partitions (1.275.0) - aws-sdk-apigateway (1.36.0) - aws-sdk-core (~> 3, >= 3.71.0) + ast (2.4.2) + aws-eventstream (1.1.0) + aws-partitions (1.426.0) + aws-sdk-apigateway (1.59.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.15.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-apigatewayv2 (1.31.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.22.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-applicationautoscaling (1.49.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-autoscaling (1.22.0) - aws-sdk-core (~> 3, >= 3.52.1) + aws-sdk-athena (1.35.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.27.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-autoscaling (1.53.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.30.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-batch (1.43.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.19.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-budgets (1.37.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.20.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudformation (1.47.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.20.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudfront (1.48.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.32.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudhsm (1.28.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.28.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudhsmv2 (1.32.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.30.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudtrail (1.33.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.27.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudwatch (1.49.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.28.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudwatchevents (1.40.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.40.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudwatchlogs (1.39.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.90.1) - aws-eventstream (~> 1.0, >= 1.0.2) + aws-sdk-codecommit (1.41.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-codedeploy (1.38.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-codepipeline (1.40.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-cognitoidentity (1.29.0) + aws-sdk-core (~> 3, >= 3.109.0) + aws-sigv4 (~> 1.1) + aws-sdk-cognitoidentityprovider (1.48.0) + aws-sdk-core (~> 3, >= 3.109.0) + aws-sigv4 (~> 1.1) + aws-sdk-configservice (1.56.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-core (3.112.0) + aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.18.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-costandusagereportservice (1.29.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-databasemigrationservice (1.50.0) + aws-sdk-core (~> 3, >= 3.109.0) + aws-sigv4 (~> 1.1) + aws-sdk-dynamodb (1.59.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-ec2 (1.224.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-ecr (1.41.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.43.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-ecs (1.74.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.144.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-efs (1.37.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.25.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-eks (1.47.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.57.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-elasticache (1.53.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.31.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-elasticbeanstalk (1.41.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.29.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-elasticloadbalancing (1.30.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.26.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-elasticloadbalancingv2 (1.59.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.19.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-elasticsearchservice (1.48.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.39.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-firehose (1.36.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.30.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-glue (1.82.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.24.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-guardduty (1.44.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.33.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-iam (1.47.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.17.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-kafka (1.34.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.20.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-kinesis (1.31.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.29.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-kms (1.42.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.36.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-lambda (1.59.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-organizations (1.17.0) - aws-sdk-core (~> 3, >= 3.39.0) - aws-sigv4 (~> 1.0) - aws-sdk-rds (1.78.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-organizations (1.55.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.37.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-ram (1.22.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.30.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-rds (1.112.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.18.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-redshift (1.54.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.11.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-route53 (1.46.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.60.2) - aws-sdk-core (~> 3, >= 3.83.0) + aws-sdk-route53domains (1.29.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-route53resolver (1.23.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.88.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.18.0) - aws-sdk-core (~> 3, >= 3.71.0) - aws-sigv4 (~> 1.1) - aws-sdk-ses (1.27.0) - aws-sdk-core (~> 3, >= 3.71.0) - aws-sigv4 (~> 1.1) - aws-sdk-sms (1.17.0) - aws-sdk-core (~> 3, >= 3.71.0) - aws-sigv4 (~> 1.1) - aws-sdk-sns (1.21.0) - aws-sdk-core (~> 3, >= 3.71.0) - aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.23.1) - aws-sdk-core (~> 3, >= 3.71.0) - aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.71.0) - aws-sdk-core (~> 3, >= 3.71.0) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.1.0) - aws-eventstream (~> 1.0, >= 1.0.2) - azure_graph_rbac (0.17.1) - ms_rest_azure (~> 0.11.0) - azure_mgmt_key_vault (0.17.5) - ms_rest_azure (~> 0.11.1) - azure_mgmt_resources (0.17.8) - ms_rest_azure (~> 0.11.1) - azure_mgmt_security (0.18.0) - ms_rest_azure (~> 0.11.1) - azure_mgmt_storage (0.19.2) - ms_rest_azure (~> 0.11.1) - backports (3.16.1) - bcrypt_pbkdf (1.0.1) - berkshelf (7.0.9) - chef (>= 13.6.52) + aws-sdk-secretsmanager (1.43.0) + aws-sdk-core (~> 3, >= 3.109.0) + aws-sigv4 (~> 1.1) + aws-sdk-securityhub (1.40.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-servicecatalog (1.57.0) + aws-sdk-core (~> 3, >= 3.109.0) + aws-sigv4 (~> 1.1) + aws-sdk-ses (1.37.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-shield (1.34.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-sms (1.28.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-sns (1.38.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-sqs (1.36.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-ssm (1.104.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-states (1.37.0) + aws-sdk-core (~> 3, >= 3.109.0) + aws-sigv4 (~> 1.1) + aws-sdk-transfer (1.29.0) + aws-sdk-core (~> 3, >= 3.109.0) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.2.2) + aws-eventstream (~> 1, >= 1.0.2) + azure_graph_rbac (0.17.2) + ms_rest_azure (~> 0.12.0) + azure_mgmt_key_vault (0.17.7) + ms_rest_azure (~> 0.12.0) + azure_mgmt_resources (0.18.1) + ms_rest_azure (~> 0.12.0) + azure_mgmt_security (0.19.0) + ms_rest_azure (~> 0.12.0) + azure_mgmt_storage (0.22.0) + ms_rest_azure (~> 0.12.0) + bcrypt_pbkdf (1.1.0) + berkshelf (7.1.0) + chef (>= 15.7.32) chef-config cleanroom (~> 1.0) concurrent-ruby (~> 1.0) @@ -181,18 +228,18 @@ GEM solve (~> 4.0) thor (>= 0.20) builder (3.2.4) - chef (15.8.23) + chef (15.15.0) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.8.23) - chef-utils (= 15.8.23) + chef-config (= 15.15.0) + chef-utils (= 15.15.0) chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) erubis (~> 2.7) ffi (~> 1.9, >= 1.9.25) - ffi-libarchive + ffi-libarchive (~> 1.0, >= 1.0.3) ffi-yajl (~> 2.2) highline (>= 1.6.9, < 2) iniparse (~> 1.4) @@ -202,37 +249,37 @@ GEM mixlib-cli (>= 2.1.1, < 3.0) mixlib-log (>= 2.0.3, < 4.0) mixlib-shellout (>= 3.0.3, < 4.0) - net-sftp (~> 2.1, >= 2.1.2) - net-ssh (>= 4.2, < 6) + net-sftp (>= 2.1.2, < 4.0) + net-ssh (>= 4.2, < 7) net-ssh-multi (~> 1.2, >= 1.2.1) ohai (~> 15.0) plist (~> 3.2) proxifier (~> 1.0) syslog-logger (~> 1.6) - train-core (~> 3.1) + train-core (~> 3.2, >= 3.2.28) train-winrm (>= 0.2.5) tty-screen (~> 0.6) uuidtools (~> 2.1.5) - chef-cli (2.0.0) - addressable (>= 2.3.5, < 2.6) - chef (>= 14.0) + chef-cli (3.1.1) + addressable (>= 2.3.5, < 2.8) + chef (>= 15.0) cookbook-omnifetch (~> 0.5) - diff-lcs (~> 1.0) + diff-lcs (>= 1.0, < 1.4) ffi-yajl (>= 1.0, < 3.0) - license-acceptance (~> 1.0, >= 1.0.11) + license-acceptance (>= 1.0.11, < 3) minitar (~> 0.6) mixlib-cli (>= 1.7, < 3.0) mixlib-shellout (>= 2.0, < 4.0) - paint (~> 1.0) + pastel (~> 0.7) solve (> 2.0, < 5.0) - chef-config (15.8.23) + chef-config (15.15.0) addressable - chef-utils (= 15.8.23) + chef-utils (= 15.15.0) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) - chef-dk (4.7.73) + chef-dk (4.13.3) addressable (>= 2.3.5, < 2.6) chef (~> 15.0) cookbook-omnifetch (~> 0.5) @@ -254,13 +301,12 @@ GEM winrm (~> 2.0) winrm-elevated (~> 1.0) winrm-fs (~> 1.0) - chef-telemetry (1.0.3) + chef-telemetry (1.0.14) chef-config concurrent-ruby (~> 1.0) ffi-yajl (~> 2.2) - http (~> 2.2) - chef-utils (15.8.23) - chef-vault (4.0.1) + chef-utils (15.15.0) + chef-vault (4.1.0) chef-zero (14.0.17) ffi-yajl (~> 2.2) hashie (>= 2.0, < 4.0) @@ -270,51 +316,47 @@ GEM cheffish (14.0.13) chef-zero (~> 14.0) net-ssh - chefspec (9.1.0) + chefspec (9.2.1) chef (>= 14) chef-cli fauxhai-ng (>= 7.5) rspec (~> 3.0) cleanroom (1.0.0) - coderay (1.1.2) - concurrent-ruby (1.1.6) - cookbook-omnifetch (0.9.1) + coderay (1.1.3) + concurrent-ruby (1.1.8) + cookbook-omnifetch (0.11.1) mixlib-archive (>= 0.4, < 2.0) - cucumber-core (3.2.1) - backports (>= 3.8.0) - cucumber-tag_expressions (~> 1.1.0) - gherkin (~> 5.0) - cucumber-tag_expressions (1.1.1) - declarative (0.0.10) + declarative (0.0.20) declarative-option (0.1.0) diff-lcs (1.3) - diffy (3.3.0) - docker-api (1.34.2) + diffy (3.4.0) + docker-api (2.0.0) excon (>= 0.47.0) multi_json domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) ed25519 (1.2.4) - equatable (0.6.1) - erubi (1.9.0) + erubi (1.10.0) erubis (2.7.0) - excon (0.72.0) - faraday (0.17.3) + excon (0.79.0) + faraday (1.3.0) + faraday-net_http (~> 1.0) multipart-post (>= 1.2, < 3) - faraday-cookie_jar (0.0.6) - faraday (>= 0.7.4) + ruby2_keywords + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) http-cookie (~> 1.0.0) - faraday_middleware (0.12.2) - faraday (>= 0.7.4, < 1.0) - fauxhai-ng (7.6.0) + faraday-net_http (1.0.1) + faraday_middleware (1.0.0) + faraday (~> 1.0) + fauxhai-ng (8.7.0) net-ssh - ffi (1.12.2) - ffi-libarchive (1.0.0) + ffi (1.14.2) + ffi-libarchive (1.0.17) ffi (~> 1.0) - ffi-yajl (2.3.3) + ffi-yajl (2.3.4) libyajl2 (~> 1.2) - foodcritic (16.2.0) - cucumber-core (>= 1.3, < 4.0) + foodcritic (16.3.0) erubis ffi-yajl (~> 2.0) nokogiri (>= 1.5, < 2.0) @@ -322,138 +364,124 @@ GEM rufus-lru (~> 1.0) treetop (~> 1.4) fuzzyurl (0.9.0) - gherkin (5.1.0) - git (1.6.0) + git (1.8.1) rchardet (~> 1.8) - google-api-client (0.34.1) + google-api-client (0.52.0) addressable (~> 2.5, >= 2.5.1) googleauth (~> 0.9) httpclient (>= 2.8.1, < 3.0) mini_mime (~> 1.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) + rexml signet (~> 0.12) - googleauth (0.10.0) - faraday (~> 0.12) + googleauth (0.14.0) + faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.12) - gssapi (1.3.0) + signet (~> 0.14) + gssapi (1.3.1) ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) hashie (3.6.0) highline (1.7.10) - htmlentities (4.3.4) - http (2.2.2) - addressable (~> 2.3) - http-cookie (~> 1.0) - http-form_data (~> 1.0.1) - http_parser.rb (~> 0.6.0) http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (1.0.3) - http_parser.rb (0.6.0) httpclient (2.8.3) - i18n (1.8.2) + i18n (1.8.8) concurrent-ruby (~> 1.0) inifile (3.0.0) - iniparse (1.4.4) - inspec (4.18.85) - faraday_middleware (~> 0.12.2) - inspec-core (= 4.18.85) + iniparse (1.5.0) + inspec (4.26.4) + faraday_middleware (>= 0.12.2, < 1.1) + inspec-core (= 4.26.4) train (~> 3.0) train-aws (~> 0.1) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.18.85) + inspec-core (4.26.4) addressable (~> 2.4) chef-telemetry (~> 1.0) - faraday (>= 0.9.0) - hashie (~> 3.4) - htmlentities (~> 4.3) - json-schema (~> 2.8) - license-acceptance (>= 0.2.13, < 2.0) - method_source (~> 0.8) + faraday (>= 0.9.0, < 1.4) + faraday_middleware (~> 1.0) + hashie (>= 3.4, < 5.0) + license-acceptance (>= 0.2.13, < 3.0) + method_source (>= 0.8, < 2.0) mixlib-log (~> 3.0) multipart-post (~> 2.0) parallel (~> 1.9) - parslet (~> 1.5) - pry (~> 0) - rspec (~> 3.9) + parslet (>= 1.5, < 2.0) + pry (~> 0.13) + rspec (>= 3.9, < 3.11) rspec-its (~> 1.2) - rubyzip (~> 1.2, >= 1.2.2) + rubyzip (>= 1.2.2, < 3.0) semverse (~> 3.0) sslshake (~> 1.2) - term-ansicolor (~> 1.7) thor (>= 0.20, < 2.0) - tomlrb (~> 1.2) + tomlrb (>= 1.2, < 2.1) train-core (~> 3.0) tty-prompt (~> 0.17) tty-table (~> 0.10) ipaddress (0.8.3) - jaro_winkler (1.5.4) jmespath (1.4.0) - json (2.3.0) - json-schema (2.8.1) - addressable (>= 2.4) - jwt (2.2.1) - kitchen-inspec (1.3.1) - hashie (~> 3.4) - inspec (>= 1.47, < 5.0) - test-kitchen (>= 1.6, < 3) - kitchen-vagrant (1.6.1) + json (2.5.1) + jwt (2.2.2) + kitchen-inspec (2.3.0) + hashie (>= 3.4, <= 5.0) + inspec (>= 2.2.64, < 5.0) + test-kitchen (>= 2.7, < 3) + kitchen-vagrant (1.8.0) test-kitchen (>= 1.4, < 3) - knife-spork (1.7.2) + knife-spork (1.7.3) app_conf (>= 0.4.0) chef (>= 11.0.0) diffy (>= 3.0.1) git (>= 1.2.5) libyajl2 (1.2.0) - license-acceptance (1.0.13) + license-acceptance (1.0.19) pastel (~> 0.7) tomlrb (~> 1.2) tty-box (~> 0.3) tty-prompt (~> 0.18) little-plugger (1.1.4) - logging (2.2.2) + logging (2.3.0) little-plugger (~> 1.1) - multi_json (~> 1.10) + multi_json (~> 1.14) memoist (0.16.2) - method_source (0.9.2) + method_source (1.0.0) mini_mime (1.0.2) - mini_portile2 (2.4.0) + mini_portile2 (2.5.0) minitar (0.9) - minitest (5.14.0) - mixlib-archive (1.0.5) + minitest (5.14.3) + mixlib-archive (1.1.4) mixlib-log - mixlib-authentication (3.0.6) - mixlib-cli (2.1.5) - mixlib-config (3.0.6) + mixlib-authentication (3.0.7) + mixlib-cli (2.1.8) + mixlib-config (3.0.9) tomlrb - mixlib-install (3.11.26) + mixlib-install (3.12.5) mixlib-shellout mixlib-versioning thor - mixlib-log (3.0.8) - mixlib-shellout (3.0.9) + mixlib-log (3.0.9) + mixlib-shellout (3.2.2) + chef-utils mixlib-versioning (1.2.12) - molinillo (0.6.6) - ms_rest (0.7.5) + molinillo (0.7.0) + ms_rest (0.7.6) concurrent-ruby (~> 1.0) - faraday (~> 0.9) + faraday (>= 0.9, < 2.0.0) timeliness (~> 0.3.10) - ms_rest_azure (0.11.1) + ms_rest_azure (0.12.0) concurrent-ruby (~> 1.0) - faraday (~> 0.9) + faraday (>= 0.9, < 2.0.0) faraday-cookie_jar (~> 0.0.6) - ms_rest (~> 0.7.4) - unf_ext (= 0.0.7.2) - multi_json (1.14.1) + ms_rest (~> 0.7.6) + multi_json (1.15.0) multipart-post (2.1.1) - necromancer (0.5.1) net-scp (1.2.1) net-ssh (>= 2.6.5) net-sftp (2.1.2) @@ -464,13 +492,14 @@ GEM net-ssh-multi (1.2.1) net-ssh (>= 2.6.5) net-ssh-gateway (>= 1.2.0) - nokogiri (1.10.8) - mini_portile2 (~> 2.4.0) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) nori (2.6.0) - octokit (4.16.0) + octokit (4.20.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - ohai (15.7.4) + ohai (15.12.0) chef-config (>= 12.8, < 16) ffi (~> 1.9) ffi-yajl (~> 2.2) @@ -482,26 +511,27 @@ GEM plist (~> 3.1) systemu (~> 2.6.4) wmi-lite (~> 1.0) - os (1.0.1) + os (1.1.1) paint (1.0.1) - parallel (1.19.1) - parser (2.7.0.2) - ast (~> 2.4.0) + parallel (1.20.1) + parser (3.0.0.0) + ast (~> 2.4.1) parslet (1.8.2) - pastel (0.7.3) - equatable (~> 0.6) + pastel (0.8.0) tty-color (~> 0.5) - plist (3.5.0) + plist (3.6.0) polyglot (0.3.5) proxifier (1.0.3) - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) + pry (0.14.0) + coderay (~> 1.1) + method_source (~> 1.0) public_suffix (3.1.1) - rack (2.2.2) + racc (1.5.2) + rack (2.2.3) rainbow (3.0.0) - rake (13.0.1) + rake (13.0.3) rchardet (1.8.0) + regexp_parser (2.0.3) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -509,110 +539,118 @@ GEM retriable (3.1.2) retryable (3.0.5) rexml (3.2.4) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.0) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) + rspec-support (~> 3.10.0) rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.9.1) + rspec-mocks (3.10.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-support (3.9.2) - rubocop (0.80.0) - jaro_winkler (~> 1.5.1) + rspec-support (~> 3.10.0) + rspec-support (3.10.2) + rubocop (1.9.1) parallel (~> 1.10) - parser (>= 2.7.0.1) + parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) rexml + rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) - ruby-progressbar (1.10.1) - rubyntlm (0.6.2) - rubyzip (1.3.0) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.4.1) + parser (>= 2.7.1.5) + ruby-progressbar (1.11.0) + ruby2_keywords (0.0.4) + rubyntlm (0.6.3) + rubyzip (2.3.0) rufus-lru (1.1.0) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) semverse (3.0.0) - signet (0.12.0) + signet (0.14.1) addressable (~> 2.3) - faraday (~> 0.9) + faraday (>= 0.17.3, < 2.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - solve (4.0.3) + solve (4.0.4) molinillo (~> 0.6) semverse (>= 1.1, < 4.0) - sslshake (1.3.0) - strings (0.1.8) - strings-ansi (~> 0.1) + sslshake (1.3.1) + strings (0.2.0) + strings-ansi (~> 0.2) unicode-display_width (~> 1.5) unicode_utils (~> 1.4) strings-ansi (0.2.0) - sync (0.5.0) syslog-logger (1.6.8) systemu (2.6.5) - term-ansicolor (1.7.1) - tins (~> 1.0) - test-kitchen (2.3.4) + test-kitchen (2.10.0) bcrypt_pbkdf (~> 1.0) ed25519 (~> 1.2) - license-acceptance (~> 1.0, >= 1.0.11) + license-acceptance (>= 1.0.11, < 3.0) mixlib-install (~> 3.6) mixlib-shellout (>= 1.2, < 4.0) - net-scp (>= 1.1, < 3.0) - net-ssh (>= 2.9, < 6.0) + net-scp (>= 1.1, < 4.0) + net-ssh (>= 2.9, < 7.0) net-ssh-gateway (>= 1.2, < 3.0) - thor (~> 0.19) + thor (>= 0.19, < 2.0) winrm (~> 2.0) winrm-elevated (~> 1.0) winrm-fs (~> 1.1) - thor (0.20.3) + thor (1.1.0) thread_safe (0.3.6) timeliness (0.3.10) - tins (1.24.1) - sync - tomlrb (1.2.9) - train (3.2.22) - activesupport (~> 5.2.3) + tomlrb (1.3.0) + train (3.4.9) + activesupport (>= 5.2.4.3, < 6.0.0) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) azure_mgmt_resources (~> 0.15) azure_mgmt_security (~> 0.18) azure_mgmt_storage (~> 0.18) - docker-api (~> 1.26) - google-api-client (>= 0.23.9, < 0.35.0) - googleauth (>= 0.6.6, < 0.11.0) - train-core (= 3.2.22) + docker-api (>= 1.26, < 3.0) + google-api-client (>= 0.23.9, <= 0.52.0) + googleauth (>= 0.6.6, <= 0.14.0) + inifile (~> 3.0) + train-core (= 3.4.9) train-winrm (~> 0.2) - train-aws (0.1.15) + train-aws (0.1.35) aws-sdk-apigateway (~> 1.0) aws-sdk-apigatewayv2 (~> 1.0) + aws-sdk-applicationautoscaling (>= 1.46, < 1.50) aws-sdk-athena (~> 1.0) - aws-sdk-autoscaling (~> 1.22.0) + aws-sdk-autoscaling (>= 1.22, < 1.54) + aws-sdk-batch (>= 1.36, < 1.44) aws-sdk-budgets (~> 1.0) aws-sdk-cloudformation (~> 1.0) + aws-sdk-cloudfront (~> 1.0) aws-sdk-cloudhsm (~> 1.0) aws-sdk-cloudhsmv2 (~> 1.0) aws-sdk-cloudtrail (~> 1.8) aws-sdk-cloudwatch (~> 1.13) + aws-sdk-cloudwatchevents (>= 1.36, < 1.41) aws-sdk-cloudwatchlogs (~> 1.13) aws-sdk-codecommit (~> 1.0) aws-sdk-codedeploy (~> 1.0) aws-sdk-codepipeline (~> 1.0) + aws-sdk-cognitoidentity (>= 1.26, < 1.30) + aws-sdk-cognitoidentityprovider (>= 1.46, < 1.49) aws-sdk-configservice (~> 1.21) aws-sdk-core (~> 3.0) aws-sdk-costandusagereportservice (~> 1.6) + aws-sdk-databasemigrationservice (>= 1.42, < 1.51) aws-sdk-dynamodb (~> 1.31) aws-sdk-ec2 (~> 1.70) aws-sdk-ecr (~> 1.18) aws-sdk-ecs (~> 1.30) + aws-sdk-efs (~> 1.0) aws-sdk-eks (~> 1.9) aws-sdk-elasticache (~> 1.0) aws-sdk-elasticbeanstalk (~> 1.0) @@ -620,68 +658,74 @@ GEM aws-sdk-elasticloadbalancingv2 (~> 1.0) aws-sdk-elasticsearchservice (~> 1.0) aws-sdk-firehose (~> 1.0) + aws-sdk-glue (>= 1.71, < 1.83) + aws-sdk-guardduty (~> 1.31) aws-sdk-iam (~> 1.13) aws-sdk-kafka (~> 1.0) aws-sdk-kinesis (~> 1.0) aws-sdk-kms (~> 1.13) aws-sdk-lambda (~> 1.0) - aws-sdk-organizations (~> 1.17.0) + aws-sdk-organizations (>= 1.17, < 1.56) + aws-sdk-ram (>= 1.21, < 1.23) aws-sdk-rds (~> 1.43) aws-sdk-redshift (~> 1.0) aws-sdk-route53 (~> 1.0) aws-sdk-route53domains (~> 1.0) aws-sdk-route53resolver (~> 1.0) aws-sdk-s3 (~> 1.30) + aws-sdk-secretsmanager (>= 1.42, < 1.44) aws-sdk-securityhub (~> 1.0) + aws-sdk-servicecatalog (>= 1.48, < 1.58) aws-sdk-ses (~> 1.0) + aws-sdk-shield (~> 1.30) aws-sdk-sms (~> 1.0) aws-sdk-sns (~> 1.9) aws-sdk-sqs (~> 1.10) aws-sdk-ssm (~> 1.0) - train-core (3.2.22) + aws-sdk-states (>= 1.35, < 1.38) + aws-sdk-transfer (>= 1.26, < 1.30) + train-core (3.4.9) addressable (~> 2.5) - inifile (~> 3.0) + ffi (!= 1.13.0) json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) - net-scp (>= 1.2, < 3.0) - net-ssh (>= 2.9, < 6.0) - train-habitat (0.2.13) - train-winrm (0.2.6) - winrm (~> 2.0) + net-scp (>= 1.2, < 4.0) + net-ssh (>= 2.9, < 7.0) + train-habitat (0.2.22) + train-winrm (0.2.12) + winrm (>= 2.3.6, < 3.0) + winrm-elevated (~> 1.2.2) winrm-fs (~> 1.0) - treetop (1.6.10) + treetop (1.6.11) polyglot (~> 0.3) - tty-box (0.5.0) - pastel (~> 0.7.2) - strings (~> 0.1.6) + tty-box (0.7.0) + pastel (~> 0.8) + strings (~> 0.2.0) tty-cursor (~> 0.7) - tty-color (0.5.1) + tty-color (0.6.0) tty-cursor (0.7.1) - tty-prompt (0.20.0) - necromancer (~> 0.5.0) - pastel (~> 0.7.0) - tty-reader (~> 0.7.0) - tty-reader (0.7.0) + tty-prompt (0.23.0) + pastel (~> 0.8) + tty-reader (~> 0.8) + tty-reader (0.9.0) tty-cursor (~> 0.7) - tty-screen (~> 0.7) - wisper (~> 2.0.0) - tty-screen (0.7.1) - tty-table (0.11.0) - equatable (~> 0.6) - necromancer (~> 0.5) - pastel (~> 0.7.2) - strings (~> 0.1.5) - tty-screen (~> 0.7) - tzinfo (1.2.6) + tty-screen (~> 0.8) + wisper (~> 2.0) + tty-screen (0.8.1) + tty-table (0.12.0) + pastel (~> 0.8) + strings (~> 0.2.0) + tty-screen (~> 0.8) + tzinfo (1.2.9) thread_safe (~> 0.1) uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.2) - unicode-display_width (1.6.1) + unf_ext (0.0.7.7) + unicode-display_width (1.7.0) unicode_utils (1.4.0) uuidtools (2.1.5) - winrm (2.3.4) + winrm (2.3.6) builder (>= 2.1.2) erubi (~> 1.8) gssapi (~> 1.2) @@ -689,15 +733,15 @@ GEM httpclient (~> 2.2, >= 2.2.0.2) logging (>= 1.6.1, < 3.0) nori (~> 2.0) - rubyntlm (~> 0.6.0, >= 0.6.1) - winrm-elevated (1.2.1) + rubyntlm (~> 0.6.0, >= 0.6.3) + winrm-elevated (1.2.3) erubi (~> 1.8) winrm (~> 2.0) winrm-fs (~> 1.0) - winrm-fs (1.3.3) + winrm-fs (1.3.5) erubi (~> 1.8) logging (>= 1.6.1, < 3.0) - rubyzip (~> 1.1) + rubyzip (~> 2.0) winrm (~> 2.0) wisper (2.0.1) wmi-lite (1.0.5) @@ -707,7 +751,7 @@ PLATFORMS DEPENDENCIES berkshelf - chef-dk (= 4.7.73) + chef-dk (= 4.13.3) chef-provisioning chef-vault chefspec diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index 1a5f6c8626a..6a1470e1074 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -1,7 +1,7 @@ { lib, bundlerEnv, bundlerUpdateScript, ruby, perl, autoconf }: bundlerEnv { - name = "chef-dk-4.7.73"; + name = "chef-dk-4.13.3"; inherit ruby; gemdir = ./.; diff --git a/pkgs/development/tools/chefdk/gemset.nix b/pkgs/development/tools/chefdk/gemset.nix index 1f9522ba4c5..14c81742cd2 100644 --- a/pkgs/development/tools/chefdk/gemset.nix +++ b/pkgs/development/tools/chefdk/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lmlnx79sv18xv1ddm4vq7z3mwdfa4468mq5186av0k8n1k471sp"; + sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc"; type = "gem"; }; - version = "5.2.4.1"; + version = "5.2.4.5"; }; addressable = { dependencies = ["public_suffix"]; @@ -36,30 +36,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; + sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.2"; }; aws-eventstream = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "100g77a5ixg4p5zwq77f28n2pdkk0y481f7v83qrlmnj22318qq6"; + sha256 = "0r0pn66yqrdkrfdin7qdim0yj2x75miyg4wp6mijckhzhrjb7cv5"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; aws-partitions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bkzzk4mxsxvnd8sr5xx57vc29j69h48gj2g24fzjn7ika6az18z"; + sha256 = "0nrqbbzykj9ckri3ci1wsksy8rhz13rigm3aznxy08gqvzv7bcy9"; type = "gem"; }; - version = "1.275.0"; + version = "1.426.0"; }; aws-sdk-apigateway = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -67,10 +67,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "106wn66gnn1rk9z4w84iwqb26wbyz3i2q9ck3xxabc47ly9mj03m"; + sha256 = "15vwm6a18v1xqfpn2ipx1h5wqwd5yipgp624p4pkchcdqacb7gvm"; type = "gem"; }; - version = "1.36.0"; + version = "1.59.0"; }; aws-sdk-apigatewayv2 = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -78,10 +78,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x9qaxi1614pfp9hy5ywk7y76gfmk5d0iz6lj9p9qy92gfzx169c"; + sha256 = "171v0xng5h6hk1nqrivv49rpz1f4jhj2lhq3pxk5izx3q1lf7rc7"; type = "gem"; }; - version = "1.15.0"; + version = "1.31.0"; + }; + aws-sdk-applicationautoscaling = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01zldlqn573bmlpg7qm562cy9miyrirzknagjbnzs4iwjnm4rgn4"; + type = "gem"; + }; + version = "1.49.0"; }; aws-sdk-athena = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -89,10 +100,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hvskqq406vh9xa29jzyjhfpf6m834872p87a2j0ly5kh4ydldkz"; + sha256 = "0lmbchjn30rpk311q2z5g8j96g5mi8hajc3fbzh3nam7wj4hmdbn"; type = "gem"; }; - version = "1.22.0"; + version = "1.35.0"; }; aws-sdk-autoscaling = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -100,10 +111,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jrz4brxbi8rxqk1jg5wcdsa1knfrgzrmx9dygfzbfi2szcfmbhv"; + sha256 = "1vkfybjdmxn7hwsywfgkcr8mms88l4v6kwj29c8qr2k7ds4l4bsn"; type = "gem"; }; - version = "1.22.0"; + version = "1.53.0"; + }; + aws-sdk-batch = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14q0b84qa5mc24nw1fqns822wkg1gvlwvwbia1m7bzzmj98maikw"; + type = "gem"; + }; + version = "1.43.0"; }; aws-sdk-budgets = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -111,10 +133,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xxgldgin1gavz7w37pmsxrhiwr8bvssjgv3lwzbwdsjqk0jd0f3"; + sha256 = "0lm7m09fp5jlranzv1hfc3xv8fn6bmw2g3kwjsj6r094qi3nyp42"; type = "gem"; }; - version = "1.27.0"; + version = "1.37.0"; }; aws-sdk-cloudformation = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -122,10 +144,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bxipaq1g6c5g8zirqlbq74kmy8fglavhyrxyd91sy9yj2d9q26r"; + sha256 = "09lcq8gpi4x7xvwy8njmbcbbgyrq6xsfbyc7hwj3m4dps9f116gw"; type = "gem"; }; - version = "1.30.0"; + version = "1.47.0"; + }; + aws-sdk-cloudfront = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w70d8wv5cb8p5wpyq828fjrccz0xxbvg5sk66bmwq0zjcxnvpb6"; + type = "gem"; + }; + version = "1.48.0"; }; aws-sdk-cloudhsm = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -133,10 +166,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "096dpm87k0q1kqnvf5v0sb98gdsq41390pxvs014qphqycqjchc6"; + sha256 = "0a4imw0rahd6bh4clcwxkcvl4lf8pmyba1sjlc1hx37jv641wlqf"; type = "gem"; }; - version = "1.19.0"; + version = "1.28.0"; }; aws-sdk-cloudhsmv2 = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -144,10 +177,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10cyc1brjppnkmynkb3qf7ar78a4dhngg3fmmfxnxlcrigwbrxpa"; + sha256 = "13kdq0xnbgrvi9f9jqrig453bc5mf7by3cjcdd8jsv8aay0gqads"; type = "gem"; }; - version = "1.20.0"; + version = "1.32.0"; }; aws-sdk-cloudtrail = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -155,10 +188,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "034psp0g7ab9al7389y64pr2ar2jvxsg6p1djj4w53700xrj602g"; + sha256 = "083nld91s8klfr2p0mwrdlx4lgiig9kx0cikiqrifd30lbja51wg"; type = "gem"; }; - version = "1.20.0"; + version = "1.33.0"; }; aws-sdk-cloudwatch = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -166,10 +199,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jvjjlcyp1sx0gsgm82h84n32sb51m8ih53ab4qq94m9jcxk49cr"; + sha256 = "1vsb01nw85sk3zsdyw5ix0yw3n81xjhj4h0431qm60mdg9akgbs4"; type = "gem"; }; - version = "1.32.0"; + version = "1.49.0"; + }; + aws-sdk-cloudwatchevents = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14hhy8zbyn5x2660pg5aq02lni69clx3y7rkvzqrldcy0482863y"; + type = "gem"; + }; + version = "1.40.0"; }; aws-sdk-cloudwatchlogs = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -177,10 +221,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bhnlh3skqw3l2yfr6nd97arlcmijpm51k664m51l5xw2971bc51"; + sha256 = "0aravrxjnp886kaag037z45xiyfr75gz0p4psjq9x3qj6gzsjn8y"; type = "gem"; }; - version = "1.28.0"; + version = "1.39.0"; }; aws-sdk-codecommit = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -188,10 +232,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00mkgfywxqzbbin2qidx4qvb5xcjjl41v6am023bl2yww5x8hi5p"; + sha256 = "1cb1bqlf3kh8akll1xybrn314ngk62jqhpli99kdjq27hxir5jq2"; type = "gem"; }; - version = "1.30.0"; + version = "1.41.0"; }; aws-sdk-codedeploy = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -199,10 +243,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06m5i5g2j2yylksficbla25cjsdw42y5gbzmx5ycxvxz3c4n3qh1"; + sha256 = "117rv0hx77kyhz9zm1fqbxdbk3lhyxcbibwn27nyafch6sl1x2j4"; type = "gem"; }; - version = "1.27.0"; + version = "1.38.0"; }; aws-sdk-codepipeline = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -210,10 +254,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09dkyclanvxz77hh933ph2ad4yh7midy09hbprszfikhfkvi4z2m"; + sha256 = "0xdkc3xmff901bjfsyg454dn27gfr6nzvgkia0kngdzgq6x4xb45"; type = "gem"; }; - version = "1.28.0"; + version = "1.40.0"; + }; + aws-sdk-cognitoidentity = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "122i3g320ccaqg541kzb0pawiz61zyphvbwnkv5rlqpwspca1m3b"; + type = "gem"; + }; + version = "1.29.0"; + }; + aws-sdk-cognitoidentityprovider = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m09dxwyw01vh9rksz8dwdx36vsr8f7p5qmjmvfazjapzv3q6qmn"; + type = "gem"; + }; + version = "1.48.0"; }; aws-sdk-configservice = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -221,10 +287,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gjw5jv4p9zhdh4cg982x7x3lpfhgi7an14gjwz1llxmmkzv15wr"; + sha256 = "1msdg1gpq9y9maf2fdljcp2vbydbjqfk07ff9j532bvikax0qmfy"; type = "gem"; }; - version = "1.40.0"; + version = "1.56.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -232,10 +298,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q7f9jkpmpppj31kh3wnzybkphq4piy8ays3vld0zsibfjs9iw7i"; + sha256 = "15lynby6r91p9hh5h92pg4jr8xgnjr52px5ax0p0wncdw4vz0skp"; type = "gem"; }; - version = "3.90.1"; + version = "3.112.0"; }; aws-sdk-costandusagereportservice = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -243,10 +309,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18yzz7av4z8qh321r0ih6m5lc1x4mh10pn67z6y70ny8syxm4kl6"; + sha256 = "1dzbh8xf8j466gwrawmprwclslvd8sqlzzzxpzyxv4y9m09bhypk"; type = "gem"; }; - version = "1.18.0"; + version = "1.29.0"; + }; + aws-sdk-databasemigrationservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vd4a5z1q282xx7717f542yavb6x13fli64rhwnc143xij4izgpn"; + type = "gem"; + }; + version = "1.50.0"; }; aws-sdk-dynamodb = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -254,10 +331,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06nbf297r85ix92x9ilx8ysz67sm59mprscmmdp4rsn74v78dzaj"; + sha256 = "19k3iznglnwwgqd95i5zmim41c98l8ydf6ih9am50gs0n6bky41q"; type = "gem"; }; - version = "1.43.0"; + version = "1.59.0"; }; aws-sdk-ec2 = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -265,10 +342,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wnql5rzwkn97w4l3pq6k97grqdci1qs7h132pnd6lc3bx62v4h5"; + sha256 = "1lg8vh124viba77b0qhi5j8xx8b4wxdiyycl4kaawmddwhr33zx9"; type = "gem"; }; - version = "1.144.0"; + version = "1.224.0"; }; aws-sdk-ecr = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -276,10 +353,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1smq30avqjq6h4yvw9h0k2gwp97c4l4868f2vdj93l84i80gh1pi"; + sha256 = "0di8s9dpyzal5n2qpx8l3jnbkm72h6kz759l04kxfapgzd5ppwhv"; type = "gem"; }; - version = "1.25.0"; + version = "1.41.0"; }; aws-sdk-ecs = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -287,10 +364,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "113kwczkqr4jsyrnnxkm0kpdqs3ysc0913nclb5mdwapd5dbq3br"; + sha256 = "0qilim7dm5hc4knhvz9090hzbmlrd24m5fywj9kr60fvhgnm0wf0"; type = "gem"; }; - version = "1.57.0"; + version = "1.74.0"; + }; + aws-sdk-efs = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03bf0g1nky772r4xz3w6nvpf09wf1096qifd0i8hgzp7cwirbmby"; + type = "gem"; + }; + version = "1.37.0"; }; aws-sdk-eks = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -298,10 +386,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h3bvqizz95lngmpsgysdpnn1fshrppfc6zq3qphv5hagpa1gj5n"; + sha256 = "0nj666bl877n61h6s570ad9mcvjq4m2s6yink218zslfp10y03v4"; type = "gem"; }; - version = "1.31.0"; + version = "1.47.0"; }; aws-sdk-elasticache = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -309,10 +397,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0805g31chgr65bc74g8s33vk8id0gmyzvwpxjvf5drsrplbv1kca"; + sha256 = "1kgpn2n1ap943q5nzxrl95v6g7fyff6bw5i4mhcw6g97gvv7p675"; type = "gem"; }; - version = "1.29.0"; + version = "1.53.0"; }; aws-sdk-elasticbeanstalk = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -320,10 +408,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nxrcfwngmbrvcbxh0cl6mqbvxda82k9kpjr1a0agypazapmy980"; + sha256 = "1a9k9srp1q5qhlcwna7zyvviimri4gi9smlqshbvcfvy2lys5w2z"; type = "gem"; }; - version = "1.26.0"; + version = "1.41.0"; }; aws-sdk-elasticloadbalancing = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -331,10 +419,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13mc6mahnnrcgf2ah3p12sm538mfdygz6a6afgwijaar0za126l3"; + sha256 = "1n6ssl3hqqm658k5ig667bgy457rs8gynl8vvin4xwknxws186di"; type = "gem"; }; - version = "1.19.0"; + version = "1.30.0"; }; aws-sdk-elasticloadbalancingv2 = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -342,10 +430,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17rvv3wlp7bm2f1cfkd8cvwz51kg6pzj8cw6jh4fvlnahx7cilr0"; + sha256 = "0cqb2bncvqqqcqks7d6lrjb7pl06fcjizdfjpr44a7v6sjyx3bcr"; type = "gem"; }; - version = "1.39.0"; + version = "1.59.0"; }; aws-sdk-elasticsearchservice = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -353,10 +441,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lzm94grzggz6vrlzbk6226vlyfnxbq0rih71vdnj1h63f8gj73m"; + sha256 = "1379lp7jqigp03zv25fgbx4bwacypjj38qbki648398r161f4bzy"; type = "gem"; }; - version = "1.30.0"; + version = "1.48.0"; }; aws-sdk-firehose = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -364,10 +452,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xpx6r6z2gfybfsndi7n6wr6zv6gqzfz9fm39wj8ljhsmbf2p2ch"; + sha256 = "0ji75vqfprnkjsy6gdk9qci6wd9kwm7h7lycpx7jsw0fbv6hjx0p"; type = "gem"; }; - version = "1.24.0"; + version = "1.36.0"; + }; + aws-sdk-glue = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "026hka71fnzmqrn5yyb50pz1wa44irqncsk6kcgb476px4zxqwmd"; + type = "gem"; + }; + version = "1.82.0"; + }; + aws-sdk-guardduty = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0n963y20rafh51xanx0bff7jqbjcgg3wj5hs4js8h9sax48k97q9"; + type = "gem"; + }; + version = "1.44.0"; }; aws-sdk-iam = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -375,10 +485,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s78ssjcp974v7r1znrgk78bqz23jhws4gy1nm659z5390zsn1fz"; + sha256 = "16152qidkisakl2iqvghrjnccq279pahb953q5a4q0ipk5imw2c1"; type = "gem"; }; - version = "1.33.0"; + version = "1.47.0"; }; aws-sdk-kafka = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -386,10 +496,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k6pixxh9vfq2bhm89h1jpdzpikh600xmp1m1zqh9k8qa62g0glm"; + sha256 = "182g1ya4bhxw90zb0jfqlb5s46r8k3mvl2dczir5jamjp2h1n24y"; type = "gem"; }; - version = "1.17.0"; + version = "1.34.0"; }; aws-sdk-kinesis = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -397,10 +507,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mx60qi7sgr8a2k8h1c0ify2l3dvp509hflmbwq87jgq6npz89jr"; + sha256 = "1wsnn4303q7501xp10gfr8s15cazm4a0xy8knz5b8pmaw93x0g4b"; type = "gem"; }; - version = "1.20.0"; + version = "1.31.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -408,10 +518,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "191qnrpg9qhwj24pisha28fwqx30sqkj75ibgpqcf4q389l3a2gw"; + sha256 = "00wgf83cdy6z77b2y0ld0aqiidfyldi71hx0z8b73gxjdlbwpq1i"; type = "gem"; }; - version = "1.29.0"; + version = "1.42.0"; }; aws-sdk-lambda = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -419,10 +529,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16llkc8dl88m2f58kpn81lnw37zlh0ghlb1g5bzli5hm8ygn1z5s"; + sha256 = "15fvdqp8k5w7wjgc7f5h9syd8v14h8pzklg5ldb49n5jsr0i3n73"; type = "gem"; }; - version = "1.36.0"; + version = "1.59.0"; }; aws-sdk-organizations = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -430,10 +540,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z71zxsvz1g3i6mnpvb05gzk2lay4dzrl45lby8n7acpp4wb2j1g"; + sha256 = "00i8kbcx1vdch1g6pznvm0hg0hsz2kfd5vpdlfarbilv6zyh9mp7"; + type = "gem"; + }; + version = "1.55.0"; + }; + aws-sdk-ram = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04n9x3nrxakx1zys0cc6vmkyqlqa83h6abdfyqaah1icxp585zjb"; type = "gem"; }; - version = "1.17.0"; + version = "1.22.0"; }; aws-sdk-rds = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -441,10 +562,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09ld8vrhrhywc4imvbj238pic7qi2mg1n3421s0iwd1xhf5fvakp"; + sha256 = "1jnmk7z4ys13vv2i1r6pvpiblgaqlpvjhcslcnqyqlmjh2ydwjxk"; type = "gem"; }; - version = "1.78.0"; + version = "1.112.0"; }; aws-sdk-redshift = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -452,10 +573,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w8y5vlzzws2fqpjjq59gmgrf1l5whm1zcm7fhlkikxspq9iw16b"; + sha256 = "1f54ig5vyc2cvipsv5d62n5xd6a1i9myjgayf6x6slkvnzk5xk4g"; type = "gem"; }; - version = "1.37.0"; + version = "1.54.0"; }; aws-sdk-route53 = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -463,10 +584,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "132c11g43zbmn2wzrnys7viymcdsznzl26igpv6ixv4jvi62r7fq"; + sha256 = "1jxm6knx9rp5m3an93c187ds8zla4chl7zdvwnml2imna3adk4z7"; type = "gem"; }; - version = "1.30.0"; + version = "1.46.0"; }; aws-sdk-route53domains = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -474,10 +595,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01flbzipphp2qm4lcrxbmwqlgl7jy5w7gyj6hbgb8aich927w5qx"; + sha256 = "0k3b37q9mhfnf4mzbhhhgx0v6y82ivq6v01g8fvdfb5n6235j0yg"; type = "gem"; }; - version = "1.18.0"; + version = "1.29.0"; }; aws-sdk-route53resolver = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -485,10 +606,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hlyd4h49sa3s61l1w362l2qmnm78kfj2ks6mshrjwr8l8zql1q5"; + sha256 = "1qyb2n40v52n0xjqncaflb6cl1y0p7szlx1bzxpcnm4g5nfdcf3l"; type = "gem"; }; - version = "1.11.0"; + version = "1.23.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -496,10 +617,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pblkq7rw465w08hs2xy6v7w10x9n004hk43yqzswqxirki68ldz"; + sha256 = "029iqr52fxxz8d6jb2g4k76i7nnjyspvjdlx52xah25zzhp3bx7v"; + type = "gem"; + }; + version = "1.88.0"; + }; + aws-sdk-secretsmanager = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pv5idvap742r4mfwgi01l0sd7skz3m9iy28piy236f6xjiiqsw3"; type = "gem"; }; - version = "1.60.2"; + version = "1.43.0"; }; aws-sdk-securityhub = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -507,10 +639,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a88i8bkqjy91ydj95h9v9mmlsqnx62hkinsprrx6ym0ix78kzim"; + sha256 = "0j6wl0v5p19h3x1fphyq8db5appig7w3gsxnj6mmlm77smlkwjlq"; type = "gem"; }; - version = "1.18.0"; + version = "1.40.0"; + }; + aws-sdk-servicecatalog = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1awf0gcywzylqsdypx2lpib5jiy02fd4iz5q19q9qkpvxw7zj9cd"; + type = "gem"; + }; + version = "1.57.0"; }; aws-sdk-ses = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -518,10 +661,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "046bsyj6zblcbffj15qbdz5fp8ipr6vfhrycsv6hznciy6jvpq4h"; + sha256 = "1j45jykqll5s8y71bp4723mvcxbrihp4rhlhq1rvcyyr4y0706yy"; + type = "gem"; + }; + version = "1.37.0"; + }; + aws-sdk-shield = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0416mrby897fnhc3iwb698m0gyih7pfgmx35h5f618i8my53alin"; type = "gem"; }; - version = "1.27.0"; + version = "1.34.0"; }; aws-sdk-sms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -529,10 +683,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x1x1hrs8v4vb5l79dp5qpdi0znb5cxviwk1zcx6zajpzabv7hdl"; + sha256 = "0121bx79galz99x2wdksmzyibdy6l18k2i2nzc8lsmrgkdz22c03"; type = "gem"; }; - version = "1.17.0"; + version = "1.28.0"; }; aws-sdk-sns = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -540,10 +694,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vfyn7hc21qgarhrfghyw3qi550656834b51n5vnginraryk6ji8"; + sha256 = "0cqri14igfmcxlapbagg0nmy79zzg29awzybv51gl76m3mljbafb"; type = "gem"; }; - version = "1.21.0"; + version = "1.38.0"; }; aws-sdk-sqs = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -551,10 +705,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c81w75ph7c3g8fkq8xxs1f5zkvv5yv0k3xy6441gjxvwkpiaih6"; + sha256 = "07qg8awkqpdwf2r7y54183jfcffwjl1mdd98vmgsxv94617bnh4q"; type = "gem"; }; - version = "1.23.1"; + version = "1.36.0"; }; aws-sdk-ssm = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -562,10 +716,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "116vbhw7l2hk1vk3dq79czp857bcw7giw00ip4par1cgwkxym03c"; + sha256 = "1svhxfjmvb6m8h7lm5cr7mmz6zngrhknrrkmwilnrq0lzg1wfp1r"; type = "gem"; }; - version = "1.71.0"; + version = "1.104.0"; + }; + aws-sdk-states = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04pdrsijckiz9fyzyvdndwci004a4fswv8mq5jm53bzmybwhndz2"; + type = "gem"; + }; + version = "1.37.0"; + }; + aws-sdk-transfer = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ivbkfw7j83c7nagdhzdmcmwxn6ym50ak0jfkq1rdc1ppyir31dp"; + type = "gem"; + }; + version = "1.29.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -573,10 +749,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dfc8i5cxjwlvi4b665lbpbwvks8a6wfy3vfmwr3pjdmxwdmc2cs"; + sha256 = "1ll9382c1x2hp750cilh01h1cycgyhdr4cmmgx23k94hyyb8chv5"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.2"; }; azure_graph_rbac = { dependencies = ["ms_rest_azure"]; @@ -584,10 +760,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fq9gnsihrrljmlsg70kmryf72rxyy8kb4v9fa9z28abj0lncqgk"; + sha256 = "0mmx8jp85xa13j3asa9xnfi6wa8a9wwlp0hz0nj70fi3ydmcpdag"; type = "gem"; }; - version = "0.17.1"; + version = "0.17.2"; }; azure_mgmt_key_vault = { dependencies = ["ms_rest_azure"]; @@ -595,10 +771,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18vcdhzndwa81lg877b1mg2804vhvvnw83qagx6v99adicjf8y8b"; + sha256 = "0f4fai5l3453yirrwajds0jgah60gvawffx53a0jyv3b93ag88mz"; type = "gem"; }; - version = "0.17.5"; + version = "0.17.7"; }; azure_mgmt_resources = { dependencies = ["ms_rest_azure"]; @@ -606,10 +782,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "036p2d59jdjx5a49jz4swf37kfpc9ryyrb13xrdyghk1q79qli8p"; + sha256 = "1hb9010cxrmm23v4dfrsf9wgvr53qkcd6397c4azg3wc65a6i1vc"; type = "gem"; }; - version = "0.17.8"; + version = "0.18.1"; }; azure_mgmt_security = { dependencies = ["ms_rest_azure"]; @@ -617,10 +793,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01rk0wbfbhrxnm0vv520ilxd55hv7n3w0sq5j0v17mnwjgm7pa6d"; + sha256 = "11h2dyz4awzidvfj41h7k2q7mcqqcgzvm95fxpfxz609pbvck0g2"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.0"; }; azure_mgmt_storage = { dependencies = ["ms_rest_azure"]; @@ -628,30 +804,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m1xajw39958kcv4qlhad2n19flijn9aqzxks2wx4b0k207vp87c"; + sha256 = "0r8klsq3x7s4nn42h9w1kbqblrxnj7z7cpa8bxvc3xwv0vvql7m0"; type = "gem"; }; - version = "0.19.2"; - }; - backports = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0sp3l5wa77klj34sqib95ppxyam53x3p57xk0y6gy2c3z29z6hs5"; - type = "gem"; - }; - version = "3.16.1"; + version = "0.22.0"; }; bcrypt_pbkdf = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02vssr285m7kpsr47jdmzbar1h1d0mnkmyrpr1zg828isfmwii35"; + sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; berkshelf = { dependencies = ["chef" "chef-config" "cleanroom" "concurrent-ruby" "minitar" "mixlib-archive" "mixlib-config" "mixlib-shellout" "octokit" "retryable" "solve" "thor"]; @@ -659,10 +825,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pb20i2blbj9w4cf9nxxxskbd7q5zk8rrirppsfjx8r02dywpq8f"; + sha256 = "1mkakim23w7b38c8lw81wxqw68q6g7rlvxx82lq6bpp1hmmni64n"; type = "gem"; }; - version = "7.0.9"; + version = "7.1.0"; }; builder = { groups = ["default"]; @@ -680,21 +846,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lfx43yl77x074vjg77ixfxnxwl103ywjya55m4lj4vj0b2nxxxn"; + sha256 = "068jzw97g40wbpzn51vcvwdp012202rkmjfafxwhx31wxjzhwy0n"; type = "gem"; }; - version = "15.8.23"; + version = "15.15.0"; }; chef-cli = { - dependencies = ["addressable" "chef" "cookbook-omnifetch" "diff-lcs" "ffi-yajl" "license-acceptance" "minitar" "mixlib-cli" "mixlib-shellout" "paint" "solve"]; + dependencies = ["addressable" "chef" "cookbook-omnifetch" "diff-lcs" "ffi-yajl" "license-acceptance" "minitar" "mixlib-cli" "mixlib-shellout" "pastel" "solve"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05178w55vwqgrv8jaic2f77h6hx5b40lsmlaqfvdq63a459wl5sd"; + sha256 = "1nw73p8wg67qkzx07v21fwiqljb0yndjm10z56li72d6b1hbw0sb"; type = "gem"; }; - version = "2.0.0"; + version = "3.1.1"; }; chef-config = { dependencies = ["addressable" "chef-utils" "fuzzyurl" "mixlib-config" "mixlib-shellout" "tomlrb"]; @@ -702,10 +868,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xbl4pgn4kavi6b1m1f232xx4l9fhlz7d4ndmb11m36wb8l05hsk"; + sha256 = "1ji166i5n7cxn69amsfxsvy3b7bf5ksgxxg985w5jfl1gp5bihfl"; type = "gem"; }; - version = "15.8.23"; + version = "15.15.0"; }; chef-dk = { dependencies = ["addressable" "chef" "cookbook-omnifetch" "diff-lcs" "ffi-yajl" "license-acceptance" "minitar" "mixlib-cli" "mixlib-shellout" "paint" "solve"]; @@ -713,10 +879,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zhfq3kwchay6aj6128pr13xabrfprs288ma9abnv9d6vz3ddpw6"; + sha256 = "0zqznvry08pyiv8820b962fzvabzwbsmmwlyvk4ayjr2wshyi6g2"; type = "gem"; }; - version = "4.7.73"; + version = "4.13.3"; }; chef-provisioning = { dependencies = ["cheffish" "inifile" "mixlib-install" "net-scp" "net-ssh" "net-ssh-gateway" "winrm" "winrm-elevated" "winrm-fs"]; @@ -730,35 +896,35 @@ version = "2.7.6"; }; chef-telemetry = { - dependencies = ["chef-config" "concurrent-ruby" "ffi-yajl" "http"]; + dependencies = ["chef-config" "concurrent-ruby" "ffi-yajl"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lx85wy6d1khrya0idwqkdvh1x57qak3d8y699gwccfhl88xymg3"; + sha256 = "0hnmqr6vkgsbnzdzcc6j6svnms14irrcd70wk8qg3p98cy359rm5"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.14"; }; chef-utils = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "149pgbybdpi9y11qfsm4bmnqm655s682yv7qkwxhzwqn2fylzb2j"; + sha256 = "1j8rhqc6mj8iay755rl5yaf0rqs54gwcygib1s8g7dxl3vqcpwxa"; type = "gem"; }; - version = "15.8.23"; + version = "15.15.0"; }; chef-vault = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k0famr2cbrrarp4rpzcymqnpnwg734psbf0pxhasxdsjjg8nl6f"; + sha256 = "1rpcgzawdgzvk60fw9s40i5alc7b1rc2phkgm89dckfmklfh6794"; type = "gem"; }; - version = "4.0.1"; + version = "4.1.0"; }; chef-zero = { dependencies = ["ffi-yajl" "hashie" "mixlib-log" "rack" "uuidtools"]; @@ -788,10 +954,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ry6707plcrj7aicadmzxzfmlvz43i2g55k2iph8m390wpxhnhcl"; + sha256 = "15sz88xxh48phq1w3rsivzasg4r36dhqnpqna5cfi120vk28ylb2"; type = "gem"; }; - version = "9.1.0"; + version = "9.2.1"; }; cleanroom = { groups = ["default"]; @@ -808,20 +974,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; + sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.3"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; + sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; type = "gem"; }; - version = "1.1.6"; + version = "1.1.8"; }; cookbook-omnifetch = { dependencies = ["mixlib-archive"]; @@ -829,41 +995,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w4xh4ffcm4jd3fys9yg3rb8asngll15mvra8lfi2328alvbanvb"; - type = "gem"; - }; - version = "0.9.1"; - }; - cucumber-core = { - dependencies = ["backports" "cucumber-tag_expressions" "gherkin"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1iavlh8hqj9lwljbpkw06259gdicbr1bdb6pbj5yy3n8szgr8k3c"; - type = "gem"; - }; - version = "3.2.1"; - }; - cucumber-tag_expressions = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0cvmbljybws0qzjs1l67fvr9gqr005l8jk1ni5gcsis9pfmqh3vc"; + sha256 = "1qw8ayyflx222igmrmp1jpgfcfhpnc4myaxv9lk3ckd5l6n3w7qh"; type = "gem"; }; - version = "1.1.1"; + version = "0.11.1"; }; declarative = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0642xvwzzbgi3kp1bg467wma4g3xqrrn0sk369hjam7w579gnv5j"; + sha256 = "1yczgnqrbls7shrg63y88g7wand2yp9h6sf56c9bdcksn5nds8c0"; type = "gem"; }; - version = "0.0.10"; + version = "0.0.20"; }; declarative-option = { groups = ["default"]; @@ -890,10 +1035,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qhx743lcx61r2d3925jk61c6r8clfjmpf5g93cdy5sq00ig76lh"; + sha256 = "0nrg7kpgz6cn1gv2saj2fa5sfiykamvd7vn9lw2v625k7pjwf31l"; type = "gem"; }; - version = "3.3.0"; + version = "3.4.0"; }; docker-api = { dependencies = ["excon" "multi_json"]; @@ -901,10 +1046,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04dkbg7x2m4102dnwil2v688gblxh1skh374nkzksn18jjrivkdp"; + sha256 = "09lkc50nl3158za0fk8kpd05zlzfxiajnf6zrxpamw1nzdw89ac9"; type = "gem"; }; - version = "1.34.2"; + version = "2.0.0"; }; domain_name = { dependencies = ["unf"]; @@ -927,25 +1072,15 @@ }; version = "1.2.4"; }; - equatable = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fzx2ishipnp6c124ka6fiw5wk42s7c7gxid2c4c1mb55b30dglf"; - type = "gem"; - }; - version = "0.6.1"; - }; erubi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x"; + sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; erubis = { groups = ["default"]; @@ -962,21 +1097,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vhc5c16i8zrm3d98ppsnw514d7jvwdg0wk60kc9i1xw3797qkkd"; + sha256 = "1759s0rz6qgsw86dds1z4jzb3fvizqsk11j5q6z7lc5n404w6i23"; type = "gem"; }; - version = "0.72.0"; + version = "0.79.0"; }; faraday = { - dependencies = ["multipart-post"]; + dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13aghksmni2sl15y7wfpx6k5l3lfd8j9gdyqi6cbw6jgc7bqyyn2"; + sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz"; type = "gem"; }; - version = "0.17.3"; + version = "1.3.0"; }; faraday-cookie_jar = { dependencies = ["faraday" "http-cookie"]; @@ -984,10 +1119,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1di4gx6446a6zdkrpj679m5k515i53wvb4yxcsqvy8d8zacxiiv6"; + sha256 = "00hligx26w9wdnpgsrf0qdnqld4rdccy8ym6027h5m735mpvxjzk"; + type = "gem"; + }; + version = "0.0.7"; + }; + faraday-net_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; type = "gem"; }; - version = "0.0.6"; + version = "1.0.1"; }; faraday_middleware = { dependencies = ["faraday"]; @@ -995,10 +1140,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p7icfl28nvl8qqdsngryz1snqic9l8x6bk0dxd7ygn230y0k41d"; + sha256 = "0jik2kgfinwnfi6fpp512vlvs0mlggign3gkbpkg5fw1jr9his0r"; type = "gem"; }; - version = "0.12.2"; + version = "1.0.0"; }; fauxhai-ng = { dependencies = ["net-ssh"]; @@ -1006,20 +1151,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vm9hz6k8v4i7r1s5z489n58liaaxmb8bgcvklfg1hf8k3d5afdp"; + sha256 = "0pxzmsp31lxlkq1p0205j2s9kkjqs5a9zy2qpqabbmhny0d9ri8k"; type = "gem"; }; - version = "7.6.0"; + version = "8.7.0"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; + sha256 = "15hgiy09i8ywjihyzyvjvk42ivi3kmy6dm21s5sgg9j7y3h3zkkx"; type = "gem"; }; - version = "1.12.2"; + version = "1.14.2"; }; ffi-libarchive = { dependencies = ["ffi"]; @@ -1027,10 +1172,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vs8s37lr3bgw5d3mb6vamcqy16dj61yzzq0xf453lhr3dcampkb"; + sha256 = "1wmbwg6hirxr85c3skdq2na8xwg4ky880qbs1z1adb9aizcjbdkx"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.17"; }; ffi-yajl = { dependencies = ["libyajl2"]; @@ -1038,21 +1183,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11m9pkx2a1vssplzb3fwx4kc25bg5xmjf0j97l5kv6mhnhd93sik"; + sha256 = "1pfmn0gprc3c15baxa9rx64pqllk64m60f5vg4gp0icpafkp0jx5"; type = "gem"; }; - version = "2.3.3"; + version = "2.3.4"; }; foodcritic = { - dependencies = ["cucumber-core" "erubis" "ffi-yajl" "nokogiri" "rake" "rufus-lru" "treetop"]; + dependencies = ["erubis" "ffi-yajl" "nokogiri" "rake" "rufus-lru" "treetop"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11dzfcf6p1z75anizwqm48nadd84j5wk0vm4mp4s5a7xfqjh3psi"; + sha256 = "1gnp8lr37cv87adr3568kh7p55vwdqp01f2hwjxlvqkwkwk3fvn4"; type = "gem"; }; - version = "16.2.0"; + version = "16.3.0"; }; fuzzyurl = { groups = ["default"]; @@ -1064,37 +1209,27 @@ }; version = "0.9.0"; }; - gherkin = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1cgcdchwwdm10rsk44frjwqd4ihprhxjbm799nscqy2q1raqfj5s"; - type = "gem"; - }; - version = "5.1.0"; - }; git = { dependencies = ["rchardet"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15sbv16dlap5d6naybl8cc99zffrpzygkhjz3m6l3r5y5yrhwwjc"; + sha256 = "0vdcv93s33d9914a9nxrn2y2qv15xk7jx94007cmalp159l08cnl"; type = "gem"; }; - version = "1.6.0"; + version = "1.8.1"; }; google-api-client = { - dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "signet"]; + dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "signet"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xndfscxxaw73qah484vmhcd60hlbyrr9rlh7sf2n2sjfcqikjsf"; + sha256 = "1q1lsyyyfvff7727sr01j8qx6b30qpx6h0bna5s0bfz853fhl33b"; type = "gem"; }; - version = "0.34.1"; + version = "0.52.0"; }; googleauth = { dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; @@ -1102,10 +1237,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dnkh017ln5g7x3y0w743g61bxb2cdcyr1vax9ic3gx7vkrfj3iw"; + sha256 = "0cm60nbmwzf83fzy06f3iyn5a6sw91siw8x9bdvpwwmjsmivana6"; type = "gem"; }; - version = "0.10.0"; + version = "0.14.0"; }; gssapi = { dependencies = ["ffi"]; @@ -1113,10 +1248,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13l6pqbfrx3vv7cw26nq9p8rnyp9br31gaz85q32wx6hnzfcriwh"; + sha256 = "1qdfhj12aq8v0y961v4xv96a1y2z80h3xhvzrs9vsfgf884g6765"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; gyoku = { dependencies = ["builder"]; @@ -1149,27 +1284,6 @@ }; version = "1.7.10"; }; - htmlentities = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; - type = "gem"; - }; - version = "4.3.4"; - }; - http = { - dependencies = ["addressable" "http-cookie" "http-form_data" "http_parser.rb"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kcd9qp8vm1rkyp7gfh8j0dbl3zpi97vz2vbhpbcsdsa7l21a59r"; - type = "gem"; - }; - version = "2.2.2"; - }; http-cookie = { dependencies = ["domain_name"]; groups = ["default"]; @@ -1181,26 +1295,6 @@ }; version = "1.0.3"; }; - http-form_data = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0j8dwwbfpf8kc0lcsqcgy29lflszd1x4d7kc0f7227892m7r6y0m"; - type = "gem"; - }; - version = "1.0.3"; - }; - "http_parser.rb" = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; - type = "gem"; - }; - version = "0.6.0"; - }; httpclient = { groups = ["default"]; platforms = []; @@ -1217,10 +1311,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm"; + sha256 = "0k7q3pwm0l1qvx6sc3d4dxmdxqx2pc63lbfjwv0k0higq94rinvs"; type = "gem"; }; - version = "1.8.2"; + version = "1.8.8"; }; inifile = { groups = ["default"]; @@ -1237,10 +1331,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xbik6838gfh5yq9ahh1m7dzszxlk0g7x5lvhb8amk60mafkrgws"; + sha256 = "1wb1qy4i2xrrd92dc34pi7q7ibrjpapzk9y465v0n9caiplnb89n"; type = "gem"; }; - version = "1.4.4"; + version = "1.5.0"; }; inspec = { dependencies = ["faraday_middleware" "inspec-core" "train" "train-aws" "train-habitat" "train-winrm"]; @@ -1248,21 +1342,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04cyv81rgspr9xachq2dk9xgb740jrq7vpy2r88lqdzlzbpz3f4n"; + sha256 = "0jg818r56vzzh971ckzbknv8b70da73njr3x2y7xd6jwv5pjs93m"; type = "gem"; }; - version = "4.18.85"; + version = "4.26.4"; }; inspec-core = { - dependencies = ["addressable" "chef-telemetry" "faraday" "hashie" "htmlentities" "json-schema" "license-acceptance" "method_source" "mixlib-log" "multipart-post" "parallel" "parslet" "pry" "rspec" "rspec-its" "rubyzip" "semverse" "sslshake" "term-ansicolor" "thor" "tomlrb" "train-core" "tty-prompt" "tty-table"]; + dependencies = ["addressable" "chef-telemetry" "faraday" "faraday_middleware" "hashie" "license-acceptance" "method_source" "mixlib-log" "multipart-post" "parallel" "parslet" "pry" "rspec" "rspec-its" "rubyzip" "semverse" "sslshake" "thor" "tomlrb" "train-core" "tty-prompt" "tty-table"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ha6dmi5lywv4gldpv2pyj0zwqv4wsf422jd4x8licmkpkcrwc2r"; + sha256 = "0nrd4ny5cyah76pchr5xyi2m9rx0lkyk9vd2sp68rjp0x1x5y3p8"; type = "gem"; }; - version = "4.18.85"; + version = "4.26.4"; }; ipaddress = { groups = ["default"]; @@ -1274,16 +1368,6 @@ }; version = "0.8.3"; }; - jaro_winkler = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh"; - type = "gem"; - }; - version = "1.5.4"; - }; jmespath = { groups = ["default"]; platforms = []; @@ -1299,31 +1383,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn"; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; type = "gem"; }; - version = "2.3.0"; - }; - json-schema = { - dependencies = ["addressable"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1yv5lfmr2nzd14af498xqd5p89f3g080q8wk0klr3vxgypsikkb5"; - type = "gem"; - }; - version = "2.8.1"; + version = "2.5.1"; }; jwt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01zg1vp3lyl3flyjdkrcc93ghf833qgfgh2p1biqfhkzz11r129c"; + sha256 = "14ynyq1q483spj20ffl4xayfqx1a8qr761mqjfxczf8lwlap392n"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.2"; }; kitchen-inspec = { dependencies = ["hashie" "inspec" "test-kitchen"]; @@ -1331,10 +1404,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v85hnmhqdbl9zxphvbqfgma9rl095mq9jz223mkffdh9q5xv282"; + sha256 = "1fx27vkc29kx59qmkrkl53sbyigny3rkqlfp836rwlxf1wfbbdlv"; type = "gem"; }; - version = "1.3.1"; + version = "2.3.0"; }; kitchen-vagrant = { dependencies = ["test-kitchen"]; @@ -1342,10 +1415,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01wwryb4ha6gzhnmbg7xir32rpynbw4zc2l9dch02pwizw0n669x"; + sha256 = "1pix3n9hbr9s736n4jh8dn71ccsm5xcqvx9clwilzhr3r89qfiwg"; type = "gem"; }; - version = "1.6.1"; + version = "1.8.0"; }; knife-spork = { dependencies = ["app_conf" "chef" "diffy" "git"]; @@ -1353,10 +1426,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rcry9fbsi9kqfi8rrdda17yzmfyg21g9jv01sgzg1sj59kzb79s"; + sha256 = "1ddgmv3j75m908ldykrgn9rdjdw09yakmxav7569f18lhxxfs9l0"; type = "gem"; }; - version = "1.7.2"; + version = "1.7.3"; }; libyajl2 = { groups = ["default"]; @@ -1374,10 +1447,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lxgpmzb9hafzx7f5fssb1mamcbzbdp87awvjr33fk6nsvyg3zaj"; + sha256 = "03n3jpzivqxajvf3507c2z9vq2mrriqqc1yg3g0pgzacb3d38k2d"; type = "gem"; }; - version = "1.0.13"; + version = "1.0.19"; }; little-plugger = { groups = ["default"]; @@ -1395,10 +1468,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn"; + sha256 = "0pkmhcxi8lp74bq5gz9lxrvaiv5w0745kk7s4bw2b1x07qqri0n9"; type = "gem"; }; - version = "2.2.2"; + version = "2.3.0"; }; memoist = { groups = ["default"]; @@ -1415,10 +1488,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; + sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp"; type = "gem"; }; - version = "0.9.2"; + version = "1.0.0"; }; mini_mime = { groups = ["default"]; @@ -1435,10 +1508,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; minitar = { groups = ["default"]; @@ -1455,10 +1528,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; + sha256 = "0ipjhdw8ds6q9h7bs3iw28bjrwkwp215hr4l3xf6215fsl80ky5j"; type = "gem"; }; - version = "5.14.0"; + version = "5.14.3"; }; mixlib-archive = { dependencies = ["mixlib-log"]; @@ -1466,30 +1539,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01c7g55x126cj2493wx03n9b83i9m1rdfx2aivg1yg8d1lmj8jdg"; + sha256 = "0dj52irvnp1riz52kg6fddmdvl9nxsrxk3vyidr7lfzhw5sj8vdk"; type = "gem"; }; - version = "1.0.5"; + version = "1.1.4"; }; mixlib-authentication = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d854b55d0hx0q12gwbycfdcpnxx88zz0jk557ngq2cqq94g96jy"; + sha256 = "1wfyn645wnb79rl3ys83171ymv56k8zks9qvxh29vj8nicyrzr23"; type = "gem"; }; - version = "3.0.6"; + version = "3.0.7"; }; mixlib-cli = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yrfgg18hlm0hkg81w5bw3fbk0m89lg96a0b65q9mrrscg37rvn2"; + sha256 = "1ydxlfgd7nnj3rp1y70k4yk96xz5cywldjii2zbnw3sq9pippwp6"; type = "gem"; }; - version = "2.1.5"; + version = "2.1.8"; }; mixlib-config = { dependencies = ["tomlrb"]; @@ -1497,10 +1570,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14lb9dg4wg86qhbd0rykdjr00arkyvmrg20a5ylf0zd6wp7w01jk"; + sha256 = "1askip583sfnz25gywd508l3vj5wnvx9vp7gm1sfnixm7amssrwq"; type = "gem"; }; - version = "3.0.6"; + version = "3.0.9"; }; mixlib-install = { dependencies = ["mixlib-shellout" "mixlib-versioning" "thor"]; @@ -1508,30 +1581,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bsn4d0m3xw142v1vssyrxwa6y64fqd5hx2hsnm5vc1xj4xmcg0f"; + sha256 = "0p11qf6b86dzl3q5gqi63myz484dicmn90d8v8jjb1dm51gqpajq"; type = "gem"; }; - version = "3.11.26"; + version = "3.12.5"; }; mixlib-log = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00kmwx7s3xpxmy44saxjk36gbhsywyxy4f8jf4gjvwwpr0ps8q0g"; + sha256 = "0n5dm5iz90ijvjn59jfm8gb8hgsvbj0f1kpzbl38b02z0z4a4v7x"; type = "gem"; }; - version = "3.0.8"; + version = "3.0.9"; }; mixlib-shellout = { + dependencies = ["chef-utils"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c2nqa82xp0hg8sj69cypar8n7p3azl5pl2v2mjbkhgmmhqxa8km"; + sha256 = "0y1z0phkdhpbsn8vz7a86nhkr7ra619j86z5p75amz61kfpw42z9"; type = "gem"; }; - version = "3.0.9"; + version = "3.2.2"; }; mixlib-versioning = { groups = ["default"]; @@ -1548,10 +1622,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hh40z1adl4lw16dj4hxgabx4rr28mgqycih1y1d91bwww0jjdg6"; + sha256 = "17kvf6fijn6k886dhj89h0x39qh90c47asa2k16s913fcgn3a1n3"; type = "gem"; }; - version = "0.6.6"; + version = "0.7.0"; }; ms_rest = { dependencies = ["concurrent-ruby" "faraday" "timeliness"]; @@ -1559,31 +1633,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10mgfspn3g75mhmfprpr2pnkmav34gix8cfga43g7162d0i1pd9l"; + sha256 = "1jiha1bda5knpjqjymwik6i41n69gb0phcrgvmgc5icl4mcisai7"; type = "gem"; }; - version = "0.7.5"; + version = "0.7.6"; }; ms_rest_azure = { - dependencies = ["concurrent-ruby" "faraday" "faraday-cookie_jar" "ms_rest" "unf_ext"]; + dependencies = ["concurrent-ruby" "faraday" "faraday-cookie_jar" "ms_rest"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "135va1hzxwn0apb2lf7b9yi8d1czid250cgf91dm331rqz84jnvz"; + sha256 = "06i37b84r2q206kfm5vsi9s1qiiy09091vhvc5pzb7320h0hc1ih"; type = "gem"; }; - version = "0.11.1"; + version = "0.12.0"; }; multi_json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr"; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; type = "gem"; }; - version = "1.14.1"; + version = "1.15.0"; }; multipart-post = { groups = ["default"]; @@ -1595,16 +1669,6 @@ }; version = "2.1.1"; }; - necromancer = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1w2y31947axs62bsf0xrpgalsw4ip1m44vpw7p8f4s9zvnayj2vd"; - type = "gem"; - }; - version = "0.5.1"; - }; net-scp = { dependencies = ["net-ssh"]; groups = ["default"]; @@ -1660,15 +1724,15 @@ version = "1.2.1"; }; nokogiri = { - dependencies = ["mini_portile2"]; + dependencies = ["mini_portile2" "racc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8"; + sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; type = "gem"; }; - version = "1.10.8"; + version = "1.11.1"; }; nori = { groups = ["default"]; @@ -1686,10 +1750,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06kx258qa5k24q5pv8i4daaw3g57gif6p5k5h3gndj3q2jk6vhkn"; + sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq"; type = "gem"; }; - version = "4.16.0"; + version = "4.20.0"; }; ohai = { dependencies = ["chef-config" "ffi" "ffi-yajl" "ipaddress" "mixlib-cli" "mixlib-config" "mixlib-log" "mixlib-shellout" "plist" "systemu" "wmi-lite"]; @@ -1697,20 +1761,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c6c22nqg905sivr099qrwbvnwwyvm37xzxxrysvkalxglkvxr23"; + sha256 = "0qw3mz8f9hpzfchwqa1nix7fcvy34k5n7lln91b8gsbx2l6aycs6"; type = "gem"; }; - version = "15.7.4"; + version = "15.12.0"; }; os = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06r55k01g32lvz4wf2s6hpjlxbbag113jsvff3w64jllfr315a73"; + sha256 = "12fli64wz5j9868gpzv5wqsingk1jk457qyqksv9ksmq9b0zpc9x"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.1"; }; paint = { groups = ["default"]; @@ -1727,10 +1791,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2"; + sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; type = "gem"; }; - version = "1.19.1"; + version = "1.20.1"; }; parser = { dependencies = ["ast"]; @@ -1738,10 +1802,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "145lv6rbbnbddbk79l10kadycjq05vyrzq5d733zswmypshpq6ni"; + sha256 = "1jixakyzmy0j5c1rb0fjrrdhgnyryvrr6vgcybs14jfw09akv5ml"; type = "gem"; }; - version = "2.7.0.2"; + version = "3.0.0.0"; }; parslet = { groups = ["default"]; @@ -1754,25 +1818,25 @@ version = "1.8.2"; }; pastel = { - dependencies = ["equatable" "tty-color"]; + dependencies = ["tty-color"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m43wk7gswwkl6lfxwlliqc9v1qp8arfygihyz91jc9icf270xzm"; + sha256 = "0xash2gj08dfjvq4hy6l1z22s5v30fhizwgs10d6nviggpxsj7a8"; type = "gem"; }; - version = "0.7.3"; + version = "0.8.0"; }; plist = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ra0910xxbhfsmdi0ig36pr3q0khdqzwb5da3wg7y3n8d1sh9ffp"; + sha256 = "1whhr897z6z6av85x2cipyjk46bwh6s4wx6nbrcd3iifnzvbqs7l"; type = "gem"; }; - version = "3.5.0"; + version = "3.6.0"; }; polyglot = { groups = ["default"]; @@ -1800,10 +1864,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69"; + sha256 = "1shq3vfdg7c9l1wppl8slridl95wmwvnngqhga6j2571nnv50piv"; type = "gem"; }; - version = "0.12.2"; + version = "0.14.0"; }; public_suffix = { groups = ["default"]; @@ -1815,15 +1879,25 @@ }; version = "3.1.1"; }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; rack = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10mp9s48ssnw004aksq90gvhdvwczh8j6q82q2kqiqq92jd1zxbp"; + sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; type = "gem"; }; - version = "2.2.2"; + version = "2.2.3"; }; rainbow = { groups = ["default"]; @@ -1840,10 +1914,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; + sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67"; type = "gem"; }; - version = "13.0.1"; + version = "13.0.3"; }; rchardet = { groups = ["default"]; @@ -1855,6 +1929,16 @@ }; version = "1.8.0"; }; + regexp_parser = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zm86k9q8m5jkcnpb1f93wsvc57saldfj8czxkx1aw031i95inip"; + type = "gem"; + }; + version = "2.0.3"; + }; representable = { dependencies = ["declarative" "declarative-option" "uber"]; groups = ["default"]; @@ -1902,10 +1986,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hzsig4pi9ybr0xl5540m1swiyxa74c8h09225y5sdh2rjkkg84h"; + sha256 = "1dwai7jnwmdmd7ajbi2q0k0lx1dh88knv5wl7c34wjmf94yv8w5q"; type = "gem"; }; - version = "3.9.0"; + version = "3.10.0"; }; rspec-core = { dependencies = ["rspec-support"]; @@ -1913,10 +1997,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qzc1wdjb1qnbimjl8i1q1r1z5hdv2lmcw7ysz7jawj4d1cvpqvd"; + sha256 = "0wwnfhxxvrlxlk1a3yxlb82k2f9lm0yn0598x7lk8fksaz4vv6mc"; type = "gem"; }; - version = "3.9.1"; + version = "3.10.1"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -1924,10 +2008,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gjqfb39da6gywdcp4h77738r7khbrn2v4y45589z25bj4z9paf0"; + sha256 = "1sz9bj4ri28adsklnh257pnbq4r5ayziw02qf67wry0kvzazbb17"; type = "gem"; }; - version = "3.9.0"; + version = "3.10.1"; }; rspec-its = { dependencies = ["rspec-core" "rspec-expectations"]; @@ -1946,61 +2030,82 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19vmdqym1v2g1zbdnq37zwmyj87y9yc9ijwc8js55igvbb9hx0mr"; + sha256 = "1d13g6kipqqc9lmwz5b244pdwc97z15vcbnbq6n9rlf32bipdz4k"; type = "gem"; }; - version = "3.9.1"; + version = "3.10.2"; }; rspec-support = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zwpyq1na23pvgacpxs2v9nwfbjbw6x3arca5j3l1xagigqmzhc3"; + sha256 = "15j52parvb8cgvl6s0pbxi2ywxrv6x0764g222kz5flz0s4mycbl"; type = "gem"; }; - version = "3.9.2"; + version = "3.10.2"; }; rubocop = { - dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "rexml" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06npybjypxsrz09z8ivxqfcwzpbgif6z3hwpp0ls8znqlgp3m922"; + type = "gem"; + }; + version = "1.9.1"; + }; + rubocop-ast = { + dependencies = ["parser"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0adfpv76whv5dy5wr5brqkki39jfv6r08482saj64h9j4wzwcznb"; + sha256 = "0gkf1p8yal38nlvdb39qaiy0gr85fxfr09j5dxh8qvrgpncpnk78"; type = "gem"; }; - version = "0.80.0"; + version = "1.4.1"; }; ruby-progressbar = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf"; + sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; type = "gem"; }; - version = "1.10.1"; + version = "1.11.0"; + }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; + type = "gem"; + }; + version = "0.0.4"; }; rubyntlm = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p6bxsklkbcqni4bcq6jajc2n57g0w5rzn4r49c3lb04wz5xg0dy"; + sha256 = "0b8hczk8hysv53ncsqzx4q6kma5gy5lqc7s5yx8h64x3vdb18cjv"; type = "gem"; }; - version = "0.6.2"; + version = "0.6.3"; }; rubyzip = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qxc2zxwwipm6kviiar4gfhcakpx1jdcs89v6lvzivn5hq1xk78l"; + sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji"; type = "gem"; }; - version = "1.3.0"; + version = "2.3.0"; }; rufus-lru = { groups = ["default"]; @@ -2039,10 +2144,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m8brljfgrxpr5j7kggv3dphqj9in3rkbf5dryx8f7nprkk85wdd"; + sha256 = "1zmrsnrrj5j3bp9fmaa74cvlkpdwspv8gv5vpz1lclhirkiqz1xv"; type = "gem"; }; - version = "0.12.0"; + version = "0.14.1"; }; solve = { dependencies = ["molinillo" "semverse"]; @@ -2050,20 +2155,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zymaik4cxd4kmd8f4n1ij8ykrfinhnlvlhjnsdv2cv1xnqnjqmk"; + sha256 = "059lrsf40rl5kclp1w8pb0fzz5sv8aikg073cwcvn5mndk14ayky"; type = "gem"; }; - version = "4.0.3"; + version = "4.0.4"; }; sslshake = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dy7pnvn0zb3qbfahgksfxqw1hxhk2i2wlw34bvr2iyzqlw04a3s"; + sha256 = "0r3ifksx8a05yqhv7nc4cwan8bwmxgq5kyv7q7hy2h9lv5zcjs8h"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; strings = { dependencies = ["strings-ansi" "unicode-display_width" "unicode_utils"]; @@ -2071,10 +2176,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "111876lcqrykh30w7zzkrl06d6rj9lq24y625m28674vgfxkkcz0"; + sha256 = "0xgw0zmwansvmk8dnxgd83pvrj4f5y8j72bpzp409hwd6xy1hy7m"; type = "gem"; }; - version = "0.1.8"; + version = "0.2.0"; }; strings-ansi = { groups = ["default"]; @@ -2086,16 +2191,6 @@ }; version = "0.2.0"; }; - sync = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1z9qlq4icyiv3hz1znvsq1wz2ccqjb1zwd6gkvnwg6n50z65d0v6"; - type = "gem"; - }; - version = "0.5.0"; - }; syslog-logger = { groups = ["default"]; platforms = []; @@ -2116,37 +2211,26 @@ }; version = "2.6.5"; }; - term-ansicolor = { - dependencies = ["tins"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xq5kci9215skdh27npyd3y55p812v4qb4x2hv3xsjvwqzz9ycwj"; - type = "gem"; - }; - version = "1.7.1"; - }; test-kitchen = { dependencies = ["bcrypt_pbkdf" "ed25519" "license-acceptance" "mixlib-install" "mixlib-shellout" "net-scp" "net-ssh" "net-ssh-gateway" "thor" "winrm" "winrm-elevated" "winrm-fs"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14wvv8vgm3lqqk9ifywjhhxlvnbx5gpl4f8zbw5gj41sq8hdqgqj"; + sha256 = "1s5sj6x2dscd3wci7ns1m3jwfp1b7h8535q44ggdsz60gp63p974"; type = "gem"; }; - version = "2.3.4"; + version = "2.10.0"; }; thor = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; + sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; type = "gem"; }; - version = "0.20.3"; + version = "1.1.0"; }; thread_safe = { groups = ["default"]; @@ -2168,80 +2252,69 @@ }; version = "0.3.10"; }; - tins = { - dependencies = ["sync"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nghqcdg7ak91n2h6igx8i2ykbhna93xpg33w6232451vphlwdm0"; - type = "gem"; - }; - version = "1.24.1"; - }; tomlrb = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0njkyq5csj4km8spmw33b5902v254wvyvqq1b0f0kky5hs7bvrgg"; + sha256 = "00x5y9h4fbvrv4xrjk4cqlkm4vq8gv73ax4alj3ac2x77zsnnrk8"; type = "gem"; }; - version = "1.2.9"; + version = "1.3.0"; }; train = { - dependencies = ["activesupport" "azure_graph_rbac" "azure_mgmt_key_vault" "azure_mgmt_resources" "azure_mgmt_security" "azure_mgmt_storage" "docker-api" "google-api-client" "googleauth" "train-core" "train-winrm"]; + dependencies = ["activesupport" "azure_graph_rbac" "azure_mgmt_key_vault" "azure_mgmt_resources" "azure_mgmt_security" "azure_mgmt_storage" "docker-api" "google-api-client" "googleauth" "inifile" "train-core" "train-winrm"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y7aggjyarc531a0vmh86vdqr6ws3y3h64jnkh8cavpqns4jhmjg"; + sha256 = "09nflqvdgzxfncr8qki0jhnarfg36mii0h6hi2cd71q49613m6gk"; type = "gem"; }; - version = "3.2.22"; + version = "3.4.9"; }; train-aws = { - dependencies = ["aws-sdk-apigateway" "aws-sdk-apigatewayv2" "aws-sdk-athena" "aws-sdk-autoscaling" "aws-sdk-budgets" "aws-sdk-cloudformation" "aws-sdk-cloudhsm" "aws-sdk-cloudhsmv2" "aws-sdk-cloudtrail" "aws-sdk-cloudwatch" "aws-sdk-cloudwatchlogs" "aws-sdk-codecommit" "aws-sdk-codedeploy" "aws-sdk-codepipeline" "aws-sdk-configservice" "aws-sdk-core" "aws-sdk-costandusagereportservice" "aws-sdk-dynamodb" "aws-sdk-ec2" "aws-sdk-ecr" "aws-sdk-ecs" "aws-sdk-eks" "aws-sdk-elasticache" "aws-sdk-elasticbeanstalk" "aws-sdk-elasticloadbalancing" "aws-sdk-elasticloadbalancingv2" "aws-sdk-elasticsearchservice" "aws-sdk-firehose" "aws-sdk-iam" "aws-sdk-kafka" "aws-sdk-kinesis" "aws-sdk-kms" "aws-sdk-lambda" "aws-sdk-organizations" "aws-sdk-rds" "aws-sdk-redshift" "aws-sdk-route53" "aws-sdk-route53domains" "aws-sdk-route53resolver" "aws-sdk-s3" "aws-sdk-securityhub" "aws-sdk-ses" "aws-sdk-sms" "aws-sdk-sns" "aws-sdk-sqs" "aws-sdk-ssm"]; + dependencies = ["aws-sdk-apigateway" "aws-sdk-apigatewayv2" "aws-sdk-applicationautoscaling" "aws-sdk-athena" "aws-sdk-autoscaling" "aws-sdk-batch" "aws-sdk-budgets" "aws-sdk-cloudformation" "aws-sdk-cloudfront" "aws-sdk-cloudhsm" "aws-sdk-cloudhsmv2" "aws-sdk-cloudtrail" "aws-sdk-cloudwatch" "aws-sdk-cloudwatchevents" "aws-sdk-cloudwatchlogs" "aws-sdk-codecommit" "aws-sdk-codedeploy" "aws-sdk-codepipeline" "aws-sdk-cognitoidentity" "aws-sdk-cognitoidentityprovider" "aws-sdk-configservice" "aws-sdk-core" "aws-sdk-costandusagereportservice" "aws-sdk-databasemigrationservice" "aws-sdk-dynamodb" "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-firehose" "aws-sdk-glue" "aws-sdk-guardduty" "aws-sdk-iam" "aws-sdk-kafka" "aws-sdk-kinesis" "aws-sdk-kms" "aws-sdk-lambda" "aws-sdk-organizations" "aws-sdk-ram" "aws-sdk-rds" "aws-sdk-redshift" "aws-sdk-route53" "aws-sdk-route53domains" "aws-sdk-route53resolver" "aws-sdk-s3" "aws-sdk-secretsmanager" "aws-sdk-securityhub" "aws-sdk-servicecatalog" "aws-sdk-ses" "aws-sdk-shield" "aws-sdk-sms" "aws-sdk-sns" "aws-sdk-sqs" "aws-sdk-ssm" "aws-sdk-states" "aws-sdk-transfer"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dvwzk9h5kzbb9v6qm387mfysjz4nfcr56685ccl5c1jj5a59553"; + sha256 = "014cbgkzkw1rf7652h1xqshb9crr6pn2yhlv1z41ndxlkmmdx4fg"; type = "gem"; }; - version = "0.1.15"; + version = "0.1.35"; }; train-core = { - dependencies = ["addressable" "inifile" "json" "mixlib-shellout" "net-scp" "net-ssh"]; + dependencies = ["addressable" "ffi" "json" "mixlib-shellout" "net-scp" "net-ssh"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dfqyfi4q2vykbiw4b373n7n2aqzhq9gkn8sr3sx2w7hpd7lkd3x"; + sha256 = "1pbfbmi9l5hxr1zly1bc72fk8a6by4d19wdap8q3mi3rlflqzbfp"; type = "gem"; }; - version = "3.2.22"; + version = "3.4.9"; }; train-habitat = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w642zkvgq0d1dy622lk50ngr0872v6ghd4r1g692qv8g4k6d90n"; + sha256 = "0qdi2q5djzfl6x3fv2vrvybjdvrnx53nfh4vzrcl2h7nrf801n6v"; type = "gem"; }; - version = "0.2.13"; + version = "0.2.22"; }; train-winrm = { - dependencies = ["winrm" "winrm-fs"]; + dependencies = ["winrm" "winrm-elevated" "winrm-fs"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x4sv6hblq9y259aka6j868di2w669f6aj2m7ssi5jxhanaf5mqk"; + sha256 = "0nin3qfkh173yjcihxaz0sbnskds9n1n0ciphc7y70647vpsqgrh"; type = "gem"; }; - version = "0.2.6"; + version = "0.2.12"; }; treetop = { dependencies = ["polyglot"]; @@ -2249,10 +2322,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7"; + sha256 = "0697qz1akblf8r3wi0s2dsjh468hfsd57fb0mrp93z35y2ni6bhh"; type = "gem"; }; - version = "1.6.10"; + version = "1.6.11"; }; tty-box = { dependencies = ["pastel" "strings" "tty-cursor"]; @@ -2260,20 +2333,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14g63v0jx87hba50rlv3c521zg9rw0f5d31cihcvym19xxa7v3l5"; + sha256 = "12yzhl3s165fl8pkfln6mi6mfy3vg7p63r3dvcgqfhyzq6h57x0p"; type = "gem"; }; - version = "0.5.0"; + version = "0.7.0"; }; tty-color = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0czbnp19cfnf5zwdd22payhqjv57mgi3gj5n726s20vyq3br6bsp"; + sha256 = "0aik4kmhwwrmkysha7qibi2nyzb4c8kp42bd5vxnf8sf7b53g73g"; type = "gem"; }; - version = "0.5.1"; + version = "0.6.0"; }; tty-cursor = { groups = ["default"]; @@ -2286,15 +2359,15 @@ version = "0.7.1"; }; tty-prompt = { - dependencies = ["necromancer" "pastel" "tty-reader"]; + dependencies = ["pastel" "tty-reader"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19kbxny8cfsy1r02awih1gf76mi3a7zqg3ymxpmf9720khlmziax"; + sha256 = "0rhvwpl5wk51njrh3avm09c8pwl2z5iwc0l67h40gq3r7ix2fjk2"; type = "gem"; }; - version = "0.20.0"; + version = "0.23.0"; }; tty-reader = { dependencies = ["tty-cursor" "tty-screen" "wisper"]; @@ -2302,31 +2375,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1977ajs9sxwhd88qqmf6l1hw63dqxlvg9mx626rymsc5ap2xa1r4"; + sha256 = "1cf2k7w7d84hshg4kzrjvk9pkyc2g1m3nx2n1rpmdcf0hp4p4af6"; type = "gem"; }; - version = "0.7.0"; + version = "0.9.0"; }; tty-screen = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jwgr2i3wilng3mx851xczmkzllbirmsmr42ik4amqyyvry1yzyf"; + sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235"; type = "gem"; }; - version = "0.7.1"; + version = "0.8.1"; }; tty-table = { - dependencies = ["equatable" "necromancer" "pastel" "strings" "tty-screen"]; + dependencies = ["pastel" "strings" "tty-screen"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y07yikpk65jqmxinw8l4c45pbw1b2h4fv9fikb43a7sdlr6sn69"; + sha256 = "0fcrbfb0hjd9vkkazkksri93dv9wgs2hp6p1xwb1lp43a13pmhpx"; type = "gem"; }; - version = "0.11.0"; + version = "0.12.0"; }; tzinfo = { dependencies = ["thread_safe"]; @@ -2334,10 +2407,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp"; + sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.9"; }; uber = { groups = ["default"]; @@ -2365,20 +2438,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04d13bp6lyg695x94whjwsmzc2ms72d94vx861nx1y40k3817yp8"; + sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; type = "gem"; }; - version = "0.0.7.2"; + version = "0.0.7.7"; }; unicode-display_width = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pppclzq4qb26g321553nm9xqca3zgllvpwb2kqxsdadwj51s09x"; + sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; type = "gem"; }; - version = "1.6.1"; + version = "1.7.0"; }; unicode_utils = { groups = ["default"]; @@ -2406,10 +2479,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13c0vf32vinkp3ia86rvq779dacl37v4v2814v4g9qrk3liv0dym"; + sha256 = "0nxf6a47d1xf1nvi7rbfbzjyyjhz0iakrnrsr2hj6y24a381sd8i"; type = "gem"; }; - version = "2.3.4"; + version = "2.3.6"; }; winrm-elevated = { dependencies = ["erubi" "winrm" "winrm-fs"]; @@ -2417,10 +2490,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yawwrs3pnvbbm9xn0nbzvyl92kgf1jr439qfbqx0mb8zzkyi2dv"; + sha256 = "1lmlaii8qapn84wxdg5d82gbailracgk67d0qsnbdnffcg8kswzd"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.3"; }; winrm-fs = { dependencies = ["erubi" "logging" "rubyzip" "winrm"]; @@ -2428,10 +2501,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0phhzliw47hmpi3ddygs500kfxa7il5yzmp7dw4ix2dvhrxrj7s6"; + sha256 = "0gb91k6s1yjqw387x4w1nkpnxblq3pjdqckayl0qvz5n3ygdsb0d"; type = "gem"; }; - version = "1.3.3"; + version = "1.3.5"; }; wisper = { groups = ["default"]; diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index ba96cfafe48..65077d6134b 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -2,7 +2,7 @@ , coreutils, git, gnused, nix, nixfmt }: let - version = "2.0.11"; + version = "2.0.12"; zshCompletion = fetchurl { url = @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "sha256-jmKJPBPzO8DiXuJoHWibinkaAzneXdSK85SQfJ2nWhg="; + sha256 = "sha256-SLl8pXGl9612FDEOy1vz/mXTb3+7YAJ/wq/njBL+V+I="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index fc1f5c3f317..1599c4213a1 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -1,13 +1,21 @@ -{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "skaffold"; - version = "1.17.2"; + version = "1.20.0"; + + src = fetchFromGitHub { + owner = "GoogleContainerTools"; + repo = "skaffold"; + rev = "v${version}"; + sha256 = "080zhksznwsyi0w1ban90vgh8y1q2703h3h4fvkwg695prd9ij66"; + }; + + vendorSha256 = "1jvrk5jhjzg0dq0zg7p4hvjwda2289cmwh0ldz3269y8g3l113x8"; - goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; - buildFlagsArray = let t = "${goPackagePath}/pkg/skaffold"; in '' + buildFlagsArray = let t = "github.com/GoogleContainerTools/skaffold/pkg/skaffold"; in '' -ldflags= -s -w -X ${t}/version.version=v${version} @@ -15,24 +23,24 @@ buildGoPackage rec { -X ${t}/version.buildDate=unknown ''; - src = fetchFromGitHub { - owner = "GoogleContainerTools"; - repo = "skaffold"; - rev = "v${version}"; - sha256 = "1sn4pmikap93kpdgcalgb3nam7zp60ck6wmynsv8dnzihrr7ycm3"; - }; - nativeBuildInputs = [ installShellFiles ]; + postInstall = '' - for shell in bash zsh; do - $out/bin/skaffold completion $shell > skaffold.$shell - installShellCompletion skaffold.$shell - done + installShellCompletion --cmd skaffold \ + --bash <($out/bin/skaffold completion bash) \ + --zsh <($out/bin/skaffold completion zsh) ''; meta = with lib; { - description = "Easy and Repeatable Kubernetes Development"; homepage = "https://skaffold.dev/"; + changelog = "https://github.com/GoogleContainerTools/skaffold/releases/tag/v${version}"; + description = "Easy and Repeatable Kubernetes Development"; + longDescription = '' + Skaffold is a command line tool that facilitates continuous development for Kubernetes applications. + You can iterate on your application source code locally then deploy to local or remote Kubernetes clusters. + Skaffold handles the workflow for building, pushing and deploying your application. + It also provides building blocks and describe customizations for a CI/CD pipeline. + ''; license = licenses.asl20; maintainers = with maintainers; [ vdemeester ]; }; diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index 8508fbe8f78..b8582f68ebc 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, nodejs-slim, mkYarnPackage, fetchFromGitHub, bundlerEnv -, yarn, callPackage, imagemagick, ffmpeg, file, ruby_2_7 +, yarn, callPackage, imagemagick, ffmpeg, file, ruby_2_7, writeShellScript # Allow building a fork or custom version of Mastodon: , pname ? "mastodon" @@ -96,10 +96,18 @@ stdenv.mkDerivation rec { ln -s /var/log/mastodon log ln -s /tmp tmp ''; + propagatedBuildInputs = [ imagemagick ffmpeg file mastodon-gems.wrappedRuby ]; - installPhase = '' + + installPhase = let + run-streaming = writeShellScript "run-streaming.sh" '' + # NixOS helper script to consistently use the same NodeJS version the package was built with. + ${nodejs-slim}/bin/node ./streaming + ''; + in '' mkdir -p $out cp -r * $out/ + ln -s ${run-streaming} $out/run-streaming.sh ''; meta = with lib; { diff --git a/pkgs/shells/fish/wrapper.nix b/pkgs/shells/fish/wrapper.nix index 053568bc6b9..6713a69d560 100644 --- a/pkgs/shells/fish/wrapper.nix +++ b/pkgs/shells/fish/wrapper.nix @@ -14,12 +14,12 @@ let complPath = completionDirs ++ map (vendorDir "completions") pluginPkgs; funcPath = functionDirs ++ map (vendorDir "functions") pluginPkgs; confPath = confDirs ++ map (vendorDir "conf") pluginPkgs; - safeConfPath = map escapeShellArg confPath; in writeShellScriptBin "fish" '' ${fish}/bin/fish --init-command " set --prepend fish_complete_path ${escapeShellArgs complPath} set --prepend fish_function_path ${escapeShellArgs funcPath} - for c in {${concatStringsSep "," safeConfPath}}/*; source $c; end + set --local fish_conf_source_path ${escapeShellArgs confPath} + for c in $fish_conf_source_path/*; source $c; end " "$@" '') diff --git a/pkgs/tools/games/ajour/default.nix b/pkgs/tools/games/ajour/default.nix index 291c783c914..a7893ac754f 100644 --- a/pkgs/tools/games/ajour/default.nix +++ b/pkgs/tools/games/ajour/default.nix @@ -34,16 +34,16 @@ let in rustPlatform.buildRustPackage rec { pname = "Ajour"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "casperstorm"; repo = "ajour"; rev = version; - sha256 = "1lwwj16q24k3d3vaj64zkai4cb15hxp6bzicp004q5az4gbriwih"; + sha256 = "sha256-ZN62RIQEokailZRBQUq8nX4Eq/b9GGPmxln8j5KGW+8="; }; - cargoSha256 = "17j6v796ahfn07yjj9xd9kygy0sllz93ac4gky8w0hcixdwjp3i5"; + cargoSha256 = "sha256-tcC8GfEeHaM7XcAXw56/wdygfGPj4vOgn5sZd0KuGkA="; nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 063442b75f2..b808d88888f 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.10.10"; + version = "2.11.0"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-Rt+60j1+uwL6g4HGc+xdUzGK6nanGfRYbekO54iKsPE="; + sha256 = "sha256-c+3zB0bxohQQsOjcTLHgRQamJfm7iUdz79t8q8wAFL8="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-6L1J5RHI657Z03rMmhwEzgpQ0//dykqGi8bI2Enc3N8="; + cargoSha256 = "sha256-ORkj6T9O/NKuaILm5NFGePYxKMaCAAydascelaEvYVw="; doCheck = false; diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index b966a03743c..6028140234e 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -13,6 +13,12 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-e95DRhD22zvizUJOM2It45Bx05iK3KtaMgFPkMbR7iI="; + doInstallCheck = true; + + installCheckPhase = '' + [[ "$($out/bin/fend "1 km to m")" = "1000 m" ]] + ''; + meta = with lib; { description = "Arbitrary-precision unit-aware calculator"; homepage = "https://github.com/printfn/fend"; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 8766e957aaf..f040b17f892 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.4.7"; + version = "0.4.5.6"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "1vh5kdx7s74il8a6gr7jydbpv0an01nla4y2r8w7h33z2wk2jv9j"; + sha256 = "0cz78pjw2bc3kl3ziip1nhhbq89crv315rf1my3zmmgd9xws7jr2"; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/tools/system/auto-cpufreq/default.nix b/pkgs/tools/system/auto-cpufreq/default.nix index b4bef5fc5e3..f86ac47fdde 100644 --- a/pkgs/tools/system/auto-cpufreq/default.nix +++ b/pkgs/tools/system/auto-cpufreq/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "auto-cpufreq"; - version = "1.5.3"; + version = "1.6.1"; src = fetchFromGitHub { owner = "AdnanHodzic"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NDIdQ4gUN2jG+VWXsv3fdUogZxOOiNtnbekD30+jx6M="; + sha256 = "sha256-oz3C1150CPfT0kkx1x7VIX/Rm06dkjyxeDPFCRJaWNc="; }; propagatedBuildInputs = with python3Packages; [ click distro psutil ]; diff --git a/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch b/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch index 232ac780341..7f86f6eda0e 100644 --- a/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch +++ b/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch @@ -1,8 +1,17 @@ diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py -index 482a544..d142013 100644 +index a685db8..1ca1ca1 100644 --- a/auto_cpufreq/core.py +++ b/auto_cpufreq/core.py -@@ -163,31 +163,13 @@ def get_current_gov(): +@@ -72,7 +72,7 @@ def app_version(): + print("Git commit:", check_output(["git", "describe", "--always"]).strip().decode()) + else: + print(getoutput("pacman -Qi auto-cpufreq | grep Version")) +- else: ++ else: + # source code (auto-cpufreq-installer) + try: + print("Git commit:", check_output(["git", "describe", "--always"]).strip().decode()) +@@ -179,31 +179,13 @@ def get_current_gov(): return print("Currently using:", getoutput("cpufreqctl.auto-cpufreq --governor").strip().split(" ")[0], "governor") def cpufreqctl(): @@ -38,8 +47,8 @@ index 482a544..d142013 100644 def footer(l=79): print("\n" + "-" * l + "\n") -@@ -212,74 +194,12 @@ def remove_complete_msg(): - +@@ -233,74 +215,12 @@ def remove_complete_msg(): + footer() def deploy_daemon(): - print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon " + "-" * 22 + "\n") @@ -60,7 +69,7 @@ index 482a544..d142013 100644 - except: - print("\nERROR:\nWas unable to turn off bluetooth on boot") - -- auto_cpufreq_log_path.touch(exist_ok=True) +- auto_cpufreq_stats_path.touch(exist_ok=True) - - print("\n* Deploy auto-cpufreq install script") - shutil.copy(SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/bin/auto-cpufreq-install") @@ -102,12 +111,12 @@ index 482a544..d142013 100644 - # remove auto-cpufreq-remove - os.remove("/usr/bin/auto-cpufreq-remove") - -- # delete log file -- if auto_cpufreq_log_path.exists(): -- if auto_cpufreq_log_file is not None: -- auto_cpufreq_log_file.close() +- # delete stats file +- if auto_cpufreq_stats_path.exists(): +- if auto_cpufreq_stats_file is not None: +- auto_cpufreq_stats_file.close() - -- auto_cpufreq_log_path.unlink() +- auto_cpufreq_stats_path.unlink() - - # restore original cpufrectl script - cpufreqctl_restore() @@ -116,6 +125,15 @@ index 482a544..d142013 100644 def gov_check(): for gov in get_avail_gov(): +@@ -331,7 +251,7 @@ def countdown(s): + if auto_cpufreq_stats_file is not None: + auto_cpufreq_stats_file.seek(0) + auto_cpufreq_stats_file.truncate(0) +- ++ + # execution timestamp + from datetime import datetime + now = datetime.now() diff --git a/scripts/cpufreqctl.sh b/scripts/cpufreqctl.sh index 63a2b5b..e157efe 100755 --- a/scripts/cpufreqctl.sh diff --git a/pkgs/tools/misc/clipman/default.nix b/pkgs/tools/wayland/clipman/default.nix index 80a0afe68d3..3a2c2ca6015 100644 --- a/pkgs/tools/misc/clipman/default.nix +++ b/pkgs/tools/wayland/clipman/default.nix @@ -1,4 +1,9 @@ -{ buildGoModule, fetchFromGitHub, lib, wl-clipboard, makeWrapper }: +{ buildGoModule +, fetchFromGitHub +, lib +, wl-clipboard +, makeWrapper +}: buildGoModule rec { pname = "clipman"; @@ -24,9 +29,9 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/yory8/clipman"; - license = licenses.gpl3; - maintainers = with maintainers; [ ma27 ]; description = "A simple clipboard manager for Wayland"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ ma27 ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/kanshi/default.nix b/pkgs/tools/wayland/kanshi/default.nix index 90ee2a3446b..c661c98a24b 100644 --- a/pkgs/tools/misc/kanshi/default.nix +++ b/pkgs/tools/wayland/kanshi/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, scdoc, wayland }: +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, scdoc +, wayland +}: stdenv.mkDerivation rec { pname = "kanshi"; @@ -15,6 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland ]; meta = with lib; { + homepage = "https://github.com/emersion/kanshi"; description = "Dynamic display configuration tool"; longDescription = '' kanshi allows you to define output profiles that are automatically enabled @@ -24,8 +33,6 @@ stdenv.mkDerivation rec { kanshi can be used on Wayland compositors supporting the wlr-output-management protocol. ''; - homepage = "https://github.com/emersion/kanshi"; - downloadPage = "https://github.com/emersion/kanshi"; license = licenses.mit; maintainers = with maintainers; [ balsoft ]; platforms = platforms.linux; diff --git a/pkgs/tools/wayland/oguri/default.nix b/pkgs/tools/wayland/oguri/default.nix new file mode 100644 index 00000000000..458ea310a01 --- /dev/null +++ b/pkgs/tools/wayland/oguri/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, meson +, ninja +, cairo +, gdk-pixbuf +, wayland +, wayland-protocols +}: + +stdenv.mkDerivation rec { + pname = "oguri"; + version = "unstable-2020-12-19"; + + src = fetchFromGitHub { + owner = "vilhalmer"; + repo = pname; + rev = "6937fee10a9b0ef3ad8f94f606c0e0d9e7dec564"; + sha256 = "sXNvpI/YPDPd2cXQAfRO4ut21gSCXxbo1DpaZmHJDYQ="; + }; + + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ + cairo + gdk-pixbuf + wayland + wayland-protocols + ]; + + meta = with lib; { + homepage = "https://github.com/vilhalmer/oguri/"; + description = "A very nice animated wallpaper daemon for Wayland compositors"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/slurp/default.nix b/pkgs/tools/wayland/slurp/default.nix index ed4bb0037fb..107ef68da56 100644 --- a/pkgs/tools/misc/slurp/default.nix +++ b/pkgs/tools/wayland/slurp/default.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config -, cairo, libxkbcommon, wayland, wayland-protocols +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, cairo +, libxkbcommon +, wayland +, wayland-protocols , buildDocs ? true, scdoc }: @@ -33,7 +41,7 @@ stdenv.mkDerivation rec { description = "Select a region in a Wayland compositor"; homepage = "https://github.com/emersion/slurp"; license = licenses.mit; - platforms = platforms.linux; maintainers = with maintainers; [ buffet ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/wev/default.nix b/pkgs/tools/wayland/wev/default.nix index c1debfd924d..83e4113f7ea 100644 --- a/pkgs/tools/misc/wev/default.nix +++ b/pkgs/tools/wayland/wev/default.nix @@ -1,6 +1,11 @@ -{ lib, stdenv, fetchurl -, pkg-config, scdoc, wayland -, wayland-protocols, libxkbcommon +{ lib +, stdenv +, fetchurl +, pkg-config +, scdoc +, wayland +, wayland-protocols +, libxkbcommon }: stdenv.mkDerivation rec { @@ -18,14 +23,14 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { + homepage = "https://git.sr.ht/~sircmpwn/wev"; description = "Wayland event viewer"; longDescription = '' This is a tool for debugging events on a Wayland window, analagous to the X11 tool xev. ''; - homepage = "https://git.sr.ht/~sircmpwn/wev"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/wl-clipboard/default.nix b/pkgs/tools/wayland/wl-clipboard/default.nix index 676ff03ad9b..0bc195e9626 100644 --- a/pkgs/tools/misc/wl-clipboard/default.nix +++ b/pkgs/tools/wayland/wl-clipboard/default.nix @@ -1,5 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config -, wayland, wayland-protocols }: +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, wayland +, wayland-protocols +}: stdenv.mkDerivation rec { pname = "wl-clipboard"; @@ -16,10 +23,11 @@ stdenv.mkDerivation rec { buildInputs = [ wayland ]; meta = with lib; { - description = "Command-line copy/paste utilities for Wayland"; homepage = "https://github.com/bugaevc/wl-clipboard"; - license = licenses.gpl3; + description = "Command-line copy/paste utilities for Wayland"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ dywedir ]; platforms = platforms.linux; }; } +# TODO: is wayland-protocols a nativeBuildInput or a buildInput? diff --git a/pkgs/tools/wayland/wlogout/default.nix b/pkgs/tools/wayland/wlogout/default.nix new file mode 100644 index 00000000000..2625405808c --- /dev/null +++ b/pkgs/tools/wayland/wlogout/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, meson +, ninja +, scdoc +, gtk3 +, libxkbcommon +, wayland +, wayland-protocols +}: + +stdenv.mkDerivation rec { + pname = "wlogout"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "ArtsyMacaw"; + repo = "wlogout"; + rev = version; + sha256 = "cTscfx+erHVFHwwYpN7pADQWt5sq75sQSyXSP/H8kOs="; + }; + + nativeBuildInputs = [ pkg-config meson ninja scdoc ]; + buildInputs = [ + gtk3 + libxkbcommon + wayland + wayland-protocols + ]; + + postPatch = '' + substituteInPlace style.css \ + --replace "/usr/share/wlogout" "$out/share/${pname}" + + substituteInPlace main.c \ + --replace "/etc/wlogout" "$out/etc/${pname}" + ''; + + mesonFlags = [ + "--datadir=${placeholder "out"}/share" + "--sysconfdir=${placeholder "out"}/etc" + ]; + + meta = with lib; { + homepage = "https://github.com/ArtsyMacaw/wlogout"; + description = "A wayland based logout menu"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} +# TODO: shell completions diff --git a/pkgs/tools/misc/wlr-randr/default.nix b/pkgs/tools/wayland/wlr-randr/default.nix index b635316bf77..e2c941998a9 100644 --- a/pkgs/tools/misc/wlr-randr/default.nix +++ b/pkgs/tools/wayland/wlr-randr/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, cmake, pkg-config, wayland }: +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, wayland +}: stdenv.mkDerivation rec { pname = "wlr-randr"; @@ -11,13 +18,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-JeSxFXSFxcTwJz9EaLb18wtD4ZIT+ATeYM5OyDTJhDQ="; }; - nativeBuildInputs = [ meson ninja cmake pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ wayland ]; meta = with lib; { - license = licenses.mit; description = "An xrandr clone for wlroots compositors"; homepage = "https://github.com/emersion/wlr-randr"; + license = licenses.mit; maintainers = with maintainers; [ ma27 ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/wob/default.nix b/pkgs/tools/wayland/wob/default.nix index e0622e5416a..3567ed6eea4 100644 --- a/pkgs/tools/misc/wob/default.nix +++ b/pkgs/tools/wayland/wob/default.nix @@ -1,6 +1,13 @@ -{ lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, scdoc, wayland # wayland-scanner -, wayland-protocols, libseccomp +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, scdoc +, libseccomp +, wayland # wayland-scanner +, wayland-protocols }: stdenv.mkDerivation rec { @@ -21,15 +28,15 @@ stdenv.mkDerivation rec { mesonFlags = lib.optional stdenv.isLinux "-Dseccomp=enabled"; meta = with lib; { + inherit (src.meta) homepage; description = "A lightweight overlay bar for Wayland"; longDescription = '' A lightweight overlay volume/backlight/progress/anything bar for Wayland, inspired by xob. ''; - inherit (src.meta) homepage; changelog = "https://github.com/francma/wob/releases/tag/${version}"; license = licenses.isc; - platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d70c6f9bda0..c0dc67cc07e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1964,7 +1964,33 @@ in chntpw = callPackage ../tools/security/chntpw { }; - clipman = callPackage ../tools/misc/clipman { }; + clipman = callPackage ../tools/wayland/clipman { }; + + kanshi = callPackage ../tools/wayland/kanshi { }; + + oguri = callPackage ../tools/wayland/oguri { }; + + slurp = callPackage ../tools/wayland/slurp { }; + + wayland-utils = callPackage ../tools/wayland/wayland-utils { }; + + wev = callPackage ../tools/wayland/wev { }; + + wl-clipboard = callPackage ../tools/wayland/wl-clipboard { }; + + wlogout = callPackage ../tools/wayland/wlogout { }; + + wlr-randr = callPackage ../tools/wayland/wlr-randr { }; + + wlsunset = callPackage ../tools/wayland/wlsunset { }; + + wob = callPackage ../tools/wayland/wob { }; + + wshowkeys = callPackage ../tools/wayland/wshowkeys { }; + + wtype = callPackage ../tools/wayland/wtype { }; + + ydotool = callPackage ../tools/wayland/ydotool { }; clipster = callPackage ../tools/misc/clipster { }; @@ -3850,22 +3876,8 @@ in wallutils = callPackage ../tools/graphics/wallutils { }; - wayland-utils = callPackage ../tools/wayland/wayland-utils { }; - - wev = callPackage ../tools/misc/wev { }; - - wl-clipboard = callPackage ../tools/misc/wl-clipboard { }; - - wlsunset = callPackage ../tools/wayland/wlsunset { }; - - wob = callPackage ../tools/misc/wob { }; - - wtype = callPackage ../tools/wayland/wtype { }; - wrangler = callPackage ../development/tools/wrangler { }; - wshowkeys = callPackage ../tools/wayland/wshowkeys { }; - wsl-open = callPackage ../tools/misc/wsl-open { }; xkcdpass = with python3Packages; toPythonApplication xkcdpass; @@ -10163,6 +10175,13 @@ in buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; }); + go_1_16 = callPackage ../development/compilers/go/1.16.nix ({ + inherit (darwin.apple_sdk.frameworks) Security Foundation; + } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { + stdenv = gcc8Stdenv; + buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + }); + go_2-dev = callPackage ../development/compilers/go/2-dev.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { @@ -17317,8 +17336,6 @@ in yder = callPackage ../development/libraries/yder { }; - ydotool = callPackage ../tools/wayland/ydotool { }; - yojimbo = callPackage ../development/libraries/yojimbo { }; yubioath-desktop = libsForQt5.callPackage ../applications/misc/yubioath-desktop { }; @@ -17478,6 +17495,9 @@ in buildGo115Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_15; }; + buildGo116Package = callPackage ../development/go-packages/generic { + go = buildPackages.go_1_16; + }; buildGoPackage = buildGo115Package; @@ -17487,6 +17507,9 @@ in buildGo115Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_15; }; + buildGo116Module = callPackage ../development/go-modules/generic { + go = buildPackages.go_1_16; + }; buildGoModule = buildGo115Module; @@ -17921,7 +17944,11 @@ in mailman-web = with python3.pkgs; toPythonApplication mailman-web; - mastodon = callPackage ../servers/mastodon { }; + mastodon = callPackage ../servers/mastodon { + # With nodejs v14 the streaming endpoint breaks. Need migrate to uWebSockets.js or similar. + # https://github.com/tootsuite/mastodon/issues/15184 + nodejs-slim = nodejs-slim-12_x; + }; mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; @@ -22814,8 +22841,6 @@ in super-productivity = callPackage ../applications/networking/super-productivity { }; - wlr-randr = callPackage ../tools/misc/wlr-randr { }; - wlroots = callPackage ../development/libraries/wlroots { }; sway-unwrapped = callPackage ../applications/window-managers/sway { }; @@ -23122,8 +23147,6 @@ in kanboard = callPackage ../applications/misc/kanboard { }; - kanshi = callPackage ../tools/misc/kanshi { }; - kapitonov-plugins-pack = callPackage ../applications/audio/kapitonov-plugins-pack { }; kapow = libsForQt5.callPackage ../applications/misc/kapow { }; @@ -23914,6 +23937,8 @@ in qbec = callPackage ../applications/networking/cluster/qbec { }; + qemacs = callPackage ../applications/editors/qemacs { }; + rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; @@ -24823,8 +24848,6 @@ in slrn = callPackage ../applications/networking/newsreaders/slrn { }; - slurp = callPackage ../tools/misc/slurp { }; - sniproxy = callPackage ../applications/networking/sniproxy { }; sooperlooper = callPackage ../applications/audio/sooperlooper { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 620c4aeeb6f..cfe7296589b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6144,6 +6144,10 @@ let license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestDifferences ]; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/* + ''; }; DevelOverloadInfo = buildPerlPackage { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4d2b0655005..9442898c16e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6311,6 +6311,8 @@ in { python-engineio = callPackage ../development/python-modules/python-engineio { }; + python-engineio_3 = callPackage ../development/python-modules/python-engineio/3.nix { }; + python-etcd = callPackage ../development/python-modules/python-etcd { }; python_fedora = callPackage ../development/python-modules/python_fedora { }; @@ -6451,6 +6453,8 @@ in { python-socketio = callPackage ../development/python-modules/python-socketio { }; + python-socketio_4 = callPackage ../development/python-modules/python-socketio/4.nix { }; + python-sql = callPackage ../development/python-modules/python-sql { }; python_statsd = callPackage ../development/python-modules/python_statsd { }; |