diff options
Diffstat (limited to 'nixpkgs/pkgs/tools')
145 files changed, 2277 insertions, 2737 deletions
diff --git a/nixpkgs/pkgs/tools/X11/wmctrl/default.nix b/nixpkgs/pkgs/tools/X11/wmctrl/default.nix index e0118b8b27b4..e4cb70c8f24d 100644 --- a/nixpkgs/pkgs/tools/X11/wmctrl/default.nix +++ b/nixpkgs/pkgs/tools/X11/wmctrl/default.nix @@ -1,23 +1,33 @@ -{stdenv, fetchurl, libX11, glib, pkgconfig, libXmu }: +{ stdenv +, fetchurl +, libX11 +, glib +, pkgconfig +, libXmu +}: stdenv.mkDerivation rec { - - name = "wmctrl-1.07"; - + + pname = "wmctrl"; + version = "1.07"; + src = fetchurl { - url = "http://tomas.styblo.name/wmctrl/dist/${name}.tar.gz"; + # NOTE: 2019-04-11: There is also a semi-official mirror: http://tripie.sweb.cz/utils/wmctrl/ + url = "https://sites.google.com/site/tstyblo/wmctrl/${pname}-${version}.tar.gz"; sha256 = "1afclc57b9017a73mfs9w7lbdvdipmf9q0xdk116f61gnvyix2np"; }; - + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXmu glib ]; patches = [ ./64-bit-data.patch ]; meta = { - homepage = http://tomas.styblo.name/wmctrl/; - description = "Command line tool to interact with an EWMH/NetWM compatible X Window Manager"; + homepage = https://sites.google.com/site/tstyblo/wmctrl; + description = "CLI tool to interact with EWMH/NetWM compatible X Window Managers"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; all; + maintainers = [ stdenv.lib.maintainers.Anton-Latukha ]; }; + } diff --git a/nixpkgs/pkgs/tools/X11/xidlehook/default.nix b/nixpkgs/pkgs/tools/X11/xidlehook/default.nix index 4dfc06aa4366..e9cd04ecd1c3 100644 --- a/nixpkgs/pkgs/tools/X11/xidlehook/default.nix +++ b/nixpkgs/pkgs/tools/X11/xidlehook/default.nix @@ -3,7 +3,7 @@ rustPlatform.buildRustPackage rec { name = "xidlehook-${version}"; - version = "0.6.2"; + version = "0.7.0"; doCheck = false; @@ -12,11 +12,11 @@ rustPlatform.buildRustPackage rec { repo = "xidlehook"; rev = version; - sha256 = "1ca29rw1w2ldahp9f1v9kfrjycbjwx3mab3m25lr82084kaa6lsh"; + sha256 = "0dl4rnh4l3rhga5pfxmkc9syn6vx05zxdf8xcv0gw9h60y1smp6v"; }; cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; - cargoSha256 = "1sy7q875gg6as98lp6m15x9b3lhdikm9326lmqcs5fv3hhzvdlvy"; + cargoSha256 = "148p7r9xmc0nc0d4qyxhh29xqcb5axwqwcxcrkgd41f32c3g44dc"; buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkgconfig patchelf ]; diff --git a/nixpkgs/pkgs/tools/admin/analog/default.nix b/nixpkgs/pkgs/tools/admin/analog/default.nix index 0d8bdad2c659..c6135e8d143f 100644 --- a/nixpkgs/pkgs/tools/admin/analog/default.nix +++ b/nixpkgs/pkgs/tools/admin/analog/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.c-amie.co.uk/software/analog/; + homepage = https://www.c-amie.co.uk/software/analog/; license = stdenv.lib.licenses.gpl2; description = "Powerful tool to generate web server statistics"; maintainers = [ stdenv.lib.maintainers.peti ]; diff --git a/nixpkgs/pkgs/tools/admin/ansible/default.nix b/nixpkgs/pkgs/tools/admin/ansible/default.nix index f9cc3fb4ebcb..91fc2c50fcf6 100644 --- a/nixpkgs/pkgs/tools/admin/ansible/default.nix +++ b/nixpkgs/pkgs/tools/admin/ansible/default.nix @@ -7,21 +7,21 @@ ansible_2_6 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec { pname = "ansible"; - version = "2.6.9"; + version = "2.6.15"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "12mysvdavkypgmyms1wjq2974lk97w893k23i6khigxrjj6r85z1"; + sha256 = "1l4ji9sryfn0l651hy6cf5zqq8fpwi956c7qzjm4sihz5ps6wyhd"; }; })); ansible_2_5 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec { pname = "ansible"; - version = "2.5.14"; + version = "2.5.15"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "0sd04h2k5qv4m48dn76jkjlwlqfdk15hzyagj9i71r8brvmwhnk9"; + sha256 = "1w9wfv1s2jq6vkx1hm6n69zwxv2pgjj7nidyg452miwh684jpg7z"; }; })); } diff --git a/nixpkgs/pkgs/tools/admin/aws-vault/default.nix b/nixpkgs/pkgs/tools/admin/aws-vault/default.nix index 71360f8030c5..03b0ff5c0016 100644 --- a/nixpkgs/pkgs/tools/admin/aws-vault/default.nix +++ b/nixpkgs/pkgs/tools/admin/aws-vault/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "${pname}-${version}"; pname = "aws-vault"; - version = "4.3.0"; + version = "4.5.1"; goPackagePath = "github.com/99designs/${pname}"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "99designs"; repo = pname; rev = "v${version}"; - sha256 = "0cwzvw1rcvg7y3m8dahr9r05s4i9apnfw5xhiaf0rlkdh3vy33wp"; + sha256 = "0y64fx15p9ls829lif7c0jaxyclzpnr8l5cyw25q545878dzmcs5"; }; # set the version. see: aws-vault's Makefile diff --git a/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix index aa8cc12ece85..3abd189d0f97 100644 --- a/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -19,18 +19,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "03ymvfhk8azyvdm6j4pbqx2fsh178kw81yqwkycbhmm6mnyc8yv1"; + sha256 = "1w94c1p8vnp3kf802zpr3i0932f5b5irnfqmxj2p44gfyfmkym1j"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "1pw4w3v81mp8alm6vxq10242xxwv8rfs59bjxrmy0pfkjgsr4x4v"; + sha256 = "0pps7csf8d3rxqgd0bv06ga6cgkqhlbsys0k0sy1ipl3i6h5hmpf"; }; }.${system}; in stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; - version = "222.0.0"; + version = "241.0.0"; src = fetchurl (sources name stdenv.hostPlatform.system); diff --git a/nixpkgs/pkgs/tools/admin/lxd/default.nix b/nixpkgs/pkgs/tools/admin/lxd/default.nix index a94cf1d37ec5..424d97a47299 100644 --- a/nixpkgs/pkgs/tools/admin/lxd/default.nix +++ b/nixpkgs/pkgs/tools/admin/lxd/default.nix @@ -8,24 +8,15 @@ buildGoPackage rec { pname = "lxd"; - version = "3.11"; + version = "3.12"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0xxzrwhyzzp23arj57vjs1yh91gy3r4wpd5qy9ksifzd390clf2x"; + sha256 = "0m2cq41mz5209csr07gsnmslqvqdxk2p1l2saa23ddnaybqnjy16"; }; - patches = [ - (fetchpatch { - url = https://github.com/CanonicalLtd/go-dqlite/commit/88a96df66e3e3bdc290fd4a0d41615d284d2c92c.patch; - sha256 = "0z6r4shh1rlf0in9xk1gi6ms2kcvplc3878106d2zzzfz7ad83a4"; - extraPrefix = "dist/src/github.com/CanonicalLtd/go-dqlite/"; - stripLen = 1; - }) - ]; - preBuild = '' # unpack vendor pushd go/src/github.com/lxc/lxd diff --git a/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix b/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix index 62fa8219f5ad..f73104422c1b 100644 --- a/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix +++ b/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix @@ -1,10 +1,10 @@ { stdenv, lib, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp, libpulseaudio }: let - versionMajor = "6.5"; - versionMinor = "6"; - versionBuild_x86_64 = "9"; - versionBuild_i686 = "8"; + versionMajor = "6.6"; + versionMinor = "8"; + versionBuild_x86_64 = "5"; + versionBuild_i686 = "5"; in stdenv.mkDerivation rec { pname = "nomachine-client"; @@ -14,12 +14,12 @@ in if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"; - sha256 = "07lg5yadxpl5qfvvh067b3kxd8hm3xv95ralm2pyjl4lw6aql46p"; + sha256 = "0hsx1nd9m1l35pj4jri88jib1hgf2wh1f42s650y2br2h6bhaixs"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"; - sha256 = "1a23isw09vicazkrypq0kxbb8qy2i4vxiarrgz5xmasjhiy5999a"; + sha256 = "1hrp8s17pcqkb4jcnayx81qmm7c1njjp69fkpyqgcnv9vshias1b"; } else throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; diff --git a/nixpkgs/pkgs/tools/admin/pulumi/default.nix b/nixpkgs/pkgs/tools/admin/pulumi/default.nix index 956f688bb0a9..2d4b65273237 100644 --- a/nixpkgs/pkgs/tools/admin/pulumi/default.nix +++ b/nixpkgs/pkgs/tools/admin/pulumi/default.nix @@ -4,17 +4,17 @@ with lib; let - version = "0.16.11"; + version = "0.17.4"; # switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script pulumiArchPackage = { "x86_64-linux" = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz"; - sha256 = "176nwqp1dd8vdpl4qajaq2w458f8pgavwvwd93lgnccqw3cznv75"; + sha256 = "169hj0db3kcq8874sb3px1hk88ls08kq5w6wygay56whymhva65n"; }; "x86_64-darwin" = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz"; - sha256 = "1mkz9bkkvpvbpzfnvwpx4892zd05bvjz5rbfwhwzm3wzfcjjs16i"; + sha256 = "1cn4mbgzq86d69mpp341zxfl8baakz0n5p9yd5chxrjjvxb6i629"; }; }; diff --git a/nixpkgs/pkgs/tools/admin/salt/default.nix b/nixpkgs/pkgs/tools/admin/salt/default.nix index 6cf997cd738c..13bba0860c49 100644 --- a/nixpkgs/pkgs/tools/admin/salt/default.nix +++ b/nixpkgs/pkgs/tools/admin/salt/default.nix @@ -8,11 +8,11 @@ pythonPackages.buildPythonApplication rec { pname = "salt"; - version = "2018.3.2"; + version = "2019.2.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "d86eeea2e5387f4a64bbf0a11d103bfc8aac1122e19d39cc0945d33efdc797bd"; + sha256 = "1kgn3lway0zwwysyzpphv05j4xgxk92dk4rv1vybr2527wmvp5an"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/nixpkgs/pkgs/tools/archivers/gnutar/default.nix b/nixpkgs/pkgs/tools/archivers/gnutar/default.nix index a6f5052ad08a..8ec34ce6730b 100644 --- a/nixpkgs/pkgs/tools/archivers/gnutar/default.nix +++ b/nixpkgs/pkgs/tools/archivers/gnutar/default.nix @@ -62,5 +62,7 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = stdenv.lib.platforms.all; + + priority = 10; }; } diff --git a/nixpkgs/pkgs/tools/archivers/rpmextract/default.nix b/nixpkgs/pkgs/tools/archivers/rpmextract/default.nix index 6d5041c52d03..3c515b8c195d 100644 --- a/nixpkgs/pkgs/tools/archivers/rpmextract/default.nix +++ b/nixpkgs/pkgs/tools/archivers/rpmextract/default.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { script = substituteAll { src = ./rpmextract.sh; + isExecutable = true; inherit rpm cpio; inherit (stdenv) shell; }; diff --git a/nixpkgs/pkgs/tools/archivers/unrar/default.nix b/nixpkgs/pkgs/tools/archivers/unrar/default.nix index 73c73c564fd1..a5d1e7b05eff 100644 --- a/nixpkgs/pkgs/tools/archivers/unrar/default.nix +++ b/nixpkgs/pkgs/tools/archivers/unrar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unrar-${version}"; - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "0i5442sh18v9s47k1j8q04m3ki98z012rw7ml7c5iwklhfvmds20"; + sha256 = "1d77wwgapwjxxshhinhk51skdd6v6xdsx34jjcjg6cj6zlwd0baq"; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/audio/playerctl/default.nix b/nixpkgs/pkgs/tools/audio/playerctl/default.nix index d1edbf94fe07..cda89302abdd 100644 --- a/nixpkgs/pkgs/tools/audio/playerctl/default.nix +++ b/nixpkgs/pkgs/tools/audio/playerctl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "playerctl-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "acrisci"; repo = "playerctl"; rev = "v${version}"; - sha256 = "0j1fvcc80307ybl1z9l752sr4bcza2fmb8qdivpnm4xmm82faigb"; + sha256 = "1f3njnpd52djx3dmhh9a8p5a67f0jmr1gbk98icflr2q91149gjz"; }; nativeBuildInputs = [ meson ninja pkgconfig gtk-doc docbook_xsl gobject-introspection ]; diff --git a/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix b/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix index 4e2f8eaf5c9b..71e27c94dbdb 100644 --- a/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCRYFS_UPDATE_CHECKS=OFF" "-DBoost_USE_STATIC_LIBS=OFF" # this option is case sensitive - "-DBUILD_TESTING=ON" ]; doCheck = true; diff --git a/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix b/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix index 806469493900..e601a12e6e6f 100644 --- a/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,12 @@ -{ stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo, perl }: +{ stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.44.5"; + pname = "e2fsprogs"; + version = "1.45.0"; src = fetchurl { - url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "1k6iwv2bz2a8mcd1gg9kb5jpry7pil5v2h2f9apxax7g4yp1y89f"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1sgcjarfksa8bkx81q5cd6rzqvhzgs28a0ljwyr4ggqpfx7d18vk"; }; outputs = [ "bin" "dev" "out" "man" "info" ]; @@ -33,13 +34,12 @@ stdenv.mkDerivation rec { "--enable-libuuid --disable-e2initrd-helper" ]; - checkInputs = [ perl ]; - doCheck = false; # fails + checkInputs = [ buildPackages.perl ]; + doCheck = true; - # hacky way to make it install *.pc postInstall = '' - make install-libs - rm "$out"/lib/*.a + # avoid cycle between outputs + mv $out/lib/${pname}/e2scrub_all_cron $bin/bin/ ''; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix b/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix index 03966533e3a3..0d58e8007efa 100644 --- a/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "moosefs"; - version = "3.0.103"; + version = "3.0.104"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0pqralv57ci4zwd75hz4pxmd4l9d4nib2mcsvrb6jndxqkaqcvns"; + sha256 = "057xg7zy872w4hczk9b9ckmqyah3qhgysvxddqizr204cyadicxh"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix b/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix index eccd72ceb238..ea321200fb98 100644 --- a/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -35,7 +35,13 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = [ "--with-libmount" ]; + configureFlags = [ + "--with-libmount" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # AC_FUNC_MALLOC is broken on cross builds. + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; # FIXME: https://github.com/NixOS/patchelf/pull/98 is in, but stdenv # still doesn't use it diff --git a/nixpkgs/pkgs/tools/filesystems/securefs/default.nix b/nixpkgs/pkgs/tools/filesystems/securefs/default.nix index 37eb8b9aa72c..a21aacb7e6b8 100644 --- a/nixpkgs/pkgs/tools/filesystems/securefs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/securefs/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "securefs-${version}"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { - sha256 = "0m3nv748g31b5nzxbwqqqjvygmz41x9vmhrjh655086g26gzrfib"; + sha256 = "0nf0bd163gz844mikqab2mh7xjlj31ixa6hi85qxdifyjpfjv7y4"; rev = version; repo = "securefs"; owner = "netheril96"; diff --git a/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix b/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix index 1a24cf7e75c4..73b7f51fd364 100644 --- a/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "3.5.1"; + version = "3.5.2"; name = "sshfs-fuse-${version}"; src = fetchFromGitHub { owner = "libfuse"; repo = "sshfs"; rev = "sshfs-${version}"; - sha256 = "07ryavfbbzfxaswsbr8ifnnfn6g8yxgxam6mk6gvcskld6rkf6gd"; + sha256 = "0gvk8snivpi2sjidjnd9ypc66ny7lr0z9v4swl56rwjv539dkbx2"; }; nativeBuildInputs = [ meson pkgconfig ninja docutils ]; diff --git a/nixpkgs/pkgs/tools/graphics/glmark2/default.nix b/nixpkgs/pkgs/tools/graphics/glmark2/default.nix index 70821468992b..566d6f48e1cc 100644 --- a/nixpkgs/pkgs/tools/graphics/glmark2/default.nix +++ b/nixpkgs/pkgs/tools/graphics/glmark2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland udev mesa_noglu ]; - configureFlags = ["--with-flavors=x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2"]; + wafConfigureFlags = ["--with-flavors=x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2"]; meta = with stdenv.lib; { description = "OpenGL (ES) 2.0 benchmark"; diff --git a/nixpkgs/pkgs/tools/graphics/logstalgia/default.nix b/nixpkgs/pkgs/tools/graphics/logstalgia/default.nix index 93a6652eafbc..a3cefddeb413 100644 --- a/nixpkgs/pkgs/tools/graphics/logstalgia/default.nix +++ b/nixpkgs/pkgs/tools/graphics/logstalgia/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { glm freetype ]; meta = with stdenv.lib; { - homepage = http://logstalgia.io/; + homepage = https://logstalgia.io/; description = "Website traffic visualization tool"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/tools/graphics/pngout/default.nix b/nixpkgs/pkgs/tools/graphics/pngout/default.nix index 333e5f600765..9d0e1b0ea879 100644 --- a/nixpkgs/pkgs/tools/graphics/pngout/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pngout/default.nix @@ -6,11 +6,11 @@ let else throw "Unsupported system: ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation { - name = "pngout-20130221"; + name = "pngout-20150319"; src = fetchurl { - url = http://static.jonof.id.au/dl/kenutils/pngout-20130221-linux.tar.gz; - sha256 = "1qdzmgx7si9zr7wjdj8fgf5dqmmqw4zg19ypg0pdz7521ns5xbvi"; + url = http://static.jonof.id.au/dl/kenutils/pngout-20150319-linux.tar.gz; + sha256 = "0iwv941hgs2g7ljpx48fxs24a70m2whrwarkrb77jkfcd309x2h7"; }; installPhase = '' diff --git a/nixpkgs/pkgs/tools/graphics/vips/default.nix b/nixpkgs/pkgs/tools/graphics/vips/default.nix index 7381238e4acb..77f15aa99b6d 100644 --- a/nixpkgs/pkgs/tools/graphics/vips/default.nix +++ b/nixpkgs/pkgs/tools/graphics/vips/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { name = "vips-${version}"; - version = "8.7.0"; + version = "8.7.4"; src = fetchFromGitHub { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "1dwcpmpqbgb9lkajnqv50mrsn97mxbxpq6b5aya7fgfkgdnrs9sw"; + sha256 = "0mcax1qg5i4iqlvgkz3s0c938d7ymx24pv3q2n3w2pjylnnd489s"; }; nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc gobject-introspection ]; diff --git a/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix b/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix index 66efb936aa4c..332fa0c509d3 100644 --- a/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python3, vulkan-loader, +{ stdenv, fetchFromGitHub, cmake, python3, vulkan-loader, vulkan-headers, glslang, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ python3 vulkan-loader xlibsWrapper libxcb libXrandr wayland ]; + buildInputs = [ python3 vulkan-headers vulkan-loader xlibsWrapper libxcb libXrandr wayland ]; enableParallelBuilding = true; cmakeFlags = [ "-DBUILD_ICD=OFF" "-DGLSLANG_INSTALL_DIR=${glslang}" ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx/unwrapped.nix index ab8a7bdb34de..50cc06d20593 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -4,7 +4,7 @@ , dbus, gtk2, gtk3, qt4, extra-cmake-modules , xkeyboard_config, pcre, libuuid , withPinyin ? true -, fetchFromGitHub +, fetchFromGitLab }: let @@ -37,13 +37,13 @@ let in stdenv.mkDerivation rec { name = "fcitx-${version}"; - version = "4.2.9.5"; + version = "4.2.9.6"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "fcitx"; repo = "fcitx"; rev = version; - sha256 = "0rv69bacdvblka85dakz4ldpznrgwj59nqcccp5mkkn1rab4zh1r"; + sha256 = "0j5vaf930lb21gx4h7z6mksh1fazqw32gajjjkyir94wbmml9n3s"; }; # put data at the correct locations else cmake tries to fetch them, diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index bd5645fe721c..f9d3c53854b4 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isIbusEngine = true; description = "IBus interface to the anthy input method"; - homepage = http://wiki.github.com/fujiwarat/ibus-anthy; + homepage = https://github.com/fujiwarat/ibus-anthy; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ gebner ericsagnes ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix index e1cd8ad09fbd..8948f1abbb3e 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, runCommand, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig +{ stdenv, fetchurl, runCommand, fetchFromGitHub, autoreconfHook, gettext, makeWrapper, pkgconfig , vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobject-introspection, gtk2 , gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true , enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null @@ -50,6 +50,24 @@ let }; nativeBuildInputs = [ autoreconfHook ]; }; + ucdSrcs = { + NamesList = fetchurl { + url = "https://www.unicode.org/Public/UNIDATA/NamesList.txt"; + sha256 = "c17c7726f562bd9ef869096807f0297e1edef9a58fdae1fbae487378fa43586f"; + }; + Blocks = fetchurl { + url = "https://www.unicode.org/Public/UNIDATA/Blocks.txt"; + sha256 = "a1a3ca4381eb91f7b65afe7cb7df615cdcf67993fef4b486585f66b349993a10"; + }; + }; + ucd = stdenv.mkDerivation rec { + name = "ucd-12.0.0"; + unpackPhase = ":"; + installPhase = '' + mkdir $out + ${builtins.toString (flip mapAttrsToList ucdSrcs (k: v: "cp ${v} $out/${k}.txt;"))} + ''; + }; python3Runtime = python3.withPackages (ps: with ps; [ pygobject3 ]); python3BuildEnv = python3.buildEnv.override { # ImportError: No module named site @@ -59,24 +77,17 @@ let makeWrapper ${glib.dev}/bin/glib-mkenums $out/bin/glib-mkenums --unset PYTHONPATH ''; }; - - # stop gconf from leaking into environment - # can be removed in ibus 1.6 which will not use gconf anymore - gsettings-schema-convert = runCommand "name" {} '' - mkdir -p $out/bin - ln -s ${gconf}/bin/gsettings-schema-convert $out/bin - ''; in stdenv.mkDerivation rec { name = "ibus-${version}"; - version = "1.5.17"; + version = "1.5.20"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus"; rev = version; - sha256 = "09mrj9d8qpl9cbylg1zx8c3ymc5gdy4jrf6zs125wjz0b574g5av"; + sha256 = "1npavb896qrp6qbqayb0va4mpsi68wybcnlbjknzgssqyw2ylh9r"; }; postPatch = '' @@ -88,10 +99,8 @@ stdenv.mkDerivation rec { ''; preAutoreconf = "touch ChangeLog"; - preConfigure = "intltoolize"; configureFlags = [ - "--disable-gconf" "--disable-memconf" (enableFeature (dconf != null) "dconf") (enableFeature (libnotify != null) "libnotify") @@ -100,13 +109,13 @@ stdenv.mkDerivation rec { (enableFeature enableUI "ui") "--with-unicode-emoji-dir=${emojiData}" "--with-emoji-annotation-dir=${cldrEmojiAnnotation}/share/unicode/cldr/common/annotations" + "--with-ucd-dir=${ucd}" ]; nativeBuildInputs = [ autoreconfHook - gsettings-schema-convert gtk-doc - intltool + gettext makeWrapper pkgconfig python3BuildEnv diff --git a/nixpkgs/pkgs/tools/inputmethods/uim/default.nix b/nixpkgs/pkgs/tools/inputmethods/uim/default.nix index b8510b102cbb..984eecf9e9d5 100644 --- a/nixpkgs/pkgs/tools/inputmethods/uim/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/uim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, shared-mime-info , autoconf, automake, intltool, libtool, pkgconfig, cmake , ruby, librsvg , ncurses, m17n_lib, m17n_db, expat @@ -127,6 +127,12 @@ stdenv.mkDerivation rec { #--with-sj3 Use SJ3 [default=no] #--with-osx-dcs Build with OS X Dictionary Services [default=no] + # TODO: fix this in librsvg/glib later + # https://github.com/NixOS/nixpkgs/pull/57027#issuecomment-475461733 + preBuild = '' + export XDG_DATA_DIRS="${shared-mime-info}/share" + ''; + dontUseCmakeConfigure = true; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/misc/autojump/default.nix b/nixpkgs/pkgs/tools/misc/autojump/default.nix index 5f86dbadfa36..ca4dde7a450c 100644 --- a/nixpkgs/pkgs/tools/misc/autojump/default.nix +++ b/nixpkgs/pkgs/tools/misc/autojump/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "autojump-${version}"; - version = "22.5.1"; + version = "22.5.3"; src = fetchFromGitHub { owner = "wting"; repo = "autojump"; rev = "release-v${version}"; - sha256 = "1l1278g3k1qfrz41pkpjdhsabassb9si2d1bfbcmvbv5h3wmlqk9"; + sha256 = "1rgpsh70manr2dydna9da4x7p8ahii7dgdgwir5fka340n1wrcws"; }; buildInputs = [ python bash ]; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { Autojump supports tab-completion. ''; - homepage = http://wiki.github.com/wting/autojump; + homepage = https://github.com/wting/autojump; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ domenkozar yurrriq ]; diff --git a/nixpkgs/pkgs/tools/misc/autorandr/default.nix b/nixpkgs/pkgs/tools/misc/autorandr/default.nix index dff98f236036..550b0ad90674 100644 --- a/nixpkgs/pkgs/tools/misc/autorandr/default.nix +++ b/nixpkgs/pkgs/tools/misc/autorandr/default.nix @@ -6,7 +6,7 @@ let python = python3Packages.python; - version = "1.8"; + version = "1.8.1"; in stdenv.mkDerivation { name = "autorandr-${version}"; @@ -48,7 +48,7 @@ in owner = "phillipberndt"; repo = "autorandr"; rev = "${version}"; - sha256 = "0yhn3gvvkgmfqf3yl3kqlj0biinw0qvli6s88sxa0pybca3j8nll"; + sha256 = "1bp1cqkrpg77rjyh4lq1agc719fmxn92jkiicf6nbhfl8kf3l3vy"; }; meta = { diff --git a/nixpkgs/pkgs/tools/misc/clipster/default.nix b/nixpkgs/pkgs/tools/misc/clipster/default.nix index 7b501d097bb7..ed0239256cdf 100644 --- a/nixpkgs/pkgs/tools/misc/clipster/default.nix +++ b/nixpkgs/pkgs/tools/misc/clipster/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "clipster-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "mrichar1"; repo = "clipster"; rev = "${version}"; - sha256 = "08zs7yjpjc6haddkwx7sq5vyq2ldy455qlcrx1a3vi7krmdwl1q9"; + sha256 = "0582r8840dk4k4jj1zq6kmyh7z9drcng099bj7f4wvr468nb9z1p"; }; pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]); diff --git a/nixpkgs/pkgs/tools/misc/coreutils/default.nix b/nixpkgs/pkgs/tools/misc/coreutils/default.nix index 84a2735dff8f..9cc48f446467 100644 --- a/nixpkgs/pkgs/tools/misc/coreutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/coreutils/default.nix @@ -16,37 +16,41 @@ assert selinuxSupport -> libselinux != null && libsepol != null; with lib; stdenv.mkDerivation rec { - name = "coreutils-8.30"; + pname = "coreutils"; + version = "8.31"; src = fetchurl { - url = "mirror://gnu/coreutils/${name}.tar.xz"; - sha256 = "0mxhw43d4wpqmvg0l4znk1vm10fy92biyh90lzdnqjcic2lb6cg8"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1zg9m79x1i2nifj4kb0waf9x3i5h6ydkypkjnbsb9rnwis8rqypz"; }; patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch; postPatch = '' # The test tends to fail on btrfs,f2fs and maybe other unusual filesystems. - sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh - sed '2i echo Skipping du threshold test && exit 0' -i ./tests/du/threshold.sh - sed '2i echo Skipping cp sparse test && exit 0' -i ./tests/cp/sparse.sh - sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh - sed '2i echo Skipping du long-from-unreadable test && exit 0' -i ./tests/du/long-from-unreadable.sh + sed '2i echo Skipping dd sparse test && exit 77' -i ./tests/dd/sparse.sh + sed '2i echo Skipping du threshold test && exit 77' -i ./tests/du/threshold.sh + sed '2i echo Skipping cp sparse test && exit 77' -i ./tests/cp/sparse.sh + sed '2i echo Skipping rm deep-2 test && exit 77' -i ./tests/rm/deep-2.sh + sed '2i echo Skipping du long-from-unreadable test && exit 77' -i ./tests/du/long-from-unreadable.sh # sandbox does not allow setgid - sed '2i echo Skipping chmod setgid test && exit 0' -i ./tests/chmod/setgid.sh + sed '2i echo Skipping chmod setgid test && exit 77' -i ./tests/chmod/setgid.sh substituteInPlace ./tests/install/install-C.sh \ --replace 'mode3=2755' 'mode3=1755' - sed '2i print "Skipping env -S test"; exit 0;' -i ./tests/misc/env-S.pl + sed '2i print "Skipping env -S test"; exit 77;' -i ./tests/misc/env-S.pl # these tests fail in the unprivileged nix sandbox (without nix-daemon) as we break posix assumptions for f in ./tests/chgrp/{basic.sh,recurse.sh,default-no-deref.sh,no-x.sh,posix-H.sh}; do - sed '2i echo Skipping chgrp && exit 0' -i "$f" + sed '2i echo Skipping chgrp && exit 77' -i "$f" done for f in gnulib-tests/{test-chown.c,test-fchownat.c,test-lchown.c}; do - echo "int main() { return 0; }" > "$f" + echo "int main() { return 77; }" > "$f" done + '' + optionalString (stdenv.hostPlatform.libc == "musl") '' + echo "int main() { return 77; }" > gnulib-tests/test-parse-datetime.c + echo "int main() { return 77; }" > gnulib-tests/test-getlogin.c ''; outputs = [ "out" "info" ]; @@ -80,7 +84,7 @@ stdenv.mkDerivation rec { # and {Open,Free}BSD. # With non-standard storeDir: https://github.com/NixOS/nix/issues/512 doCheck = stdenv.hostPlatform == stdenv.buildPlatform - && stdenv.hostPlatform.libc == "glibc" + && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl) && builtins.storeDir == "/nix/store"; # Prevents attempts of running 'help2man' on cross-built binaries. @@ -123,6 +127,8 @@ stdenv.mkDerivation rec { platforms = platforms.unix ++ platforms.windows; + priority = 10; + maintainers = [ maintainers.eelco ]; }; diff --git a/nixpkgs/pkgs/tools/misc/cpulimit/default.nix b/nixpkgs/pkgs/tools/misc/cpulimit/default.nix index 13c1202e1d31..9a764c12941e 100644 --- a/nixpkgs/pkgs/tools/misc/cpulimit/default.nix +++ b/nixpkgs/pkgs/tools/misc/cpulimit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cpulimit-${version}"; - version = "2.5"; + version = "2.6"; src = fetchurl { url = "mirror://sourceforge/limitcpu/${name}.tar.gz"; - sha256 = "1w1l3r9ini78s8idxlzmgljpfgl1n4y4qhp3q2s8y6wq4bfx41lp"; + sha256 = "0xf0r6zxaqan1drz61nqf95p2pkiiihpvrjhrr9dx9j3vswyx31g"; }; buildFlags = with stdenv; diff --git a/nixpkgs/pkgs/tools/misc/doitlive/default.nix b/nixpkgs/pkgs/tools/misc/doitlive/default.nix index 00b04c2112f4..6edcefb11d5e 100644 --- a/nixpkgs/pkgs/tools/misc/doitlive/default.nix +++ b/nixpkgs/pkgs/tools/misc/doitlive/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "doitlive"; - version = "4.2.1"; + version = "4.3.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0sffr78h0hdrlpamg6v0iw2cgrkv7wy82mvrbzri0w1jqd29s526"; + sha256 = "03qrs032x206xrl0x3z0fpvxgjivzz9rkmb11bqlk1id10707cac"; }; propagatedBuildInputs = with python3Packages; [ click click-completion click-didyoumean ]; diff --git a/nixpkgs/pkgs/tools/misc/entr/default.nix b/nixpkgs/pkgs/tools/misc/entr/default.nix index 9301ce12a055..19bcd77923b9 100644 --- a/nixpkgs/pkgs/tools/misc/entr/default.nix +++ b/nixpkgs/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "entr-${version}"; - version = "4.1"; + version = "4.2"; src = fetchurl { url = "http://entrproject.org/code/${name}.tar.gz"; - sha256 = "0y7gvyf0iykpf3gfw09m21hy51m6qn4cpkbrm4nnn7pwrwycj0y5"; + sha256 = "0w2xkf77jikcjh15fp9g7661ss30pz3jbnh261vqpaqavwah4c17"; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/misc/file/default.nix b/nixpkgs/pkgs/tools/misc/file/default.nix index cefddbd65ef5..ed31d01f09d5 100644 --- a/nixpkgs/pkgs/tools/misc/file/default.nix +++ b/nixpkgs/pkgs/tools/misc/file/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "file-${version}"; - version = "5.35"; + version = "5.36"; src = fetchurl { urls = [ "ftp://ftp.astron.com/pub/file/${name}.tar.gz" "https://distfiles.macports.org/file/${name}.tar.gz" ]; - sha256 = "0ijm1fabm68ykr1zbx0bxnka5jr3n42sj8y5mbkrnxs0fj0mxi1h"; + sha256 = "0ya330cdkvfi2d28h8gvhghj4gnhysmifmryysl0a97xq2884q7v"; }; nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; diff --git a/nixpkgs/pkgs/tools/misc/fltrdr/default.nix b/nixpkgs/pkgs/tools/misc/fltrdr/default.nix index 3d99a0e27e3e..b18e9d96706f 100644 --- a/nixpkgs/pkgs/tools/misc/fltrdr/default.nix +++ b/nixpkgs/pkgs/tools/misc/fltrdr/default.nix @@ -1,20 +1,22 @@ { stdenv , fetchFromGitHub , cmake +, icu }: stdenv.mkDerivation rec { name = "fltrdr-${version}"; - version = "0.1.1"; + version = "0.2.1"; src = fetchFromGitHub { repo = "fltrdr"; owner = "octobanana"; rev = "${version}"; - sha256 = "1gglv7hwszk09ywjq6s169cdzr77sjklj89k5p24if24v93yffpf"; + sha256 = "0hj7pwb93l4ahykmmr0665nq50jvwdq0aiaciz82225aw1cq939w"; }; nativeBuildInputs = [ cmake ]; + buildInputs = [ icu ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/tools/misc/fluentd/Gemfile b/nixpkgs/pkgs/tools/misc/fluentd/Gemfile index 3933eb131800..952c419ad313 100644 --- a/nixpkgs/pkgs/tools/misc/fluentd/Gemfile +++ b/nixpkgs/pkgs/tools/misc/fluentd/Gemfile @@ -1,7 +1,6 @@ source "https://rubygems.org" gem 'fluentd' -gem 'fluent-plugin-elasticsearch' gem 'fluent-plugin-record-reformer' gem 'fluent-plugin-s3' gem 'fluent-plugin-kinesis' diff --git a/nixpkgs/pkgs/tools/misc/fluentd/Gemfile.lock b/nixpkgs/pkgs/tools/misc/fluentd/Gemfile.lock index d5f78e807ff4..3d852e367594 100644 --- a/nixpkgs/pkgs/tools/misc/fluentd/Gemfile.lock +++ b/nixpkgs/pkgs/tools/misc/fluentd/Gemfile.lock @@ -1,644 +1,82 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) - aws-eventstream (1.0.1) - aws-partitions (1.96.0) - aws-sdk (3.0.1) - aws-sdk-resources (~> 3) - aws-sdk-acm (1.9.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-acmpca (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-alexaforbusiness (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-apigateway (1.13.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-applicationautoscaling (1.11.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-applicationdiscoveryservice (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-appstream (1.13.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-appsync (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-athena (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-autoscaling (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-autoscalingplans (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-batch (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-budgets (1.8.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cloud9 (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-clouddirectory (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cloudformation (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cloudfront (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cloudhsm (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cloudhsmv2 (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cloudsearch (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cloudsearchdomain (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cloudtrail (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cloudwatch (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cloudwatchevents (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cloudwatchlogs (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-codebuild (1.12.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-codecommit (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-codedeploy (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-codepipeline (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-codestar (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cognitoidentity (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cognitoidentityprovider (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cognitosync (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-comprehend (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-configservice (1.12.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-connect (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-core (3.22.1) - aws-eventstream (~> 1.0) + aws-eventstream (1.0.2) + aws-partitions (1.149.0) + aws-sdk-core (3.48.3) + aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1.0) - aws-sigv4 (~> 1.0) + aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-costexplorer (1.7.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-databasemigrationservice (1.7.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-datapipeline (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-dax (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-devicefarm (1.7.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-directconnect (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-directoryservice (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-dlm (1.0.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-dynamodb (1.8.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-dynamodbstreams (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-ec2 (1.38.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-ecr (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-ecs (1.15.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-efs (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-eks (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-elasticache (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-elasticbeanstalk (1.8.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-elasticloadbalancing (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-elasticloadbalancingv2 (1.11.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-elasticsearchservice (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-elastictranscoder (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-emr (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-firehose (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-fms (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-gamelift (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-glacier (1.8.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-glue (1.10.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-greengrass (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-guardduty (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-health (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-iam (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-importexport (1.1.0) - aws-sdk-core (~> 3) - aws-sigv2 (~> 1.0) - aws-sdk-inspector (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-iot (1.9.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-iot1clickdevicesservice (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-iot1clickprojects (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-iotanalytics (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-iotdataplane (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-iotjobsdataplane (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-kinesis (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-kinesisanalytics (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-kinesisvideo (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-kinesisvideoarchivedmedia (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-kinesisvideomedia (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-kms (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-lambda (1.8.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-lambdapreview (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-lex (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-lexmodelbuildingservice (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-lightsail (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-machinelearning (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-macie (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-marketplacecommerceanalytics (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-marketplaceentitlementservice (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-marketplacemetering (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-mediaconvert (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-medialive (1.8.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-mediapackage (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-mediastore (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-mediastoredata (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-mediatailor (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-migrationhub (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-mobile (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-mq (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-mturk (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-neptune (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-opsworks (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-opsworkscm (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-organizations (1.10.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-pi (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-pinpoint (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-polly (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-pricing (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-rds (1.23.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-redshift (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-rekognition (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-resourcegroups (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-resourcegroupstaggingapi (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-resources (3.22.0) - aws-sdk-acm (~> 1) - aws-sdk-acmpca (~> 1) - aws-sdk-alexaforbusiness (~> 1) - aws-sdk-apigateway (~> 1) - aws-sdk-applicationautoscaling (~> 1) - aws-sdk-applicationdiscoveryservice (~> 1) - aws-sdk-appstream (~> 1) - aws-sdk-appsync (~> 1) - aws-sdk-athena (~> 1) - aws-sdk-autoscaling (~> 1) - aws-sdk-autoscalingplans (~> 1) - aws-sdk-batch (~> 1) - aws-sdk-budgets (~> 1) - aws-sdk-cloud9 (~> 1) - aws-sdk-clouddirectory (~> 1) - aws-sdk-cloudformation (~> 1) - aws-sdk-cloudfront (~> 1) - aws-sdk-cloudhsm (~> 1) - aws-sdk-cloudhsmv2 (~> 1) - aws-sdk-cloudsearch (~> 1) - aws-sdk-cloudsearchdomain (~> 1) - aws-sdk-cloudtrail (~> 1) - aws-sdk-cloudwatch (~> 1) - aws-sdk-cloudwatchevents (~> 1) - aws-sdk-cloudwatchlogs (~> 1) - aws-sdk-codebuild (~> 1) - aws-sdk-codecommit (~> 1) - aws-sdk-codedeploy (~> 1) - aws-sdk-codepipeline (~> 1) - aws-sdk-codestar (~> 1) - aws-sdk-cognitoidentity (~> 1) - aws-sdk-cognitoidentityprovider (~> 1) - aws-sdk-cognitosync (~> 1) - aws-sdk-comprehend (~> 1) - aws-sdk-configservice (~> 1) - aws-sdk-connect (~> 1) - aws-sdk-costandusagereportservice (~> 1) - aws-sdk-costexplorer (~> 1) - aws-sdk-databasemigrationservice (~> 1) - aws-sdk-datapipeline (~> 1) - aws-sdk-dax (~> 1) - aws-sdk-devicefarm (~> 1) - aws-sdk-directconnect (~> 1) - aws-sdk-directoryservice (~> 1) - aws-sdk-dlm (~> 1) - aws-sdk-dynamodb (~> 1) - aws-sdk-dynamodbstreams (~> 1) - aws-sdk-ec2 (~> 1) - aws-sdk-ecr (~> 1) - aws-sdk-ecs (~> 1) - aws-sdk-efs (~> 1) - aws-sdk-eks (~> 1) - aws-sdk-elasticache (~> 1) - aws-sdk-elasticbeanstalk (~> 1) - aws-sdk-elasticloadbalancing (~> 1) - aws-sdk-elasticloadbalancingv2 (~> 1) - aws-sdk-elasticsearchservice (~> 1) - aws-sdk-elastictranscoder (~> 1) - aws-sdk-emr (~> 1) - aws-sdk-firehose (~> 1) - aws-sdk-fms (~> 1) - aws-sdk-gamelift (~> 1) - aws-sdk-glacier (~> 1) - aws-sdk-glue (~> 1) - aws-sdk-greengrass (~> 1) - aws-sdk-guardduty (~> 1) - aws-sdk-health (~> 1) - aws-sdk-iam (~> 1) - aws-sdk-importexport (~> 1) - aws-sdk-inspector (~> 1) - aws-sdk-iot (~> 1) - aws-sdk-iot1clickdevicesservice (~> 1) - aws-sdk-iot1clickprojects (~> 1) - aws-sdk-iotanalytics (~> 1) - aws-sdk-iotdataplane (~> 1) - aws-sdk-iotjobsdataplane (~> 1) - aws-sdk-kinesis (~> 1) - aws-sdk-kinesisanalytics (~> 1) - aws-sdk-kinesisvideo (~> 1) - aws-sdk-kinesisvideoarchivedmedia (~> 1) - aws-sdk-kinesisvideomedia (~> 1) - aws-sdk-kms (~> 1) - aws-sdk-lambda (~> 1) - aws-sdk-lambdapreview (~> 1) - aws-sdk-lex (~> 1) - aws-sdk-lexmodelbuildingservice (~> 1) - aws-sdk-lightsail (~> 1) - aws-sdk-machinelearning (~> 1) - aws-sdk-macie (~> 1) - aws-sdk-marketplacecommerceanalytics (~> 1) - aws-sdk-marketplaceentitlementservice (~> 1) - aws-sdk-marketplacemetering (~> 1) - aws-sdk-mediaconvert (~> 1) - aws-sdk-medialive (~> 1) - aws-sdk-mediapackage (~> 1) - aws-sdk-mediastore (~> 1) - aws-sdk-mediastoredata (~> 1) - aws-sdk-mediatailor (~> 1) - aws-sdk-migrationhub (~> 1) - aws-sdk-mobile (~> 1) - aws-sdk-mq (~> 1) - aws-sdk-mturk (~> 1) - aws-sdk-neptune (~> 1) - aws-sdk-opsworks (~> 1) - aws-sdk-opsworkscm (~> 1) - aws-sdk-organizations (~> 1) - aws-sdk-pi (~> 1) - aws-sdk-pinpoint (~> 1) - aws-sdk-polly (~> 1) - aws-sdk-pricing (~> 1) - aws-sdk-rds (~> 1) - aws-sdk-redshift (~> 1) - aws-sdk-rekognition (~> 1) - aws-sdk-resourcegroups (~> 1) - aws-sdk-resourcegroupstaggingapi (~> 1) - aws-sdk-route53 (~> 1) - aws-sdk-route53domains (~> 1) - aws-sdk-s3 (~> 1) - aws-sdk-sagemaker (~> 1) - aws-sdk-sagemakerruntime (~> 1) - aws-sdk-secretsmanager (~> 1) - aws-sdk-serverlessapplicationrepository (~> 1) - aws-sdk-servicecatalog (~> 1) - aws-sdk-servicediscovery (~> 1) - aws-sdk-ses (~> 1) - aws-sdk-shield (~> 1) - aws-sdk-simpledb (~> 1) - aws-sdk-sms (~> 1) - aws-sdk-snowball (~> 1) - aws-sdk-sns (~> 1) - aws-sdk-sqs (~> 1) - aws-sdk-ssm (~> 1) - aws-sdk-states (~> 1) - aws-sdk-storagegateway (~> 1) - aws-sdk-support (~> 1) - aws-sdk-swf (~> 1) - aws-sdk-transcribeservice (~> 1) - aws-sdk-translate (~> 1) - aws-sdk-waf (~> 1) - aws-sdk-wafregional (~> 1) - aws-sdk-workdocs (~> 1) - aws-sdk-workmail (~> 1) - aws-sdk-workspaces (~> 1) - aws-sdk-xray (~> 1) - aws-sdk-route53 (1.10.1) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-route53domains (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-s3 (1.17.0) - aws-sdk-core (~> 3, >= 3.21.2) + aws-sdk-firehose (1.14.0) + aws-sdk-core (~> 3, >= 3.48.2) + aws-sigv4 (~> 1.1) + aws-sdk-kinesis (1.13.1) + aws-sdk-core (~> 3, >= 3.48.2) + aws-sigv4 (~> 1.1) + aws-sdk-kms (1.16.0) + aws-sdk-core (~> 3, >= 3.48.2) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.36.0) + aws-sdk-core (~> 3, >= 3.48.2) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.0) - aws-sdk-sagemaker (1.11.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-sagemakerruntime (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-secretsmanager (1.10.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-serverlessapplicationrepository (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-servicecatalog (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-servicediscovery (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-ses (1.8.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-shield (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-simpledb (1.1.0) - aws-sdk-core (~> 3) - aws-sigv2 (~> 1.0) - aws-sdk-sms (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-snowball (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-sns (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-sqs (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-ssm (1.18.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-states (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-storagegateway (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-support (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-swf (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-transcribeservice (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-translate (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-waf (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-wafregional (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-workdocs (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-workmail (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-workspaces (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-xray (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sigv2 (1.0.1) - aws-sigv4 (1.0.3) - bson (4.3.0) - cool.io (1.5.3) + aws-sdk-sqs (1.13.0) + aws-sdk-core (~> 3, >= 3.48.2) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.1.0) + aws-eventstream (~> 1.0, >= 1.0.2) + bson (4.4.2) + cool.io (1.5.4) dig_rb (1.0.1) - elasticsearch (6.1.0) - elasticsearch-api (= 6.1.0) - elasticsearch-transport (= 6.1.0) - elasticsearch-api (6.1.0) + digest-crc (0.4.1) + elasticsearch (6.3.0) + elasticsearch-api (= 6.3.0) + elasticsearch-transport (= 6.3.0) + elasticsearch-api (6.3.0) multi_json - elasticsearch-transport (6.1.0) + elasticsearch-transport (6.3.0) faraday multi_json excon (0.62.0) - faraday (0.15.2) + faraday (0.15.4) multipart-post (>= 1.2, < 3) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) - fluent-plugin-elasticsearch (2.11.1) + fluent-plugin-elasticsearch (3.4.1) elasticsearch excon - fluentd (>= 0.14.20) - fluent-plugin-kafka (0.7.4) + fluentd (>= 0.14.22) + fluent-plugin-kafka (0.9.2) fluentd (>= 0.10.58, < 2) ltsv - ruby-kafka (>= 0.4.1, < 1.0.0) - fluent-plugin-kinesis (2.1.1) - aws-sdk (>= 2.9.9, < 4) - fluentd (>= 0.12.35, < 2) + ruby-kafka (>= 0.7.1, < 0.8.0) + fluent-plugin-kinesis (3.0.0) + aws-sdk-firehose (~> 1, != 1.9, != 1.5) + aws-sdk-kinesis (~> 1, != 1.5, != 1.4) + fluentd (>= 0.14.10, < 2) google-protobuf (~> 3) - fluent-plugin-mongo (1.1.1) - fluentd (>= 0.14.12, < 2) - mongo (~> 2.2.0) + fluent-plugin-mongo (1.2.2) + fluentd (>= 0.14.22, < 2) + mongo (~> 2.6.0) fluent-plugin-record-reformer (0.9.1) fluentd - fluent-plugin-rewrite-tag-filter (2.1.0) + fluent-plugin-rewrite-tag-filter (2.2.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-s3 (1.1.3) + fluent-plugin-s3 (1.1.9) aws-sdk-s3 (~> 1.0) aws-sdk-sqs (~> 1.0) - fluentd (>= 0.14.2, < 2) - fluent-plugin-scribe (0.10.14) + fluentd (>= 0.14.22, < 2) + fluent-plugin-scribe (1.0.0) fluentd thrift (~> 0.8.0) fluent-plugin-webhdfs (1.2.3) fluentd (>= 0.14.4) webhdfs (>= 0.6.0) - fluentd (1.2.3) + fluentd (1.4.2) cool.io (>= 1.4.5, < 2.0.0) dig_rb (~> 1.0.0) http_parser.rb (>= 0.5.1, < 0.7.0) @@ -649,18 +87,19 @@ GEM tzinfo (~> 1.0) tzinfo-data (~> 1.0) yajl-ruby (~> 1.0) - google-protobuf (3.6.0) + google-protobuf (3.7.1) http_parser.rb (0.6.0) jmespath (1.4.0) - ltsv (0.1.0) - mongo (2.2.7) - bson (~> 4.0) - msgpack (1.2.4) + ltsv (0.1.2) + mongo (2.6.4) + bson (>= 4.3.0, < 5.0.0) + msgpack (1.2.9) multi_json (1.13.1) multipart-post (2.0.0) - public_suffix (3.0.2) - ruby-kafka (0.6.7) - serverengine (2.0.7) + public_suffix (3.0.3) + ruby-kafka (0.7.6) + digest-crc + serverengine (2.1.0) sigdump (~> 0.2.2) sigdump (0.2.4) strptime (0.2.3) @@ -668,11 +107,11 @@ GEM thrift (0.8.0) tzinfo (1.2.5) thread_safe (~> 0.1) - tzinfo-data (1.2018.5) + tzinfo-data (1.2019.1) tzinfo (>= 1.0.0) webhdfs (0.8.0) addressable - yajl-ruby (1.4.0) + yajl-ruby (1.4.1) PLATFORMS ruby @@ -690,4 +129,4 @@ DEPENDENCIES fluentd BUNDLED WITH - 1.16.2 + 1.16.3 diff --git a/nixpkgs/pkgs/tools/misc/fluentd/gemset.nix b/nixpkgs/pkgs/tools/misc/fluentd/gemset.nix index 8a3c212d0552..022127238ecc 100644 --- a/nixpkgs/pkgs/tools/misc/fluentd/gemset.nix +++ b/nixpkgs/pkgs/tools/misc/fluentd/gemset.nix @@ -1,1420 +1,188 @@ { addressable = { dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; type = "gem"; }; - version = "2.5.2"; + version = "2.6.0"; }; aws-eventstream = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gdiwkg24jpx5f3bkw6vchgliicn6v9bpm09j0dldaxsca66q0wy"; + sha256 = "1i4djzrynzr4l8mqx946ad6zn7blz2r5jif58y9c0lws6bdc5h1l"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; aws-partitions = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gqkj0fq1rlrsfr1s3dgrhz4dikxlkrbrkp0i2013aa3lcsm8hqm"; - type = "gem"; - }; - version = "1.96.0"; - }; - aws-sdk = { - dependencies = ["aws-sdk-resources"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0z01jdka7akshp524xprqaakpavzjadh0kmwmz8mwk5i1yiakba3"; - type = "gem"; - }; - version = "3.0.1"; - }; - aws-sdk-acm = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0r6m6l8jbnhcvs6xighgcpc8li8pnjr33l34fqgnbxbbkybwnhl0"; - type = "gem"; - }; - version = "1.9.0"; - }; - aws-sdk-acmpca = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13ggvcyijmhdwiw1ym21pxac4hf7wmndy5l5g1mmd2r6mlz08n6b"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-alexaforbusiness = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1bn1460ga5b1nair735nf8cg4hrgh499kdwn9r75d5mjfd4yxg1s"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-apigateway = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1v1p15lx6k9iyx226h6w9pp16frhnpl1xxwm1c0q39a5f9k7vyl7"; - type = "gem"; - }; - version = "1.13.0"; - }; - aws-sdk-applicationautoscaling = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1sf117qwmw3qdvydr6sn70vm9ygpnr1mgqic2vc1y6s85rzfh4z2"; - type = "gem"; - }; - version = "1.11.0"; - }; - aws-sdk-applicationdiscoveryservice = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0n770ra6d2bc23rq66x5rd2ck0c0h0ivgxcdgi7kmvkjrh09fslj"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-appstream = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04y4s4pkwvl72a2jzrscki68p6klh9g6vxi86whi4hsg05imj909"; - type = "gem"; - }; - version = "1.13.0"; - }; - aws-sdk-appsync = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kk4r6272fniq5dx50f3k0wz8pjysbvxs26jyvr5af97ayndks1n"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-athena = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1q9igjjw0jc860dns4mh8l1bm0s1q4bpfrzkgczij5vx3rp3jpqv"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-autoscaling = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15hvj08avacvkkrm60rdv39k58zxaqsigrlfjgfiki7vcrrqm19j"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-autoscalingplans = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0djk1z0q92cclr0757qvphj63x20a1ygzp3c9w1ycc6b3n7j5a0r"; - type = "gem"; - }; - version = "1.3.0"; - }; - aws-sdk-batch = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18yr41pgl11x1vfc7w4f7n5v8vbhz4vb05q1fckqcwmwrwcqwycn"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-budgets = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xdwr9c0wcys9gljl2q0bvrjvlk6q676gsr2159qdh0px1s9f8cd"; - type = "gem"; - }; - version = "1.8.0"; - }; - aws-sdk-cloud9 = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vs7jgg1fjz0kn1772mbk55q5ia8k8045bl38wsh23yz9naf7wrb"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-clouddirectory = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zkbqj3nf9pdyzyk9z1xm9qkslghljhwzma10mrpg2wkic8in2zg"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-cloudformation = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1q75h9nbhkrs3rblc5bdf2v1yamskgjkz5rlzlikpp1x08alll2x"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-cloudfront = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wzhhv2hnxy0h3zcbppdzym1zmsgmv6fqkdcdghh5ys9mj4wnq86"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-cloudhsm = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zjdql9x8cpjikjc6q4g8vmdi1xq27q7vwns8flib9cklbkb615k"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-cloudhsmv2 = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09pw8dgay7vrmwfjz5dzjrci1q6iqazna36d5vhp3raw4drb5q0c"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-cloudsearch = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1k702nm5aqxhgyc2gvjx8c5abg2b004apsgwfv6pi4szcbd3c4bq"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-cloudsearchdomain = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0kc6d3dy7vdydwnhzddnfkrrdspsxzc1h91yml6jskr5p6ccc6mb"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-cloudtrail = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11lj0qw9w7cmxwgfdwvhfx6pfx5dx3b2mcsg0fmy0k8pl18zp4rr"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-cloudwatch = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xmpmwzra3b5gracca050zs0lrsq28sc34x7qx8c0cr05jlkjjig"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-cloudwatchevents = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qr2mlx7w2wb168vldm0ci7z7jf8mjmp73i50048pa6yqsn5jg42"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-cloudwatchlogs = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "16fwk4hxycqq8kkv1asiimr5h5dcrnh22ix9z7vzg6gd3w4cx8yl"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-codebuild = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1x88dg1ygffxlvw9hl9xj7nfvd311vic49sjwrq171ily9drd8dp"; - type = "gem"; - }; - version = "1.12.0"; - }; - aws-sdk-codecommit = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17xch4hwf5i7vvpq3mi6hg120jdjxw9qplhi7d48ch20w5w2nn3k"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-codedeploy = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18qpmbaqwnbw91hbm64fixn4dba35fhr7x770lvly885i8srbv44"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-codepipeline = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1n0v9ml7bfdr30py24ab7jhh35ni17m2c7rr16d55sp14j6583ax"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-codestar = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0dd3l6igidddxy4flw3wry0mv2lr559vvfafjwna7ilj3v311dz2"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-cognitoidentity = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "014b9d7iai5sinjfs2qar3wwnhhb3cd35867jiwkqwhyga30r70p"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-cognitoidentityprovider = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0jlk4ysr1lbn94p16p7z0hr0m7pr47447g632fd0ss1hw7ap4csw"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-cognitosync = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1d5fxq99sfwv4c7jgx65yrhxp9qg524bd8bsfamhakn0rlwi4iny"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-comprehend = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0l50mvlrarqhb7d469czi3p7rimjwzcwp52bhklxbx6lmv3il23p"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-configservice = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11lzxili2c17m6h8y6ngl7z7h0rf7jwwaim4dq2pdf2qi2k5mh70"; + sha256 = "08i5a52b42x1q26j4rzaxp4hhwl0wzw12jbbjxjifnwi2dm57biy"; type = "gem"; }; - version = "1.12.0"; - }; - aws-sdk-connect = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15xz6v48y4nn1yrr2n8d2w0z7g52cqyjrkjxyhgdv6967yby4qw2"; - type = "gem"; - }; - version = "1.1.0"; + version = "1.149.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dhii8d1ra9rbh3n0v5s2p4dg5mrwj44sl0mfcan40s1crcrm3m8"; - type = "gem"; - }; - version = "3.22.1"; - }; - aws-sdk-costandusagereportservice = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04sady26xlvkrmym4bmdbkc1d472kjlxsgr9awa205ih0bxsaffn"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-costexplorer = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ddd92nny926ipzgmr2gg9qh64iv96cd35zwsbwn7ns8mnndxa4q"; - type = "gem"; - }; - version = "1.7.0"; - }; - aws-sdk-databasemigrationservice = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0slj051gw3mr155cwmj67d95wywq4v14ri6xhnkfx07sqp4i8z9a"; - type = "gem"; - }; - version = "1.7.0"; - }; - aws-sdk-datapipeline = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0r2jnvbcbqkg5k42ly1x2w4g97rl4km1m3bwjvwl7q8c9fbrzpby"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-dax = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0m6l7p2g667c54jxbdpb1zkin5damiq3x34aw5b3b88wk9nm8pfy"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-devicefarm = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02bzffmwrbw5irg94iki16ybg0wb926vsfvd4ziv890fc8n239ya"; - type = "gem"; - }; - version = "1.7.0"; - }; - aws-sdk-directconnect = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03jshg8ax2cww8zvf2lvf542xllgpv38i2iqnv79y62s9a26g4l5"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-directoryservice = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0mmjxk34gids533s2x1ay4s9zzrvad16djf1m6xib6ys9bja1x27"; + sha256 = "1sng9iagk96r8986gsacljnw357famz5x4xa1wk9xm4cx0bmpm5i"; type = "gem"; }; - version = "1.3.0"; - }; - aws-sdk-dlm = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0j6r629wqg08zr9ndisy3d27hqj32kimlrfkigw276mnx2v507cn"; - type = "gem"; - }; - version = "1.0.0"; - }; - aws-sdk-dynamodb = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0id29l91wpd9az9axsfmiqdwlh0qx4m1ci7fwzxm7ac6yjq4p7gr"; - type = "gem"; - }; - version = "1.8.0"; - }; - aws-sdk-dynamodbstreams = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03b2wrkxp9cpr0akxqgn5hss9l2yzqa7kl9j0isyh968rbdzaxla"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-ec2 = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17144h9892pf8hn5c5lnid47q2dilyb5hxzf8pj7z3pkra5yn5aw"; - type = "gem"; - }; - version = "1.38.0"; - }; - aws-sdk-ecr = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01x7m60sqfdkfiif1fxknl9p97076ndwr71s5aixq688plf7zybf"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-ecs = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "16czi8zgy8s1p0skcxwr4lcbfwp0g9c8ppbd3ymjchm75rdrg47g"; - type = "gem"; - }; - version = "1.15.0"; - }; - aws-sdk-efs = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fi1a99fh62ma1xy4axh5cpach3fclajd30jp8kig9bxyaspsf2c"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-eks = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1sgyja0kdj68vcqzmckxmik7ibp4rmyiw8vl6zyp3ihkqpvwf5ns"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-elasticache = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wy4w8gcdnn4ckyc0aa9p293fnwlv8ihyvmxflzjkigallxa23vc"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-elasticbeanstalk = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "10f9lg288m74ssm24m7mhphi4h6km84pak0bpg7gd4rnrw4fdw1f"; - type = "gem"; - }; - version = "1.8.0"; - }; - aws-sdk-elasticloadbalancing = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1dz9gx4c83s1qb03kqng5vh9kjihi0jv02j3ndp2z5z10cpncf3p"; - type = "gem"; - }; - version = "1.3.0"; - }; - aws-sdk-elasticloadbalancingv2 = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1qs1gjjnvhx1ijm7mr5aa0cv7sanvm81l8kpx1y57zrpa5ikp3r7"; - type = "gem"; - }; - version = "1.11.0"; - }; - aws-sdk-elasticsearchservice = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zhylvqwln0vz5qhd1vj89s7fwdk330wksp206dphscmqjra0ggz"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-elastictranscoder = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1r9waa8jksznqwvlrapf71j8ga6cjm9j6qjrssqps083kxg0sad1"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-emr = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0mkb4302iczxmn7al36f151xvjnf8v0r559p4wn6jginvgwxk48n"; - type = "gem"; - }; - version = "1.3.0"; + version = "3.48.3"; }; aws-sdk-firehose = { dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yc2kvnf0hdlpfh3i51m44775vws3k84wvlhnvj68nm5jszhhx7b"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-fms = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lqh6pxg3ki2k539xm99p63fai8grswpkyd5nj8dl4pwsqn4xx57"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-gamelift = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wfyq9m0dv9isdriin285daj5b90bbkrk5b0ss0awhcqwarlj29i"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-glacier = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vlg62v7zraz5f7h13wws9cga4sdv62v6lsfkqn2ai6n1ks80c02"; - type = "gem"; - }; - version = "1.8.0"; - }; - aws-sdk-glue = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rlq8hchn6dkccwdrd27lizfghmgf4lcrdcblhs14sxmwk0jzl25"; - type = "gem"; - }; - version = "1.10.0"; - }; - aws-sdk-greengrass = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05cjp6jvcnzg3jxwcggg31l0sqb743b6x66230nb5ahf7l8sq4fx"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-guardduty = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0l2fbhm1d5mgkvrz8jgny2zcd4zzijwy8s4f4p91kn22m1s74cg4"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-health = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0b3zgjwh2drkxcbmglw9vz9b8wir0qwxihf2yrra33qhcxvlf29q"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-iam = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1wch93pvh5y16ldn1b42igrj0q76j7mfwvkwqnlk8197wpmyzl8z"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-importexport = { - dependencies = ["aws-sdk-core" "aws-sigv2"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0clry5ch04npyrgz61xrwwj6kwqai5d9c933rd17jx0r7dm2x5zb"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-inspector = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0blgc82naibxdv5zv7brc8kdp4mnqimxc3lsb2fahn9av4bdh4zf"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-iot = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00paa2lhahcfk1kk8zka7zb3hnia1qj6i8rv5ybapgdq9rj4936q"; - type = "gem"; - }; - version = "1.9.0"; - }; - aws-sdk-iot1clickdevicesservice = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0k1if31wsy3dpk4mhwc6s86432g8jbbb1w4gpj85qlydrk2c7y96"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-iot1clickprojects = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12r1pkzixj2g0i9mz7ywsr5qlz19868d8qb4www4s45h6qjwxwnz"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-iotanalytics = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0a69cv9nypykg6il99znymfm09da4hlh3d6i13kj8gma5q7prnq6"; + sha256 = "0f7s1vqs1qga6jzvjgg4x4hcz1rdycwry5dcizidzffwn9sp9iy0"; type = "gem"; }; - version = "1.2.0"; - }; - aws-sdk-iotdataplane = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0777k6l8phrby6ar5zpbhsp4i77d8bfs5z57axn6ir1q4dalgza5"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-iotjobsdataplane = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05awqr95nlral8f8il5n27swri3vq9y60mhqz9qmhld8w3cwwspj"; - type = "gem"; - }; - version = "1.1.0"; + version = "1.14.0"; }; aws-sdk-kinesis = { dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kw8ksdy6mylrzdswvxxdjb8wim9agdgxpjp3a1aqa72nlswq3nx"; + sha256 = "005dj7m3zi8gkda5g40a0wxlx48g0w5cz4k7783g2p6c0h5wwdsb"; type = "gem"; }; - version = "1.3.0"; - }; - aws-sdk-kinesisanalytics = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1krdg2qvm2if5npbpw4bk2i1kz51bknfy1j5gaiiym1mmrz7lrap"; - type = "gem"; - }; - version = "1.3.0"; - }; - aws-sdk-kinesisvideo = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1299hi3296i3wjmy8cjzpy10bzpljb638yrbyash39y3znaxk2i8"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-kinesisvideoarchivedmedia = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17sap4wdpi6l6h8yfm9yzjniv4cps5q3wrhdjp6slwrmhrmq2gpx"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-kinesisvideomedia = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rzwpjnym78i5g6427w7war436qnl77qjaiwwh5avrvy12lfjyrb"; - type = "gem"; - }; - version = "1.1.0"; + version = "1.13.1"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y41nf5p94r2mrmpxx2icylz7g1jm72d1awwpjfrw5zlxbzi8jgj"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-lambda = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ng2k320s81d5v1g2ihjvkmspnyfkcb9v2fc25mszwg9gwq4mhz1"; - type = "gem"; - }; - version = "1.8.0"; - }; - aws-sdk-lambdapreview = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ys1zpc7jmzn4vs01z5qw7rkg4732fbzpiwj5p0gpgy151hip110"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-lex = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1g67akcqmv1i1k4a370vwnb1qkmfl7smfllbw84kd062h8m1h2vl"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-lexmodelbuildingservice = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0awdfirdc2wn4xaqxkizlxy604gwna55mn261fjwj6a3jp83pb1z"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-lightsail = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gxs8b3grk4dwsldszvkz31w3lypdnyqhqs1c3w7f18b66p5l714"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-machinelearning = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rf84hxrqgzpmr08h14p1070x8cs3x5gxn48l1ia1bdlfjvllv2f"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-macie = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0l20rk8r0k6n81vfy132l5xbaxr4h58ykvyhka0xrb2fys5kr704"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-marketplacecommerceanalytics = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0mcbk1gwqpfxg9wrf1vd9c4s97d46p425yx4m7fx6z73fb26ckp3"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-marketplaceentitlementservice = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17r2c9ir63wbhpl4kz3pwkavjqvi73jpx3vpbm8172zqai72m2qw"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-marketplacemetering = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05snignv3fjdfpjw771daxkkm7hlc7wbsi43ajjwvrxzl8apgkl1"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-mediaconvert = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hdliqi7rxhp02rnnnvrkg1pn5rbss577f5di4h1pbcmw29zqa2p"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-medialive = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03pr959i5lnsdw4vagdhfcjfrm01h055j83abs9w2gs4asmknyi9"; - type = "gem"; - }; - version = "1.8.0"; - }; - aws-sdk-mediapackage = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "190ca52xzdgnfn73qwv4kc2jix2a3s7gxx6a2nij47ak5bs8qhhn"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-mediastore = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1m7xjz0xpnwvsm35m2wnp9ja8sqhk5w09jf92frim482vyddk46n"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-mediastoredata = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1da6wd4nrf99mxyv9fay4bbk3n64swzr8989dfjipqa8rpnry9dq"; + sha256 = "1m64sb5nnpryjmjbgvr5lmlrd06wvafd0ss9i9zf3fsi39hqaicg"; type = "gem"; }; - version = "1.2.0"; - }; - aws-sdk-mediatailor = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rm8f2ln263mabj5ia880h8464pxqg7cp1b1dy6mggbj77v4qyw7"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-migrationhub = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vaswa6f4hd7gf5y2rn6jn4rxx4i3dhyngb6446llwc218qqcp5x"; - type = "gem"; - }; - version = "1.3.0"; - }; - aws-sdk-mobile = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kvx23q0dcf4kznf72fq6vrz2wzprim1n87a7jwwvqp1cm8dkh9s"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-mq = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1h258myrx75zvicpdb06bbls4d0fnpfqfp16yc0j5lmqdr6p74qn"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-mturk = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0kb5ii2lqiq8va1plyrna0zczgc9p2dgv0a17xx9pzfg2djvc7vz"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-neptune = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rddn8y1cwnj5zahvln643sfb4ayddqmydrxibf5j1nqsvv46lg7"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-opsworks = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1mkjf0694daikkqsqygq1f34zw4wiwg57p8vxlwx5fxjbgwfi01a"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-opsworkscm = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06067wx6ihk9kj11789dlzag3j2b7zxk9yil4zxy0gv95w37ypzg"; - type = "gem"; - }; - version = "1.3.0"; - }; - aws-sdk-organizations = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1jhll8rgp78pwsd5wgfg4nwxkyzahlh0xrnddw3cx9qhzcb001xn"; - type = "gem"; - }; - version = "1.10.0"; - }; - aws-sdk-pi = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0xm7d9ssn4q2107gp90qsi8vjg87wdl5py55qq76m79xmp2i08wi"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-pinpoint = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "023yvhr6xdisyyx9p104hyaq2vy9rs0n43h2dc5nbm58a1bm2zsn"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-polly = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0g98zchw6ycnz3anvpc6glxj9kal71mn78gr2i37awb6z0j3mk1g"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-pricing = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hm8m1jhf6qfpy1866ykvvnc51mfbp89mfby6z6yxy00fz6mvax5"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-rds = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "009ns5wfcrxan5hhzsj7gpcwnni2ydq79mk2i3lj4gw87k9kr9zx"; - type = "gem"; - }; - version = "1.23.0"; - }; - aws-sdk-redshift = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rp9zm846rx9vm2qvh238gzixbb7r58xbrrfk0ipsrw6v19b4my4"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-rekognition = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1j399i23anlj252rwnj3dcm66787nspfj8hyazfsgb5ww7b2day3"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-resourcegroups = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0f878grncnyxlkml525apx3l28mmq96gfi5vpcjhcw9apz58qclf"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-resourcegroupstaggingapi = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wr75f1gi449x12hai1yjzrlw6cql3z4jyc1hd68wppyf6f1s8kw"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-resources = { - dependencies = ["aws-sdk-acm" "aws-sdk-acmpca" "aws-sdk-alexaforbusiness" "aws-sdk-apigateway" "aws-sdk-applicationautoscaling" "aws-sdk-applicationdiscoveryservice" "aws-sdk-appstream" "aws-sdk-appsync" "aws-sdk-athena" "aws-sdk-autoscaling" "aws-sdk-autoscalingplans" "aws-sdk-batch" "aws-sdk-budgets" "aws-sdk-cloud9" "aws-sdk-clouddirectory" "aws-sdk-cloudformation" "aws-sdk-cloudfront" "aws-sdk-cloudhsm" "aws-sdk-cloudhsmv2" "aws-sdk-cloudsearch" "aws-sdk-cloudsearchdomain" "aws-sdk-cloudtrail" "aws-sdk-cloudwatch" "aws-sdk-cloudwatchevents" "aws-sdk-cloudwatchlogs" "aws-sdk-codebuild" "aws-sdk-codecommit" "aws-sdk-codedeploy" "aws-sdk-codepipeline" "aws-sdk-codestar" "aws-sdk-cognitoidentity" "aws-sdk-cognitoidentityprovider" "aws-sdk-cognitosync" "aws-sdk-comprehend" "aws-sdk-configservice" "aws-sdk-connect" "aws-sdk-costandusagereportservice" "aws-sdk-costexplorer" "aws-sdk-databasemigrationservice" "aws-sdk-datapipeline" "aws-sdk-dax" "aws-sdk-devicefarm" "aws-sdk-directconnect" "aws-sdk-directoryservice" "aws-sdk-dlm" "aws-sdk-dynamodb" "aws-sdk-dynamodbstreams" "aws-sdk-ec2" "aws-sdk-ecr" "aws-sdk-ecs" "aws-sdk-efs" "aws-sdk-eks" "aws-sdk-elasticache" "aws-sdk-elasticbeanstalk" "aws-sdk-elasticloadbalancing" "aws-sdk-elasticloadbalancingv2" "aws-sdk-elasticsearchservice" "aws-sdk-elastictranscoder" "aws-sdk-emr" "aws-sdk-firehose" "aws-sdk-fms" "aws-sdk-gamelift" "aws-sdk-glacier" "aws-sdk-glue" "aws-sdk-greengrass" "aws-sdk-guardduty" "aws-sdk-health" "aws-sdk-iam" "aws-sdk-importexport" "aws-sdk-inspector" "aws-sdk-iot" "aws-sdk-iot1clickdevicesservice" "aws-sdk-iot1clickprojects" "aws-sdk-iotanalytics" "aws-sdk-iotdataplane" "aws-sdk-iotjobsdataplane" "aws-sdk-kinesis" "aws-sdk-kinesisanalytics" "aws-sdk-kinesisvideo" "aws-sdk-kinesisvideoarchivedmedia" "aws-sdk-kinesisvideomedia" "aws-sdk-kms" "aws-sdk-lambda" "aws-sdk-lambdapreview" "aws-sdk-lex" "aws-sdk-lexmodelbuildingservice" "aws-sdk-lightsail" "aws-sdk-machinelearning" "aws-sdk-macie" "aws-sdk-marketplacecommerceanalytics" "aws-sdk-marketplaceentitlementservice" "aws-sdk-marketplacemetering" "aws-sdk-mediaconvert" "aws-sdk-medialive" "aws-sdk-mediapackage" "aws-sdk-mediastore" "aws-sdk-mediastoredata" "aws-sdk-mediatailor" "aws-sdk-migrationhub" "aws-sdk-mobile" "aws-sdk-mq" "aws-sdk-mturk" "aws-sdk-neptune" "aws-sdk-opsworks" "aws-sdk-opsworkscm" "aws-sdk-organizations" "aws-sdk-pi" "aws-sdk-pinpoint" "aws-sdk-polly" "aws-sdk-pricing" "aws-sdk-rds" "aws-sdk-redshift" "aws-sdk-rekognition" "aws-sdk-resourcegroups" "aws-sdk-resourcegroupstaggingapi" "aws-sdk-route53" "aws-sdk-route53domains" "aws-sdk-s3" "aws-sdk-sagemaker" "aws-sdk-sagemakerruntime" "aws-sdk-secretsmanager" "aws-sdk-serverlessapplicationrepository" "aws-sdk-servicecatalog" "aws-sdk-servicediscovery" "aws-sdk-ses" "aws-sdk-shield" "aws-sdk-simpledb" "aws-sdk-sms" "aws-sdk-snowball" "aws-sdk-sns" "aws-sdk-sqs" "aws-sdk-ssm" "aws-sdk-states" "aws-sdk-storagegateway" "aws-sdk-support" "aws-sdk-swf" "aws-sdk-transcribeservice" "aws-sdk-translate" "aws-sdk-waf" "aws-sdk-wafregional" "aws-sdk-workdocs" "aws-sdk-workmail" "aws-sdk-workspaces" "aws-sdk-xray"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15z91flcf5daz7v5sfrib5sxm4gk6w66jlh93is0ixr6hwanqb2h"; - type = "gem"; - }; - version = "3.22.0"; - }; - aws-sdk-route53 = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ga3rd1b3fgg8z46490gjkf2a7j1vys7mf3wi4qmwg8ijs8gva4c"; - type = "gem"; - }; - version = "1.10.1"; - }; - aws-sdk-route53domains = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02nzhks6kjpdakm3xcc5373g3dnn45a9gr70vc8jhdjyarhcasbk"; - type = "gem"; - }; - version = "1.3.0"; + version = "1.16.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sxd6iwyg54qdzqxqhww1qnhg4z1il1impkg2g8ksgr9q2ykf4jd"; + sha256 = "1bnihahz0va36jcw5wifw6ad0fdarl0lsils6h50wpvzcxzmlm2i"; type = "gem"; }; - version = "1.17.0"; - }; - aws-sdk-sagemaker = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11arjp9mcgy3b8rp6dpdla0zcsrv40sw7cc0azplayk5n6cislx1"; - type = "gem"; - }; - version = "1.11.0"; - }; - aws-sdk-sagemakerruntime = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zyinypfjsf7kp6dh7wbk3f5x3qhj8p76pv332pknrgk94v6rn3i"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-secretsmanager = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1b5xk5icz664rjjcy9ijwfg4nr1chg0pbxyrmzy0agh88vxgp71z"; - type = "gem"; - }; - version = "1.10.0"; - }; - aws-sdk-serverlessapplicationrepository = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1n7lzzvpyryv1v3pai3yxk2w95zk2yglmdh0k3h84n6z3w6jlgr3"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-servicecatalog = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13dhxxp1nmzs71ripdi4yas1wm17w3ks22by6qlbnqy9zwb0r6jg"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-servicediscovery = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "033fynzwr4j6idlk3p5rqk94n0ayxrwjcziky5hnfj2aic2yj3lf"; - type = "gem"; - }; - version = "1.3.0"; - }; - aws-sdk-ses = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0aa3vq1lscb5cmcc10s38pdw2crdsfjd4gpb6d9j5d5z8wbpqjhz"; - type = "gem"; - }; - version = "1.8.0"; - }; - aws-sdk-shield = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12imklik3j9l4fchyj4q6wpiw27kkm4m29accjwkxxikh70w9q0l"; - type = "gem"; - }; - version = "1.3.0"; - }; - aws-sdk-simpledb = { - dependencies = ["aws-sdk-core" "aws-sigv2"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "16qrczxn096aanan2qrvbbk398sqlfiawviz72z9y31pxds7699d"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-sms = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1d16b5s6x894fagk6mzvli4n9rpsv4gx1xw445nl49jc8z3b941l"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-snowball = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17kk7n83zbhms7bvavlasw13ydsiqzm8l2p6dpsa3cjqvs7bn9bw"; - type = "gem"; - }; - version = "1.3.0"; - }; - aws-sdk-sns = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0pkv99yqilpklrhwhxr5lv0xma1irk0j7q5myw220yl84d7c6m04"; - type = "gem"; - }; - version = "1.3.0"; + version = "1.36.0"; }; aws-sdk-sqs = { dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m4lk45bfanxyq3rz428az2bbz2g3xbzq40754d81m0b17kyz6nc"; + sha256 = "1cpmimcnjfwrqv1nmaxp4yyxmh50wg83ccihj8hiafkazg75kfx0"; type = "gem"; }; - version = "1.4.0"; - }; - aws-sdk-ssm = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0w5idgdqp3z9s0cf84r66ha1npjhszp0zd3w43rlp96m1z9m8pk8"; - type = "gem"; - }; - version = "1.18.0"; - }; - aws-sdk-states = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0sg5z9mgn76l81zgigxrxwnn710gigp6iragc3gvz0cdfwwzd33f"; - type = "gem"; - }; - version = "1.3.0"; - }; - aws-sdk-storagegateway = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "078j56x8jllk5dsb8crk33336kmcgs83p2achlw5j10mlfzlra6z"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-support = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bg642zz7nn3dfr039pgry44js9jlr31yq47rsqzhl6p3qh9yisi"; - type = "gem"; - }; - version = "1.1.0"; + version = "1.13.0"; }; - aws-sdk-swf = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; + aws-sigv4 = { + dependencies = ["aws-eventstream"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "108gzaw0y83vncbv6rzaww4950cycwh8crcw3vf2av6w0mbqi61f"; + sha256 = "1dfc8i5cxjwlvi4b665lbpbwvks8a6wfy3vfmwr3pjdmxwdmc2cs"; type = "gem"; }; version = "1.1.0"; }; - aws-sdk-transcribeservice = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1z66aqfh1s561wa9dqasvbb4shxb2chp12i8h6hs6lxsrpihxbi0"; - type = "gem"; - }; - version = "1.3.0"; - }; - aws-sdk-translate = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17wprz7c8h8bfi1pv8pw2jll4iaixs9v2zd6iyy33zy0ssyzp9jc"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-waf = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kxaspfpgsrwm1vdyqhbjw1l40z5ygkx9if5lfqh80906rns9gwz"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-wafregional = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ryrx7zh7dmxzrvky3kx6dvz22v0s919jkdhqh8rx65p97ikml2c"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-workdocs = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "07grgjkzg31n3k0ig70gj6pjix44jwnl54lw4pn4yqld3472r296"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-workmail = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04yak9s80kcx0vnz9ghbis5qj274rpkwga2391kky8r2gf40lpn2"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-workspaces = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; + bson = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vq0bayq1ryzd9z4y70w39h1ag2jj6k59bv72agdafrszv13fggf"; + sha256 = "1kgim98b41cj0njlqv1bwvx2m6gw9n7ilwklfn9hivfg096bzl8l"; type = "gem"; }; - version = "1.3.0"; + version = "4.4.2"; }; - aws-sdk-xray = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; + "cool.io" = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00n7nrx5qfbcv94hdlh623nhv269z9abfkb6mj5dmjw4hzpm8d31"; + sha256 = "0l836z3qgrl5829q48qaz1zngqqxy2k0l61swqm0amhyfcgfbz1m"; type = "gem"; }; - version = "1.3.0"; + version = "1.5.4"; }; - aws-sigv2 = { + dig_rb = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1191i9c0kkiyfs3vfwgfxc8kq19rg1q4lkackz56yffv05yp5ng3"; + sha256 = "12dbb1pl2vr9z7yy2zsbsjaj4hw89y56wll6kd8422mylmcw7bx4"; type = "gem"; }; version = "1.0.1"; }; - aws-sigv4 = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hzndv113i6bgy2n72i5l3mwn8vjnb6hhjxfkpn9mm2p5ra77yk7"; - type = "gem"; - }; - version = "1.0.3"; - }; - bson = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "07baxjrd8rb5gfsv7hh1akjqcpwih76f1711bwjzp228c79ny2na"; - type = "gem"; - }; - version = "4.3.0"; - }; - "cool.io" = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03wwgs427nmic6aa365d7kyfbljpb1ra6syywffxfmz9382xswcp"; - type = "gem"; - }; - version = "1.5.3"; - }; - dig_rb = { + digest-crc = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12dbb1pl2vr9z7yy2zsbsjaj4hw89y56wll6kd8422mylmcw7bx4"; + sha256 = "08q8p0fk51aa6dwhy2xmjaj76arcq9nn22gyia162jmqpccfx50l"; type = "gem"; }; - version = "1.0.1"; + version = "0.4.1"; }; elasticsearch = { dependencies = ["elasticsearch-api" "elasticsearch-transport"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "162a7aiajs7w3rak21y6jidik7zhkm104wcx25190llyqbqkvlp9"; + sha256 = "1kx13w90dnmrfgwgm86h8wsmjmpv19qxvd1f6xxrdjmw0ij0vyqn"; type = "gem"; }; - version = "6.1.0"; + version = "6.3.0"; }; elasticsearch-api = { dependencies = ["multi_json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q9shhpifl6cir68zxv30mjjybxsx39asqnircrgs4lqsb20j1n7"; + sha256 = "06dji10nahhqd04igfwcqb1d521lv7gy40g7nv0mx3nnb1c6ksbm"; type = "gem"; }; - version = "6.1.0"; + version = "6.3.0"; }; elasticsearch-transport = { dependencies = ["faraday" "multi_json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dmb587mp526q1wvb1j13rjj13vxl4fcpmm899ipyr88spld5vc7"; + sha256 = "025c0plj3ydrykmwpwhn6vdxfgf4b7xr4gg5dzdd5ck9frvqb6mz"; type = "gem"; }; - version = "6.1.0"; + version = "6.3.0"; }; excon = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2"; @@ -1424,15 +192,19 @@ }; faraday = { dependencies = ["multipart-post"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14lg0c4bphk16rccc5jmaan6nfcvmy0caiahpc61f9zfwpsj7ymg"; + sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0"; type = "gem"; }; - version = "0.15.2"; + version = "0.15.4"; }; fluent-config-regexp-type = { dependencies = ["fluentd"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0hk0vxcmlbid7n6piyv3x83j5gyiz7in397l9x3c6nh69wicy7gm"; @@ -1442,42 +214,52 @@ }; fluent-plugin-elasticsearch = { dependencies = ["elasticsearch" "excon" "fluentd"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jh7wpj46753mii98ddafl5yas0iw8dc1b87lzgdyfri9z8cbfv1"; + sha256 = "115y11r7rd4hd9gc2lngm6cas1119fas87s75x6iaykqg8hlr99l"; type = "gem"; }; - version = "2.11.1"; + version = "3.4.1"; }; fluent-plugin-kafka = { dependencies = ["fluentd" "ltsv" "ruby-kafka"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16r7ydlnb1ba7adk3f95v3x1qjk22cifd9bvz71099m17njw56g1"; + sha256 = "079isjc1788fbhagrn2qfrp6mcfw0b6kl6dpnrwpwv9865h75hmm"; type = "gem"; }; - version = "0.7.4"; + version = "0.9.2"; }; fluent-plugin-kinesis = { - dependencies = ["aws-sdk" "fluentd" "google-protobuf"]; + dependencies = ["aws-sdk-firehose" "aws-sdk-kinesis" "fluentd" "google-protobuf"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14hsvbskfviq11408qglqx1434hv6i7qbgqy8nnii8a657fccvxy"; + sha256 = "14jqr13k50vs29akjpi0prcs1fdjy335prlqylvri7bc1cmfkhz3"; type = "gem"; }; - version = "2.1.1"; + version = "3.0.0"; }; fluent-plugin-mongo = { dependencies = ["fluentd" "mongo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w7fla5172x7bll10zja0sg4n0gzkqa191jf6zradhb6416qd355"; + sha256 = "1p5c7j3yx4cjrn4ljxwghrp8yh0rcdra1iafc67i92s1sl8b70dq"; type = "gem"; }; - version = "1.1.1"; + version = "1.2.2"; }; fluent-plugin-record-reformer = { dependencies = ["fluentd"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1gwfrfyi9is4l9q4ih3c4l3c9qvyh00jnd2qajdpdh5xjj2m7akn"; @@ -1487,33 +269,41 @@ }; fluent-plugin-rewrite-tag-filter = { dependencies = ["fluent-config-regexp-type" "fluentd"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xra33l2pid84qmgr0ni9dmd114l035z9j4g66wdfyihncnaaamp"; + sha256 = "0kf8p1s02pwhkks82kmkkbfbf4qlhhqiczqah4w0dnp86wp6xyw5"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; fluent-plugin-s3 = { dependencies = ["aws-sdk-s3" "aws-sdk-sqs" "fluentd"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "102d85igcnnlha8j0vw3pvc0425d38c9r0pryqhz7v1j4p2igi27"; + sha256 = "16zaxvf3rs5lmd933sgyrxkrws0qcd0z2ypbky45gyq8si1dpwcl"; type = "gem"; }; - version = "1.1.3"; + version = "1.1.9"; }; fluent-plugin-scribe = { dependencies = ["fluentd" "thrift"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00m19w7p22adq0yx1h7h2h4ckw9kh5j458a8lawgmbazw2dz0zxi"; + sha256 = "19m37d0saknifjg8kva96pgsc7zsmdlwvwiy9gvhi2d6c7bq3q30"; type = "gem"; }; - version = "0.10.14"; + version = "1.0.0"; }; fluent-plugin-webhdfs = { dependencies = ["fluentd" "webhdfs"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1yyv3f0g30x9dzhq74b5cq8z0wbyppw9bb6152v6yrwz25b16231"; @@ -1523,29 +313,38 @@ }; fluentd = { dependencies = ["cool.io" "dig_rb" "http_parser.rb" "msgpack" "serverengine" "sigdump" "strptime" "tzinfo" "tzinfo-data" "yajl-ruby"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02a7xzpq3vs3lgwawygbkzbsjr2p46945l6wc3bkvws47v33yr4d"; + sha256 = "1ppdfa03gzv97px7xhdx5nnzc15g8l7yp10jw87qyl5cp62kpx3c"; type = "gem"; }; - version = "1.2.3"; + version = "1.4.2"; }; google-protobuf = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10r48i7g0387sd8a1cl8n2da54ar9nw29jshmydwmdrb8y5v5nic"; + sha256 = "04988m3hmllg4sl4syjb35x0wzsg7rj1nmvhx3d9ihml22w76gb2"; type = "gem"; }; - version = "3.6.0"; + version = "3.7.1"; }; "http_parser.rb" = { + groups = ["default"]; + platforms = []; source = { + remotes = ["https://rubygems.org"]; sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; type = "gem"; }; version = "0.6.0"; }; jmespath = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf"; @@ -1554,31 +353,39 @@ version = "1.4.0"; }; ltsv = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1alfq3g0mih4w86736ybnzqmknphm2z95c9q0wl765i4lrmxng11"; + sha256 = "0wrjvc5079zhpn62k1yflrf7js6vaysrg1qwggf7bj2zi0p5rhys"; type = "gem"; }; - version = "0.1.0"; + version = "0.1.2"; }; mongo = { dependencies = ["bson"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qdy2prwr9hv9691xxl0zqgp1s24jm6pknd2vq829yy6a1fv8f87"; + sha256 = "0k0f1826hixqfqgsc9g6rdqrzr5pzy46hszmk6869pmvm638jah1"; type = "gem"; }; - version = "2.2.7"; + version = "2.6.4"; }; msgpack = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864"; + sha256 = "0zs8v59d77wlx4yylyh0lglsj8sp9jrq11yqngdgn95avfhxjw0s"; type = "gem"; }; - version = "1.2.4"; + version = "1.2.9"; }; multi_json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; @@ -1587,38 +394,50 @@ version = "1.13.1"; }; multipart-post = { + groups = ["default"]; + platforms = []; source = { + remotes = ["https://rubygems.org"]; sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; type = "gem"; }; version = "2.0.0"; }; public_suffix = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.3"; }; ruby-kafka = { + dependencies = ["digest-crc"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k9p93zgyify9barnzc4di09pm8bdaywqx68149bmw0zzhghqdqa"; + sha256 = "0b5i6vazw9s26nwifwsbd95sl35l5krh3yp4z2zpp6lpp6al36db"; type = "gem"; }; - version = "0.6.7"; + version = "0.7.6"; }; serverengine = { dependencies = ["sigdump"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gkm880njsi9x6vpb5grsspxb097hi8898drlbbkj1wl9qf2xv8l"; + sha256 = "01978684zvab2pbg7r8vm53n8m2h99pc9iqm1wy9gy67y1nxvz13"; type = "gem"; }; - version = "2.0.7"; + version = "2.1.0"; }; sigdump = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1mqf06iw7rymv54y7rgbmfi6ppddgjjmxzi3hrw658n1amp1gwhb"; @@ -1627,6 +446,8 @@ version = "0.2.4"; }; strptime = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1yj5wwa7wbhgi7w8d9ihpzpf99niw956fhyxddhayj09fgmdcxd8"; @@ -1635,6 +456,8 @@ version = "0.2.3"; }; thread_safe = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; @@ -1643,6 +466,8 @@ version = "0.3.6"; }; thrift = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0aj23ndh5n5yqcvp4c12y7vl5wvxpl66zncf6n6ax2zvb6ig44cv"; @@ -1652,6 +477,8 @@ }; tzinfo = { dependencies = ["thread_safe"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; @@ -1661,15 +488,19 @@ }; tzinfo-data = { dependencies = ["tzinfo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fkihwl9k9pmygl6c4kdlzqv51hn33bvjnxs4q48gs4s63d8gva2"; + sha256 = "1105fp27d527k7rrq1yx1ikbzf1sra046ndayxikkjvay9ql61jz"; type = "gem"; }; - version = "1.2018.5"; + version = "1.2019.1"; }; webhdfs = { dependencies = ["addressable"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0gs6xb9dz9bp5xc38yplfy48jcgj7jrj0zg0vgi7ydkxnkzkhbf2"; @@ -1678,11 +509,13 @@ version = "0.8.0"; }; yajl-ruby = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01bk8pi6h9wdm0ikjqvl1nxlkrxv3q74m3yfg64va9wvk9sqjvvw"; + sha256 = "16v0w5749qjp13xhjgr2gcsvjv6mf35br7iqwycix1n2h7kfcckf"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/tools/misc/hdf4/default.nix b/nixpkgs/pkgs/tools/misc/hdf4/default.nix index ef3839f67de9..eb57cc45f6a0 100644 --- a/nixpkgs/pkgs/tools/misc/hdf4/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdf4/default.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DBUILD_TESTING=ON" "-DHDF4_BUILD_TOOLS=ON" "-DHDF4_BUILD_UTILS=ON" "-DHDF4_BUILD_WITH_INSTALL_NAME=OFF" diff --git a/nixpkgs/pkgs/tools/misc/hdf5/0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch b/nixpkgs/pkgs/tools/misc/hdf5/0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch deleted file mode 100644 index 8b32ea4bab1c..000000000000 --- a/nixpkgs/pkgs/tools/misc/hdf5/0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 38c202df4db8eddd5e6f6f7d6506ce97912a3111 Mon Sep 17 00:00:00 2001 -From: Dana Robinson <derobins@hdfgroup.org> -Date: Mon, 26 Nov 2018 22:10:06 -0800 -Subject: [PATCH] Updated H5S to use the MPI-2 function MPI_Type_get_exten() - where available. OpenMPI 4.0 removed the deprecated MPI-1 MPI_type_extent() - call by default, so this avoids needing a special OpenMPI build. - ---- - src/H5Smpio.c | 26 ++++++++++++++++++++++++-- - 1 file changed, 24 insertions(+), 2 deletions(-) - -diff --git a/src/H5Smpio.c b/src/H5Smpio.c -index 2bd275a729..e71e2cb858 100644 ---- a/src/H5Smpio.c -+++ b/src/H5Smpio.c -@@ -879,7 +879,18 @@ H5S_mpio_hyper_type(const H5S_t *space, size_t elmt_size, - HMPI_GOTO_ERROR(FAIL, "MPI_Type_contiguous failed", mpi_code) - } - -- MPI_Type_extent (inner_type, &inner_extent); -+#if MPI_VERSION >= 2 -+{ -+ /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default, -+ * so we're using the MPI-2 version even though we don't need the lb -+ * value. -+ */ -+ MPI_Aint unused_lb_arg; -+ MPI_Type_get_extent(inner_type, &unused_lb_arg, &inner_extent); -+} -+#else -+ MPI_Type_extent(inner_type, &inner_extent); -+#endif - stride_in_bytes = inner_extent * (MPI_Aint)d[i].strid; - - /* If the element count is larger than what a 32 bit integer can hold, -@@ -1500,7 +1511,18 @@ static herr_t H5S_mpio_create_large_type (hsize_t num_elements, - } - } - -- MPI_Type_extent (old_type, &old_extent); -+#if MPI_VERSION >= 2 -+{ -+ /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default, -+ * so we're using the MPI-2 version even though we don't need the lb -+ * value. -+ */ -+ MPI_Aint unused_lb_arg; -+ MPI_Type_get_extent(old_type, &unused_lb_arg, &old_extent); -+} -+#else -+ MPI_Type_extent(old_type, &old_extent); -+#endif - - /* Set up the arguments for MPI_Type_struct constructor */ - type[0] = outer_type; --- -2.18.1 - diff --git a/nixpkgs/pkgs/tools/misc/hdf5/0001-Yanked-all-MPI-1-calls.patch b/nixpkgs/pkgs/tools/misc/hdf5/0001-Yanked-all-MPI-1-calls.patch deleted file mode 100644 index 8dc831dbba12..000000000000 --- a/nixpkgs/pkgs/tools/misc/hdf5/0001-Yanked-all-MPI-1-calls.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 8cf3bfb14bd2a80f13d269a9e84cd99f86f19254 Mon Sep 17 00:00:00 2001 -From: Dana Robinson <derobins@hdfgroup.org> -Date: Tue, 27 Nov 2018 10:31:54 -0800 -Subject: [PATCH] Yanked all MPI-1 calls - ---- - src/H5.c | 2 +- - src/H5Smpio.c | 24 ++++++++---------------- - testpar/t_cache.c | 20 ++++++++++---------- - 3 files changed, 19 insertions(+), 27 deletions(-) - -diff --git a/src/H5.c b/src/H5.c -index d1967e611b..bf4643ca59 100644 ---- a/src/H5.c -+++ b/src/H5.c -@@ -138,7 +138,7 @@ H5_init_library(void) - if (mpi_initialized && !mpi_finalized) { - int key_val; - -- if(MPI_SUCCESS != (mpi_code = MPI_Comm_create_keyval(MPI_NULL_COPY_FN, -+ if(MPI_SUCCESS != (mpi_code = MPI_Comm_create_keyval(MPI_COMM_NULL_COPY_FN, - (MPI_Comm_delete_attr_function *)H5_mpi_delete_cb, - &key_val, NULL))) - HMPI_GOTO_ERROR(FAIL, "MPI_Comm_create_keyval failed", mpi_code) -diff --git a/src/H5Smpio.c b/src/H5Smpio.c -index e71e2cb858..935d27972e 100644 ---- a/src/H5Smpio.c -+++ b/src/H5Smpio.c -@@ -879,18 +879,14 @@ H5S_mpio_hyper_type(const H5S_t *space, size_t elmt_size, - HMPI_GOTO_ERROR(FAIL, "MPI_Type_contiguous failed", mpi_code) - } - --#if MPI_VERSION >= 2 --{ - /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default, - * so we're using the MPI-2 version even though we don't need the lb - * value. - */ -- MPI_Aint unused_lb_arg; -- MPI_Type_get_extent(inner_type, &unused_lb_arg, &inner_extent); --} --#else -- MPI_Type_extent(inner_type, &inner_extent); --#endif -+ { -+ MPI_Aint unused_lb_arg; -+ MPI_Type_get_extent(inner_type, &unused_lb_arg, &inner_extent); -+ } - stride_in_bytes = inner_extent * (MPI_Aint)d[i].strid; - - /* If the element count is larger than what a 32 bit integer can hold, -@@ -1511,18 +1507,14 @@ static herr_t H5S_mpio_create_large_type (hsize_t num_elements, - } - } - --#if MPI_VERSION >= 2 --{ - /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default, - * so we're using the MPI-2 version even though we don't need the lb - * value. - */ -- MPI_Aint unused_lb_arg; -- MPI_Type_get_extent(old_type, &unused_lb_arg, &old_extent); --} --#else -- MPI_Type_extent(old_type, &old_extent); --#endif -+ { -+ MPI_Aint unused_lb_arg; -+ MPI_Type_get_extent(old_type, &unused_lb_arg, &old_extent); -+ } - - /* Set up the arguments for MPI_Type_struct constructor */ - type[0] = outer_type; -diff --git a/testpar/t_cache.c b/testpar/t_cache.c -index 5e15ec274c..ca5ded9ecf 100644 ---- a/testpar/t_cache.c -+++ b/testpar/t_cache.c -@@ -1217,15 +1217,15 @@ setup_derived_types(void) - struct mssg_t sample; /* used to compute displacements */ - - /* setup the displacements array */ -- if ( ( MPI_SUCCESS != MPI_Address(&sample.req, &displs[0]) ) || -- ( MPI_SUCCESS != MPI_Address(&sample.src, &displs[1]) ) || -- ( MPI_SUCCESS != MPI_Address(&sample.dest, &displs[2]) ) || -- ( MPI_SUCCESS != MPI_Address(&sample.mssg_num, &displs[3]) ) || -- ( MPI_SUCCESS != MPI_Address(&sample.base_addr, &displs[4]) ) || -- ( MPI_SUCCESS != MPI_Address(&sample.len, &displs[5]) ) || -- ( MPI_SUCCESS != MPI_Address(&sample.ver, &displs[6]) ) || -- ( MPI_SUCCESS != MPI_Address(&sample.count, &displs[7]) ) || -- ( MPI_SUCCESS != MPI_Address(&sample.magic, &displs[8]) ) ) { -+ if ( ( MPI_SUCCESS != MPI_Get_address(&sample.req, &displs[0]) ) || -+ ( MPI_SUCCESS != MPI_Get_address(&sample.src, &displs[1]) ) || -+ ( MPI_SUCCESS != MPI_Get_address(&sample.dest, &displs[2]) ) || -+ ( MPI_SUCCESS != MPI_Get_address(&sample.mssg_num, &displs[3]) ) || -+ ( MPI_SUCCESS != MPI_Get_address(&sample.base_addr, &displs[4]) ) || -+ ( MPI_SUCCESS != MPI_Get_address(&sample.len, &displs[5]) ) || -+ ( MPI_SUCCESS != MPI_Get_address(&sample.ver, &displs[6]) ) || -+ ( MPI_SUCCESS != MPI_Get_address(&sample.count, &displs[7]) ) || -+ ( MPI_SUCCESS != MPI_Get_address(&sample.magic, &displs[8]) ) ) { - - nerrors++; - success = FALSE; -@@ -1245,7 +1245,7 @@ setup_derived_types(void) - - if ( success ) { - -- result = MPI_Type_struct(9, block_len, displs, mpi_types, &mpi_mssg_t); -+ result = MPI_Type_create_struct(9, block_len, displs, mpi_types, &mpi_mssg_t); - - if ( result != MPI_SUCCESS ) { - --- -2.18.1 - diff --git a/nixpkgs/pkgs/tools/misc/hdf5/default.nix b/nixpkgs/pkgs/tools/misc/hdf5/default.nix index ae34cfd32358..e6402322d35a 100644 --- a/nixpkgs/pkgs/tools/misc/hdf5/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdf5/default.nix @@ -16,11 +16,11 @@ assert !cpp || mpi == null; let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { - version = "1.10.4"; + version = "1.10.5"; name = "hdf5-${version}"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${name}/src/${name}.tar.bz2"; - sha256 = "1pr85fa1sh2ky6ai2hs3f21lp252grl2cq3wbyi4rh7dm83gyrqj"; + sha256 = "0i3g6v521vigzbx8wpd32ibsiiw92r65ca3qdbn0d8fj8f4fmmk8"; }; passthru = { @@ -47,10 +47,6 @@ stdenv.mkDerivation rec { patches = [ ./bin-mv.patch - # upstream patches for openmpi-4 compatiblity - # To be removed with the upgrade to 1.10.5 - ./0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch - ./0001-Yanked-all-MPI-1-calls.patch ]; postInstall = '' diff --git a/nixpkgs/pkgs/tools/misc/hexyl/default.nix b/nixpkgs/pkgs/tools/misc/hexyl/default.nix index a672544f1300..a888e9729f19 100644 --- a/nixpkgs/pkgs/tools/misc/hexyl/default.nix +++ b/nixpkgs/pkgs/tools/misc/hexyl/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "hexyl-${version}"; - version = "0.4.0"; + pname = "hexyl"; + version = "0.5.0"; src = fetchFromGitHub { owner = "sharkdp"; - repo = "hexyl"; + repo = pname; rev = "v${version}"; - sha256 = "09h01y0r7km0vgljgc8bgiswbrq47id408vpya2da4mijbg4h82r"; + sha256 = "1b5y2lwcv802hjp105h35vda1d6rgysm9qvrm0v96srm0qqh8rq3"; }; - cargoSha256 = "1zy2jvzx62yjaiq25560krz1648vqwfr5kjbq3wz7nlmf1cs7s2c"; + cargoSha256 = "0lnwkp9jxz7c0jp7w8z2kpl2qkpd1np3s83nim8s6srl6aapc94c"; meta = with stdenv.lib; { description = "A command-line hex viewer"; diff --git a/nixpkgs/pkgs/tools/misc/hpl/default.nix b/nixpkgs/pkgs/tools/misc/hpl/default.nix new file mode 100644 index 000000000000..d9aaefb46d94 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/hpl/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, openblasCompat, mpi } : + +stdenv.mkDerivation rec { + name = "hpl-${version}"; + version = "2.3"; + + src = fetchurl { + url = "http://www.netlib.org/benchmark/hpl/${name}.tar.gz"; + sha256 = "0c18c7fzlqxifz1bf3izil0bczv3a7nsv0dn6winy3ik49yw3i9j"; + }; + + enableParallelBuilding = true; + + postInstall = '' + # only contains the static lib + rm -r $out/lib + + install -D testing/ptest/HPL.dat $out/share/hpl/HPL.dat + ''; + + buildInputs = [ openblasCompat mpi ]; + + meta = with stdenv.lib; { + description = "Portable Implementation of the Linpack Benchmark for Distributed-Memory Computers"; + homepage = http://www.netlib.org/benchmark/hpl/; + platforms = platforms.unix; + license = licenses.bsdOriginal; + maintainers = [ maintainers.markuskowa ]; + }; +} + diff --git a/nixpkgs/pkgs/tools/misc/ipxe/default.nix b/nixpkgs/pkgs/tools/misc/ipxe/default.nix index f2fac5e3d0f9..b06a1c47786f 100644 --- a/nixpkgs/pkgs/tools/misc/ipxe/default.nix +++ b/nixpkgs/pkgs/tools/misc/ipxe/default.nix @@ -3,8 +3,8 @@ }: let - date = "20190310"; - rev = "b6ffe28a21c53a0946d95751c905d9e0b6c3b630"; + date = "20190318"; + rev = "ebf2eaf515e46abd43bc798e7e4ba77bfe529218"; in stdenv.mkDerivation { @@ -13,8 +13,8 @@ stdenv.mkDerivation { buildInputs = [ perl cdrkit syslinux xz openssl ]; src = fetchgit { - url = git://git.ipxe.org/ipxe.git; - sha256 = "1s8sy75lpx8zq60wc0i35d8c1wwm1rq3scxpkq31623d097mch59"; + url = https://git.ipxe.org/ipxe.git; + sha256 = "0if3m8h1nfxy4n37cwlfbc5kand52290v80m4zvjppc81im3nr5g"; inherit rev; }; diff --git a/nixpkgs/pkgs/tools/misc/kisslicer/default.nix b/nixpkgs/pkgs/tools/misc/kisslicer/default.nix index 2ec795e78e90..b6b56e1df937 100644 --- a/nixpkgs/pkgs/tools/misc/kisslicer/default.nix +++ b/nixpkgs/pkgs/tools/misc/kisslicer/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { - name = "kisslicer-1.6.2"; + name = "kisslicer-1.6.3"; src = fetchzip { - url = "http://www.kisslicer.com/uploads/1/5/3/8/15381852/kisslicer_linux64_1.6.2_release.zip"; - sha256 = "0fb7hzic78skq3ykc37srnjsw0yri7m0pb3arlz076ws7jrcbr0f"; + url = "http://www.kisslicer.com/uploads/1/5/3/8/15381852/kisslicer_linux64_1.6.3_release.zip"; + sha256 = "1xmywj5jrcsqv1d5x3mphhvafs4mfm9l12npkhk7l03qxbwg9j82"; stripRoot = false; }; diff --git a/nixpkgs/pkgs/tools/misc/linuxquota/default.nix b/nixpkgs/pkgs/tools/misc/linuxquota/default.nix index dfcefe092008..d489a5188f14 100644 --- a/nixpkgs/pkgs/tools/misc/linuxquota/default.nix +++ b/nixpkgs/pkgs/tools/misc/linuxquota/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, e2fsprogs, openldap, pkgconfig }: stdenv.mkDerivation rec { - version = "4.04"; + version = "4.05"; name = "quota-${version}"; src = fetchurl { url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz"; - sha256 = "1pwfxza923j75z5lx0w89pj09745zi1swy77cm0zalbzgs4f2nvk"; + sha256 = "1fbsrxhhf1ls7i025db7p66yzjr0bqa2c63cni217v8l21fmnfzg"; }; outputs = [ "out" "dev" "doc" "man" ]; diff --git a/nixpkgs/pkgs/tools/misc/logstash/default.nix b/nixpkgs/pkgs/tools/misc/logstash/6.x.nix index 9f3c441ffcd2..359c714228e0 100644 --- a/nixpkgs/pkgs/tools/misc/logstash/default.nix +++ b/nixpkgs/pkgs/tools/misc/logstash/6.x.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; sha256 = if enableUnfree - then "01mkb9fr63m3ilp4cbbjccid5m8yc7iqhnli12ynfabsf7302fdz" - else "0r60183yyywabinsv9pkd8sx0wq68h740xi3172fypjfdcqs0g9c"; + then "18j2n6gnhfjmb6skhhrzs0d1zwa1aj9jv37rqvg4w3fimnm8p0sh" + else "181x8y6izrh587a6d1qipgj8wk71v4fggypkzjkns4my00nki42y"; }; dontBuild = true; diff --git a/nixpkgs/pkgs/tools/misc/logstash/7.x.nix b/nixpkgs/pkgs/tools/misc/logstash/7.x.nix new file mode 100644 index 000000000000..bb4a6b1436be --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/logstash/7.x.nix @@ -0,0 +1,53 @@ +{ elk7Version +, enableUnfree ? true +, stdenv +, fetchurl +, makeWrapper +, jre +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + version = elk7Version; + name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; + sha256 = + if enableUnfree + then "1dzk9amg23vbkj92wx529i1m2rrfjc0gzkbg6w3f6xaix5zch0vp" + else "07q2gbd3xidcklid5ny22zpb3q5v0z3k2kva6g214k7rnkr9bhyy"; + }; + + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + dontPatchShebangs = true; + + buildInputs = [ + makeWrapper jre + ]; + + installPhase = '' + mkdir -p $out + cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out + + patchShebangs $out/bin/logstash + patchShebangs $out/bin/logstash-plugin + + wrapProgram $out/bin/logstash \ + --set JAVA_HOME "${jre}" + + wrapProgram $out/bin/logstash-plugin \ + --set JAVA_HOME "${jre}" + ''; + + meta = with stdenv.lib; { + description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; + homepage = https://www.elastic.co/products/logstash; + license = if enableUnfree then licenses.elastic else licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ wjlroe offline basvandijk ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/lolcat/Gemfile.lock b/nixpkgs/pkgs/tools/misc/lolcat/Gemfile.lock index 58f62b64e718..e1e60663a270 100644 --- a/nixpkgs/pkgs/tools/misc/lolcat/Gemfile.lock +++ b/nixpkgs/pkgs/tools/misc/lolcat/Gemfile.lock @@ -1,13 +1,13 @@ GEM remote: http://rubygems.org/ specs: - lolcat (99.9.19) + lolcat (99.9.69) manpages (~> 0.6.1) + optimist (~> 3.0.0) paint (~> 2.0.0) - trollop (~> 2.1.3) manpages (0.6.1) - paint (2.0.1) - trollop (2.1.3) + optimist (3.0.0) + paint (2.0.3) PLATFORMS ruby @@ -16,4 +16,4 @@ DEPENDENCIES lolcat BUNDLED WITH - 1.14.6 + 1.16.3 diff --git a/nixpkgs/pkgs/tools/misc/lolcat/gemset.nix b/nixpkgs/pkgs/tools/misc/lolcat/gemset.nix index 3e68f307530e..9e351eecb829 100644 --- a/nixpkgs/pkgs/tools/misc/lolcat/gemset.nix +++ b/nixpkgs/pkgs/tools/misc/lolcat/gemset.nix @@ -1,12 +1,12 @@ { lolcat = { - dependencies = ["manpages" "paint" "trollop"]; + dependencies = ["manpages" "optimist" "paint"]; source = { remotes = ["http://rubygems.org"]; - sha256 = "05zm92ad0ws9fklpz1xk94hy95argwana01c6rr2xbx2q4mcil9m"; + sha256 = "0d1yh2ikyhyh7am4qznd6fzv2pyvk82xrnsrsbbyxzcqfz9x6aa9"; type = "gem"; }; - version = "99.9.19"; + version = "99.9.69"; }; manpages = { source = { @@ -16,20 +16,20 @@ }; version = "0.6.1"; }; - paint = { + optimist = { source = { remotes = ["http://rubygems.org"]; - sha256 = "1gnh9cihc84w4xbw51pg15crjvhblbq6nkzljrp7kmn3434nsg0d"; + sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j"; type = "gem"; }; - version = "2.0.1"; + version = "3.0.0"; }; - trollop = { + paint = { source = { remotes = ["http://rubygems.org"]; - sha256 = "1rzx9rkacpq58dsvbbzs4cpybls1v1h36xskkfs5q2askpdr00wq"; + sha256 = "0ldb269l3pzkihmsws19cr9h3l6naw8c2fqpav8ck3nllnyiv7r2"; type = "gem"; }; - version = "2.1.3"; + version = "2.0.3"; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/tools/misc/papis/default.nix b/nixpkgs/pkgs/tools/misc/papis/default.nix deleted file mode 100644 index f1589fc8c3b0..000000000000 --- a/nixpkgs/pkgs/tools/misc/papis/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, fetchFromGitHub, fetchpatch -, python3, xdg_utils -}: - -python3.pkgs.buildPythonApplication rec { - pname = "papis"; - version = "0.8.2"; - - # Missing tests on Pypi - src = fetchFromGitHub { - owner = "papis"; - repo = pname; - rev = "v${version}"; - sha256 = "0sa4hpgjvqkjcmp9bjr27b5m5jg4pfspdc8nf1ny80sr0kzn72hb"; - }; - - propagatedBuildInputs = with python3.pkgs; [ - requests filetype pyparsing configparser arxiv2bib - pyyaml chardet beautifulsoup4 colorama bibtexparser - pylibgen click python-slugify habanero isbnlib - prompt_toolkit pygments - # optional dependencies - jinja2 whoosh - ]; - - checkInputs = (with python3.pkgs; [ - pytest - ]) ++ [ - xdg_utils - ]; - - # most of the downloader tests and 4 other tests require a network connection - checkPhase = '' - HOME=$(mktemp -d) pytest papis tests --ignore tests/downloaders \ - -k "not test_get_data and not test_doi_to_data and not test_general and not get_document_url" - ''; - - meta = { - description = "Powerful command-line document and bibliography manager"; - homepage = http://papis.readthedocs.io/en/latest/; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.nico202 ]; - }; -} diff --git a/nixpkgs/pkgs/tools/misc/pdd/default.nix b/nixpkgs/pkgs/tools/misc/pdd/default.nix index da595e0591a4..f94d2cc27379 100644 --- a/nixpkgs/pkgs/tools/misc/pdd/default.nix +++ b/nixpkgs/pkgs/tools/misc/pdd/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "pdd"; - version = "1.3.1"; + version = "1.4"; src = fetchFromGitHub { owner = "jarun"; repo = "pdd"; rev = "v${version}"; - sha256 = "0kl6d9nivf6jj1j70alz64iwbp3ip9rg4x506nannii2cfmmx5wr"; + sha256 = "1cirb8mmxxadks7az6a3a4sp8djv45cwa9dx0zrarzfmw0x7xb9g"; }; format = "other"; diff --git a/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/nixpkgs/pkgs/tools/misc/plantuml/default.nix index dd9b6d0b260b..4619d05c4c6a 100644 --- a/nixpkgs/pkgs/tools/misc/plantuml/default.nix +++ b/nixpkgs/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2019.2"; + version = "1.2019.4"; name = "plantuml-${version}"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "17b9nwj0r4nbajql611lhy1kkgzigq8p8hkyv90psm7avwyd7fk2"; + sha256 = "0kd0f7kknl6x1dibh4gsx3pl58bzylx42lxwmh9zv4d53gm6a93r"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/misc/powerline-go/default.nix b/nixpkgs/pkgs/tools/misc/powerline-go/default.nix index b0d1afc654d8..10972d9fa894 100644 --- a/nixpkgs/pkgs/tools/misc/powerline-go/default.nix +++ b/nixpkgs/pkgs/tools/misc/powerline-go/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "powerline-go"; - version = "1.11.0"; + version = "1.12.1"; name = "${pname}-${version}"; rev = "v${version}"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "justjanne"; repo = pname; inherit rev; - sha256 = "1s3d9p4jf23n63n6vx3frnw3wkmg3kyiazapixy66790qkx6ddi9"; + sha256 = "0r2n3hjgr7c7nwwcph7i2lv3709z9cyc8gmsinlzjwny998akyf4"; }; goDeps = ./deps.nix; diff --git a/nixpkgs/pkgs/tools/misc/powerline-go/deps.nix b/nixpkgs/pkgs/tools/misc/powerline-go/deps.nix index e033a1cf48cf..85bf229a2697 100644 --- a/nixpkgs/pkgs/tools/misc/powerline-go/deps.nix +++ b/nixpkgs/pkgs/tools/misc/powerline-go/deps.nix @@ -1,12 +1,12 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ { goPackagePath = "github.com/mattn/go-runewidth"; fetch = { type = "git"; url = "https://github.com/mattn/go-runewidth"; - rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; - sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; + rev = "703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211"; + sha256 = "0znpyz71gajx3g0j2zp63nhjj2c07g16885vxv4ykwnrfmzbgk4w"; }; } { @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/shirou/gopsutil"; - rev = "57f370e13068146efe1cb7129f79e5d51da8a242"; - sha256 = "1ij0bbnfjj65afin8vhccr3cxvg6r0awmvcvb2ilza5wbbsslggb"; + rev = "2cbc9195c892b304060269ef280375236d2fcac9"; + sha256 = "1m66hhh37lxn525y2gnmh4ipc88c3wfiixr5ydywa9v1z90wxw5r"; }; } { @@ -23,8 +23,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "2d027ae1dddd4694d54f7a8b6cbe78dca8720226"; - sha256 = "1fdab3scp9fm88jxwjw8a3hh5ykx6ads3zcacgy48k2n6b0rqrdw"; + rev = "38d8ce5564a5b71b2e3a00553993f1b9a7ae852f"; + sha256 = "1x52liy2540pw75sqsw4vpg41vq2dnmqpc0j5r7k6jxv6xmbr5mb"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "9950ad118b73f9207b991f01920a3509c68f7f2b"; - sha256 = "1607m89kpdxgc2lj14mrp02bg7c42g1zv0fzrl5961gvm5qzbjja"; + rev = "4b34438f7a67ee5f45cc6132e2bad873a20324e9"; + sha256 = "1xnsiaikz62wqjpaly1j4nqwp504gih5mgw9wdj1pp1d4bmx0vl0"; }; } { @@ -41,8 +41,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "7dd2c8130f5e924233f5543598300651c386d431"; - sha256 = "0ja6skzplirb7dgf5d4wi0navinf8j5iakak020lwm7287wnpcrg"; + rev = "f4905fbd45b6790792202848439271c74074bbfd"; + sha256 = "184d6ap2g92jvx0532lymdqbnx9vi9ips4dq5lnqbby0caccc6r1"; }; } { @@ -50,8 +50,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; }; } ] diff --git a/nixpkgs/pkgs/tools/misc/pspg/default.nix b/nixpkgs/pkgs/tools/misc/pspg/default.nix index 597d0b566d9e..7f9638a3ffc7 100644 --- a/nixpkgs/pkgs/tools/misc/pspg/default.nix +++ b/nixpkgs/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pspg-${version}"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "okbob"; repo = "pspg"; rev = "${version}"; - sha256 = "1k2nnq15h5grymiylnh1iqipxn315paq58habfmaix2zlj3n3dy2"; + sha256 = "0j9qn516j0fdz1x196xsdai3qk3jmlamm53zvngqjbjzdfkdclqw"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/misc/sl/default.nix b/nixpkgs/pkgs/tools/misc/sl/default.nix index 4299073d96ba..641a0c3e3652 100644 --- a/nixpkgs/pkgs/tools/misc/sl/default.nix +++ b/nixpkgs/pkgs/tools/misc/sl/default.nix @@ -7,29 +7,30 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "eyJhb"; repo = "sl"; - rev = "${version}"; + rev = version; sha256 = "029lv6vw39c7gj8bkfyqs8q4g32174vbmghhhgfk8wrhnxq60qn7"; }; buildInputs = [ ncurses ]; - buildFlags = [ "CC=cc" ]; - installPhase = '' - mkdir -p $out/bin $out/share/man/man1 - cp sl $out/bin - cp sl.1 $outputMan + runHook preInstall + + install -Dm755 -t $out/bin sl + install -Dm644 -t $out/share/man/man1 sl.1{,.ja} + + runHook postInstall ''; meta = with stdenv.lib; { + description = "Steam Locomotive runs across your terminal when you type 'sl'"; homepage = http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html; license = rec { shortName = "Toyoda Masashi's free software license"; fullName = shortName; url = https://github.com/eyJhb/sl/blob/master/LICENSE; }; - maintainers = [ maintainers.eyjhb ]; - description = "Steam Locomotive runs across your terminal when you type 'sl'"; + maintainers = with maintainers; [ eyjhb ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix b/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix index 4cbb2943d3cf..eed527da4168 100644 --- a/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "1.8.2"; + version = "1.8.3"; name = "ttfautohint-${version}"; src = fetchurl { url = "mirror://savannah/freetype/${name}.tar.gz"; - sha256 = "19w9g1ksr0vyblgcirppj0279gfj5s902jblzgav5a4n2mq42rrq"; + sha256 = "0zpqgihn3yh3v51ynxwr8asqrijvs4gv686clwv7bm8sawr4kfw7"; }; postAutoreconf = '' diff --git a/nixpkgs/pkgs/tools/misc/vdirsyncer/stable.nix b/nixpkgs/pkgs/tools/misc/vdirsyncer/stable.nix new file mode 100644 index 000000000000..ac950894035b --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/vdirsyncer/stable.nix @@ -0,0 +1,52 @@ +{ lib, python3Packages, fetchpatch }: + +# Packaging documentation at: +# https://github.com/pimutils/vdirsyncer/blob/0.16.7/docs/packaging.rst +python3Packages.buildPythonApplication rec { + version = "0.16.7"; + pname = "vdirsyncer"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "6c9bcfb9bcb01246c83ba6f8551cf54c58af3323210755485fc23bb7848512ef"; + }; + + propagatedBuildInputs = with python3Packages; [ + click click-log click-threading + requests_toolbelt + requests + requests_oauthlib # required for google oauth sync + atomicwrites + ]; + + nativeBuildInputs = with python3Packages; [ setuptools_scm ]; + + checkInputs = with python3Packages; [ hypothesis pytest pytest-localserver pytest-subtesthack ]; + + patches = [ + # Fixes for hypothesis: https://github.com/pimutils/vdirsyncer/pull/779 + (fetchpatch { + url = https://github.com/pimutils/vdirsyncer/commit/22ad88a6b18b0979c5d1f1d610c1d2f8f87f4b89.patch; + sha256 = "0dbzj6jlxhdidnm3i21a758z83sdiwzhpd45pbkhycfhgmqmhjpl"; + }) + ]; + + postPatch = '' + # Invalid argument: 'perform_health_check' is not a valid setting + substituteInPlace tests/conftest.py \ + --replace "perform_health_check=False" "" + substituteInPlace tests/unit/test_repair.py \ + --replace $'@settings(perform_health_check=False) # Using the random module for UIDs\n' "" + ''; + + checkPhase = '' + make DETERMINISTIC_TESTS=true test + ''; + + meta = with lib; { + homepage = https://github.com/pimutils/vdirsyncer; + description = "Synchronize calendars and contacts"; + license = licenses.mit; + maintainers = with maintainers; [ loewenheim ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix b/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix index b5bb97ce5724..d3cca59bf190 100644 --- a/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix +++ b/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2019.04.01"; + version = "2019.04.07"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0srh04k0p088rxbyxvnhngqyymwqhykqv02sdaqvkl9jhp43r0sm"; + sha256 = "1krx4y8nzpaqpq9qs8dnv2y988jpdccyfl9sdx9wrb0baycl119k"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/networking/airfield/deps.sh b/nixpkgs/pkgs/tools/networking/airfield/deps.sh index 216e3c11a9a2..77648e2fbfbc 100755 --- a/nixpkgs/pkgs/tools/networking/airfield/deps.sh +++ b/nixpkgs/pkgs/tools/networking/airfield/deps.sh @@ -1,6 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix -node2nix -6 -i deps.json \ +node2nix -8 -i deps.json \ --no-copy-node-env \ -e ../../../development/node-packages/node-env.nix -c node.nix diff --git a/nixpkgs/pkgs/tools/networking/airfield/node-packages.nix b/nixpkgs/pkgs/tools/networking/airfield/node-packages.nix index 13edd48e37d2..eb54c4248cb8 100644 --- a/nixpkgs/pkgs/tools/networking/airfield/node-packages.nix +++ b/nixpkgs/pkgs/tools/networking/airfield/node-packages.nix @@ -4,22 +4,22 @@ let sources = { - "ajv-5.5.2" = { + "ajv-6.10.0" = { name = "ajv"; packageName = "ajv"; - version = "5.5.2"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz"; - sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz"; + sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; }; }; - "asn1-0.2.3" = { + "asn1-0.2.4" = { name = "asn1"; packageName = "asn1"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; - sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; "assert-plus-1.0.0" = { @@ -49,22 +49,22 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.7.0" = { + "aws4-1.8.0" = { name = "aws4"; packageName = "aws4"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz"; - sha512 = "32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"; + sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="; }; }; - "bcrypt-pbkdf-1.0.1" = { + "bcrypt-pbkdf-1.0.2" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; - sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; "buffer-crc32-0.1.1" = { @@ -94,22 +94,13 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "co-4.6.0" = { - name = "co"; - packageName = "co"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; - sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; - }; - }; - "combined-stream-1.0.6" = { + "combined-stream-1.0.7" = { name = "combined-stream"; packageName = "combined-stream"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; - sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"; + sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w=="; }; }; "commander-0.6.1" = { @@ -175,13 +166,13 @@ let sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; }; }; - "debug-3.1.0" = { + "debug-4.1.1" = { name = "debug"; packageName = "debug"; - version = "3.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; + url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"; + sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; }; }; "delayed-stream-1.0.0" = { @@ -202,22 +193,22 @@ let sha1 = "103d3527fd31528f40188130c841efdd78264e5c"; }; }; - "ecc-jsbn-0.1.1" = { + "ecc-jsbn-0.1.2" = { name = "ecc-jsbn"; packageName = "ecc-jsbn"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; - sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; }; }; - "extend-3.0.1" = { + "extend-3.0.2" = { name = "extend"; packageName = "extend"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"; - sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"; + url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; }; }; "extsprintf-1.3.0" = { @@ -229,13 +220,13 @@ let sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; - "fast-deep-equal-1.1.0" = { + "fast-deep-equal-2.0.1" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; - version = "1.1.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz"; - sha1 = "c053477817c86b51daa853c81e059b733d023614"; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; + sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; }; }; "fast-json-stable-stringify-2.0.0" = { @@ -256,13 +247,13 @@ let sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; }; }; - "form-data-2.3.2" = { + "form-data-2.3.3" = { name = "form-data"; packageName = "form-data"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz"; - sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; "formidable-1.0.11" = { @@ -301,13 +292,13 @@ let sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; }; }; - "har-validator-5.0.3" = { + "har-validator-5.1.3" = { name = "har-validator"; packageName = "har-validator"; - version = "5.0.3"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz"; - sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; }; }; "http-signature-1.2.0" = { @@ -355,13 +346,13 @@ let sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; - "json-schema-traverse-0.3.1" = { + "json-schema-traverse-0.4.1" = { name = "json-schema-traverse"; packageName = "json-schema-traverse"; - version = "0.3.1"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; - sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; }; "json-stringify-safe-5.0.1" = { @@ -382,13 +373,13 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; - "lodash-4.17.10" = { + "lodash-4.17.11" = { name = "lodash"; packageName = "lodash"; - version = "4.17.10"; + version = "4.17.11"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz"; - sha512 = "UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz"; + sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="; }; }; "methods-0.0.1" = { @@ -409,22 +400,22 @@ let sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365"; }; }; - "mime-db-1.33.0" = { + "mime-db-1.38.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.33.0"; + version = "1.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz"; - sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz"; + sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="; }; }; - "mime-types-2.1.18" = { + "mime-types-2.1.22" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.18"; + version = "2.1.22"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz"; - sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz"; + sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog=="; }; }; "mkdirp-0.3.3" = { @@ -436,22 +427,22 @@ let sha1 = "595e251c1370c3a68bab2136d0e348b8105adf13"; }; }; - "ms-2.0.0" = { + "ms-2.1.1" = { name = "ms"; packageName = "ms"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; + sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; }; }; - "oauth-sign-0.8.2" = { + "oauth-sign-0.9.0" = { name = "oauth-sign"; packageName = "oauth-sign"; - version = "0.8.2"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; - sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; }; "pause-0.0.1" = { @@ -472,6 +463,15 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; + "psl-1.1.31" = { + name = "psl"; + packageName = "psl"; + version = "1.1.31"; + src = fetchurl { + url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"; + sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="; + }; + }; "punycode-1.4.1" = { name = "punycode"; packageName = "punycode"; @@ -481,6 +481,15 @@ let sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; }; }; + "punycode-2.1.1" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + }; + }; "qs-0.5.1" = { name = "qs"; packageName = "qs"; @@ -517,13 +526,13 @@ let sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A=="; }; }; - "redis-commands-1.3.5" = { + "redis-commands-1.4.0" = { name = "redis-commands"; packageName = "redis-commands"; - version = "1.3.5"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.5.tgz"; - sha512 = "foGF8u6MXGFF++1TZVC6icGXuMYPftKXt1FBT2vrfU9ZATNtZJ8duRC5d1lEfE8hyVe3jhelHGB91oB7I6qLsA=="; + url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.4.0.tgz"; + sha512 = "cu8EF+MtkwI4DLIT0x9P8qNTLFhQD4jLfxLR0cCNkeGzs87FN6879JOJwNQR/1zD7aSYNbU0hgsV9zGY71Itvw=="; }; }; "redis-parser-2.6.0" = { @@ -562,22 +571,22 @@ let sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640"; }; }; - "sshpk-1.14.2" = { + "sshpk-1.16.1" = { name = "sshpk"; packageName = "sshpk"; - version = "1.14.2"; + version = "1.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz"; - sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; }; }; - "tough-cookie-2.3.4" = { + "tough-cookie-2.4.3" = { name = "tough-cookie"; packageName = "tough-cookie"; - version = "2.3.4"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz"; - sha512 = "TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA=="; + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; + sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; }; }; "tunnel-agent-0.6.0" = { @@ -607,13 +616,22 @@ let sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="; }; }; - "uuid-3.3.0" = { + "uri-js-4.2.2" = { + name = "uri-js"; + packageName = "uri-js"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; + sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; + }; + }; + "uuid-3.3.2" = { name = "uuid"; packageName = "uuid"; - version = "3.3.0"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.3.0.tgz"; - sha512 = "ijO9N2xY/YaOqQ5yz5c4sy2ZjWmA6AR6zASb/gdpeKZ8+948CxwfMW9RrKVk5may6ev8c0/Xguu32e2Llelpqw=="; + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; + sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; }; }; "verror-1.10.0" = { @@ -644,13 +662,13 @@ in sources."cookie-0.0.5" sources."cookie-signature-0.0.1" sources."crc-0.2.0" - sources."debug-3.1.0" + sources."debug-4.1.1" sources."formidable-1.0.11" sources."fresh-0.1.0" sources."methods-0.0.1" sources."mime-1.2.6" sources."mkdirp-0.3.3" - sources."ms-2.0.0" + sources."ms-2.1.1" sources."pause-0.0.1" sources."qs-0.5.1" sources."range-parser-0.0.4" @@ -661,7 +679,7 @@ in description = "Sinatra inspired web development framework"; }; production = true; - bypassCache = false; + bypassCache = true; }; "swig-0.14.0" = nodeEnv.buildNodePackage { name = "swig"; @@ -679,7 +697,7 @@ in description = "A fast django-like templating engine for node.js and browsers."; }; production = true; - bypassCache = false; + bypassCache = true; }; "consolidate-0.10.0" = nodeEnv.buildNodePackage { name = "consolidate"; @@ -695,7 +713,7 @@ in homepage = https://github.com/visionmedia/consolidate.js; }; production = true; - bypassCache = false; + bypassCache = true; }; redis = nodeEnv.buildNodePackage { name = "redis"; @@ -707,7 +725,7 @@ in }; dependencies = [ sources."double-ended-queue-2.1.0-0" - sources."redis-commands-1.3.5" + sources."redis-commands-1.4.0" sources."redis-parser-2.6.0" ]; buildInputs = globalBuildInputs; @@ -717,22 +735,22 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; connect-redis = nodeEnv.buildNodePackage { name = "connect-redis"; packageName = "connect-redis"; - version = "3.3.3"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/connect-redis/-/connect-redis-3.3.3.tgz"; - sha512 = "rpWsW2uk1uOe/ccY/JvW+RiLrhZm7auIx8z4yR+KXemFTIhJyD58jXiJbI0E/fZCnybawpdSqOZ+6/ah6aBeyg=="; + url = "https://registry.npmjs.org/connect-redis/-/connect-redis-3.4.1.tgz"; + sha512 = "oXNcpLg/PJ6G4gbhyGwrQK9mUQTKYa2aEnOH9kWIxbNUjIFPqUmzz75RdLp5JTPSjrBVcz+9ll4sSxfvlW0ZLA=="; }; dependencies = [ - sources."debug-3.1.0" + sources."debug-4.1.1" sources."double-ended-queue-2.1.0-0" - sources."ms-2.0.0" + sources."ms-2.1.1" sources."redis-2.8.0" - sources."redis-commands-1.3.5" + sources."redis-commands-1.4.0" sources."redis-parser-2.6.0" ]; buildInputs = globalBuildInputs; @@ -742,18 +760,18 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; async = nodeEnv.buildNodePackage { name = "async"; packageName = "async"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.1.tgz"; - sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ=="; + url = "https://registry.npmjs.org/async/-/async-2.6.2.tgz"; + sha512 = "H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg=="; }; dependencies = [ - sources."lodash-4.17.10" + sources."lodash-4.17.11" ]; buildInputs = globalBuildInputs; meta = { @@ -762,61 +780,66 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; request = nodeEnv.buildNodePackage { name = "request"; packageName = "request"; - version = "2.87.0"; + version = "2.88.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz"; - sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw=="; + url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; + sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; }; dependencies = [ - sources."ajv-5.5.2" - sources."asn1-0.2.3" + sources."ajv-6.10.0" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" - sources."bcrypt-pbkdf-1.0.1" + sources."aws4-1.8.0" + sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" - sources."co-4.6.0" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.1" - sources."extend-3.0.1" + sources."ecc-jsbn-0.1.2" + sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + sources."form-data-2.3.3" sources."getpass-0.1.7" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" + sources."har-validator-5.1.3" sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" - sources."oauth-sign-0.8.2" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" + sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sshpk-1.14.2" - sources."tough-cookie-2.3.4" + sources."sshpk-1.16.1" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uuid-3.3.0" + sources."uri-js-4.2.2" + sources."uuid-3.3.2" sources."verror-1.10.0" ]; buildInputs = globalBuildInputs; @@ -826,6 +849,6 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/tools/networking/airfield/node.nix b/nixpkgs/pkgs/tools/networking/airfield/node.nix index 8f3be4cc8c7f..29d77f0bf9a6 100644 --- a/nixpkgs/pkgs/tools/networking/airfield/node.nix +++ b/nixpkgs/pkgs/tools/networking/airfield/node.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/nixpkgs/pkgs/tools/networking/aria2/default.nix b/nixpkgs/pkgs/tools/networking/aria2/default.nix index 2cf735328974..8d9ec9288114 100644 --- a/nixpkgs/pkgs/tools/networking/aria2/default.nix +++ b/nixpkgs/pkgs/tools/networking/aria2/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchpatch, fetchFromGitHub, pkgconfig, autoreconfHook , openssl, c-ares, libxml2, sqlite, zlib, libssh2 -, cppunit +, cppunit, sphinx , Security }: @@ -23,13 +23,17 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkgconfig autoreconfHook sphinx ]; buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ] ++ stdenv.lib.optional stdenv.isDarwin Security; configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" ]; + prePatch = '' + patchShebangs doc/manual-src/en/mkapiref.py + ''; + checkInputs = [ cppunit ]; doCheck = false; # needs the net diff --git a/nixpkgs/pkgs/tools/networking/autossh/default.nix b/nixpkgs/pkgs/tools/networking/autossh/default.nix index 3ff06960156a..55b464607b11 100644 --- a/nixpkgs/pkgs/tools/networking/autossh/default.nix +++ b/nixpkgs/pkgs/tools/networking/autossh/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.harding.motd.ca/autossh/; + homepage = https://www.harding.motd.ca/autossh/; description = "Automatically restart SSH sessions and tunnels"; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; diff --git a/nixpkgs/pkgs/tools/networking/boringtun/default.nix b/nixpkgs/pkgs/tools/networking/boringtun/default.nix new file mode 100644 index 000000000000..c7ddb44d0fe5 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/boringtun/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "boringtun"; + # "boringtun" is still undergoing review for security concerns. + # The GitHub page does not show any release yet, + # use 20190407 as version number to indicate that it is an unstable version. + version = "20190407"; + + src = fetchFromGitHub { + owner = "cloudflare"; + repo = pname; + rev = "b040eb4fd1591b1d5ceb07c6cbb0856553f50adc"; + sha256 = "04i53dvxld2a0xzr0gfl895rcwfvisj1rfs7rl0444gml8s8xyb3"; + }; + + cargoSha256 = "0mqgd5r3rdzaw3vkmz0rswn3cwq9b4im6g4rrq7wr7pgrzq96xwm"; + + # To prevent configuration phase error that is caused by + # lacking a new line in file ".cargo/config", + # we append a new line to the end of file. + preConfigure = "echo '' >> .cargo/config"; + + # Testing this project requires sudo, Docker and network access, etc. + doCheck = false; + + meta = with stdenv.lib; { + description = "Userspace WireGuard® implementation in Rust"; + homepage = https://github.com/cloudflare/boringtun; + license = licenses.bsd3; + maintainers = with maintainers; [ xrelkd ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/brook/default.nix b/nixpkgs/pkgs/tools/networking/brook/default.nix new file mode 100644 index 000000000000..b840628e2151 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/brook/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "brook"; + version = "20190401"; + + goPackagePath = "github.com/txthinking/brook"; + + src = fetchFromGitHub { + owner = "txthinking"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "0kx0dpvr3llpdzmw5bvzhdvwkmzrv6kqbsilx6rgrvyl61y9pyry"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://github.com/txthinking/brook; + description = "A cross-platform Proxy/VPN software"; + license = with licenses; [ gpl3 ]; + platforms = platforms.linux; + maintainers = with maintainers; [ xrelkd ]; + }; +} + diff --git a/nixpkgs/pkgs/tools/networking/brook/deps.nix b/nixpkgs/pkgs/tools/networking/brook/deps.nix new file mode 100644 index 000000000000..68fffd34e2a3 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/brook/deps.nix @@ -0,0 +1,173 @@ +[ + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "a1c7408de3f632d86eee604a3bb755f1ffb68226"; + sha256 = "1fq0amfgpccf35nll7xw0k6smwrb7h0wy62n70kfd9kvh64n8hbn"; + }; + } + { + goPackagePath = "github.com/bitly/go-simplejson"; + fetch = { + type = "git"; + url = "https://github.com/bitly/go-simplejson"; + rev = "9db4a59bd4d803ae0c173a7d8a538e056cd59d57"; + sha256 = "0cbnjzjq55jnzk07zdk7nb96yzgpyawm1r6km3xignn8ih4bnn6g"; + }; + } + { + goPackagePath = "github.com/fatih/structs"; + fetch = { + type = "git"; + url = "https://github.com/fatih/structs"; + rev = "878a968ab22548362a09bdb3322f98b00f470d46"; + sha256 = "15nkffa8ylr5kkv52gyry675l8bzv3c0xx39j0fzz0vp2kcjyy8x"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "93c3765e9bb2e29c6a63277c9f829dae34ec24eb"; + sha256 = "043yalxp97vc9xsd5npms0h6slxrlzf8dzvd9l0wcxa8v0cl9lp6"; + }; + } + { + goPackagePath = "github.com/jinzhu/inflection"; + fetch = { + type = "git"; + url = "https://github.com/jinzhu/inflection"; + rev = "04140366298a54a039076d798123ffa108fff46c"; + sha256 = "1s4qcnwaajp3c5ykwx4dfy32hykwsm0ki7kx8lcw8b0z0grkz6qh"; + }; + } + { + goPackagePath = "github.com/jmoiron/sqlx"; + fetch = { + type = "git"; + url = "https://github.com/jmoiron/sqlx"; + rev = "1d3423c595d749e4613fce663591b44ae539d377"; + sha256 = "0947211fqibv9sqsk22lfnk080vqnsxmsan9fff5phygbmzbhzzb"; + }; + } + { + goPackagePath = "github.com/mdp/qrterminal"; + fetch = { + type = "git"; + url = "https://github.com/mdp/qrterminal"; + rev = "28b49810f53911623d0a538d8edc01b8cbe2bd0e"; + sha256 = "17dq5niw57r1iq1rn1crpgbq1ydrcxqpzc9gj7dd1snc0p9n1rv1"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "73601d4aed9d844322611759d7f3619110b7c88e"; + sha256 = "1frnj97bbch1qhg55fx2yz6mdjsz8fw94sj7pkrjms239j7vqcvm"; + }; + } + { + goPackagePath = "github.com/patrickmn/go-cache"; + fetch = { + type = "git"; + url = "https://github.com/patrickmn/go-cache"; + rev = "5633e0862627c011927fa39556acae8b1f1df58a"; + sha256 = "1zjk6yvig68zcbipa85dxz9xa82fk4zp4q33hwzxdv6h68wga5bs"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "7bfe4c7ecddb3666a94b053b422cdd8f5aaa3615"; + sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; + }; + } + { + goPackagePath = "github.com/txthinking/gotun2socks"; + fetch = { + type = "git"; + url = "https://github.com/txthinking/gotun2socks"; + rev = "35016fdae05e78db993d43f55eb96ddbe3958252"; + sha256 = "11rl8pqyd6jzi5alpymzi0i5q7pk2492di44v85g7r24y6livrjg"; + }; + } + { + goPackagePath = "github.com/txthinking/mailx"; + fetch = { + type = "git"; + url = "https://github.com/txthinking/mailx"; + rev = "ebc2af2e1aa8d2178c30786c18eb138fbe40010d"; + sha256 = "02h5b922savsljcgjz3gxkydk52zd2gbs51prz88l60n6miv9k70"; + }; + } + { + goPackagePath = "github.com/txthinking/socks5"; + fetch = { + type = "git"; + url = "https://github.com/txthinking/socks5"; + rev = "254e122c4eaf8657900905ed5bed5777870b9df8"; + sha256 = "1q43sxzacj216mdzl44khhx51w1z78jpraw955dnjv9va0zqbhmi"; + }; + } + { + goPackagePath = "github.com/txthinking/x"; + fetch = { + type = "git"; + url = "https://github.com/txthinking/x"; + rev = "e13a838cdc21596c45b4e6b6fd15c822597c9ae3"; + sha256 = "0l5gzhy3h3qynfkgd789hxkv433yqdn1mmk945bwjha7vrm4rx2z"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "38d8ce5564a5b71b2e3a00553993f1b9a7ae852f"; + sha256 = "1x52liy2540pw75sqsw4vpg41vq2dnmqpc0j5r7k6jxv6xmbr5mb"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "eb5bcb51f2a31c7d5141d810b70815c05d9c9146"; + sha256 = "17k4g8krxbl84gzcs275b7gsh66dzm15fdxivjnx9xz8q84l4kby"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "31e7599a6c37728c25ca34167be099d072ad335d"; + sha256 = "18i17j7nkkc5dl9rpzm8l345r409hfj4knfnldar684337x1irrf"; + }; + } + { + goPackagePath = "gopkg.in/russross/blackfriday.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/russross/blackfriday.v2"; + rev = "d3b5b032dc8e8927d31a5071b56e14c89f045135"; + sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j"; + }; + } + { + goPackagePath = "rsc.io/qr"; + fetch = { + type = "git"; + url = "https://github.com/rsc/qr"; + rev = "ca9a01fc2f9505024045632c50e5e8cd6142fafe"; + sha256 = "04yx493g0fqp8i59zjxnl4k3s0cl0kr5m8xh0ph8m10r1hkw0xr3"; + }; + } +] diff --git a/nixpkgs/pkgs/tools/networking/burpsuite/default.nix b/nixpkgs/pkgs/tools/networking/burpsuite/default.nix index 6c440fc48fd8..993e9ad74692 100644 --- a/nixpkgs/pkgs/tools/networking/burpsuite/default.nix +++ b/nixpkgs/pkgs/tools/networking/burpsuite/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jre, runtimeShell }: let - version = "1.7.23"; + version = "1.7.36"; jar = fetchurl { name = "burpsuite.jar"; url = "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar"; - sha256 = "1y83qisn9pkn88vphpli7h8nacv8jv3sq0h04zbri25nfkgvl4an"; + sha256 = "12m4fn04yd89r6x4m4yd668p5v0bs9b1h6p239bjj11ykyi3g51a"; }; launcher = '' #!${runtimeShell} diff --git a/nixpkgs/pkgs/tools/networking/connman/default.nix b/nixpkgs/pkgs/tools/networking/connman/default.nix index e960f8c3a848..a4e8c17a545e 100644 --- a/nixpkgs/pkgs/tools/networking/connman/default.nix +++ b/nixpkgs/pkgs/tools/networking/connman/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "connman-${version}"; - version = "1.36"; + version = "1.37"; src = fetchurl { url = "mirror://kernel/linux/network/connman/${name}.tar.xz"; - sha256 = "0x00dq5c2frz06md3g5y0jh5kbcj2hrfl5qjcqga8gs4ri0xp2f7"; + sha256 = "05kfjiqhqfmbbwc4snnyvi5hc4zxanac62f6gcwaf5mvn0z9pqkc"; }; buildInputs = [ openconnect polkit diff --git a/nixpkgs/pkgs/tools/networking/dropbear/default.nix b/nixpkgs/pkgs/tools/networking/dropbear/default.nix index 32d55d2009a5..c51f0a4fdf02 100644 --- a/nixpkgs/pkgs/tools/networking/dropbear/default.nix +++ b/nixpkgs/pkgs/tools/networking/dropbear/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "dropbear-2018.76"; + name = "dropbear-2019.78"; src = fetchurl { url = "https://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; - sha256 = "0rgavbzw7jrs5wslxm0dnwx2m409yzxd9hazd92r7kx8xikr3yzj"; + sha256 = "19242qlr40pbqfqd0gg6h8qpj38q6lgv03ja6sahj9vj2abnanaj"; }; dontDisableStatic = enableStatic; diff --git a/nixpkgs/pkgs/tools/networking/gmrender-resurrect/default.nix b/nixpkgs/pkgs/tools/networking/gmrender-resurrect/default.nix index 6926f1522c71..6fdcfaa70db0 100644 --- a/nixpkgs/pkgs/tools/networking/gmrender-resurrect/default.nix +++ b/nixpkgs/pkgs/tools/networking/gmrender-resurrect/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation { homepage = https://github.com/hzeller/gmrender-resurrect; license = licenses.gpl2; platforms = platforms.linux; + broken = true; maintainers = [ maintainers.koral ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/i2pd/default.nix b/nixpkgs/pkgs/tools/networking/i2pd/default.nix index b2826a5cbc6b..8c71018ba869 100644 --- a/nixpkgs/pkgs/tools/networking/i2pd/default.nix +++ b/nixpkgs/pkgs/tools/networking/i2pd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.23.0"; + version = "2.24.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "0sw9fjamd5wjrsxnxsih9532yf6x3rrjmv5ybskkpk7b6acyqjj1"; + sha256 = "1gn8i3jxy6zwrqxmkzc1n55sw29jxdjr4ihv33q2kcp7b90b4wsq"; }; buildInputs = with stdenv.lib; [ boost zlib openssl ] diff --git a/nixpkgs/pkgs/tools/networking/inetutils/default.nix b/nixpkgs/pkgs/tools/networking/inetutils/default.nix index 1d2bfdc91189..612e3ec0f835 100644 --- a/nixpkgs/pkgs/tools/networking/inetutils/default.nix +++ b/nixpkgs/pkgs/tools/networking/inetutils/default.nix @@ -11,9 +11,21 @@ stdenv.mkDerivation rec { patches = [ ./whois-Update-Canadian-TLD-server.patch ./service-name.patch + # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3 + ./inetutils-1_9-PATH_PROCNET_DEV.patch ]; - buildInputs = [ ncurses /* for `talk' */ perl /* for `whois' */ help2man ]; + nativeBuildInputs = [ help2man perl /* for `whois' */ ]; + buildInputs = [ ncurses /* for `talk' */ ]; + + # Don't use help2man if cross-compiling + # https://lists.gnu.org/archive/html/bug-sed/2017-01/msg00001.html + # https://git.congatec.com/yocto/meta-openembedded/blob/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb#L44 + preConfigure = let + isCross = stdenv.hostPlatform != stdenv.buildPlatform; + in lib.optionalString isCross '' + export HELP2MAN=true + ''; configureFlags = [ "--with-ncurses-include-dir=${ncurses.dev}/include" ] ++ lib.optionals stdenv.hostPlatform.isMusl [ # Musl doesn't define rcmd diff --git a/nixpkgs/pkgs/tools/networking/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch b/nixpkgs/pkgs/tools/networking/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch new file mode 100644 index 000000000000..2592989a90a3 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch @@ -0,0 +1,26 @@ +inetutils: define PATH_PROCNET_DEV if not already defined + +this prevents the following compilation error : +system/linux.c:401:15: error: 'PATH_PROCNET_DEV' undeclared (first use in this function) + +this patch comes from : + http://repository.timesys.com/buildsources/i/inetutils/inetutils-1.9/ + +Upstream-Status: Inappropriate [not author] + +Signed-of-by: Eric Bénard <eric@eukrea.com> +--- +diff -Naur inetutils-1.9.orig/ifconfig/system/linux.c inetutils-1.9/ifconfig/system/linux.c +--- inetutils-1.9.orig/ifconfig/system/linux.c 2012-01-04 16:31:36.000000000 -0500 ++++ inetutils-1.9/ifconfig/system/linux.c 2012-01-04 16:40:53.000000000 -0500 +@@ -49,6 +49,10 @@ + #include "../ifconfig.h" + + ++#ifndef PATH_PROCNET_DEV ++ #define PATH_PROCNET_DEV "/proc/net/dev" ++#endif ++ + /* ARPHRD stuff. */ + + static void diff --git a/nixpkgs/pkgs/tools/networking/ip2location/default.nix b/nixpkgs/pkgs/tools/networking/ip2location/default.nix index 00a3f7f3b6b0..3c2e7f53beeb 100644 --- a/nixpkgs/pkgs/tools/networking/ip2location/default.nix +++ b/nixpkgs/pkgs/tools/networking/ip2location/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { weather, MCC, MNC, mobile brand name, elevation and usage type of any IP address or host name in the IP2Location databases. ''; - homepage = http://www.ip2location.com/free/applications; + homepage = https://www.ip2location.com/free/applications; license = with licenses; [ gpl3Plus lgpl3Plus ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/networking/keepalived/default.nix b/nixpkgs/pkgs/tools/networking/keepalived/default.nix index d38ff60f7062..43d0944a4159 100644 --- a/nixpkgs/pkgs/tools/networking/keepalived/default.nix +++ b/nixpkgs/pkgs/tools/networking/keepalived/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://keepalived.org; + homepage = https://keepalived.org; description = "Routing software written in C"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/modem-manager/default.nix b/nixpkgs/pkgs/tools/networking/modem-manager/default.nix index 15ec2ef41cd7..6f0732b8cfdf 100644 --- a/nixpkgs/pkgs/tools/networking/modem-manager/default.nix +++ b/nixpkgs/pkgs/tools/networking/modem-manager/default.nix @@ -1,56 +1,41 @@ { stdenv, fetchurl, glib, udev, libgudev, polkit, ppp, gettext, pkgconfig -, libmbim, libqmi, systemd, fetchpatch }: +, libmbim, libqmi, systemd, vala, gobject-introspection, dbus }: stdenv.mkDerivation rec { - name = "modem-manager-${version}"; - version = "1.7.990"; + pname = "modem-manager"; + version = "1.10.0"; package = "ModemManager"; src = fetchurl { url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz"; - sha256 = "1v4hixmghlrw7w4ajq2x4k62js0594h223d0yma365zwqr7hjrfl"; + sha256 = "1qkfnxqvaraz1npahqvm5xc73mbxxic8msnsjmlwkni5c2ckj3zx"; }; - nativeBuildInputs = [ gettext pkgconfig ]; + nativeBuildInputs = [ vala gobject-introspection gettext pkgconfig ]; buildInputs = [ glib udev libgudev polkit ppp libmbim libqmi systemd ]; - patches = [ - # Patch dependency on glib headers, this breaks packages using core headers (networkmanager-qt) - (fetchpatch { - url = "https://cgit.freedesktop.org/ModemManager/ModemManager/patch/?id=0f377f943eeb81472fd73189f2c3d8fc65b8c609"; - sha256 = "0av0sqdvbhwjnhqqylkc7rmqcj6awqmz5693l9x93nlwp7zya95j"; - }) - ]; - configureFlags = [ "--with-polkit" - "--with-udev-base-dir=$(out)/lib/udev" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--with-udev-base-dir=${placeholder ''out''}/lib/udev" + "--with-dbus-sys-dir=${placeholder ''out''}/etc/dbus-1/system.d" + "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system" "--sysconfdir=/etc" "--localstatedir=/var" - "--with-suspend-resume=systemd" + "--with-systemd-suspend-resume" + "--with-systemd-journal" ]; - installFlags = [ "DESTDIR=\${out}" ]; - - preInstall = '' - mkdir -p $out/etc/systemd/system + preCheck = '' + export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon" ''; - postInstall = '' - # rename to modem-manager to be in style - mv $out/$out/etc/systemd/system/ModemManager.service $out/etc/systemd/system/modem-manager.service - rm -rf $out/$out/etc - mv $out/$out/* $out - DIR=$out/$out - while rmdir $DIR 2>/dev/null; do - DIR="$(dirname "$DIR")" - done + doCheck = true; + postInstall = '' # systemd in NixOS doesn't use `systemctl enable`, so we need to establish # aliases ourselves. - ln -s $out/etc/systemd/system/modem-manager.service \ + ln -s $out/etc/systemd/system/ModemManager.service \ $out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service ''; diff --git a/nixpkgs/pkgs/tools/networking/mu/default.nix b/nixpkgs/pkgs/tools/networking/mu/default.nix index f8c3d7541008..75462659699c 100644 --- a/nixpkgs/pkgs/tools/networking/mu/default.nix +++ b/nixpkgs/pkgs/tools/networking/mu/default.nix @@ -1,31 +1,26 @@ { stdenv, fetchFromGitHub, sqlite, pkgconfig, autoreconfHook, pmccabe -, xapian, glib, gmime, texinfo , emacs, guile +, xapian, glib, gmime3, texinfo , emacs, guile , gtk3, webkitgtk24x-gtk3, libsoup, icu , withMug ? false }: stdenv.mkDerivation rec { name = "mu-${version}"; - version = "1.0"; + version = "1.2"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; - rev = "v${version}"; - sha256 = "0y6azhcmqdx46a9gi7mn8v8p0mhfx2anjm5rj7i69kbr6j8imlbc"; + rev = version; + sha256 = "0yhjlj0z23jw3cf2wfnl98y8q6gikvmhkb8vdm87bd7jw0bdnrfz"; }; - # 0.9.18 and 1.0 have 2 failing tests but previously we had no tests - patches = [ - ./failing_tests.patch - ]; - # test-utils coredumps so don't run those postPatch = '' sed -i -e '/test-utils/d' lib/parser/Makefile.am ''; buildInputs = [ - sqlite xapian glib gmime texinfo emacs guile libsoup icu + sqlite xapian glib gmime3 texinfo emacs guile libsoup icu ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x-gtk3 ]; nativeBuildInputs = [ pkgconfig autoreconfHook pmccabe ]; @@ -54,7 +49,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A collection of utilties for indexing and searching Maildirs"; license = licenses.gpl3Plus; - homepage = http://www.djcbsoftware.nl/code/mu/; + homepage = https://www.djcbsoftware.nl/code/mu/; platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ antono the-kenny peterhoeg ]; }; diff --git a/nixpkgs/pkgs/tools/networking/mu/failing_tests.patch b/nixpkgs/pkgs/tools/networking/mu/failing_tests.patch deleted file mode 100644 index c45834ff2082..000000000000 --- a/nixpkgs/pkgs/tools/networking/mu/failing_tests.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/mu/tests/test-mu-query.c b/mu/tests/test-mu-query.c -index 73cbd3f4..46a0b131 100644 ---- a/mu/tests/test-mu-query.c -+++ b/mu/tests/test-mu-query.c -@@ -753,10 +753,10 @@ main (int argc, char *argv[]) - g_test_add_func ("/mu-query/test-mu-query-sizes", - test_mu_query_sizes); - -- g_test_add_func ("/mu-query/test-mu-query-dates-helsinki", -- test_mu_query_dates_helsinki); -- g_test_add_func ("/mu-query/test-mu-query-dates-sydney", -- test_mu_query_dates_sydney); -+ /* g_test_add_func ("/mu-query/test-mu-query-dates-helsinki", */ -+ /* test_mu_query_dates_helsinki); */ -+ /* g_test_add_func ("/mu-query/test-mu-query-dates-sydney", */ -+ /* test_mu_query_dates_sydney); */ - g_test_add_func ("/mu-query/test-mu-query-dates-la", - test_mu_query_dates_la); diff --git a/nixpkgs/pkgs/tools/networking/network-manager/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/default.nix index 48848c0ead72..1695e23514a9 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/default.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/default.nix @@ -9,11 +9,11 @@ let pname = "NetworkManager"; in stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "1.14.4"; + version = "1.16.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "064cgj9za0kzarks0lrv0qw2ysdphb5l97iw0c964bfiqzjfv8rm"; + sha256 = "0b2x9hrg41cd17psqi0vacwj733v99hxczn53gdfs0yanqrji5lf"; }; outputs = [ "out" "dev" ]; @@ -88,13 +88,15 @@ in stdenv.mkDerivation rec { # FIXME: Workaround until NixOS' dbus+systemd supports at_console policy substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"' - # rename to network-manager to be in style - mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service - # systemd in NixOS doesn't use `systemctl enable`, so we need to establish # aliases ourselves. ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service - ln -s $out/etc/systemd/system/network-manager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service + ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service + + # Add the legacy service name from before #51382 to prevent NetworkManager + # from not starting back up: + # TODO: remove this once 19.10 is released + ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service ''; passthru = { diff --git a/nixpkgs/pkgs/tools/networking/network-manager/fix-paths.patch b/nixpkgs/pkgs/tools/networking/network-manager/fix-paths.patch index 949608095528..adf70421ed82 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/fix-paths.patch +++ b/nixpkgs/pkgs/tools/networking/network-manager/fix-paths.patch @@ -43,7 +43,7 @@ + ping_binary = "@inetutils@/bin/ping"; log_domain = LOGD_IP4; } - } else if (priv->ip_config_6 && priv->ip6_state == IP_DONE) { + } else if (priv->ip_config_6 && priv->ip_state_6 == NM_DEVICE_IP_STATE_DONE) { gw = nm_ip6_config_best_default_route_get (priv->ip_config_6); if (gw) { nm_utils_inet6_ntop (&NMP_OBJECT_CAST_IP6_ROUTE (gw)->gateway, buf); @@ -54,12 +54,13 @@ } --- a/src/nm-core-utils.c +++ b/src/nm-core-utils.c -@@ -421,7 +421,7 @@ +@@ -421,8 +421,8 @@ /* construct the argument list */ argv = g_ptr_array_sized_new (4); - g_ptr_array_add (argv, "/sbin/modprobe"); + g_ptr_array_add (argv, "@kmod@/bin/modprobe"); + g_ptr_array_add (argv, "--use-blacklist"); g_ptr_array_add (argv, (char *) arg1); va_start (ap, arg1); diff --git a/nixpkgs/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/fortisslvpn/default.nix index 1fcbce28cc44..f4ffe620e744 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/fortisslvpn/default.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/fortisslvpn/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, gtk3, +{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, file, gtk3, networkmanager, ppp, libsecret, withGnome ? true, gnome3 }: let pname = "NetworkManager-fortisslvpn"; - version = "1.2.8"; + version = "1.2.10"; in stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "01gvdv9dknvzx05plq863jh1xz1v8vgj5w7v9fmw5v601ggybf4w"; + sha256 = "1sw66cxgs4in4cjp1cm95c5ijsk8xbbmq4ykg2jwqwgz6cf2lr3s"; }; patches = [ @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { buildInputs = [ openfortivpn networkmanager ppp ] ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ]; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig file ]; configureFlags = [ "--without-libnm-glib" diff --git a/nixpkgs/pkgs/tools/networking/nfdump/default.nix b/nixpkgs/pkgs/tools/networking/nfdump/default.nix index 7af852095124..5ad3adfc9153 100644 --- a/nixpkgs/pkgs/tools/networking/nfdump/default.nix +++ b/nixpkgs/pkgs/tools/networking/nfdump/default.nix @@ -1,19 +1,34 @@ -{ stdenv, fetchFromGitHub, bzip2, yacc, flex }: +{ stdenv, fetchFromGitHub +, autoconf, automake, libtool, pkg-config +, bzip2, libpcap, flex, yacc }: -let version = "1.6.16"; in +let version = "1.6.17"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "nfdump-${version}"; src = fetchFromGitHub { owner = "phaag"; repo = "nfdump"; rev = "v${version}"; - sha256 = "0dgrzf9m4rg5ygibjw21gjdm9am3570wys7wdh5k16nsnyai1gqm"; + sha256 = "1z8zpvd9jfi2raafcbkykw55y0hd4mp74jvna19h3k0g86mqkxya"; }; - nativeBuildInputs = [yacc flex]; - buildInputs = [bzip2]; + nativeBuildInputs = [ autoconf automake flex libtool pkg-config yacc ]; + buildInputs = [ bzip2 libpcap ]; + + preConfigure = '' + # The script defaults to glibtoolize on darwin, so we pass the correct + # name explicitly. + LIBTOOLIZE=libtoolize ./autogen.sh + ''; + + configureFlags = [ + "--enable-nsel" + "--enable-sflow" + "--enable-readpcap" + "--enable-nfpcapd" + ]; meta = with stdenv.lib; { description = "Tools for working with netflow data"; diff --git a/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix b/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix index 26bcc8f803f1..d0aec7889efa 100644 --- a/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix +++ b/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix @@ -28,4 +28,8 @@ buildGoPackage rec { ''; buildFlags = [ "-tags release" ]; + + meta = { + homepage = https://ngrok.com/; + }; } diff --git a/nixpkgs/pkgs/tools/networking/nzbget/default.nix b/nixpkgs/pkgs/tools/networking/nzbget/default.nix index 20a448b0ded6..3575cc65b2b2 100644 --- a/nixpkgs/pkgs/tools/networking/nzbget/default.nix +++ b/nixpkgs/pkgs/tools/networking/nzbget/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://nzbget.net; + homepage = https://nzbget.net; license = licenses.gpl2Plus; description = "A command line tool for downloading files from news servers"; maintainers = with maintainers; [ pSub ]; diff --git a/nixpkgs/pkgs/tools/networking/ocserv/default.nix b/nixpkgs/pkgs/tools/networking/ocserv/default.nix index 63a74c3ddb61..fdb281e6c372 100644 --- a/nixpkgs/pkgs/tools/networking/ocserv/default.nix +++ b/nixpkgs/pkgs/tools/networking/ocserv/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "ocserv-${version}"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitLab { owner = "openconnect"; repo = "ocserv"; rev = "ocserv_${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "13lijg5qkkpn35laaimpw9l5g2dnnbmqn74lpcknmp6nm6j2wvci"; + sha256 = "072256099l1c6p7dvvzp0gyafh1zvmmgmnpy0fcmv9sy80qg3p44"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 3e9d1f9f5f7e..97bf456dbbd9 100644 --- a/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -50,8 +50,6 @@ pythonPackages.buildPythonApplication rec { nativeBuildInputs = with pythonPackages; [ sphinx texinfo ]; - buildInputs = with pythonPackages; [ unzip numpy mock ]; - # The `backup' command requires `sqlite3'. propagatedBuildInputs = with pythonPackages; [ twisted foolscap nevow simplejson zfec pycryptopp darcsver @@ -59,7 +57,7 @@ pythonPackages.buildPythonApplication rec { service-identity pyyaml magic-wormhole treq ]; - checkInputs = with pythonPackages; [ hypothesis twisted ]; + checkInputs = with pythonPackages; [ mock hypothesis twisted ]; # Install the documentation. postInstall = '' diff --git a/nixpkgs/pkgs/tools/networking/pcapfix/default.nix b/nixpkgs/pkgs/tools/networking/pcapfix/default.nix index 5e3bf176b2c9..92df5d55524b 100644 --- a/nixpkgs/pkgs/tools/networking/pcapfix/default.nix +++ b/nixpkgs/pkgs/tools/networking/pcapfix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pcapfix-1.1.3"; + name = "pcapfix-1.1.4"; src = fetchurl { url = "https://f00l.de/pcapfix/${name}.tar.gz"; - sha256 = "0f9g6yh1dc7x1n28xs4lcwlk6sa3mpz0rbw0ddhajqidag2k07sr"; + sha256 = "0m6308ka33wqs568b7cwa1f5q0bv61j2nwfizdyzrazw673lnh6d"; }; postPatch = ''sed -i "s|/usr|$out|" Makefile''; diff --git a/nixpkgs/pkgs/tools/networking/persepolis/default.nix b/nixpkgs/pkgs/tools/networking/persepolis/default.nix new file mode 100644 index 000000000000..bfa309f79df2 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/persepolis/default.nix @@ -0,0 +1,60 @@ +{ stdenv, lib, buildPythonApplication, fetchFromGitHub, makeDesktopItem, makeWrapper +, aria +, libnotify +, pulseaudio +, psutil +, pyqt5 +, requests +, setproctitle +, sound-theme-freedesktop +, youtube-dl +}: + +buildPythonApplication rec { + pname = "persepolis"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "persepolisdm"; + repo = "persepolis"; + rev = "${version}"; + sha256 = "0xngk8wgj5k27mh3bcrf2wwzqr8a3g0d4pc5i5vcavnnaj03j44m"; + }; + + # see: https://github.com/persepolisdm/persepolis/blob/3.1.0/setup.py#L130 + doCheck = false; + + preBuild='' + substituteInPlace setup.py --replace "answer = input(" "answer = 'y'#" + ''; + + postPatch = '' + sed -i 's|/usr/share/sounds/freedesktop/stereo/|${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/|' setup.py + sed -i "s|'persepolis = persepolis.__main__'|'persepolis = persepolis.scripts.persepolis:main'|" setup.py + ''; + + postInstall = '' + mkdir -p $out/share/applications + cp $src/xdg/com.github.persepolisdm.persepolis.desktop $out/share/applications + wrapProgram $out/bin/persepolis --prefix PATH : "${lib.makeBinPath [aria libnotify ]}" + ''; + + buildInputs = [ makeWrapper ]; + + propagatedBuildInputs = [ + pulseaudio + psutil + pyqt5 + requests + setproctitle + sound-theme-freedesktop + youtube-dl + ]; + + meta = with stdenv.lib; { + description = "Persepolis Download Manager is a GUI for aria2."; + homepage = https://persepolisdm.github.io/; + license = licenses.gpl3; + maintainers = [ maintainers.linarcx ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/ppp/default.nix b/nixpkgs/pkgs/tools/networking/ppp/default.nix index cea8a3f133f4..26dc71b7d619 100644 --- a/nixpkgs/pkgs/tools/networking/ppp/default.nix +++ b/nixpkgs/pkgs/tools/networking/ppp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, libpcap }: +{ stdenv, fetchurl, substituteAll, libpcap, openssl }: stdenv.mkDerivation rec { version = "2.4.7"; @@ -27,10 +27,14 @@ stdenv.mkDerivation rec { url = "https://anonscm.debian.org/git/collab-maint/pkg-ppp.git/plain/debian/patches/0016-pppoe-include-netinet-in.h-before-linux-in.h.patch"; sha256 = "1xnmqn02kc6g5y84xynjwnpv9cvrfn3nyv7h7r8j8xi7qf2aj4q8"; }) + (fetchurl { + url = https://www.nikhef.nl/~janjust/ppp/ppp-2.4.7-eaptls-mppe-1.102.patch; + sha256 = "04war8l5szql53l36043hvzgfwqp3v76kj8brbz7wlf7vs2mlkia"; + }) ./musl-fix-headers.patch ]; - buildInputs = [ libpcap ]; + buildInputs = [ libpcap openssl ]; postPatch = '' # strip is not found when cross compiling with seemingly no way to point diff --git a/nixpkgs/pkgs/tools/networking/redir/default.nix b/nixpkgs/pkgs/tools/networking/redir/default.nix index 350d31c19dad..e584354952a4 100644 --- a/nixpkgs/pkgs/tools/networking/redir/default.nix +++ b/nixpkgs/pkgs/tools/networking/redir/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "redir-${version}"; - version = "3.2"; + version = "3.3"; src = fetchFromGitHub { owner = "troglobit"; repo = "redir"; rev = "v${version}"; - sha256 = "015vxpy6n7xflkq0lgls4f4vw7ynvv2635bwykzglin3v5ssrm2k"; + sha256 = "13n401i3q0xwpfgr21y47kgihi057wbh59xlsna8b8zpm973qny1"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/tools/networking/socat/default.nix b/nixpkgs/pkgs/tools/networking/socat/default.nix index 37fe3398ae8b..834ea1bd873d 100644 --- a/nixpkgs/pkgs/tools/networking/socat/default.nix +++ b/nixpkgs/pkgs/tools/networking/socat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, readline, which, nettools }: stdenv.mkDerivation rec { - name = "socat-1.7.3.2"; + name = "socat-1.7.3.3"; src = fetchurl { url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2"; - sha256 = "0lcj6zpra33xhgvhmz9l3cqz10v8ybafb8dd1yqkwf1rhy01ymp3"; + sha256 = "0jnhjijyq74g3wa4ph0am83z6vq7qna7ac0xqjma8s4197z3zmhd"; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/networking/sstp/default.nix b/nixpkgs/pkgs/tools/networking/sstp/default.nix index e8db3a071843..7bbc872c98e1 100644 --- a/nixpkgs/pkgs/tools/networking/sstp/default.nix +++ b/nixpkgs/pkgs/tools/networking/sstp/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, ppp, libevent, openssl }: +{ stdenv, fetchurl, pkgconfig, ppp, libevent, openssl }: stdenv.mkDerivation rec { name = "sstp-client-${version}"; - version = "1.0.11"; + version = "1.0.12"; src = fetchurl { url = "mirror://sourceforge/sstp-client/sstp-client/${version}/sstp-client-${version}.tar.gz"; - sha256 = "087vp3n7nv001fsgbmkjpgl3a2vhbix22cflrqi5bv9h8181p18v"; + sha256 = "1zv7rx6wh9rhbyg9pg6759by8hc6n4162zrrw0y812cnaw3b8zj8"; }; patchPhase = @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { "--with-pppd-plugin-dir=$(out)/lib/pppd" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libevent openssl ppp ]; meta = { diff --git a/nixpkgs/pkgs/tools/networking/stubby/default.nix b/nixpkgs/pkgs/tools/networking/stubby/default.nix index 4685143c934b..89af381d0d6d 100644 --- a/nixpkgs/pkgs/tools/networking/stubby/default.nix +++ b/nixpkgs/pkgs/tools/networking/stubby/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "stubby"; name = "${pname}-${version}"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "getdnsapi"; repo = pname; rev = "v${version}"; - sha256 = "034y783dvh43v5ajxlgn4y9y7mdk1lwy87d7isaxpkigs1jqbrma"; + sha256 = "164gm5cbnq785s78bqmbsgxrxkq8hw930xwkxxzi1f6jgz928dnf"; }; nativeBuildInputs = [ libtool m4 libbsd libyaml autoreconfHook ]; diff --git a/nixpkgs/pkgs/tools/networking/stunnel/default.nix b/nixpkgs/pkgs/tools/networking/stunnel/default.nix index e00b5335d35e..b85e146971b2 100644 --- a/nixpkgs/pkgs/tools/networking/stunnel/default.nix +++ b/nixpkgs/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "stunnel-${version}"; - version = "5.50"; + version = "5.53"; src = fetchurl { url = "https://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "0j811iakljjxw39qchmqf235jdkwixb0i4xxjyi55f08558947cm"; + sha256 = "119560alb8k0qz2zkjb2i80ikmn76fa6dg681fvrw9hlxsb9hhw0"; # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; diff --git a/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix b/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix index a977a83e23f0..53af27b4deba 100644 --- a/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix +++ b/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "tcpreplay-${version}"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { url = "https://github.com/appneta/tcpreplay/releases/download/v${version}/tcpreplay-${version}.tar.gz"; - sha256 = "0d2ywaxq0iaa1kfhgsfhsk1c4w4lakxafsw90dn4m6k82486dflm"; + sha256 = "0ld9v88g5xs2rykimksmhlkwbv2r97575c4aqmqdxbvc37crnisg"; }; buildInputs = [ libpcap ]; diff --git a/nixpkgs/pkgs/tools/networking/tgt/default.nix b/nixpkgs/pkgs/tools/networking/tgt/default.nix index e1e19609d513..9f3075b374e2 100644 --- a/nixpkgs/pkgs/tools/networking/tgt/default.nix +++ b/nixpkgs/pkgs/tools/networking/tgt/default.nix @@ -2,7 +2,7 @@ , docbook_xsl }: let - version = "1.0.75"; + version = "1.0.76"; in stdenv.mkDerivation rec { name = "tgt-${version}"; @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { owner = "fujita"; repo = "tgt"; rev = "v${version}"; - sha256 = "008x7xz49fnqi91hw4nim4f25gp5qyjgzxfikmj7gz81mh4hhamj"; + sha256 = "1q01ay0zn5gmy6df1iw1ic11p8zygxlp0r3nd887vvvjvlp3xrvc"; }; buildInputs = [ libxslt systemd libaio docbook_xsl ]; diff --git a/nixpkgs/pkgs/tools/networking/tox-node/default.nix b/nixpkgs/pkgs/tools/networking/tox-node/default.nix new file mode 100644 index 000000000000..28be00099b8b --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/tox-node/default.nix @@ -0,0 +1,43 @@ +{ stdenv, rustPlatform, fetchFromGitHub +, libsodium, openssl +, pkgconfig +}: + +with rustPlatform; + +buildRustPackage rec { + name = "tox-node-${version}"; + version = "0.0.7"; + + src = fetchFromGitHub { + owner = "tox-rs"; + repo = "tox-node"; + rev = "v${version}"; + sha256 = "0p1k4glqm3xasck66fywkyg42lbccad9rc6biyvi24rn76qip4jm"; + }; + + buildInputs = [ libsodium openssl ]; + nativeBuildInputs = [ pkgconfig ]; + + SODIUM_USE_PKG_CONFIG = "yes"; + + installPhase = '' + runHook preInstall + + install -D target/release/tox-node $out/bin/tox-node + + runHook postInstall + ''; + + doCheck = false; + + cargoSha256 = "18w1ycvj2q4q8lj81wn5lfljh5wa7b230ahqdz30w20pv1cazsv2"; + + meta = with stdenv.lib; { + description = "A server application to run tox node written in pure Rust"; + homepage = https://github.com/tox-rs/tox-node; + license = [ licenses.mit ]; + platforms = platforms.linux; + maintainers = with maintainers; [ suhr ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/unbound/python.nix b/nixpkgs/pkgs/tools/networking/unbound/python.nix index c20169d39135..f41aa35df90e 100644 --- a/nixpkgs/pkgs/tools/networking/unbound/python.nix +++ b/nixpkgs/pkgs/tools/networking/unbound/python.nix @@ -5,7 +5,7 @@ let in stdenv.mkDerivation rec { pname = "pyunbound"; name = "${pname}-${version}"; - version = "1.7.3"; + version = "1.9.0"; src = fetchurl { url = "http://unbound.net/downloads/unbound-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/networking/urlwatch/default.nix b/nixpkgs/pkgs/tools/networking/urlwatch/default.nix index fc77846efc39..3e572a10da0a 100644 --- a/nixpkgs/pkgs/tools/networking/urlwatch/default.nix +++ b/nixpkgs/pkgs/tools/networking/urlwatch/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urlwatch-${version}"; - version = "2.16"; + version = "2.17"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "1bkwr151bnv72aka2r9jwaq8lkz1p6031wr5pss4sij978qn5xld"; + sha256 = "1865p3yczgpq8gvgh4cpgbx2ibc1fwycd7pagga9sj8r3q0giqyk"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/tools/networking/wget/default.nix b/nixpkgs/pkgs/tools/networking/wget/default.nix index 57ab0bab5167..38a24eddc288 100644 --- a/nixpkgs/pkgs/tools/networking/wget/default.nix +++ b/nixpkgs/pkgs/tools/networking/wget/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "wget-${version}"; - version = "1.20.1"; + version = "1.20.3"; src = fetchurl { url = "mirror://gnu/wget/${name}.tar.lz"; - sha256 = "0a29qsqxkk8145vkyy35q5a1wc7qzwx3qj3gmfrkmi9xs96yhqqg"; + sha256 = "1frajd86ds8vz2hprq30wq8ya89z9dcxnwm8nwk12bbc47l7qq39"; }; patches = [ diff --git a/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix b/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix index b4b339edb5f7..21e869b7b01e 100644 --- a/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix +++ b/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix @@ -91,7 +91,6 @@ in stdenv.mkDerivation rec { "-DUSE_SYSTEM_LIBARCHIVE=ON" "-DUSE_SYSTEM_GTEST=ON" "-DUSE_SYSTEM_MKSQUASHFS=ON" - "-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}" ]; postInstall = '' diff --git a/nixpkgs/pkgs/tools/package-management/cargo-tree/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-tree/default.nix index d98ad1d8cb79..e462202f6153 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-tree/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-tree/default.nix @@ -1,17 +1,17 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, cmake, curl, libiconv, darwin }: rustPlatform.buildRustPackage rec { name = "cargo-tree-${version}"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "sfackler"; repo = "cargo-tree"; rev = "v${version}"; - sha256 = "1pnq2gphdv0rkc317rnkdx2qv0cd7p3k4v5f0ys5rya2akkxx4wn"; + sha256 = "12z0sa7g79x46q2ybpy6i9rf1x4cnwajw8dsjzra2qhssyp8rp9c"; }; - cargoSha256 = "0y6swl5ngkd489g53c100gyjl1sp8vidl8j6zfcasw5lbkli3acs"; + cargoSha256 = "10nfa0pd4zhz36f9yx80qd0bbsmqdjk8r6656jyzh92ydncry1as"; nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ curl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/nixpkgs/pkgs/tools/package-management/checkinstall/default.nix b/nixpkgs/pkgs/tools/package-management/checkinstall/default.nix index df1bf794062f..6605d9de65ae 100644 --- a/nixpkgs/pkgs/tools/package-management/checkinstall/default.nix +++ b/nixpkgs/pkgs/tools/package-management/checkinstall/default.nix @@ -69,5 +69,6 @@ stdenv.mkDerivation { description = "A tool for automatically generating Slackware, RPM or Debian packages when doing `make install'"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/nixpkgs/pkgs/tools/package-management/dpkg/default.nix b/nixpkgs/pkgs/tools/package-management/dpkg/default.nix index 864c229b8803..33620bb51f17 100644 --- a/nixpkgs/pkgs/tools/package-management/dpkg/default.nix +++ b/nixpkgs/pkgs/tools/package-management/dpkg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dpkg-${version}"; - version = "1.19.5"; + version = "1.19.6"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "0i1mwqf60n25f89zfvp7fsa4v5rlqxhkhqah35g6j2k1ffcpqcpd"; + sha256 = "0s1pyj7g8ign630biqq1ycjy8cw733fk1dgas9w59mav3wns3caf"; }; configureFlags = [ diff --git a/nixpkgs/pkgs/tools/package-management/nix/default.nix b/nixpkgs/pkgs/tools/package-management/nix/default.nix index d725692f4054..7590a37a8e36 100644 --- a/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -167,10 +167,10 @@ in rec { }; nixStable = callPackage common rec { - name = "nix-2.2"; + name = "nix-2.2.2"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "63238d00d290b8a93925891fc9164439d3941e2ccc569bf7f7ca32f53c3ec0c7"; + sha256 = "f80a1b4f9837a8d33209f0b7769d5038335459ff4303eccf3e9217a9eca8594c"; }; inherit storeDir stateDir confDir boehmgc; diff --git a/nixpkgs/pkgs/tools/package-management/nixui/generate.sh b/nixpkgs/pkgs/tools/package-management/nixui/generate.sh index c7a93a716731..334edb4a027a 100755 --- a/nixpkgs/pkgs/tools/package-management/nixui/generate.sh +++ b/nixpkgs/pkgs/tools/package-management/nixui/generate.sh @@ -1,4 +1,4 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix -exec node2nix -6 -i pkg.json -c nixui.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env +exec node2nix -8 -i pkg.json -c nixui.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env diff --git a/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix b/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix index 8f3be4cc8c7f..29d77f0bf9a6 100644 --- a/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix +++ b/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/nixpkgs/pkgs/tools/package-management/nixui/node-packages.nix b/nixpkgs/pkgs/tools/package-management/nixui/node-packages.nix index 846e9bcfc12a..b019c7ef3772 100644 --- a/nixpkgs/pkgs/tools/package-management/nixui/node-packages.nix +++ b/nixpkgs/pkgs/tools/package-management/nixui/node-packages.nix @@ -102,6 +102,6 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/tools/package-management/packagekit/default.nix b/nixpkgs/pkgs/tools/package-management/packagekit/default.nix index 5b7872200402..2e9f93177e45 100644 --- a/nixpkgs/pkgs/tools/package-management/packagekit/default.nix +++ b/nixpkgs/pkgs/tools/package-management/packagekit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, lib , intltool, glib, pkgconfig, polkit, python, sqlite -, gobject-introspection, vala_0_38, gtk-doc, autoreconfHook, autoconf-archive +, gobject-introspection, vala, gtk-doc, autoreconfHook, autoconf-archive # TODO: set enableNixBackend to true, as soon as it builds , nix, enableNixBackend ? false, boost , enableCommandNotFound ? false @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { sha256 = "02wq3jw3mkdld90irh5vdfd5bri2g1p89mhrmj56kvif1fqak46x"; }; - buildInputs = [ glib polkit python gobject-introspection vala_0_38 ] + buildInputs = [ glib polkit python gobject-introspection ] ++ lib.optional enableSystemd systemd ++ lib.optional enableBashCompletion bash-completion; propagatedBuildInputs = [ sqlite nix boost ]; - nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk-doc ]; + nativeBuildInputs = [ vala intltool pkgconfig autoreconfHook autoconf-archive gtk-doc ]; preAutoreconf = '' gtkdocize diff --git a/nixpkgs/pkgs/tools/security/afl/default.nix b/nixpkgs/pkgs/tools/security/afl/default.nix index c90d031e989b..2ee0c478212c 100644 --- a/nixpkgs/pkgs/tools/security/afl/default.nix +++ b/nixpkgs/pkgs/tools/security/afl/default.nix @@ -69,7 +69,7 @@ let homepage = "http://lcamtuf.coredump.cx/afl/"; license = stdenv.lib.licenses.asl20; platforms = ["x86_64-linux" "i686-linux"]; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ris ]; }; }; in afl diff --git a/nixpkgs/pkgs/tools/security/afl/qemu.nix b/nixpkgs/pkgs/tools/security/afl/qemu.nix index a007eb3913db..9e0f19361fb0 100644 --- a/nixpkgs/pkgs/tools/security/afl/qemu.nix +++ b/nixpkgs/pkgs/tools/security/afl/qemu.nix @@ -1,7 +1,5 @@ -{ stdenv, fetchurl, afl, python2, zlib, pkgconfig, glib, ncurses, perl -, attr, libcap, vde2, texinfo, libuuid, flex, bison, lzo, snappy -, libaio, libcap_ng, gnutls, pixman, autoconf -, writeText +{ stdenv, fetchurl, afl, python2, zlib, pkgconfig, glib, perl +, texinfo, libuuid, flex, bison, pixman, autoconf }: with stdenv.lib; @@ -41,9 +39,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - zlib glib pixman ncurses attr libcap - vde2 libuuid lzo snappy libcap_ng gnutls - ] ++ optionals (stdenv.isLinux) [ libaio ]; + zlib glib pixman libuuid + ]; enableParallelBuilding = true; @@ -63,9 +60,9 @@ stdenv.mkDerivation rec { "--disable-gtk" "--disable-sdl" "--disable-vnc" + "--disable-kvm" "--target-list=${cpuTarget}" "--enable-pie" - "--enable-kvm" "--sysconfdir=/etc" "--localstatedir=/var" ]; diff --git a/nixpkgs/pkgs/tools/security/bitwarden-cli/generate.sh b/nixpkgs/pkgs/tools/security/bitwarden-cli/generate.sh new file mode 100755 index 000000000000..5bcee4c0513a --- /dev/null +++ b/nixpkgs/pkgs/tools/security/bitwarden-cli/generate.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix + +exec node2nix -8 \ + --input node-packages.json \ + --output node-packages-generated.nix \ + --composition node-packages.nix \ + --node-env ./../../../development/node-packages/node-env.nix diff --git a/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages-generated.nix b/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages-generated.nix index f709bd3d122d..e258571a6207 100644 --- a/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages-generated.nix +++ b/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages-generated.nix @@ -4,13 +4,58 @@ let sources = { - "ansi-escapes-3.1.0" = { + "abab-2.0.0" = { + name = "abab"; + packageName = "abab"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz"; + sha512 = "sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w=="; + }; + }; + "acorn-6.1.1" = { + name = "acorn"; + packageName = "acorn"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz"; + sha512 = "jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA=="; + }; + }; + "acorn-globals-4.3.0" = { + name = "acorn-globals"; + packageName = "acorn-globals"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.0.tgz"; + sha512 = "hMtHj3s5RnuhvHPowpBYvJVj3rAar82JiDQHvGs1zO0l10ocX/xEdBShNHTJaboucJUsScghp74pH3s7EnHHQw=="; + }; + }; + "acorn-walk-6.1.1" = { + name = "acorn-walk"; + packageName = "acorn-walk"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz"; + sha512 = "OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw=="; + }; + }; + "ajv-6.10.0" = { + name = "ajv"; + packageName = "ajv"; + version = "6.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz"; + sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; + }; + }; + "ansi-escapes-3.2.0" = { name = "ansi-escapes"; packageName = "ansi-escapes"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz"; - sha512 = "UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw=="; + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; + sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; }; }; "ansi-regex-3.0.0" = { @@ -31,6 +76,42 @@ let sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; }; + "array-equal-1.0.0" = { + name = "array-equal"; + packageName = "array-equal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz"; + sha1 = "8c2a5ef2472fd9ea742b04c77a75093ba2757c93"; + }; + }; + "asn1-0.2.4" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + }; + "async-limiter-1.0.0" = { + name = "async-limiter"; + packageName = "async-limiter"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz"; + sha512 = "jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="; + }; + }; "asynckit-0.4.0" = { name = "asynckit"; packageName = "asynckit"; @@ -40,6 +121,33 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; + "aws-sign2-0.7.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + }; + "aws4-1.8.0" = { + name = "aws4"; + packageName = "aws4"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"; + sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="; + }; + }; + "bcrypt-pbkdf-1.0.2" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + }; + }; "big-integer-1.6.36" = { name = "big-integer"; packageName = "big-integer"; @@ -49,6 +157,24 @@ let sha512 = "t70bfa7HYEA1D9idDbmuv7YbsbVkQ+Hp+8KFSul4aE5e/i1bjCNIRYJZlA8Q8p0r9T8cF/RVvwUgRA//FydEyg=="; }; }; + "browser-process-hrtime-0.1.3" = { + name = "browser-process-hrtime"; + packageName = "browser-process-hrtime"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz"; + sha512 = "bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw=="; + }; + }; + "caseless-0.12.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + }; "chalk-2.4.1" = { name = "chalk"; packageName = "chalk"; @@ -121,6 +247,60 @@ let sha512 = "6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ=="; }; }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "cssom-0.3.6" = { + name = "cssom"; + packageName = "cssom"; + version = "0.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cssom/-/cssom-0.3.6.tgz"; + sha512 = "DtUeseGk9/GBW0hl0vVPpU22iHL6YB5BUX7ml1hB+GMpo0NX5G4voX3kdWiMSEguFtcW3Vh3djqNF4aIe6ne0A=="; + }; + }; + "cssstyle-1.2.2" = { + name = "cssstyle"; + packageName = "cssstyle"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cssstyle/-/cssstyle-1.2.2.tgz"; + sha512 = "43wY3kl1CVQSvL7wUY1qXkxVGkStjpkDmVjiIKX8R97uhajy8Bybay78uOtqvh7Q5GK75dNPfW0geWjE6qQQow=="; + }; + }; + "dashdash-1.14.1" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + }; + "data-urls-1.1.0" = { + name = "data-urls"; + packageName = "data-urls"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz"; + sha512 = "YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ=="; + }; + }; + "deep-is-0.1.3" = { + name = "deep-is"; + packageName = "deep-is"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + }; "delayed-stream-1.0.0" = { name = "delayed-stream"; packageName = "delayed-stream"; @@ -130,6 +310,24 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; + "domexception-1.0.1" = { + name = "domexception"; + packageName = "domexception"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz"; + sha512 = "raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug=="; + }; + }; + "ecc-jsbn-0.1.2" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + }; + }; "escape-string-regexp-1.0.5" = { name = "escape-string-regexp"; packageName = "escape-string-regexp"; @@ -139,6 +337,51 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; + "escodegen-1.11.1" = { + name = "escodegen"; + packageName = "escodegen"; + version = "1.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.11.1.tgz"; + sha512 = "JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw=="; + }; + }; + "esprima-3.1.3" = { + name = "esprima"; + packageName = "esprima"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; + sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; + }; + }; + "estraverse-4.2.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz"; + sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13"; + }; + }; + "esutils-2.0.2" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"; + sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; + }; + }; + "extend-3.0.2" = { + name = "extend"; + packageName = "extend"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; + }; + }; "external-editor-3.0.3" = { name = "external-editor"; packageName = "external-editor"; @@ -148,6 +391,42 @@ let sha512 = "bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA=="; }; }; + "extsprintf-1.3.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + }; + "fast-deep-equal-2.0.1" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; + sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; + }; + }; + "fast-json-stable-stringify-2.0.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; + sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + }; + }; + "fast-levenshtein-2.0.6" = { + name = "fast-levenshtein"; + packageName = "fast-levenshtein"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + }; "figures-2.0.0" = { name = "figures"; packageName = "figures"; @@ -157,6 +436,15 @@ let sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; }; }; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + }; "form-data-2.3.2" = { name = "form-data"; packageName = "form-data"; @@ -166,6 +454,15 @@ let sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; }; }; + "getpass-0.1.7" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + }; "graceful-fs-4.1.15" = { name = "graceful-fs"; packageName = "graceful-fs"; @@ -175,6 +472,24 @@ let sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; }; }; + "har-schema-2.0.0" = { + name = "har-schema"; + packageName = "har-schema"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + }; + "har-validator-5.1.3" = { + name = "har-validator"; + packageName = "har-validator"; + version = "5.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; + }; + }; "has-flag-3.0.0" = { name = "has-flag"; packageName = "has-flag"; @@ -184,6 +499,24 @@ let sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; }; }; + "html-encoding-sniffer-1.0.2" = { + name = "html-encoding-sniffer"; + packageName = "html-encoding-sniffer"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz"; + sha512 = "71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw=="; + }; + }; + "http-signature-1.2.0" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + }; "iconv-lite-0.4.24" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -220,6 +553,87 @@ let sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; }; }; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + }; + "jsbn-0.1.1" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + }; + "jsdom-13.2.0" = { + name = "jsdom"; + packageName = "jsdom"; + version = "13.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdom/-/jsdom-13.2.0.tgz"; + sha512 = "cG1NtMWO9hWpqRNRR3dSvEQa8bFI6iLlqU2x4kwX51FQjp0qus8T9aBaAO6iGp3DeBrhdwuKxckknohkmfvsFw=="; + }; + }; + "json-schema-0.2.3" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + }; + "json-schema-traverse-0.4.1" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; + }; + }; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + }; + "jsprim-1.4.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + }; + "levn-0.3.0" = { + name = "levn"; + packageName = "levn"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; + sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + }; + }; "lodash-4.17.11" = { name = "lodash"; packageName = "lodash"; @@ -229,6 +643,15 @@ let sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="; }; }; + "lodash.sortby-4.7.0" = { + name = "lodash.sortby"; + packageName = "lodash.sortby"; + version = "4.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; + sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; + }; + }; "lowdb-1.0.0" = { name = "lowdb"; packageName = "lowdb"; @@ -247,22 +670,22 @@ let sha512 = "rlAEsgU9Bnavca2w1WJ6+6cdeHMXNyadcersyk3ZpuhgWb5HBNj8l4WwJz9PjksAhYDlpQffCVXPctOn+wCIVA=="; }; }; - "mime-db-1.37.0" = { + "mime-db-1.38.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.37.0"; + version = "1.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz"; - sha512 = "R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz"; + sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="; }; }; - "mime-types-2.1.21" = { + "mime-types-2.1.22" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.21"; + version = "2.1.22"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz"; - sha512 = "3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz"; + sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog=="; }; }; "mimic-fn-1.2.0" = { @@ -301,6 +724,24 @@ let sha512 = "sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw=="; }; }; + "nwsapi-2.1.3" = { + name = "nwsapi"; + packageName = "nwsapi"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.3.tgz"; + sha512 = "RowAaJGEgYXEZfQ7tvvdtAQUKPyTR6T6wNu0fwlNsGQYr/h3yQc6oI8WnVZh3Y/Sylwc+dtAlvPqfFZjhTyk3A=="; + }; + }; + "oauth-sign-0.9.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; + }; + }; "onetime-2.0.1" = { name = "onetime"; packageName = "onetime"; @@ -310,6 +751,15 @@ let sha1 = "067428230fd67443b2794b22bba528b6867962d4"; }; }; + "optionator-0.8.2" = { + name = "optionator"; + packageName = "optionator"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz"; + sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; + }; + }; "os-tmpdir-1.0.2" = { name = "os-tmpdir"; packageName = "os-tmpdir"; @@ -328,6 +778,24 @@ let sha512 = "ylm8pmgyz9rkS3Ng/ru5tHUF3JxWwKYP0aZZWZ8eCGdSxoqgYiDUXLNQei73mUJOjHw8QNu5ZNCsLoDpkMA6sg=="; }; }; + "parse5-5.1.0" = { + name = "parse5"; + packageName = "parse5"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz"; + sha512 = "fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ=="; + }; + }; + "performance-now-2.1.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + }; "pify-3.0.0" = { name = "pify"; packageName = "pify"; @@ -337,6 +805,33 @@ let sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; }; }; + "pn-1.1.0" = { + name = "pn"; + packageName = "pn"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz"; + sha512 = "2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA=="; + }; + }; + "prelude-ls-1.1.2" = { + name = "prelude-ls"; + packageName = "prelude-ls"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; + sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + }; + }; + "psl-1.1.31" = { + name = "psl"; + packageName = "psl"; + version = "1.1.31"; + src = fetchurl { + url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"; + sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="; + }; + }; "punycode-1.4.1" = { name = "punycode"; packageName = "punycode"; @@ -346,6 +841,51 @@ let sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; }; }; + "punycode-2.1.1" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + }; + }; + "qs-6.5.2" = { + name = "qs"; + packageName = "qs"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; + }; + }; + "request-2.88.0" = { + name = "request"; + packageName = "request"; + version = "2.88.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; + sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; + }; + }; + "request-promise-core-1.1.2" = { + name = "request-promise-core"; + packageName = "request-promise-core"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz"; + sha512 = "UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag=="; + }; + }; + "request-promise-native-1.0.7" = { + name = "request-promise-native"; + packageName = "request-promise-native"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz"; + sha512 = "rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w=="; + }; + }; "restore-cursor-2.0.0" = { name = "restore-cursor"; packageName = "restore-cursor"; @@ -364,13 +904,22 @@ let sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; }; }; - "rxjs-6.3.3" = { + "rxjs-6.4.0" = { name = "rxjs"; packageName = "rxjs"; - version = "6.3.3"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz"; - sha512 = "JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz"; + sha512 = "Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw=="; + }; + }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; "safer-buffer-2.1.2" = { @@ -382,6 +931,15 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; + "saxes-3.1.9" = { + name = "saxes"; + packageName = "saxes"; + version = "3.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/saxes/-/saxes-3.1.9.tgz"; + sha512 = "FZeKhJglhJHk7eWG5YM0z46VHmI3KJpMBAQm3xa9meDvd+wevB5GuBB0wc0exPInZiBBHqi00DbS8AcvCGCFMw=="; + }; + }; "signal-exit-3.0.2" = { name = "signal-exit"; packageName = "signal-exit"; @@ -391,6 +949,33 @@ let sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; }; }; + "source-map-0.6.1" = { + name = "source-map"; + packageName = "source-map"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; + }; + }; + "sshpk-1.16.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; + }; + }; + "stealthy-require-1.1.1" = { + name = "stealthy-require"; + packageName = "stealthy-require"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz"; + sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; + }; + }; "steno-0.4.4" = { name = "steno"; packageName = "steno"; @@ -427,6 +1012,15 @@ let sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; + "symbol-tree-3.2.2" = { + name = "symbol-tree"; + packageName = "symbol-tree"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz"; + sha1 = "ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"; + }; + }; "through-2.3.8" = { name = "through"; packageName = "through"; @@ -454,6 +1048,33 @@ let sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; }; }; + "tough-cookie-2.4.3" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; + sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; + }; + }; + "tough-cookie-2.5.0" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; + }; + }; + "tr46-1.0.1" = { + name = "tr46"; + packageName = "tr46"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz"; + sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09"; + }; + }; "tslib-1.9.3" = { name = "tslib"; packageName = "tslib"; @@ -463,6 +1084,150 @@ let sha512 = "4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="; }; }; + "tunnel-agent-0.6.0" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + }; + "tweetnacl-0.14.5" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + }; + "type-check-0.3.2" = { + name = "type-check"; + packageName = "type-check"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; + sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + }; + }; + "uri-js-4.2.2" = { + name = "uri-js"; + packageName = "uri-js"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; + sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; + }; + }; + "uuid-3.3.2" = { + name = "uuid"; + packageName = "uuid"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; + sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; + }; + }; + "verror-1.10.0" = { + name = "verror"; + packageName = "verror"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + }; + "w3c-hr-time-1.0.1" = { + name = "w3c-hr-time"; + packageName = "w3c-hr-time"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz"; + sha1 = "82ac2bff63d950ea9e3189a58a65625fedf19045"; + }; + }; + "w3c-xmlserializer-1.1.2" = { + name = "w3c-xmlserializer"; + packageName = "w3c-xmlserializer"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz"; + sha512 = "p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg=="; + }; + }; + "webidl-conversions-4.0.2" = { + name = "webidl-conversions"; + packageName = "webidl-conversions"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz"; + sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; + }; + }; + "whatwg-encoding-1.0.5" = { + name = "whatwg-encoding"; + packageName = "whatwg-encoding"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz"; + sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw=="; + }; + }; + "whatwg-mimetype-2.3.0" = { + name = "whatwg-mimetype"; + packageName = "whatwg-mimetype"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz"; + sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="; + }; + }; + "whatwg-url-7.0.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz"; + sha512 = "37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ=="; + }; + }; + "wordwrap-1.0.0" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; + sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + }; + }; + "ws-6.2.1" = { + name = "ws"; + packageName = "ws"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz"; + sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; + }; + }; + "xml-name-validator-3.0.0" = { + name = "xml-name-validator"; + packageName = "xml-name-validator"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz"; + sha512 = "A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="; + }; + }; + "xmlchars-1.3.1" = { + name = "xmlchars"; + packageName = "xmlchars"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlchars/-/xmlchars-1.3.1.tgz"; + sha512 = "tGkGJkN8XqCod7OT+EvGYK5Z4SfDQGD30zAa58OcnAa0RRWgzUEK72tkXhsX1FZd+rgnhRxFtmO+ihkp8LHSkw=="; + }; + }; "zxcvbn-4.4.2" = { name = "zxcvbn"; packageName = "zxcvbn"; @@ -478,17 +1243,31 @@ in "@bitwarden/cli" = nodeEnv.buildNodePackage { name = "_at_bitwarden_slash_cli"; packageName = "@bitwarden/cli"; - version = "1.7.0"; + version = "1.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.7.0.tgz"; - sha512 = "rynqUqyfC33dMQ21OlrOu4MQVEvtjyHw1kmu85+l0j9f2CQWEffeqVwoHF5GTtQOXev4PMyqRfSSYI6dRsseag=="; + url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.7.4.tgz"; + sha512 = "WCYARJaSpcItFvxPFdRXTO9s26HbYFazL3wSlZ7HuL4tiML/7AfPD4wO3J7fgBn1ghU5NGJ7YZIL+oPmiuw6+Q=="; }; dependencies = [ - sources."ansi-escapes-3.1.0" + sources."abab-2.0.0" + sources."acorn-6.1.1" + sources."acorn-globals-4.3.0" + sources."acorn-walk-6.1.1" + sources."ajv-6.10.0" + sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" + sources."array-equal-1.0.0" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."async-limiter-1.0.0" sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.8.0" + sources."bcrypt-pbkdf-1.0.2" sources."big-integer-1.6.36" + sources."browser-process-hrtime-0.1.3" + sources."caseless-0.12.0" sources."chalk-2.4.1" sources."chardet-0.7.0" sources."cli-cursor-2.1.0" @@ -497,44 +1276,122 @@ in sources."color-name-1.1.3" sources."combined-stream-1.0.6" sources."commander-2.18.0" + sources."core-util-is-1.0.2" + sources."cssom-0.3.6" + sources."cssstyle-1.2.2" + sources."dashdash-1.14.1" + sources."data-urls-1.1.0" + sources."deep-is-0.1.3" sources."delayed-stream-1.0.0" + sources."domexception-1.0.1" + sources."ecc-jsbn-0.1.2" sources."escape-string-regexp-1.0.5" + sources."escodegen-1.11.1" + sources."esprima-3.1.3" + sources."estraverse-4.2.0" + sources."esutils-2.0.2" + sources."extend-3.0.2" sources."external-editor-3.0.3" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-2.0.1" + sources."fast-json-stable-stringify-2.0.0" + sources."fast-levenshtein-2.0.6" sources."figures-2.0.0" + sources."forever-agent-0.6.1" sources."form-data-2.3.2" + sources."getpass-0.1.7" sources."graceful-fs-4.1.15" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" sources."has-flag-3.0.0" + sources."html-encoding-sniffer-1.0.2" + sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" sources."inquirer-6.2.0" sources."is-fullwidth-code-point-2.0.0" sources."is-promise-2.1.0" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."jsdom-13.2.0" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."levn-0.3.0" sources."lodash-4.17.11" + sources."lodash.sortby-4.7.0" sources."lowdb-1.0.0" sources."lunr-2.3.3" - sources."mime-db-1.37.0" - sources."mime-types-2.1.21" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."mimic-fn-1.2.0" sources."mute-stream-0.0.7" sources."node-fetch-2.2.0" sources."node-forge-0.7.6" + sources."nwsapi-2.1.3" + sources."oauth-sign-0.9.0" sources."onetime-2.0.1" + sources."optionator-0.8.2" sources."os-tmpdir-1.0.2" sources."papaparse-4.6.0" + sources."parse5-5.1.0" + sources."performance-now-2.1.0" sources."pify-3.0.0" - sources."punycode-1.4.1" + sources."pn-1.1.0" + sources."prelude-ls-1.1.2" + sources."psl-1.1.31" + sources."punycode-2.1.1" + sources."qs-6.5.2" + (sources."request-2.88.0" // { + dependencies = [ + sources."punycode-1.4.1" + sources."tough-cookie-2.4.3" + ]; + }) + sources."request-promise-core-1.1.2" + sources."request-promise-native-1.0.7" sources."restore-cursor-2.0.0" sources."run-async-2.3.0" - sources."rxjs-6.3.3" + sources."rxjs-6.4.0" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" + sources."saxes-3.1.9" sources."signal-exit-3.0.2" + sources."source-map-0.6.1" + sources."sshpk-1.16.1" + sources."stealthy-require-1.1.1" sources."steno-0.4.4" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."supports-color-5.5.0" + sources."symbol-tree-3.2.2" sources."through-2.3.8" - sources."tldjs-2.3.1" + (sources."tldjs-2.3.1" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tmp-0.0.33" + sources."tough-cookie-2.5.0" + sources."tr46-1.0.1" sources."tslib-1.9.3" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-check-0.3.2" + sources."uri-js-4.2.2" + sources."uuid-3.3.2" + sources."verror-1.10.0" + sources."w3c-hr-time-1.0.1" + sources."w3c-xmlserializer-1.1.2" + sources."webidl-conversions-4.0.2" + sources."whatwg-encoding-1.0.5" + sources."whatwg-mimetype-2.3.0" + sources."whatwg-url-7.0.0" + sources."wordwrap-1.0.0" + sources."ws-6.2.1" + sources."xml-name-validator-3.0.0" + sources."xmlchars-1.3.1" sources."zxcvbn-4.4.2" ]; buildInputs = globalBuildInputs; @@ -544,6 +1401,6 @@ in license = "GPL-3.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages.nix b/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages.nix index 0b559600b1b4..6fb6421eb2db 100644 --- a/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages.nix +++ b/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/nixpkgs/pkgs/tools/security/browserpass/default.nix b/nixpkgs/pkgs/tools/security/browserpass/default.nix index c1c9e679f22c..055444d5566d 100644 --- a/nixpkgs/pkgs/tools/security/browserpass/default.nix +++ b/nixpkgs/pkgs/tools/security/browserpass/default.nix @@ -8,13 +8,13 @@ let v2 = callPackage ./2.nix {}; in buildGoPackage rec { pname = "browserpass"; - version = "3.0.1"; + version = "3.0.6"; src = fetchFromGitHub { owner = "browserpass"; repo = "browserpass-native"; rev = version; - sha256 = "1i3xxysiiapz9y2v0gp13inx7j0d7n0khpmcsy9k95pzn53526dx"; + sha256 = "0q3bsla07zjl6i69nj1axbkg2ia89pvh0jg6nlqgbm2kpzzbn0pz"; }; nativeBuildInputs = [ makeWrapper ]; @@ -27,6 +27,8 @@ in buildGoPackage rec { # variables to be valid by default substituteInPlace Makefile \ --replace "PREFIX ?= /usr" "" + sed -i -e 's/SED :=.*/SED := sed/' Makefile + sed -i -e 's/INSTALL :=.*/INSTALL := install/' Makefile ''; DESTDIR = placeholder "bin"; diff --git a/nixpkgs/pkgs/tools/security/eid-mw/default.nix b/nixpkgs/pkgs/tools/security/eid-mw/default.nix index 9ac62dc334f7..155c63c87e13 100644 --- a/nixpkgs/pkgs/tools/security/eid-mw/default.nix +++ b/nixpkgs/pkgs/tools/security/eid-mw/default.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { name = "eid-mw-${version}"; - version = "4.4.13"; + version = "4.4.16"; src = fetchFromGitHub { - sha256 = "14bgn2k0xbd6241qdghg787pgxy7k9rvcspaf74zwwyibaqknzyx"; + sha256 = "1q82fw63xzrnrgh1wyh457hal6vfdl6swqfq7l6kviywiwlzx7kd"; rev = "v${version}"; repo = "eid-mw"; owner = "Fedict"; @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { let eid-nssdb-in = substituteAll { inherit (stdenv) shell; + isExecutable = true; src = ./eid-nssdb.in; }; in diff --git a/nixpkgs/pkgs/tools/security/eid-mw/eid-nssdb.in b/nixpkgs/pkgs/tools/security/eid-mw/eid-nssdb.in index fc05a20a6758..636b4c1ee118 100644 --- a/nixpkgs/pkgs/tools/security/eid-mw/eid-nssdb.in +++ b/nixpkgs/pkgs/tools/security/eid-mw/eid-nssdb.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!@shell@ rootdb="/etc/pki/nssdb" userdb="$HOME/.pki/nssdb" diff --git a/nixpkgs/pkgs/tools/security/lastpass-cli/default.nix b/nixpkgs/pkgs/tools/security/lastpass-cli/default.nix index 0415b10b25d8..37da20225205 100644 --- a/nixpkgs/pkgs/tools/security/lastpass-cli/default.nix +++ b/nixpkgs/pkgs/tools/security/lastpass-cli/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "lastpass-cli"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "lastpass"; repo = pname; rev = "v${version}"; - sha256 = "12qjqvqzi3pq7hrdpq59bcxqy6yj1mhx145g9rky1jm2ipzpfayq"; + sha256 = "168jg8kjbylfgalhicn0llbykd7kdc9id2989gg0nxlgmnvzl58a"; }; nativeBuildInputs = [ asciidoc cmake docbook_xsl pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/security/lynis/default.nix b/nixpkgs/pkgs/tools/security/lynis/default.nix index ceff23911c7e..dfbda2b5e073 100644 --- a/nixpkgs/pkgs/tools/security/lynis/default.nix +++ b/nixpkgs/pkgs/tools/security/lynis/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "lynis"; - version = "2.7.2"; + version = "2.7.3"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "CISOfy"; repo = "${pname}"; rev = "${version}"; - sha256 = "0dbbfk47dpxx7zpb98n4w3ls3z5di57qnr2nsgxjvp49gk9j3f6k"; + sha256 = "0md1w86i3fy9l78i98ijr5136nbhdiik2dxyw9qnzmvdlvkqmw70"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/security/notary/default.nix b/nixpkgs/pkgs/tools/security/notary/default.nix index 071bfdaea005..221817b004df 100644 --- a/nixpkgs/pkgs/tools/security/notary/default.nix +++ b/nixpkgs/pkgs/tools/security/notary/default.nix @@ -30,7 +30,7 @@ buildGoPackage rec { runHook postInstall ''; - doCheck = true; + #doCheck = true; # broken by tzdata: 2018g -> 2019a checkPhase = '' make test PKGS=github.com/theupdateframework/notary/cmd/notary ''; diff --git a/nixpkgs/pkgs/tools/security/proxmark3/default.nix b/nixpkgs/pkgs/tools/security/proxmark3/default.nix new file mode 100644 index 000000000000..afaed796057c --- /dev/null +++ b/nixpkgs/pkgs/tools/security/proxmark3/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, pkgconfig, ncurses, readline }: + +stdenv.mkDerivation rec { + pname = "proxmark3"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "Proxmark"; + repo = pname; + rev = "v${version}"; + sha256 = "1qw28n1bhhl91ix77lv50qcr919fq3hjc8zhhqphwxal2svgx2jf"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses readline ]; + + postPatch = '' + substituteInPlace client/Makefile --replace '-ltermcap' ' ' + substituteInPlace liblua/Makefile --replace '-ltermcap' ' ' + ''; + + preBuild = '' + cd client + ''; + + installPhase = '' + mkdir -p $out/bin + cp proxmark3 $out/bin + ''; + + meta = with stdenv.lib; { + description = "Client for proxmark3, powerful general purpose RFID tool"; + homepage = http://www.proxmark.org; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/vault/default.nix b/nixpkgs/pkgs/tools/security/vault/default.nix index bf5d34a8dd15..86cc6221a5c1 100644 --- a/nixpkgs/pkgs/tools/security/vault/default.nix +++ b/nixpkgs/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "vault-${version}"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1c5v1m8b6nm28mjwpsgc73n8q475pkzpdvyx46rf3xyrh01rfrnz"; + sha256 = "11hyqqpfz839ipqv534vvljyarnr9wn98rzvyfwnx2lq76h2adqn"; }; nativeBuildInputs = [ go gox removeReferencesTo ]; diff --git a/nixpkgs/pkgs/tools/security/vulnix/default.nix b/nixpkgs/pkgs/tools/security/vulnix/default.nix index c1fd40f24c68..96c3e78b6a7c 100644 --- a/nixpkgs/pkgs/tools/security/vulnix/default.nix +++ b/nixpkgs/pkgs/tools/security/vulnix/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "vulnix"; - version = "1.8.0"; + version = "1.8.1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "15j8zz7qmf6c6vhim08yn1knn0qhwypmc7bxw608zg5nf50vghyb"; + sha256 = "1kpwqsnz7jisi622halzl4s5q42d76nbq6ra800gscnfx48hqw9r"; }; outputs = [ "out" "doc" "man" ]; diff --git a/nixpkgs/pkgs/tools/system/facter/default.nix b/nixpkgs/pkgs/tools/system/facter/default.nix index d775df98aac9..899d9aa795ae 100644 --- a/nixpkgs/pkgs/tools/system/facter/default.nix +++ b/nixpkgs/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.13.0"; + version = "3.13.1"; src = fetchFromGitHub { - sha256 = "1sqj8777vwb2izm86y74sivbpyxcx95sflgjn0pbqni311ck972v"; + sha256 = "1cj56s3gghkja4zrcyzhrwq5ac0r7zjfgj7jzp0i56vdv8a1mihr"; rev = version; repo = "facter"; owner = "puppetlabs"; diff --git a/nixpkgs/pkgs/tools/system/goreman/default.nix b/nixpkgs/pkgs/tools/system/goreman/default.nix new file mode 100644 index 000000000000..d58d19fd6ed1 --- /dev/null +++ b/nixpkgs/pkgs/tools/system/goreman/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoPackage, fetchFromGitHub }: +buildGoPackage rec { + name = "goreman-${version}"; + version = "0.2.1"; + + goPackagePath = "github.com/mattn/goreman"; + subPackages = ["."]; + + src = fetchFromGitHub { + owner = "mattn"; + repo = "goreman"; + rev = "v${version}"; + sha256 = "1h7ip788j7bkygahpp7ylgnrx9jrbhwjzqpjhd1pflmlaxcbflcy"; + }; + + meta = with lib; { + description = "foreman clone written in go language"; + homepage = "https://github.com/mattn/goreman"; + license = licenses.mit; + maintainers = with maintainers; [ zimbatm ]; + }; +} + diff --git a/nixpkgs/pkgs/tools/system/gotop/default.nix b/nixpkgs/pkgs/tools/system/gotop/default.nix index 745139f9e50b..daf9ce58c911 100644 --- a/nixpkgs/pkgs/tools/system/gotop/default.nix +++ b/nixpkgs/pkgs/tools/system/gotop/default.nix @@ -1,16 +1,16 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gotop-${version}"; - version = "2.0.1"; + pname = "gotop"; + version = "3.0.0"; goPackagePath = "github.com/cjbassi/gotop"; src = fetchFromGitHub { - repo = "gotop"; owner = "cjbassi"; + repo = pname; rev = version; - sha256 = "0xpm8nrn53kz65f93czflgdgr2a33qfi1w0gsgngrmaliq1vlpji"; + sha256 = "1kndj5qjaqgizjakh642fay2i0i1jmfjlk1p01gnjbh2b0yzvj1r"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/system/ior/default.nix b/nixpkgs/pkgs/tools/system/ior/default.nix index ead7970da860..ad7715f0fe69 100644 --- a/nixpkgs/pkgs/tools/system/ior/default.nix +++ b/nixpkgs/pkgs/tools/system/ior/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { preConfigure = "./bootstrap"; meta = with stdenv.lib; { - homepage = http://www.nersc.gov/users/computational-systems/cori/nersc-8-procurement/trinity-nersc-8-rfp/nersc-8-trinity-benchmarks/ior/; + homepage = https://www.nersc.gov/users/computational-systems/cori/nersc-8-procurement/trinity-nersc-8-rfp/nersc-8-trinity-benchmarks/ior/; description = "Parallel file system I/O performance test"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/system/proot/default.nix b/nixpkgs/pkgs/tools/system/proot/default.nix index 2381ce6c0db1..c8028ed74a7c 100644 --- a/nixpkgs/pkgs/tools/system/proot/default.nix +++ b/nixpkgs/pkgs/tools/system/proot/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/GNUmakefile \ --replace /bin/echo ${coreutils}/bin/echo + # our cross machinery defines $CC and co just right + sed -i /CROSS_COMPILE/d src/GNUmakefile ''; buildInputs = [ talloc ] ++ stdenv.lib.optional enablePython python; diff --git a/nixpkgs/pkgs/tools/system/stress-ng/default.nix b/nixpkgs/pkgs/tools/system/stress-ng/default.nix index 8237a4928a0b..a31ce8f65e4b 100644 --- a/nixpkgs/pkgs/tools/system/stress-ng/default.nix +++ b/nixpkgs/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "stress-ng-${version}"; - version = "0.09.54"; + version = "0.09.57"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.xz"; - sha256 = "0qbgabrxm8aj4a6bgf55mi7rv9sqcgl3kkm7j3qhkqjfn9rqzslb"; + sha256 = "0xp55m1kif8hcjdcdhgaarghqf1gz5fa24qwl6zpmxkzl6bn002x"; }; # All platforms inputs then Linux-only ones diff --git a/nixpkgs/pkgs/tools/text/csvkit/default.nix b/nixpkgs/pkgs/tools/text/csvkit/default.nix index 1ff9cee241c6..f581e44bcc8a 100644 --- a/nixpkgs/pkgs/tools/text/csvkit/default.nix +++ b/nixpkgs/pkgs/tools/text/csvkit/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "csvkit"; - version = "1.0.3"; + version = "1.0.4"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "a6c859c1321d4697dc41252877249091681297f093e08d9c1e1828a6d52c260c"; + sha256 = "1830lb95rh1iyi3drlwxzb6y3pqkii0qiyzd40c1kvhvaf1s6lqk"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/tools/text/fanficfare/default.nix b/nixpkgs/pkgs/tools/text/fanficfare/default.nix index 3315d435afbb..a865859b1864 100644 --- a/nixpkgs/pkgs/tools/text/fanficfare/default.nix +++ b/nixpkgs/pkgs/tools/text/fanficfare/default.nix @@ -1,19 +1,25 @@ -{ stdenv, fetchurl, python27Packages }: +{ stdenv, fetchFromGitHub, python3Packages }: -python27Packages.buildPythonApplication rec { - version = "3.1.1"; - name = "fanficfare-${version}"; - nameprefix = ""; +python3Packages.buildPythonApplication rec { + pname = "FanFicFare"; + version = "3.6.0"; - src = fetchurl { - url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz"; - sha256 = "1wklii24vbvq2vi5pqgp3z4lazcplh2i7r2w4d8lkm6pzbw0s8px"; + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "1ir3m8wknr8shdbmbpiaw73mdpa7mvidkl6pbs9ca23mgwivxa84"; }; - propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ]; + propagatedBuildInputs = with python3Packages; [ + beautifulsoup4 + chardet + html5lib + html2text + ]; + + doCheck = false; # no tests exist meta = with stdenv.lib; { - description = "FanFicFare is a tool for making eBooks from fanfiction web sites"; + description = "Tool for making eBooks from fanfiction web sites"; homepage = https://github.com/JimmXinu/FanFicFare; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/text/link-grammar/default.nix b/nixpkgs/pkgs/tools/text/link-grammar/default.nix index 294aa1576801..e565b37fc9ee 100644 --- a/nixpkgs/pkgs/tools/text/link-grammar/default.nix +++ b/nixpkgs/pkgs/tools/text/link-grammar/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "5.5.1"; + version = "5.6.0"; pname = "link-grammar"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz"; - sha256 = "1x8kj1yr3b7b6qrvc5b8mm90ff3m4qdbdqplvzii2xlkpvik92ff"; + sha256 = "0v4hn72npjlcf5aaw3kqmvf05vf15mp2r1s2nbj5ggxpprjj6dsm"; }; nativeBuildInputs = [ pkgconfig python3 ]; diff --git a/nixpkgs/pkgs/tools/text/ripgrep/default.nix b/nixpkgs/pkgs/tools/text/ripgrep/default.nix index 81c88ecad9e5..00a16abb70af 100644 --- a/nixpkgs/pkgs/tools/text/ripgrep/default.nix +++ b/nixpkgs/pkgs/tools/text/ripgrep/default.nix @@ -4,17 +4,17 @@ }: rustPlatform.buildRustPackage rec { - name = "ripgrep-${version}"; - version = "0.10.0"; + pname = "ripgrep"; + version = "11.0.1"; src = fetchFromGitHub { owner = "BurntSushi"; - repo = "ripgrep"; + repo = pname; rev = version; - sha256 = "017fz5kv1kv9jz7mb7vcxrklf5vybvfz2x61g6myzshqz4z1v1yb"; + sha256 = "0vak82d4vyw0w8agswbyxa6g3zs2h9mxm2xjw0xs9qccvmi7whbb"; }; - cargoSha256 = "0k2b2vbklfdjk2zdc8ip480drc12gy1whlwj94p44hr3402azcgr"; + cargoSha256 = "0i31d0m145dsjfix589p5pfp83qp3a5wvz1v9sp4bxn3rggmw734"; cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2"; diff --git a/nixpkgs/pkgs/tools/text/shfmt/default.nix b/nixpkgs/pkgs/tools/text/shfmt/default.nix index 2ab568ba8416..12b57cb82dfd 100644 --- a/nixpkgs/pkgs/tools/text/shfmt/default.nix +++ b/nixpkgs/pkgs/tools/text/shfmt/default.nix @@ -2,16 +2,16 @@ buildGoPackage rec { name = "shfmt-${version}"; - version = "1.1.0"; - rev = "v${version}"; + version = "2.6.4"; - goPackagePath = "github.com/mvdan/sh"; + goPackagePath = "mvdan.cc/sh"; + subPackages = ["cmd/shfmt"]; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; - inherit rev; - sha256 = "0h1qy27z6j1cgkk3hkvl7w3wjqc5flgn92r3j6frn8k2wzwj7zhz"; + rev = "v${version}"; + sha256 = "1jifac0fi0sz6wzdgvk6s9xwpkdng2hj63ldbaral8n2j9km17hh"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/text/vale/default.nix b/nixpkgs/pkgs/tools/text/vale/default.nix index cb1780a6903c..7c21e621ea6d 100644 --- a/nixpkgs/pkgs/tools/text/vale/default.nix +++ b/nixpkgs/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "vale-${version}"; - version = "1.3.2"; + version = "1.4.0"; goPackagePath = "github.com/errata-ai/vale"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "0jpklca4m6wpndy6spj30s6ssb5y9ysyncxj7i6fg2g0m4dzzh8w"; + sha256 = "05vrnmw7kpgxf2989jvmkwj9c3mv3zkr4z5rpmsplnhvgsnidg4g"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/text/xml/jing-trang/default.nix b/nixpkgs/pkgs/tools/text/xml/jing-trang/default.nix index 3c2b4f5e8854..f764a2fac07d 100644 --- a/nixpkgs/pkgs/tools/text/xml/jing-trang/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/jing-trang/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "A RELAX NG validator in Java"; # The homepage is www.thaiopensource.com, but it links to googlecode.com # for downloads and call it the "project site". - homepage = "http://www.thaiopensource.com/relaxng/trang.html"; + homepage = https://www.thaiopensource.com/relaxng/trang.html; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; diff --git a/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix b/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix index 7001b6e36423..8c4b93ab2656 100644 --- a/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix @@ -47,7 +47,7 @@ bundlerApp { meta = with lib; { description = "A faster Asciidoc processor written in Ruby"; - homepage = http://asciidoctor.org/; + homepage = https://asciidoctor.org/; license = licenses.mit; maintainers = with maintainers; [ gpyh ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix index 33937c7c53b4..9988bcc3585c 100644 --- a/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "amazon-ecs-cli-${version}"; - version = "1.12.1"; + version = "1.13.1"; src = fetchurl { url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-v${version}"; - sha256 = "100iv4cchnxl1s02higga5v3hvawi4c7sqva97x34qigr4r7fxwm"; + sha256 = "0wiq32szmy2vk7yjjrcfisl9wrydcyiw986vhk0haidxkgw0gkv0"; }; unpackPhase = ":"; diff --git a/nixpkgs/pkgs/tools/virtualization/govc/default.nix b/nixpkgs/pkgs/tools/virtualization/govc/default.nix index 527c47ffc34c..f2fdbcc670d9 100644 --- a/nixpkgs/pkgs/tools/virtualization/govc/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "govc-${version}"; - version = "0.16.0"; + version = "0.20.0"; goPackagePath = "github.com/vmware/govmomi"; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "09fllx7l2hsjrv1jl7g06xngjy0xwn5n5zng6x8dspgsl6kblyqp"; + sha256 = "16pgjhlps21vk3cb5h2y0b6skq095rd8kl0618rwrz84chdnzahk"; }; meta = { |