diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-02 17:45:43 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-02 17:45:43 +0000 |
commit | 0ae3aa5345b2840a7490e9f17a7d1c5cf1b2f6ad (patch) | |
tree | 95192e22f190544123158498760d92b83d1b8416 | |
parent | fc393d5731026ad533167bce923152c82d10b064 (diff) | |
parent | 6221ec58af5b7b1b9a71d6ceacf1135285a10263 (diff) |
Merge master into staging-next
64 files changed, 795 insertions, 510 deletions
diff --git a/doc/languages-frameworks/coq.section.md b/doc/languages-frameworks/coq.section.md index 38bf7db18506b..6a5c72cb0a943 100644 --- a/doc/languages-frameworks/coq.section.md +++ b/doc/languages-frameworks/coq.section.md @@ -31,7 +31,7 @@ The recommended way of defining a derivation for a Coq library, is to use the `c * `releaseRev` (optional, defaults to `(v: v)`), provides a default mapping from release names to revision hashes/branch names/tags, * `displayVersion` (optional), provides a way to alter the computation of `name` from `pname`, by explaining how to display version numbers, * `namePrefix` (optional, defaults to `[ "coq" ]`), provides a way to alter the computation of `name` from `pname`, by explaining which dependencies must occur in `name`, -* `nativeBuildInputs` (optional), is a list of executables that are required to build the current derivation, in addition to the default ones (namely `which`, `dune` and `ocaml` depending on whether `useDune2`, `useDune2ifVersion` and `mlPlugin` are set). +* `nativeBuildInputs` (optional), is a list of executables that are required to build the current derivation, in addition to the default ones (namely `which`, `dune` and `ocaml` depending on whether `useDune`, `useDuneifVersion` and `mlPlugin` are set). * `extraNativeBuildInputs` (optional, deprecated), an additional list of derivation to add to `nativeBuildInputs`, * `overrideNativeBuildInputs` (optional) replaces the default list of derivation to which `nativeBuildInputs` and `extraNativeBuildInputs` adds extra elements, * `buildInputs` (optional), is a list of libraries and dependencies that are required to build and run the current derivation, in addition to the default one `[ coq ]`, @@ -39,8 +39,8 @@ The recommended way of defining a derivation for a Coq library, is to use the `c * `overrideBuildInputs` (optional) replaces the default list of derivation to which `buildInputs` and `extraBuildInputs` adds extras elements, * `propagatedBuildInputs` (optional) is passed as is to `mkDerivation`, we recommend to use this for Coq libraries and Coq plugin dependencies, as this makes sure the paths of the compiled libraries and plugins will always be added to the build environements of subsequent derivation, which is necessary for Coq packages to work correctly, * `mlPlugin` (optional, defaults to `false`). Some extensions (plugins) might require OCaml and sometimes other OCaml packages. Standard dependencies can be added by setting the current option to `true`. For a finer grain control, the `coq.ocamlPackages` attribute can be used in `nativeBuildInputs`, `buildInputs`, and `propagatedBuildInputs` to depend on the same package set Coq was built against. -* `useDune2ifVersion` (optional, default to `(x: false)` uses Dune2 to build the package if the provided predicate evaluates to true on the version, e.g. `useDune2ifVersion = versions.isGe "1.1"` will use dune if the version of the package is greater or equal to `"1.1"`, -* `useDune2` (optional, defaults to `false`) uses Dune2 to build the package if set to true, the presence of this attribute overrides the behavior of the previous one. +* `useDuneifVersion` (optional, default to `(x: false)` uses Dune to build the package if the provided predicate evaluates to true on the version, e.g. `useDuneifVersion = versions.isGe "1.1"` will use dune if the version of the package is greater or equal to `"1.1"`, +* `useDune` (optional, defaults to `false`) uses Dune to build the package if set to true, the presence of this attribute overrides the behavior of the previous one. * `opam-name` (optional, defaults to concatenating with a dash separator the components of `namePrefix` and `pname`), name of the Dune package to build. * `enableParallelBuilding` (optional, defaults to `true`), since it is activated by default, we provide a way to disable it. * `extraInstallFlags` (optional), allows to extend `installFlags` which initializes the variable `COQMF_COQLIB` so as to install in the proper subdirectory. Indeed Coq libraries should be installed in `$(out)/lib/coq/${coq.coq-version}/user-contrib/`. Such directories are automatically added to the `$COQPATH` environment variable by the hook defined in the Coq derivation. diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 8494b62e6ff05..ad08caf3ce5c8 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -505,14 +505,6 @@ </listitem> <listitem> <para> - The (previously undocumented) Nixpkgs configuration option - <literal>checkMeta</literal> now defaults to - <literal>true</literal>. This may cause evaluation failures - for packages with incorrect <literal>meta</literal> attribute. - </para> - </listitem> - <listitem> - <para> xow package removed along with the <literal>hardware.xow</literal> module, due to the project being deprecated in favor of <literal>xone</literal>, which is diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index a5ba4841f549b..85c35b993ac4c 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -172,9 +172,6 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - riak package removed along with `services.riak` module, due to lack of maintainer to update the package. -- The (previously undocumented) Nixpkgs configuration option `checkMeta` now defaults to `true`. This may cause evaluation - failures for packages with incorrect `meta` attribute. - - xow package removed along with the `hardware.xow` module, due to the project being deprecated in favor of `xone`, which is available via the `hardware.xone` module. - dd-agent package removed along with the `services.dd-agent` module, due to the project being deprecated in favor of `datadog-agent`, which is available via the `services.datadog-agent` module. diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index 29aa49c8aadaa..e208eed008ae0 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/nixos/modules/services/security/fail2ban.nix @@ -91,8 +91,9 @@ in example = "nftables-multiport"; description = lib.mdDoc '' Default banning action (e.g. iptables, iptables-new, iptables-multiport, - shorewall, etc) It is used to define action_* variables. Can be overridden - globally or per section within jail.local file + iptables-ipset-proto6-allports, shorewall, etc) It is used to + define action_* variables. Can be overridden globally or per + section within jail.local file ''; }; @@ -212,10 +213,18 @@ in filter = apache-nohome action = iptables-multiport[name=HTTP, port="http,https"] logpath = /var/log/httpd/error_log* + backend = auto findtime = 600 bantime = 600 maxretry = 5 '''; + dovecot = ''' + # block IPs which failed to log-in + # aggressive mode add blocking for aborted connections + enabled = true + filter = dovecot[mode=aggressive] + maxretry = 3 + '''; } ''; type = types.attrsOf types.lines; diff --git a/nixos/tests/vengi-tools.nix b/nixos/tests/vengi-tools.nix index 5bc8d72c77237..fd7567991487e 100644 --- a/nixos/tests/vengi-tools.nix +++ b/nixos/tests/vengi-tools.nix @@ -20,10 +20,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.wait_for_x() machine.execute("vengi-voxedit >&2 &") machine.wait_for_window("voxedit") - # OCR on voxedit's window is very expensive, so we avoid wasting a try - # by letting the window load fully first + # Let the window load fully machine.sleep(15) - machine.wait_for_text("Solid") machine.screenshot("screen") ''; }) diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index 31a197071045e..48bae2b59bd5a 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -132,7 +132,7 @@ stdenv.mkDerivation rec { description = "The Linux desktop music player from the future"; homepage = "https://tauonmusicbox.rocks/"; license = licenses.gpl3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ jansol ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index baaeea48ddd76..d9ab6cf89a212 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1087,3 +1087,4 @@ https://github.com/ziglang/zig.vim/,, https://github.com/mickael-menu/zk-nvim/,HEAD, https://github.com/troydm/zoomwintab.vim/,, https://github.com/nanotee/zoxide.vim/,, +https://github.com/anuvyklack/windows.nvim/,, diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix new file mode 100644 index 0000000000000..121a1708a5b78 --- /dev/null +++ b/pkgs/applications/file-managers/felix-fm/default.nix @@ -0,0 +1,25 @@ +{ lib, rustPlatform, fetchFromGitHub, zoxide }: + +rustPlatform.buildRustPackage rec { + pname = "felix"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "kyoheiu"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-7WeikYd/mADsp9DQ0jelhuZo5ZiyJrHG9HBg/YLpjZY="; + }; + + cargoSha256 = "sha256-IUiyDk+TRfODXQ+45ARcFximkLVk32pqvJfn23H0kAw="; + + checkInputs = [ zoxide ]; + + meta = with lib; { + description = "A tui file manager with vim-like key mapping"; + homepage = "https://github.com/kyoheiu/felix"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "fx"; + }; +} diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index fb44d36f62a6d..d54d4e06f0d46 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "vengi-tools"; - version = "0.0.20"; + version = "0.0.21"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; rev = "v${version}"; - sha256 = "sha256-WsG6mjO90QQNsAarxdupZvXubdy06JjQmVYUzygl8l4="; + sha256 = "sha256-T9YBU/YhhOASdKnzLcwQGBLc4HcQspiOV9VRgotfq3c="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix index 1c590451a9b86..5ab3694728ad1 100644 --- a/pkgs/applications/misc/etesync-dav/default.nix +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -62,7 +62,7 @@ in python.pkgs.buildPythonApplication rec { homepage = "https://www.etesync.com/"; description = "Secure, end-to-end encrypted, and privacy respecting sync for contacts, calendars and tasks"; license = licenses.gpl3; - maintainers = with maintainers; [ valodim ]; + maintainers = with maintainers; [ thyol valodim ]; broken = stdenv.isDarwin; # pyobjc-framework-Cocoa is missing }; } diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 1d9b10bfc39b3..365cac59f41ad 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -10,7 +10,7 @@ , which , bzip2 , cyrus_sasl -, protobuf3_7 +, protobuf , snappy , zlib , zstd @@ -92,8 +92,8 @@ in pname = "hadoop"; platformAttrs = rec { x86_64-linux = { - version = "3.3.3"; - hash = "sha256-+nHGG7qkJxKa7wn+wCizTdVCxlrZD9zOxefvk9g7h2Q="; + version = "3.3.4"; + hash = "sha256-akg9GgsSNJDr2N8/cbZOs58zP3i5XwkK61jkM8vCQW0="; }; x86_64-darwin = x86_64-linux; aarch64-linux = { @@ -107,7 +107,7 @@ in jdk = jdk11_headless; inherit openssl; # TODO: Package and add Intel Storage Acceleration Library - nativeLibs = [ stdenv.cc.cc.lib protobuf3_7 zlib snappy ]; + nativeLibs = [ stdenv.cc.cc.lib protobuf zlib snappy ]; libPatches = '' ln -s ${getLib cyrus_sasl}/lib/libsasl2.so $out/lib/${untarDir}/lib/native/libsasl2.so.2 ln -s ${getLib openssl}/lib/libcrypto.so $out/lib/${untarDir}/lib/native/ @@ -119,14 +119,17 @@ in patchelf --add-rpath ${jdk.home}/lib/server $out/lib/${untarDir}/lib/native/libnativetask.so.1.0.0 # Java 8 has libjvm.so at a different path patchelf --add-rpath ${jdk.home}/jre/lib/amd64/server $out/lib/${untarDir}/lib/native/libnativetask.so.1.0.0 + # NixOS/nixpkgs#193370 + # This workaround is needed to use protobuf 3.19 + patchelf --replace-needed libprotobuf.so.18 libprotobuf.so $out/lib/${untarDir}/lib/native/libhdfspp.so ''; tests = nixosTests.hadoop; }; hadoop_3_2 = common rec { pname = "hadoop"; platformAttrs.x86_64-linux = { - version = "3.2.3"; - hash = "sha256-Q2/a1LcKutpJoGySB0qlCcYE2bvC/HoG/dp9nBikuNU="; + version = "3.2.4"; + hash = "sha256-qt2gpMr+NHuiVR+/zFRzRyRKG725/ZNBIM69z9J9wNw="; }; jdk = jdk8_headless; # not using native libs because of broken openssl_1_0_2 dependency diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 278332ca6a36d..40bab79b89718 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "372"; + version = "373"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - sha256 = "xtCBJ8skCcOgS8rlWbcCUZbtdwu3vyZjCry0XZX2CrE="; + sha256 = "sha256-3rCYlHOmOQi1qNRN/uqDAchxD2zgH7V86MMAAjdXRrY="; }; strictDeps = true; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index e870b8572d8de..f3d3bf38b634e 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -64,6 +64,7 @@ , systemd , taglib , unzip +, xlibsWrapper , xorg , zlib , chromecastSupport ? true, libmicrodns, protobuf @@ -149,6 +150,7 @@ stdenv.mkDerivation rec { srt systemd taglib + xlibsWrapper zlib ] ++ (with xorg; [ @@ -156,7 +158,6 @@ stdenv.mkDerivation rec { libXv libXvMC xcbutilkeysyms - xlibsWrapper ]) ++ optional (!stdenv.hostPlatform.isAarch && !onlyLibVLC) live555 ++ optional jackSupport libjack2 diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index b4f610c7a91d3..d88172a592bd0 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -12,6 +12,7 @@ , readline , shared-mime-info , xine-lib +, xlibsWrapper , xorg }: @@ -46,6 +47,7 @@ stdenv.mkDerivation rec { ncurses readline xine-lib + xlibsWrapper ] ++ (with xorg; [ libXext libXft @@ -54,7 +56,6 @@ stdenv.mkDerivation rec { libXtst libXv libXxf86vm - xlibsWrapper xorgproto ]); diff --git a/pkgs/build-support/coq/default.nix b/pkgs/build-support/coq/default.nix index 0dc5c999ea357..e0ba7b3e08c8c 100644 --- a/pkgs/build-support/coq/default.nix +++ b/pkgs/build-support/coq/default.nix @@ -30,8 +30,8 @@ in dropAttrs ? [], keepAttrs ? [], dropDerivationAttrs ? [], - useDune2ifVersion ? (x: false), - useDune2 ? false, + useDuneifVersion ? (x: false), + useDune ? false, opam-name ? (concatStringsSep "-" (namePrefix ++ [ pname ])), ... }@args: @@ -44,7 +44,7 @@ let "extraBuildInputs" "extraNativeBuildInputs" "overrideBuildInputs" "overrideNativeBuildInputs" "namePrefix" - "meta" "useDune2ifVersion" "useDune2" "opam-name" + "meta" "useDuneifVersion" "useDune" "opam-name" "extraInstallFlags" "setCOQBIN" "mlPlugin" "dropAttrs" "dropDerivationAttrs" "keepAttrs" ] ++ dropAttrs) keepAttrs; fetch = import ../coq/meta-fetch/default.nix @@ -65,7 +65,7 @@ let ] "") + optionalString (v == null) "-broken"; append-version = p: n: p + display-pkg n "" coqPackages.${n}.version + "-"; prefix-name = foldl append-version "" namePrefix; - useDune2 = args.useDune2 or (useDune2ifVersion fetched.version); + useDune = args.useDune or (useDuneifVersion fetched.version); coqlib-flags = switch coq.coq-version [ { case = v: versions.isLe "8.6" v && v != "dev" ; out = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; } @@ -85,8 +85,8 @@ stdenv.mkDerivation (removeAttrs ({ nativeBuildInputs = args.overrideNativeBuildInputs or ([ which coq.ocamlPackages.findlib ] - ++ optional useDune2 coq.ocamlPackages.dune_2 - ++ optional (useDune2 || mlPlugin) coq.ocamlPackages.ocaml + ++ optional useDune coq.ocamlPackages.dune_3 + ++ optional (useDune || mlPlugin) coq.ocamlPackages.ocaml ++ (args.nativeBuildInputs or []) ++ extraNativeBuildInputs); buildInputs = args.overrideBuildInputs or ([ coq ] ++ (args.buildInputs or []) ++ extraBuildInputs); @@ -107,7 +107,7 @@ stdenv.mkDerivation (removeAttrs ({ coqlib-flags ++ docdir-flags ++ extraInstallFlags; }) -// (optionalAttrs useDune2 { +// (optionalAttrs useDune { buildPhase = '' runHook preBuild dune build -p ${opam-name} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index 0f1d5b5a4cc03..4e29f23a158d6 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -1,26 +1,30 @@ -{ lib, fetchzip }: +{ lib, stdenv, fetchzip }: -fetchzip { - name = "ubuntu-font-family-0.83"; +stdenv.mkDerivation rec { + pname = "ubuntu-font-family"; + version = "0.83"; - url = "https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-0.83.zip"; + src = fetchzip { + url = "https://assets.ubuntu.com/v1/fad7939b-${pname}-${version}.zip"; + hash = "sha256-FAg1xn8Gcbwmuvqtg9SquSet4oTT9nqE+Izeq7ZMVcA="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/ubuntu + installPhase = '' + install -D -m 644 -t "$out/share/fonts/truetype" *.ttf ''; - sha256 = "090y665h4kf2bi623532l6wiwkwnpd0xds0jr7560xwfwys1hiqh"; + outputHashMode = "recursive"; + outputHash = "sha256-EEcYtOeOd2DKyRLo1kG7lk8euaFilCFMXMJNAosxHiQ="; - meta = { + meta = with lib; { description = "Ubuntu Font Family"; longDescription = "The Ubuntu typeface has been specially created to complement the Ubuntu tone of voice. It has a contemporary style and contains characteristics unique to the Ubuntu brand that convey a precise, reliable and free attitude."; homepage = "http://font.ubuntu.com/"; - license = lib.licenses.free; - platforms = lib.platforms.all; - maintainers = [ lib.maintainers.antono ]; + license = licenses.free; + platforms = platforms.all; + maintainers = with maintainers; [ antono ]; }; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index 0a84e0ea3ec58..f59bee32929bc 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libxml2, xorg, glib, pango +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libxml2, xlibsWrapper, glib, pango , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool , gnome_vfs, libgnome-keyring, libglade }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool ]; buildInputs = - [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome-keyring libglade libtool ]; + [ xlibsWrapper libxml2 GConf pango glib libgnome-keyring libglade libtool ]; propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ]; } diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix index 0e4baf3ce57ec..7feb364976e56 100644 --- a/pkgs/development/compilers/dale/default.nix +++ b/pkgs/development/compilers/dale/default.nix @@ -3,26 +3,24 @@ , cmake , pkg-config , libffi -, llvm_6 -, doCheck ? false +, llvm_13 , perl }: stdenv.mkDerivation { pname = "dale"; - version = "20181024"; + version = "20220411"; src = fetchFromGitHub { owner = "tomhrr"; repo = "dale"; - rev = "f5db8b486f4e7c423fc25941a8315f1209bc0e54"; - sha256 = "0v4ajrzrqvf279kd7wsd9flrpsav57lzxlwwimk9vnfwh7xpzf9v"; + rev = "7386ef2d8912c60c6fb157a1e5cd772e15eaf658"; + sha256 = "sha256-LNWqrFuEjtL7zuPTBfe4qQWr8IrT/ldQWSeDTK3Wqmo="; }; - nativeBuildInputs = [ cmake pkg-config llvm_6.dev ]; - buildInputs = [ libffi llvm_6 ]; + nativeBuildInputs = [ cmake pkg-config llvm_13.dev ]; + buildInputs = [ libffi llvm_13 ]; - inherit doCheck; checkInputs = [ perl ]; checkTarget = "tests"; @@ -36,8 +34,7 @@ stdenv.mkDerivation { homepage = "https://github.com/tomhrr/dale"; license = licenses.bsd3; maintainers = with maintainers; [ amiloradovsky ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; # failed on Darwin: linker couldn't find the FFI lib - # failed on AArch64: because LLVM 3.5 is failed there }; } diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix index 3c4d90ccb054c..0fb18de59f232 100644 --- a/pkgs/development/compilers/go-jsonnet/default.nix +++ b/pkgs/development/compilers/go-jsonnet/default.nix @@ -1,4 +1,9 @@ -{ lib, buildGoModule, fetchFromGitHub, testers }: +{ lib +, buildGoModule +, fetchFromGitHub +, fetchpatch +, testers +}: let self = buildGoModule rec { pname = "go-jsonnet"; @@ -6,12 +11,20 @@ let self = buildGoModule rec { src = fetchFromGitHub { owner = "google"; - repo = "go-jsonnet"; + repo = pname; rev = "v${version}"; - sha256 = "sha256-o/IjXskGaMhvQmTsAS745anGBMI2bwHf/EOEp57H8LU="; + hash = "sha256-o/IjXskGaMhvQmTsAS745anGBMI2bwHf/EOEp57H8LU="; }; - vendorSha256 = "sha256-fZBhlZrLcC4xj5uvb862lBOczGnJa9CceS3D8lUhBQo="; + patches = [ + (fetchpatch { + name = "update-x-sys-for-go-1.18-on-aarch64-darwin.patch"; + url = "https://github.com/google/go-jsonnet/commit/7032dd729f7e684dcfb2574f4fe99499165ef9cb.patch"; + hash = "sha256-emUcuE9Q4qkXFXLyLvLHjzrKAaQhjcSWLNafABvHxhM="; + }) + ]; + + vendorHash = "sha256-H4vLVXpuPkECB15LHoS9N9IwUD7Fzccshwbo5hjeXXc="; doCheck = false; diff --git a/pkgs/development/compilers/p4c/default.nix b/pkgs/development/compilers/p4c/default.nix index dac9011f575aa..b37c380c4c939 100644 --- a/pkgs/development/compilers/p4c/default.nix +++ b/pkgs/development/compilers/p4c/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "p4c"; - version = "1.2.3.1"; + version = "1.2.3.2"; src = fetchFromGitHub { owner = "p4lang"; repo = "p4c"; rev = "v${version}"; - sha256 = "sha256-mOswMUvr7LGN4GmczPUqNMUjs0c1Pc8SiC5k2Ou52Iw="; + sha256 = "sha256-EeTYH7CsmPPBL05zJ+g4aM677n0NqDD+H40lBuKpY6M="; fetchSubmodules = true; }; diff --git a/pkgs/development/coq-modules/addition-chains/default.nix b/pkgs/development/coq-modules/addition-chains/default.nix index 8de9a8e411cd8..63ba0e8050721 100644 --- a/pkgs/development/coq-modules/addition-chains/default.nix +++ b/pkgs/development/coq-modules/addition-chains/default.nix @@ -19,7 +19,7 @@ mkCoqDerivation { propagatedBuildInputs = [ mathcomp-ssreflect mathcomp-algebra mathcomp-fingroup paramcoq ]; - useDune2 = true; + useDune = true; meta = { description = "Exponentiation algorithms following addition chains"; diff --git a/pkgs/development/coq-modules/coqide/default.nix b/pkgs/development/coq-modules/coqide/default.nix index a827057a118b6..4e1f9e5f66628 100644 --- a/pkgs/development/coq-modules/coqide/default.nix +++ b/pkgs/development/coq-modules/coqide/default.nix @@ -22,7 +22,7 @@ with lib; mkCoqDerivation rec { ''; prefixKey = "-prefix "; - useDune2 = true; + useDune = true; buildInputs = [ copyDesktopItems diff --git a/pkgs/development/coq-modules/gaia-hydras/default.nix b/pkgs/development/coq-modules/gaia-hydras/default.nix index ce254aff78bb4..5377600caba42 100644 --- a/pkgs/development/coq-modules/gaia-hydras/default.nix +++ b/pkgs/development/coq-modules/gaia-hydras/default.nix @@ -21,7 +21,7 @@ with lib; mkCoqDerivation rec { mathcomp-zify ]; - useDune2 = true; + useDune = true; meta = { description = "Comparison between ordinals in Gaia and Hydra battles"; diff --git a/pkgs/development/coq-modules/hydra-battles/default.nix b/pkgs/development/coq-modules/hydra-battles/default.nix index d59afa53ac311..2729f7c213918 100644 --- a/pkgs/development/coq-modules/hydra-battles/default.nix +++ b/pkgs/development/coq-modules/hydra-battles/default.nix @@ -16,7 +16,7 @@ with lib; { case = range "8.11" "8.12"; out = "0.4"; } ] null; - useDune2 = true; + useDune = true; meta = { description = "Exploration of some properties of Kirby and Paris' hydra battles, with the help of Coq"; diff --git a/pkgs/development/coq-modules/mathcomp-word/default.nix b/pkgs/development/coq-modules/mathcomp-word/default.nix index f39fbe0ac6a6b..69735c801edd8 100644 --- a/pkgs/development/coq-modules/mathcomp-word/default.nix +++ b/pkgs/development/coq-modules/mathcomp-word/default.nix @@ -6,7 +6,7 @@ mkCoqDerivation { pname = "word"; owner = "jasmin-lang"; repo = "coqword"; - useDune2 = true; + useDune = true; releaseRev = v: "v${v}"; diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index 8144d87b9fbf4..57f4a381b2049 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -1,5 +1,5 @@ { coq, mkCoqDerivation, mathcomp, mathcomp-finmap, mathcomp-bigenough, - lib, version ? null, useDune2 ? false }@args: + lib, version ? null, useDune ? false }@args: with lib; mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; @@ -31,7 +31,7 @@ with lib; mkCoqDerivation { "1.0".sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; }; - useDune2ifVersion = v: versions.isGe "1.5.3" v || v == "dev"; + useDuneifVersion = v: versions.isGe "1.5.3" v || v == "dev"; preConfigure = '' patchShebangs configure || true @@ -45,4 +45,4 @@ with lib; mkCoqDerivation { license = licenses.cecill-c; }; } -// optionalAttrs (args?useDune2) { inherit useDune2; } +// optionalAttrs (args?useDune) { inherit useDune; } diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index 7c3b656da9138..e3ec9bfdc39ac 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -27,7 +27,7 @@ in { case = isEq "8.10"; out = "8.10.0+0.7.2"; } ] null; - useDune2 = true; + useDune = true; patches = [ ./janestreet-0.15.patch ]; diff --git a/pkgs/development/coq-modules/topology/default.nix b/pkgs/development/coq-modules/topology/default.nix index 37585eea8c79f..eb94912307a7f 100644 --- a/pkgs/development/coq-modules/topology/default.nix +++ b/pkgs/development/coq-modules/topology/default.nix @@ -25,7 +25,7 @@ mkCoqDerivation rec { propagatedBuildInputs = [ zorns-lemma ]; - useDune2ifVersion = versions.isGe "9.0"; + useDuneifVersion = versions.isGe "9.0"; meta = { description = "General topology in Coq"; diff --git a/pkgs/development/coq-modules/zorns-lemma/default.nix b/pkgs/development/coq-modules/zorns-lemma/default.nix index b003e15891d48..10f238ae6c110 100644 --- a/pkgs/development/coq-modules/zorns-lemma/default.nix +++ b/pkgs/development/coq-modules/zorns-lemma/default.nix @@ -25,7 +25,7 @@ with lib; { case = "8.5"; out = "8.5.0"; } ] null; - useDune2ifVersion = versions.isGe "9.0"; + useDuneifVersion = versions.isGe "9.0"; meta = { description = "Development of basic set theory"; diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index abd680ad23425..5aa19f665a82f 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "angelscript"; - version = "2.35.1"; + version = "2.36.0"; src = fetchurl { url = "https://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; - sha256 = "12x12fs2bjkbh73n2w84wnqhg6xn6mnp6g79gbkwfl6gssv9c42w"; + sha256 = "sha256-M/lfdZe8DYiwl9NeexMg0VQZ/8V3mFHZ0qbMzsV4EbM="; }; nativeBuildInputs = [ unzip cmake ]; diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix index e3abc6e5d62e4..5b04c168cf318 100644 --- a/pkgs/development/libraries/packr/default.nix +++ b/pkgs/development/libraries/packr/default.nix @@ -1,7 +1,7 @@ -{ buildGoModule +{ stdenv +, buildGoModule , fetchFromGitHub , lib - , symlinkJoin }: @@ -27,6 +27,14 @@ let p2 = buildGoModule rec { homepage = "https://github.com/gobuffalo/packr"; license = licenses.mit; maintainers = with maintainers; [ mmahut ]; + + # golang.org/x/sys needs to be updated due to: + # + # https://github.com/golang/go/issues/49219 + # + # but this package is no longer maintained. + # + broken = stdenv.isDarwin; }; }; p1 = buildGoModule rec { @@ -51,6 +59,14 @@ p1 = buildGoModule rec { homepage = "https://github.com/gobuffalo/packr"; license = licenses.mit; maintainers = with maintainers; [ mmahut ]; + + # golang.org/x/sys needs to be updated due to: + # + # https://github.com/golang/go/issues/49219 + # + # but this package is no longer maintained. + # + broken = stdenv.isDarwin; }; }; in diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index b519cf9596951..194a9a0c15cf0 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -6,6 +6,7 @@ , libusb1 , zlib , boost +, libev , libnova , curl , libjpeg @@ -15,13 +16,13 @@ stdenv.mkDerivation rec { pname = "indilib"; - version = "1.9.6"; + version = "1.9.8"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${version}"; - sha256 = "sha256-rElxc9q4i8FjjPmLXhu6GnHps6t3NWkfxtqAAeRq77M="; + sha256 = "sha256-+KFuZgM/Bl6Oezq3WXjWCHefc1wvR3wOKXejmT0pw1U="; }; nativeBuildInputs = [ @@ -31,6 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl cfitsio + libev libusb1 zlib boost diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix index d23673ac37ae8..660433c2dd599 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - for f in libfishcamp/CMakeLists.txt libsbig/CMakeLists.txt + for f in {libfishcamp,libsbig,libqhy}/CMakeLists.txt do substituteInPlace $f --replace "/lib/firmware" "lib/firmware" done diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix index a20c92dfaeba9..fae8b95cb28c2 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix @@ -1,12 +1,12 @@ { stdenv, lib, callPackage, fetchFromGitHub, indilib }: let - indi-version = "1.9.3"; + indi-version = "1.9.8"; indi-3rdparty-src = fetchFromGitHub { owner = "indilib"; repo = "indi-3rdparty"; rev = "v${indi-version}"; - sha256 = "sha256-TBccdheBEO48uIXd6tya6dytkzxaHg2+YancBkcL3bw="; + sha256 = "sha256-ZFbMyjMvAWcdsl+1TyX5/v5nY1DqvhZ2ckFBDe8gdQg="; }; indi-firmware = callPackage ./indi-firmware.nix { version = indi-version; diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index 2d6f6ef8d2921..649c1dbae27a5 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -4,7 +4,7 @@ , curl }: let - version = "2020.3.13"; + version = "2020.3.14"; shortVersion = builtins.substring 0 6 version; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-3AmQb9qLGBD+LLIrX1Fx0gi6kBxbnTkLrW0fP9ZsUeg="; + sha256 = "sha256-NbpHn1e9+TD+9/iSFBw16/CQMXYx3D/aSDhkSGdBT3Q="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/perl-modules/mod_perl2-PL_hash_seed.patch b/pkgs/development/perl-modules/mod_perl2-PL_hash_seed.patch deleted file mode 100644 index a8aac88de319d..0000000000000 --- a/pkgs/development/perl-modules/mod_perl2-PL_hash_seed.patch +++ /dev/null @@ -1,13 +0,0 @@ -From https://github.com/Perl/perl5/issues/18617#issuecomment-822056978 by Leont - ---- a/src/modules/perl/modperl_perl.c -+++ a/src/modules/perl/modperl_perl.c -@@ -268,7 +268,7 @@ - #ifdef MP_NEED_HASH_SEED_FIXUP - if (MP_init_hash_seed_set) { - #if MP_PERL_VERSION_AT_LEAST(5, 17, 6) -- memcpy(&PL_hash_seed, &MP_init_hash_seed, -+ memcpy(PL_hash_seed, &MP_init_hash_seed, - sizeof(PL_hash_seed) > sizeof(MP_init_hash_seed) ? - sizeof(MP_init_hash_seed) : sizeof(PL_hash_seed)); - PL_hash_seed_set = MP_init_hash_seed_set; diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 71a7e80269fe2..6f52d436046d7 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.2.2"; + version = "3.2.3"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cZEhSRzDSe4/hGAPPCkWtbuV1oYLlNkNNPj2PZedEiA="; + hash = "sha256-fWPl2SY0+NtnX70ErdiIf5B0qB/ULpuBn7py3YtSS2M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index e62a84ae91dde..3e58b91b16005 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -18,13 +18,14 @@ , typed-ast , typing-extensions , tomli +, types-setuptools , types-typed-ast , virtualenv }: buildPythonPackage rec { pname = "mypy"; - version = "0.971"; + version = "0.981"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -32,12 +33,13 @@ buildPythonPackage rec { owner = "python"; repo = "mypy"; rev = "refs/tags/v${version}"; - hash = "sha256-J1lUnJco9rLYgFpJkfujGfVq1CfC4pdvvDzoan3jGkU="; + hash = "sha256-CkRK/j5DRUZU2enpZtqX4l+89E7ODDG9MeRYFQp9kSs="; }; nativeBuildInputs = [ setuptools types-typed-ast + types-setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix index 4bc85a5cd08e0..76507a11e09b5 100644 --- a/pkgs/development/python-modules/tensorboardx/default.nix +++ b/pkgs/development/python-modules/tensorboardx/default.nix @@ -33,6 +33,10 @@ buildPythonPackage rec { substituteInPlace tensorboardX/pytorch_graph.py --replace \ "torch.onnx.set_training(model, False)" \ "torch.onnx.select_model_mode_for_export(model, torch.onnx.TrainingMode.EVAL)" + + # Version detection seems broken here, the version reported by python is + # newer than the protobuf package itself. + sed -i -e "s/'protobuf[^']*'/'protobuf'/" setup.py ''; # Wanted protobuf version is mentioned here: diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index dad3b14c4ca9d..9d3d1b71aa9d9 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -1,49 +1,56 @@ -{ lib, fetchFromGitHub, python3, nginx }: +{ lib, fetchFromGitHub, buildPythonApplication, isPy27 +, aiohttp +, appdirs +, beautifulsoup4 +, defusedxml +, devpi-common +, execnet +, itsdangerous +, nginx +, packaging +, passlib +, platformdirs +, pluggy +, pyramid +, pytest-flake8 +, pytestCheckHook +, repoze_lru +, setuptools +, strictyaml +, waitress +, webtest +}: -let - py = python3.override { - packageOverrides = self: super: { - # pyramid 2.0 no longer has a 'pyramid.compat' module - pyramid = super.pyramid.overridePythonAttrs (oldAttrs: rec { - version = "1.10.8"; - src = oldAttrs.src.override { - inherit version; - sha256 = "sha256-t81mWVvvkvgXZLl23d4rL6jk9fMl4C9l9ux/NwiynPY="; - }; - }); - }; - }; -in with py.pkgs; buildPythonApplication rec { pname = "devpi-server"; - version = "6.2.0"; + version = "6.7.0"; + + disabled = isPy27; src = fetchFromGitHub { owner = "devpi"; repo = "devpi"; - rev = "68ee291ef29a93f6d921d4927aec8d13919b4a4c"; - sha256 = "1ivd5dy9f2gq07w8n2gywa0n0d9wv8644l53ni9fz7i69jf8q2fm"; + rev = "server-${version}"; + hash = "sha256-tevQ/Ocusz2PythGnedP6r4xARgetVosAc8uTD49H3M="; }; sourceRoot = "source/server"; - postPatch = '' - substituteInPlace setup.py \ - --replace "pluggy>=0.6.0,<1.0" "pluggy>=0.6.0,<2.0" - ''; - propagatedBuildInputs = [ - py + aiohttp appdirs - devpi-common defusedxml + devpi-common execnet itsdangerous - repoze_lru + packaging passlib + platformdirs pluggy pyramid + repoze_lru + setuptools strictyaml waitress ] ++ passlib.optional-dependencies.argon2; @@ -51,10 +58,10 @@ buildPythonApplication rec { checkInputs = [ beautifulsoup4 nginx - pytestCheckHook pytest-flake8 + pytestCheckHook webtest - ] ++ lib.optionals isPy27 [ mock ]; + ]; # root_passwd_hash tries to write to store # TestMirrorIndexThings tries to write to /var through ngnix diff --git a/pkgs/development/tools/fblog/default.nix b/pkgs/development/tools/fblog/default.nix new file mode 100644 index 0000000000000..63592bb1359bd --- /dev/null +++ b/pkgs/development/tools/fblog/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "fblog"; + version = "4.1.0"; + + src = fetchFromGitHub { + owner = "brocode"; + repo = pname; + rev = "v${version}"; + sha256 = "1lj0cv1rmcqg36rxnnjh1dazn0sdggfc9kigjg3id6h0y8k7d9b3"; + }; + + cargoSha256 = "sha256-xHvnxRPxe09EmxUK9j7+V2AA1xJFP3ibwbkSs3FBgcw="; + + meta = with lib; { + description = "A small command-line JSON log viewer"; + homepage = "https://github.com/brocode/fblog"; + license = licenses.wtfpl; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index 983156c2c05dc..3bcc9523b9644 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.19.0"; + version = "0.20.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-gtqPt59jA4NhbaE9ij45oFEaAJ+l984lWEjloQtBSSE="; + sha256 = "sha256-59A3RPdltDfMDPTFbBHcnJoFEp718xvYgg6v4MvsxaQ="; }; - cargoSha256 = "sha256-j0bsuu+A5oCf+0pFM4PAQ3oqq9POc5rrzt5UR0RDnAw="; + cargoSha256 = "sha256-GEttxHtdOYMijv1xxK7U0d8WNwJcpqJNgDYKgCV/zVw="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/http/apache-modules/mod_perl/default.nix b/pkgs/servers/http/apache-modules/mod_perl/default.nix index e511429bfc447..bbb38eb969bd2 100644 --- a/pkgs/servers/http/apache-modules/mod_perl/default.nix +++ b/pkgs/servers/http/apache-modules/mod_perl/default.nix @@ -2,18 +2,13 @@ stdenv.mkDerivation rec { pname = "mod_perl"; - version = "2.0.11"; + version = "2.0.12"; src = fetchurl { url = "mirror://apache/perl/${pname}-${version}.tar.gz"; - sha256 = "0x3gq4nz96y202cymgrf56n8spm7bffkd1p74dh9q3zrrlc9wana"; + sha256 = "sha256-9bghtZsP3JZw5G7Q/PMtiRHyUSYYmotowWUvkiHu4mk="; }; - patches = [ - # Fix build on perl-5.34.0, https://github.com/Perl/perl5/issues/18617 - ../../../../development/perl-modules/mod_perl2-PL_hash_seed.patch - ]; - buildInputs = [ apacheHttpd perl ]; buildPhase = '' perl Makefile.PL \ diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/servers/http/darkhttpd/default.nix index 56bf5cd5b74cf..81e963c5607b0 100644 --- a/pkgs/servers/http/darkhttpd/default.nix +++ b/pkgs/servers/http/darkhttpd/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "darkhttpd"; - version = "1.13"; + version = "1.14"; src = fetchFromGitHub { owner = "emikulic"; repo = pname; rev = "v${version}"; - sha256 = "0w11xq160q9yyffv4mw9ncp1n0dl50d9plmwxb0yijaaxls9i4sk"; + sha256 = "sha256-J/tjT3Rfhk5++jbmLBrZu9O4GgTBqeycuz82NliCBxw="; }; enableParallelBuilding = true; diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index f549d3ece33fd..60a7333fe0d9b 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.24.1"; + version = "0.25.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "agent"; - sha256 = "sha256-WxULVtqKxYXMWNY4l0wvTkqcDkPrlHcS70NgQhe8nzU="; + sha256 = "sha256-VbcWYH3eSKfYlSoN9HpxvhtvW36M1aYn9nLDfEbIzTY="; }; - vendorSha256 = "sha256-hdo8uiVJAMMPo1N8kLDFPSbyTr5WxNKtq8E7pj6Plak="; + vendorSha256 = "sha256-VFTz9+nf4qH8bbFijpT1uIHSAhJy/aMMlIjkvnzzAD4="; tags = [ "nonetwork" diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 2639ad8b80e26..6b09105ef20a1 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config , libsndfile, libtool, makeWrapper, perlPackages -, xorg, libcap, alsa-lib, glib, dconf +, xlibsWrapper, xorg, libcap, alsa-lib, glib, dconf , avahi, libjack2, libasyncns, lirc, dbus , sbc, bluez5, udev, openssl, fftwFloat , soxr, speexdsp, systemd, webrtc-audio-processing @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (!libOnly) ( [ libasyncns webrtc-audio-processing ] ++ lib.optional jackaudioSupport libjack2 - ++ lib.optionals x11Support [ xorg.xlibsWrapper xorg.libXtst xorg.libXi ] + ++ lib.optionals x11Support [ xlibsWrapper xorg.libXtst xorg.libXi ] ++ lib.optional useSystemd systemd ++ lib.optionals stdenv.isLinux [ alsa-lib udev ] ++ lib.optional airtunesSupport openssl diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 41073e8cc8398..362a7432ff498 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap , expat, libxml2, openssl, pkg-config, systemd +, cppunit }: stdenv.mkDerivation rec { @@ -32,6 +33,22 @@ stdenv.mkDerivation rec { ] ++ lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) "--enable-linux-netfilter"; + doCheck = true; + checkInputs = [ cppunit ]; + preCheck = '' + # tests attempt to copy around "/bin/true" to make some things + # no-ops but this doesn't work if our "true" is a multi-call + # binary, so make our own fake "true" which will work when used + # this way + echo "#!$SHELL" > fake-true + chmod +x fake-true + grep -rlF '/bin/true' test-suite/ | while read -r filename ; do + substituteInPlace "$filename" \ + --replace "$(type -P true)" "$(realpath fake-true)" \ + --replace "/bin/true" "$(realpath fake-true)" + done + ''; + meta = with lib; { description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"; homepage = "http://www.squid-cache.org"; diff --git a/pkgs/tools/admin/google-cloud-sdk/components.json b/pkgs/tools/admin/google-cloud-sdk/components.json index 114f7ac9832e7..40332cb9d04ec 100644 --- a/pkgs/tools/admin/google-cloud-sdk/components.json +++ b/pkgs/tools/admin/google-cloud-sdk/components.json @@ -5,7 +5,7 @@ "checksum": "5a65179c291bc480696ca323d2f8c4874985458303eff8f233e16cdca4e88e6f", "contents_checksum": "038c999c7a7d70d5133eab7dc5868c4c3d0358431dad250f9833306af63016c8", "size": 800, - "source": "components/google-cloud-sdk-alpha-20220826172526.tar.gz", + "source": "components/google-cloud-sdk-alpha-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -22,8 +22,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20220826172526, - "version_string": "2022.08.26" + "build_number": 20220923141408, + "version_string": "2022.09.23" } }, { @@ -56,15 +56,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.4.3" + "version_string": "1.4.4" } }, { "data": { - "checksum": "9a11f7c85ffff2fd7ad4946b5c1ea97a1162e687b559244ee21228c8154d90dd", - "contents_checksum": "2cd31930d0f1326c8f3e0be44bb9ab3c5335ed38c170090f7105ba7accccb4a1", - "size": 19054806, - "source": "components/google-cloud-sdk-anthos-auth-darwin-arm-20220729144039.tar.gz", + "checksum": "f197d04a40be89731ecd7a653f83900dcc4dcd84e54e0833c529f9f8dfa4395c", + "contents_checksum": "fa1d4910c1ce188c5c450d655c5d15e59a146364ec46e3fda0791db76c2edd17", + "size": 20108065, + "source": "components/google-cloud-sdk-anthos-auth-darwin-arm-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -88,16 +88,16 @@ }, "platform_required": false, "version": { - "build_number": 20220729144039, - "version_string": "1.4.3" + "build_number": 20220923141408, + "version_string": "1.4.4" } }, { "data": { - "checksum": "e04c7143047fd26430e26e3e67fa1768413d8ed1d6e014a0d96c6075559ce3aa", - "contents_checksum": "f7b242bfa64f2c78d388ce361a829f6d0bfd53e8f0fabfc6b4b14fa6e3ef4682", - "size": 19911349, - "source": "components/google-cloud-sdk-anthos-auth-darwin-x86_64-20220729144039.tar.gz", + "checksum": "5417a11523868f36d6b7c3199e3029cf9f43c8cb99c57dba016942db4141c939", + "contents_checksum": "06a661642cbd20bcb9965c7a4b505d4d72944c48c30b8ada71db7e53c898d505", + "size": 21183974, + "source": "components/google-cloud-sdk-anthos-auth-darwin-x86_64-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -121,16 +121,16 @@ }, "platform_required": false, "version": { - "build_number": 20220729144039, - "version_string": "1.4.3" + "build_number": 20220923141408, + "version_string": "1.4.4" } }, { "data": { - "checksum": "030fa3615f5a7833a642047bdf531936c8d8fa827f5dbc44384de1a9e85df254", - "contents_checksum": "5119864e84d03d45dc0c00713072a8c34ecf95f18ac4633c938b581dbad86a28", - "size": 18716150, - "source": "components/google-cloud-sdk-anthos-auth-linux-arm-20220729144039.tar.gz", + "checksum": "c9dee264071d169de081880019f2f6fdb14edc22cbd20c19de76bb7cfa196eae", + "contents_checksum": "80ae98f1bfd1bd5cce9cddd642a1505d5401908d8890a22afa723490132b4342", + "size": 19755666, + "source": "components/google-cloud-sdk-anthos-auth-linux-arm-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -154,16 +154,16 @@ }, "platform_required": false, "version": { - "build_number": 20220729144039, - "version_string": "1.4.3" + "build_number": 20220923141408, + "version_string": "1.4.4" } }, { "data": { - "checksum": "b3377c443f135a112ace343bb6ab6c20bf763e29512947f95bb239a381ee9b86", - "contents_checksum": "4543d98cd25e05c6bfb9e36d89b7b34a226218e5ce3feee07276377fde8f5967", - "size": 20095013, - "source": "components/google-cloud-sdk-anthos-auth-linux-x86_64-20220729144039.tar.gz", + "checksum": "b5efe7e9cd17f44905186242e663b97734183e14c66daed35553bc59bbf07a3a", + "contents_checksum": "57b753ecbde456973bed97af69aa7d1696694c1d30e9756d57658f79689fd925", + "size": 21362894, + "source": "components/google-cloud-sdk-anthos-auth-linux-x86_64-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -187,16 +187,16 @@ }, "platform_required": false, "version": { - "build_number": 20220729144039, - "version_string": "1.4.3" + "build_number": 20220923141408, + "version_string": "1.4.4" } }, { "data": { - "checksum": "29c9c078662d94e48a601c2916ca9030e0d81f8f442e3e11a654c90ff0816838", - "contents_checksum": "78662933c423257a0aaafd07a1bcbf1eed864015a5e42ffbfb0d4caa30d9b5f0", - "size": 20093409, - "source": "components/google-cloud-sdk-anthos-auth-windows-x86_64-20220729144039.tar.gz", + "checksum": "ab73e4c82e95a7b707f2298906a7a5fb9a2c1fe741c4584ab16e507bcf7b6d5b", + "contents_checksum": "38d10a97aa0e5fbf2c927acda1c853c25a2b729615bebd2ac8fce4eb77c2466a", + "size": 21470866, + "source": "components/google-cloud-sdk-anthos-auth-windows-x86_64-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -220,8 +220,8 @@ }, "platform_required": false, "version": { - "build_number": 20220729144039, - "version_string": "1.4.3" + "build_number": 20220923141408, + "version_string": "1.4.4" } }, { @@ -1020,10 +1020,10 @@ }, { "data": { - "checksum": "e650804080d747f02c46b8b96d7e47aaa1aeed762da10725a558a3c9226f57b4", - "contents_checksum": "6c4ec2d67682d146f06aaddaafd1f568b3aacba413f0fd42b83cf41e1c8616ed", - "size": 53827944, - "source": "components/google-cloud-sdk-app-engine-java-20220819155753.tar.gz", + "checksum": "f4aebdd247726881bb16c12d2b33ff09574282653ec6a39c6dfd41508351ed8d", + "contents_checksum": "8a2e935650c2dbc309e1f6fa72ec964fb80bfc2f8fa5164916fcce00dbc7eb47", + "size": 76738516, + "source": "components/google-cloud-sdk-app-engine-java-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -1041,8 +1041,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20220819155753, - "version_string": "1.9.98.1" + "build_number": 20220923141408, + "version_string": "2.0.8" } }, { @@ -1432,7 +1432,7 @@ "checksum": "707d412854a14450b4fddee199d258e75946fe51b44eb2980c8cd7e274c15760", "contents_checksum": "0b4e9d8e6394dc841aece07ca4da91920a460cbd7ec22495be4a2b4f46635b4d", "size": 797, - "source": "components/google-cloud-sdk-beta-20220826172526.tar.gz", + "source": "components/google-cloud-sdk-beta-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -1449,8 +1449,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20220826172526, - "version_string": "2022.08.26" + "build_number": 20220923141408, + "version_string": "2022.09.23" } }, { @@ -1765,10 +1765,10 @@ }, { "data": { - "checksum": "81e8b301e5f04c691ccc32b422bd5b515f58a83c61ffcc02eb0f727368ab74af", - "contents_checksum": "de1b4b7eb575cc2af80471030289edae18d4fbdda140df61864c4f85ec97f656", - "size": 1649904, - "source": "components/google-cloud-sdk-bq-20220826172526.tar.gz", + "checksum": "32c61f28a7ca91e20d33e5bb69df23a4e0d845583e77e7d2eaa2fd4443c6d573", + "contents_checksum": "f9a4cd505db656f70848c44b3c7198c06543bdcaffe5168b0af2ca868e909750", + "size": 1660964, + "source": "components/google-cloud-sdk-bq-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -1787,16 +1787,16 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20220826172526, - "version_string": "2.0.75" + "build_number": 20220923141408, + "version_string": "2.0.78" } }, { "data": { - "checksum": "31be1877239d6dcb9113966dbeea4ff62f2526f0e39a860c34f141a150ef78c5", - "contents_checksum": "73f7b6b5d91c4b7ec7cd49116af97ac4e806c983850dadf9ac5b9c5364068d78", - "size": 1816, - "source": "components/google-cloud-sdk-bq-nix-20220805142045.tar.gz", + "checksum": "f1417d278b3814ed9e70fa6af25835a18228a10dca6482a91bf650584463e7d8", + "contents_checksum": "c27a1e54bd9a2e2a7005fc771294fadd88850b3f7f69ee9bc239a1468eb0f79b", + "size": 1837, + "source": "components/google-cloud-sdk-bq-nix-20220920185015.tar.gz", "type": "tar" }, "dependencies": [ @@ -1821,8 +1821,8 @@ }, "platform_required": false, "version": { - "build_number": 20220805142045, - "version_string": "2.0.75" + "build_number": 20220920185015, + "version_string": "2.0.77" } }, { @@ -2818,15 +2818,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.4.3" + "version_string": "1.4.5" } }, { "data": { - "checksum": "70917c386da1adc19e650b58285b73e5c0ae487748b926edb68e506f3be27c33", - "contents_checksum": "78a0616222d1caca2dae4ccec6f0f030af2c70b49b2369b002bfbe265b6e5399", - "size": 28519205, - "source": "components/google-cloud-sdk-cloud-spanner-emulator-linux-x86_64-20220719210002.tar.gz", + "checksum": "f2e205c542b4ec2225791878a7fc350b33118b4d42183ca1103f0e392593a8e4", + "contents_checksum": "8101181c7cff6d3ffb98d2cc209f151dfc64944470957161129740ca1c9b00e2", + "size": 29784440, + "source": "components/google-cloud-sdk-cloud-spanner-emulator-linux-x86_64-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -2851,8 +2851,8 @@ }, "platform_required": false, "version": { - "build_number": 20220719210002, - "version_string": "1.4.3" + "build_number": 20220923141408, + "version_string": "1.4.5" } }, { @@ -3152,15 +3152,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.92.0" + "version_string": "1.93.0" } }, { "data": { - "checksum": "e69ad0ad6158e75c1a5e50cbd6e47712ae1333466e98fa0e38360388a7741397", - "contents_checksum": "887b9e9f94fb330ce38b71e63563b43a2b3625090ca97df01c395f1a170f1f0b", - "size": 58031942, - "source": "components/google-cloud-sdk-config-connector-darwin-arm-20220826172526.tar.gz", + "checksum": "dd20420980225726c0bb881fdcfb935bf8d25aad84f0bb315e4d5b0ce51cf0fa", + "contents_checksum": "8dc4d4419a866c0aaa33fd0d4e0fde885aa926dcf9b8025a580e060b916ca599", + "size": 58308273, + "source": "components/google-cloud-sdk-config-connector-darwin-arm-20220912133630.tar.gz", "type": "tar" }, "dependencies": [ @@ -3184,16 +3184,16 @@ }, "platform_required": false, "version": { - "build_number": 20220826172526, - "version_string": "1.92.0" + "build_number": 20220912133630, + "version_string": "1.93.0" } }, { "data": { - "checksum": "9bd57dfb4397c571345f275ade22db8bfbf0c7ce1f0766be04033a8d5108d129", - "contents_checksum": "e03b352e55adc4f2e70452569f3513e8661cb309cffd804f670c42c8d11b90e7", - "size": 59628145, - "source": "components/google-cloud-sdk-config-connector-darwin-x86_64-20220826172526.tar.gz", + "checksum": "541307135cc5c06430cf1368a5a6f9dfe050031aedf1b7e7497362505f81074b", + "contents_checksum": "d234dc236ff1c4d88fb4caebd61955df9d3ee5b3db094472dce64f031d646e97", + "size": 59915703, + "source": "components/google-cloud-sdk-config-connector-darwin-x86_64-20220912133630.tar.gz", "type": "tar" }, "dependencies": [ @@ -3217,16 +3217,16 @@ }, "platform_required": false, "version": { - "build_number": 20220826172526, - "version_string": "1.92.0" + "build_number": 20220912133630, + "version_string": "1.93.0" } }, { "data": { - "checksum": "6819e1c06d7cee23dee7f278908a2ade370fd3c862c0c3f975d368e6e4face8d", - "contents_checksum": "b4f2a75282db97fd5a04fee33d770588ec86e914bb1ac7ef65cabc33c48b028f", - "size": 54427844, - "source": "components/google-cloud-sdk-config-connector-linux-arm-20220826172526.tar.gz", + "checksum": "693e9b1fdb2b8958388dca7abc405891d481c5973a5a622da8fa54920114af2c", + "contents_checksum": "b29263faa92ec2b3a2780f837c14d991c570914d7a9df10940325fab9e6cbe4d", + "size": 54695578, + "source": "components/google-cloud-sdk-config-connector-linux-arm-20220912133630.tar.gz", "type": "tar" }, "dependencies": [ @@ -3250,16 +3250,16 @@ }, "platform_required": false, "version": { - "build_number": 20220826172526, - "version_string": "1.92.0" + "build_number": 20220912133630, + "version_string": "1.93.0" } }, { "data": { - "checksum": "16fbc19aa9b3b8d8d9ddffc346f6d7ffe7d20d1ea8a6e3f3f9bab43b2d6e0a11", - "contents_checksum": "d40df11cbe34f661b57f9743c7c9bef8a43232ea3b37568debe1fdc5a3c4ab51", - "size": 59183027, - "source": "components/google-cloud-sdk-config-connector-linux-x86_64-20220826172526.tar.gz", + "checksum": "62babd72829ff1e9c0ee92ee5fcf0052b19780ff028014871ab73d34aeff4021", + "contents_checksum": "29127a962616825f78276a0143a3b75239c66d7df4f582aee85b3801e9590a8d", + "size": 59462846, + "source": "components/google-cloud-sdk-config-connector-linux-x86_64-20220912133630.tar.gz", "type": "tar" }, "dependencies": [ @@ -3283,16 +3283,16 @@ }, "platform_required": false, "version": { - "build_number": 20220826172526, - "version_string": "1.92.0" + "build_number": 20220912133630, + "version_string": "1.93.0" } }, { "data": { - "checksum": "fe8328a8e56d137d50b2db1ddadb5db24fa1b2ce940373556f98d918f2e94f57", - "contents_checksum": "1ab0f32fc5cb49579dcd8fa5cdfd525fada6f67817d364a277908c3bac80c963", - "size": 59356188, - "source": "components/google-cloud-sdk-config-connector-windows-x86_64-20220826172526.tar.gz", + "checksum": "e2b541bcbbfcdcd359bc828c7d51538cda3ef0fc4f90ad7ca274792b643bd74f", + "contents_checksum": "5221ebb5c2a0cc2c8752806c680382f21366c87cda41f5aa0e009da0d73e9bce", + "size": 59649780, + "source": "components/google-cloud-sdk-config-connector-windows-x86_64-20220912133630.tar.gz", "type": "tar" }, "dependencies": [ @@ -3316,19 +3316,20 @@ }, "platform_required": false, "version": { - "build_number": 20220826172526, - "version_string": "1.92.0" + "build_number": 20220912133630, + "version_string": "1.93.0" } }, { "data": { - "checksum": "67ea11d36e9538cab9ca073ba009e4f4d8bdc74e27417b0833ce49042a268b31", - "contents_checksum": "513f4f9f2de029c8056b85991065c9cc55a94244d54dab53427ab86d782a22ed", - "size": 25728101, - "source": "components/google-cloud-sdk-core-20220826172526.tar.gz", + "checksum": "9f400edfce1cdaed0c64868bf07c766a37c16586b8c562d1e4998b718779c736", + "contents_checksum": "1e78cf08ebac768823adaf54ad0079cc22c75da881f34d09f9fb8f9e81ddcce2", + "size": 26095678, + "source": "components/google-cloud-sdk-core-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ + "bundled-python3-unix", "core-nix", "core-win", "gcloud-deps", @@ -3345,19 +3346,20 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20220826172526, - "version_string": "2022.08.26" + "build_number": 20220923141408, + "version_string": "2022.09.23" } }, { "data": { - "checksum": "8b588bd281f23c083d797c5144da4f856edf23c86131efbabc8ab389ce740fdc", - "contents_checksum": "8f1c24d273122da4020ac2106e439187e5d1d2769c75ccff72359fd4e892746f", - "size": 2202, - "source": "components/google-cloud-sdk-core-nix-20220805142045.tar.gz", + "checksum": "6db75a8f57486ed49afbd2866643bd21e77e08aa7aaf04bd9ee1713acad7b3bf", + "contents_checksum": "5ab83e0028ef523ae3eab59b05b6f2f3d340be750385dc66bd1127c75d7a6d4b", + "size": 2221, + "source": "components/google-cloud-sdk-core-nix-20220920185015.tar.gz", "type": "tar" }, "dependencies": [ + "bundled-python3-unix", "core", "gcloud-deps", "ssh-tools" @@ -3380,8 +3382,8 @@ }, "platform_required": false, "version": { - "build_number": 20220805142045, - "version_string": "2022.08.05" + "build_number": 20220920185015, + "version_string": "2022.09.20" } }, { @@ -3393,6 +3395,7 @@ "type": "tar" }, "dependencies": [ + "bundled-python3-unix", "core", "gcloud-deps", "ssh-tools" @@ -3449,10 +3452,10 @@ }, { "data": { - "checksum": "ede6475214e26c5237656f3381b267609bb1470303bea118bd4d85025105da25", - "contents_checksum": "e15062374974a0b422807965f10d3599cfe3caf0643d62aee2d0cc5e46bc96cf", - "size": 1832, - "source": "components/google-cloud-sdk-datalab-nix-20220805142045.tar.gz", + "checksum": "6afdc65013c2389a52d6b8b6c7ea043b19822f31a6d3bf696e128a9bd3f8fd61", + "contents_checksum": "3fb8b295ae8fecb0ea685d8f6acd1cd9517f26b037a343767b21fd48ec84edc1", + "size": 1854, + "source": "components/google-cloud-sdk-datalab-nix-20220920185015.tar.gz", "type": "tar" }, "dependencies": [ @@ -3480,7 +3483,7 @@ }, "platform_required": false, "version": { - "build_number": 20220805142045, + "build_number": 20220920185015, "version_string": "20190610" } }, @@ -3807,7 +3810,6 @@ { "dependencies": [ "gcloud-crc32c-darwin-arm", - "gcloud-crc32c-darwin-x86", "gcloud-crc32c-darwin-x86_64", "gcloud-crc32c-linux-arm", "gcloud-crc32c-linux-x86", @@ -3876,39 +3878,6 @@ }, { "data": { - "checksum": "1921da0b8ce346094cf85d30c76fe8dcdc49a2c1a7024e2b92fc921f1e8f4ae6", - "contents_checksum": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", - "size": 104, - "source": "components/google-cloud-sdk-gcloud-crc32c-darwin-x86-20220729144039.tar.gz", - "type": "tar" - }, - "dependencies": [ - "gcloud-crc32c" - ], - "details": { - "description": "Command line tool that calculates CRC32C hashes on local files.", - "display_name": "Google Cloud CRC32C Hash Tool" - }, - "id": "gcloud-crc32c-darwin-x86", - "is_configuration": false, - "is_hidden": true, - "is_required": false, - "platform": { - "architectures": [ - "x86" - ], - "operating_systems": [ - "MACOSX" - ] - }, - "platform_required": false, - "version": { - "build_number": 20220729144039, - "version_string": "1.0.0" - } - }, - { - "data": { "checksum": "766f6271d8ad1de1b2b803e7aca680abc445344e30dbb448ead0b98b041ad70a", "contents_checksum": "b8e4eee009bbb6e2d521353569e20f32a66a9f5decd79915baee05eb64b2ac1a", "size": 1250758, @@ -4107,10 +4076,10 @@ }, { "data": { - "checksum": "ecc87f105076886c96fa5c3fa0a585c02dad5fc1ee7b3057c77d7734345a89ed", - "contents_checksum": "70e95c8c5184e7f15e8806f70d450dec7f5dd34b93254128a3505e78fdaeb0d5", - "size": 11787976, - "source": "components/google-cloud-sdk-gcloud-deps-20220819155753.tar.gz", + "checksum": "2ed9abf269d41558e85a748916225d14eb9a61ad3fa181b1c644a2d53219941b", + "contents_checksum": "7d0c3959b707eedc156cbdb6d6e1b2e75a69637d5efc36268639f9addf73c626", + "size": 11801890, + "source": "components/google-cloud-sdk-gcloud-deps-20220912133630.tar.gz", "type": "tar" }, "dependencies": [ @@ -4133,8 +4102,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20220819155753, - "version_string": "2022.08.19" + "build_number": 20220912133630, + "version_string": "2022.09.12" } }, { @@ -4370,10 +4339,10 @@ }, { "data": { - "checksum": "51bdccd26675d35f001e8cc4559ce94d37c0d40533a3f7510efbbb8a45f3d033", - "contents_checksum": "fae4b5a2357238e46e5fb51f936bbc351a7af6871d0c40dfd6138d12c72f6535", - "size": 5092288, - "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20220826172526.tar.gz", + "checksum": "9c53b485c9da6befa0f4edc4e822fa33b78aee0918c768e6491d540c1eef9cc8", + "contents_checksum": "e0e0264b5a04d814ca438ccf03c5712ad6288198a29edd7ee1ae2ba3d1249d61", + "size": 5175748, + "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -4398,7 +4367,7 @@ }, "platform_required": false, "version": { - "build_number": 20220826172526, + "build_number": 20220923141408, "version_string": "" } }, @@ -4671,10 +4640,10 @@ }, { "data": { - "checksum": "0d5a788c9a2ce8afa11df39ca92395b896c75abc6613aeaa5bf26f11cf500000", - "contents_checksum": "c018a70eda52d4d450c0df6d4d0a85cc63b356c6459d0e75ae3154118d0bcda7", - "size": 16238934, - "source": "components/google-cloud-sdk-gsutil-20220812141601.tar.gz", + "checksum": "86455168929ba37f0d6446aabc883fbc6bf9c7317776940f2ee4708660ddba73", + "contents_checksum": "f3ff13f8c1b4347fb0be3a943d10539f19b482dab150e95cc6c4cefc55b8d39c", + "size": 16281930, + "source": "components/google-cloud-sdk-gsutil-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -4693,16 +4662,16 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20220812141601, - "version_string": "5.12" + "build_number": 20220923141408, + "version_string": "5.14" } }, { "data": { - "checksum": "8dedc4501d4c44664dbe4bf403e7ca33d772eb92fe31622e1b0100fd7333eb06", - "contents_checksum": "cfed152cbb1c3bd59b818004578584d95049de6ae963f0ecfda786b7feca12f3", - "size": 1831, - "source": "components/google-cloud-sdk-gsutil-nix-20220805142045.tar.gz", + "checksum": "43435ae1c5c1570a279aa7ba79345a4121a040f5ae732968ce6e2802fa91cf7d", + "contents_checksum": "5368c71d19578ae4e3b2c2e44ef794040d45cfefcaad8137454ee1fcc75069ea", + "size": 1851, + "source": "components/google-cloud-sdk-gsutil-nix-20220920185015.tar.gz", "type": "tar" }, "dependencies": [ @@ -4727,16 +4696,16 @@ }, "platform_required": false, "version": { - "build_number": 20220805142045, - "version_string": "5.11" + "build_number": 20220920185015, + "version_string": "5.13" } }, { "data": { - "checksum": "d8619ff9a346685d60cb3c9092cecc640bc3b426079454ba78d5a57f6001006c", - "contents_checksum": "9dce4185b8d842133a744c2582b9d1910d358cc4b9f7b2699cbd56ea65f81c94", - "size": 3898, - "source": "components/google-cloud-sdk-gsutil-win-20220805142045.tar.gz", + "checksum": "e9fa362ebfd166fcd02a4a0b2be6cb1bc8070b78bc95aa6412cef27e014800a0", + "contents_checksum": "268fc5137f56690b853b7d9c606cf48bcc168555d8d24f02e1bb5bcdd4678305", + "size": 3915, + "source": "components/google-cloud-sdk-gsutil-win-20220920185015.tar.gz", "type": "tar" }, "dependencies": [ @@ -4758,8 +4727,8 @@ }, "platform_required": false, "version": { - "build_number": 20220805142045, - "version_string": "5.11" + "build_number": 20220920185015, + "version_string": "5.13" } }, { @@ -4986,10 +4955,10 @@ }, { "data": { - "checksum": "9de67dcca25d9fe988f7bb50d51f469f15f94a18448baf324836e967ab33f00a", - "contents_checksum": "727cf52bb3893c60b77edd5989e9febe5445381d1a5ffeb4f9dbdbf3d1ca33ca", + "checksum": "7856f8122d27e23899e913ba4fad9700ee6c2abafc9abcf487248ba2db57321c", + "contents_checksum": "8bc4e63305e3309718a8f77c23552d310b167cb9e636e42b69c2b44f7b3657dd", "size": 48204, - "source": "components/google-cloud-sdk-kubectl-20220826172526.tar.gz", + "source": "components/google-cloud-sdk-kubectl-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -5013,16 +4982,16 @@ "platform": {}, "platform_required": true, "version": { - "build_number": 20220826172526, - "version_string": "1.22.12" + "build_number": 20220923141408, + "version_string": "1.22.14" } }, { "data": { - "checksum": "183a93dc2868f125fd74ac0907d8314806af95bcdee7dfedd2a0d6693e38220a", - "contents_checksum": "5cc81a6770bf326c6f9dce82a620a6a6210319969e3a4de91d567eab2b21acb8", - "size": 68347897, - "source": "components/google-cloud-sdk-kubectl-darwin-arm-20220722145557.tar.gz", + "checksum": "21d6b384830db24c47ad84eed130e0ac43c5092cafbfe64a5c2b1f767a2d3bdd", + "contents_checksum": "7030de0f4f7c209f9db17e0926b19bb665f81977082e1c75359235f00eabafe9", + "size": 82321843, + "source": "components/google-cloud-sdk-kubectl-darwin-arm-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -5047,16 +5016,16 @@ }, "platform_required": true, "version": { - "build_number": 20220722145557, - "version_string": "1.22.12" + "build_number": 20220923141408, + "version_string": "1.22.14" } }, { "data": { - "checksum": "f08c5e917c04dce420d4fb5fc98e4f0dbb234ed00ba81c11c7dcf6ba05da1c71", - "contents_checksum": "4f1cdd27d68a22e9fd4bc762f6d8d4ab6a079b2c6e52c3c2ba8f9de82b099b0d", - "size": 95973956, - "source": "components/google-cloud-sdk-kubectl-darwin-x86_64-20220722145557.tar.gz", + "checksum": "1e3068a62f3afa8e46782e22880ae35f6358e4b637956a7cb6116cd08aa4ff71", + "contents_checksum": "f217554c39fdf2744df60e20e1b3da9fa384e1f8ffc2b813ee3fdbd138f6e9b4", + "size": 97570066, + "source": "components/google-cloud-sdk-kubectl-darwin-x86_64-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -5081,16 +5050,16 @@ }, "platform_required": true, "version": { - "build_number": 20220722145557, - "version_string": "1.22.12" + "build_number": 20220923141408, + "version_string": "1.22.14" } }, { "data": { - "checksum": "68a90b93bcc95518e57f627fd3db2d949ac290ba457645633c6c92f22d5a02aa", - "contents_checksum": "e023599a6381690ffdf61952d8183b1010d0c445b5ca3f5543650cb56b31bd43", - "size": 84739879, - "source": "components/google-cloud-sdk-kubectl-linux-arm-20220722145557.tar.gz", + "checksum": "52e38b9e2ae7a948af11d9fc4bf4d355ef15fbbcd74226710ab01f7da32ac35a", + "contents_checksum": "831a4170256641069a14fdfae161c780b1210938b3fa7881819cea3b3bea7c4f", + "size": 86262197, + "source": "components/google-cloud-sdk-kubectl-linux-arm-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -5115,16 +5084,16 @@ }, "platform_required": true, "version": { - "build_number": 20220722145557, - "version_string": "1.22.12" + "build_number": 20220923141408, + "version_string": "1.22.14" } }, { "data": { - "checksum": "dbb20121a8590ae23b9b4570d9bbe1ed4ef75c0301fb5c82ba8f39d8204e3dc9", - "contents_checksum": "c164f5f80d3d6a6fb34faefa4a5e2f30203870fe258de483ff9da2daa636bba6", - "size": 85216084, - "source": "components/google-cloud-sdk-kubectl-linux-x86-20220722145557.tar.gz", + "checksum": "71a1963cbeb19cfe29b65bfc50f1cf9c2468fe13632a4325160b81ecb01c6aa9", + "contents_checksum": "92480f7feaa3e8cda1a573eebfdca4109fb64df5f759dd3ae266a64b03cbdd26", + "size": 86774419, + "source": "components/google-cloud-sdk-kubectl-linux-x86-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -5149,16 +5118,16 @@ }, "platform_required": true, "version": { - "build_number": 20220722145557, - "version_string": "1.22.12" + "build_number": 20220923141408, + "version_string": "1.22.14" } }, { "data": { - "checksum": "cad7f2a1e918a582f849e2a7680a901f844b67fc13185ab81ddf0df644d73a2e", - "contents_checksum": "ce7711c4e5f89e79ce85cfe25e733911a67a8e20de9ac19794f4a84d083f754d", - "size": 91318082, - "source": "components/google-cloud-sdk-kubectl-linux-x86_64-20220722145557.tar.gz", + "checksum": "ae520fa71535f79bcc12515c6f1421fca9ece08b0ed59f7ee406756ba48561dd", + "contents_checksum": "0b465529d9e1674a10fc52ab12fb2db1253572ca020e9e57f2bb56be7edb14ca", + "size": 92944406, + "source": "components/google-cloud-sdk-kubectl-linux-x86_64-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -5183,8 +5152,8 @@ }, "platform_required": true, "version": { - "build_number": 20220722145557, - "version_string": "1.22.12" + "build_number": 20220923141408, + "version_string": "1.22.14" } }, { @@ -5217,15 +5186,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.4.3" + "version_string": "1.4.4" } }, { "data": { - "checksum": "2ec95a80a5c1c165488702eecfe84a17f51c8dd0ea96e5b5b10e805bb45f61a5", - "contents_checksum": "2d1d1a849782dcf64e1b187387e2335277cb6801cf657e91eebd2d8582f2fe19", - "size": 19054821, - "source": "components/google-cloud-sdk-kubectl-oidc-darwin-arm-20220729144039.tar.gz", + "checksum": "a7d9d1a977856dc342b82936bedfda0032e27ec4657fd380048cd7dc5de05039", + "contents_checksum": "2d656b34043e23ff6a98a7fb432efa86d251eb0b14c4452d17c537dc02e04eaf", + "size": 20108100, + "source": "components/google-cloud-sdk-kubectl-oidc-darwin-arm-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -5249,16 +5218,16 @@ }, "platform_required": false, "version": { - "build_number": 20220729144039, - "version_string": "1.4.3" + "build_number": 20220923141408, + "version_string": "1.4.4" } }, { "data": { - "checksum": "f9f5fba90117efb21a256ced62d431d1c1257855052ca53066cb52dbaf76c960", - "contents_checksum": "72cdd4ed404e24c506ddddaaff6c5ea19a222dac673a21ac4a288bedc267a2f3", - "size": 19911397, - "source": "components/google-cloud-sdk-kubectl-oidc-darwin-x86_64-20220729144039.tar.gz", + "checksum": "1d6d08431d911928ef8500d1979720278f8116e86ae52afc32ce0b76ec4a5fb0", + "contents_checksum": "497465b1a0c3a6781d2bb0b68a951af0a4d2230ae67caa84288d38b853800a53", + "size": 21183987, + "source": "components/google-cloud-sdk-kubectl-oidc-darwin-x86_64-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -5282,16 +5251,16 @@ }, "platform_required": false, "version": { - "build_number": 20220729144039, - "version_string": "1.4.3" + "build_number": 20220923141408, + "version_string": "1.4.4" } }, { "data": { - "checksum": "b75f04ad05de495342265e6b3b65d9146cd6a0c32aa8d3c8af9cdf29ef9396a3", - "contents_checksum": "bd186ff699cd4a85dea551e3b2a98f9bc6b17f3c1bde5ab26de3a8013cd1b48f", - "size": 18716163, - "source": "components/google-cloud-sdk-kubectl-oidc-linux-arm-20220729144039.tar.gz", + "checksum": "87550a6e878b3091c8da5df8380c65f9e2579f012b7cbddc3e64fb637906fc38", + "contents_checksum": "2c33c85c5826938f014a33c21d28289676cccc09d7ffb87368fd94faf43b6cc1", + "size": 19755678, + "source": "components/google-cloud-sdk-kubectl-oidc-linux-arm-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -5315,16 +5284,16 @@ }, "platform_required": false, "version": { - "build_number": 20220729144039, - "version_string": "1.4.3" + "build_number": 20220923141408, + "version_string": "1.4.4" } }, { "data": { - "checksum": "a961eb557b60f2b4f85efaf1178bb2b2c00dc76aad4428e52e4675ac433b39f9", - "contents_checksum": "02d55ba02e330737d36b164642c351579a90d96a2618b313a36b069f3dc9eb62", - "size": 20095032, - "source": "components/google-cloud-sdk-kubectl-oidc-linux-x86_64-20220729144039.tar.gz", + "checksum": "cd6945af71ecfdf94c693ee22b7629ad62dc650cf0c19d58761fe260f792e36f", + "contents_checksum": "c2092312910a7e7e86adcd8d72c9e97d7d9757d6dce2f3e24124d9bcadd0d9eb", + "size": 21362894, + "source": "components/google-cloud-sdk-kubectl-oidc-linux-x86_64-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -5348,16 +5317,16 @@ }, "platform_required": false, "version": { - "build_number": 20220729144039, - "version_string": "1.4.3" + "build_number": 20220923141408, + "version_string": "1.4.4" } }, { "data": { - "checksum": "58504d03cb89202ae39a199cd099d52bd370698a231dcc69636c583d58cda6f0", - "contents_checksum": "61fea21e4e483439b865217a3d6cffc20ece1e596415d1ed2fe5cf0157873332", - "size": 20093462, - "source": "components/google-cloud-sdk-kubectl-oidc-windows-x86_64-20220729144039.tar.gz", + "checksum": "2cf3f2460446692a81c888ec16ac7cbd838fd83acdec46e99bd9225ed49a5d67", + "contents_checksum": "6477f1e7ad0e16d891b1b47c201c2bf0e4409789893be60e1697593c58f74025", + "size": 21470876, + "source": "components/google-cloud-sdk-kubectl-oidc-windows-x86_64-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -5381,16 +5350,16 @@ }, "platform_required": false, "version": { - "build_number": 20220729144039, - "version_string": "1.4.3" + "build_number": 20220923141408, + "version_string": "1.4.4" } }, { "data": { - "checksum": "a4ab96118718d8deb17e4a6366e710016cd724e0f9aa748b12337f692f2a3560", - "contents_checksum": "4ef9d705ffbbe3a250f977e96144284b6eb5de741022baf9cf891b3701f3b1ae", - "size": 89788788, - "source": "components/google-cloud-sdk-kubectl-windows-x86-20220722145557.tar.gz", + "checksum": "28440941a732c6dfda5f05efc0cba74023c913f825871c90ae3c06b14ad2bdda", + "contents_checksum": "95a17b296f14a9d7d0dfced9ad0a55c941fccc83c99b168b3ba9853e3adba360", + "size": 91332851, + "source": "components/google-cloud-sdk-kubectl-windows-x86-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -5417,16 +5386,16 @@ }, "platform_required": true, "version": { - "build_number": 20220722145557, - "version_string": "1.22.12" + "build_number": 20220923141408, + "version_string": "1.22.14" } }, { "data": { - "checksum": "a6b1959aebd022162d6fdbc83c98112a7a7fd8fc1a9d753c8c76720b94e44875", - "contents_checksum": "3159a9b26c49fd74a95e88235d7d0ce4c9424639121557870161d94ae4c1cc91", - "size": 92776963, - "source": "components/google-cloud-sdk-kubectl-windows-x86_64-20220722145557.tar.gz", + "checksum": "b21d319af27d9765f51be9c3b44807c3ca1769beec3674568dc81409f6334186", + "contents_checksum": "a87f48bab704f3f53d9d7b7ea2280a60c793963387d24b0db227e8502ea2995a", + "size": 94323359, + "source": "components/google-cloud-sdk-kubectl-windows-x86_64-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -5453,8 +5422,8 @@ }, "platform_required": true, "version": { - "build_number": 20220722145557, - "version_string": "1.22.12" + "build_number": 20220923141408, + "version_string": "1.22.14" } }, { @@ -5785,6 +5754,204 @@ }, { "dependencies": [ + "log-streaming-darwin-arm", + "log-streaming-darwin-x86_64", + "log-streaming-linux-arm", + "log-streaming-linux-x86_64", + "log-streaming-windows-x86_64" + ], + "details": { + "description": "Provides log streaming services.", + "display_name": "Log Streaming" + }, + "id": "log-streaming", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "architectures": [ + "arm", + "x86_64" + ], + "operating_systems": [ + "LINUX", + "MACOSX", + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "0.1.0" + } + }, + { + "data": { + "checksum": "2d038a49773005dbca959451cb68376ee7350d5ef6ef203da00238bbc92ba3ba", + "contents_checksum": "43a1da489e8b9c536778d69bbcca31c3e26ac8e8adee8305c25b5ccd9d5bcfb5", + "size": 12250253, + "source": "components/google-cloud-sdk-log-streaming-darwin-arm-20220923141408.tar.gz", + "type": "tar" + }, + "dependencies": [ + "log-streaming" + ], + "details": { + "description": "Provides log streaming services.", + "display_name": "Log Streaming" + }, + "id": "log-streaming-darwin-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220923141408, + "version_string": "0.1.0" + } + }, + { + "data": { + "checksum": "2e24ef158bf59bc13e64305464923e34a3c5a22eebed42994fd8bd2262c8de4e", + "contents_checksum": "14a71125b30e23301f0a52ec57ecf1fa8cd84f0c972bcec5d8ab53fbd5bb2b82", + "size": 12632972, + "source": "components/google-cloud-sdk-log-streaming-darwin-x86_64-20220923141408.tar.gz", + "type": "tar" + }, + "dependencies": [ + "log-streaming" + ], + "details": { + "description": "Provides log streaming services.", + "display_name": "Log Streaming" + }, + "id": "log-streaming-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220923141408, + "version_string": "0.1.0" + } + }, + { + "data": { + "checksum": "eb647953fb3921dbe63f2b5d642a524d4cca2212ef4235ac037d7622b6686521", + "contents_checksum": "8a83ad4a79e8269b11fc4f8b279f8e97c7a6318d4236663e166219fb76e7ae8d", + "size": 12118626, + "source": "components/google-cloud-sdk-log-streaming-linux-arm-20220923141408.tar.gz", + "type": "tar" + }, + "dependencies": [ + "log-streaming" + ], + "details": { + "description": "Provides log streaming services.", + "display_name": "Log Streaming" + }, + "id": "log-streaming-linux-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220923141408, + "version_string": "0.1.0" + } + }, + { + "data": { + "checksum": "c422d2a99e2354b6cf57717eeb33c39af64d458ea023909aeac65d8cf3a35991", + "contents_checksum": "bfecc7629c23e684ac4638b9ea54b887f31c5ffbbf62f42153915e133085da23", + "size": 14329668, + "source": "components/google-cloud-sdk-log-streaming-linux-x86_64-20220923141408.tar.gz", + "type": "tar" + }, + "dependencies": [ + "log-streaming" + ], + "details": { + "description": "Provides log streaming services.", + "display_name": "Log Streaming" + }, + "id": "log-streaming-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220923141408, + "version_string": "0.1.0" + } + }, + { + "data": { + "checksum": "4f183757d5f71b19f2894dd357ead27a5cfc2463912e6fa2221521844e235cf4", + "contents_checksum": "10e1197c43d20fb5b3a53fa79b04323f7eaa42afb6e15fac35799f7de00be2eb", + "size": 12777192, + "source": "components/google-cloud-sdk-log-streaming-windows-x86_64-20220923141408.tar.gz", + "type": "tar" + }, + "dependencies": [ + "log-streaming" + ], + "details": { + "description": "Provides log streaming services.", + "display_name": "Log Streaming" + }, + "id": "log-streaming-windows-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220923141408, + "version_string": "0.1.0" + } + }, + { + "dependencies": [ "minikube-darwin-arm", "minikube-darwin-x86_64", "minikube-linux-arm", @@ -5813,15 +5980,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.26.1" + "version_string": "1.27.0" } }, { "data": { - "checksum": "27a35a1156344d63a44e376956e024a8031b1eeaf8adc0c1833b10d838bf7afe", - "contents_checksum": "e4101d218a7ce1f361ebffa3b2940dc45e496796e29415ad8f6913b8d2c06ab4", - "size": 30786798, - "source": "components/google-cloud-sdk-minikube-darwin-arm-20220805142045.tar.gz", + "checksum": "5a63b4052f5892e5723d62b812eea09d4bb20218e1c8986527c218b7e0e5b2b2", + "contents_checksum": "98639bbd563712ce9ac35a72de5382da64af64783a8adc5986dfd01367928015", + "size": 31131878, + "source": "components/google-cloud-sdk-minikube-darwin-arm-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -5845,16 +6012,16 @@ }, "platform_required": false, "version": { - "build_number": 20220805142045, - "version_string": "1.26.1" + "build_number": 20220923141408, + "version_string": "1.27.0" } }, { "data": { - "checksum": "e851e190b2a4747d32f72ba2caaf9cda7bbf6a67b1c357a221598ee9af04eb52", - "contents_checksum": "40b12f79e6446f3d5cbbc3133069cd7349e0ce7744959362b235345329aae84e", - "size": 31814476, - "source": "components/google-cloud-sdk-minikube-darwin-x86_64-20220805142045.tar.gz", + "checksum": "1f58909a020d0a8a1ff3aa20dd71cd0148cf16adf323230ddb35e91421945afc", + "contents_checksum": "847392870c71810c7f038f2da223e5162cd58a2e4b277e04b03839cd89f12d55", + "size": 32365761, + "source": "components/google-cloud-sdk-minikube-darwin-x86_64-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -5878,16 +6045,16 @@ }, "platform_required": false, "version": { - "build_number": 20220805142045, - "version_string": "1.26.1" + "build_number": 20220923141408, + "version_string": "1.27.0" } }, { "data": { - "checksum": "793a34c028e32ed307023aed42012f89bf1677e8ef004b785b10816bd3c1347d", - "contents_checksum": "eeea49fc6d42b8b6aca0b5cbcc18e594042d24bdda142e530b7b4ca5b250c100", - "size": 30251095, - "source": "components/google-cloud-sdk-minikube-linux-arm-20220805142045.tar.gz", + "checksum": "e4d3268beb0091f8431d85b260381cd5204c891b54feba5410dcc6738f767a12", + "contents_checksum": "f217a95d3c5ebb18055d48b9b7aa278a0211914591bc01366a53b6eb4bcaddc2", + "size": 30626509, + "source": "components/google-cloud-sdk-minikube-linux-arm-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -5911,16 +6078,16 @@ }, "platform_required": false, "version": { - "build_number": 20220805142045, - "version_string": "1.26.1" + "build_number": 20220923141408, + "version_string": "1.27.0" } }, { "data": { - "checksum": "f8018c1c90f3aaa7d6d16ebdd6fc9f9f4fe1278278257dc8baedbea8faaea055", - "contents_checksum": "c9a2f9ed229eab8c0bae77fd9eaa2bd1c287383db3f4395cf5131a8bb20abbe2", - "size": 32405345, - "source": "components/google-cloud-sdk-minikube-linux-x86_64-20220805142045.tar.gz", + "checksum": "c41f2b5b94a91b4d712fe68bb9ee84a81c0afc862b71c71cd68c55b822781faa", + "contents_checksum": "89cff2f8b843db2a4b411cc8593e4bf623a9c2fdd89fc63f1e42eb9dd2bc9263", + "size": 32992037, + "source": "components/google-cloud-sdk-minikube-linux-x86_64-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -5944,16 +6111,16 @@ }, "platform_required": false, "version": { - "build_number": 20220805142045, - "version_string": "1.26.1" + "build_number": 20220923141408, + "version_string": "1.27.0" } }, { "data": { - "checksum": "1b3a3552de1ec3cf7b23b4add0a225272122953bc1588f24022fc68fbb331bed", - "contents_checksum": "1e5745e14161ac8df58286ceab2412c42ba9612b7ca689c5175b32c49384bc04", - "size": 32246442, - "source": "components/google-cloud-sdk-minikube-windows-x86_64-20220805142045.tar.gz", + "checksum": "4461b0d6dce2ad476d7c40c3bd55a13855a6f3cffb21b4dc22728f36cb6fce13", + "contents_checksum": "b05dcba039ce63ec98e9a42da93f262246e7d0b775f87b5823a37a78dc937305", + "size": 32922362, + "source": "components/google-cloud-sdk-minikube-windows-x86_64-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -5977,8 +6144,8 @@ }, "platform_required": false, "version": { - "build_number": 20220805142045, - "version_string": "1.26.1" + "build_number": 20220923141408, + "version_string": "1.27.0" } }, { @@ -6006,15 +6173,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.12.2-rc.2" + "version_string": "1.13.0-rc.7" } }, { "data": { - "checksum": "3d68d8a604dcf4123f7e52b839ab67909956cbee8bef9f592ae31173a0c77e59", - "contents_checksum": "72b328cc2cd63d282976b31e57b9391789a45e629d114c5bfa701fb1b20bc6df", - "size": 25577195, - "source": "components/google-cloud-sdk-nomos-darwin-x86_64-20220826172526.tar.gz", + "checksum": "e3b8394db81bd917f498d4c64f3002a1e462a2176503c9780406e2bfcb2c0764", + "contents_checksum": "6ca04e9e59fc7f84e1cc154b1e502f1503b10c3965a0208140fa405d6167ab62", + "size": 25595518, + "source": "components/google-cloud-sdk-nomos-darwin-x86_64-20220920185015.tar.gz", "type": "tar" }, "dependencies": [ @@ -6038,16 +6205,16 @@ }, "platform_required": false, "version": { - "build_number": 20220826172526, - "version_string": "1.12.2-rc.2" + "build_number": 20220920185015, + "version_string": "1.13.0-rc.7" } }, { "data": { - "checksum": "6ffb0aaa5b7d76ce29a8460da26014eef438d077bfecf440198df041c17cedfe", - "contents_checksum": "bb0711b94470949df670ebedd6dccad98334276aab1547750be9b73ba31f9079", - "size": 26179434, - "source": "components/google-cloud-sdk-nomos-linux-x86_64-20220826172526.tar.gz", + "checksum": "04542a9dbdb94a0cc4f28a7c61d1f8883a9918366fa2b7449458431c8eed78e2", + "contents_checksum": "e916b7982d9ac6827821d0d020976818ce85438cf1a5dd0a8d5daf0610101bbc", + "size": 26198140, + "source": "components/google-cloud-sdk-nomos-linux-x86_64-20220920185015.tar.gz", "type": "tar" }, "dependencies": [ @@ -6071,8 +6238,8 @@ }, "platform_required": false, "version": { - "build_number": 20220826172526, - "version_string": "1.12.2-rc.2" + "build_number": 20220920185015, + "version_string": "1.13.0-rc.7" } }, { @@ -6764,10 +6931,10 @@ }, { "data": { - "checksum": "a070114060f948bdfd1ed7f1947098b042aa260d5123f0d60fa0e145795619c9", - "contents_checksum": "2089133ad95150f0c960621fbd43ce19e12550bf9fc1e83af6f53e08ba99807b", - "size": 36344281, - "source": "components/google-cloud-sdk-tests-20220826172526.tar.gz", + "checksum": "6e094c6fb35304bded5f23069152591bfeff44a53e263a09f2412dd193b86844", + "contents_checksum": "55b77011bbfe6163f84c590d8ae3b8f122a640024aa6c872ced74d0bdcc2f1e7", + "size": 36483380, + "source": "components/google-cloud-sdk-tests-20220923141408.tar.gz", "type": "tar" }, "dependencies": [ @@ -6784,8 +6951,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20220826172526, - "version_string": "2022.08.26" + "build_number": 20220923141408, + "version_string": "2022.09.23" } } ], @@ -6804,11 +6971,11 @@ ], "post_processing_command": "components post-process", "release_notes_url": "RELEASE_NOTES", - "revision": 20220826172526, + "revision": 20220923141408, "schema_version": { "no_update": false, "url": "https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz", "version": 3 }, - "version": "400.0.0" + "version": "404.0.0" } diff --git a/pkgs/tools/admin/google-cloud-sdk/data.nix b/pkgs/tools/admin/google-cloud-sdk/data.nix index 5c634ff61e015..8a0c6ce570ff6 100644 --- a/pkgs/tools/admin/google-cloud-sdk/data.nix +++ b/pkgs/tools/admin/google-cloud-sdk/data.nix @@ -1,32 +1,32 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "400.0.0"; + version = "404.0.0"; googleCloudSdkPkgs = { x86_64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-400.0.0-linux-x86_64.tar.gz"; - sha256 = "0i9xvg26d4rl3nas49rmxbmbwq127nwvgp0di7rszddj63wj7py9"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-404.0.0-linux-x86_64.tar.gz"; + sha256 = "0s2qr7krzd9z6s2i00qksxnxd1fcp318gxg8fm46rgh2r482k2k5"; }; x86_64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-400.0.0-darwin-x86_64.tar.gz"; - sha256 = "0ajywp16105yhxs5hv4cz7vg3jr9wqggb0fcimb23qpvn3xqh6xw"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-404.0.0-darwin-x86_64.tar.gz"; + sha256 = "11kzzny8a3xs1lijwwkv60qnmcxbfgzpmrdcqbcf6957b5ml6rsl"; }; aarch64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-400.0.0-linux-arm.tar.gz"; - sha256 = "0dpl7cd1z05q0mgp5qxn23jjsvjhbfxhpjbd4pmhl62qp8x4m5mm"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-404.0.0-linux-arm.tar.gz"; + sha256 = "11yzs4cc9cn8xwv51mc2qmx84nbvv1zragsdy38wrmfpd5m27jx3"; }; aarch64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-400.0.0-darwin-arm.tar.gz"; - sha256 = "16lxw3vrydzn36zwvl74akfgxx6m7mrjfd3dc8kvl1wvbbdqqz3j"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-404.0.0-darwin-arm.tar.gz"; + sha256 = "03bc1hk3blky9x8wf3lhpblxv1zyq23wimzwd7bb00h35935x449"; }; i686-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-400.0.0-linux-x86.tar.gz"; - sha256 = "09mn21ii17h8rfcmkwgmm3wpkiykgw9kc1dxjpaazxvxbmx0bi2y"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-404.0.0-linux-x86.tar.gz"; + sha256 = "0zhx9xbp090acdxlii7m94j792nlbvl4agjy35q1z8pi45hc7nl9"; }; }; } diff --git a/pkgs/tools/admin/google-cloud-sdk/update.sh b/pkgs/tools/admin/google-cloud-sdk/update.sh index ce19ef1a6e300..114342010f684 100755 --- a/pkgs/tools/admin/google-cloud-sdk/update.sh +++ b/pkgs/tools/admin/google-cloud-sdk/update.sh @@ -6,7 +6,7 @@ BASE_URL="$CHANNEL_URL/downloads/google-cloud-sdk" # Version of Google Cloud SDK from # https://cloud.google.com/sdk/docs/release-notes -VERSION="400.0.0" +VERSION="404.0.0" function genMainSrc() { local url="${BASE_URL}-${VERSION}-${1}-${2}.tar.gz" diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index ba81f7f360668..786e4bd859d1d 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kopia"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-HiM9rEdC9q3MxU6TugnyMOefakFY47HhbCdJG83m+C8="; + sha256 = "sha256-5zocfkNHsTFl3Sjwkr7dGnDY+4WO20F5AMgjfFulNd0="; }; - vendorSha256 = "sha256-7eT2HeYxyUb3MUhdjZoAFs+6GzAyTUbvE0QlXnt06uU="; + vendorSha256 = "sha256-Xmd4Q2X0cur4XGEjy1ysEEQkNqch4G+jGkPnrepgP6g="; doCheck = false; diff --git a/pkgs/tools/misc/lazycli/default.nix b/pkgs/tools/misc/lazycli/default.nix new file mode 100644 index 0000000000000..d3ef8192b38b5 --- /dev/null +++ b/pkgs/tools/misc/lazycli/default.nix @@ -0,0 +1,27 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "lazycli"; + version = "0.1.15"; + + src = fetchFromGitHub { + owner = "jesseduffield"; + repo = pname; + rev = "v${version}"; + sha256 = "1qq167hc7pp9l0m40ysphfljakmm8hjjnhpldvb0kbc825h0z8z5"; + }; + + cargoSha256 = "sha256-1BIUXepR7ppEkTLDOCZz9RBv+RazNMXnCnH1rvzVFgs="; + + checkFlags = [ + # currently broken: https://github.com/jesseduffield/lazycli/pull/20 + "--skip=command::test_run_command_fail" + ]; + + meta = with lib; { + description = "A tool to static turn CLI commands into TUIs"; + homepage = "https://github.com/jesseduffield/lazycli"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 619028c6eb7b0..99684c9a326d0 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -16,11 +16,11 @@ let in tcl.mkTclDerivation rec { pname = "remind"; - version = "04.00.03"; + version = "04.01.00"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "sha256-slTeBD7zk3aUxaRYBwrOtNz4cbWL0q57Me8SWwB3eHk="; + sha256 = "sha256-P0aDmEHkxMGk3gwgDwFIlNNoLOfSZfOHU1VYQkOLQGE="; }; propagatedBuildInputs = tclLibraries; diff --git a/pkgs/tools/misc/wayshot/default.nix b/pkgs/tools/misc/wayshot/default.nix index 659ad3add4100..64bfbe6aa4ea6 100644 --- a/pkgs/tools/misc/wayshot/default.nix +++ b/pkgs/tools/misc/wayshot/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wayshot"; - version = "1.1.9"; + version = "1.2.2"; src = fetchFromGitHub { owner = "waycrate"; repo = pname; rev = version; - hash = "sha256-4tzL/9p/qBCSWX+O7wZlKi9qb7mIt+hoxcQY7cWlFoU="; + hash = "sha256-/uZ98ICdPTilUD3vBEbJ4AxGWY1xIbkK6O+bkhqIUKA="; }; - cargoHash = "sha256-/FAI2VUoyQ1+3CuA7sEpeF5oeJdGB9CRZEp1leLnTh4="; + cargoHash = "sha256-j/gSrXY5n/zW3IogHewyrupTKtEm5EtOzfOzglyTP9A="; meta = with lib; { description = "A native, blazing-fast screenshot tool for wlroots based compositors such as sway and river"; diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index abfc85766298f..0f1769fc80239 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "xdaliclock"; - version = "2.45"; + version = "2.47"; src = fetchurl { url = "https://www.jwz.org/xdaliclock/${pname}-${version}.tar.gz"; - hash = "sha256-GHjSUuRHCAVwWcDMRb2ng1aNbheu+xnUBNLqSpPkZeQ="; + hash = "sha256-1Jkv9iulvyY+b5KryDr8s+v8LU95hcVi7PJQsL1rUL4="; }; # Note: don't change this to set sourceRoot, or updateAutotoolsGnuConfigScriptsHook diff --git a/pkgs/tools/misc/yutto/default.nix b/pkgs/tools/misc/yutto/default.nix index 3d60bad0a4cc3..a6ac2604f08fc 100644 --- a/pkgs/tools/misc/yutto/default.nix +++ b/pkgs/tools/misc/yutto/default.nix @@ -14,14 +14,14 @@ buildPythonApplication rec { pname = "yutto"; - version = "2.0.0b13"; + version = "2.0.0b15"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XqfbvlaJoRPpwnaUA52KloOsEOIt3YM0cq36DZN6lR8="; + hash = "sha256-TOFApMwY2WRYg2H2N0PIjylYFKnTHdszdU+AFgLYYwc="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/fulcio/default.nix b/pkgs/tools/security/fulcio/default.nix index 4d04d791e20db..d099cd2c0dbee 100644 --- a/pkgs/tools/security/fulcio/default.nix +++ b/pkgs/tools/security/fulcio/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fulcio"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-X943wqbgFX4Y15kCf+bxQP7OOTWksmmYghlAWPC2zVs="; + sha256 = "sha256-ZWDvFSx+zH/P0ZfdqxAe+c4jFUH8mfY1vpUXlIxw1sI="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-1BsnNDZAIdLj13e/qL//bPrhYKrTIBvtC1C65WmGHY0="; + vendorSha256 = "sha256-LLvaaOZzp9b99eYOsfvbPRwZqSNfoinVUfYDmPiw5Mk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/quill/default.nix b/pkgs/tools/security/quill/default.nix index b7f414ea87ef1..da1b22a52c978 100644 --- a/pkgs/tools/security/quill/default.nix +++ b/pkgs/tools/security/quill/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "quill"; - version = "0.2.7"; + version = "0.2.17"; src = fetchFromGitHub { owner = "dfinity"; repo = "quill"; rev = "v${version}"; - sha256 = "sha256-3OlsCRpxRDKlfC0sa9MlFCupyRbDuqJQzDb9SQob1O0="; + sha256 = "sha256-0DHTtnQU26l4DXUVDeHF+hkavlVY7rQykXxgWGSUc/k="; }; ic = fetchFromGitHub { @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { export OPENSSL_LIB_DIR=${lib.getLib openssl}/lib ''; - cargoSha256 = "sha256-YxuBABGaZ+ti31seEYR6bB+OMgrSvl1lZyu4bqdxPIk="; + cargoSha256 = "sha256-QgvQ0ptfb4L465hn/aBpVAUwSvm4MkpZlBQaVrinkq4="; nativeBuildInputs = [ pkg-config protobuf ]; buildInputs = [ openssl ] diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index 28d7158d08ff1..d923f74a7ff05 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "consul-template"; - version = "0.29.2"; + version = "0.29.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; rev = "v${version}"; - sha256 = "sha256-wvnOKbxS1j+MhmOs9INPusA1whLDo1sLGNxmzBQWPWc="; + sha256 = "sha256-jFj5iVUS7qpH4Aq35KS8IDKA7PzGgire+flBpkCgwuA="; }; - vendorSha256 = "sha256-uR1hzP17hFo9DUNCeKcwepZSxJJoV8WBsX9l+1CR4Ek="; + vendorSha256 = "sha256-GKohljwH4/kBPoI3/RfxYsvzISv1WmVAo96sjKJrnHk="; # consul-template tests depend on vault and consul services running to # execute tests so we skip them here diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index fe84d365f8d6e..8cc5d9599cc1b 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.14.03"; + version = "0.14.06"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-6aA0dWP6q6SJ8TYGctDE2rhDCO5QuAO4cx4J9id9hjY="; + hash = "sha256-akWvX22oJT/V5Zvsk7AXXIFK1AjfWEzMZXAwpJCc0M0="; }; postPatch = '' diff --git a/pkgs/tools/typesetting/ted/default.nix b/pkgs/tools/typesetting/ted/default.nix index bd21ad4c437bf..cc9d2574ff885 100644 --- a/pkgs/tools/typesetting/ted/default.nix +++ b/pkgs/tools/typesetting/ted/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, zlib, pcre, xorg, libjpeg, libtiff, libpng, gtk2, libpaper, makeWrapper, ghostscript }: +{ lib, stdenv, fetchurl, pkg-config, zlib, pcre, xlibsWrapper, xorg, libjpeg, libtiff, libpng, gtk2, libpaper, makeWrapper, ghostscript }: stdenv.mkDerivation rec { pname = "ted"; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper ]; + buildInputs = [ zlib pcre xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper ]; meta = with lib; { description = "An easy rich text processor"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4a4266ea9eb2..d1c5fd77f4d12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1749,6 +1749,8 @@ with pkgs; inherit (qt5) wrapQtAppsHook; }; + felix-fm = callPackage ../applications/file-managers/felix-fm { }; + joshuto = callPackage ../applications/file-managers/joshuto { inherit (darwin.apple_sdk.frameworks) SystemConfiguration Foundation; }; @@ -3918,6 +3920,8 @@ with pkgs; faudio = callPackage ../development/libraries/faudio { }; + fblog = callPackage ../development/tools/fblog { }; + fd = callPackage ../tools/misc/fd { }; fdroidserver = python3Packages.callPackage ../development/tools/fdroidserver { }; @@ -8589,6 +8593,8 @@ with pkgs; latexrun = callPackage ../tools/typesetting/tex/latexrun { }; + lazycli = callPackage ../tools/misc/lazycli { }; + lcdf-typetools = callPackage ../tools/misc/lcdf-typetools { }; ldapmonitor = callPackage ../tools/security/ldapmonitor { }; @@ -13379,7 +13385,7 @@ with pkgs; devpi-client = python3Packages.callPackage ../development/tools/devpi-client {}; - devpi-server = callPackage ../development/tools/devpi-server {}; + devpi-server = python3Packages.callPackage ../development/tools/devpi-server {}; dictu = callPackage ../development/compilers/dictu { }; @@ -23112,10 +23118,7 @@ with pkgs; grafana = callPackage ../servers/monitoring/grafana { }; grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { }; - grafana-agent = callPackage ../servers/monitoring/grafana-agent { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + grafana-agent = callPackage ../servers/monitoring/grafana-agent { }; grafana-loki = callPackage ../servers/monitoring/loki { }; @@ -24118,7 +24121,7 @@ with pkgs; libdrm = if stdenv.isLinux then libdrm else null; abiCompat = config.xorg.abiCompat # `config` because we have no `xorg.override` or (if stdenv.isDarwin then "1.18" else null); # 1.19 needs fixing on Darwin - }) // { inherit xlibsWrapper; } ); + })); xorg-autoconf = callPackage ../development/tools/misc/xorg-autoconf { }; diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index 6ddd647a2b1a1..5057ca10e105a 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -130,7 +130,7 @@ let checkMeta = mkOption { type = types.bool; - default = true; + default = false; description = '' Whether to check that the `meta` attribute of derivations are correct during evaluation time. ''; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 070e228979cbb..9c58630036a39 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15733,17 +15733,12 @@ let mod_perl2 = buildPerlPackage { pname = "mod_perl"; - version = "2.0.11"; + version = "2.0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.11.tar.gz"; - hash = "sha256-yiqeGM35D5xgI+eGNp1bp16NrCkuv+qZAMKb9C3Bb3Q="; + url = "mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.12.tar.gz"; + hash = "sha256-9bghtZsP3JZw5G7Q/PMtiRHyUSYYmotowWUvkiHu4mk="; }; - patches = [ - # Fix build on perl-5.34.0, https://github.com/Perl/perl5/issues/18617 - ../development/perl-modules/mod_perl2-PL_hash_seed.patch - ]; - makeMakerFlags = "MP_AP_DESTDIR=$out"; buildInputs = [ pkgs.apacheHttpd ]; doCheck = false; # would try to start Apache HTTP server |