diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md index 5ffc23173d6d..d266a032268c 100644 --- a/doc/languages-frameworks/ocaml.section.md +++ b/doc/languages-frameworks/ocaml.section.md @@ -1,5 +1,31 @@ # OCaml {#sec-language-ocaml} +## User guide {#sec-language-ocaml-user-guide} + +OCaml libraries are available in attribute sets of the form `ocaml-ng.ocamlPackages_X_XX` where X is to be replaced with the desired compiler version. For example, ocamlgraph compiled with OCaml 4.12 can be found in `ocaml-ng.ocamlPackages_4_12.ocamlgraph`. The compiler itself is also located in this set, under the name `ocaml`. + +If you don't care about the exact compiler version, `ocamlPackages` is a top-level alias pointing to a recent version of OCaml. + +OCaml applications are usually available top-level, and not inside `ocamlPackages`. Notable exceptions are build tools that must be built with the same compiler version as the compiler you intend to use like `dune` or `ocaml-lsp`. + +To open a shell able to build a typical OCaml project, put the dependencies in `buildInputs` and add `ocamlPackages.ocaml` and `ocamlPackages.findlib` to `nativeBuildInputs` at least. +For example: +```nix +let + pkgs = import {}; + # choose the ocaml version you want to use + ocamlPackages = pkgs.ocaml-ng.ocamlPackages_4_12; +in +pkgs.mkShell { + # build tools + nativeBuildInputs = with ocamlPackages; [ ocaml findlib dune_2 ocaml-lsp ]; + # dependencies + buildInputs = with ocamlPackages; [ ocamlgraph ]; +} +``` + +## Packaging guide {#sec-language-ocaml-packaging} + OCaml libraries should be installed in `$(out)/lib/ocaml/${ocaml.version}/site-lib/`. Such directories are automatically added to the `$OCAMLPATH` environment variable when building another package that depends on them or when opening a `nix-shell`. Given that most of the OCaml ecosystem is now built with dune, nixpkgs includes a convenience build support function called `buildDunePackage` that will build an OCaml package using dune, OCaml and findlib and any additional dependencies provided as `buildInputs` or `propagatedBuildInputs`. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b14431dbb7a4..43d8d58baa10 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -603,6 +603,12 @@ fingerprint = "7931 EB4E 4712 D7BE 04F8 6D34 07EE 1FFC A58A 11C5"; }]; }; + amfl = { + email = "amfl@none.none"; + github = "amfl"; + githubId = 382798; + name = "amfl"; + }; amiddelk = { email = "amiddelk@gmail.com"; github = "amiddelk"; diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix index 9b005021086b..2b94b954cb80 100644 --- a/nixos/modules/config/swap.nix +++ b/nixos/modules/config/swap.nix @@ -203,7 +203,6 @@ in ]; # Create missing swapfiles. - # FIXME: support changing the size of existing swapfiles. systemd.services = let @@ -223,11 +222,7 @@ in ${optionalString (sw.size != null) '' currentSize=$(( $(stat -c "%s" "${sw.device}" 2>/dev/null || echo 0) / 1024 / 1024 )) if [ "${toString sw.size}" != "$currentSize" ]; then - fallocate -l ${toString sw.size}M "${sw.device}" || - dd if=/dev/zero of="${sw.device}" bs=1M count=${toString sw.size} - if [ "${toString sw.size}" -lt "$currentSize" ]; then - truncate --size "${toString sw.size}M" "${sw.device}" - fi + dd if=/dev/zero of="${sw.device}" bs=1M count=${toString sw.size} chmod 0600 ${sw.device} ${optionalString (!sw.randomEncryption.enable) "mkswap ${sw.realDevice}"} fi diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 917c6d3013e7..5b379505608a 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -294,7 +294,7 @@ in hardware.opengl.extraPackages32 = optional offloadCfg.enable nvidia_x11.lib32; environment.systemPackages = [ nvidia_x11.bin ] - ++ optionals nvidiaSettings [ nvidia_x11.settings ] + ++ optionals cfg.nvidiaSettings [ nvidia_x11.settings ] ++ optionals nvidiaPersistencedEnabled [ nvidia_x11.persistenced ]; systemd.packages = optional cfg.powerManagement.enable nvidia_x11.out; diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix index f044e6f39ea5..e79b92723841 100644 --- a/nixos/modules/profiles/minimal.nix +++ b/nixos/modules/profiles/minimal.nix @@ -14,4 +14,6 @@ with lib; documentation.enable = mkDefault false; documentation.nixos.enable = mkDefault false; + + programs.command-not-found.enable = mkDefault false; } diff --git a/nixos/modules/services/databases/hbase.nix b/nixos/modules/services/databases/hbase.nix index 9132b7ed3569..ff01a1bcd98b 100644 --- a/nixos/modules/services/databases/hbase.nix +++ b/nixos/modules/services/databases/hbase.nix @@ -103,7 +103,8 @@ in { wantedBy = [ "multi-user.target" ]; environment = { - JAVA_HOME = "${pkgs.jre}"; + # JRE 15 removed option `UseConcMarkSweepGC` which is needed. + JAVA_HOME = "${pkgs.jre8}"; HBASE_LOG_DIR = cfg.logDir; }; diff --git a/nixos/modules/services/databases/influxdb2.nix b/nixos/modules/services/databases/influxdb2.nix index 01b9c4934847..15f008cbc6d6 100644 --- a/nixos/modules/services/databases/influxdb2.nix +++ b/nixos/modules/services/databases/influxdb2.nix @@ -17,7 +17,7 @@ in }; settings = mkOption { default = { }; - description = "configuration options for influxdb2, see https://docs.influxdata.com/influxdb/v2.0/reference/config-options for details."; + description = ''configuration options for influxdb2, see for details.''; type = format.type; }; }; diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index 5f99ee866a50..2ae4e80d5c3f 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -65,6 +65,29 @@ in ''; }; + extraScanners = mkOption { + type = types.listOf types.path; + default = []; + description = '' + A list of paths to extra scanners to install in Plex's scanners + directory. + + Every time the systemd unit for Plex starts up, all of the symlinks + in Plex's scanners directory will be cleared and this module will + symlink all of the paths specified here to that directory. + ''; + example = literalExpression '' + [ + (fetchFromGitHub { + owner = "ZeroQI"; + repo = "Absolute-Series-Scanner"; + rev = "773a39f502a1204b0b0255903cee4ed02c46fde0"; + sha256 = "4l+vpiDdC8L/EeJowUgYyB3JPNTZ1sauN8liFAcK+PY="; + }) + ] + ''; + }; + package = mkOption { type = types.package; default = pkgs.plex; @@ -113,6 +136,7 @@ in # Configuration for our FHS userenv script PLEX_DATADIR=cfg.dataDir; PLEX_PLUGINS=concatMapStringsSep ":" builtins.toString cfg.extraPlugins; + PLEX_SCANNERS=concatMapStringsSep ":" builtins.toString cfg.extraScanners; # The following variables should be set by the FHS userenv script: # PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.xml b/nixos/modules/services/x11/desktop-managers/pantheon.xml index 70cd7410c1e0..64933349e798 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.xml +++ b/nixos/modules/services/x11/desktop-managers/pantheon.xml @@ -107,12 +107,6 @@ switchboard-with-plugs.override { AppCenter has been available since 20.03, but it is of little use. This is because there is no functioning PackageKit backend for Nix 2.0. The Flatpak backend will not work before flag for Flatpak-only is provided. See this issue. - - To use AppCenter on NixOS, add pantheon.appcenter to , enable Flatpak support and optionally add the appcenter Flatpak remote: - - -$ flatpak remote-add --if-not-exists appcenter https://flatpak.elementary.io/repo.flatpakrepo - diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 662dfe2db989..2e17bdf6bb65 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -131,6 +131,7 @@ let "fou" "xfrm" "ifb" + "batadv" ]) (assertByteFormat "MTUBytes") (assertMacAddress "MACAddress") @@ -381,6 +382,29 @@ let (assertInt "Table") (assertMinimum "Table" 0) ]; + + sectionBatmanAdvanced = checkUnitConfig "BatmanAdvanced" [ + (assertOnlyFields [ + "GatewayMode" + "Aggregation" + "BridgeLoopAvoidance" + "DistributedArpTable" + "Fragmentation" + "HopPenalty" + "OriginatorIntervalSec" + "GatewayBandwithDown" + "GatewayBandwithUp" + "RoutingAlgorithm" + ]) + (assertValueOneOf "GatewayMode" ["off" "client" "server"]) + (assertValueOneOf "Aggregation" boolValues) + (assertValueOneOf "BridgeLoopAvoidance" boolValues) + (assertValueOneOf "DistributedArpTable" boolValues) + (assertValueOneOf "Fragmentation" boolValues) + (assertInt "HopPenalty") + (assertRange "HopPenalty" 0 255) + (assertValueOneOf "RoutingAlgorithm" ["batman-v" "batman-iv"]) + ]; }; network = { @@ -473,6 +497,7 @@ let "IgnoreCarrierLoss" "Xfrm" "KeepConfiguration" + "BatmanAdvanced" ]) # Note: For DHCP the values both, none, v4, v6 are deprecated (assertValueOneOf "DHCP" ["yes" "no" "ipv4" "ipv6"]) @@ -1056,6 +1081,21 @@ let ''; }; + batmanAdvancedConfig = mkOption { + default = {}; + example = { + GatewayMode = "server"; + RoutingAlgorithm = "batman-v"; + }; + type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionBatmanAdvanced; + description = '' + Each attribute in this set specifies an option in the + [BatmanAdvanced] section of the unit. See + systemd.netdev + 5 for details. + ''; + }; + }; addressOptions = { @@ -1507,6 +1547,10 @@ let [VRF] ${attrsToSection def.vrfConfig} '' + + optionalString (def.batmanAdvancedConfig != { }) '' + [BatmanAdvanced] + ${attrsToSection def.batmanAdvancedConfig} + '' + def.extraConfig; }; diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 3fdd3995b7aa..45c5c1963a0d 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -29,6 +29,7 @@ let linux_4_19_hardened linux_5_4_hardened linux_5_10_hardened + linux_5_15_hardened linux_testing; }; diff --git a/pkgs/applications/blockchains/wasabibackend/create_deps.sh b/pkgs/applications/blockchains/wasabibackend/create_deps.sh index 79bc88ca8996..764bf2106ef9 100755 --- a/pkgs/applications/blockchains/wasabibackend/create_deps.sh +++ b/pkgs/applications/blockchains/wasabibackend/create_deps.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p dotnet-sdk_3 jq xmlstarlet curl nixfmt +#! nix-shell -i bash -p dotnet-sdk_3 jq xmlstarlet curl nixpkgs-fmt set -euo pipefail # Run this script to generate deps.nix @@ -95,4 +95,4 @@ echo $DEPS_FOOTER >&6 exec 6>&- -nixfmt "$deps_file" +nixpkgs-fmt "$deps_file" diff --git a/pkgs/applications/blockchains/wasabibackend/deps.nix b/pkgs/applications/blockchains/wasabibackend/deps.nix index 47ee3f9bfe59..d558fa871537 100644 --- a/pkgs/applications/blockchains/wasabibackend/deps.nix +++ b/pkgs/applications/blockchains/wasabibackend/deps.nix @@ -1,17 +1,14 @@ { fetchurl }: let nugetUrlBase = "https://www.nuget.org/api/v2/package"; - fetchNuGet = { name, version, sha256 }: - fetchurl { - inherit sha256; - url = "${nugetUrlBase}/${name}/${version}"; - }; -in [ + fetchNuGet = { name, version, sha256 }: fetchurl { inherit sha256; url = "${nugetUrlBase}/${name}/${version}"; }; +in +[ (fetchNuGet { name = "microsoft.aspnetcore.app.runtime.linux-x64"; - version = "3.1.19"; - sha256 = "19z4zrchaxcz0a33c33n1qd11z9khj4323nfzsbzah0xxkkj8ka8"; + version = "3.1.21"; + sha256 = "056g9nv8a7n8zdbgzmyzmn3pbg52yq2kv5d1rcp7h6plwzgpiwql"; }) (fetchNuGet { name = "microsoft.aspnetcore.jsonpatch"; @@ -95,8 +92,8 @@ in [ }) (fetchNuGet { name = "microsoft.netcore.app.runtime.linux-x64"; - version = "3.1.19"; - sha256 = "10c9bq1z8j173n9jzamgplbxq101yscwdhksshn1ybisn7cr5g0h"; + version = "3.1.21"; + sha256 = "13692wqcww0w6x4nhyxpxwprdg6mx9xmlvv38m6fvp6g0m27r43v"; }) (fetchNuGet { name = "microsoft.netcore.dotnetapphost"; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index a07cf38c0eba..257206b4f27e 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-13"; + version = "7.1.0-14"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "sha256-W/XqgYOlSailHQdNBYsvf2P9go9sblWayDLrQQlekro="; + sha256 = "sha256-w4h4KEfmDC/dDgtk7xgEnIYvSfPlKfsvdFhx43Tn9GA="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix index 0a4ed515511c..e38ca908fe07 100644 --- a/pkgs/applications/graphics/c3d/default.nix +++ b/pkgs/applications/graphics/c3d/default.nix @@ -1,20 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, cmake, itk4, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake, itk, Cocoa }: stdenv.mkDerivation rec { pname = "c3d"; - version = "unstable-2020-10-05"; + version = "unstable-2021-09-14"; src = fetchFromGitHub { owner = "pyushkevich"; repo = pname; - rev = "0a87e3972ea403babbe2d05ec6d50855e7c06465"; - sha256 = "0wsmkifqrcfy13fnwvinmnq1m0lkqmpyg7bgbwnb37mbrlbq06wf"; + rev = "cc06e6e2f04acd3d6faa3d8c9a66b499f02d4388"; + sha256 = "sha256:1ql1y6694njsmdapywhppb54viyw8wdpaxxr1b3hm2rqhvwmhn52"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ itk4 ] + buildInputs = [ itk ] ++ lib.optional stdenv.isDarwin Cocoa; + cmakeFlags = [ "-DCONVERT3D_USE_ITK_REMOTE_MODULES=OFF" ]; + meta = with lib; { homepage = "https://github.com/pyushkevich/c3d"; description = "Medical imaging processing tool"; @@ -22,6 +24,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.gpl3; broken = stdenv.isAarch64; - # /build/git-3453f61/itkextras/OneDimensionalInPlaceAccumulateFilter.txx:311:10: fatal error: xmmintrin.h: No such file or directory + # /build/source/itkextras/OneDimensionalInPlaceAccumulateFilter.txx:312:10: fatal error: xmmintrin.h: No such file or directory }; } diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index dc692b67730e..d5e2e6adf526 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec{ pname = "corectrl"; - version = "1.1.4"; + version = "1.2.2"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; rev = "v${version}"; - sha256 = "sha256-o8u9WnkK/6VZ+wlJ9I5Ti6ADjV9VXraRGpSWkDQv5JQ="; + sha256 = "1zp523cgvmfjc42wx1f1jh5q3jnsnm833m2xnbbwmfrmhrzh5269"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/q4wine/default.nix b/pkgs/applications/misc/q4wine/default.nix new file mode 100644 index 000000000000..cb4014684fd2 --- /dev/null +++ b/pkgs/applications/misc/q4wine/default.nix @@ -0,0 +1,37 @@ +{ lib, fetchFromGitHub, mkDerivation, cmake, sqlite +, qtbase, qtsvg, qttools, wrapQtAppsHook +, icoutils # build and runtime deps. +, wget, fuseiso, wine, sudo, which # runtime deps. +}: + +mkDerivation rec { + pname = "q4wine"; + version = "1.3.13"; + + src = fetchFromGitHub { + owner = "brezerk"; + repo = "q4wine"; + rev = "v${version}"; + sha256 = "04gw5y3dxdpivm2xqacqq85fdzx7xkl0c3h3hdazljb0c3cxxs6h"; + }; + + buildInputs = [ + sqlite icoutils qtbase qtsvg qttools + ]; + + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + + # Add runtime deps. + postInstall = '' + wrapProgram $out/bin/q4wine \ + --prefix PATH : ${lib.makeBinPath [ icoutils wget fuseiso wine which ]} + ''; + + meta = with lib; { + homepage = "https://q4wine.brezblock.org.ua/"; + description = "A Qt GUI for Wine to manage prefixes and applications"; + license = licenses.gpl3; + maintainers = with maintainers; [ rkitover ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/sqls/default.nix b/pkgs/applications/misc/sqls/default.nix index d3ecfcbde2b0..2c89d31df35a 100644 --- a/pkgs/applications/misc/sqls/default.nix +++ b/pkgs/applications/misc/sqls/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sqls"; - version = "0.2.19"; + version = "0.2.20"; src = fetchFromGitHub { owner = "lighttiger2505"; repo = pname; rev = "v${version}"; - sha256 = "1myypq9kdfbhl5h9h8d30a3pi89mix48wm1c38648ky9vhx0s4az"; + sha256 = "sha256-QYxiWxgzuD+JymlXlVmzZOtex70JC93VmWljAFQJMPQ="; }; - vendorSha256 = "13c7nv0anj260z34bd7w1hz0rkmsj9r1zz55qiwcr1vdgmvy84cz"; + vendorSha256 = "sha256-fo5g6anMcKqdzLG8KCJ/T4uTOp1Z5Du4EtCHYkLgUpo="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.revision=${src.rev}" ]; diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 79a0758a2a5b..6c1f035dfef6 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -25,13 +25,13 @@ }: buildPythonApplication rec { pname = "visidata"; - version = "2.7"; + version = "2.7.1"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - sha256 = "0b2h9vy0fch0bk0b33h8p4ssk3a25j67sfn0yvmxhbqjdmhlwv4h"; + sha256 = "13s1541n1sr2rkfk1qpsm61y2q773x6fs4cwin660qq4bzmgymhy"; }; propagatedBuildInputs = [ @@ -90,7 +90,7 @@ buildPythonApplication rec { meta = { description = "Interactive terminal multitool for tabular data"; license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.raskin ]; + maintainers = with lib.maintainers; [ raskin markus1189 ]; homepage = "http://visidata.org/"; changelog = "https://github.com/saulpw/visidata/blob/v${version}/CHANGELOG.md"; }; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index ca73b620cfbb..313a03d0dd2f 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "97.0.4692.8", - "sha256": "0n47jfxs05g55p69f5939jf5pgyw88n4cpg78k019n3zr2vlv1qf", - "sha256bin64": "1gisqc6dz7yfigj0dji7cnx5jdcjz0gmn248cp2a6zs9mfvwwbqv", + "version": "97.0.4692.20", + "sha256": "1njgfz3kz1pyyaaskqc47ldy2gzc3c9a8mjib81nalzrqbmd3372", + "sha256bin64": "06vsmzz8nvmx7hfqwvqfmq4h000dw22srxdrgrdfgh7mry0yvf4a", "deps": { "gn": { "version": "2021-11-03", diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix new file mode 100644 index 000000000000..752c9b3c6172 --- /dev/null +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -0,0 +1,41 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "clusterctl"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "kubernetes-sigs"; + repo = "cluster-api"; + rev = "v${version}"; + sha256 = "sha256-EkBZZUkr1u0u75WDDFAdLLpS01+3+eyXpu4HRg2Q780="; + }; + + vendorSha256 = "sha256-VO1Z4NUWrd4JuFYFg0a01psqoIM8ps3vKd0djR5OELU="; + + subPackages = [ "cmd/clusterctl" ]; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = let t = "sigs.k8s.io/cluster-api/version"; in [ + "-X ${t}.gitMajor=${lib.versions.major version}" + "-X ${t}.gitMinor=${lib.versions.minor version}" + "-X ${t}.gitVersion=v${version}" + ]; + + postInstall = '' + # errors attempting to write config to read-only $HOME + export HOME=$(mktemp -d) + + installShellCompletion --cmd clusterctl \ + --bash <($out/bin/clusterctl completion bash) \ + --zsh <($out/bin/clusterctl completion zsh) + ''; + + meta = with lib; { + description = "Kubernetes cluster API tool"; + homepage = "https://cluster-api.sigs.k8s.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ zowoq ]; + }; +} diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix index 13d15d0bf618..7f960931c100 100644 --- a/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub }: # SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags. -let rev = "08bb70f407d0334fa80b9dbc6850987f16eb27d3"; +let rev = "dc78b39a6ff0a1a94a29fa0fd72bcbe5d95004be"; in buildGoModule rec { pname = "sonobuoy"; - version = "0.54.0"; # Do not forget to update `rev` above + version = "0.55.0"; # Do not forget to update `rev` above ldflags = let t = "github.com/vmware-tanzu/sonobuoy"; @@ -20,10 +20,10 @@ buildGoModule rec { owner = "vmware-tanzu"; repo = "sonobuoy"; rev = "v${version}"; - sha256 = "sha256-Gtpky+zkFKukIIHF91F4uBZjaguk8KlOEVhSwTj+ccs="; + sha256 = "sha256-fMZju0Cd1JtVC+EKHwW3ZGsB2m0V3UIHsKQMbvf4i5Y="; }; - vendorSha256 = "sha256-Lkwv95BZa7nFEXk1KcwXIRVpj9DZmqnWjkdrZkO/k24="; + vendorSha256 = "sha256-jPKCWTFABKRZCg6X5VVdrmOU/ZFc7yGD7R8RJrpcITg="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/spacegun/node-composition.nix b/pkgs/applications/networking/cluster/spacegun/node-composition.nix index 7cbb2328ae73..9d532a3861a1 100644 --- a/pkgs/applications/networking/cluster/spacegun/node-composition.nix +++ b/pkgs/applications/networking/cluster/spacegun/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ffcc0b3d43b1..3023bb6c7ac1 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -179,10 +179,10 @@ "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v2.23.0", - "sha256": "0cyw6lddw3pj5lqra78qn0nd16ffay86vc8sqa68grx7ik9jgn7l", - "vendorSha256": "19fdwif81lqp848jhawd09b0lalslrwadd519vsdw03v2wp4p962", - "version": "2.23.0" + "rev": "v3.4.0", + "sha256": "1w37wkpb785jfqq91piclcsrhy3idpbmwb90n5y7rkgmm37ij7ij", + "vendorSha256": "004pb5xnvisq3j113i6qfvnh1j06nkpkgzav3wb08k0bl19b6jks", + "version": "3.4.0" }, "cloudinit": { "owner": "hashicorp", diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index d04f2d18f97a..9b3ab777b053 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -28,11 +28,11 @@ }: let - version = "5.8.3.145"; + version = "5.8.4.210"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "1p4agpbcpk95r04m775dr17fmlm18vxq9mb65pyfbhvsd1ypw6kr"; + sha256 = "1qjr35wg1jk6a6c958s0hbgqqczq789iim77s02yqpy5kyjbnn1n"; }; }; diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index b0975c56b059..7d5d414a4f97 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "seafile-client"; - version = "8.0.4"; + version = "8.0.5"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "sha256-HIgIcw4Y/NXidCBwRMrdKojlqO8CJO+6N7s7PdBx4YQ="; + sha256 = "1p9wkvnr3km829gy84b1w1pv72pany5vr3r7ydz1c0aqrp0snfhx"; }; nativeBuildInputs = [ pkg-config cmake ]; @@ -29,6 +29,6 @@ mkDerivation rec { description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ schmittlauch ]; + maintainers = with maintainers; [ schmittlauch greizgh ]; }; } diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index ddd94bff522a..1620c2878eea 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -43,14 +43,14 @@ in clientbuffer = zncDerivation rec { pname = "znc-clientbuffer"; - version = "unstable-2020-04-24"; + version = "unstable-2021-05-30"; module_name = "clientbuffer"; src = fetchFromGitHub { owner = "CyberShadow"; repo = "znc-clientbuffer"; - rev = "2e32d508aa975c0a307d09575a0198f8c56c11fa"; - sha256 = "1jaspnrbv3pzsnbysqygc8s8g3q07zx5nlrdpgwv9j8aryg0pcnh"; + rev = "9a7465b413b53408f5d7af86e84b1d08efb6bec0"; + sha256 = "0a3f4j6s5j7p53y42zrgpqyl2zm0jxb69lp24j6mni3licigh254"; }; meta = with lib; { diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 1bd29b06d9b9..dfaec8690228 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "21.10.9"; + version = "21.11.4"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-.tar.xz.sha256 - sha256 = "2c86d66ae427bdcd16d706b982cedaa669a27340f7819fc97a8e2b24c709e74f"; + sha256 = "3eb025873160cecd4fa35ae5079c150d4aa5dd3152fd58c5e216b592af43e8dc"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 8c7b4ee43842..f1740b326dcf 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -9,11 +9,11 @@ let in buildPythonApplication rec { pname = "todoman"; - version = "4.0.0"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - sha256 = "4c4d0c6533da8d553f3dd170c9c4ff3752eb11fd7177ee391414a39adfef60ad"; + sha256 = "ec88f8009321e77deb0ae682f7d036c139edf4175f8413011b532905c6e7d2b1"; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -90,8 +90,8 @@ buildPythonApplication rec { Todoman is part of the pimutils project ''; + changelog = "https://github.com/pimutils/todoman/raw/v${version}/CHANGELOG.rst"; license = licenses.isc; maintainers = with maintainers; [ leenaars ]; - platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/logic/kissat/default.nix b/pkgs/applications/science/logic/kissat/default.nix new file mode 100644 index 000000000000..08be0740117a --- /dev/null +++ b/pkgs/applications/science/logic/kissat/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv, fetchFromGitHub +, drat-trim, p7zip +}: + +stdenv.mkDerivation rec { + pname = "kissat"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "arminbiere"; + repo = "kissat"; + # https://github.com/arminbiere/kissat/issues/18 + rev = "abfa45fb782fa3b7c6e2eb6b939febe74d7270b7"; + sha256 = "06pbmkjxgf2idhsrd1yzvbxr2wf8l06pjb38bzbygm6n9ami89b8"; + }; + + outputs = [ "out" "dev" "lib" ]; + + checkInputs = [ drat-trim p7zip ]; + doCheck = true; + + # 'make test' assumes that /etc/passwd is not writable. + patches = [ ./writable-passwd-is-ok.patch ]; + + # the configure script is not generated by autotools and does not accept the + # arguments that the default configurePhase passes like --prefix and --libdir + dontAddPrefix = true; + setOutputFlags = false; + + installPhase = '' + runHook preInstall + + install -Dm0755 build/kissat "$out/bin/kissat" + install -Dm0644 src/kissat.h "$dev/include/kissat.h" + install -Dm0644 build/libkissat.a "$lib/lib/libkissat.a" + mkdir -p "$out/share/doc/kissat/" + install -Dm0644 {LICEN?E,README*,VERSION} "$out/share/doc/kissat/" + + runHook postInstall + ''; + + meta = with lib; { + description = "A 'keep it simple and clean bare metal SAT solver' written in C"; + longDescription = '' + Kissat is a "keep it simple and clean bare metal SAT solver" written in C. + It is a port of CaDiCaL back to C with improved data structures, + better scheduling of inprocessing and optimized algorithms and implementation. + ''; + maintainers = with maintainers; [ shnarazk ]; + platforms = platforms.unix; + license = licenses.mit; + homepage = "http://fmv.jku.at/kissat"; + }; +} diff --git a/pkgs/applications/science/logic/kissat/writable-passwd-is-ok.patch b/pkgs/applications/science/logic/kissat/writable-passwd-is-ok.patch new file mode 100644 index 000000000000..f2cca54e1d36 --- /dev/null +++ b/pkgs/applications/science/logic/kissat/writable-passwd-is-ok.patch @@ -0,0 +1,13 @@ +diff --git a/test/testfile.c b/test/testfile.c +index cb311d5..0726244 100644 +--- a/test/testfile.c ++++ b/test/testfile.c +@@ -92,8 +92,6 @@ do { \ + WRITABLE (true, "../test/file/non-existing"); + WRITABLE (false, "/kissat-test-file-writable"); + WRITABLE (false, "non-existing-directory/file-in-non-existing-directory"); +- if (kissat_file_exists ("/etc/passwd")) +- WRITABLE (false, "/etc/passwd"); + #undef WRITABLE + } + diff --git a/pkgs/applications/version-management/commitizen/generate-dependencies.sh b/pkgs/applications/version-management/commitizen/generate-dependencies.sh index 7111289d2909..9855e2d41d1a 100755 --- a/pkgs/applications/version-management/commitizen/generate-dependencies.sh +++ b/pkgs/applications/version-management/commitizen/generate-dependencies.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix +#! nix-shell -I nixpkgs=../../../.. -i bash -p nodePackages.node2nix node2nix \ --node-env node-env.nix \ diff --git a/pkgs/applications/version-management/commitizen/node-composition.nix b/pkgs/applications/version-management/commitizen/node-composition.nix index 0769168a78fa..53bdef1f9864 100644 --- a/pkgs/applications/version-management/commitizen/node-composition.nix +++ b/pkgs/applications/version-management/commitizen/node-composition.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! {pkgs ? import { inherit system; @@ -6,12 +6,12 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile; - inherit nodejs; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; + inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages.nix { - inherit (pkgs) fetchurl fetchgit; + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; inherit nodeEnv; } diff --git a/pkgs/applications/version-management/commitizen/node-env.nix b/pkgs/applications/version-management/commitizen/node-env.nix index 262df27e464f..5f055785791b 100644 --- a/pkgs/applications/version-management/commitizen/node-env.nix +++ b/pkgs/applications/version-management/commitizen/node-env.nix @@ -1,8 +1,11 @@ # This file originates from node2nix -{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}: +{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: let + # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master + utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; + python = if nodejs ? python then nodejs.python else python2; # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise @@ -37,36 +40,22 @@ let ''; }; - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) - (lib.concatMapStrings (dependency: - '' - # Bundle the dependencies of the package - mkdir -p node_modules - cd node_modules + # Common shell logic + installPackage = writeShellScript "install-package" '' + installPackage() { + local packageName=$1 src=$2 - # Only include dependencies if they don't exist. They may also be bundled in the package. - if [ ! -e "${dependency.name}" ] - then - ${composePackage dependency} - fi + local strippedName - cd .. - '' - ) dependencies); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - DIR=$(pwd) + local DIR=$PWD cd $TMPDIR - unpackFile ${src} + unpackFile $src # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/${packageName}")" + mkdir -p "$(dirname "$DIR/$packageName")" - if [ -f "${src}" ] + if [ -f "$src" ] then # Figure out what directory has been unpacked packageDir="$(find . -maxdepth 1 -type d | tail -1)" @@ -76,28 +65,53 @@ let chmod -R u+w "$packageDir" # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/${packageName}" - elif [ -d "${src}" ] + mv "$packageDir" "$DIR/$packageName" + elif [ -d "$src" ] then # Get a stripped name (without hash) of the source directory. # On old nixpkgs it's already set internally. if [ -z "$strippedName" ] then - strippedName="$(stripHash ${src})" + strippedName="$(stripHash $src)" fi # Restore write permissions to make building work chmod -R u+w "$strippedName" # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/${packageName}" + mv "$strippedName" "$DIR/$packageName" fi - # Unset the stripped name to not confuse the next unpack step - unset strippedName + # Change to the package directory to install dependencies + cd "$DIR/$packageName" + } + ''; - # Include the dependencies of the package - cd "$DIR/${packageName}" + # Bundle the dependencies of the package + # + # Only include dependencies if they don't exist. They may also be bundled in the package. + includeDependencies = {dependencies}: + lib.optionalString (dependencies != []) ( + '' + mkdir -p node_modules + cd node_modules + '' + + (lib.concatMapStrings (dependency: + '' + if [ ! -e "${dependency.name}" ]; then + ${composePackage dependency} + fi + '' + ) dependencies) + + '' + cd .. + '' + ); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [], ... }@args: + builtins.addErrorContext "while evaluating node package '${packageName}'" '' + installPackage "${packageName}" "${src}" ${includeDependencies { inherit dependencies; }} cd .. ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} @@ -242,8 +256,8 @@ let if(fs.existsSync("./package-lock.json")) { var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - if(packageLock.lockfileVersion !== 1) { - process.stderr.write("Sorry, I only understand lock file version 1!\n"); + if(![1, 2].includes(packageLock.lockfileVersion)) { + process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); process.exit(1); } @@ -388,15 +402,16 @@ let , dontStrip ? true , unpackPhase ? "true" , buildPhase ? "true" + , meta ? {} , ... }@args: let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; in stdenv.mkDerivation ({ - name = "node_${name}-${version}"; + name = "${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) util-linux + ++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; @@ -411,6 +426,8 @@ let passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; installPhase = '' + source ${installPackage} + # Create and enter a root node_modules/ folder mkdir -p $out/lib/node_modules cd $out/lib/node_modules @@ -443,10 +460,15 @@ let # Run post install hook, if provided runHook postInstall ''; + + meta = { + # default to Node.js' platforms + platforms = nodejs.meta.platforms; + } // meta; } // extraArgs); - # Builds a development shell - buildNodeShell = + # Builds a node environment (a node_modules folder and a set of binaries) + buildNodeDependencies = { name , packageName , version @@ -465,12 +487,12 @@ let let extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - - nodeDependencies = stdenv.mkDerivation ({ + in + stdenv.mkDerivation ({ name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) util-linux + ++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; @@ -483,6 +505,8 @@ let passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; installPhase = '' + source ${installPackage} + mkdir -p $out/${packageName} cd $out/${packageName} @@ -512,11 +536,32 @@ let ln -s $out/lib/node_modules/.bin $out/bin ''; } // extraArgs); + + # Builds a development shell + buildNodeShell = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + nodeDependencies = buildNodeDependencies args; in stdenv.mkDerivation { name = "node-shell-${name}-${version}"; - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs; + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell <&2 + exit 1 +fi + +VERSION=$1 +HASHFILE=$(mktemp /tmp/dotnet.hashes.XXXXXXXX) +trap "rm -f $HASHFILE" EXIT + +curl -L https://dotnetcli.blob.core.windows.net/dotnet/checksums/$VERSION-sha.txt -o $HASHFILE + +ASPNETCORE_VERSION=$(grep aspnetcore-runtime- $HASHFILE | grep -- -linux-x64.tar.gz | tail -n -1 | sed -e 's:.*aspnetcore-runtime-::' -e 's:-linux-x64.tar.gz.*$::' ) +ASPNETCORE_HASH_LINUX_X64=$(grep aspnetcore-runtime- $HASHFILE | grep -- -linux-x64.tar.gz | cut -d ' ' -f 1) +ASPNETCORE_HASH_LINUX_ARM64=$(grep aspnetcore-runtime- $HASHFILE | grep -- -linux-arm64.tar.gz | cut -d ' ' -f 1) +ASPNETCORE_HASH_OSX_X64=$(grep aspnetcore-runtime- $HASHFILE | grep -- -osx-x64.tar.gz | cut -d ' ' -f 1) +ASPNETCORE_HASH_OSX_ARM64=$(grep aspnetcore-runtime- $HASHFILE | grep -- -osx-arm64.tar.gz | cut -d ' ' -f 1) + +RUNTIME_VERSION=$(grep dotnet-runtime- $HASHFILE | grep -- -linux-x64.tar.gz | tail -n -1 | sed -e 's:.*dotnet-runtime-::' -e 's:-linux-x64.tar.gz.*$::' ) +RUNTIME_HASH_LINUX_X64=$(grep dotnet-runtime- $HASHFILE | grep -- -linux-x64.tar.gz | cut -d ' ' -f 1) +RUNTIME_HASH_LINUX_ARM64=$(grep dotnet-runtime- $HASHFILE | grep -- -linux-arm64.tar.gz | cut -d ' ' -f 1) +RUNTIME_HASH_OSX_X64=$(grep dotnet-runtime- $HASHFILE | grep -- -osx-x64.tar.gz | cut -d ' ' -f 1) +RUNTIME_HASH_OSX_ARM64=$(grep dotnet-runtime- $HASHFILE | grep -- -osx-arm64.tar.gz | cut -d ' ' -f 1) + +# dotnet-sdk has multiple entries in file, but the latest is the newest +SDK_VERSION=$(grep dotnet-sdk- $HASHFILE | grep -- -linux-x64.tar.gz | tail -n -1 | sed -e 's:.*dotnet-sdk-::' -e 's:-linux-x64.tar.gz.*$::' ) +SDK_HASH_LINUX_X64=$(grep dotnet-sdk- $HASHFILE | grep -- -linux-x64.tar.gz | tail -n 1 | cut -d ' ' -f 1) +SDK_HASH_LINUX_ARM64=$(grep dotnet-sdk- $HASHFILE | grep -- -linux-arm64.tar.gz | tail -n 1 | cut -d ' ' -f 1) +SDK_HASH_OSX_X64=$(grep dotnet-sdk- $HASHFILE | grep -- -osx-x64.tar.gz | tail -n 1 | cut -d ' ' -f 1) +SDK_HASH_OSX_ARM64=$(grep dotnet-sdk- $HASHFILE | grep -- -osx-arm64.tar.gz | tail -n 1 | cut -d ' ' -f 1) + +V=${VERSION/./_} +MAJOR_MINOR_VERSION=${V%%.*} + +echo """ + aspnetcore_${MAJOR_MINOR_VERSION} = buildAspNetCore { + version = \"${ASPNETCORE_VERSION}\"; + sha512 = { + x86_64-linux = \"${ASPNETCORE_HASH_LINUX_X64}\"; + aarch64-linux = \"${ASPNETCORE_HASH_LINUX_ARM64}\"; + x86_64-darwin = \"${ASPNETCORE_HASH_OSX_X64}\"; + aarch64-darwin = \"${ASPNETCORE_HASH_OSX_ARM64}\"; + }; + }; + + runtime_${MAJOR_MINOR_VERSION} = buildNetRuntime { + version = \"${RUNTIME_VERSION}\"; + sha512 = { + x86_64-linux = \"${RUNTIME_HASH_LINUX_X64}\"; + aarch64-linux = \"${RUNTIME_HASH_LINUX_ARM64}\"; + x86_64-darwin = \"${RUNTIME_HASH_OSX_X64}\"; + aarch64-darwin = \"${RUNTIME_HASH_OSX_ARM64}\"; + }; + }; + + sdk_${MAJOR_MINOR_VERSION} = buildNetSdk { + version = \"${SDK_VERSION}\"; + sha512 = { + x86_64-linux = \"${SDK_HASH_LINUX_X64}\"; + aarch64-linux = \"${SDK_HASH_LINUX_ARM64}\"; + x86_64-darwin = \"${SDK_HASH_OSX_X64}\"; + aarch64-darwin = \"${SDK_HASH_OSX_ARM64}\"; + }; + }; +""" diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix index 4b662bd072b4..10952aff94b6 100644 --- a/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/pkgs/development/compilers/elm/packages/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/development/compilers/fennel/default.nix b/pkgs/development/compilers/fennel/default.nix index bae976a9b68f..ec6b3d619e1c 100644 --- a/pkgs/development/compilers/fennel/default.nix +++ b/pkgs/development/compilers/fennel/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fennel"; - version = "0.10.0"; + version = "1.0.0"; src = fetchFromSourcehut { owner = "~technomancy"; repo = pname; rev = version; - sha256 = "sha256-/xCnaDNZJTBGxIgjPUVeEyMVeRWg8RCNuo5nPpLrJXY="; + sha256 = "sha256-HhxFTWC1gBY76pQzhn6EdgYHpYQr9zkUox0r4YC7mTQ="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index e0ede49b0919..376e0f529874 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -156,7 +156,10 @@ runCommand drvName ''; preferLocalBuild = true; allowSubstitutes = false; - passthru = { unwrapped = flutter; }; + passthru = { + unwrapped = flutter; + inherit dart; + }; meta = with lib; { description = "Flutter is Google's SDK for building mobile, web and desktop with Dart"; longDescription = '' diff --git a/pkgs/development/compilers/roslyn/default.nix b/pkgs/development/compilers/roslyn/default.nix index f05b821676fc..df07eea54e2d 100644 --- a/pkgs/development/compilers/roslyn/default.nix +++ b/pkgs/development/compilers/roslyn/default.nix @@ -85,9 +85,6 @@ in stdenv.mkDerivation rec { rm NuGet.config install -m644 -D ${nuget-config} fake-home/.nuget/NuGet/NuGet.Config ln -s ${packages}/lib/dotnet fake-home/.nuget/packages - HOME=$(pwd)/fake-home dotnet add \ - src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj \ - package -n -v 5.10.0-preview.2.7169 nuget.build.tasks.pack HOME=$(pwd)/fake-home dotnet msbuild -r -v:m -t:pack \ -p:Configuration=Release \ -p:RepositoryUrl="${meta.homepage}" \ diff --git a/pkgs/development/compilers/roslyn/deps.nix b/pkgs/development/compilers/roslyn/deps.nix index 0ddd7e7cbac4..b08bd0740a42 100644 --- a/pkgs/development/compilers/roslyn/deps.nix +++ b/pkgs/development/compilers/roslyn/deps.nix @@ -137,10 +137,18 @@ } { name = "microsoft.netcore.app.host.linux-x64"; - version = "3.1.19"; + version = "3.1.21"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/3.1.19/microsoft.netcore.app.host.linux-x64.3.1.19.nupkg"; - sha256 = "10fs93kg8vhhm1l05815m8yqz796i6gk824pk1bps239mshmkybr"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/3.1.21/microsoft.netcore.app.host.linux-x64.3.1.21.nupkg"; + sha256 = "01kbhi29lhv6mg1zfsyakz3z8hfbxnc0kxy0fczl8xqviik9svx7"; + }; + } + { + name = "microsoft.netcore.app.host.linux-arm64"; + version = "3.1.21"; + src = fetchurl { + url = "https://globalcdn.nuget.org/packages/microsoft.netcore.app.host.linux-arm64.3.1.21.nupkg"; + sha256 = "0mv79mv0g539437jy4cxvkic7iqgh2xs1nlpd8bzx7jha27g5mlr"; }; } { @@ -271,14 +279,6 @@ sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }; } - { - name = "nuget.build.tasks.pack"; - version = "5.10.0-preview.2.7169"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.build.tasks.pack/5.10.0-preview.2.7169/nuget.build.tasks.pack.5.10.0-preview.2.7169.nupkg"; - sha256 = "0siby8s8km50hfwvqx34nfnn9qwhygxlhw57wm1j5d22nf16kasb"; - }; - } { name = "richcodenav.envvardump"; version = "0.1.1643-alpha"; diff --git a/pkgs/development/coq-modules/smpl/default.nix b/pkgs/development/coq-modules/smpl/default.nix new file mode 100644 index 000000000000..63bed38ead9c --- /dev/null +++ b/pkgs/development/coq-modules/smpl/default.nix @@ -0,0 +1,28 @@ +{ lib, mkCoqDerivation, coq, version ? null }: +with lib; + +mkCoqDerivation { + pname = "smpl"; + owner = "uds-psl"; + + release."8.10.2".sha256 = "sha256-TUfTZKBgrSOT6piXRViHSGPE9NSj3bGx2XBIw6YCcEs="; + release."8.12".sha256 = "sha256-UQbDHLVBKYk++o+Y2B6ARYRYGglytsnXhguwMatjOHg="; + release."8.13".sha256 = "sha256-HxQBaIE2CjyfG4GoIXprfehqjsr/Z74YdodxMmrbzSg="; + releaseRev = v: "v${v}"; + + inherit version; + defaultVersion = with versions; switch coq.version [ + { case = "8.13.2"; out = "8.13"; } + { case = "8.12.2"; out = "8.12"; } + { case = "8.10.2"; out = "8.10.2"; } + ] null; + + mlPlugin = true; + + meta = { + description = "A Coq plugin providing an extensible tactic similar to first"; + maintainers = with maintainers; [ siraben ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/dotnet-modules/python-language-server/deps.nix b/pkgs/development/dotnet-modules/python-language-server/deps.nix index 9ebbaceae502..7a15a5f384fd 100644 --- a/pkgs/development/dotnet-modules/python-language-server/deps.nix +++ b/pkgs/development/dotnet-modules/python-language-server/deps.nix @@ -48,8 +48,8 @@ in [ (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.1.19"; - sha256 = "19z4zrchaxcz0a33c33n1qd11z9khj4323nfzsbzah0xxkkj8ka8"; + version = "3.1.21"; + sha256 = "056g9nv8a7n8zdbgzmyzmn3pbg52yq2kv5d1rcp7h6plwzgpiwql"; }) (fetchNuGet { @@ -78,8 +78,8 @@ in [ (fetchNuGet { name = "Microsoft.NetCore.App.Runtime.linux-x64"; - version = "3.1.19"; - sha256 = "10c9bq1z8j173n9jzamgplbxq101yscwdhksshn1ybisn7cr5g0h"; + version = "3.1.21"; + sha256 = "13692wqcww0w6x4nhyxpxwprdg6mx9xmlvv38m6fvp6g0m27r43v"; }) (fetchNuGet { diff --git a/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt b/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt index 541bedcbe566..35afa4da80ae 100644 --- a/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt +++ b/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt @@ -1,2 +1,2 @@ -Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.19 -Microsoft.NetCore.App.Runtime.linux-x64 3.1.19 +Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.21 +Microsoft.NetCore.App.Runtime.linux-x64 3.1.21 diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 19adfb08cfa0..0292fb223e7c 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook }: +{ lib, stdenv, fetchurl, fetchpatch, buildPackages, autoreconfHook }: stdenv.mkDerivation rec { pname = "apr"; @@ -17,6 +17,16 @@ stdenv.mkDerivation rec { # convince fetchpatch to restore missing `a/`, `b/` to paths extraPrefix = ""; }) + + # Fix cross. + (fetchpatch { + url = "https://github.com/apache/apr/commit/374210c50ee9f4dbf265f0172dcf2d45b97d0550.patch"; + sha256 = "04k62c5dh043jhkgs5qma6yqkq4q7nh0zswr81il4l7q1zil581y"; + }) + (fetchpatch { + url = "https://github.com/apache/apr/commit/866e1df66be6704a584feaf5c3d241e3d631d03a.patch"; + sha256 = "0hhm5v5wx985c28dq6d9ngnyqihpsphq4mw7rwylk39k2p90ppcm"; + }) ] ++ lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ]; # This test needs the net @@ -35,19 +45,19 @@ stdenv.mkDerivation rec { configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_file__dev_zero=yes" "ac_cv_func_setpgrp_void=0" - "apr_cv_process_shared_works=1" "apr_cv_tcp_nodelay_with_cork=1" + "CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/cc" ] ++ lib.optionals (stdenv.hostPlatform.system == "i686-cygwin") [ # Including the Windows headers breaks unistd.h. # Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2 "ac_cv_header_windows_h=no" ]; - CPPFLAGS=lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-DAPR_IOVEC_DEFINED"; + # - Update libtool for macOS 11 support + # - Regenerate for cross fix patch + nativeBuildInputs = [ autoreconfHook ]; - nativeBuildInputs = - # Update libtool for macOS 11 support - lib.optional (stdenv.isDarwin && stdenv.isAarch64) [ autoreconfHook ]; + doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix index 821a9ea9226a..5626c5fa8f8d 100644 --- a/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/pkgs/development/libraries/audio/libmysofa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libmysofa"; - version = "1.2"; + version = "1.2.1"; src = fetchFromGitHub { owner = "hoene"; repo = "libmysofa"; rev = "v${version}"; - sha256 = "sha256-f+1CIVSxyScyNF92cPIiZwfnnCVrWfCZlbrIXtduIdY="; + sha256 = "sha256-SCyeicZ+JkJU1x2X3efOvxUXT2qF2IiUsj+anLg5Lsg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index d78db53ea4b5..ad4804febbc1 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -1,29 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "cmark"; - version = "0.30.1"; + version = "0.30.2"; src = fetchFromGitHub { owner = "jgm"; repo = pname; rev = version; - sha256 = "sha256-UjDM2N6gCwO94F1nW3qCP9JX42MYAicAuGTKAXMy1Gg="; + sha256 = "sha256-IkNybUe/XYwAvPowym3aqfVyvNdw2t/brRjhOrjVRpA="; }; - patches = [ - # Fix libcmark.pc paths (should be incorporated next release) - (fetchpatch { - url = "https://github.com/commonmark/cmark/commit/15762d7d391483859c241cdf82b1615c6b6a5a19.patch"; - sha256 = "sha256-wdyK1tQolgfiwYMAaWMQZdCSbMDCijug5ykpoDl/HwI="; - }) - ]; - nativeBuildInputs = [ cmake ]; cmakeFlags = [ - # https://github.com/commonmark/cmark/releases/tag/0.30.1 - # recommends distributions dynamically link + # Link the executable with the shared library "-DCMARK_STATIC=OFF" ]; diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 967910e2a117..08971c4c81c1 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, makeWrapper -, pkg-config, libX11, libuuid, xz, vtk_7, Cocoa }: +, pkg-config, libX11, libuuid, xz, vtk, Cocoa }: stdenv.mkDerivation rec { pname = "itk"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake xz makeWrapper ]; - buildInputs = [ libX11 libuuid vtk_7 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ libX11 libuuid vtk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; postInstall = '' wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkg-config}/bin" diff --git a/pkgs/development/libraries/libbde/default.nix b/pkgs/development/libraries/libbde/default.nix new file mode 100644 index 000000000000..ba44a200e83b --- /dev/null +++ b/pkgs/development/libraries/libbde/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchurl +, fuse +, ncurses +, python3 +}: + +stdenv.mkDerivation rec { + pname = "libbde"; + version = "20210605"; + + src = fetchurl { + url = "https://github.com/libyal/libbde/releases/download/${version}/${pname}-alpha-${version}.tar.gz"; + sha256 = "0dk5h7gvp2fgg21n7k600mnayg4g4pc0lm7317k43j1q0p4hkfng"; + }; + + buildInputs = [ fuse ncurses python3 ]; + + configureFlags = [ "--enable-python" ]; + + meta = with lib; { + description = "Library to access the BitLocker Drive Encryption (BDE) format"; + homepage = "https://github.com/libyal/libbde/"; + license = licenses.lgpl3; + maintainers = with maintainers; [ eliasp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index face30c1e0cc..6edb264d2e2c 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcouchbase"; - version = "3.2.1"; + version = "3.2.3"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "sha256-6TMWWXAgt4e+De1ebmqQhaqcia1ZXT8IXn9fTGsr3qY="; + sha256 = "sha256-pCqSsmddgNtQJnOVIHz5ft0gJN5T7T3ehHtjuexhBxI="; }; cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index b041dd483e1b..9739530f8ba3 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }: +{ lib, stdenv, fetchurl, fetchpatch, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }: stdenv.mkDerivation rec { pname = "rivet"; @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { hash = "sha256-YhcXW3gab7z3EJd3qGePeplVEapV4a5WKIc151hQXZo="; }; + patches = [ + # Fixes build + (fetchpatch { + name = "rivet-3.1.5-namespace-fix.patch"; + url = "https://gitlab.com/hepcedar/rivet/-/commit/17a99b38b52e65a4a3fd6289124bd9dd874c30bf.diff"; + sha256 = "sha256-OknqghpMMB5nRHeeRc2ddxybhnkVGRB1x8jfOjrkyms="; + }) + ]; + latex = texlive.combine { inherit (texlive) scheme-basic collection-pstricks diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index 2c5c6c263484..86606df5e41b 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "libupnp"; - version = "1.14.10"; + version = "1.14.12"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "pupnp"; repo = "pupnp"; rev = "release-${version}"; - sha256 = "sha256-QlV5V1+VPj/C0M3XgwVIJbxzVXfSvP6yMcJz9al6a+U="; + sha256 = "sha256-ZJ74x5+4dDb5sJ1cPtlin6iunGyu8boNSpfLFB1mCME="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix index 712713c82be4..b00de428c8d4 100644 --- a/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -2,14 +2,13 @@ , stdenv , fetchzip , lib +, libcxx , addOpenGLRunpath , patchelf , fixDarwinDylibNames , cudaSupport -, cudatoolkit_11_1 -, cudnn_cudatoolkit_11_1 }: let @@ -18,10 +17,11 @@ let # this derivation. However, we should ensure on version bumps # that the CUDA toolkit for `passthru.tests` is still # up-to-date. - version = "1.9.0"; + version = "1.10.0"; device = if cudaSupport then "cuda" else "cpu"; srcs = import ./binary-hashes.nix version; unavailable = throw "libtorch is not available for this platform"; + libcxx-for-libtorch = if stdenv.hostPlatform.system == "x86_64-darwin" then libcxx else stdenv.cc.cc.lib; in stdenv.mkDerivation { inherit version; pname = "libtorch"; @@ -67,57 +67,37 @@ in stdenv.mkDerivation { ''} done '' + lib.optionalString stdenv.isDarwin '' - install_name_tool -change @rpath/libshm.dylib $out/lib/libshm.dylib $out/lib/libtorch_python.dylib - install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch_python.dylib - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_python.dylib - install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libtorch_python.dylib - install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch_python.dylib - - install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch.dylib - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch.dylib - install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch.dylib - - install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch_cpu.dylib - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_cpu.dylib - install_name_tool -change @rpath/libtensorpipe.dylib $out/lib/libtensorpipe.dylib $out/lib/libtorch_cpu.dylib - - install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_observers.dylib - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_observers.dylib - install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_observers.dylib - install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_observers.dylib - - install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_module_test_dynamic.dylib - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_module_test_dynamic.dylib - install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_module_test_dynamic.dylib - install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_module_test_dynamic.dylib - - install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_detectron_ops.dylib - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_detectron_ops.dylib - install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_detectron_ops.dylib - install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_detectron_ops.dylib - - install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libshm.dylib - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libshm.dylib - install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libshm.dylib - install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libshm.dylib - - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_global_deps.dylib - install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch_global_deps.dylib + for f in $out/lib/*.dylib; do + otool -L $f + done + for f in $out/lib/*.dylib; do + install_name_tool -id $out/lib/$(basename $f) $f || true + for rpath in $(otool -L $f | grep rpath | awk '{print $1}');do + install_name_tool -change $rpath $out/lib/$(basename $rpath) $f + done + if otool -L $f | grep /usr/lib/libc++ >& /dev/null; then + install_name_tool -change /usr/lib/libc++.1.dylib ${libcxx-for-libtorch.outPath}/lib/libc++.1.0.dylib $f + fi + done + for f in $out/lib/*.dylib; do + otool -L $f + done ''; outputs = [ "out" "dev" ]; passthru.tests.cmake = callPackage ./test { inherit cudaSupport; - cudatoolkit = cudatoolkit_11_1; - cudnn = cudnn_cudatoolkit_11_1; }; meta = with lib; { description = "C++ API of the PyTorch machine learning framework"; homepage = "https://pytorch.org/"; - license = licenses.unfree; # Includes CUDA and Intel MKL. - maintainers = with maintainers; [ ]; - platforms = with platforms; linux ++ darwin; + # Includes CUDA and Intel MKL, but redistributions of the binary are not limited. + # https://docs.nvidia.com/cuda/eula/index.html + # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html + license = licenses.bsd3; + maintainers = with maintainers; [ junjihashimoto ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix index 6ded62fb87c3..156515f6eb51 100644 --- a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix +++ b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix @@ -1,14 +1,19 @@ -version: { - x86_64-darwin-cpu = { - url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-${version}.zip"; - hash = "sha256-TOJ+iQpqazta46y4IzIbfEGMjz/fz+pRDV8fKqriB6Q="; - }; - x86_64-linux-cpu = { - url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcpu.zip"; - hash = "sha256-gZMNLCzW3j+eplBqWo6lVvuHS5iRqtMD8NL3MoszsVg="; - }; - x86_64-linux-cuda = { - url = "https://download.pytorch.org/libtorch/cu111/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcu111.zip"; - hash = "sha256-dRu4F8k2SAbtghwrPJNyX0u3tsODCbXfi9EqUdf4xYc="; +version : builtins.getAttr version { + "1.10.0" = { + x86_64-darwin-cpu = { + name = "libtorch-macos-1.10.0.zip"; + url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-1.10.0.zip"; + hash = "sha256-HSisxHs466c6XwvZEbkV/1kVNBzJOy3uVw9Bh497Vk8="; + }; + x86_64-linux-cpu = { + name = "libtorch-cxx11-abi-shared-with-deps-1.10.0-cpu.zip"; + url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-1.10.0%2Bcpu.zip"; + hash = "sha256-wAtA+AZx3HjaFbsrbyfkSXjYM0BP8H5HwCgyHbgJXJ0="; + }; + x86_64-linux-cuda = { + name = "libtorch-cxx11-abi-shared-with-deps-1.10.0-cu113.zip"; + url = "https://download.pytorch.org/libtorch/cu113/libtorch-cxx11-abi-shared-with-deps-1.10.0%2Bcu113.zip"; + hash = "sha256-jPylK4j0V8SEQ8cZU+O22P7kQ28wanIB0GkBzRGyTj8="; + }; }; } diff --git a/pkgs/development/libraries/science/math/libtorch/prefetch.sh b/pkgs/development/libraries/science/math/libtorch/prefetch.sh new file mode 100755 index 000000000000..26b24198e235 --- /dev/null +++ b/pkgs/development/libraries/science/math/libtorch/prefetch.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-prefetch-scripts + +set -eou pipefail + +version=$1 + +bucket="https://download.pytorch.org/libtorch" +CUDA_VERSION=cu113 + +url_and_key_list=( + "x86_64-darwin-cpu $bucket/cpu/libtorch-macos-${version}.zip libtorch-macos-${version}.zip" + "x86_64-linux-cpu $bucket/cpu/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcpu.zip libtorch-cxx11-abi-shared-with-deps-${version}-cpu.zip" + "x86_64-linux-cuda $bucket/${CUDA_VERSION}/libtorch-cxx11-abi-shared-with-deps-${version}%2B${CUDA_VERSION}.zip libtorch-cxx11-abi-shared-with-deps-${version}-${CUDA_VERSION}.zip" +) + +hashfile="binary-hashes-$version.nix" +echo " \"$version\" = {" >> $hashfile + +for url_and_key in "${url_and_key_list[@]}"; do + key=$(echo "$url_and_key" | cut -d' ' -f1) + url=$(echo "$url_and_key" | cut -d' ' -f2) + name=$(echo "$url_and_key" | cut -d' ' -f3) + + echo "prefetching ${url}..." + hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url --unpack "$url" --name "$name")) + + echo " $key = {" >> $hashfile + echo " name = \"$name\";" >> $hashfile + echo " url = \"$url\";" >> $hashfile + echo " hash = \"$hash\";" >> $hashfile + echo " };" >> $hashfile + + echo +done + +echo " };" >> $hashfile +echo "done." diff --git a/pkgs/development/libraries/unicorn/default.nix b/pkgs/development/libraries/unicorn/default.nix index 0a760c07a97e..57983537ad14 100644 --- a/pkgs/development/libraries/unicorn/default.nix +++ b/pkgs/development/libraries/unicorn/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "unicorn"; - version = "1.0.3"; + version = "2.0.0-rc4"; src = fetchFromGitHub { owner = "unicorn-engine"; repo = pname; rev = version; - sha256 = "079azb1df4nwsnsck36b200rnf03aqilw30h3fiaqi1ixash957k"; + sha256 = "sha256-dNBebXp8HVmmY1RVRYuRFoJ3PStCf4taNTeYKi2lhQM="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/pkgs/development/misc/google-clasp/google-clasp.nix b/pkgs/development/misc/google-clasp/google-clasp.nix index baacee29ff20..6bb4ea8fbd67 100644 --- a/pkgs/development/misc/google-clasp/google-clasp.nix +++ b/pkgs/development/misc/google-clasp/google-clasp.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/development/node-packages/composition.nix b/pkgs/development/node-packages/composition.nix index 64326c6b2160..53bdef1f9864 100644 --- a/pkgs/development/node-packages/composition.nix +++ b/pkgs/development/node-packages/composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index ea5ab3eadae8..45c566b0d601 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -243,6 +243,11 @@ let url = "https://github.com/svanderburg/node2nix/commit/58736093161f2d237c17e75a96529b018cd0ac64.patch"; sha256 = "0sif7803c9g6gjmmdniw5qxrq5igiz9nqdmdrcf1hxfi5x43a32h"; }) + # Extract common logic from composePackage to a shell function + (fetchpatch { + url = "https://github.com/svanderburg/node2nix/commit/e4c951971df6c9f9584c7252971c13b55c369916.patch"; + sha256 = "0w8fcyr12g2340rn06isv40jkmz2khmak81c95zpkjgipzx7hp7w"; + }) ]; }; postInstall = '' diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 21089c4d5459..5f055785791b 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}: +{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: let # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master @@ -40,36 +40,22 @@ let ''; }; - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) - (lib.concatMapStrings (dependency: - '' - # Bundle the dependencies of the package - mkdir -p node_modules - cd node_modules + # Common shell logic + installPackage = writeShellScript "install-package" '' + installPackage() { + local packageName=$1 src=$2 - # Only include dependencies if they don't exist. They may also be bundled in the package. - if [ ! -e "${dependency.name}" ] - then - ${composePackage dependency} - fi + local strippedName - cd .. - '' - ) dependencies); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - DIR=$(pwd) + local DIR=$PWD cd $TMPDIR - unpackFile ${src} + unpackFile $src # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/${packageName}")" + mkdir -p "$(dirname "$DIR/$packageName")" - if [ -f "${src}" ] + if [ -f "$src" ] then # Figure out what directory has been unpacked packageDir="$(find . -maxdepth 1 -type d | tail -1)" @@ -79,28 +65,53 @@ let chmod -R u+w "$packageDir" # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/${packageName}" - elif [ -d "${src}" ] + mv "$packageDir" "$DIR/$packageName" + elif [ -d "$src" ] then # Get a stripped name (without hash) of the source directory. # On old nixpkgs it's already set internally. if [ -z "$strippedName" ] then - strippedName="$(stripHash ${src})" + strippedName="$(stripHash $src)" fi # Restore write permissions to make building work chmod -R u+w "$strippedName" # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/${packageName}" + mv "$strippedName" "$DIR/$packageName" fi - # Unset the stripped name to not confuse the next unpack step - unset strippedName + # Change to the package directory to install dependencies + cd "$DIR/$packageName" + } + ''; - # Include the dependencies of the package - cd "$DIR/${packageName}" + # Bundle the dependencies of the package + # + # Only include dependencies if they don't exist. They may also be bundled in the package. + includeDependencies = {dependencies}: + lib.optionalString (dependencies != []) ( + '' + mkdir -p node_modules + cd node_modules + '' + + (lib.concatMapStrings (dependency: + '' + if [ ! -e "${dependency.name}" ]; then + ${composePackage dependency} + fi + '' + ) dependencies) + + '' + cd .. + '' + ); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [], ... }@args: + builtins.addErrorContext "while evaluating node package '${packageName}'" '' + installPackage "${packageName}" "${src}" ${includeDependencies { inherit dependencies; }} cd .. ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} @@ -415,6 +426,8 @@ let passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; installPhase = '' + source ${installPackage} + # Create and enter a root node_modules/ folder mkdir -p $out/lib/node_modules cd $out/lib/node_modules @@ -492,6 +505,8 @@ let passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; installPhase = '' + source ${installPackage} + mkdir -p $out/${packageName} cd $out/${packageName} diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 17d137e36bd6..955b684a9ff7 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -22,6 +22,15 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; + "@alexbosworth/fiat-1.0.0" = { + name = "_at_alexbosworth_slash_fiat"; + packageName = "@alexbosworth/fiat"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@alexbosworth/fiat/-/fiat-1.0.0.tgz"; + sha512 = "GN8uppujBmlSI38NTj1pG8gX1bstwn9exELArqeKvFoLuzuK1nizKjY7Re+1zbt0tXa5BZ6H3JVl7JRlxL8OuQ=="; + }; + }; "@alexbosworth/html2unicode-1.1.5" = { name = "_at_alexbosworth_slash_html2unicode"; packageName = "@alexbosworth/html2unicode"; @@ -2812,31 +2821,31 @@ let sha512 = "82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw=="; }; }; - "@gitbeaker/core-34.5.0" = { + "@gitbeaker/core-34.6.0" = { name = "_at_gitbeaker_slash_core"; packageName = "@gitbeaker/core"; - version = "34.5.0"; + version = "34.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/core/-/core-34.5.0.tgz"; - sha512 = "MfBwD3W79/nhmrwYyfw7R8FmVNS3CsoCulNfhySY38LT3w1GLMnDOIDTpELySTwoIWVXYT/QHdEPlGIG6nPXOg=="; + url = "https://registry.npmjs.org/@gitbeaker/core/-/core-34.6.0.tgz"; + sha512 = "yKF+oxffPyzOnyuHCqLGJrBHhcFHuGHtcmqKhGKtnYPfqcNYA8rt4INAHaE5wMz4ILua9b4sB8p42fki+xn6WA=="; }; }; - "@gitbeaker/node-34.5.0" = { + "@gitbeaker/node-34.6.0" = { name = "_at_gitbeaker_slash_node"; packageName = "@gitbeaker/node"; - version = "34.5.0"; + version = "34.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/node/-/node-34.5.0.tgz"; - sha512 = "klm9PI7r6OpCmkS3Q26nPnVUwTb/VfF/IdOYv02/8SguEI3gMWfmR8PNvD99nsKN7lvL6ZoHl79gMGbgr65fHg=="; + url = "https://registry.npmjs.org/@gitbeaker/node/-/node-34.6.0.tgz"; + sha512 = "gVV4Wuev43Jbyoy1fszC885+bkvWH4zWiUhtIu0PSAm628j/OxO7idLIqUEMV0hDf6wm/PE/vOSP6PhjE0N+fA=="; }; }; - "@gitbeaker/requester-utils-34.5.0" = { + "@gitbeaker/requester-utils-34.6.0" = { name = "_at_gitbeaker_slash_requester-utils"; packageName = "@gitbeaker/requester-utils"; - version = "34.5.0"; + version = "34.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-34.5.0.tgz"; - sha512 = "fgMGE/A5sOLjuhRPRCyiwLOCBqbhlDpVjo6nooizyQcOH5K4c4EZNgGD5AQshg6U5r3xdLNCKHYFu36pbR91uQ=="; + url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-34.6.0.tgz"; + sha512 = "H8utxbSP1kEdX0KcyVYrTDTT0A3UcPwrIV1ahyufX9ZLybYSUsA56B8Wx5kJSbWGFT1ffu2f8H2YDMwNCKKsBg=="; }; }; "@google-cloud/paginator-3.0.6" = { @@ -3559,22 +3568,22 @@ let sha512 = "s0jhnq/1X1IQQpKcAoUAd3KZ6X58nEjIi+vL4aC0iyDW6v2pmt8J5G/ilUZSbvplyJ2GdTMYi7NOCz2f3QAGZA=="; }; }; - "@jsii/check-node-1.43.0" = { + "@jsii/check-node-1.44.0" = { name = "_at_jsii_slash_check-node"; packageName = "@jsii/check-node"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.43.0.tgz"; - sha512 = "9+bZhSZB5Mz4yQb0y+sJTbFugtUmVyEaRNRoaptc31w8xERiOXr1SJNQe3JCOckArf5KfeeGHVbXB9ZMBcBSkg=="; + url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.44.0.tgz"; + sha512 = "f5yHUWdhPWav5Bf3O0BtT89LYg1YjLQib6LzroHXJOwCgQZdK9A+eZZ0bTmtWSEKd5UDhZmrN1JCXpZ7UzgpnA=="; }; }; - "@jsii/spec-1.43.0" = { + "@jsii/spec-1.44.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.43.0.tgz"; - sha512 = "4FZmzdBdVO64VEq1dQ6vXvBIWWHnUjP8bz7jAIjwSTE6iyJnSz2XT32tJpNg57RpBHRDdUuZGCgYa+xl06iGcA=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.44.0.tgz"; + sha512 = "q0hbiXrDqQ2FsM4RA/aKyB8Zy8oi7ukDBJt/kEMO8rN9RC5uQ5uxFoR6UTS3d3raQpyzXpAkfs7UQldvi65B3w=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -5629,13 +5638,13 @@ let sha512 = "y9qNj0//tZtWB2jfXNK3BX18BSBp9zNR7KE7lMysVHwbZtY392OJCjm6Rb/h4UHH2r1AqjNEHFD6bRn+DqU9Mw=="; }; }; - "@redocly/openapi-core-1.0.0-beta.67" = { + "@redocly/openapi-core-1.0.0-beta.68" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.67"; + version = "1.0.0-beta.68"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.67.tgz"; - sha512 = "xH9Dl4D2VbXh7qMv1x7oQPfE9FpQsSjjJCe8QzRBF6aiTQFcxCB9LG4msa3Ym5KQuGkCDMyQXuA5oPTtzDooRQ=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.68.tgz"; + sha512 = "ocvDC13Fr8USbBlBUgl8wQlRFBCNEqz6gVTNlQ8IFOglCKxmOeu4JqnFENNGow3ycKTl35c891clfCw1vPyPcQ=="; }; }; "@redocly/react-dropdown-aria-2.0.12" = { @@ -6673,13 +6682,13 @@ let sha512 = "qNjVXcrp+1sS8YpRUa714r0pgzOwESdW5UjHL7D/2ZFdBX0BXUXtg1LUrp+ylvqbvMcMWUy73YpRoxPN2VoKAQ=="; }; }; - "@types/eslint-7.28.2" = { + "@types/eslint-7.29.0" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "7.28.2"; + version = "7.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.2.tgz"; - sha512 = "KubbADPkfoU75KgKeKLsFHXnU4ipH7wYg0TRT33NK3N3yiu7jlFAAoygIWBV+KbuHx/G+AvuGX6DllnK35gfJA=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz"; + sha512 = "VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng=="; }; }; "@types/eslint-scope-3.7.1" = { @@ -7060,13 +7069,13 @@ let sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA=="; }; }; - "@types/lodash-4.14.176" = { + "@types/lodash-4.14.177" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.176"; + version = "4.14.177"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.176.tgz"; - sha512 = "xZmuPTa3rlZoIbtDUyJKZQimJV3bxCmzMIO2c9Pz9afyDro6kr7R79GwcB6mRhuoPmV2p1Vb66WOJH7F886WKQ=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.177.tgz"; + sha512 = "0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw=="; }; }; "@types/long-4.0.1" = { @@ -7456,13 +7465,13 @@ let sha512 = "eEQ6Hq0K0VShe00iDzG1DKxA5liTsk7jgcR5eDZ5d5cnivLjPqqcDgqurS5NlQJNfgTNg51dp7zFGWHomr5NJQ=="; }; }; - "@types/react-16.14.20" = { + "@types/react-16.14.21" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "16.14.20"; + version = "16.14.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-16.14.20.tgz"; - sha512 = "SV7TaVc8e9E/5Xuv6TIyJ5VhQpZoVFJqX6IZgj5HZoFCtIDCArE3qXkcHlc6O/Ud4UwcMoX+tlvDA95YrKdLgA=="; + url = "https://registry.npmjs.org/@types/react/-/react-16.14.21.tgz"; + sha512 = "rY4DzPKK/4aohyWiDRHS2fotN5rhBSK6/rz1X37KzNna9HJyqtaGAbq9fVttrEPWF5ywpfIP1ITL8Xi2QZn6Eg=="; }; }; "@types/react-dom-16.9.14" = { @@ -7717,13 +7726,13 @@ let sha512 = "awrJu8yML4E/xTwr2EMatC+HBnHGoDxc2+ImA9QyeUELI1S7dOCIZcyjki1rkwoA8P2D2NVgLAJLjnclkdLtAw=="; }; }; - "@types/url-parse-1.4.4" = { + "@types/url-parse-1.4.5" = { name = "_at_types_slash_url-parse"; packageName = "@types/url-parse"; - version = "1.4.4"; + version = "1.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/url-parse/-/url-parse-1.4.4.tgz"; - sha512 = "KtQLad12+4T/NfSxpoDhmr22+fig3T7/08QCgmutYA6QSznSRmEtuL95GrhVV40/0otTEdFc+etRcCTqhh1q5Q=="; + url = "https://registry.npmjs.org/@types/url-parse/-/url-parse-1.4.5.tgz"; + sha512 = "8Wje3itJpk/FX+QItca9vjNLjGx5jlEYBw/CpMi03Fphk2DSVeZDUqWTE81BeCI5Bl6Z+zmA1O9L/8e3ZUSeLg=="; }; }; "@types/vfile-3.0.2" = { @@ -7762,13 +7771,13 @@ let sha512 = "iGlQJ1w5e3qPUryroO6v4lxg3ql1ztdTCwQW3xEwFawdyPLoeUSv48SYfMwc7kQA7h6ThUqflZIjgKAykeF9oA=="; }; }; - "@types/webpack-4.41.31" = { + "@types/webpack-4.41.32" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; - version = "4.41.31"; + version = "4.41.32"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.31.tgz"; - sha512 = "/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ=="; + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.32.tgz"; + sha512 = "cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg=="; }; }; "@types/webpack-sources-3.2.0" = { @@ -8122,31 +8131,31 @@ let sha512 = "B4Rc4wGgxTAOivy0tmBEuPAbSYeTzv3dusoQUOW1CVT3N5zYkEuxVj8OXmUQ1YECWaK+IjvQQMFkBuXt//lp7g=="; }; }; - "@vue/compiler-core-3.2.21" = { + "@vue/compiler-core-3.2.22" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.2.21"; + version = "3.2.22"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.21.tgz"; - sha512 = "NhhiQZNG71KNq1h5pMW/fAXdTF7lJRaSI7LDm2edhHXVz1ROMICo8SreUmQnSf4Fet0UPBVqJ988eF4+936iDQ=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.22.tgz"; + sha512 = "uAkovrVeTcjzpiM4ECmVaMrv/bjdgAaLzvjcGqQPBEyUrcqsCgccT9fHJ/+hWVGhyMahmBwLqcn4guULNx7sdw=="; }; }; - "@vue/compiler-dom-3.2.21" = { + "@vue/compiler-dom-3.2.22" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.2.21"; + version = "3.2.22"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.21.tgz"; - sha512 = "gsJD3DpYZSYquiA7UIPsMDSlAooYWDvHPq9VRsqzJEk2PZtFvLvHPb4aaMD8Ufd62xzYn32cnnkzsEOJhyGilA=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.22.tgz"; + sha512 = "VZdsw/VuO1ODs8K7NQwnMQzKITDkIFlYYC03SVnunuf6eNRxBPEonSyqbWNoo6qNaHAEBTG6VVcZC5xC9bAx1g=="; }; }; - "@vue/shared-3.2.21" = { + "@vue/shared-3.2.22" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.2.21"; + version = "3.2.22"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.21.tgz"; - sha512 = "5EQmIPK6gw4UVYUbM959B0uPsJ58+xoMESCZs3N89XyvJ9e+fX4pqEPrOGV8OroIk3SbEvJcC+eYc8BH9JQrHA=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.22.tgz"; + sha512 = "qWVav014mpjEtbWbEgl0q9pEyrrIySKum8UVYjwhC6njrKzknLZPvfuYdQyVbApsqr94tf/3dP4pCuZmmjdCWQ=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -11866,13 +11875,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.1028.0" = { + "aws-sdk-2.1029.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1028.0"; + version = "2.1029.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1028.0.tgz"; - sha512 = "OmR0NcpU8zsDcUOZhM+eZ6CzlUFtuaEuRyjm6mxDO0KI7lJAp7/NzB6tcellRrgWxL+NO7b5TSxi+m28qu5ocQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1029.0.tgz"; + sha512 = "nCmaMPkJr3EATXaeqR3JeNC0GTDH2lJZ3Xq/ZCAW+yrfaPQWv8HqJJHBCNGtmk3FmcCoxc7ed/gEB8XSl0tocA=="; }; }; "aws-sdk-2.920.0" = { @@ -13999,13 +14008,13 @@ let sha1 = "4d67dc2602c0cc16dd9bce7ebf87e948290f5812"; }; }; - "bower-1.8.12" = { + "bower-1.8.13" = { name = "bower"; packageName = "bower"; - version = "1.8.12"; + version = "1.8.13"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.12.tgz"; - sha512 = "u1xy9SrwwoPlgjuHNjhV+YUPVdqyBj2ALBxuzeIUKXaPI2i2xypGgxqXkuHcITGdi5yBj5JuXgyMvgiWiS1S3Q=="; + url = "https://registry.npmjs.org/bower/-/bower-1.8.13.tgz"; + sha512 = "8eWko16JlCTdaZZG70kddHPed17pHEbH8/IjfP4IFkQsfEqRsyNM09Dc8cDBFkSvtQ/2lTea7A+bMhRggG2a+Q=="; }; }; "bower-endpoint-parser-0.2.1" = { @@ -14413,13 +14422,13 @@ let sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; }; }; - "browserslist-4.18.0" = { + "browserslist-4.18.1" = { name = "browserslist"; packageName = "browserslist"; - version = "4.18.0"; + version = "4.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.18.0.tgz"; - sha512 = "ER2M0g5iAR84fS/zjBDqEgU6iO5fS9JI2EkHr5zxDxYEFk3LjhU9Vpp/INb6RMQphxko7PDV1FH38H/qVP5yCA=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.18.1.tgz"; + sha512 = "8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ=="; }; }; "brq-0.1.8" = { @@ -15116,6 +15125,15 @@ let sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; }; }; + "bytes-3.1.1" = { + name = "bytes"; + packageName = "bytes"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz"; + sha512 = "dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg=="; + }; + }; "bytesish-0.4.4" = { name = "bytesish"; packageName = "bytesish"; @@ -15422,6 +15440,15 @@ let sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="; }; }; + "camelcase-6.2.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz"; + sha512 = "tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA=="; + }; + }; "camelcase-keys-2.1.0" = { name = "camelcase-keys"; packageName = "camelcase-keys"; @@ -15647,22 +15674,22 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-1.1.33" = { + "cdk8s-1.1.35" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.1.33"; + version = "1.1.35"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.1.33.tgz"; - sha512 = "+ts6ksmpPxryb7MB6hlNF1NNqLy/n2D/DzqW/dcB4ymML7iaXDrCwkWWOqaQCIE5SL1rm37uBnX/pyjDOtsn8A=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.1.35.tgz"; + sha512 = "6hhAP+XivkMFKiqenOuBX+7D+5Ae6s+X8KF0TEoiwrrRFa1Wt5LvM7JGsJT7F7+jMNF+UAF53kxpffNZMCpOJA=="; }; }; - "cdk8s-plus-22-1.0.0-beta.40" = { + "cdk8s-plus-22-1.0.0-beta.42" = { name = "cdk8s-plus-22"; packageName = "cdk8s-plus-22"; - version = "1.0.0-beta.40"; + version = "1.0.0-beta.42"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.40.tgz"; - sha512 = "5BMhOy2wJyruukF9cKkqXgrVlI6UiZZaEnBmLwEoOMWi/v3NoQPcsHT9CVTauUEfSFlzBb0iFcuqrafYWIpYaw=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.42.tgz"; + sha512 = "aC9H+ulFxXIafMhIj5w5KxTY3Fknjxztc2/uEPWZqB9K+aUozhfTTeVcBsmFuOw3p6LvI6Xbs6cJuJ2h7zCiDQ=="; }; }; "cdktf-0.7.0" = { @@ -17294,13 +17321,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.43.0" = { + "codemaker-1.44.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.43.0.tgz"; - sha512 = "6FA4syN+22H9V0Dfadk9xbQ894kkeIhOH6HleiLRL0lU6Ts3nMB4lM01cHtnY/5YhLBr+XrHboV5Bi5xVFf4sg=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.44.0.tgz"; + sha512 = "GrUjFBFDbMyykrmL9aGf7Viv2I+wAH9mnkW/5qCHsZw51LuZKAidBHp5nS3oT1mdkcIorjqUJjRSJ3LzslgFEQ=="; }; }; "codepage-1.4.0" = { @@ -19887,13 +19914,13 @@ let sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A=="; }; }; - "csstype-3.0.9" = { + "csstype-3.0.10" = { name = "csstype"; packageName = "csstype"; - version = "3.0.9"; + version = "3.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz"; - sha512 = "rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw=="; + url = "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz"; + sha512 = "2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA=="; }; }; "csurf-1.11.0" = { @@ -23604,13 +23631,13 @@ let sha512 = "U9dKi10V9w/BdIVB8a8dTKYLK3Q1d2WZ+Yo5qfM3XX/O4jI7KpnwgvWgGoVv0jTWPC2NlebF00ffWS/8NfUAtA=="; }; }; - "electron-to-chromium-1.3.896" = { + "electron-to-chromium-1.3.899" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.896"; + version = "1.3.899"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.896.tgz"; - sha512 = "NcGkBVXePiuUrPLV8IxP43n1EOtdg+dudVjrfVEUd/bOqpQUFZ2diL5PPYzbgEhZFEltdXV3AcyKwGnEQ5lhMA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.899.tgz"; + sha512 = "w16Dtd2zl7VZ4N4Db+FIa7n36sgPGCKjrKvUUmp5ialsikvcQLjcJR9RWnlYNxIyEHLdHaoIZEqKsPxU9MdyBg=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -28214,31 +28241,31 @@ let sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9"; }; }; - "gatsby-core-utils-3.1.2" = { + "gatsby-core-utils-3.1.3" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.1.2.tgz"; - sha512 = "l3LUdGNDlM3fLrdxRUGnsd/Szu9e8yLEL/pZIV2LuhTHMNwjOStiycEQivezsUhHNPobep1r5t4yWzP6r2cw/Q=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.1.3.tgz"; + sha512 = "+pg2i3DYVLzmJ/67SVGM+zVxerilGCbcgVxDoN58Y+Htv5TwogUWzPymfoFrJEsWGhlVKlYq7I8jVWSXPzwMHw=="; }; }; - "gatsby-recipes-1.1.2" = { + "gatsby-recipes-1.1.3" = { name = "gatsby-recipes"; packageName = "gatsby-recipes"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-1.1.2.tgz"; - sha512 = "r6FSPM2eKH+rlC6JX0SgVYBFxBXJW5J/MwFtsP8N+C6Yvr7Cosi9OlMreMx/SBza4HYMXxIoDBYvX68qbBQrhg=="; + url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-1.1.3.tgz"; + sha512 = "AdO9Y7vtpa0VSWXe3gZIeIUDJ6/j/MeAkpkuJHbbU8hix9gtbVPoOcmF8VFJUMALNRzhhFsgqRN2mK6jXJlang=="; }; }; - "gatsby-telemetry-3.1.2" = { + "gatsby-telemetry-3.1.3" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.1.2.tgz"; - sha512 = "uz8J+cGkQ1vgIc5BCrR5Jm/cF/kKF+Ys+tqXofn4ah95ezT94U+g+m3FPPB49cut7H4OZsONCXeLyLRzdIx7EQ=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.1.3.tgz"; + sha512 = "vZSj67F4vzoqqK5CyNIRTDTWOqhBYkMey+i6swY3H51tehGTHRyzzOhJorQOJa76cQOcOMXr1/vvxX1T84Y96g=="; }; }; "gauge-1.2.7" = { @@ -31410,6 +31437,15 @@ let sha512 = "4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A=="; }; }; + "http-errors-1.8.1" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz"; + sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; + }; + }; "http-headers-3.0.2" = { name = "http-headers"; packageName = "http-headers"; @@ -35651,13 +35687,13 @@ let sha512 = "M+opnlcNb1Ne5igms/OJn/e2ZyQgcCwmqqljuOsHXBMFm7vMOVLSjEUcBYcW7ifJeM1+XYg8+wfuAoZhqY1zCg=="; }; }; - "jsii-1.43.0" = { + "jsii-1.44.0" = { name = "jsii"; packageName = "jsii"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.43.0.tgz"; - sha512 = "2GsSiwbX++/f6BE/fnT9s0iBQtT+MSsnFBZdpyw4sV50gEg9gbD1rPO/ewSLuUh83mrztPtdiurxsBpYGj17Nw=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.44.0.tgz"; + sha512 = "6CRoO+swOmTyvuYbMzZJ89pCn3cbCLUUo8qLN9JLZhT5Pc8uJgCdCn67rK9Vu5LRgwI7thOKP2ij9TG+8Ejyng=="; }; }; "jsii-pacmak-1.37.0" = { @@ -35669,40 +35705,40 @@ let sha512 = "cXLXAOyCqd/QNBy+OfcmMgj8UdNVbJJsKoM/C3SvRgdi+fpQlxh1iDTOcKUwd3/QgMuDMDLvKCCpLmq/YRjreA=="; }; }; - "jsii-pacmak-1.43.0" = { + "jsii-pacmak-1.44.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.43.0.tgz"; - sha512 = "GrvEz/Rbiwu+O3HWNiDybXV+homhzSZH0DgBkfCvmPvPUJPmSn1u3cU586F77gESGTOy9bOXJOkGfXpq9PZO4Q=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.44.0.tgz"; + sha512 = "m6x3xQM20vi0jIXCpW4lIOYK4dS8jdOIi4mQNQcreraoskYSsrv9d2G2THXGPojF5ozNjnPBNgsIXaH4XdkZKw=="; }; }; - "jsii-reflect-1.43.0" = { + "jsii-reflect-1.44.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.43.0.tgz"; - sha512 = "UoEK0c2CO0LPvb53TkedFFyAKBXbrb35vs65HJhfBzBqyZBcPQ3+mm6lFA38oTtsDFNBJe0Eyg0cuFaWzWDllg=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.44.0.tgz"; + sha512 = "mgyCUYXqLbOxkNgiENDuRnDB0S0pIKZvqFZPW7fMBTOU8XxVPhZD3DhFGEIj6cPtbTUbz18Kc5qKk3l8mEkmfg=="; }; }; - "jsii-rosetta-1.43.0" = { + "jsii-rosetta-1.44.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.43.0.tgz"; - sha512 = "AjJ0tlrnBatJB7OJ/cn9sFaLpM4Ra7fSkxLlHNWsVE1KFAUnCLIcDloXaytaDmBXY/emxi3/XbWwGUIqbjbCIw=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.44.0.tgz"; + sha512 = "6loHTZdcNLYs4JNi2Uwe9xY9caFGpKC/OPtj5Je1+zLx/MyiJeAhd448T+Tg8SXRRIZ549ZZ6Xn4COYZQVU+AA=="; }; }; - "jsii-srcmak-0.1.398" = { + "jsii-srcmak-0.1.400" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.398"; + version = "0.1.400"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.398.tgz"; - sha512 = "owTEb9AENT/MQQoHIIiAWvD/sTJtooHwlsNTnM3GaBmEZdntsCjYrDbWGZG1baZjRq2d6PBPqVs7EfxHMIUXjA=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.400.tgz"; + sha512 = "7FVK/c8VBb33mqUYDHJ5JnnW6xmGFyf7Z5LWf2yVAD1FXk3kj4BYpcnJ5K7eDHpY60PtNeivEzM8vJrrDqPIpQ=="; }; }; "json-bigint-1.0.0" = { @@ -35993,13 +36029,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.2.51" = { + "json2jsii-0.2.53" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.2.51"; + version = "0.2.53"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.51.tgz"; - sha512 = "r/pye6PVthtdz3wW8vAwL3t0xUt40FIhqlY5bkZJ6OR2jM2WBJWgBuCoLs3YhKxwNRR7uDsfHTAhexX8ga0tUA=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.53.tgz"; + sha512 = "mofX4sQEkIJWtFn6ZLZZwOpPd/T0KLgiVCN8jFgSxYiED36xp9CXkU+UV3lPRiUMGhDmo/brXRuQ8U7vRutgCg=="; }; }; "json3-3.2.6" = { @@ -41808,6 +41844,15 @@ let sha512 = "USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="; }; }; + "mime-3.0.0" = { + name = "mime"; + packageName = "mime"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz"; + sha512 = "jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A=="; + }; + }; "mime-db-1.33.0" = { name = "mime-db"; packageName = "mime-db"; @@ -43888,13 +43933,13 @@ let sha512 = "/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w=="; }; }; - "node-abi-3.3.0" = { + "node-abi-3.5.0" = { name = "node-abi"; packageName = "node-abi"; - version = "3.3.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-3.3.0.tgz"; - sha512 = "/+2sCVPXmj07GY/l0ggRr7+trqzX7F9d4QVfSArqIVYmRzc/LkXKr5FlRO6U8uZ/gVVclDDaBxBNITj1z1Z/Zw=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-3.5.0.tgz"; + sha512 = "LtHvNIBgOy5mO8mPEUtkCW/YCRWYEKshIvqhe1GHHyXEHEB5mgICyYnAcl4qan3uFeRROErKGzatFHPf6kDxWw=="; }; }; "node-addon-api-1.7.2" = { @@ -45771,13 +45816,13 @@ let sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA=="; }; }; - "oo-ascii-tree-1.43.0" = { + "oo-ascii-tree-1.44.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.43.0.tgz"; - sha512 = "OjCQZnEi/ssOj5f7d3oILcTrzpKN9eWIWEpoEdRr+8NOdcLBGiXDdUYotIx/ajcjmRPjuoRtRT7NE6cKWWT/fA=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.44.0.tgz"; + sha512 = "31f6M3ID8HKIOOAlyQWlURL0koXyEgjF0U1fiu2BuV8TepwCUDUy6MnKHE/72H9cXAwnBXpJHf0dun4B8D3AlA=="; }; }; "opal-runtime-1.0.11" = { @@ -45978,13 +46023,13 @@ let sha512 = "Su8jA45PhegUgJnEAT15DYt2spPJgvjyTtXqg+Lw5AtGePfcQskV6ACEzsL0XPoAXIFf09Vx6sBor9pek+tl+Q=="; }; }; - "openapi-sampler-1.1.0" = { + "openapi-sampler-1.1.1" = { name = "openapi-sampler"; packageName = "openapi-sampler"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.1.0.tgz"; - sha512 = "/LhZYKNBWphLEpbAG5BdpBZbIbmLgC4vTiTj8N/MV0LF9ptmKOiJ2nETVlacNjXHt7iqDgZDELJCIoZ3q5ZG6A=="; + url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.1.1.tgz"; + sha512 = "WAFsl5SPYuhQwaMTDFOcKhnEY1G1rmamrMiPmJdqwfl1lr81g63/befcsN9BNi0w5/R0L+hfcUj13PANEBeLgg=="; }; }; "openapi-schema-validator-3.0.3" = { @@ -50056,15 +50101,6 @@ let sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg=="; }; }; - "prettier-2.3.2" = { - name = "prettier"; - packageName = "prettier"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz"; - sha512 = "lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ=="; - }; - }; "prettier-2.4.1" = { name = "prettier"; packageName = "prettier"; @@ -50101,13 +50137,13 @@ let sha512 = "2UzApPuxi2yRoyMlXMazgR6UcH9DKJhNgCviIwY3ixZ9THWSSrUww5vkiZ3C48WvpFl1M1y/oU63deSy1puWEA=="; }; }; - "prettier-plugin-svelte-2.4.0" = { + "prettier-plugin-svelte-2.5.0" = { name = "prettier-plugin-svelte"; packageName = "prettier-plugin-svelte"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.4.0.tgz"; - sha512 = "JwJ9bOz4XHLQtiLnX4mTSSDUdhu12WH8sTwy/XTDCSyPlah6IcV7NWeYBZscPEcceu2YnW8Y9sJCP40Z2UH9GA=="; + url = "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.5.0.tgz"; + sha512 = "+iHY2uGChOngrgKielJUnqo74gIL/EO5oeWm8MftFWjEi213lq9QYTOwm1pv4lI1nA61tdgf80CF2i5zMcu1kw=="; }; }; "prettier-stylelint-0.4.2" = { @@ -50722,13 +50758,13 @@ let sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; }; }; - "proto3-json-serializer-0.1.5" = { + "proto3-json-serializer-0.1.6" = { name = "proto3-json-serializer"; packageName = "proto3-json-serializer"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-0.1.5.tgz"; - sha512 = "G395jcZkgNXNeS+6FGqd09TsXeoCs9wmBWByDiwFy7Yd7HD8pyfyvf6q+rGh7PhT4AshRpG4NowzoKYUtkNjKg=="; + url = "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-0.1.6.tgz"; + sha512 = "tGbV6m6Kad8NqxMh5hw87euPS0YoZSAOIfvR01zYkQV8Gpx1V/8yU/0gCKCvfCkhAJsjvzzhnnsdQxA1w7PSog=="; }; }; "protobufjs-3.8.2" = { @@ -54808,6 +54844,15 @@ let sha512 = "y3cj3wDwpXTE1boMco/nsquHj2noK0mtnXwBC8FJ/CtU06y66jOBWX1kLknluBl06pYbxtx1ypAOHKvjgT4vsA=="; }; }; + "remark-mdx-2.0.0-rc.2" = { + name = "remark-mdx"; + packageName = "remark-mdx"; + version = "2.0.0-rc.2"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-mdx/-/remark-mdx-2.0.0-rc.2.tgz"; + sha512 = "TMgFSEVx42/YzJWjDY+GKw7CGSbp3XKqBraXPxFS27r8iD9U6zuOZKXH4MoLl9JqiTOmQi0M1zJwT2YhPs32ug=="; + }; + }; "remark-mdxjs-2.0.0-next.8" = { name = "remark-mdxjs"; packageName = "remark-mdxjs"; @@ -55348,13 +55393,13 @@ let sha512 = "YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ=="; }; }; - "reselect-4.1.2" = { + "reselect-4.1.3" = { name = "reselect"; packageName = "reselect"; - version = "4.1.2"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/reselect/-/reselect-4.1.2.tgz"; - sha512 = "wg60ebcPOtxcptIUfrr7Jt3h4BR86cCW3R7y4qt65lnNb4yz4QgrXcbSioVsIOYguyz42+XTHIyJ5TEruzkFgQ=="; + url = "https://registry.npmjs.org/reselect/-/reselect-4.1.3.tgz"; + sha512 = "TVpMknnmdSRNhLPgTDSCQKw32zt1ZIJtEcSxfL/ihtDqShEMUs2X2UY/g96YAVynUXxqLWSXObLGIcqKHQObHw=="; }; }; "reserved-words-0.1.2" = { @@ -56131,13 +56176,13 @@ let sha1 = "6f04063a2d04eba3303a1bbc6765eef63037cf3d"; }; }; - "router-1.3.5" = { + "router-1.3.6" = { name = "router"; packageName = "router"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/router/-/router-1.3.5.tgz"; - sha512 = "kozCJZUhuSJ5VcLhSb3F8fsmGXy+8HaDbKCAerR1G6tq3mnMZFMuSohbFvGv1c5oMFipijDjRZuuN/Sq5nMf3g=="; + url = "https://registry.npmjs.org/router/-/router-1.3.6.tgz"; + sha512 = "gsjhou+LFApzkIP8VDrouG6Z4pqkeF11n3o5orlwPPvPTl0x7c+dbF71itKOhDoFHygmc3N3uqm55Uq/gIDUwg=="; }; }; "router-ips-1.0.0" = { @@ -59011,15 +59056,6 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.10" = { - name = "spdx-license-ids"; - packageName = "spdx-license-ids"; - version = "3.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz"; - sha512 = "oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA=="; - }; - }; "spdx-license-ids-3.0.11" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; @@ -59722,13 +59758,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.127" = { + "sscaff-1.2.129" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.127"; + version = "1.2.129"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.127.tgz"; - sha512 = "lmfLzIKLeolLAujyn2yNcUkg2ia31j7NHVgGEiIe+YqhYomSXzjQxM/k1G0cNvMYNPWvkBakS4Um/ppe2/Zrog=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.129.tgz"; + sha512 = "S9j7nQ83ETJv+NV9nV6Dr5gOAD/gnzMwlf9LLzDEPuwvDolXkIN9kFnzi+Sqxb0zoHxev7t+2342qbcsU0ORgg=="; }; }; "ssh-config-1.1.6" = { @@ -61486,13 +61522,13 @@ let sha512 = "EQS/oRZzMtYdAprppZxY3HcysKh11w54MgA63ybtL+TAZ4hVqYOnhw41JVJjWN9dhPnNjjLzvbZ2tMhTsla1Og=="; }; }; - "svelte2tsx-0.4.8" = { + "svelte2tsx-0.4.9" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.4.8"; + version = "0.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.4.8.tgz"; - sha512 = "FSaJW/PW40XIV3zrHsW4aX6fBDPUu19gl1+zupCqOeT7wRip2RBxxt5ENDsPx/U5EuQC5+ultlYDGhSi6276wQ=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.4.9.tgz"; + sha512 = "FXly9uQTzdLFliTF86mfkT8MgR1DGJ3yvRC/jv2t2RoRLKNgLaXBv8DP2o2RcJL+NQ2X4kRD3IQsf9/99KZ5mg=="; }; }; "sver-compat-1.5.0" = { @@ -62360,13 +62396,13 @@ let sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; }; - "terser-5.9.0" = { + "terser-5.10.0" = { name = "terser"; packageName = "terser"; - version = "5.9.0"; + version = "5.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz"; - sha512 = "h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ=="; + url = "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz"; + sha512 = "AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -63206,6 +63242,15 @@ let sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; }; }; + "toidentifier-1.0.1" = { + name = "toidentifier"; + packageName = "toidentifier"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"; + sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; + }; + }; "toiletdb-1.4.1" = { name = "toiletdb"; packageName = "toiletdb"; @@ -67536,15 +67581,6 @@ let sha512 = "jWi+297PJUUWTHwlcrZz0zIuEXuHOBJIQMapXmEzbosWGv/gMnNSAMV4hTKnl5wzxvZKZzV6j+WFdrSlKQ5qnw=="; }; }; - "vscode-css-languageservice-5.0.0" = { - name = "vscode-css-languageservice"; - packageName = "vscode-css-languageservice"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.0.0.tgz"; - sha512 = "DTMa8QbVmujFPvD3NxoC5jjIXCyCG+cvn3hNzwQRhvhsk8LblNymBZBwzfcDdgEtqsi4O/2AB5HnMIRzxhzEzg=="; - }; - }; "vscode-css-languageservice-5.1.8" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; @@ -67581,13 +67617,13 @@ let sha512 = "X4pzcrJ8dE7M3ArFuySF5fgipKDd/EauXkiJwtjBIVRWpVNq0tF9+lNCyuC7iDUwP3Oq7ow/TGssD3GdG96Jow=="; }; }; - "vscode-emmet-helper-2.1.2" = { + "vscode-emmet-helper-2.6.4" = { name = "vscode-emmet-helper"; packageName = "vscode-emmet-helper"; - version = "2.1.2"; + version = "2.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-2.1.2.tgz"; - sha512 = "Fy6UNawSgxE3Kuqi54vSXohf03iOIrp1A74ReAgzvGP9Yt7fUAvkqF6No2WAc34/w0oWAHAeqoBNqmKKWh6U5w=="; + url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-2.6.4.tgz"; + sha512 = "fP0nunW1RUWEKGf4gqiYLOVNFFGXSRHjCl0pikxtwCFlty8WwimM+RBJ5o0aIiwerrYD30HqeaVyvDW027Sseg=="; }; }; "vscode-html-languageservice-2.1.12" = { @@ -67599,15 +67635,6 @@ let sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; }; }; - "vscode-html-languageservice-4.0.0" = { - name = "vscode-html-languageservice"; - packageName = "vscode-html-languageservice"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-4.0.0.tgz"; - sha512 = "UmC+GS0IqBeZnOAmdtQvaDzoH1c5/un+b7qALUziu/Y4SOPXso5dF+YkJeTqsde6YU2pLm78RtMDzl9BParwbw=="; - }; - }; "vscode-html-languageservice-4.1.1" = { name = "vscode-html-languageservice"; packageName = "vscode-html-languageservice"; @@ -68454,13 +68481,13 @@ let sha512 = "8G0xBj05hqZybCqBtW7RPZ/hWEtP3DiLTauQzGJZuZYfVRgw7qj7iaZ+8djNqJ4VPrdOO+pS2dR1JsTbsLxdYg=="; }; }; - "web3-utils-1.6.0" = { + "web3-utils-1.6.1" = { name = "web3-utils"; packageName = "web3-utils"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.6.0.tgz"; - sha512 = "bgCAWAeQnJF035YTFxrcHJ5mGEfTi/McsjqldZiXRwlHK7L1PyOqvXiQLE053dlzvy1kdAxWl/sSSfLMyNUAXg=="; + url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.6.1.tgz"; + sha512 = "RidGKv5kOkcerI6jQqDFDoTllQQqV+rPhTzZHhmbqtFObbYpU93uc+yG1LHivRTQhA6llIx67iudc/vzisgO+w=="; }; }; "webassemblyjs-1.11.1" = { @@ -68571,13 +68598,13 @@ let sha512 = "3S6e9Vo1W2ijk4F4PPWRIu6D/uGgqaPmqw+av3W3jLDujuNkdxX5h5c+RQ6GkjVR+WwIPOfgY8av+j5j4tMqJw=="; }; }; - "webpack-5.64.0" = { + "webpack-5.64.1" = { name = "webpack"; packageName = "webpack"; - version = "5.64.0"; + version = "5.64.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.64.0.tgz"; - sha512 = "UclnN24m054HaPC45nmDEosX6yXWD+UGC12YtUs5i356DleAUGMDC9LBAw37xRRfgPKYIdCYjGA7RZ1AA+ZnGg=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.64.1.tgz"; + sha512 = "b4FHmRgaaAjP+aVOVz41a9Qa5SmkUPQ+u8FntTQ1roPHahSComB6rXnLwc976VhUY4CqTaLu5mCswuHiNhOfVw=="; }; }; "webpack-bundle-analyzer-3.9.0" = { @@ -68715,13 +68742,13 @@ let sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; }; }; - "webpack-sources-3.2.1" = { + "webpack-sources-3.2.2" = { name = "webpack-sources"; packageName = "webpack-sources"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.1.tgz"; - sha512 = "t6BMVLQ0AkjBOoRTZgqrWm7xbXMBzD+XDq2EZ96+vMfn3qKgsvdXZhbPZ4ElUOpdv4u+iiGe+w3+J75iy/bYGA=="; + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.2.tgz"; + sha512 = "cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw=="; }; }; "webpack-stream-6.1.0" = { @@ -70291,6 +70318,15 @@ let sha512 = "QaYgJZMfWD6fKN/EYMk6w1oLWPCr1xj9QaPSZW5qkDb3y8nGCXhy2Ono+AF4F+CSL/vGcqswcAT0BaS//pgD2A=="; }; }; + "yaml-2.0.0-9" = { + name = "yaml"; + packageName = "yaml"; + version = "2.0.0-9"; + src = fetchurl { + url = "https://registry.npmjs.org/yaml/-/yaml-2.0.0-9.tgz"; + sha512 = "Bf2KowHjyVkIIiGMt7+fbhmlvKOaE8DWuD07bnL4+FQ9sPmEl/5IzGpBpoxPqOaHuyasBjJhyXDcISpJWfhCGw=="; + }; + }; "yaml-ast-parser-0.0.43" = { name = "yaml-ast-parser"; packageName = "yaml-ast-parser"; @@ -71816,7 +71852,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."split2-3.2.2" sources."string-width-4.2.3" sources."string_decoder-1.3.0" @@ -71948,7 +71984,7 @@ in sources."string_decoder-0.10.31" ]; }) - sources."bytes-3.1.0" + sources."bytes-3.1.1" sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" @@ -73447,7 +73483,7 @@ in ]; }) sources."@nestjs/schematics-8.0.4" - sources."@types/eslint-7.28.2" + sources."@types/eslint-7.29.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" @@ -73488,7 +73524,7 @@ in sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" @@ -73511,7 +73547,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.3" // { @@ -73675,7 +73711,7 @@ in sources."supports-color-7.2.0" sources."symbol-observable-4.0.0" sources."tapable-1.1.3" - (sources."terser-5.9.0" // { + (sources."terser-5.10.0" // { dependencies = [ sources."commander-2.20.3" ]; @@ -73715,7 +73751,7 @@ in ]; }) sources."webpack-node-externals-3.0.0" - sources."webpack-sources-3.2.1" + sources."webpack-sources-3.2.2" sources."which-2.0.2" sources."windows-release-4.0.0" sources."wrappy-1.0.2" @@ -74003,13 +74039,13 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.15" sources."@vue/cli-ui-addon-widgets-4.5.15" - (sources."@vue/compiler-core-3.2.21" // { + (sources."@vue/compiler-core-3.2.22" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.2.21" - sources."@vue/shared-3.2.21" + sources."@vue/compiler-dom-3.2.22" + sources."@vue/shared-3.2.22" sources."@wry/equality-0.1.11" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" @@ -74091,6 +74127,7 @@ in sources."inherits-2.0.3" sources."qs-6.7.0" sources."setprototypeof-1.1.1" + sources."toidentifier-1.0.0" ]; }) (sources."boxen-4.2.0" // { @@ -74106,7 +74143,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -74253,7 +74290,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -74415,7 +74452,7 @@ in sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.9" sources."http-cache-semantics-3.8.1" - sources."http-errors-1.8.0" + sources."http-errors-1.8.1" sources."http-signature-1.2.0" sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" @@ -74703,6 +74740,7 @@ in sources."http-errors-1.7.2" sources."inherits-2.0.3" sources."setprototypeof-1.1.1" + sources."toidentifier-1.0.0" ]; }) sources."read-pkg-5.2.0" @@ -74766,6 +74804,7 @@ in sources."http-errors-1.7.3" sources."ms-2.1.1" sources."setprototypeof-1.1.1" + sources."toidentifier-1.0.0" ]; }) sources."serve-static-1.14.1" @@ -74822,7 +74861,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" (sources."split-string-3.1.0" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -74919,7 +74958,7 @@ in ]; }) sources."to-regex-range-2.1.1" - sources."toidentifier-1.0.0" + sources."toidentifier-1.0.1" sources."tough-cookie-2.5.0" sources."tr46-0.0.3" sources."trim-repeated-1.0.0" @@ -75284,7 +75323,7 @@ in sources."pump-3.0.0" ]; }) - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."camelcase-keys-7.0.1" sources."ccount-2.0.1" sources."chalk-2.4.2" @@ -75581,7 +75620,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."split-0.2.10" (sources."split-transform-stream-0.1.1" // { dependencies = [ @@ -75750,7 +75789,7 @@ in sources."async-3.2.2" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."caniuse-lite-1.0.30001280" sources."chalk-2.4.2" sources."color-convert-1.9.3" @@ -75761,7 +75800,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -75890,9 +75929,9 @@ in sha512 = "7FdJ1ONtwzV1G43GDD0kpVMn/qbiNqyOPMFTX5nRffI+7vgWoFEc6DcXOxHJxrWNDXrZh18eDsZjvZGUljSRGA=="; }; dependencies = [ - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."caniuse-lite-1.0.30001280" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" sources."escalade-3.1.1" sources."fraction.js-4.1.2" sources."node-releases-2.0.1" @@ -75927,7 +75966,7 @@ in sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.1028.0" // { + (sources."aws-sdk-2.1029.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -76154,7 +76193,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/eslint-7.28.2" + sources."@types/eslint-7.29.0" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" sources."@types/mdast-3.0.10" @@ -76447,7 +76486,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" (sources."string-width-4.2.3" // { dependencies = [ sources."emoji-regex-8.0.0" @@ -76548,12 +76587,13 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "11.11.0"; + version = "11.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.11.0.tgz"; - sha512 = "jmJjvAB00rF+zKthCDzCOIz8IxJah2cjgcBHSjLqgV7AYbyyDEUNiFZhSlymEfmGc2pJI2/JhetYEVu9PpDl3Q=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.12.0.tgz"; + sha512 = "wb6LDwuSA5UGHb7yIRZK3YAk9odlPkV5e4qwswwlKTOj0BV2gawClTsJ1uE27WIWFIu7OQaoB1TxUiL1jKQueQ=="; }; dependencies = [ + sources."@alexbosworth/fiat-1.0.0" sources."@alexbosworth/html2unicode-1.1.5" sources."@alexbosworth/node-fetch-2.6.2" sources."@alexbosworth/saxophone-0.6.2" @@ -76672,7 +76712,7 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" (sources."caporal-1.4.0" // { dependencies = [ sources."colorette-1.4.0" @@ -77485,10 +77525,10 @@ in bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; - version = "1.8.12"; + version = "1.8.13"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.12.tgz"; - sha512 = "u1xy9SrwwoPlgjuHNjhV+YUPVdqyBj2ALBxuzeIUKXaPI2i2xypGgxqXkuHcITGdi5yBj5JuXgyMvgiWiS1S3Q=="; + url = "https://registry.npmjs.org/bower/-/bower-1.8.13.tgz"; + sha512 = "8eWko16JlCTdaZZG70kddHPed17pHEbH8/IjfP4IFkQsfEqRsyNM09Dc8cDBFkSvtQ/2lTea7A+bMhRggG2a+Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -77512,7 +77552,7 @@ in sources."argparse-1.0.4" sources."array-find-index-1.0.2" sources."balanced-match-1.0.2" - sources."bower-1.8.12" + sources."bower-1.8.13" sources."bower-endpoint-parser-0.2.1" sources."bower-json-0.6.0" sources."bower-logger-0.2.1" @@ -77610,7 +77650,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."sprintf-js-1.0.3" sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" @@ -78506,7 +78546,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."standard-error-1.1.0" @@ -78919,7 +78959,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."speedometer-0.1.4" sources."srt2vtt-1.3.1" sources."sshpk-1.16.1" @@ -79478,7 +79518,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."split-on-first-1.1.0" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { @@ -79596,14 +79636,14 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.29"; + version = "1.0.31"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.29.tgz"; - sha512 = "hvQr4muvZ5mM//MpTH7IK8bSKRl/c3s/8GXx4BghWI+noG0/O06XxaN4ZeQuIdXHuZ4/7Qi2YA6a7qgifnetyQ=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.31.tgz"; + sha512 = "xaViO1Divm4/4v+oTlYV28MohHaoT4vNI2T4M9I/6oAHF1yNiSJWWd76mjOICVIoAi7OpjBj5YtyBrXcmq9pzA=="; }; dependencies = [ - sources."@jsii/check-node-1.43.0" - sources."@jsii/spec-1.43.0" + sources."@jsii/check-node-1.44.0" + sources."@jsii/spec-1.44.0" sources."@types/node-12.20.37" sources."@xmldom/xmldom-0.7.5" sources."ajv-8.8.0" @@ -79612,14 +79652,14 @@ in sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.5" sources."call-bind-1.0.2" - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."case-1.6.3" - sources."cdk8s-1.1.33" - sources."cdk8s-plus-22-1.0.0-beta.40" + sources."cdk8s-1.1.35" + sources."cdk8s-plus-22-1.0.0-beta.42" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.43.0" // { + (sources."codemaker-1.44.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -79684,38 +79724,38 @@ in sources."is-weakref-1.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" - (sources."jsii-1.43.0" // { + (sources."jsii-1.44.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.43.0" // { + (sources."jsii-pacmak-1.44.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.43.0" // { + (sources."jsii-reflect-1.44.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.43.0" // { + (sources."jsii-rosetta-1.44.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.398" // { + (sources."jsii-srcmak-0.1.400" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.2.51" + sources."json2jsii-0.2.53" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -79731,7 +79771,7 @@ in sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."oo-ascii-tree-1.43.0" + sources."oo-ascii-tree-1.44.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -79753,7 +79793,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.127" + sources."sscaff-1.2.129" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -79779,7 +79819,7 @@ in sources."xmlbuilder-15.1.1" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yaml-2.0.0-8" + sources."yaml-2.0.0-9" (sources."yargs-15.4.1" // { dependencies = [ sources."camelcase-5.3.1" @@ -79875,8 +79915,8 @@ in }) sources."@graphql-typed-document-node/core-3.1.0" sources."@josephg/resolvable-1.0.1" - sources."@jsii/check-node-1.43.0" - sources."@jsii/spec-1.43.0" + sources."@jsii/check-node-1.44.0" + sources."@jsii/spec-1.44.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -79987,7 +80027,7 @@ in sources."bytes-3.1.0" sources."call-bind-1.0.2" sources."camel-case-4.1.2" - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" (sources."camelcase-keys-6.2.2" // { dependencies = [ sources."camelcase-5.3.1" @@ -80222,19 +80262,19 @@ in (sources."jsii-pacmak-1.37.0" // { dependencies = [ sources."@jsii/check-node-1.37.0" - sources."codemaker-1.43.0" + sources."codemaker-1.44.0" sources."escape-string-regexp-4.0.0" sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.43.0" // { + (sources."jsii-reflect-1.44.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.43.0" // { + (sources."jsii-rosetta-1.44.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" @@ -80301,7 +80341,7 @@ in sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.43.0" + sources."oo-ascii-tree-1.44.0" sources."open-7.4.2" sources."optimism-0.16.1" sources."ora-5.4.1" @@ -80394,7 +80434,7 @@ in sources."sort-json-2.0.0" sources."source-map-0.5.7" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.127" + sources."sscaff-1.2.129" (sources."stack-utils-2.0.5" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -80545,7 +80585,7 @@ in sources."ansi-styles-3.2.1" sources."arch-2.2.0" sources."arrify-1.0.1" - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."camelcase-keys-7.0.1" sources."chalk-2.4.2" sources."clipboardy-3.0.0" @@ -80610,7 +80650,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."strip-final-newline-2.0.0" sources."strip-indent-4.0.0" sources."supports-color-5.5.0" @@ -81134,7 +81174,7 @@ in sources."bser-2.1.1" sources."buffer-indexof-polyfill-1.0.2" sources."buffers-0.1.1" - sources."bytes-3.1.0" + sources."bytes-3.1.1" sources."call-bind-1.0.2" sources."chainsaw-0.1.0" sources."chownr-2.0.0" @@ -81513,7 +81553,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -82107,7 +82147,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."specificity-0.3.2" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" @@ -82391,10 +82431,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.54.0"; + version = "0.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.54.0.tgz"; - sha512 = "pj7VGs/Fzi50vWsF2VlmjmZDE1IScxEMO9TKgpaj8Fi/eGczFz8WxAnbGiAjDzVHYqyaCq/eQtU0Ix7bm1V3Bw=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.55.0.tgz"; + sha512 = "qTlCHI6qpMsRLK6Wt4OfC8NxUbZxZ2bVaq/7oan0LR2N2gh3KvQToe8aq2IlrGmRBM8CdnuiD7Wz8uPB5QelpQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -82523,7 +82563,7 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" @@ -82564,7 +82604,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -82742,7 +82782,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."specificity-0.4.1" sources."string-width-4.2.3" (sources."string_decoder-1.3.0" // { @@ -83830,7 +83870,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."split-1.0.1" sources."split2-3.2.2" sources."string-width-4.2.3" @@ -84387,7 +84427,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."sshpk-1.16.1" sources."ssri-8.0.1" sources."statuses-1.5.0" @@ -84789,7 +84829,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { dependencies = [ @@ -85388,7 +85428,7 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.2" sources."bulk-write-stream-1.1.4" - sources."bytes-3.1.0" + sources."bytes-3.1.1" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."camelcase-4.1.0" @@ -86150,12 +86190,12 @@ in sources."@types/node-fetch-2.5.12" sources."@types/prop-types-15.7.4" sources."@types/rc-1.2.0" - sources."@types/react-16.14.20" + sources."@types/react-16.14.21" sources."@types/react-dom-16.9.14" sources."@types/react-window-1.8.5" sources."@types/react-window-infinite-loader-1.0.5" sources."@types/scheduler-0.16.2" - sources."@types/url-parse-1.4.4" + sources."@types/url-parse-1.4.5" sources."ansi-styles-3.2.1" (sources."anymatch-2.0.0" // { dependencies = [ @@ -86192,7 +86232,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."cache-base-1.0.1" @@ -86252,7 +86292,7 @@ in sources."core-util-is-1.0.3" sources."crypto-random-string-1.0.0" sources."csscolorparser-1.0.3" - sources."csstype-3.0.9" + sources."csstype-3.0.10" sources."debounce-1.2.1" sources."debug-4.3.2" sources."decode-uri-component-0.2.0" @@ -86270,7 +86310,7 @@ in sources."duplexer3-0.1.4" sources."earcut-2.2.3" sources."electron-13.6.1" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -86868,7 +86908,7 @@ in sources."big.js-5.2.2" sources."buffer-4.9.2" sources."buffer-queue-1.0.0" - sources."bytes-3.1.0" + sources."bytes-3.1.1" sources."caseless-0.12.0" sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" @@ -87393,7 +87433,7 @@ in sources."mute-stream-0.0.8" sources."negotiator-0.6.2" sources."nice-try-1.0.5" - sources."node-abi-3.3.0" + sources."node-abi-3.5.0" sources."node-addon-api-3.2.1" sources."node-api-version-0.1.4" sources."node-fetch-2.6.6" @@ -87527,7 +87567,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."speedometer-0.1.4" sources."sprintf-js-1.1.2" sources."sshpk-1.16.1" @@ -87713,7 +87753,7 @@ in sources."auto-bind-4.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" @@ -87748,7 +87788,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -87915,7 +87955,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" (sources."stack-utils-2.0.5" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -89363,7 +89403,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."split-string-3.1.0" sources."split2-3.2.2" sources."sprintf-js-1.0.3" @@ -89448,7 +89488,7 @@ in sources."yallist-3.1.1" ]; }) - (sources."terser-5.9.0" // { + (sources."terser-5.10.0" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -89793,10 +89833,10 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "11.0.0"; + version = "11.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-11.0.0.tgz"; - sha512 = "eR6yaJepLQ8hMGIfW2Bj41e4ZnxbsbMZvYjDxWl98YnUlqn46qoUi20N3VB0xq9mv1IKsOO+Rqfnjov5Y93zLg=="; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-11.1.0.tgz"; + sha512 = "uhrQhFPG7L/81j90+QKaDImDJriqCdPY4ZcN9exFs9sdeF28Cdv/vD2XuRhjD5FxVbA/nNpFL37QsTSQwtjdjA=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" @@ -90151,7 +90191,7 @@ in sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.31" // { + (sources."@types/webpack-4.41.32" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -90340,7 +90380,7 @@ in sources."tslib-2.3.1" ]; }) - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."caniuse-api-3.0.0" sources."caniuse-lite-1.0.30001280" sources."caseless-0.12.0" @@ -90600,7 +90640,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -92254,7 +92294,7 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."brace-expansion-1.1.11" - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."caller-callsite-2.0.0" @@ -92286,7 +92326,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -92419,7 +92459,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" (sources."stack-utils-2.0.5" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -92596,7 +92636,7 @@ in sources."lowercase-keys-1.0.0" ]; }) - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."cardinal-2.1.1" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { @@ -93577,7 +93617,7 @@ in sources."promise-breaker-5.0.0" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" - sources."proto3-json-serializer-0.1.5" + sources."proto3-json-serializer-0.1.6" sources."protobufjs-6.11.2" sources."proxy-addr-2.0.7" (sources."proxy-agent-5.0.0" // { @@ -93613,7 +93653,7 @@ in sources."retry-0.12.0" sources."retry-request-4.2.2" sources."rimraf-3.0.2" - (sources."router-1.3.5" // { + (sources."router-1.3.6" // { dependencies = [ sources."array-flatten-3.0.0" sources."debug-2.6.9" @@ -93766,7 +93806,7 @@ in (sources."update-notifier-5.1.0" // { dependencies = [ sources."boxen-5.1.2" - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."chalk-4.1.2" sources."global-dirs-3.0.0" sources."has-flag-4.0.0" @@ -93912,7 +93952,7 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."buffer-5.7.1" - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" (sources."camelcase-keys-7.0.1" // { dependencies = [ sources."type-fest-1.4.0" @@ -94060,7 +94100,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."string-width-5.0.1" sources."string_decoder-1.3.0" sources."strip-ansi-7.0.1" @@ -94295,7 +94335,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."web3-utils-1.6.0" + sources."web3-utils-1.6.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-module-2.0.0" @@ -94807,10 +94847,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "4.1.3"; + version = "4.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.1.3.tgz"; - sha512 = "GKOKnNXNMCJ/FDTieZ0eAVbOWoDRzSbbUU1+QQzbSvWl2fBtWXvpz9Grrk66gkHlu1KtqzuN9zR11AIa12dEzw=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.1.4.tgz"; + sha512 = "B8PYO0FPZMuaEJnvLDPPfEO+xHci7pWoS0NnEKKd+12kneObi4doQp0vqqAG+PS3oNtBRGy1nLglf8BTpCex8Q=="; }; dependencies = [ (sources."@ardatan/aggregate-error-0.0.6" // { @@ -94956,7 +94996,7 @@ in sources."boxen-5.1.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."bytes-3.1.0" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.2" // { @@ -94966,7 +95006,7 @@ in }) sources."call-bind-1.0.2" sources."camel-case-4.1.2" - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."caniuse-lite-1.0.30001280" sources."ccount-1.1.0" (sources."chalk-4.1.2" // { @@ -95072,7 +95112,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -95144,13 +95184,13 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."gatsby-core-utils-3.1.2" - (sources."gatsby-recipes-1.1.2" // { + sources."gatsby-core-utils-3.1.3" + (sources."gatsby-recipes-1.1.3" // { dependencies = [ sources."strip-ansi-6.0.1" ]; }) - (sources."gatsby-telemetry-3.1.2" // { + (sources."gatsby-telemetry-3.1.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."boxen-4.2.0" @@ -95447,7 +95487,7 @@ in sources."regenerator-runtime-0.13.9" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" - sources."remark-mdx-2.0.0-rc.1" + sources."remark-mdx-2.0.0-rc.2" (sources."remark-mdxjs-2.0.0-next.8" // { dependencies = [ sources."@babel/core-7.10.5" @@ -95793,7 +95833,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" (sources."string-width-2.1.1" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -96119,15 +96159,15 @@ in "@gitbeaker/cli" = nodeEnv.buildNodePackage { name = "_at_gitbeaker_slash_cli"; packageName = "@gitbeaker/cli"; - version = "34.5.0"; + version = "34.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-34.5.0.tgz"; - sha512 = "lOagLq2JwEbAnppLKWZlh1wfZv2r+FJfIvOgxtf+sy+t+CtQNIXuyPzBhzqgEKhpDDKqfSF7L9diEXVPXsISEA=="; + url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-34.6.0.tgz"; + sha512 = "CztjBIMUgD/2RbcHjDDDqKfduBARokquYnF6pUql/9v1iodq5ch4DdBqVJuLbXehyOE/UkF/RsAtnAiKy0qbxQ=="; }; dependencies = [ - sources."@gitbeaker/core-34.5.0" - sources."@gitbeaker/node-34.5.0" - sources."@gitbeaker/requester-utils-34.5.0" + sources."@gitbeaker/core-34.6.0" + sources."@gitbeaker/node-34.6.0" + sources."@gitbeaker/requester-utils-34.6.0" sources."@sindresorhus/is-4.2.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" @@ -96183,6 +96223,7 @@ in sources."li-1.3.0" sources."log-symbols-5.0.0" sources."lowercase-keys-2.0.0" + sources."mime-3.0.0" sources."mime-db-1.51.0" sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" @@ -96265,7 +96306,7 @@ in sources."bl-4.1.0" (sources."boxen-5.1.2" // { dependencies = [ - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."type-fest-0.20.2" ]; }) @@ -96526,7 +96567,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."statuses-1.5.0" sources."string-width-4.2.3" sources."string_decoder-1.3.0" @@ -98956,7 +98997,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.1028.0" + sources."aws-sdk-2.1029.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -99151,10 +99192,10 @@ in ijavascript = nodeEnv.buildNodePackage { name = "ijavascript"; packageName = "ijavascript"; - version = "5.2.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ijavascript/-/ijavascript-5.2.0.tgz"; - sha512 = "MIV3R9d2o9uucTmNH5IU5bvXcevljsOrsH7Sv3rmf/uoXjl/iXb8hx4ZnymBpdt48f7U2m0iKmpWlQzxjthtjw=="; + url = "https://registry.npmjs.org/ijavascript/-/ijavascript-5.2.1.tgz"; + sha512 = "kH7hudp+S+8++ngjUXbiyHOhp3qa4oDVUkmf6p7+7s15PIBDv5zx878pxNRdGcWhYGy5TT683EOqeKMQw8jrFA=="; }; dependencies = [ sources."jmp-2.0.0" @@ -100486,7 +100527,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1028.0" // { + (sources."aws-sdk-2.1029.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -100729,7 +100770,7 @@ in sources."html-encoding-sniffer-1.0.2" sources."html-entities-1.4.0" sources."html-minifier-3.5.21" - sources."http-errors-1.8.0" + sources."http-errors-1.8.1" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" @@ -101002,7 +101043,7 @@ in ]; }) sources."requires-port-1.0.0" - sources."reselect-4.1.2" + sources."reselect-4.1.3" sources."resolve-url-0.2.1" sources."retry-0.10.1" sources."rimraf-2.7.1" @@ -101106,7 +101147,7 @@ in ]; }) sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.0" + sources."toidentifier-1.0.1" sources."tough-cookie-3.0.1" sources."tr46-1.0.1" sources."tree-kit-0.7.4" @@ -101467,7 +101508,7 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."chalk-4.1.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -102799,7 +102840,7 @@ in sources."brace-expansion-1.1.11" sources."browser-or-node-1.3.0" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."buffer-from-1.1.2" sources."bytes-3.1.0" sources."bytesish-0.4.4" @@ -102855,7 +102896,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."enquirer-2.3.6" @@ -105690,7 +105731,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.2" @@ -105829,7 +105870,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -107649,7 +107690,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" @@ -109107,7 +109148,7 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" (sources."chalk-4.1.2" // { dependencies = [ sources."has-flag-4.0.0" @@ -109289,7 +109330,7 @@ in sources."balanced-match-1.0.2" (sources."boxen-5.1.2" // { dependencies = [ - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."type-fest-0.20.2" sources."wrap-ansi-7.0.0" ]; @@ -109842,7 +109883,7 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."chalk-4.1.2" sources."chownr-2.0.0" sources."ci-info-2.0.0" @@ -110560,7 +110601,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -110714,7 +110755,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -110824,7 +110865,7 @@ in sources."posthtml-0.15.2" sources."posthtml-parser-0.7.2" sources."source-map-0.7.3" - sources."terser-5.9.0" + sources."terser-5.10.0" ]; }) (sources."htmlparser2-6.1.0" // { @@ -112227,9 +112268,10 @@ in sources."ms-2.0.0" (sources."multiparty-4.2.2" // { dependencies = [ - sources."http-errors-1.8.0" + sources."http-errors-1.8.1" sources."safe-buffer-5.2.1" sources."setprototypeof-1.2.0" + sources."toidentifier-1.0.1" ]; }) sources."negotiator-0.6.2" @@ -112813,10 +112855,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.21.1"; + version = "6.22.2"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.21.1.tgz"; - sha512 = "cekH8bFgZbHerGsmW4JYY5bi0jYyi/K7WZpSf8TQFlP3Kxc50KhCwNWPUzgLVImYyX8SCJcVhyNOoYQKDnmYCw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.22.2.tgz"; + sha512 = "8umiz8XtgauWmPzOrb0CvCCwyb4IkJiavnxMDvNEbDpTb/6FZh3SLVVR2WNb07obGVKY6USpo159o5zd3RHD9g=="; }; buildInputs = globalBuildInputs; meta = { @@ -114330,7 +114372,7 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -114588,7 +114630,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -115978,7 +116020,7 @@ in sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.6" sources."@redocly/ajv-8.6.4" - sources."@redocly/openapi-core-1.0.0-beta.67" + sources."@redocly/openapi-core-1.0.0-beta.68" sources."@redocly/react-dropdown-aria-2.0.12" sources."@types/json-schema-7.0.9" sources."@types/node-14.17.33" @@ -116144,7 +116186,7 @@ in sources."oas-schema-walker-1.1.5" sources."oas-validator-5.0.8" sources."object-assign-4.1.1" - sources."openapi-sampler-1.1.0" + sources."openapi-sampler-1.1.1" sources."os-browserify-0.3.0" sources."pako-1.0.11" sources."parse-asn1-5.1.6" @@ -116465,7 +116507,7 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."chalk-4.1.2" sources."chokidar-3.5.2" sources."ci-info-2.0.0" @@ -116829,7 +116871,7 @@ in sources."buffers-0.1.1" sources."call-bind-1.0.2" sources."callsites-3.1.0" - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."chainsaw-0.1.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -117410,7 +117452,7 @@ in }) sources."brace-expansion-1.1.11" sources."bytes-3.0.0" - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" (sources."chalk-2.4.1" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -117602,7 +117644,7 @@ in sources."@types/caseless-0.12.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/lodash-4.14.176" + sources."@types/lodash-4.14.177" sources."@types/long-4.0.1" sources."@types/node-16.11.7" sources."@types/request-2.48.7" @@ -117664,7 +117706,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.1028.0" // { + (sources."aws-sdk-2.1029.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -117724,7 +117766,7 @@ in ]; }) sources."cachedir-2.3.0" - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."caseless-0.12.0" (sources."chainsaw-0.1.0" // { dependencies = [ @@ -119028,10 +119070,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.760.0"; + version = "1.763.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.760.0.tgz"; - sha512 = "pVH3AbY30zNerW+F+okULIRYVj0r8Ksvd8WW+beMddghOH31ZePpAWjK5F+D6d3Dy3WJ3n/JyAywxiTS+2d6kQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.763.0.tgz"; + sha512 = "nZbLVKzj3P8cPImwCkdC2m9OmghiCBmEWoXQRlDtNDnRZ/jiLZtBJcJEku8DZoJUA+P+7HJGu1TxvmKz5DLadQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -120303,7 +120345,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.1028.0" // { + (sources."aws-sdk-2.1029.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -121290,10 +121332,10 @@ in svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; - version = "2.2.8"; + version = "2.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.2.8.tgz"; - sha512 = "y8BmSf3v+jOoVwKY0K3wAiIt3hupLiUS4HYqXSZPXJZrChKddp+N8fyNeClsDChLt2sLUo6sOAhlnok/RJ+iIw=="; + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.2.9.tgz"; + sha512 = "au77iP0v2f8F0gWu5Nk3dPkASk4H6DyLQEDQrQR6a7BWJaTnGEZKFhe5EsD8f9tHLyA4awPBi+D56hVuRsbgNA=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -121377,10 +121419,10 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.14.11"; + version = "0.14.12"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.11.tgz"; - sha512 = "vocQDpxGkhAmzwMuXtEmfaj+O7jWhaw2S7NOZNBTqxG0OG5FzlpHmScJ3g6MonKcY3bv3IzFTIiGIXFdTXZ9+Q=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.12.tgz"; + sha512 = "CrkiGvu88SK9zn+yJrjw8l00N3je/WHpsZLCfR9zQDNFAdKJHsCwmq/ExCHjU32wsRIfX0oIGx+TW6fF0wtzxA=="; }; dependencies = [ sources."@emmetio/abbreviation-2.2.2" @@ -121419,8 +121461,8 @@ in sources."normalize-path-3.0.0" sources."pascal-case-3.1.2" sources."picomatch-2.3.0" - sources."prettier-2.3.2" - sources."prettier-plugin-svelte-2.4.0" + sources."prettier-2.4.1" + sources."prettier-plugin-svelte-2.5.0" sources."queue-microtask-1.2.3" sources."readdirp-3.6.0" sources."reusify-1.0.4" @@ -121429,13 +121471,17 @@ in sources."strip-indent-3.0.0" sources."svelte-3.38.3" sources."svelte-preprocess-4.7.4" - sources."svelte2tsx-0.4.8" + sources."svelte2tsx-0.4.9" sources."to-regex-range-5.0.1" sources."tslib-2.3.1" sources."typescript-4.4.4" - sources."vscode-css-languageservice-5.0.0" - sources."vscode-emmet-helper-2.1.2" - sources."vscode-html-languageservice-4.0.0" + sources."vscode-css-languageservice-5.1.8" + (sources."vscode-emmet-helper-2.6.4" // { + dependencies = [ + sources."vscode-uri-2.1.2" + ]; + }) + sources."vscode-html-languageservice-4.1.1" sources."vscode-jsonrpc-6.1.0-next.2" sources."vscode-languageserver-7.1.0-next.4" (sources."vscode-languageserver-protocol-3.17.0-next.5" // { @@ -121446,7 +121492,7 @@ in sources."vscode-languageserver-textdocument-1.0.2" sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-5.0.0" - sources."vscode-uri-2.1.2" + sources."vscode-uri-3.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -122338,10 +122384,10 @@ in terser = nodeEnv.buildNodePackage { name = "terser"; packageName = "terser"; - version = "5.9.0"; + version = "5.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz"; - sha512 = "h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ=="; + url = "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz"; + sha512 = "AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA=="; }; dependencies = [ sources."buffer-from-1.1.2" @@ -125696,7 +125742,7 @@ in src = ../../misc/vscode-extensions/vscode-lldb/build-deps; dependencies = [ sources."@discoveryjs/json-ext-0.5.5" - sources."@types/eslint-7.28.2" + sources."@types/eslint-7.29.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" @@ -125742,11 +125788,11 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."call-bind-1.0.2" - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."caniuse-lite-1.0.30001280" (sources."chalk-4.1.2" // { dependencies = [ @@ -125787,7 +125833,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.2" sources."domutils-2.8.0" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.3" @@ -125953,7 +125999,7 @@ in sources."strip-json-comments-3.1.1" sources."supports-color-8.1.1" sources."tapable-2.2.1" - (sources."terser-5.9.0" // { + (sources."terser-5.10.0" // { dependencies = [ sources."commander-2.20.3" sources."source-map-0.7.3" @@ -125996,14 +126042,14 @@ in sources."vscode-debugadapter-testsupport-1.50.0" sources."vscode-debugprotocol-1.50.1" sources."watchpack-2.2.0" - sources."webpack-5.64.0" + sources."webpack-5.64.1" (sources."webpack-cli-4.9.1" // { dependencies = [ sources."commander-7.2.0" ]; }) sources."webpack-merge-5.8.0" - sources."webpack-sources-3.2.1" + sources."webpack-sources-3.2.2" sources."which-2.0.2" sources."wide-align-1.1.3" sources."wildcard-2.0.0" @@ -128092,13 +128138,13 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.64.0"; + version = "5.64.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.64.0.tgz"; - sha512 = "UclnN24m054HaPC45nmDEosX6yXWD+UGC12YtUs5i356DleAUGMDC9LBAw37xRRfgPKYIdCYjGA7RZ1AA+ZnGg=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.64.1.tgz"; + sha512 = "b4FHmRgaaAjP+aVOVz41a9Qa5SmkUPQ+u8FntTQ1roPHahSComB6rXnLwc976VhUY4CqTaLu5mCswuHiNhOfVw=="; }; dependencies = [ - sources."@types/eslint-7.28.2" + sources."@types/eslint-7.29.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" @@ -128124,12 +128170,12 @@ in sources."acorn-import-assertions-1.8.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."buffer-from-1.1.2" sources."caniuse-lite-1.0.30001280" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" sources."enhanced-resolve-5.8.3" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -128165,7 +128211,7 @@ in sources."source-map-support-0.5.20" sources."supports-color-8.1.1" sources."tapable-2.2.1" - (sources."terser-5.9.0" // { + (sources."terser-5.10.0" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -128173,7 +128219,7 @@ in sources."terser-webpack-plugin-5.2.5" sources."uri-js-4.4.1" sources."watchpack-2.2.0" - sources."webpack-sources-3.2.1" + sources."webpack-sources-3.2.2" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index 116349746bf3..d22a87a92f3f 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -1,4 +1,5 @@ { self +, fetchpatch , lib , openssl , zstd @@ -578,6 +579,18 @@ with self; propagatedBuildInputs = [ ppxlib ]; }; + ppx_python = janePackage { + pname = "ppx_python"; + hash = "0gk4nqz4i9v3hwjg5mvgpgwj0dfcgpyc7ikba93cafyhn6fy83zk"; + meta.description = "A [@@deriving] plugin to generate Python conversion functions "; + # Compatibility with ppxlib 0.23 + patches = fetchpatch { + url = "https://github.com/janestreet/ppx_python/commit/b2fe0040cc39fa6164de868f8a20edb38d81170e.patch"; + sha256 = "sha256:1mrdwp0zw3dqavzx3ffrmzq5cdlninyf67ksavfzxb8gb16w6zpz"; + }; + propagatedBuildInputs = [ ppx_base ppxlib pyml ]; + }; + ppx_sexp_conv = janePackage { pname = "ppx_sexp_conv"; version = "0.14.3"; @@ -647,6 +660,13 @@ with self; propagatedBuildInputs = [ core_kernel ]; }; + pythonlib = janePackage { + pname = "pythonlib"; + hash = "0qr0mh9jiv1ham5zlz9i4im23a1vh6x1yp6dp2db2s4icmfph639"; + meta.description = "A library to help writing wrappers around ocaml code for python"; + propagatedBuildInputs = [ ppx_expect ppx_let ppx_python stdio typerep ]; + }; + re2 = janePackage { pname = "re2"; hash = "1j7dizls6lkz3i9dgf8nq2fm382mfbrmz72ci066zl3hkgdq8xwc"; diff --git a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix index 15f391342bdb..c2c51632b9f8 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix @@ -3,7 +3,7 @@ ppx_jane, sexplib, typerep, variantslib}: buildOcamlJane { - name = "async_rpc_kernel"; + pname = "async_rpc_kernel"; hash = "0pvys7giqix1nfidw1f4i3r94cf03ba1mvhadpm2zpdir3av91sw"; propagatedBuildInputs = [ async_kernel bin_prot core_kernel fieldslib ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane diff --git a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix index 5f3c2ab83ff4..d90d91cc229e 100644 --- a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix +++ b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix @@ -1,7 +1,7 @@ {lib, buildOcamlJane, type_conv}: buildOcamlJane { - name = "bin_prot"; + pname = "bin_prot"; version = "113.33.03"; minimumSupportedOcamlVersion = "4.02"; hash = "0jlarpfby755j0kikz6vnl1l6q0ga09b9zrlw6i84r22zchnqdsh"; diff --git a/pkgs/development/ocaml-modules/janestreet/core_bench.nix b/pkgs/development/ocaml-modules/janestreet/core_bench.nix index 52a9350eeeac..8c318f03b05b 100644 --- a/pkgs/development/ocaml-modules/janestreet/core_bench.nix +++ b/pkgs/development/ocaml-modules/janestreet/core_bench.nix @@ -6,7 +6,7 @@ }: buildOcamlJane { - name = "core_bench"; + pname = "core_bench"; hash = "1d1ainpakgsf5rg8dvar12ksgilqcc4465jr8gf7fz5mmn0mlifj"; propagatedBuildInputs = [ core core_extended textutils ]; diff --git a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix index 6ed34f2a28c6..15dee416b643 100644 --- a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix +++ b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix @@ -1,7 +1,7 @@ { lib, type_conv, buildOcamlJane }: buildOcamlJane { - name = "fieldslib"; + pname = "fieldslib"; version = "113.33.03"; minimumSupportedOcamlVersion = "4.02"; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix b/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix index 8f4eb7e41510..24ca4bfa9fa0 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix @@ -2,7 +2,7 @@ ppx_compare, ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools, ppx_type_conv, sexplib}: buildOcamlJane { - name = "ppx_assert"; + pname = "ppx_assert"; hash = "0n7fa1j79ykbkhp8xz0ksg5096asri5d0msshsaqhw5fz18chvz4"; propagatedBuildInputs = [ ppx_compare ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix b/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix index 2aa1b208d503..d20be4fe1557 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix @@ -2,7 +2,7 @@ ppx_core, ppx_driver, ppx_inline_test, ppx_tools}: buildOcamlJane { - name = "ppx_bench"; + pname = "ppx_bench"; minimumSupportedOcamlVersion = "4.02"; hash = "1l5jlwy1d1fqz70wa2fkf7izngp6nx3g4s9bmnd6ca4dx1x5bksk"; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix b/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix index 2dc64497ca23..6405b6928237 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix @@ -2,7 +2,7 @@ ppx_core, ppx_tools, ppx_type_conv, bin_prot}: buildOcamlJane { - name = "ppx_bin_prot"; + pname = "ppx_bin_prot"; hash = "0kwmrrrybdkmphqczsr3lg3imsxcjb8iy41syvn44s3kcjfyyzbz"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv bin_prot ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix b/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix index 103f17c455ea..a0c7c548baad 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix @@ -2,7 +2,7 @@ ppx_core, ppx_driver, ppx_tools, ppx_type_conv}: buildOcamlJane { - name = "ppx_compare"; + pname = "ppx_compare"; hash = "05cnwxfxm8201lpfmcqkcqfy6plh5c2151jbj4qsnxhlvvjli459"; propagatedBuildInputs = [ppx_core ppx_driver ppx_tools ppx_type_conv ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix b/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix index 785cdbc31c07..e95d46e7281b 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix @@ -2,7 +2,7 @@ ppx_core, ppx_driver, ppx_sexp_conv, ppx_tools}: buildOcamlJane { - name = "ppx_custom_printf"; + pname = "ppx_custom_printf"; hash = "06y85m6ky376byja4w7gdwd339di5ag0xrf0czkylzjsnylhdr85"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_sexp_conv ppx_tools ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix b/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix index edb73814704f..8591117abb67 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix @@ -2,7 +2,7 @@ ppx_core, ppx_tools, ppx_type_conv}: buildOcamlJane { - name = "ppx_enumerate"; + pname = "ppx_enumerate"; hash = "0m11921q2pjzkwckf21fynd2qfy83n9jjsgks23yagdai8a7ym16"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix b/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix index 7506e09e30e0..87675f75e50b 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix @@ -4,7 +4,7 @@ ppx_variants_conv, re, sexplib, variantslib, fieldslib}: buildOcamlJane { - name = "ppx_expect"; + pname = "ppx_expect"; hash = "0cwagb4cj3x1vsr19kyfa9pxlvaz9a5v863cahi5glinsh4mzgdx"; propagatedBuildInputs = [ ppx_assert ppx_compare ppx_core ppx_custom_printf ppx_driver diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix index 857e85f8f03a..756db313c266 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix @@ -2,7 +2,7 @@ ppx_core, ppx_tools, ppx_type_conv}: buildOcamlJane { - name = "ppx_fields_conv"; + pname = "ppx_fields_conv"; hash = "11w9wfjgkv7yxv3rwlwi6m193zan6rhmi45q7n3ddi2s8ls3gra7"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-here.nix b/pkgs/development/ocaml-modules/janestreet/ppx-here.nix index d9c7de65347e..f55b6725c23d 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-here.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-here.nix @@ -2,7 +2,7 @@ ppx_core, ppx_driver}: buildOcamlJane { - name = "ppx_here"; + pname = "ppx_here"; hash = "1mzdgn8k171zkwmbizf1a48l525ny0w3363c7gknpnifcinxniiw"; propagatedBuildInputs = [ ppx_core ppx_driver ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix b/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix index 0b9bb9838947..c09538d6f1df 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix @@ -2,7 +2,7 @@ ppx_core, ppx_driver, ppx_tools}: buildOcamlJane { - name = "ppx_inline_test"; + pname = "ppx_inline_test"; hash = "0ygapa54i0wwcj3jcqwiimrc6z0b7aafgjhbk37h6vvclnm5n7f6"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix b/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix index e6c51bebd52c..0dc36f890bc3 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix @@ -6,7 +6,7 @@ ppx_sexp_value, ppx_typerep_conv, ppx_variants_conv}: buildOcamlJane { - name = "ppx_jane"; + pname = "ppx_jane"; hash = "1la0rp8fhzfglwb15gqh1pl1ld8ls4cnidaw9mjc5q1hb0yj1qd9"; propagatedBuildInputs = [ ppx_assert ppx_bench ppx_bin_prot ppx_compare ppx_custom_printf diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-let.nix b/pkgs/development/ocaml-modules/janestreet/ppx-let.nix index 49333fb0e865..c43685065700 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-let.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-let.nix @@ -2,7 +2,7 @@ ppx_core, ppx_driver}: buildOcamlJane { - name = "ppx_let"; + pname = "ppx_let"; hash = "0whnfq4rgkq4apfqnvc100wlk25pmqdyvy6s21dsn3fcm9hff467"; propagatedBuildInputs = [ ppx_core ppx_driver ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix b/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix index 1ee00ecfa70f..e25ad6c28673 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix @@ -2,7 +2,7 @@ ppx_core, ppx_tools}: buildOcamlJane { - name = "ppx_optcomp"; + pname = "ppx_optcomp"; hash = "09m2x2a5ics4bz1j29n5slhh1rlyhcwdfmf44v1jfxcby3f0riwd"; propagatedBuildInputs = [ ppx_core ppx_tools ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix b/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix index 9afc27e8a5dd..32262223205c 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix @@ -2,7 +2,7 @@ ppx_core, ppx_driver, ppx_tools}: buildOcamlJane { - name = "ppx_pipebang"; + pname = "ppx_pipebang"; hash = "0k25bhj9ziiw89xvs4svz7cgazbbmprba9wbic2llffg55fp7acc"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix index 537a5941a9fd..a56bbc7b3e4f 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix @@ -2,7 +2,7 @@ ppx_core, ppx_tools, ppx_type_conv, sexplib}: buildOcamlJane { - name = "ppx_sexp_conv"; + pname = "ppx_sexp_conv"; hash = "1kgbmlc11w5jhbhmy5n0f734l44zwyry48342dm5qydi9sfzcgq2"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix index 714c3356ea0c..2ea63cc3edc5 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix @@ -2,7 +2,7 @@ ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}: buildOcamlJane { - name = "ppx_sexp_message"; + pname = "ppx_sexp_message"; hash = "0inbff25qii868p141jb1y8n3vjfyz66jpnsl9nma6nkkyjkp05j"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix index 5bfbd185cee9..eaaf04ffe6c1 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix @@ -2,7 +2,7 @@ ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}: buildOcamlJane { - name = "ppx_sexp_value"; + pname = "ppx_sexp_value"; hash = "04602ppqfwx33ghjywam00hlqqzsz4d99r60k9q0v1mynk9pjhj0"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix index 842e90276b73..b6b7fc85c96b 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix @@ -2,7 +2,7 @@ ppx_core, ppx_tools, ppx_type_conv, typerep}: buildOcamlJane { - name = "ppx_typerep_conv"; + pname = "ppx_typerep_conv"; hash = "0dldlx73r07j6w0i7h4hxly0v678naa79na5rafsk2974gs5ih9g"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv typerep ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix index a2c8de8a8deb..5c53eb92f294 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix @@ -2,7 +2,7 @@ ppx_core, ppx_tools, ppx_type_conv, sexplib, variantslib}: buildOcamlJane { - name = "ppx_variants_conv"; + pname = "ppx_variants_conv"; hash = "0kgal8b9yh7wrd75hllb9fyl6zbksfnr9k7pykpzdm3js98dirhn"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib variantslib ]; diff --git a/pkgs/development/ocaml-modules/janestreet/sexplib.nix b/pkgs/development/ocaml-modules/janestreet/sexplib.nix index b0b2ce3a451e..e24d9565c813 100644 --- a/pkgs/development/ocaml-modules/janestreet/sexplib.nix +++ b/pkgs/development/ocaml-modules/janestreet/sexplib.nix @@ -2,7 +2,7 @@ buildOcamlJane { minimumSupportedOcamlVersion = "4.02"; - name = "sexplib"; + pname = "sexplib"; version = "113.33.03"; hash = "1klar4qw4s7bj47ig7kxz2m4j1q3c60pfppis4vxrxv15r0kfh22"; diff --git a/pkgs/development/ocaml-modules/janestreet/typerep.nix b/pkgs/development/ocaml-modules/janestreet/typerep.nix index 41e845b362ea..692c2d2286fb 100644 --- a/pkgs/development/ocaml-modules/janestreet/typerep.nix +++ b/pkgs/development/ocaml-modules/janestreet/typerep.nix @@ -1,7 +1,7 @@ {lib, buildOcamlJane, type_conv}: buildOcamlJane { - name = "typerep"; + pname = "typerep"; version = "113.33.03"; minimumSupportedOcamlVersion = "4.00"; diff --git a/pkgs/development/ocaml-modules/janestreet/variantslib.nix b/pkgs/development/ocaml-modules/janestreet/variantslib.nix index 053ab412f88d..dfb330f49d58 100644 --- a/pkgs/development/ocaml-modules/janestreet/variantslib.nix +++ b/pkgs/development/ocaml-modules/janestreet/variantslib.nix @@ -1,7 +1,7 @@ {lib, buildOcamlJane, type_conv}: buildOcamlJane { - name = "variantslib"; + pname = "variantslib"; version = "113.33.03"; minimumSupportedOcamlVersion = "4.00"; diff --git a/pkgs/development/ocaml-modules/sodium/default.nix b/pkgs/development/ocaml-modules/sodium/default.nix index dc090e91743f..cff3d6186d1a 100644 --- a/pkgs/development/ocaml-modules/sodium/default.nix +++ b/pkgs/development/ocaml-modules/sodium/default.nix @@ -1,9 +1,5 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, ctypes, libsodium }: -if lib.versionAtLeast ocaml.version "4.10" -then throw "sodium is not available for OCaml ${ocaml.version}" -else - stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-sodium"; version = "0.6.0"; diff --git a/pkgs/development/python-modules/aiolookin/default.nix b/pkgs/development/python-modules/aiolookin/default.nix index a81c817e4e07..0af203d8fb7b 100644 --- a/pkgs/development/python-modules/aiolookin/default.nix +++ b/pkgs/development/python-modules/aiolookin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiolookin"; - version = "0.0.3"; + version = "0.0.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ANMalko"; repo = pname; rev = "v${version}"; - sha256 = "15mdvrzvqpdvg9zkczzgzzc5v2ri3v5f17000mhxill1nhirxhqx"; + sha256 = "sha256-Kqys76c/9Mw3ETgF0N4rA9mz5DELwTMjAK38PPN8Ahs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiolyric/default.nix b/pkgs/development/python-modules/aiolyric/default.nix index 4c20e38d8cfe..44e532a6149d 100644 --- a/pkgs/development/python-modules/aiolyric/default.nix +++ b/pkgs/development/python-modules/aiolyric/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiolyric"; - version = "1.0.7"; + version = "1.0.8"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "timmo001"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3UyWUsamluJclwrQD+MuUPLhNJoNU4/8w1m92OLWyrg="; + sha256 = "sha256-A4EkqSIQ5p4E4DPLYu9a/lmb1sFhwDqFLhjhZS6Zf5c="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index f028fc33310c..7cdfbb66b26b 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.8.0"; + version = "2.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-VWXLBpShTp1MvJ9zhP58P9ZplVMetPUucq2II+2iG6M="; + sha256 = "0648eba58d72653755f28e26c9bd83147d9652c1f2f5e87fbf5a87d7f8fbf83a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/blocksat-cli/default.nix b/pkgs/development/python-modules/blocksat-cli/default.nix index 624d4f490e3c..1bba2b30be55 100644 --- a/pkgs/development/python-modules/blocksat-cli/default.nix +++ b/pkgs/development/python-modules/blocksat-cli/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "blocksat-cli"; - version = "0.4.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-g/V1//Jo8wnoOHEotF2ElVm+vzTIwZ6EzssJg6WJw6g="; + sha256 = "96ec5e548dcdb71ada75727d76b34006fe5f6818bd89cf982e15616d41889603"; }; propagatedBuildInputs = [ @@ -35,11 +35,15 @@ buildPythonPackage rec { pytestFlagsArray = [ # disable tests which require being connected to the satellite "--ignore=blocksatcli/test_satip.py" + "--ignore=blocksatcli/api/test_listen.py" + "--ignore=blocksatcli/api/test_msg.py" "--ignore=blocksatcli/api/test_net.py" # disable tests which require being online "--ignore=blocksatcli/api/test_order.py" ]; + pythonImportsCheck = [ "blocksatcli" ]; + meta = with lib; { description = "Blockstream Satellite CLI"; homepage = "https://github.com/Blockstream/satellite"; diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 17681f053337..95e24e98d51c 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "4.12.0"; + version = "4.13.0"; src = fetchPypi { inherit pname version; - sha256 = "946abd50fe2843eec586ac3cec285d27dfae0cc5a43a64b505e8a2800b8a74a6"; + sha256 = "de8270c24c4557bcb76d2079bb4cabf380ce467d17c65f10ee5159da7ff8496a"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 6fe2bc2be08d..31cb3fd5ffe4 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.20.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-SO8vy9x2jwK5AOHety7RuxRK+OEIHpMXqetW3bqfzZI="; + sha256 = "0sbhg8gdcszi4q5091s1by0hz6qxpkdfazs5lbfrlw33fkck2d3i"; }; sourceRoot = "source/${pname}"; diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix index d247cecdfa63..ecbd8d02120d 100644 --- a/pkgs/development/python-modules/clustershell/default.nix +++ b/pkgs/development/python-modules/clustershell/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "ClusterShell"; - version = "1.8.3"; + version = "1.8.4"; src = fetchPypi { inherit pname version; - sha256 = "0ebc1925c1aed94f99d74cbc0230215127ade80a25240133204094faa74bc41b"; + sha256 = "ff6fba688a06e5e577315d899f0dab3f4fe479cef99d444a4e651af577b7d081"; }; propagatedBuildInputs = [ pyyaml ]; diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index 022ab5a0b29c..16059fe3d6b5 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cogapp"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "c43e374ee5ca2a35fbc68556f598bd8578eabe8a890487980bba56945b5ce9c6"; + sha256 = "09a6e82a55af45f5e946d7002ed997869abf6f57d28fdc79f128132b5da18bf8"; }; # there are no tests diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix index d8a800f70ce0..690a54813f41 100644 --- a/pkgs/development/python-modules/colorlog/default.nix +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "colorlog"; - version = "6.5.0"; + version = "6.6.0"; src = fetchPypi { inherit pname version; - sha256 = "cf62a8e389d5660d0d22be17937b25b9abef9497ddc940197d1773aa1f604339"; + sha256 = "sha256-NE9zIEAJ5Mg8W2vrALPEXccPza48gNuRngpBcdAG/eg="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index c3b06b7d9caa..6336fc0bdc01 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "cupy"; - version = "9.5.0"; + version = "9.6.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "2e85c3ac476c80c78ce94cae8786cc82a615fc4d1b0d380f16b9665d2cc5d187"; + sha256 = "22469ea1ad51ffbb4af2b139ed0820ac5d0b78f1265b2a095ed5e5d5299aab91"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/django/2.nix b/pkgs/development/python-modules/django/2.nix index 67946ab0d725..c1e5139d3015 100644 --- a/pkgs/development/python-modules/django/2.nix +++ b/pkgs/development/python-modules/django/2.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "A high-level Python Web framework"; homepage = "https://www.djangoproject.com/"; license = licenses.bsd3; - maintainers = with maintainers; [ georgewhewell lsix ]; + maintainers = with maintainers; [ georgewhewell ]; }; } diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index cfe9f451ef65..9b8aa8cba8f4 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "A high-level Python Web framework"; homepage = "https://www.djangoproject.com/"; license = licenses.bsd3; - maintainers = with maintainers; [ georgewhewell lsix ]; + maintainers = with maintainers; [ georgewhewell ]; }; } diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 5b9301172b6d..7fc0cb3b12ba 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "dropbox"; - version = "11.22.0"; + version = "11.23.0"; src = fetchFromGitHub { owner = "dropbox"; repo = "dropbox-sdk-python"; rev = "v${version}"; - sha256 = "0fhzpss3zs5x3hr4amrmw8hras75qc385ikpw0sx5a907kigk7w5"; + sha256 = "1zrwr73dirmkbkcpy8v49hb52xffh0k9wp2603aysg9435w1rxvx"; }; postPatch = '' diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 0548cb6e3cb0..ae5d14aa4883 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -12,11 +12,11 @@ buildPythonPackage (rec { # there's a clear path forward. See # https://github.com/elastic/elasticsearch-py/issues/1639 for more # info. - version = "7.15.1"; + version = "7.15.2"; src = fetchPypi { inherit pname version; - sha256 = "1e9a6302945d98046899a7c9b3d345c881ac7b05ba176d3a49c9d2702b1e8bc8"; + sha256 = "436f871848a5020bf9b47495812b229b59bd0c5d7e40adbd5e3c89896b311704"; }; # Check is disabled because running them destroy the content of the local cluster! diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 25ad1128d66b..58f23fba931c 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux_led"; - version = "0.24.21"; + version = "0.24.24"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "sha256-d55FrCnEh6uS/2yL0HcaeqGjTzWmrwg6h5jKReyzJAw="; + sha256 = "sha256-99EHmhyc6lAjYPHFvvqnd5r8HeEEJM6W3VK0/yLsz7I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix index 7ec27a12db2d..fc268ba05a88 100644 --- a/pkgs/development/python-modules/frigidaire/default.nix +++ b/pkgs/development/python-modules/frigidaire/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "frigidaire"; - version = "0.16"; + version = "0.17"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bm1549"; repo = pname; rev = version; - sha256 = "1yzwzvlxz28rhnwhwsn37v7l7fxikzr4j7m293db9452w340p0zl"; + sha256 = "sha256-R3OjZyQMUDu8+QPe9y2j1SoWi1b7z/OYWY4wFXGG3zA="; }; propagatedBuildInputs = [ @@ -34,7 +34,9 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "frigidaire" ]; + pythonImportsCheck = [ + "frigidaire" + ]; meta = with lib; { description = "Python API for the Frigidaire devices"; diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix index d5cf044e4949..2fd95e676c96 100644 --- a/pkgs/development/python-modules/greeclimate/default.nix +++ b/pkgs/development/python-modules/greeclimate/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "greeclimate"; - version = "0.12.4"; + version = "0.12.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cmroche"; repo = "greeclimate"; rev = version; - sha256 = "sha256-8mrQTRR1erqo0oi9ltuiQX947qdvJLyF/nj80LvovV8="; + sha256 = "sha256-Lu6DxYrK3WgRC09QQXZLIgYSIaWydcEofNiA1PKP8Ek="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index 2b9165dee24e..cf54198b18b3 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "hidapi"; - version = "0.10.1"; + version = "0.11.0.post2"; src = fetchPypi { inherit pname version; - sha256 = "a1170b18050bc57fae3840a51084e8252fd319c0fc6043d68c8501deb0e25846"; + sha256 = "da815e0d1d4b2ef1ebbcc85034572105dca29627eb61881337aa39010f2ef8cb"; }; nativeBuildInputs = lib.optionals stdenv.isDarwin [ xcbuild ]; diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 741fd996ffdc..8c3c3670c424 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.12.0"; + version = "3.13.0"; src = fetchPypi { inherit pname version; - sha256 = "ff3e8675a982f7754359ec598329ba5635014e2bfd51573b9413605849ef314a"; + sha256 = "b27aec03e8c666b3e36c68b2331871f37a0c6c0467fe0f73462fda7300d3c19f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix index a8ce23d371f8..2f7921374e75 100644 --- a/pkgs/development/python-modules/johnnycanencrypt/default.nix +++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -13,6 +13,7 @@ , pytestCheckHook , pythonOlder , PCSC +, libiconv }: buildPythonPackage rec { @@ -55,7 +56,10 @@ buildPythonPackage rec { buildInputs = [ pcsclite nettle - ] ++ lib.optionals stdenv.isDarwin [ PCSC ]; + ] ++ lib.optionals stdenv.isDarwin [ + PCSC + libiconv + ]; # Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage) doCheck = false; @@ -70,6 +74,8 @@ buildPythonPackage rec { # for compatibility with maturin 0.9.0. postPatch = '' sed '/project-url = /d' -i Cargo.toml + substituteInPlace pyproject.toml \ + --replace 'manylinux = "off"' 'skip-auditwheel = true' ''; preCheck = '' diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 3ba2291da792..53b83fe95755 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "kombu"; - version = "5.1.0"; + version = "5.2.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "01481d99f4606f6939cdc9b637264ed353ee9e3e4f62cfb582324142c41a572d"; + sha256 = "f262a2adc71b53e5b7dad4933bbdee65d8766ca4df6a9043b13edaad2144aaec"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index 78afad13dd20..eacc05ffd144 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "3.3.1"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "d7450453eaf5904eb4fb4f74cf9f37dc83721a719bce34f5abb336b1a1ab974d"; + sha256 = "17618ccbe3493f2be015db9e1efa35080ff34d470de723f1384d908ff126e51c"; }; checkInputs = [ mock pytest pytest-runner requests-mock ]; diff --git a/pkgs/development/python-modules/manticore/default.nix b/pkgs/development/python-modules/manticore/default.nix index 9e0938fb1486..0c36f2cc6cc6 100644 --- a/pkgs/development/python-modules/manticore/default.nix +++ b/pkgs/development/python-modules/manticore/default.nix @@ -1,38 +1,46 @@ { lib , buildPythonPackage -, fetchFromGitHub , capstone , crytic-compile +, fetchFromGitHub +, intervaltree , ply , prettytable +, protobuf , pyelftools , pyevmasm , pysha3 +, pytestCheckHook +, pythonOlder , pyyaml , rlp , stdenv , unicorn , wasm , yices -, pytestCheckHook , z3 }: buildPythonPackage rec { pname = "manticore"; - version = "0.3.5"; + version = "0.3.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "trailofbits"; repo = "manticore"; rev = version; - sha256 = "0z2nhfcraa5dx6srbrw8s11awh2la0x7d88yw9in8g548nv6qa69"; + sha256 = "sha256-L112YwrBcdcLBeBsPLWt3C57u2WDvGLq50EzW9ojdyg="; }; propagatedBuildInputs = [ crytic-compile + intervaltree ply prettytable + protobuf pyevmasm pysha3 pyyaml @@ -49,22 +57,29 @@ buildPythonPackage rec { sed -ie s/z3-solver// setup.py ''; - checkInputs = [ pytestCheckHook ]; - preCheck = "export PATH=${yices}/bin:${z3}/bin:$PATH"; - pytestFlagsArray = [ - "--ignore=tests/ethereum" # TODO: enable when solc works again - "--ignore=tests/ethereum_bench" - ] ++ lib.optionals (!stdenv.isLinux) [ - "--ignore=tests/native" - "--ignore=tests/other/test_locking.py" - "--ignore=tests/other/test_state_introspection.py" + checkInputs = [ + pytestCheckHook ]; + + preCheck = '' + export PATH=${yices}/bin:${z3}/bin:$PATH + ''; + + disabledTestPaths = [ + "tests/ethereum" # Enable when solc works again + "tests/ethereum_bench" + ] ++ lib.optionals (!stdenv.isLinux) [ + "tests/native" + "tests/other/test_locking.py" + "tests/other/test_state_introspection.py" + ]; + disabledTests = [ - # failing tests + # Failing tests "test_chmod" "test_timeout" "test_wasm_main" - # slow tests + # Slow tests "testmprotectFailSymbReading" "test_ConstraintsForking" "test_resume" @@ -97,6 +112,13 @@ buildPythonPackage rec { "test_implicit_call" "test_trace" "test_plugin" + # Tests are failing with latest unicorn + "Aarch64UnicornInstructions" + "test_integration_resume" + ]; + + pythonImportsCheck = [ + "manticore" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index 8e17eacbf7b5..c9d8833e8ec9 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mne-python"; - version = "0.23.4"; + version = "0.24.0"; disabled = isPy27; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "mne-tools"; repo = pname; rev = "v${version}"; - sha256 = "1kik52ssa6difkqz8xnvrcbpp4p7792hj1rcgyypb4q7sc048aqy"; + sha256 = "1982y54n7q9pl28haca0vx6cjrk2a8cj24piaj8j31f09rynn8k0"; }; propagatedBuildInputs = [ numpy scipy ]; diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/pkgs/development/python-modules/multiprocess/default.nix index df304efb9199..491aa131bb59 100644 --- a/pkgs/development/python-modules/multiprocess/default.nix +++ b/pkgs/development/python-modules/multiprocess/default.nix @@ -1,22 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi, dill }: +{ lib +, buildPythonPackage +, dill +, fetchFromGitHub +}: buildPythonPackage rec { pname = "multiprocess"; - version = "0.70.9"; + version = "0.70.12.2"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "9fd5bd990132da77e73dec6e9613408602a4612e1d73caf2e2b813d2b61508e5"; + src = fetchFromGitHub { + owner = "uqfoundation"; + repo = pname; + rev = "multiprocess-${version}"; + sha256 = "1npikdgj0qriqj384vg22qgq2xqylypk67sx1qfmdzvk6c4iyg0w"; }; - propagatedBuildInputs = [ dill ]; + propagatedBuildInputs = [ + dill + ]; # Python-version dependent tests doCheck = false; + pythonImportsCheck = [ + "multiprocess" + ]; + meta = with lib; { - description = "Better multiprocessing and multithreading in python"; + description = "Multiprocessing and multithreading in Python"; homepage = "https://github.com/uqfoundation/multiprocess"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/multitasking/default.nix b/pkgs/development/python-modules/multitasking/default.nix index 8ea4d633f662..2784a0d2e2ee 100644 --- a/pkgs/development/python-modules/multitasking/default.nix +++ b/pkgs/development/python-modules/multitasking/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "multitasking"; - version = "0.0.9"; + version = "0.0.10"; # GitHub source releases aren't tagged src = fetchPypi { inherit pname version; - sha256 = "b59d99f709d2e17d60ccaa2be09771b6e9ed9391c63f083c0701e724f624d2e0"; + sha256 = "810640fa6670be41f4a712b287d9307a14ad849d966f06a17d2cf1593b66c3cd"; }; doCheck = false; # No tests included diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index ad591163f081..ede91e7df913 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-KPgBbYGbKpKEPMxywgRvJcSCEYSUQkiPEFqj+bB0g1s="; + sha256 = "sha256-hKEXTzJMSVBRDiqrN90/fETEhirwSWLdgRULRvlQjbY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/normality/default.nix b/pkgs/development/python-modules/normality/default.nix index ece47afad4e2..a91489f1aded 100644 --- a/pkgs/development/python-modules/normality/default.nix +++ b/pkgs/development/python-modules/normality/default.nix @@ -9,13 +9,13 @@ }: buildPythonPackage rec { pname = "normality"; - version = "2.1.3"; + version = "2.2.5"; src = fetchFromGitHub { owner = "pudo"; repo = "normality"; rev = version; - sha256 = "WvpMs02vBGnCSPkxo6r6g4Di2fKkUr2SsBflTBxlhkU="; + sha256 = "n8Ycm5DeFItmMJTolazZKGIyN7CTg2ajDCwi/UqzVe8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix index c04d0e2df088..a188daf6b428 100644 --- a/pkgs/development/python-modules/ntc-templates/default.nix +++ b/pkgs/development/python-modules/ntc-templates/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 +, pythonOlder , poetry-core , textfsm , pytestCheckHook @@ -11,15 +11,16 @@ buildPythonPackage rec { pname = "ntc-templates"; - version = "2.3.2"; + version = "3.0.0"; format = "pyproject"; - disabled = isPy27; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "networktocode"; repo = pname; rev = "v${version}"; - sha256 = "0sga86ajbh3a8wsb7q5mxzxhlg4fds8pr33ybjgi1sda4bvp2dvp"; + sha256 = "0kijzmmvq2rw7ima19w7lyb2p26a5w52k70fzbkaqqw78qzw8178"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pdfkit/default.nix b/pkgs/development/python-modules/pdfkit/default.nix index 431f7f09796b..73d09c755ac5 100644 --- a/pkgs/development/python-modules/pdfkit/default.nix +++ b/pkgs/development/python-modules/pdfkit/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pdfkit"; - version = "0.6.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1lcc1njpjd2zadbljqsnkrvamschl6j099p4giz1jd6mg1ds67gg"; + sha256 = "992f821e1e18fc8a0e701ecae24b51a2d598296a180caee0a24c0af181da02a9"; }; # tests are not distributed diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index d0ea1b198490..6241a7d86e46 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -27,12 +27,12 @@ let debuggerName = lib.strings.getName debugger; in buildPythonPackage rec { - version = "4.6.0"; + version = "4.7.0"; pname = "pwntools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FWnmE+XgbtRztgo/xxN2xK1bz1YhbqdywlrQIANHAww="; + sha256 = "sha256-dDiOKGdeehkp92PfWhzsaj1YlkEEm2z0drscVuxQqI4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix index c8cc7c964243..9e3b711718c3 100644 --- a/pkgs/development/python-modules/pycm/default.nix +++ b/pkgs/development/python-modules/pycm/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pycm"; - version = "3.2"; + version = "3.3"; disabled = !isPy3k; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "sepandhaghighi"; repo = pname; rev = "v${version}"; - sha256 = "1p2scgb4aghjlxak4zvm3s9ydkpg42mdxy6vjxlnqw0wpnsskfni"; + sha256 = "0i3qpb20mnc22qny1ar3yvxb1dac7njwi8bvi5sy5kywz10c5dkw"; }; # remove a trivial dependency on the author's `art` Python ASCII art library diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 45a24851150e..3281a7ceb873 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -3,27 +3,28 @@ , fetchPypi , pytestCheckHook , six -, icu68 +, icu }: buildPythonPackage rec { pname = "PyICU"; - version = "2.7.4"; + version = "2.8"; src = fetchPypi { inherit pname version; - sha256 = "c0655302e2aea16f9acefe04152f74e5d7d70542e9e15c89ee8d763c8e097f56"; + sha256 = "3d80de47045a8163db5aebc947c42b4d429eeea4f0c32af4f40b33981fa872b9"; }; - nativeBuildInputs = [ icu68 ]; # for icu-config, but should be replaced with pkg-config - buildInputs = [ icu68 ]; + nativeBuildInputs = [ icu ]; # for icu-config, but should be replaced with pkg-config + buildInputs = [ icu ]; checkInputs = [ pytestCheckHook six ]; - meta = with lib; { - homepage = "https://github.com/ovalhub/pyicu/"; - description = "Python extension wrapping the ICU C++ API"; - license = licenses.mit; - platforms = platforms.unix; - }; + pythonImportsCheck = [ "icu" ]; + meta = with lib; { + homepage = "https://gitlab.pyicu.org/main/pyicu"; + description = "Python extension wrapping the ICU C++ API"; + changelog = "https://gitlab.pyicu.org/main/pyicu/-/raw/v${version}/CHANGES"; + license = licenses.mit; + }; } diff --git a/pkgs/development/python-modules/pyp/default.nix b/pkgs/development/python-modules/pyp/default.nix index 4ef79bc90716..1eeeb83a9dce 100644 --- a/pkgs/development/python-modules/pyp/default.nix +++ b/pkgs/development/python-modules/pyp/default.nix @@ -11,13 +11,16 @@ buildPythonPackage rec { pname = "pyp"; - version = "0.3.4"; + version = "1.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "hauntsaninja"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K9dGmvy4siurmhqwNfg1dT0TWc6tCSaxfPyaJkYM2Vw="; + sha256 = "09k7y77h7g4dg0x6lg9pn2ga9z7xiy4vlj15fj0991ffsi4ydqgm"; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ @@ -27,6 +30,7 @@ buildPythonPackage rec { preCheck = '' export PATH=$out/bin:$PATH ''; + checkInputs = [ pytestCheckHook coreutils @@ -34,8 +38,12 @@ buildPythonPackage rec { bc ]; + pythonImportsCheck = [ + "pyp" + ]; + meta = with lib; { - description = "Easily run Python at the shell! Magical, but never mysterious."; + description = "Easily run Python at the shell! Magical, but never mysterious"; homepage = "https://github.com/hauntsaninja/pyp"; license = licenses.mit; maintainers = with maintainers; [ rmcgibbo ]; diff --git a/pkgs/development/python-modules/pypresence/default.nix b/pkgs/development/python-modules/pypresence/default.nix index 0fa188c0771a..c21692f7f2a9 100644 --- a/pkgs/development/python-modules/pypresence/default.nix +++ b/pkgs/development/python-modules/pypresence/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pypresence"; - version = "4.2.0"; + version = "4.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1c8r7yxih5zp46qb9anq5s91pw2wr7d9d0nzcfh4l42x10c8lqal"; + sha256 = "691daf98c8189fd216d988ebfc67779e0f664211512d9843f37ab0d51d4de066"; }; doCheck = false; # tests require internet connection diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index cd41899c5810..635f9cd13daf 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.4.1"; + version = "5.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "v${version}"; - sha256 = "sha256-qmC7AL2ZNB0D5p3c8ozacNMKc2COzYzPJfz6KXwWsd0="; + sha256 = "sha256-K5rs3UEGN1BvWDDfJE9/dPDLsZ4EGSsEf6PXodvc2Bg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index 1ca78b51e983..9b3668b59783 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -12,7 +12,8 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.20.0"; + version = "0.21.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = version; - sha256 = "sha256-q7DNRCJrt4B/u7QV4MocxmlfEdLmJMP7umv3+PJjIoE="; + sha256 = "sha256-lUe79VHlK/2/1SZfC+Ha+27NUoIKoTlqn75XA/mPCNU="; }; propagatedBuildInputs = [ @@ -35,12 +36,16 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "test/test.py" ]; + pytestFlagsArray = [ + "test/test.py" + ]; # tests access network doCheck = false; - pythonImportsCheck = [ "tibber" ]; + pythonImportsCheck = [ + "tibber" + ]; meta = with lib; { description = "Python library to communicate with Tibber"; diff --git a/pkgs/development/python-modules/pytorch/bin.nix b/pkgs/development/python-modules/pytorch/bin.nix index e9bc58321df5..f570a0a5c95a 100644 --- a/pkgs/development/python-modules/pytorch/bin.nix +++ b/pkgs/development/python-modules/pytorch/bin.nix @@ -18,7 +18,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "1.9.1"; + version = "1.10.0"; in buildPythonPackage { inherit version; @@ -59,13 +59,19 @@ in buildPythonPackage { done ''; + # The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`. + dontStrip = true; + pythonImportsCheck = [ "torch" ]; meta = with lib; { description = "Open source, prototype-to-production deep learning platform"; homepage = "https://pytorch.org/"; changelog = "https://github.com/pytorch/pytorch/releases/tag/v${version}"; - license = licenses.unfree; # Includes CUDA and Intel MKL. + # Includes CUDA and Intel MKL, but redistributions of the binary are not limited. + # https://docs.nvidia.com/cuda/eula/index.html + # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html + license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ junjihashimoto ]; }; diff --git a/pkgs/development/python-modules/pytorch/binary-hashes.nix b/pkgs/development/python-modules/pytorch/binary-hashes.nix index 0fbf9ae91287..dd3e5dc1ae3e 100644 --- a/pkgs/development/python-modules/pytorch/binary-hashes.nix +++ b/pkgs/development/python-modules/pytorch/binary-hashes.nix @@ -6,21 +6,21 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "1.9.1" = { + "1.10.0" = { x86_64-linux-37 = { - name = "torch-1.9.1-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torch-1.9.1%2Bcu111-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-qzXbbpLX+ZlRv41oAyQRk3guU0n/6vuNzWw+nOieL6s="; + name = "torch-1.10.0-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torch-1.10.0%2Bcu113-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-KpDbklee2HXSqgrWr1U1nj8EJqUjBWp7SbACw8xtKtg="; }; x86_64-linux-38 = { - name = "torch-1.9.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torch-1.9.1%2Bcu111-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-JUbcqugax08/iN1LKfXq0ohSpejmbKhbT0by7qMGAzw="; + name = "torch-1.10.0-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torch-1.10.0%2Bcu113-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-zM3cMriUG9A+3in/ChzOLytRETpe4ju4uXkxasIRQYM="; }; x86_64-linux-39 = { - name = "torch-1.9.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torch-1.9.1%2Bcu111-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-wNLLtR9ZxKkVOTzwbAikM5H83pXyH+aPHVFyfrO4c1M="; + name = "torch-1.10.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torch-1.10.0%2Bcu113-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-w8UJDh4b5cgDu7ZSvDoKzNH4hiXEyRfvpycNOg+wJOg="; }; }; } diff --git a/pkgs/development/python-modules/pytorch/prefetch.sh b/pkgs/development/python-modules/pytorch/prefetch.sh index 65007f11bf7b..debf26bfa20a 100755 --- a/pkgs/development/python-modules/pytorch/prefetch.sh +++ b/pkgs/development/python-modules/pytorch/prefetch.sh @@ -1,18 +1,19 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p nix-prefetch-scripts +set -eou pipefail + version=$1 -bucket="https://download.pytorch.org/whl/cu111" +bucket="https://download.pytorch.org/whl/cu113" url_and_key_list=( -"x86_64-linux-37 $bucket/torch-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl torch-${version}-cp37-cp37m-linux_x86_64.whl" -"x86_64-linux-38 $bucket/torch-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl" -"x86_64-linux-39 $bucket/torch-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-37 $bucket/torch-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torch-${version}-cp37-cp37m-linux_x86_64.whl" + "x86_64-linux-38 $bucket/torch-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl" + "x86_64-linux-39 $bucket/torch-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl" ) -hashfile=binary-hashes-"$version".nix -rm -f $hashfile +hashfile="binary-hashes-$version.nix" echo " \"$version\" = {" >> $hashfile for url_and_key in "${url_and_key_list[@]}"; do diff --git a/pkgs/development/python-modules/qiling/default.nix b/pkgs/development/python-modules/qiling/default.nix index 61787548f846..3576f5b73660 100644 --- a/pkgs/development/python-modules/qiling/default.nix +++ b/pkgs/development/python-modules/qiling/default.nix @@ -1,33 +1,43 @@ { lib , buildPythonPackage -, fetchPypi , capstone -, unicorn -, pefile -, python-registry -, keystone-engine -, pyelftools +, fetchFromGitHub +, fetchPypi , gevent +, keystone-engine +, multiprocess +, pefile +, pyelftools +, python-registry +, unicorn }: + buildPythonPackage rec { pname = "qiling"; - version = "1.3.0"; + version = "1.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "084ad706f6803d7de2391eab928ecf4cb3e8d892fd2988666d4791a422d6ab9a"; + sha256 = "sha256-xUoNHMyGN0G2itVcKLsk+7QKxZdguzyh6OZCqCHNB4Y="; }; propagatedBuildInputs = [ capstone - unicorn - pefile - python-registry - keystone-engine - pyelftools gevent + keystone-engine + multiprocess + pefile + pyelftools + python-registry + unicorn ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "pefile==2021.5.24" "pefile>=2021.5.24" + ''; + # Tests are broken (attempt to import a file that tells you not to import it, # amongst other things) doCheck = false; diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index f422934f02fb..570654dc7e15 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rebulk"; - version = "3.0.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "025d191c11abf9174c6aff0006579624047d3371a654333c4bf7a4b421552cdc"; + sha256 = "809de3a97c68afa831f7101b10d316fe62e061dc9f7f67a44b7738128721173a"; }; # Some kind of trickery with imports that doesn't work. diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index 2be02376360f..173458a634b6 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "statsmodels"; - version = "0.13.0"; + version = "0.13.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f2efc02011b7240a9e851acd76ab81150a07d35c97021cb0517887539a328f8a"; + sha256 = "006ec8d896d238873af8178d5475203844f2c391194ed8d42ddac37f5ff77a69"; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/threadpoolctl/default.nix b/pkgs/development/python-modules/threadpoolctl/default.nix index 4a13af31216a..2c85c15ebdd3 100644 --- a/pkgs/development/python-modules/threadpoolctl/default.nix +++ b/pkgs/development/python-modules/threadpoolctl/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, isPy27 +, pythonOlder , fetchFromGitHub , flit , pytestCheckHook @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "threadpoolctl"; - version = "2.2.0"; + version = "3.0.0"; - disabled = isPy27; + disabled = pythonOlder "3.6"; format = "flit"; src = fetchFromGitHub { owner = "joblib"; repo = pname; rev = version; - sha256 = "7UUjbX1IpXtUAgN48Db43Zr1u360UETSUnIHD6rQRLs="; + sha256 = "02zccsiq4gvawy7q2fh3m3hvr40hl2ylmwwny6dv0lqsr2iwgnmn"; }; checkInputs = [ pytestCheckHook numpy scipy ]; diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix new file mode 100644 index 000000000000..1f6ae80b0329 --- /dev/null +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchurl +, python +, pytorch-bin +, pythonOlder +, pythonAtLeast +}: + +buildPythonPackage rec { + pname = "torchaudio"; + version = "0.10.0"; + format = "wheel"; + + src = + let pyVerNoDot = lib.replaceStrings [ "." ] [ "" ] python.pythonVersion; + unsupported = throw "Unsupported system"; + srcs = (import ./binary-hashes.nix version)."${stdenv.system}-${pyVerNoDot}" or unsupported; + in fetchurl srcs; + + disabled = ! (pythonAtLeast "3.7" && pythonOlder "3.10"); + + propagatedBuildInputs = [ + pytorch-bin + ]; + + # The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`. + dontStrip = true; + + pythonImportsCheck = [ "torchaudio" ]; + + postFixup = '' + # Note: after patchelf'ing, libcudart can still not be found. However, this should + # not be an issue, because PyTorch is loaded before torchvision and brings + # in the necessary symbols. + patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:${pytorch-bin}/${python.sitePackages}/torch/lib:" \ + "$out/${python.sitePackages}/torchaudio/_torchaudio.so" + ''; + + meta = with lib; { + description = "PyTorch audio library"; + homepage = "https://pytorch.org/"; + changelog = "https://github.com/pytorch/audio/releases/tag/v${version}"; + # Includes CUDA and Intel MKL, but redistributions of the binary are not limited. + # https://docs.nvidia.com/cuda/eula/index.html + # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ junjihashimoto ]; + }; +} diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix new file mode 100644 index 000000000000..764b9db426b9 --- /dev/null +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -0,0 +1,26 @@ +# Warning: Need to update at the same time as pytorch-bin +# +# Precompiled wheels can be found at: +# https://download.pytorch.org/whl/torch_stable.html + +# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. + +version : builtins.getAttr version { + "0.10.0" = { + x86_64-linux-37 = { + name = "torchaudio-0.10.0-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchaudio-0.10.0%2Bcu113-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-FspXTTODdkO0nPUJcJm8+vLIvckUa8gRfBPBT9LcKPw="; + }; + x86_64-linux-38 = { + name = "torchaudio-0.10.0-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchaudio-0.10.0%2Bcu113-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-Mf7QdXBSIIWRfT7ACthEwFA1V2ieid8legbMnRQnzqI="; + }; + x86_64-linux-39 = { + name = "torchaudio-0.10.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchaudio-0.10.0%2Bcu113-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-LMSGNdmku1iHRy1jCRTTOYcQlRL+Oc9jjZC1nx++skA="; + }; + }; +} diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh new file mode 100755 index 000000000000..4e62ab4ed359 --- /dev/null +++ b/pkgs/development/python-modules/torchaudio/prefetch.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-prefetch-scripts + +set -eou pipefail + +version=$1 + +bucket="https://download.pytorch.org/whl/cu113" + +url_and_key_list=( + "x86_64-linux-37 $bucket/torchaudio-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torchaudio-${version}-cp37-cp37m-linux_x86_64.whl" + "x86_64-linux-38 $bucket/torchaudio-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl" + "x86_64-linux-39 $bucket/torchaudio-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl" +) + +hashfile=binary-hashes-"$version".nix +echo " \"$version\" = {" >> $hashfile + +for url_and_key in "${url_and_key_list[@]}"; do + key=$(echo "$url_and_key" | cut -d' ' -f1) + url=$(echo "$url_and_key" | cut -d' ' -f2) + name=$(echo "$url_and_key" | cut -d' ' -f3) + + echo "prefetching ${url}..." + hash=$(nix hash to-sri --type sha256 `nix-prefetch-url "$url" --name "$name"`) + + echo " $key = {" >> $hashfile + echo " name = \"$name\";" >> $hashfile + echo " url = \"$url\";" >> $hashfile + echo " hash = \"$hash\";" >> $hashfile + echo " };" >> $hashfile + + echo +done + +echo " };" >> $hashfile +echo "done." diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index a69531f2d062..f7041dbb519d 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -15,7 +15,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.10.1"; + version = "0.11.1"; in buildPythonPackage { inherit version; @@ -36,6 +36,9 @@ in buildPythonPackage { pytorch-bin ]; + # The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`. + dontStrip = true; + pythonImportsCheck = [ "torchvision" ]; postFixup = let @@ -52,6 +55,9 @@ in buildPythonPackage { description = "PyTorch vision library"; homepage = "https://pytorch.org/"; changelog = "https://github.com/pytorch/vision/releases/tag/v${version}"; + # Includes CUDA and Intel MKL, but redistributions of the binary are not limited. + # https://docs.nvidia.com/cuda/eula/index.html + # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ junjihashimoto ]; diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index 239db8bdb864..b608bab24409 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -6,21 +6,21 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "0.10.1" = { + "0.11.1" = { x86_64-linux-37 = { - name = "torchvision-0.10.1-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torchvision-0.10.1%2Bcu111-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-1MdsCrOLGkYpfbtv011/b6QG+yKaE+O0jUKeUVj2BJY="; + name = "torchvision-0.11.1-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchvision-0.11.1%2Bcu113-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-2xKWqWNKqmOMyVJnPfbtF+B9PQ7z4S66J1T3P8EvM0I="; }; x86_64-linux-38 = { - name = "torchvision-0.10.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torchvision-0.10.1%2Bcu111-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-LtmsnNSa9g3tCdjW1jhu7AZlGgfyYIVh5/2R+WwcxSo="; + name = "torchvision-0.11.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchvision-0.11.1%2Bcu113-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-bFxvJaNEomytXXANHng+oU8YSLGkuO/TSzkoDskkaIE="; }; x86_64-linux-39 = { - name = "torchvision-0.10.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torchvision-0.10.1%2Bcu111-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-ZOC/angyiLeOhe+7dAs0W6XlQRKK00T/iI+aBgFNpA0="; + name = "torchvision-0.11.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchvision-0.11.1%2Bcu113-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-ysN3LmSKR+FVKYGnCGQJqa8lVApVT5rPMO+NHmmazAc="; }; }; } diff --git a/pkgs/development/python-modules/torchvision/prefetch.sh b/pkgs/development/python-modules/torchvision/prefetch.sh index f57ac96bdb63..686d1b3e6200 100755 --- a/pkgs/development/python-modules/torchvision/prefetch.sh +++ b/pkgs/development/python-modules/torchvision/prefetch.sh @@ -1,18 +1,19 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p nix-prefetch-scripts +set -eou pipefail + version=$1 -bucket="https://download.pytorch.org/whl/cu111" +bucket="https://download.pytorch.org/whl/cu113" url_and_key_list=( -"x86_64-linux-37 $bucket/torchvision-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl torchvision-${version}-cp37-cp37m-linux_x86_64.whl" -"x86_64-linux-38 $bucket/torchvision-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl" -"x86_64-linux-39 $bucket/torchvision-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-37 $bucket/torchvision-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torchvision-${version}-cp37-cp37m-linux_x86_64.whl" + "x86_64-linux-38 $bucket/torchvision-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl" + "x86_64-linux-39 $bucket/torchvision-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl" ) -hashfile=binary-hashes-"$version".nix -rm -f $hashfile +hashfile="binary-hashes-$version.nix" echo " \"$version\" = {" >> $hashfile for url_and_key in "${url_and_key_list[@]}"; do diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index bc55e3ab8ff7..17008eafc1ba 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , click @@ -42,6 +43,11 @@ buildPythonPackage rec { preCheck = '' export HOME=$(mktemp -d); ''; + disabledTests = lib.optionals stdenv.isDarwin [ + # likely related to https://github.com/sarugaku/shellingham/issues/35 + "test_show_completion" + "test_install_completion" + ]; pythonImportsCheck = [ "typer" ]; diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix index 484f422adf3e..c9043afa85d9 100644 --- a/pkgs/development/python-modules/unicorn/default.nix +++ b/pkgs/development/python-modules/unicorn/default.nix @@ -1,10 +1,17 @@ -{ lib, stdenv, buildPythonPackage, setuptools, unicorn-emu }: +{ lib +, stdenv +, buildPythonPackage +, setuptools +, unicorn-emu +}: buildPythonPackage rec { pname = "unicorn"; version = lib.getVersion unicorn-emu; + format = "setuptools"; src = unicorn-emu.src; + sourceRoot = "source/bindings/python"; prePatch = '' @@ -12,12 +19,21 @@ buildPythonPackage rec { ln -s ${unicorn-emu}/lib/libunicorn.a prebuilt/ ''; - propagatedBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ + setuptools + ]; + + # No tests present + doCheck = false; + + pythonImportsCheck = [ + "unicorn" + ]; meta = with lib; { description = "Python bindings for Unicorn CPU emulator engine"; homepage = "https://www.unicorn-engine.org/"; - license = [ licenses.gpl2 ]; + license = licenses.gpl2Plus; maintainers = with maintainers; [ bennofs ris ]; }; } diff --git a/pkgs/development/python-modules/vehicle/default.nix b/pkgs/development/python-modules/vehicle/default.nix new file mode 100644 index 000000000000..b7b7fbc32738 --- /dev/null +++ b/pkgs/development/python-modules/vehicle/default.nix @@ -0,0 +1,61 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pydantic +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, yarl +}: + +buildPythonPackage rec { + pname = "vehicle"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "frenck"; + repo = "python-vehicle"; + rev = "v${version}"; + sha256 = "0yiavz5sw8fjrh6m3mr8gyds7h6vaja3xy1516ajgz0qvijhqylg"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + pydantic + yarl + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + + pythonImportsCheck = [ + "vehicle" + ]; + + meta = with lib; { + description = "Python client providing RDW vehicle information"; + homepage = "https://github.com/frenck/python-wled"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index f28a5c6a72a6..d7cf63f003d0 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,16 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.18.12"; - disabled = pythonOlder "3.7"; + version = "0.18.13"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "sha256-Wk6+IRIGMaOPOEVEyzalBKyK88Y2yfKKo6T0fKxeOOE="; + sha256 = "sha256-GZ5FRPQn69+/Fnx10VKWSIAaVXCcVyfvQVH1JaMGRC0="; }; propagatedBuildInputs = [ @@ -32,7 +34,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "xknx" ]; + pythonImportsCheck = [ + "xknx" + ]; meta = with lib; { description = "KNX Library Written in Python"; diff --git a/pkgs/development/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix index 391e1656749a..1cb2780cc948 100644 --- a/pkgs/development/python-modules/zfec/default.nix +++ b/pkgs/development/python-modules/zfec/default.nix @@ -24,6 +24,8 @@ buildPythonPackage rec { sed -i -e '/argparse/d' setup.py ''; + pythonImportsCheck = [ "zfec" ]; + meta = with lib; { homepage = "https://github.com/tahoe-lafs/zfec"; description = "Zfec, a fast erasure codec which can be used with the command-line, C, Python, or Haskell"; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 3118946c6bf0..0bf46ed1b13e 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -56,13 +56,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.571"; + version = "2.0.574"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-cmSZHqR1BfVWXoUSJ3Et5TTdeUWklNA4egKLP4xKjw8="; + sha256 = "sha256-DM7fPwJcWEyOu55ThK/jP9jIUbiVCfEtltSP7puCoxQ="; }; nativeBuildInputs = with py.pkgs; [ @@ -70,6 +70,9 @@ buildPythonApplication rec { ]; propagatedBuildInputs = with py.pkgs; [ + aiodns + aiohttp + aiomultiprocess bc-python-hcl2 boto3 cachetools @@ -98,7 +101,11 @@ buildPythonApplication rec { ]; checkInputs = with py.pkgs; [ + aioresponses jsonschema + mock + pytest-asyncio + pytest-mock pytest-xdist pytestCheckHook ]; diff --git a/pkgs/development/tools/continuous-integration/github-runner/deps.nix b/pkgs/development/tools/continuous-integration/github-runner/deps.nix index 803a4019a744..197927674be1 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/deps.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/deps.nix @@ -15,13 +15,13 @@ in }) (fetchNuGet { name = "microsoft.aspnetcore.app.runtime.linux-x64"; - version = "3.1.19"; - sha256 = "19z4zrchaxcz0a33c33n1qd11z9khj4323nfzsbzah0xxkkj8ka8"; + version = "3.1.21"; + sha256 = "056g9nv8a7n8zdbgzmyzmn3pbg52yq2kv5d1rcp7h6plwzgpiwql"; }) (fetchNuGet { name = "microsoft.aspnetcore.app.runtime.linux-arm64"; - version = "3.1.19"; - sha256 = "0xspb0xib1zsqnkkqm4s26z27v9idh9k09zziar1cavh2hxxxfcd"; + version = "3.1.21"; + sha256 = "0147s60lvbzj2agb4wgwvkxacq96mqsgayxkbpjqybnc8ggzqkvr"; }) (fetchNuGet { name = "microsoft.aspnet.webapi.client"; @@ -45,13 +45,13 @@ in }) (fetchNuGet { name = "microsoft.netcore.app.runtime.linux-x64"; - version = "3.1.19"; - sha256 = "10c9bq1z8j173n9jzamgplbxq101yscwdhksshn1ybisn7cr5g0h"; + version = "3.1.21"; + sha256 = "13692wqcww0w6x4nhyxpxwprdg6mx9xmlvv38m6fvp6g0m27r43v"; }) (fetchNuGet { name = "microsoft.netcore.app.runtime.linux-arm64"; - version = "3.1.19"; - sha256 = "0v9nc38bg4k2qk547pl1rlrslwprixqlbhcbbf6pw1ia6261wm5m"; + version = "3.1.21"; + sha256 = "04rp4j2kyzslyfbzldm2ndb6v4g7jq9xi9bmvss34fh25gdgqs3q"; }) (fetchNuGet { name = "microsoft.netcore.platforms"; diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index c781cb815f76..e72ea1138428 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -1,7 +1,24 @@ -{ stdenv, lib, fetchFromGitHub, scons, pkg-config, udev, libX11 -, libXcursor , libXinerama, libXrandr, libXrender, libpulseaudio -, libXi, libXext, libXfixes, freetype, openssl -, alsa-lib, libGLU, zlib, yasm +{ stdenv +, lib +, fetchFromGitHub +, scons +, pkg-config +, udev +, libX11 +, libXcursor +, libXinerama +, libXrandr +, libXrender +, libpulseaudio +, libXi +, libXext +, libXfixes +, freetype +, openssl +, alsa-lib +, libGLU +, zlib +, yasm , withUdev ? true }: @@ -11,34 +28,49 @@ let pulseaudio = false; udev = withUdev; }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "godot"; - version = "3.3.3"; + version = "3.4"; src = fetchFromGitHub { - owner = "godotengine"; - repo = "godot"; - rev = "${version}-stable"; - sha256 = "0bkng0iwsfawxk8bxlq01ib4n6kaxjkbwcif1bhpvw5ra19430rg"; + owner = "godotengine"; + repo = "godot"; + rev = "${version}-stable"; + sha256 = "0y542zla6msgxf31rd0349d9j3ya7f3njnwmmrh8lmzfgxx86qbx"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - scons udev libX11 libXcursor libXinerama libXrandr libXrender - libXi libXext libXfixes freetype openssl alsa-lib libpulseaudio - libGLU zlib yasm + scons + udev + libX11 + libXcursor + libXinerama + libXrandr + libXrender + libXi + libXext + libXfixes + freetype + openssl + alsa-lib + libpulseaudio + libGLU + zlib + yasm ]; - patches = [ - ./pkg_config_additions.patch - ./dont_clobber_environment.patch - ]; + patches = [ ./pkg_config_additions.patch ./dont_clobber_environment.patch ]; enableParallelBuilding = true; sconsFlags = "target=release_debug platform=x11"; preConfigure = '' - sconsFlags+=" ${lib.concatStringsSep " " (lib.mapAttrsToList (k: v: "${k}=${builtins.toJSON v}") options)}" + sconsFlags+=" ${ + lib.concatStringsSep " " + (lib.mapAttrsToList (k: v: "${k}=${builtins.toJSON v}") options) + }" ''; outputs = [ "out" "dev" "man" ]; @@ -62,10 +94,10 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://godotengine.org"; + homepage = "https://godotengine.org"; description = "Free and Open Source 2D and 3D game engine"; - license = licenses.mit; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = licenses.mit; + platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ twey ]; }; } diff --git a/pkgs/development/tools/kafkacat/default.nix b/pkgs/development/tools/kcat/default.nix similarity index 67% rename from pkgs/development/tools/kafkacat/default.nix rename to pkgs/development/tools/kcat/default.nix index 5493bf24428d..d4cc4a37ea1a 100644 --- a/pkgs/development/tools/kafkacat/default.nix +++ b/pkgs/development/tools/kcat/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl, avro-c, libserdes }: +{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl, avro-c, libserdes, which }: stdenv.mkDerivation rec { - pname = "kafkacat"; + pname = "kcat"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "edenhill"; - repo = "kafkacat"; + repo = "kcat"; rev = version; - sha256 = "0z3bw00s269myfd1xqksjyznmgp74xfs09xqlq347adsgby3cmfs"; + sha256 = "sha256-koDhj/RQc9fhfqjrJylhURw6tppPELhLlBGbNVJsii8="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config which ]; buildInputs = [ zlib rdkafka yajl avro-c libserdes ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A generic non-JVM producer and consumer for Apache Kafka"; - homepage = "https://github.com/edenhill/kafkacat"; + homepage = "https://github.com/edenhill/kcat"; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ nyarly ]; diff --git a/pkgs/development/tools/misc/docopts/default.nix b/pkgs/development/tools/misc/docopts/default.nix index 74450bdfe737..7a3202df40f3 100644 --- a/pkgs/development/tools/misc/docopts/default.nix +++ b/pkgs/development/tools/misc/docopts/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "docopts"; - version = "0.6.3-rc2"; + version = "0.6.4-with-no-mangle-double-dash"; src = fetchFromGitHub { owner = "docopt"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PmsTkPT/sf70MKYLhHvjCDb2o3VQ1k7d++RUW7rcoAg="; + sha256 = "0zxax0kl8wqpkzmw9ij4qgfhjbk4r7996pjyp9xf5icyk8knp00q"; }; goPackagePath = "github.com/docopt/${pname}"; diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index f2fda08e8d4d..c5545633bb4e 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7L+hRr+/sphH4fq4vX7lI9KR6Tks1uLveSJ/wLqO1Ek="; + sha256 = "Y+sIyueLdREoq/NR6LwppyhWxB8s0iBjdFaDUSKnlRw="; }; - cargoSha256 = "sha256-AxhFQxtT3PfG3Y9nJlp8n4HjaOXxs9KDPY9Ha5Lr4VE="; + cargoSha256 = "3oqmiHH9QU8uHs9q2CgE0uTvfyaRxV3rFBxkXxC5/Tw="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix index baacee29ff20..6bb4ea8fbd67 100644 --- a/pkgs/development/web/remarkjs/nodepkgs.nix +++ b/pkgs/development/web/remarkjs/nodepkgs.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 165702e60621..f809793a7eac 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -65,7 +65,7 @@ (fetchNuGet { name = "Markdig"; version = "0.26.0"; sha256 = "1pg0yica8h1c2kx10pqzc5iclmlfll5wbw1bxa8l251w1qnfglv2"; }) (fetchNuGet { name = "MessagePack"; version = "2.3.85"; sha256 = "0n7kv4i6knhv1dd35cv45sfpidsiy9albfdmbrdschykd1mzxmiy"; }) (fetchNuGet { name = "MessagePack.Annotations"; version = "2.3.85"; sha256 = "0axjgy9r533bw00lflnc6acjyza76mf2x1nn6fw7qacvak9rqxm3"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1zlcdqscbgqz5yqfgn21l711ybplid97c6wg0gqbbd6920qmpidd"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.12"; sha256 = "1asph5v7kgmscfgsyv9gg7cwvg52gnm6m0ldm2m4pfkpsxqyp2mi"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Connections.Abstractions"; version = "5.0.11"; sha256 = "0x6c6m8s4mq1j21sys8j1xp8sqvy5n3shcpcm0yyx4r2ld2cpdkr"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Client"; version = "5.0.11"; sha256 = "1b60rhlbn8s4c39nl2kb1xfq0m3kzy407hdvz2s5r9qc8y9p55ps"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Common"; version = "5.0.11"; sha256 = "1rq6lildicnz6ngrf1m46ynya0hbn0hzazdqp6c3lkmkw3pgd8wp"; }) @@ -124,7 +124,7 @@ (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "2.2.0"; sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "5.0.1"; sha256 = "01ar5ba2sal9wnpa1xnnikhgb37vzhg2cspz45wf760jflpai2vv"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1b3lm6dc31yl9r0rian7zcmhpn949dyp4yhw4fsl4bkdpp4id085"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.12"; sha256 = "1fdbrjrmjd31y1amp0inlmki9w3fwzv8nz41pqmc943g3cpmyg9f"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index ff2c6e13288a..bfe19a88ca98 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -1,26 +1,37 @@ -{ pkgs, newScope, buildFHSUserEnv }: +{ lib, newScope, splicePackages, steamPackagesAttr ? "steamPackages" +, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, pkgsHostHost, pkgsTargetTarget +, stdenv, buildFHSUserEnv, pkgsi686Linux +}: let - callPackage = newScope self; - - self = rec { - steamArch = if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then "amd64" - else if pkgs.stdenv.hostPlatform.system == "i686-linux" then "i386" - else throw "Unsupported platform: ${pkgs.stdenv.hostPlatform.system}"; + steamPackagesFun = self: let + inherit (self) callPackage; + in { + steamArch = if stdenv.hostPlatform.system == "x86_64-linux" then "amd64" + else if stdenv.hostPlatform.system == "i686-linux" then "i386" + else throw "Unsupported platform: ${stdenv.hostPlatform.system}"; steam-runtime = callPackage ./runtime.nix { }; steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { }; steam = callPackage ./steam.nix { }; steam-fonts = callPackage ./fonts.nix { }; steam-fhsenv = callPackage ./fhsenv.nix { - glxinfo-i686 = pkgs.pkgsi686Linux.glxinfo; + glxinfo-i686 = pkgsi686Linux.glxinfo; steam-runtime-wrapped-i686 = - if steamArch == "amd64" - then pkgs.pkgsi686Linux.steamPackages.steam-runtime-wrapped + if self.steamArch == "amd64" + then pkgsi686Linux.${steamPackagesAttr}.steam-runtime-wrapped else null; inherit buildFHSUserEnv; }; steamcmd = callPackage ./steamcmd.nix { }; }; - -in self + otherSplices = { + selfBuildBuild = pkgsBuildBuild.${steamPackagesAttr}; + selfBuildHost = pkgsBuildHost.${steamPackagesAttr}; + selfBuildTarget = pkgsBuildTarget.${steamPackagesAttr}; + selfHostHost = pkgsHostHost.${steamPackagesAttr}; + selfTargetTarget = pkgsTargetTarget.${steamPackagesAttr}; + }; + keep = self: { }; + extra = spliced0: { }; +in lib.makeScopeWithSplicing splicePackages newScope otherSplices keep extra steamPackagesFun diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index 79748949ff72..459157b82a4c 100644 --- a/pkgs/misc/base16-builder/node-packages.nix +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -10,7 +10,7 @@ let inherit (pkgs) stdenv lib nix-gitignore fetchurl fetchgit; }); nodeEnv = import ../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/misc/emulators/ryujinx/default.nix index d1c9a7547b49..43c98cbacac2 100644 --- a/pkgs/misc/emulators/ryujinx/default.nix +++ b/pkgs/misc/emulators/ryujinx/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.0.7096"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx + version = "1.0.7101"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "f41687f4c1948e9e111afd70e979e98ea5de52fa"; - sha256 = "0l0ll0bbqnqr63xlv4j9ir8pqb2ni7xmw52r8mdzw8vxq6xgs70b"; + rev = "911ea38e939459c652c6e27a28599340a61267dc"; + sha256 = "0znn5bcjhajs26y2ykizpya11ism27zlpbsrf12a25ak4vj6pzvx"; }; projectFile = "Ryujinx.sln"; diff --git a/pkgs/misc/emulators/ryujinx/deps.nix b/pkgs/misc/emulators/ryujinx/deps.nix index c89d203863c3..92638ea9b4ac 100644 --- a/pkgs/misc/emulators/ryujinx/deps.nix +++ b/pkgs/misc/emulators/ryujinx/deps.nix @@ -12,17 +12,17 @@ (fetchNuGet { name = "GtkSharp"; version = "3.22.25.128"; sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; }) (fetchNuGet { name = "GtkSharp.Dependencies"; version = "1.1.0"; sha256 = "1g1rhcn38ww97638rds6l5bysra43hkhv47fy71fvq89623zgyxn"; }) (fetchNuGet { name = "LibHac"; version = "0.13.3"; sha256 = "0mh7q1i9wk5mj7xc1rbsasfmd0d1y6xs5m4nllmclk4drzkzsi56"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1zlcdqscbgqz5yqfgn21l711ybplid97c6wg0gqbbd6920qmpidd"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.10"; sha256 = "0ir75jh4qas1v70y63hvd0rbyprcf97l47b2pgljhxk138z96s4y"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.10"; sha256 = "0qhyrprvbhcn980ycqvkchd4qy5shydi7pl0lbcl9cljivn60if3"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.12"; sha256 = "1asph5v7kgmscfgsyv9gg7cwvg52gnm6m0ldm2m4pfkpsxqyp2mi"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.12"; sha256 = "02kv8xh6xvpav7vqj281321ly1imghxcc18cdgadiq8dwgm87xwp"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.12"; sha256 = "062zb8gqbzxq2xrmr8lbl215pnhw1fdidq43m975vsfgzmqrga8f"; }) (fetchNuGet { name = "Microsoft.CodeCoverage"; version = "16.8.0"; sha256 = "1y05sjk7wgd29a47v1yhn2s1lrd8wgazkilvmjbvivmrrm3fqjs8"; }) (fetchNuGet { name = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { name = "Microsoft.DotNet.InternalAbstractions"; version = "1.0.0"; sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.10"; sha256 = "1z8l02ypzbhbh0jp89ibc4dx61dvaa4l7cdn4s2zs0l492nz2ni8"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.10"; sha256 = "07yr09al8cci38zmwqghpsf8jsg51a8qv6p156ph8b5714iq5jjq"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1b3lm6dc31yl9r0rian7zcmhpn949dyp4yhw4fsl4bkdpp4id085"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.10"; sha256 = "1pphlbhs1swr14g07hnvvwj9p983qqf6vqaq455bhpn6lin3z81f"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.10"; sha256 = "0cn3nq7vmjwk8b5bh7hb5wzidz1msjmwyng6k1ngqdm49w9f0m2g"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.12"; sha256 = "0950m6x86jp5dybzakfsp74qzrk4pk8wkazc178v36j14sqmj2zq"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.12"; sha256 = "173zymcac00rjb0l4yvksglj32b6fnwxzi60kpi0ki3z3a2k8kd3"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.12"; sha256 = "1fdbrjrmjd31y1amp0inlmki9w3fwzv8nz41pqmc943g3cpmyg9f"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.12"; sha256 = "0z8l0gzy9dih0mn5a2rknyph1w73y4m03s250wghym1zp6rz910p"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.12"; sha256 = "1s4klc4p5wiqiiqcfqyi56cci9f29b588h52vj7na7gfqry4b51l"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index aa97f6b60985..92642016b24a 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -199,6 +199,10 @@ let linkVimlPlugin = plugin: packageName: dir: '' mkdir -p $out/pack/${packageName}/${dir} + if test -e "$out/pack/${packageName}/${dir}/${lib.getName plugin}"; then + printf "\nERROR - Duplicated vim plugin: ${lib.getName plugin}\n\n" + exit 1 + fi ln -sf ${plugin}/${rtpPath} $out/pack/${packageName}/${dir}/${lib.getName plugin} ''; diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 3d345e68f3c3..2c05a4aa271e 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -21,11 +21,11 @@ ]; in stdenv.mkDerivation rec { pname = "bluez"; - version = "5.61"; + version = "5.62"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz"; - sha256 = "sha256-g6/WxSF5VUv+q7y1OP7C62vpCorDxAhxtJ162LScQjs="; + sha256 = "sha256-OAkKW3UOF/wI0+UheO2NMlTF9L0sSIMNXBlVuI47wMI="; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index f6c95acf4c6f..1c05b7b77d26 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,22 +2,22 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.254-hardened1.patch", - "sha256": "1mg4zims7ckb0ddnnahk1cj73lhdh7x7xkjz4cgsvwndw0qvmhdi", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.254-hardened1/linux-hardened-4.14.254-hardened1.patch" + "name": "linux-hardened-4.14.255-hardened1.patch", + "sha256": "0d84jwf9vd86qzxq8aqcyrzmwczf3qh2f7a801qsgzb96fyvakrl", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.255-hardened1/linux-hardened-4.14.255-hardened1.patch" }, - "sha256": "0ihdlsg4jg9wwhhcbjjmrcchnl9pc0szh21nwmbhwnxgqcdmrnfz", - "version": "4.14.254" + "sha256": "1mxjwqijnlvrdbpd973kdycz1dwklfkj9vpnj1cihgsf880q02zh", + "version": "4.14.255" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.216-hardened1.patch", - "sha256": "0a8rg0lc0pj6zlkbrd3fjrjgg3f18918zzs8q4nld092hqjfjbsm", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.216-hardened1/linux-hardened-4.19.216-hardened1.patch" + "name": "linux-hardened-4.19.217-hardened1.patch", + "sha256": "1brx4dvh8acq1r5mbh2a5d95k3n7m4x3jnqnp0s69p3fx9gf1kxh", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.217-hardened1/linux-hardened-4.19.217-hardened1.patch" }, - "sha256": "0cs8yy5jfbvvi5j9f3kzyc4j0fjylxdj1641f53ga6gkmjmayv3d", - "version": "4.19.216" + "sha256": "01500jcjvhbkn7xcan564jw0nnwc12cf8hhvl8118jqqqw612lc5", + "version": "4.19.217" }, "5.10": { "patch": { @@ -32,21 +32,31 @@ "5.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.14.17-hardened1.patch", - "sha256": "08s26hmmaji51aczh9spbg8ngbxz5mr067dgi05djp3cgs2hl5pw", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.17-hardened1/linux-hardened-5.14.17-hardened1.patch" + "name": "linux-hardened-5.14.18-hardened1.patch", + "sha256": "1mk159nwkdd1kwsp9l7328x8mk7i5k3sw4nk858zr8izgllqijlp", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.18-hardened1/linux-hardened-5.14.18-hardened1.patch" }, - "sha256": "0q7df51yk6di1m8ky0gplkyx6smlr9inxrd569qv3ww3ykg933sd", - "version": "5.14.17" + "sha256": "1pr7qh2wjw7h6r3fixg9ia5r3na7vdb6b4sp9wnbifnqckahzwis", + "version": "5.14.18" + }, + "5.15": { + "patch": { + "extra": "-hardened1", + "name": "linux-hardened-5.15.2-hardened1.patch", + "sha256": "15r7vkflcrj1hxfvhycqfflb3625br10qvn1ixhsv14xxdf3h39c", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.2-hardened1/linux-hardened-5.15.2-hardened1.patch" + }, + "sha256": "0xdi799k15l7l9kxlq4qbp79mp1c38vxal4z4p9l5gl194x06d2n", + "version": "5.15.2" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.158-hardened1.patch", - "sha256": "1pnxwvy5x04b95bfia63916qlrj5mrp2d54dcc4hg5k29vm0z6a5", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.158-hardened1/linux-hardened-5.4.158-hardened1.patch" + "name": "linux-hardened-5.4.159-hardened1.patch", + "sha256": "1hzs6sqdyzddz0qwq4b6c7rcihbjgzq73ng6fma408c27y72d6pi", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.159-hardened1/linux-hardened-5.4.159-hardened1.patch" }, - "sha256": "0ncdkf1iz49458k3dvq3dc5b2r9dp21jsn3ffm9lbhlgvkn8y0bf", - "version": "5.4.158" + "sha256": "0hw68yjf0c8kahwra8hq863318cbyqc89f429z75scmb9rgk466p", + "version": "5.4.159" } } diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 6ef781f6095c..c8d42ddda746 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.73-rt54"; # updated by ./update-rt.sh + version = "5.10.78-rt55"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "0xhf0g5pra27hnavpy0y3mn05m5hqn5rd3d6fx0a3vr35c1jicpd"; + sha256 = "03q5lrv8gr9hnm7984pxi9kwsvxrn21qwykj60amisi2wac6r05y"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0szqm9f939p9z701i5hj881nf5bhfa0a6037bbcz974y0x8g9nmk"; + sha256 = "1wcw682r238qi5jgn5zk9m6j2506p9ypfax13bzhjfyjzz3h98kp"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix deleted file mode 100644 index 5d1b14f1d0f0..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, buildLinux, fetchurl -, kernelPatches ? [ ] -, structuredExtraConfig ? {} -, extraMeta ? {} -, argsOverride ? {} -, ... } @ args: - -let - version = "5.11.4-rt11"; # updated by ./update-rt.sh - branch = lib.versions.majorMinor version; - kversion = builtins.elemAt (lib.splitString "-" version) 0; -in buildLinux (args // { - inherit version; - - # modDirVersion needs a patch number, change X.Y-rtZ to X.Y.0-rtZ. - modDirVersion = if (builtins.match "[^.]*[.][^.]*-.*" version) == null then version - else lib.replaceStrings ["-"] [".0-"] version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1i8dfw83ndaylwji7lazfckk113plvnz7kh1yppbfg35r6przrc8"; - }; - - kernelPatches = let rt-patch = { - name = "rt"; - patch = fetchurl { - url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1az6cn9jj3bnjgwzzrjy1adnrnn06p2vzsnc1iib4xhs0sfr27hc"; - }; - }; in [ rt-patch ] ++ kernelPatches; - - structuredExtraConfig = with lib.kernel; { - PREEMPT_RT = yes; - # Fix error: unused option: PREEMPT_RT. - EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt) - # Fix error: option not set correctly: PREEMPT_VOLUNTARY (wanted 'y', got 'n'). - PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it. - # Fix error: unused option: RT_GROUP_SCHED. - RT_GROUP_SCHED = lib.mkForce (option no); # Removed by sched-disable-rt-group-sched-on-rt.patch. - } // structuredExtraConfig; - - extraMeta = extraMeta // { - inherit branch; - }; -} // argsOverride) diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/pkgs/os-specific/linux/selinux-python/default.nix index 32ed5bc2e7d6..b6394b3e1f6c 100644 --- a/pkgs/os-specific/linux/selinux-python/default.nix +++ b/pkgs/os-specific/linux/selinux-python/default.nix @@ -4,7 +4,6 @@ # this is python3 only because setools only supports python3 with lib; -with python3.pkgs; stdenv.mkDerivation rec { pname = "selinux-python"; @@ -17,9 +16,11 @@ stdenv.mkDerivation rec { sha256 = "1pjzsyay5535cxcjag7y7k193ajry0s0xc3dqv5905qd7cwval1n"; }; - nativeBuildInputs = [ wrapPython ]; - buildInputs = [ libsepol python3 ]; - propagatedBuildInputs = [ libselinux libsemanage setools ipy ]; + strictDeps = true; + + nativeBuildInputs = [ python3 python3.pkgs.wrapPython ]; + buildInputs = [ libsepol ]; + propagatedBuildInputs = [ libselinux libsemanage setools python3.pkgs.ipy ]; postPatch = '' substituteInPlace sepolicy/Makefile --replace "echo --root" "echo --prefix" @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { "LOCALEDIR=$(out)/share/locale" "BASHCOMPLETIONDIR=$(out)/share/bash-completion/completions" "PYTHON=python" - "PYTHONLIBDIR=$(out)/${python.sitePackages}" + "PYTHONLIBDIR=$(out)/${python3.sitePackages}" "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a" ]; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 8e2345ec3a4e..50327bc658f2 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -202,7 +202,7 @@ let changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}"; license = licenses.cddl; platforms = platforms.linux; - maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ]; + maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin ]; mainProgram = "zfs"; # If your Linux kernel version is not yet supported by zfs, try zfsUnstable. # On NixOS set the option boot.zfs.enableUnstable. diff --git a/pkgs/servers/gemini/gmid/default.nix b/pkgs/servers/gemini/gmid/default.nix index f06498d583b5..803945c7a234 100644 --- a/pkgs/servers/gemini/gmid/default.nix +++ b/pkgs/servers/gemini/gmid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, bison, libressl, libevent }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, bison, libressl, libevent }: stdenv.mkDerivation rec { pname = "gmid"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-BBd0AL5jRRslxzDnxcTZRR+8J5D23NAQ7mp9K+leXAQ="; }; + patches = [ + # Fix cross-compilation + (fetchpatch { + url = "https://github.com/omar-polo/gmid/commit/eb77afa8d308a2f4f422df2ff19f023b5b2cc591.patch"; + sha256 = "sha256-rTTZUpfXOg7X0Ad0Y9evyU7k+aVYpJ0t9SEkNA/sSdk="; + }) + ]; + nativeBuildInputs = [ bison ]; buildInputs = [ libressl libevent ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index dbd447a41f8a..37b078adefa1 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.11.3"; + version = "2021.11.4"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index c98b054e52f6..59d2ee364b23 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -152,7 +152,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.11.3"; + hassVersion = "2021.11.4"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -169,7 +169,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "sha256-HycMb29niuUp7flRdWgrKSOcnr0l3PqjULCrgrwLrFw="; + sha256 = "sha256-411oqzC8VTD7CM9vM/M3m4zW0Ygf2g2hoAXAxGBv7iw="; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 3b8a4acbfc94..9538ea9f450f 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -81,6 +81,8 @@ stdenv.mkDerivation rec { inherit apr aprutil sslSupport proxySupport ldapSupport luaSupport lua5; tests = { acme-integration = nixosTests.acme; + proxy = nixosTests.proxy; + php = nixosTests.php.httpd; }; }; diff --git a/pkgs/servers/jellyfin/node-composition.nix b/pkgs/servers/jellyfin/node-composition.nix index d0c72d2e8536..fc96c12c5b25 100644 --- a/pkgs/servers/jellyfin/node-composition.nix +++ b/pkgs/servers/jellyfin/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix index 6fb86dfd79e7..f9a1999f36d7 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix index e0d21f7d44d3..9f0040e2f446 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/servers/monitoring/prometheus/webui/codemirror-promql/default.nix b/pkgs/servers/monitoring/prometheus/webui/codemirror-promql/default.nix index 20c7e2568cf0..6b56f640ae9a 100644 --- a/pkgs/servers/monitoring/prometheus/webui/codemirror-promql/default.nix +++ b/pkgs/servers/monitoring/prometheus/webui/codemirror-promql/default.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/servers/monitoring/prometheus/webui/webui/default.nix b/pkgs/servers/monitoring/prometheus/webui/webui/default.nix index 20c7e2568cf0..6b56f640ae9a 100644 --- a/pkgs/servers/monitoring/prometheus/webui/webui/default.nix +++ b/pkgs/servers/monitoring/prometheus/webui/webui/default.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/servers/mx-puppet-discord/node-composition.nix b/pkgs/servers/mx-puppet-discord/node-composition.nix index 777c9db52568..1285e13cfba4 100644 --- a/pkgs/servers/mx-puppet-discord/node-composition.nix +++ b/pkgs/servers/mx-puppet-discord/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/servers/nosql/eventstore/create-deps.sh b/pkgs/servers/nosql/eventstore/create-deps.sh old mode 100644 new mode 100755 index da73bcf1e3b6..7b1acd5ab26f --- a/pkgs/servers/nosql/eventstore/create-deps.sh +++ b/pkgs/servers/nosql/eventstore/create-deps.sh @@ -1,34 +1,98 @@ -# 1. create a log with `dotnet restore -v m MyPackage.sln > mypackage-restore.log -# 2. then call ./create-deps.sh mypackage-restore.log +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p dotnet-sdk_5 jq xmlstarlet curl nixpkgs-fmt +set -euo pipefail -urlbase="https://www.nuget.org/api/v2/package" -cat << EOL -{ fetchurl }: let +# Run this script to generate deps.nix +# TODO: consolidate with other dotnet deps generation scripts by which +# this script is inspired: +# - pkgs/servers/nosql/eventstore/create-deps.sh +# - pkgs/development/dotnet-modules/python-language-server/create_deps.sh +# - pkgs/misc/emulators/ryujinx/updater.sh + +cd "$(dirname "${BASH_SOURCE[0]}")" + +deps_file="$(realpath "./deps.nix")" + +exec 2>&1 6> "$deps_file" + +store_src="$( nix-build ../../../.. -A eventstore.src --no-out-link )" +src="$(mktemp -d)" +cp -rT "$store_src" "$src" +chmod -R +w "$src" +pushd "$src" + +URLBASE="https://www.nuget.org/api/v2/package" + +DEPS_HEADER=" +{ fetchurl }: +let + nugetUrlBase = \"$URLBASE\"; fetchNuGet = { name, version, sha256 }: fetchurl { inherit sha256; - url = "$urlbase/\${name}/\${version}"; + url = \"\${nugetUrlBase}/\${name}/\${version}\"; }; +in [" -in [ -EOL -IFS='' -while read line; do - if echo $line | grep -q "Installing "; then - name=$(echo $line | sed -r 's/ Installing ([^ ]+) (.+)./\1/') - version=$(echo $line | sed -r 's/ Installing ([^ ]+) (.+)./\2/') - sha256=$(nix-prefetch-url "$urlbase/$name/$version" 2>/dev/null) - cat << EOL +DEPS_FOOTER="]" - (fetchNuGet { - name = "$name"; - version = "$version"; - sha256 = "$sha256"; - }) -EOL - fi -done < $1 -cat << EOL +DEPS_TEMPLATE=" +(fetchNuGet { + name = \"%s\"; + version = \"%s\"; + sha256 = \"%s\"; +})" -] -EOL +tmpdir="$(mktemp -d -p "$(pwd)")" # must be under source root +trap 'rm -rf "$tmpdir"' EXIT + +HOME="$tmpdir" dotnet restore --packages "$tmpdir"/.nuget/packages \ + --no-cache --force --runtime linux-x64 \ + src/EventStore.sln >&2 + +mapfile -t repos < <( + xmlstarlet sel -t -v 'configuration/packageSources/add/@value' -n NuGet.config "$tmpdir"/.nuget/NuGet/NuGet.Config | + while IFS= read index + do + curl --compressed -fsL "$index" | \ + jq -r '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"' + done +) + +echo $DEPS_HEADER >&6 + +cd "$tmpdir/.nuget/packages" +for package in * +do + cd "$package" + for version in * + do + found=false + for repo in "${repos[@]}" + do + url="$repo$package/$version/$package.$version.nupkg" + if curl -fsL "$url" -o /dev/null + then + found=true + break + fi + done + + if ! $found + then + echo "couldn't find $package $version" >&2 + exit 1 + fi + + sha256=$(nix-prefetch-url "$url" 2>/dev/null) + + printf "$DEPS_TEMPLATE" $package $version $sha256 >&6 + done + cd .. +done + +echo $DEPS_FOOTER >&6 + +exec 6>&- + +nixpkgs-fmt "$deps_file" diff --git a/pkgs/servers/nosql/eventstore/deps.nix b/pkgs/servers/nosql/eventstore/deps.nix index 937bd8181441..7f61169276fd 100644 --- a/pkgs/servers/nosql/eventstore/deps.nix +++ b/pkgs/servers/nosql/eventstore/deps.nix @@ -1,532 +1,633 @@ -{ fetchurl }: let - - fetchNuGet = { name, version, sha256 }: fetchurl { - inherit sha256; - url = "https://www.nuget.org/api/v2/package/${name}/${version}"; - }; - -in [ +{ fetchurl }: +let + nugetUrlBase = "https://www.nuget.org/api/v2/package"; + fetchNuGet = { name, version, sha256 }: fetchurl { inherit sha256; url = "${nugetUrlBase}/${name}/${version}"; }; +in +[ (fetchNuGet { - name = "YamlDotNet"; - version = "5.2.1"; - sha256 = "0nb34qcdhs5qn4783idg28f2kr89vaiyjn4v2barhv7i75zhym6y"; + name = "hdrhistogram"; + version = "2.5.0"; + sha256 = "1s2np7m3pp17rgambax9a3x5pd2grx74cr325q3xapjz2gd58sj1"; }) - (fetchNuGet { - name = "NLog"; - version = "4.5.10"; - sha256 = "0d4yqxrhqn2k36h3v1f5pn6qqlagbzg67v6gvxqhz3s4zyc3b8rg"; + name = "microsoft.build.tasks.git"; + version = "1.0.0-beta-63127-02"; + sha256 = "10avjhp4vjbmix4rwacbw6cim2d4kbmz64q4n7r6zz94395l61b6"; }) - (fetchNuGet { - name = "Newtonsoft.Json"; - version = "11.0.2"; - sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; - }) - - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.3.0"; - sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; - }) - - (fetchNuGet { - name = "Microsoft.CodeCoverage"; + name = "microsoft.codecoverage"; version = "15.9.0"; sha256 = "10v5xrdilnm362g9545qxvlrbwc9vn65jhpb1i0jlhyqsj6bfwzg"; }) - (fetchNuGet { - name = "System.Text.Encoding.Extensions"; - version = "4.3.0"; - sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + name = "microsoft.netcore.platforms"; + version = "1.1.0"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }) + (fetchNuGet { + name = "microsoft.netcore.platforms"; + version = "1.1.1"; + sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; + }) + (fetchNuGet { + name = "microsoft.netcore.platforms"; + version = "2.1.0"; + sha256 = "0nmdnkmwyxj8cp746hs9an57zspqlmqdm55b00i7yk8a22s6akxz"; + }) + (fetchNuGet { + name = "microsoft.netcore.targets"; + version = "1.1.0"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }) + (fetchNuGet { + name = "microsoft.netframework.referenceassemblies"; + version = "1.0.0"; + sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; + }) + (fetchNuGet { + name = "microsoft.netframework.referenceassemblies.net452"; + version = "1.0.0"; + sha256 = "1f0vqrnkggnn4fgfbb2wp4hg9b1n1zvcknvgpphl5dfrk4b0zag8"; + }) + (fetchNuGet { + name = "microsoft.netframework.referenceassemblies.net46"; + version = "1.0.0"; + sha256 = "1yl609ilni8adiyryn9rm967sjm499pkx4xj06gpb16dm8d9jkji"; + }) + (fetchNuGet { + name = "microsoft.netframework.referenceassemblies.net471"; + version = "1.0.0"; + sha256 = "101incszmaxdhrfzqbfya04fqivi81xvazdfc5l0hr7hm42r6k2m"; + }) + (fetchNuGet { + name = "microsoft.net.test.sdk"; + version = "15.9.0"; + sha256 = "0g7wjgiigs4v8qa32g9ysqgx8bx55dzmbxfkc4ic95mpd1vkjqxw"; + }) + (fetchNuGet { + name = "microsoft.sourcelink.common"; + version = "1.0.0-beta-63127-02"; + sha256 = "0y29xx3x9nd14n1sr8ycxhf6y1a83pv3sayfxjib8wi6s866lagb"; + }) + (fetchNuGet { + name = "microsoft.sourcelink.github"; + version = "1.0.0-beta-63127-02"; + sha256 = "1096d5n7mfvgm1apdmafjkxkqray6r2cw6zjhhxj2zn98836w1n2"; + }) + (fetchNuGet { + name = "microsoft.win32.primitives"; + version = "4.3.0"; + sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; + }) + (fetchNuGet { + name = "netstandard.library"; + version = "2.0.3"; + sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; + }) + (fetchNuGet { + name = "newtonsoft.json"; + version = "11.0.2"; + sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; + }) + (fetchNuGet { + name = "nlog"; + version = "4.5.10"; + sha256 = "0d4yqxrhqn2k36h3v1f5pn6qqlagbzg67v6gvxqhz3s4zyc3b8rg"; + }) + (fetchNuGet { + name = "nunit"; + version = "3.11.0"; + sha256 = "0mmc8snwjjmbkhk6cv5c0ha77czzy9bca4q59244rxciw9sxk1cz"; + }) + (fetchNuGet { + name = "nunit3testadapter"; + version = "3.10.0"; + sha256 = "0ahzfk9y2dq0wl91ll5hss89hqw7la85ndll5030nslizsgm5q2i"; }) - (fetchNuGet { name = "protobuf-net"; version = "2.4.0"; sha256 = "106lxm9afga7ihlknyy7mlfplyq40mrndksqrsn8ia2a47fbqqld"; }) - (fetchNuGet { - name = "NUnit3TestAdapter"; - version = "3.10.0"; - sha256 = "0ahzfk9y2dq0wl91ll5hss89hqw7la85ndll5030nslizsgm5q2i"; - }) - - (fetchNuGet { - name = "System.Security.Principal.Windows"; - version = "4.5.0"; - sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; - }) - - (fetchNuGet { - name = "NUnit"; - version = "3.11.0"; - sha256 = "0mmc8snwjjmbkhk6cv5c0ha77czzy9bca4q59244rxciw9sxk1cz"; - }) - - (fetchNuGet { - name = "System.Reflection.DispatchProxy"; - version = "4.5.0"; - sha256 = "0v9sg38h91aljvjyc77m1y5v34p50hjdbxvvxwa1whlajhafadcn"; - }) - - (fetchNuGet { - name = "Microsoft.NET.Test.Sdk"; - version = "15.9.0"; - sha256 = "0g7wjgiigs4v8qa32g9ysqgx8bx55dzmbxfkc4ic95mpd1vkjqxw"; - }) - - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "2.1.0"; - sha256 = "0nmdnkmwyxj8cp746hs9an57zspqlmqdm55b00i7yk8a22s6akxz"; - }) - - (fetchNuGet { - name = "HdrHistogram"; - version = "2.5.0"; - sha256 = "1s2np7m3pp17rgambax9a3x5pd2grx74cr325q3xapjz2gd58sj1"; - }) - - (fetchNuGet { - name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; + name = "runtime.any.system.collections"; version = "4.3.0"; - sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; + sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { - name = "System.Xml.XmlDocument"; + name = "runtime.any.system.diagnostics.tracing"; version = "4.3.0"; - sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; + sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { - name = "System.Xml.ReaderWriter"; + name = "runtime.any.system.globalization"; version = "4.3.0"; - sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; + sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { - name = "System.Text.RegularExpressions"; + name = "runtime.any.system.globalization.calendars"; version = "4.3.0"; - sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) - (fetchNuGet { - name = "System.Reflection.Extensions"; + name = "runtime.any.system.io"; version = "4.3.0"; - sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { - name = "System.Private.ServiceModel"; - version = "4.5.3"; - sha256 = "0nyw9m9dj327hn0qb0jmgwpch0f40jv301fk4mrchga8g99xbpng"; - }) - - (fetchNuGet { - name = "System.Reflection.Emit.ILGeneration"; + name = "runtime.any.system.reflection"; version = "4.3.0"; - sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; + sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Csp"; + name = "runtime.any.system.reflection.extensions"; version = "4.3.0"; - sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; + sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Cng"; + name = "runtime.any.system.reflection.primitives"; version = "4.3.0"; - sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; + sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { - name = "System.Globalization.Calendars"; + name = "runtime.any.system.resources.resourcemanager"; version = "4.3.0"; - sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; + sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { - name = "System.Linq"; + name = "runtime.any.system.runtime"; version = "4.3.0"; - sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; + sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { - name = "Microsoft.Build.Tasks.Git"; - version = "1.0.0-beta-63127-02"; - sha256 = "10avjhp4vjbmix4rwacbw6cim2d4kbmz64q4n7r6zz94395l61b6"; - }) - - (fetchNuGet { - name = "Microsoft.SourceLink.Common"; - version = "1.0.0-beta-63127-02"; - sha256 = "0y29xx3x9nd14n1sr8ycxhf6y1a83pv3sayfxjib8wi6s866lagb"; - }) - - (fetchNuGet { - name = "Microsoft.SourceLink.GitHub"; - version = "1.0.0-beta-63127-02"; - sha256 = "1096d5n7mfvgm1apdmafjkxkqray6r2cw6zjhhxj2zn98836w1n2"; - }) - - (fetchNuGet { - name = "System.Runtime.Numerics"; + name = "runtime.any.system.runtime.handles"; version = "4.3.0"; - sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; + sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.Apple"; + name = "runtime.any.system.runtime.interopservices"; version = "4.3.0"; - sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; + sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { - name = "System.Reflection.Primitives"; + name = "runtime.any.system.text.encoding"; version = "4.3.0"; - sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; + name = "runtime.any.system.text.encoding.extensions"; version = "4.3.0"; - sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { - name = "NETStandard.Library"; - version = "2.0.3"; - sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; - }) - - (fetchNuGet { - name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; - }) - - (fetchNuGet { - name = "System.Net.Requests"; + name = "runtime.any.system.threading.tasks"; version = "4.3.0"; - sha256 = "0pcznmwqqk0qzp0gf4g4xw7arhb0q8v9cbzh3v8h8qp6rjcr339a"; + sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { - name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; + name = "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { - name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; - }) - - (fetchNuGet { - name = "System.Net.Http"; - version = "4.3.4"; - sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; - }) - - (fetchNuGet { - name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; - }) - - (fetchNuGet { - name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; - }) - - (fetchNuGet { - name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; - }) - - (fetchNuGet { - name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; - }) - - (fetchNuGet { - name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; - }) - - (fetchNuGet { - name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; - }) - - (fetchNuGet { - name = "System.Net.Security"; - version = "4.3.2"; - sha256 = "1aw1ca1vssqrillrh4qkarx0lxwc8wcaqdkfdima8376wb98j2q8"; - }) - - (fetchNuGet { - name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + name = "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.2"; sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "1.1.0"; - sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; - }) - - (fetchNuGet { - name = "System.Reflection"; + name = "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; - sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { - name = "System.Collections"; + name = "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.2"; + sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; + }) + (fetchNuGet { + name = "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; - sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { - name = "System.Diagnostics.Debug"; - version = "4.3.0"; - sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + name = "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.2"; + sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; }) - (fetchNuGet { - name = "System.Diagnostics.Tracing"; - version = "4.3.0"; - sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; - }) - - (fetchNuGet { - name = "System.Globalization"; - version = "4.3.0"; - sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; - }) - - (fetchNuGet { - name = "Microsoft.NETCore.Targets"; - version = "1.1.0"; - sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; - }) - - (fetchNuGet { - name = "System.Threading.ThreadPool"; - version = "4.3.0"; - sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; - }) - - (fetchNuGet { - name = "System.IO"; - version = "4.3.0"; - sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; - }) - - (fetchNuGet { - name = "System.Security.Principal"; - version = "4.3.0"; - sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; - }) - - (fetchNuGet { - name = "System.Net.Primitives"; - version = "4.3.0"; - sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; - }) - - (fetchNuGet { - name = "System.Net.WebHeaderCollection"; - version = "4.3.0"; - sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; - }) - - (fetchNuGet { - name = "System.Security.Claims"; - version = "4.3.0"; - sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; - }) - - (fetchNuGet { - name = "System.Resources.ResourceManager"; - version = "4.3.0"; - sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; - }) - - (fetchNuGet { - name = "System.Collections.Concurrent"; - version = "4.3.0"; - sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; - }) - - (fetchNuGet { - name = "System.Runtime"; - version = "4.3.0"; - sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; - }) - - (fetchNuGet { - name = "System.Threading"; - version = "4.3.0"; - sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; - }) - - (fetchNuGet { - name = "System.Threading.Tasks"; - version = "4.3.0"; - sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; - }) - - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "1.1.1"; - sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; - }) - - (fetchNuGet { - name = "runtime.native.System"; + name = "runtime.native.system"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { - name = "runtime.native.System.Net.Http"; + name = "runtime.native.system.net.http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { - name = "runtime.native.System.Net.Security"; + name = "runtime.native.system.net.security"; version = "4.3.0"; sha256 = "0dnqjhw445ay3chpia9p6vy4w2j6s9vy3hxszqvdanpvvyaxijr3"; }) - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.OpenSsl"; + name = "runtime.native.system.security.cryptography.apple"; + version = "4.3.0"; + sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; + }) + (fetchNuGet { + name = "runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + }) + (fetchNuGet { + name = "runtime.native.system.security.cryptography.openssl"; version = "4.3.2"; sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; }) - (fetchNuGet { - name = "Microsoft.Win32.Primitives"; + name = "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; - sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; + sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; + name = "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.2"; + sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; + }) + (fetchNuGet { + name = "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; + }) + (fetchNuGet { + name = "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.2"; + sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; + }) + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple"; + version = "4.3.0"; + sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; + }) + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; + }) + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.2"; + sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; + }) + (fetchNuGet { + name = "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; + }) + (fetchNuGet { + name = "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.2"; + sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; + }) + (fetchNuGet { + name = "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; + }) + (fetchNuGet { + name = "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.2"; + sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.2"; + sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.2"; + sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; + }) + (fetchNuGet { + name = "runtime.unix.microsoft.win32.primitives"; + version = "4.3.0"; + sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; + }) + (fetchNuGet { + name = "runtime.unix.system.diagnostics.debug"; + version = "4.3.0"; + sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; + }) + (fetchNuGet { + name = "runtime.unix.system.io.filesystem"; + version = "4.3.0"; + sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; + }) + (fetchNuGet { + name = "runtime.unix.system.net.primitives"; + version = "4.3.0"; + sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; + }) + (fetchNuGet { + name = "runtime.unix.system.private.uri"; + version = "4.3.0"; + sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; + }) + (fetchNuGet { + name = "runtime.unix.system.runtime.extensions"; + version = "4.3.0"; + sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; + }) + (fetchNuGet { + name = "system.buffers"; + version = "4.3.0"; + sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; + }) + (fetchNuGet { + name = "system.collections"; + version = "4.3.0"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }) + (fetchNuGet { + name = "system.collections.concurrent"; + version = "4.3.0"; + sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; + }) + (fetchNuGet { + name = "system.diagnostics.debug"; + version = "4.3.0"; + sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + }) + (fetchNuGet { + name = "system.diagnostics.diagnosticsource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { - name = "System.Xml.XmlSerializer"; + name = "system.diagnostics.tracing"; version = "4.3.0"; - sha256 = "07pa4sx196vxkgl3csvdmw94nydlsm9ir38xxcs84qjn8cycd912"; + sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { - name = "System.Globalization.Extensions"; + name = "system.globalization"; + version = "4.3.0"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) + (fetchNuGet { + name = "system.globalization.calendars"; + version = "4.3.0"; + sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; + }) + (fetchNuGet { + name = "system.globalization.extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { - name = "System.IO.FileSystem"; + name = "system.io"; + version = "4.3.0"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }) + (fetchNuGet { + name = "system.io.filesystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { - name = "System.Runtime.Extensions"; + name = "system.io.filesystem.primitives"; version = "4.3.0"; - sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { - name = "System.Runtime.Handles"; + name = "system.linq"; version = "4.3.0"; - sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { - name = "System.Runtime.InteropServices"; + name = "system.net.http"; + version = "4.3.4"; + sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; + }) + (fetchNuGet { + name = "system.net.primitives"; version = "4.3.0"; - sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Algorithms"; + name = "system.net.requests"; version = "4.3.0"; - sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; + sha256 = "0pcznmwqqk0qzp0gf4g4xw7arhb0q8v9cbzh3v8h8qp6rjcr339a"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Encoding"; + name = "system.net.security"; + version = "4.3.2"; + sha256 = "1aw1ca1vssqrillrh4qkarx0lxwc8wcaqdkfdima8376wb98j2q8"; + }) + (fetchNuGet { + name = "system.net.webheadercollection"; version = "4.3.0"; - sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; + sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; }) - (fetchNuGet { - name = "System.ServiceModel.Primitives"; + name = "system.private.servicemodel"; version = "4.5.3"; - sha256 = "1v90pci049cn44y0km885k1vrilhb34w6q2zva4y6f3ay84klrih"; + sha256 = "0nyw9m9dj327hn0qb0jmgwpch0f40jv301fk4mrchga8g99xbpng"; }) - (fetchNuGet { - name = "System.Security.Cryptography.OpenSsl"; + name = "system.private.uri"; version = "4.3.0"; - sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; + sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Primitives"; + name = "system.reflection"; version = "4.3.0"; - sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { - name = "System.Security.Cryptography.X509Certificates"; - version = "4.3.0"; - sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; + name = "system.reflection.dispatchproxy"; + version = "4.5.0"; + sha256 = "0v9sg38h91aljvjyc77m1y5v34p50hjdbxvvxwa1whlajhafadcn"; }) - (fetchNuGet { - name = "System.Text.Encoding"; - version = "4.3.0"; - sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; - }) - - (fetchNuGet { - name = "System.Reflection.Emit"; + name = "system.reflection.emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { - name = "System.Reflection.TypeExtensions"; - version = "4.4.0"; - sha256 = "0n9r1w4lp2zmadyqkgp4sk9wy90sj4ygq4dh7kzamx26i9biys5h"; + name = "system.reflection.emit.ilgeneration"; + version = "4.3.0"; + sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { - name = "System.Reflection.Emit.Lightweight"; + name = "system.reflection.emit.lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - + (fetchNuGet { + name = "system.reflection.extensions"; + version = "4.3.0"; + sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + }) + (fetchNuGet { + name = "system.reflection.primitives"; + version = "4.3.0"; + sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + }) + (fetchNuGet { + name = "system.reflection.typeextensions"; + version = "4.4.0"; + sha256 = "0n9r1w4lp2zmadyqkgp4sk9wy90sj4ygq4dh7kzamx26i9biys5h"; + }) + (fetchNuGet { + name = "system.resources.resourcemanager"; + version = "4.3.0"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + }) + (fetchNuGet { + name = "system.runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) + (fetchNuGet { + name = "system.runtime.extensions"; + version = "4.3.0"; + sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + }) + (fetchNuGet { + name = "system.runtime.handles"; + version = "4.3.0"; + sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; + }) + (fetchNuGet { + name = "system.runtime.interopservices"; + version = "4.3.0"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }) + (fetchNuGet { + name = "system.runtime.numerics"; + version = "4.3.0"; + sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; + }) + (fetchNuGet { + name = "system.security.claims"; + version = "4.3.0"; + sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; + }) + (fetchNuGet { + name = "system.security.cryptography.algorithms"; + version = "4.3.0"; + sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; + }) + (fetchNuGet { + name = "system.security.cryptography.cng"; + version = "4.3.0"; + sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; + }) + (fetchNuGet { + name = "system.security.cryptography.csp"; + version = "4.3.0"; + sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; + }) + (fetchNuGet { + name = "system.security.cryptography.encoding"; + version = "4.3.0"; + sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; + }) + (fetchNuGet { + name = "system.security.cryptography.openssl"; + version = "4.3.0"; + sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; + }) + (fetchNuGet { + name = "system.security.cryptography.primitives"; + version = "4.3.0"; + sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; + }) + (fetchNuGet { + name = "system.security.cryptography.x509certificates"; + version = "4.3.0"; + sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; + }) + (fetchNuGet { + name = "system.security.principal"; + version = "4.3.0"; + sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; + }) + (fetchNuGet { + name = "system.security.principal.windows"; + version = "4.5.0"; + sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; + }) + (fetchNuGet { + name = "system.servicemodel.primitives"; + version = "4.5.3"; + sha256 = "1v90pci049cn44y0km885k1vrilhb34w6q2zva4y6f3ay84klrih"; + }) + (fetchNuGet { + name = "system.text.encoding"; + version = "4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }) + (fetchNuGet { + name = "system.text.encoding.extensions"; + version = "4.3.0"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + }) + (fetchNuGet { + name = "system.text.regularexpressions"; + version = "4.3.0"; + sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + }) + (fetchNuGet { + name = "system.threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) + (fetchNuGet { + name = "system.threading.tasks"; + version = "4.3.0"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }) + (fetchNuGet { + name = "system.threading.tasks.extensions"; + version = "4.3.0"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + }) + (fetchNuGet { + name = "system.threading.threadpool"; + version = "4.3.0"; + sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; + }) + (fetchNuGet { + name = "system.xml.readerwriter"; + version = "4.3.0"; + sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; + }) + (fetchNuGet { + name = "system.xml.xmldocument"; + version = "4.3.0"; + sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; + }) + (fetchNuGet { + name = "system.xml.xmlserializer"; + version = "4.3.0"; + sha256 = "07pa4sx196vxkgl3csvdmw94nydlsm9ir38xxcs84qjn8cycd912"; + }) + (fetchNuGet { + name = "yamldotnet"; + version = "5.2.1"; + sha256 = "0nb34qcdhs5qn4783idg28f2kr89vaiyjn4v2barhv7i75zhym6y"; + }) ] diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 3d69d2197803..fd580d52d8a0 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -63,13 +63,9 @@ buildFHSUserEnv { test -d "$pluginDir" || mkdir -p "$pluginDir" # First, remove all of the symlinks in the plugins directory. - echo "Removing old symlinks" - for f in $(ls "$pluginDir/"); do - if [[ -L "$pluginDir/$f" ]]; then - echo "Removing plugin symlink: $pluginDir/$f" - rm "$pluginDir/$f" - fi - done + while IFS= read -r -d $'\0' f; do + echo "Removing plugin symlink: $f" + done < <(find "$pluginDir" -type l -print0) echo "Symlinking plugins" IFS=':' read -ra pluginsArray <<< "$PLEX_PLUGINS" @@ -87,6 +83,39 @@ buildFHSUserEnv { done fi + if [[ -n "''${PLEX_SCANNERS:-}" ]]; then + for scannerType in Common Movies Music Series; do + echo "Preparing $scannerType scanners directory" + + scannerDir="$PLEX_DATADIR/Plex Media Server/Scanners/$scannerType" + test -d "$scannerDir" || mkdir -p "$scannerDir" + + # First, remove all of the symlinks in the scanners directory. + echo "Removing old symlinks" + while IFS= read -r -d $'\0' f; do + echo "Removing scanner symlink: $f" + done < <(find "$scannerDir" -type l -print0) + + echo "Symlinking scanners" + IFS=':' read -ra scannersArray <<< "$PLEX_SCANNERS" + for path in "''${scannersArray[@]}"; do + # The provided source should contain a 'Scanners' directory; symlink + # from inside that. + subpath="$path/Scanners/$scannerType" + while IFS= read -r -d $'\0' file; do + dest="$scannerDir/$(basename "$file")" + + if [[ -f "$dest" || -L "$dest" ]]; then + echo "Error symlinking scanner from $file to $dest: file or directory already exists" + else + echo "Symlinking scanner at: $file" + ln -s "$file" "$dest" + fi + done < <(find "$subpath" -type f -print0) + done + done + fi + # Tell Plex to use the data directory as the "Application Support" # directory, otherwise it tries to write things into the user's home # directory. diff --git a/pkgs/servers/pounce/default.nix b/pkgs/servers/pounce/default.nix index 68b2779c7fa4..0d01f9cb7c49 100644 --- a/pkgs/servers/pounce/default.nix +++ b/pkgs/servers/pounce/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pounce"; - version = "2.5"; + version = "3.0"; src = fetchzip { url = "https://git.causal.agency/pounce/snapshot/pounce-${version}.tar.gz"; - sha256 = "0swbncsm888r95dwk13v1vii5sr3gah817dfah5v7zs8lsv1kgv5"; + sha256 = "17vmbfr7ika6kmq9jqa3rpd4cr71arapav7hlmggnj7a9yw5b9mg"; }; buildInputs = [ libressl ]; diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index ffb4bc0c7e82..96b10829d865 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { makeWrapper "$dotnetDir/$binName" "${binPath}" \ --add-flags "$binDir/$binName.dll" \ --argv0 "$binName" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ icu66 openssl ]}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ alsa-lib icu66 ffmpeg openssl ]}" \ --prefix PATH : "$dotnetDir" \ --prefix PATH : "${lib.makeBinPath [ alsa-utils cifs-utils ffmpeg ]}" \ --run "cd $binDir" \ diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index cb0aac6147fe..34654a3d0430 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_auto_failover"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "158rr0q2y34mjikripz7n61gc3ivj29brxxz4yq72qbz5bd859yj"; + sha256 = "sha256-hGpcHV4ai9mxaJ/u/o9LNFWPGsW22W7ak2pbvAUgmwU="; }; buildInputs = [ postgresql openssl zlib readline libkrb5 ]; diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix index 76d5cf6a202f..0961603968ea 100644 --- a/pkgs/servers/web-apps/cryptpad/node-packages.nix +++ b/pkgs/servers/web-apps/cryptpad/node-packages.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/servers/web-apps/whitebophir/node-packages.nix b/pkgs/servers/web-apps/whitebophir/node-packages.nix index 76d5cf6a202f..0961603968ea 100644 --- a/pkgs/servers/web-apps/whitebophir/node-packages.nix +++ b/pkgs/servers/web-apps/whitebophir/node-packages.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/tools/admin/awslimitchecker/default.nix b/pkgs/tools/admin/awslimitchecker/default.nix new file mode 100644 index 000000000000..54cf59942233 --- /dev/null +++ b/pkgs/tools/admin/awslimitchecker/default.nix @@ -0,0 +1,58 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "awslimitchecker"; + version = "12.0.0"; + + src = fetchFromGitHub { + owner = "jantman"; + repo = "awslimitchecker"; + rev = version; + sha256 = "1p6n4kziyl6sfq7vgga9v88ddwh3sgnfb1m1cx6q25n0wyl7phgv"; + }; + + propagatedBuildInputs = with python3Packages; [ + boto3 + botocore + pytz + termcolor + versionfinder + ]; + + checkInputs = with python3Packages; [ + freezegun + onetimepass + pytestCheckHook + pyotp + testfixtures + ]; + + patches = [ + # Fix the version lookup to use only the hardcoded version in the source package + ./version.patch + ]; + + pytestFlagsArray = [ + "awslimitchecker/tests" + ]; + + disabledTestPaths = [ + # AWS tests that use the network + "awslimitchecker/tests/services" + "awslimitchecker/tests/test_checker.py" + "awslimitchecker/tests/test_runner.py" + + # the version lookup tests as patched above + "awslimitchecker/tests/test_version.py" + ]; + + pythonImportsCheck = [ "awslimitchecker.checker" ]; + + meta = with lib; { + homepage = "http://awslimitchecker.readthedocs.org"; + changelog = "https://github.com/jantman/awslimitchecker/blob/${version}/CHANGES.rst"; + description = "A script and python package to check your AWS service limits and usage via boto3"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ zakame ]; + }; +} diff --git a/pkgs/tools/admin/awslimitchecker/version.patch b/pkgs/tools/admin/awslimitchecker/version.patch new file mode 100644 index 000000000000..6556fb39a5f2 --- /dev/null +++ b/pkgs/tools/admin/awslimitchecker/version.patch @@ -0,0 +1,35 @@ +--- a/awslimitchecker/version.py ++++ b/awslimitchecker/version.py +@@ -111,32 +106,5 @@ def _get_version_info(): + :returns: awslimitchecker version + :rtype: str + """ +- if os.environ.get('VERSIONCHECK_DEBUG', '') != 'true': +- for lname in ['versionfinder', 'pip', 'git']: +- l = logging.getLogger(lname) +- l.setLevel(logging.CRITICAL) +- l.propagate = True +- try: +- vinfo = find_version('awslimitchecker') +- dirty = '' +- if vinfo.git_is_dirty: +- dirty = '*' +- tag = vinfo.git_tag +- if tag is not None: +- tag += dirty +- commit = vinfo.git_commit +- if commit is not None: +- if len(commit) > 7: +- commit = commit[:8] +- commit += dirty +- return AWSLimitCheckerVersion( +- vinfo.version, +- vinfo.url, +- tag=tag, +- commit=commit +- ) +- except Exception: +- logger.exception("Error checking installed version; this installation " +- "may not be in compliance with the AGPLv3 license:") + # fall back to returning just the hard-coded release information + return AWSLimitCheckerVersion(_VERSION, _PROJECT_URL) diff --git a/pkgs/tools/audio/botamusique/default.nix b/pkgs/tools/audio/botamusique/default.nix index d13bbd13c922..a1c78768f6ab 100644 --- a/pkgs/tools/audio/botamusique/default.nix +++ b/pkgs/tools/audio/botamusique/default.nix @@ -17,7 +17,7 @@ let nodejs = pkgs.nodejs-12_x; nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/tools/backup/discordchatexporter-cli/deps.nix index 7b34bccecb5c..62d0595b4564 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/deps.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -3,7 +3,7 @@ (fetchNuGet { name = "Gress"; version = "1.2.0"; sha256 = "0aidc9whi0718gh896j7xkyndki9x7rifd8n1n681afb2zbxw4bn"; }) (fetchNuGet { name = "JsonExtensions"; version = "1.1.0"; sha256 = "1fqxb2jdbvjgg135wmy890qf63r056dq16jy7wgzkgp21m3j0lgy"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.19"; sha256 = "10fs93kg8vhhm1l05815m8yqz796i6gk824pk1bps239mshmkybr"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.21"; sha256 = "01kbhi29lhv6mg1zfsyakz3z8hfbxnc0kxy0fczl8xqviik9svx7"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; }) (fetchNuGet { name = "MiniRazor.CodeGen"; version = "2.1.4"; sha256 = "1856hfw2wl3ilxmpg4jmwpigmq0rm50i9pmy3sq8f1xc8j44kzl2"; }) (fetchNuGet { name = "MiniRazor.Runtime"; version = "2.1.4"; sha256 = "1pc3kjbnz810a8bb94k6355rflmayigfmpfmc4jzzx6l6iavnnc4"; }) diff --git a/pkgs/tools/backup/hpe-ltfs/default.nix b/pkgs/tools/backup/hpe-ltfs/default.nix index ec8e6392e9cf..5ce6b287e932 100644 --- a/pkgs/tools/backup/hpe-ltfs/default.nix +++ b/pkgs/tools/backup/hpe-ltfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fuse, icu, pkg-config, libxml2, libuuid }: +{ lib, stdenv, fetchFromGitHub, fuse, icu66, pkg-config, libxml2, libuuid }: stdenv.mkDerivation rec { version = "3.4.2_Z7550-02501"; @@ -13,10 +13,15 @@ stdenv.mkDerivation rec { sourceRoot = "source/ltfs"; + # include sys/sysctl.h is deprecated in glibc. The sysctl calls are only used + # for Apple to determine the kernel version. Because this build only targets + # Linux is it safe to remove. + patches = [ ./remove-sysctl.patch ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ - fuse icu libxml2 libuuid + fuse icu66 libxml2 libuuid ]; meta = with lib; { diff --git a/pkgs/tools/backup/hpe-ltfs/remove-sysctl.patch b/pkgs/tools/backup/hpe-ltfs/remove-sysctl.patch new file mode 100644 index 000000000000..35b56522a5bb --- /dev/null +++ b/pkgs/tools/backup/hpe-ltfs/remove-sysctl.patch @@ -0,0 +1,14 @@ +diff --git a/src/libltfs/arch/arch_info.c b/src/libltfs/arch/arch_info.c +index 179428f..114acf0 100644 +--- a/src/libltfs/arch/arch_info.c ++++ b/src/libltfs/arch/arch_info.c +@@ -47,9 +47,6 @@ + */ + + #include "libltfs/ltfs.h" +-#ifndef mingw_PLATFORM +-#include +-#endif + #include + #include + #include diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 04774e851b3e..913367084ed2 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -241,13 +241,14 @@ in rec { ceph-client = runCommand "ceph-client-${version}" { meta = getMeta "Tools needed to mount Ceph's RADOS Block Devices/Cephfs"; } '' - mkdir -p $out/{bin,sbin,etc,${sitePackages},share/bash-completion/completions} + mkdir -p $out/{bin,etc,${sitePackages},share/bash-completion/completions} cp -r ${ceph}/bin/{ceph,.ceph-wrapped,rados,rbd,rbdmap} $out/bin cp -r ${ceph}/bin/ceph-{authtool,conf,dencoder,rbdnamer,syn} $out/bin cp -r ${ceph}/bin/rbd-replay* $out/bin - cp -r ${ceph}/sbin/mount.ceph $out/sbin - cp -r ${ceph}/sbin/mount.fuse.ceph $out/sbin - cp -r ${ceph}/${sitePackages} $out/${sitePackages} + cp -r ${ceph}/sbin/mount.ceph $out/bin + cp -r ${ceph}/sbin/mount.fuse.ceph $out/bin + ln -s bin $out/sbin + cp -r ${ceph}/${sitePackages}/* $out/${sitePackages} cp -r ${ceph}/etc/bash_completion.d $out/share/bash-completion/completions # wrapPythonPrograms modifies .ceph-wrapped, so lets just update its paths substituteInPlace $out/bin/ceph --replace ${ceph} $out diff --git a/pkgs/tools/games/opentracker/deps.nix b/pkgs/tools/games/opentracker/deps.nix index 3d6944b66724..fb3427dbbb49 100644 --- a/pkgs/tools/games/opentracker/deps.nix +++ b/pkgs/tools/games/opentracker/deps.nix @@ -25,11 +25,12 @@ (fetchNuGet { name = "HarfBuzzSharp"; version = "2.6.1.7"; sha256 = "0xm4dr6cs5n1ywbbpp1jrxfk8rn1iy61kdm29kb6bqj1q0gv8zyv"; }) (fetchNuGet { name = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.6.1.7"; sha256 = "1slackrhcwsjn3f6sa0nlrcynzmx5pbqv8j33l9w6z9w7ssq4wkn"; }) (fetchNuGet { name = "JetBrains.Annotations"; version = "2020.3.0"; sha256 = "04xlfqnfg3069f014q8f0vx7y70m8nldbf9fia4b50bp3rry2lv2"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.1.21"; sha256 = "056g9nv8a7n8zdbgzmyzmn3pbg52yq2kv5d1rcp7h6plwzgpiwql"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "3.1.21"; sha256 = "0akdzi35497v8yxr3a9q1g26cnx9vxnwv81kwxi293jklwnx8gsr"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "3.1.21"; sha256 = "16kya6xvi7k42sr8bxgpbz9116dj7g3i18ylpvji9qngdx41891v"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "3.1.21"; sha256 = "0rd3w3i6fzwhi71jcr8i0mchgfgpp1a0qhancg4dxsva032as4s6"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.1.19"; sha256 = "19z4zrchaxcz0a33c33n1qd11z9khj4323nfzsbzah0xxkkj8ka8"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "3.1.19"; sha256 = "0fhj1q9zdy5nqxppjgr8ayqlc2b9zfbrs7h3zc1wlg9xxbzk944y"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "3.1.19"; sha256 = "0cbic6d8ck79fgg7hngfvsdyd9aj6zanf6c36lzdydvqvjza1l48"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "3.1.19"; sha256 = "040rbbxgcqks2f81x2sr8bnrarxygadzv84ksfpwcdw5xjnqj5c9"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.2"; sha256 = "162vb5894zxps0cf5n9gc08an7gwybzz87allx3lsszvllr9ldx4"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Common"; version = "3.9.0"; sha256 = "1x6l6kn8iv5gk1545nxs2gwzkb8gj4sb9kryai132l7yg9afjqik"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp"; version = "3.9.0"; sha256 = "0crb9x5rhija8y7b0iya9axcvinz2hv3bgf80bvz7kv6zpbpszkz"; }) @@ -39,15 +40,14 @@ (fetchNuGet { name = "Microsoft.CodeCoverage"; version = "16.9.1"; sha256 = "18isx8w4kwnlk6hq5ay8i4lgzwhx0zg9brayfdk2lakagvv6yyaf"; }) (fetchNuGet { name = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { name = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.19"; sha256 = "10fs93kg8vhhm1l05815m8yqz796i6gk824pk1bps239mshmkybr"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.19"; sha256 = "1yqkh1z643vfxs2qkhc4h8403ha29f3kpj28cm067zsyr0jn1zbx"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "3.1.19"; sha256 = "1069h3yznipl44gzx0r7srg5yfhkp8v552g1pl7rdnwrbi1xfrbg"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x86"; version = "3.1.19"; sha256 = "19vkqpw5j0zd6b06npx934idjq90av0rhsvcx01z6hlhg80ajr14"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "3.1.19"; sha256 = "10c9bq1z8j173n9jzamgplbxq101yscwdhksshn1ybisn7cr5g0h"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "3.1.19"; sha256 = "0av8fnjmjmws9h1r49ga7an9180z156dii3n0crwmn9fwdw2l7g2"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "3.1.19"; sha256 = "19rw3hpr32x4kwlx7drd2f522pkvhgpscjldg0rg40z6ki3biykd"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x86"; version = "3.1.19"; sha256 = "17kxfradsfdf8cr506izmb3lhgy4kg7ij82cjdx6nxwkpaq96ykw"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.21"; sha256 = "01kbhi29lhv6mg1zfsyakz3z8hfbxnc0kxy0fczl8xqviik9svx7"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.21"; sha256 = "1s5g9gk0hvs268q2zpc32m0my2m2ivlmsmza86797a9vkxr6pzw6"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "3.1.21"; sha256 = "0dl4yakfmdkx6xr18f09cdnl11b4fyp23jg3msr8a25zqdqvcr29"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x86"; version = "3.1.21"; sha256 = "1l5wh5c9bgnzph07cd72q08mr87lsczwl0vy0rzrsi7xpzryvw7l"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "3.1.21"; sha256 = "13692wqcww0w6x4nhyxpxwprdg6mx9xmlvv38m6fvp6g0m27r43v"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "3.1.21"; sha256 = "1p7fpcmx4m2374zjfh53i3mv4lkr8xrkz5lnawv95s7j005m07pc"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "3.1.21"; sha256 = "02zgxzf8l607mh17900n7msga0yfcnqgd70rj1rlwj23plifykx1"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x86"; version = "3.1.21"; sha256 = "1gsrajdhlyndwb0s1c03cbm7wh1yfiwpk075nrlfvicbc4m7h347"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) diff --git a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix index aaf54a05c884..02fdb925fb1b 100644 --- a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix +++ b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/tools/misc/interactsh/default.nix b/pkgs/tools/misc/interactsh/default.nix index b623faea39fb..7da2a7fe729e 100644 --- a/pkgs/tools/misc/interactsh/default.nix +++ b/pkgs/tools/misc/interactsh/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "interactsh"; - version = "0.0.4"; + version = "0.0.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9tmEeYuMRZVkcUupBzJv3rCuy7Il46yh5i0UEUNCNtc="; + sha256 = "sha256-9h2RdP0rVmStl+obMbBHcbfiOBiJ/2sbk2XvH3YaHRo="; }; - vendorSha256 = "sha256-YTzo8YjnJUNXZrYKYTCHOgZAUrMlYzbEEP3yXYfNZqo="; + vendorSha256 = "sha256-9ehliyOCrWSDHVtmuUFBdw4BY6ygOvr2JxxJ3TvmSFU="; modRoot = "."; subPackages = [ diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 8baeb1556b14..e11d0899df4e 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -1,9 +1,40 @@ -{ lib, stdenv, fetchurl, dpkg -, alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib -, gnome2, gdk-pixbuf, gtk3, pango, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }: +{ +alsa-lib, +at-spi2-atk, +at-spi2-core, +atk, +cairo, +cups, +curl, +dbus, +dpkg, +expat, +fetchurl, +fontconfig, +freetype, +gdk-pixbuf, +glib, +gnome2, +gtk3, +lib, +libdrm, +libnotify, +libsecret, +libuuid, +libxcb, +libxkbcommon, +mesa, +nspr, +nss, +pango, +stdenv, +systemd, +wrapGAppsHook, +xorg, +}: let - version = "1.25.0"; + version = "1.29.4"; rpath = lib.makeLibraryPath [ alsa-lib @@ -17,22 +48,24 @@ let expat fontconfig freetype + gdk-pixbuf glib gnome2.GConf - gdk-pixbuf gtk3 - pango + libdrm libnotify libsecret libuuid libxcb + libxkbcommon + mesa nspr nss + pango stdenv.cc.cc systemd - - xorg.libxkbfile xorg.libX11 + xorg.libXScrnSaver xorg.libXcomposite xorg.libXcursor xorg.libXdamage @@ -42,14 +75,16 @@ let xorg.libXrandr xorg.libXrender xorg.libXtst - xorg.libXScrnSaver - ] + ":${stdenv.cc.cc.lib}/lib64"; + xorg.libxkbfile + xorg.libxshmfence + (lib.getLib stdenv.cc.cc) + ]; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "sha256-998/voQ04fLj3KZCy6BueUoI1v++4BoGRTGJT7Nsv40="; + sha256 = "sha256-CqC6BrRhMfjxamSwC6ub1u3+FtDuIq3/OMNdUZgpCAQ="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; @@ -94,8 +129,9 @@ in stdenv.mkDerivation { meta = with lib; { description = "The GUI for MongoDB"; + maintainers = with maintainers; [ bryanasdev000 ]; homepage = "https://www.mongodb.com/products/compass"; - license = licenses.unfree; + license = licenses.sspl; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index 7949a82edc48..a4dc2ba905c1 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -16,9 +16,8 @@ let "mongostat" "mongofiles" "mongotop" - "mongoreplay" ]; - version = "4.2.0"; + version = "100.5.1"; in buildGoPackage { pname = "mongo-tools"; @@ -28,10 +27,10 @@ in buildGoPackage { subPackages = tools; src = fetchFromGitHub { - rev = "r${version}"; + rev = version; owner = "mongodb"; repo = "mongo-tools"; - sha256 = "0mjwvx0cxvb6zam6jyr3753xjnwcygxcjzqhhlsq0b3xnwws9yh7"; + sha256 = "sha256-Qxtb7DJOgrCUvoGVgmKh4qKS4duvEWwW9BLkdt5M5ZY="; }; nativeBuildInputs = [ pkg-config ]; @@ -53,6 +52,7 @@ in buildGoPackage { meta = { homepage = "https://github.com/mongodb/mongo-tools"; description = "Tools for the MongoDB"; + maintainers = with lib.maintainers; [ bryanasdev000 ]; license = lib.licenses.asl20; }; } diff --git a/pkgs/tools/misc/tea/default.nix b/pkgs/tools/misc/tea/default.nix index c968b57c60ad..5ff739c46ba5 100644 --- a/pkgs/tools/misc/tea/default.nix +++ b/pkgs/tools/misc/tea/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tea"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitea { domain = "gitea.com"; owner = "gitea"; repo = "tea"; rev = "v${version}"; - sha256 = "sha256-Y/Znj8vVjVt+rs+n8JRQsptq5u17G2D7r98PDxPLyd4="; + sha256 = "sha256-LtLel6JfmYr2Zu7g7oBjAqDcl5y7tJL3XGL7gw+kHxU="; }; vendorSha256 = null; diff --git a/pkgs/tools/misc/vimpager/build.nix b/pkgs/tools/misc/vimpager/build.nix index a610a461656c..c77f623c5dcd 100644 --- a/pkgs/tools/misc/vimpager/build.nix +++ b/pkgs/tools/misc/vimpager/build.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , coreutils , sharutils +, runtimeShell , version , sha256 }: diff --git a/pkgs/tools/misc/vimpager/latest.nix b/pkgs/tools/misc/vimpager/latest.nix index c98b9a000147..4ea8d5be57fd 100644 --- a/pkgs/tools/misc/vimpager/latest.nix +++ b/pkgs/tools/misc/vimpager/latest.nix @@ -1,7 +1,10 @@ -{ callPackage }: +{ callPackage, runtimeShell }: -callPackage ./build.nix { +(callPackage ./build.nix { version = "a4da4dfac44d1bbc6986c5c76fea45a60ebdd8e5"; sha256 = "0gcjpw2q263hh8w2sjvq3f3k2d28qpkkv0jnl8hw1l7v604i8zxg"; -} - +}).overrideAttrs (old: { + postPatch = old.postPatch or "" + '' + echo 'echo ${runtimeShell}' > scripts/find_shell + ''; +}) diff --git a/pkgs/tools/misc/vimwiki-markdown/default.nix b/pkgs/tools/misc/vimwiki-markdown/default.nix index 18adf99b9c99..3375b86df0fc 100644 --- a/pkgs/tools/misc/vimwiki-markdown/default.nix +++ b/pkgs/tools/misc/vimwiki-markdown/default.nix @@ -6,12 +6,12 @@ }: buildPythonApplication rec { - version = "0.3.3"; + version = "0.4.0"; pname = "vimwiki-markdown"; src = fetchPypi { inherit version pname; - sha256 = "ee4ef08f7e4df27f67ffebb5fa413a7cf4fad967a248c1c75d48b00122a5b945"; + sha256 = "e898c58fa6ecbb7474738d79c44db2b6ab3adfa958bffe80089194c2a70b1ec0"; }; propagatedBuildInputs= [ diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index dd2115f99bff..a08fdcb1dd2c 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -1,8 +1,8 @@ -{ lib, buildPythonApplication, fetchPypi }: +{ lib, buildPythonApplication, fetchPypi, installShellFiles }: buildPythonApplication rec { pname = "you-get"; - version = "0.4.1545"; + version = "0.4.1555"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,14 +10,23 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "63e9b0527424c565303fe3d8ede1cd35d48a4ecf4afe72e1c12b0e90b9fdcd39"; + sha256 = "99282aca720c7ee1d9ef4b63bbbd226e906ea170b789a459fafd5b0627b0b15f"; }; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd you-get \ + --zsh contrib/completion/_you-get \ + --fish contrib/completion/you-get.fish \ + --bash contrib/completion/you-get-completion.bash + ''; + meta = with lib; { description = "A tiny command line utility to download media contents from the web"; homepage = "https://you-get.org"; + changelog = "https://github.com/soimort/you-get/raw/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ ryneeverett ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix index 0bcd0eb4b851..e6ff9b78d386 100644 --- a/pkgs/tools/networking/airfield/node.nix +++ b/pkgs/tools/networking/airfield/node.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/tools/networking/gemget/default.nix b/pkgs/tools/networking/gemget/default.nix new file mode 100644 index 000000000000..e501172f75e5 --- /dev/null +++ b/pkgs/tools/networking/gemget/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "gemget"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "makeworld-the-better-one"; + repo = pname; + rev = "v${version}"; + sha256 = "PmtIgxnzfLduNGTx8SNDky6juv+NTJ8Cr++SOCk/QNU="; + }; + + vendorSha256 = "sha256-Ep6HAJgurxFbA4L77z8V2ar06BBVWlAJS9VoSSUg27U="; + + meta = with lib; { + description = "Command line downloader for the Gemini protocol"; + homepage = "https://github.com/makeworld-the-better-one/gemget"; + license = licenses.mit; + maintainers = with maintainers; [ amfl ]; + }; +} diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index b1a374f0349d..705b2397c6ac 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urlwatch"; - version = "2.23"; + version = "2.24"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "1ryygy7lalmwnv9kc8q4920gkdx878izy33a5dgxb780sy2qq8pg"; + sha256 = "sha256-H7dusAXVEGOUu2fr6UjiXjw13Gm9xNeJDQ4jqV+8QmU="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/tools/networking/ytcc/default.nix index 7b6104e25fc3..9062caa11d58 100644 --- a/pkgs/tools/networking/ytcc/default.nix +++ b/pkgs/tools/networking/ytcc/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "ytcc"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "woefe"; repo = "ytcc"; rev = "v${version}"; - sha256 = "0xpinilb8rnha35laxq076p6v7hdis6davr9ckm5xycs3m4aj7s8"; + sha256 = "1skhg8ca2bjjfi02pjsi3w7v3f4xhzg7bqyy0cajxsymzqzqp7lm"; }; postPatch = '' diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index d86eb8c88657..94cd645d177c 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zerotierone"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "sha256-Itq06zE2AVQ1HSUEQdNUuvEazfU56Hs86T0DEVuF8d4="; + sha256 = "sha256-668KZ2E0jx/s+w4pl+oJbPlfdRGr6ypP2/FoFEBReIk="; }; preConfigure = '' diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix index 106622706f00..62b91a4e4d1f 100644 --- a/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/pkgs/tools/package-management/cargo-outdated/default.nix @@ -1,28 +1,37 @@ -{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, openssl, libiconv, curl, darwin }: +{ lib +, rustPlatform +, fetchCrate +, pkg-config +, openssl +, stdenv +, curl +, Security +, SystemConfiguration +}: rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.9.18"; + version = "0.10.1"; src = fetchCrate { inherit pname version; - sha256 = "19r4nv28iq4cmzs5j127qgvdf7y3pfmgjp6jzzbb8b5xj7w06jhl"; + sha256 = "sha256-jg8KuIu1SaIRlEI9yvpLCESZfAyNgSThJ6pe7+IM6j0="; }; - cargoSha256 = "1rf3sxprra9s76iip2xf82kclgs83fhnlx9ykl9hhn2y0z8r3342"; + cargoSha256 = "sha256-jfZUtUVHEC8zK+FJHSOQxELWTG/Of2WSDoqdg/Sckws="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - libiconv + + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl + Security + SystemConfiguration ]; meta = with lib; { description = "A cargo subcommand for displaying when Rust dependencies are out of date"; homepage = "https://github.com/kbknapp/cargo-outdated"; + changelog = "https://github.com/kbknapp/cargo-outdated/blob/${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ sondr3 ivan ]; }; diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix index 0bcd0eb4b851..e6ff9b78d386 100644 --- a/pkgs/tools/package-management/nixui/nixui.nix +++ b/pkgs/tools/package-management/nixui/nixui.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/tools/security/bpb/default.nix b/pkgs/tools/security/bpb/default.nix index 121c5674c08c..4d601aac1553 100644 --- a/pkgs/tools/security/bpb/default.nix +++ b/pkgs/tools/security/bpb/default.nix @@ -2,6 +2,7 @@ , lib , rustPlatform , fetchFromGitHub +, Security }: rustPlatform.buildRustPackage rec { @@ -20,6 +21,8 @@ rustPlatform.buildRustPackage rec { # a nightly compiler is required unless we use this cheat code. RUSTC_BOOTSTRAP = 1; + buildInputs = lib.optional stdenv.isDarwin Security; + meta = with lib; { description = "Tool to automatically sign git commits, replacing gpg for that purpose"; homepage = "https://github.com/withoutboats/bpb"; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 06c6d0bac26c..f35eecca05a9 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-11-13"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-0/ZKki+QJpBL+K3zQ0H5d5cfan+pKEYHwr6y4U+FKzM="; + sha256 = "sha256-xsTmZdEee/lrRYPemny7lUy13xXVVDrb7w1NBnkzmJM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/onlykey/onlykey.nix b/pkgs/tools/security/onlykey/onlykey.nix index 6fb86dfd79e7..f9a1999f36d7 100644 --- a/pkgs/tools/security/onlykey/onlykey.nix +++ b/pkgs/tools/security/onlykey/onlykey.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix index 2d2816dac0f0..6bdf428b199b 100644 --- a/pkgs/tools/security/vaultwarden/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -19,12 +19,20 @@ in rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-ViXpoPkBznB0o/dc/l1r3m0y+z2w58wqlU8/cg8u7tI="; + postPatch = '' + # Upstream specifies 1.57; nixpkgs has 1.56 which also produces a working + # vaultwarden when using RUSTC_BOOTSTRAP=1 + sed -ri 's/^rust-version = .*//g' Cargo.toml + ''; + nativeBuildInputs = [ pkg-config ]; buildInputs = with lib; [ openssl ] ++ optionals stdenv.isDarwin [ libiconv Security CoreServices ] ++ optional (dbBackend == "mysql") libmysqlclient ++ optional (dbBackend == "postgresql") postgresql; + # vaultwarden depends on rocket v0.5.0-dev, which requires nightly features. + # This may be removed if https://github.com/dani-garcia/vaultwarden/issues/712 is fixed. RUSTC_BOOTSTRAP = 1; cargoBuildFlags = [ featuresFlag ]; @@ -42,6 +50,6 @@ in rustPlatform.buildRustPackage rec { description = "Unofficial Bitwarden compatible server written in Rust"; homepage = "https://github.com/dani-garcia/vaultwarden"; license = licenses.gpl3Only; - maintainers = with maintainers; [ msteen ]; + maintainers = with maintainers; [ msteen ivan ]; }; } diff --git a/pkgs/tools/system/openseachest/default.nix b/pkgs/tools/system/openseachest/default.nix new file mode 100644 index 000000000000..7b7909fbe002 --- /dev/null +++ b/pkgs/tools/system/openseachest/default.nix @@ -0,0 +1,38 @@ +{ lib +, fetchFromGitHub +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "openseachest"; + version = "21.06.21"; + + src = fetchFromGitHub { + owner = "Seagate"; + repo = "openSeaChest"; + rev = "v${version}"; + sha256 = "09xay3frk0yh48ww650dsjp0rx0w1m3ab3rpz5k1jizppv4kk9fi"; + fetchSubmodules = true; + }; + + makeFlags = [ "-C Make/gcc" ]; + buildFlags = [ "release" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share} + cp -r Make/gcc/openseachest_exes/. $out/bin + cp -r docs/man $out/share + + runHook postInstall + ''; + + meta = with lib; { + description = "A collection of command line diagnostic tools for storage devices"; + homepage = "https://github.com/Seagate/openSeaChest"; + license = licenses.mpl20; + maintainers = with maintainers; [ justinas ]; + platforms = with platforms; freebsd ++ linux; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 62efca5b8d00..99f66c938e32 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -378,6 +378,7 @@ mapAliases ({ joseki = apache-jena-fuseki; # added 2016-02-28 jvmci8 = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # added 2021-10-15 json_glib = json-glib; # added 2018-02-25 + kafkacat = kcat; # added 2021-10-07 kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16 k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06 kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # added 2021-06-09 @@ -461,7 +462,6 @@ mapAliases ({ linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rt_5_4 = linuxKernel.packages.linux_rt_5_4; linuxPackages_rt_5_10 = linuxKernel.packages.linux_rt_5_10; - linuxPackages_rt_5_11 = linuxKernel.packages.linux_rt_5_11; linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi2 = linuxKernel.packages.linux_rpi2; linuxPackages_rpi3 = linuxKernel.packages.linux_rpi3; @@ -489,7 +489,6 @@ mapAliases ({ linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4; linux_5_10 = linuxKernel.kernels.linux_5_10; linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10; - linux-rt_5_11 = linuxKernel.kernels.linux_rt_5_11; linux_5_14 = linuxKernel.kernels.linux_5_14; linux_5_15 = linuxKernel.kernels.linux_5_15; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e3e2b65bb0b..06b7f496ace6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -422,9 +422,9 @@ with pkgs; dotnet-sdk_5 = dotnetCorePackages.sdk_5_0; dotnet-sdk_6 = dotnetCorePackages.sdk_6_0; - dotnet-sdk = dotnetCorePackages.sdk_5_0; - dotnet-runtime = dotnetCorePackages.runtime_5_0; - dotnet-aspnetcore = dotnetCorePackages.aspnetcore_5_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-runtime = dotnetCorePackages.runtime_6_0; + dotnet-aspnetcore = dotnetCorePackages.aspnetcore_6_0; dumb-init = callPackage ../applications/virtualization/dumb-init {}; @@ -1343,6 +1343,8 @@ with pkgs; awsebcli = callPackage ../tools/virtualization/awsebcli {}; + awslimitchecker = callPackage ../tools/admin/awslimitchecker { }; + awslogs = callPackage ../tools/admin/awslogs { }; aws-lambda-rie = callPackage ../tools/admin/aws-lambda-runtime-interface-emulator { }; @@ -2228,7 +2230,7 @@ with pkgs; bozohttpd = callPackage ../servers/http/bozohttpd { }; bozohttpd-minimal = callPackage ../servers/http/bozohttpd { minimal = true; }; - bpb = callPackage ../tools/security/bpb { }; + bpb = callPackage ../tools/security/bpb { inherit (darwin.apple_sdk.frameworks) Security; }; bpytop = callPackage ../tools/system/bpytop { }; @@ -2459,6 +2461,8 @@ with pkgs; clprover = callPackage ../applications/science/logic/clprover/clprover.nix { }; + clusterctl = callPackage ../applications/networking/cluster/clusterctl { }; + coloredlogs = with python3Packages; toPythonApplication coloredlogs; colord-kde = libsForQt5.callPackage ../tools/misc/colord-kde {}; @@ -5435,6 +5439,8 @@ with pkgs; gelasio = callPackage ../data/fonts/gelasio { }; + gemget = callPackage ../tools/networking/gemget {}; + gen-oath-safe = callPackage ../tools/security/gen-oath-safe { }; genext2fs = callPackage ../tools/filesystems/genext2fs { }; @@ -8199,6 +8205,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon PCSC; }; + openseachest = callPackage ../tools/system/openseachest { }; + opensm = callPackage ../tools/networking/opensm { }; tinyssh = callPackage ../tools/networking/tinyssh { }; @@ -12782,7 +12790,9 @@ with pkgs; cargo-graph = callPackage ../tools/package-management/cargo-graph { }; cargo-license = callPackage ../tools/package-management/cargo-license { }; cargo-llvm-lines = callPackage ../development/tools/rust/cargo-llvm-lines { }; - cargo-outdated = callPackage ../tools/package-management/cargo-outdated {}; + cargo-outdated = callPackage ../tools/package-management/cargo-outdated { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + }; cargo-release = callPackage ../tools/package-management/cargo-release { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -14709,10 +14719,10 @@ with pkgs; k2tf = callPackage ../development/tools/misc/k2tf { }; - kafkacat = callPackage ../development/tools/kafkacat { }; - kati = callPackage ../development/tools/build-managers/kati { }; + kcat = callPackage ../development/tools/kcat { }; + kcc = libsForQt5.callPackage ../applications/graphics/kcc { }; kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends { @@ -15541,7 +15551,9 @@ with pkgs; appstream-glib = callPackage ../development/libraries/appstream-glib { }; - apr = callPackage ../development/libraries/apr { }; + apr = callPackage ../development/libraries/apr { + autoreconfHook = buildPackages.autoreconfHook269; + }; aprutil = callPackage ../development/libraries/apr-util { db = if stdenv.isFreeBSD then db4 else db; @@ -17228,6 +17240,8 @@ with pkgs; libbass = (callPackage ../development/libraries/audio/libbass { }).bass; libbass_fx = (callPackage ../development/libraries/audio/libbass { }).bass_fx; + libbde = callPackage ../development/libraries/libbde { }; + libbencodetools = callPackage ../development/libraries/libbencodetools { }; libbluedevil = callPackage ../development/libraries/libbluedevil { }; @@ -22116,6 +22130,8 @@ with pkgs; linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened; linuxPackages_5_14_hardened = linuxKernel.packages.linux_5_14_hardened; linux_5_14_hardened = linuxKernel.kernels.linux_5_14_hardened; + linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened; + linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened; # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest; @@ -25464,6 +25480,8 @@ with pkgs; gtkpod = callPackage ../applications/audio/gtkpod { }; + q4wine = libsForQt5.callPackage ../applications/misc/q4wine { }; + qrcodegen = callPackage ../development/libraries/qrcodegen { }; qrencode = callPackage ../development/libraries/qrencode { }; @@ -31537,6 +31555,8 @@ with pkgs; honeytrap = callPackage ../tools/security/honeytrap { }; + kissat = callPackage ../applications/science/logic/kissat {}; + tini = callPackage ../applications/virtualization/tini {}; ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 5e73426afbcb..bf5b65f93885 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -88,6 +88,7 @@ let semantics = callPackage ../development/coq-modules/semantics {}; serapi = callPackage ../development/coq-modules/serapi {}; simple-io = callPackage ../development/coq-modules/simple-io { }; + smpl = callPackage ../development/coq-modules/smpl { }; stdpp = callPackage ../development/coq-modules/stdpp { }; StructTact = callPackage ../development/coq-modules/StructTact {}; tlc = callPackage ../development/coq-modules/tlc {}; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 8c97a418b295..e109cca82077 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -159,14 +159,6 @@ in { ]; }; - linux_rt_5_11 = callPackage ../os-specific/linux/kernel/linux-rt-5.11.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.export-rt-sched-migrate - ]; - }; - linux_5_14 = callPackage ../os-specific/linux/kernel/linux-5.14.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -233,6 +225,7 @@ in { linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { }; linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; linux_5_14_hardened = hardenedKernelFor kernels.linux_5_14 { }; + linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; })); /* Linux kernel modules are inherently tied to a specific kernel. So @@ -482,7 +475,6 @@ in { # realtime kernel packages linux_rt_5_4 = packagesFor kernels.linux_rt_5_4; linux_rt_5_10 = packagesFor kernels.linux_rt_5_10; - linux_rt_5_11 = packagesFor kernels.linux_rt_5_11; }; rpiPackages = { @@ -506,6 +498,7 @@ in { linux_5_4_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_4 { }); linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { }); linux_5_14_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_14 { }); + linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { }); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); @@ -524,7 +517,7 @@ in { linux_latest = packages.linux_5_15; linux_mptcp = packages.linux_mptcp_95; linux_rt_default = packages.linux_rt_5_4; - linux_rt_latest = packages.linux_rt_5_11; + linux_rt_latest = packages.linux_rt_5_10; linux_hardkernel_latest = packages.hardkernel_4_14; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 74691f1df2d2..b2d2d2415e24 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1459,7 +1459,7 @@ let if lib.versionOlder "4.08" ocaml.version then import ../development/ocaml-modules/janestreet/0.14.nix { inherit self; - inherit (pkgs) lib openssl zstd; + inherit (pkgs) fetchpatch lib openssl zstd; } else if lib.versionOlder "4.07" ocaml.version then import ../development/ocaml-modules/janestreet/0.12.nix { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 627fdbb039ae..e7b7e9017fac 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9344,6 +9344,8 @@ in { toposort = callPackage ../development/python-modules/toposort { }; + torchaudio-bin = callPackage ../development/python-modules/torchaudio/bin.nix { }; + torchgpipe = callPackage ../development/python-modules/torchgpipe { }; torchvision = callPackage ../development/python-modules/torchvision { }; @@ -9696,6 +9698,8 @@ in { vdirsyncer = callPackage ../development/python-modules/vdirsyncer { }; + vehicle = callPackage ../development/python-modules/vehicle { }; + vega = callPackage ../development/python-modules/vega { }; vega_datasets = callPackage ../development/python-modules/vega_datasets { };