From 30ff3e31460f1220dfeed0048e5a9f78a32c762d Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Wed, 20 Jul 2022 15:24:12 -0700 Subject: [PATCH 01/12] schemaspy: 6.1.0 -> dev Unfortunately, schemaspy is broken with graphviz 3.0.0, and they haven't tagged their releases in a very long time. Let's just build from source and not worry about it. --- .../tools/database/schemaspy/default.nix | 74 ++++++++++++++++--- 1 file changed, 63 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/development/tools/database/schemaspy/default.nix index 7a755d0186b3..30100bac08a0 100644 --- a/pkgs/development/tools/database/schemaspy/default.nix +++ b/pkgs/development/tools/database/schemaspy/default.nix @@ -1,30 +1,83 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper, graphviz }: +{ lib +, stdenv +, callPackage +, maven +, jdk +, jre +, buildMaven +, makeWrapper +, git +, fetchFromGitHub +, graphviz +, ensureNewerSourcesHook +}: -stdenv.mkDerivation rec { - version = "6.1.0"; +let + version = "6.1.1-SNAPSHOT"; pname = "schemaspy"; - src = fetchurl { - url = "https://github.com/schemaspy/schemaspy/releases/download/v${version}/${pname}-${version}.jar"; - sha256 = "0lgz6b17hx9857fb2l03ggz8y3n8a37vrcsylif0gmkwj1v4qgl7"; + src = fetchFromGitHub { + owner = "schemaspy"; + repo = "schemaspy"; + rev = "110b1614f9ae4aec0e4dc4e8f0e7c647274d3af6"; + sha256 = "sha256-X5B34zGhD/NxcK8TQvwdk1NljGJ1HwfBp47ocbE4HiU="; }; - dontUnpack = true; + deps = stdenv.mkDerivation { + name = "${pname}-${version}-deps"; + inherit src; + + nativeBuildInputs = [ jdk maven git ]; + buildInputs = [ jre ]; + + buildPhase = '' + mvn package -Dmaven.test.skip=true -Dmaven.repo.local=$out/.m2 -Dmaven.wagon.rto=5000 + ''; + + # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside + installPhase = '' + find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete + find $out/.m2 -type f -iname '*.pom' -exec sed -i -e 's/\r\+$//' {} \; + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "sha256-CUFA9L6qqjo3Jp5Yy1yCqbS9QAEb9PElys4ArPa9VhA="; + + doCheck = false; + }; +in +stdenv.mkDerivation rec { + inherit version pname src; buildInputs = [ - jre + maven ]; nativeBuildInputs = [ makeWrapper + # the build system gets angry if it doesn't see git (even though it's not + # actually in a git repository) + git + + # springframework boot gets angry about 1970 sources + # fix from https://github.com/nix-community/mavenix/issues/25 + (ensureNewerSourcesHook { year = "1980"; }) ]; wrappedPath = lib.makeBinPath [ graphviz ]; + buildPhase = '' + VERSION=${version} + SEMVER_STR=${version} + + mvn package --offline -Dmaven.test.skip=true -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 + ''; + installPhase = '' - install -D ${src} "$out/share/java/${pname}-${version}.jar" + install -D target/${pname}-${version}.jar $out/share/java/${pname}-${version}.jar makeWrapper ${jre}/bin/java $out/bin/schemaspy \ --add-flags "-jar $out/share/java/${pname}-${version}.jar" \ @@ -34,8 +87,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://schemaspy.org"; description = "Document your database simply and easily"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.mit; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ jraygauthier ]; }; } From d31cf8ca0cbfe01419db3599aa6dc25a13f9766a Mon Sep 17 00:00:00 2001 From: lucasew Date: Sat, 22 Oct 2022 11:03:31 -0300 Subject: [PATCH 02/12] nixos/uvesafb: init Signed-off-by: lucasew --- nixos/modules/module-list.nix | 1 + nixos/modules/system/boot/uvesafb.nix | 39 +++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 nixos/modules/system/boot/uvesafb.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1a87df989769..9f4200fee619 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1252,6 +1252,7 @@ ./system/boot/systemd/user.nix ./system/boot/timesyncd.nix ./system/boot/tmp.nix + ./system/boot/uvesafb.nix ./system/etc/etc-activation.nix ./tasks/auto-upgrade.nix ./tasks/bcache.nix diff --git a/nixos/modules/system/boot/uvesafb.nix b/nixos/modules/system/boot/uvesafb.nix new file mode 100644 index 000000000000..b10dc42887a1 --- /dev/null +++ b/nixos/modules/system/boot/uvesafb.nix @@ -0,0 +1,39 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.boot.uvesafb; + inherit (lib) mkIf mkEnableOption mkOption mdDoc types; +in { + options = { + boot.uvesafb = { + enable = mkEnableOption (mdDoc "uvesafb"); + + gfx-mode = mkOption { + type = types.str; + default = "1024x768-32"; + description = mdDoc "Screen resolution in modedb format. See [uvesafb](https://docs.kernel.org/fb/uvesafb.html) and [modedb](https://docs.kernel.org/fb/modedb.html) documentation for more details. The default value is a sensible default but may be not ideal for all setups."; + }; + + v86d.package = mkOption { + type = types.package; + description = mdDoc "Which v86d package to use with uvesafb"; + defaultText = ''config.boot.kernelPackages.v86d.overrideAttrs (old: { + hardeningDisable = [ "all" ]; + })''; + default = config.boot.kernelPackages.v86d.overrideAttrs (old: { + hardeningDisable = [ "all" ]; + }); + }; + }; + }; + config = mkIf cfg.enable { + boot.initrd = { + kernelModules = [ "uvesafb" ]; + extraFiles."/usr/v86d".source = cfg.v86d.package; + }; + + boot.kernelParams = [ + "video=uvesafb:mode:${cfg.gfx-mode},mtrr:3,ywrap" + ''uvesafb.v86d="${cfg.v86d.package}/bin/v86d"'' + ]; + }; +} From 488da5d839dfe8a7e87d9afaccf3d8884026423d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Oct 2022 16:28:38 +0000 Subject: [PATCH 03/12] exoscale-cli: 1.59.3 -> 1.60.0 --- pkgs/tools/admin/exoscale-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index a643b9929c33..0fdf54c0e0cc 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "exoscale-cli"; - version = "1.59.3"; + version = "1.60.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-QJDj8YW7gO0xvKqUYrgNlSfOqtk29C3nLsqO1BjowTE="; + sha256 = "sha256-hvLPLqy5wgywM4vZizBiB2jpC5JszSC5bUSmchqGQcA="; }; vendorSha256 = null; From 2813d781c5fc6e24d48e0468f08d9a2747aa20e1 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 25 Oct 2022 12:22:38 +0200 Subject: [PATCH 04/12] magnetico: 0.12.0 -> unstable-2022-08-10 Note: this switches a more recently update fork, https://github.com/ireun/magnetico --- .../networking/p2p/magnetico/default.nix | 27 ++++++++++++++----- pkgs/top-level/all-packages.nix | 5 +--- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/applications/networking/p2p/magnetico/default.nix index 124e3492c8cd..f7130edf66a5 100644 --- a/pkgs/applications/networking/p2p/magnetico/default.nix +++ b/pkgs/applications/networking/p2p/magnetico/default.nix @@ -1,27 +1,40 @@ -{ lib, fetchFromGitHub, buildGoModule, go-bindata }: +{ lib +, fetchFromGitHub +, nixosTests +, buildGoModule +}: buildGoModule rec { pname = "magnetico"; - version = "0.12.0"; + version = "unstable-2022-08-10"; src = fetchFromGitHub { - owner = "boramalper"; + owner = "ireun"; repo = "magnetico"; - rev = "v${version}"; - sha256 = "1avqnfn4llmc9xmpsjfc9ivki0cfvd8sljfzd9yac94xcj581s83"; + rev = "828e230d3b3c0759d3274e27f5a7b70400f4d6ea"; + sha256 = "sha256-V1pBzillWTk9iuHAhFztxYaq4uLL3U3HYvedGk6ffbk="; }; - vendorSha256 = "087kikj6sjhjxqymnj7bpxawfmwckihi6mbmi39w0bn2040aflx5"; + vendorSha256 = "sha256-ngYkTtBEZSyYYnfBHi0VrotwKGvMOiowbrwigJnjsuU="; - nativeBuildInputs = [ go-bindata ]; buildPhase = '' + runHook preBuild + make magneticow magneticod + + runHook postBuild ''; checkPhase = '' + runHook preBuild + make test + + runHook postBuild ''; + passthru.tests = { inherit (nixosTests) magnetico; }; + meta = with lib; { description = "Autonomous (self-hosted) BitTorrent DHT search engine suite"; homepage = "https://github.com/boramalper/magnetico"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05182417be43..940c77082afd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29996,10 +29996,7 @@ with pkgs; electron = electron_9; }; - magnetico = callPackage ../applications/networking/p2p/magnetico { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + magnetico = callPackage ../applications/networking/p2p/magnetico { }; mastodon-bot = nodePackages.mastodon-bot; From 1c06cf972cdefeb7453e4b130a4db3bac45a1fbe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Oct 2022 15:57:35 +0000 Subject: [PATCH 05/12] flyctl: 0.0.417 -> 0.0.419 --- pkgs/development/web/flyctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 38864995297a..bf4341006b0e 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.417"; + version = "0.0.419"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-Bxe0YzSHF7ziCLiyxb1inWbwZAqRO6/qFxWsllbjXK4="; + sha256 = "sha256-x9ZwwUn6Rwn6tGaSpkWc8syMJDusn4j2QzLjmr1/ciM="; }; vendorSha256 = "sha256-a0ZnZlKB/Uotrm4npXB1dd1+oWHRhJVW7ofMSKlqcvM="; From 9f8a55aee51d118f81fb66af3691b359a306d00b Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Tue, 25 Oct 2022 12:16:38 -0400 Subject: [PATCH 06/12] python3Packages.flit-scm: init at 1.7.0 --- .../python-modules/flit-scm/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/flit-scm/default.nix diff --git a/pkgs/development/python-modules/flit-scm/default.nix b/pkgs/development/python-modules/flit-scm/default.nix new file mode 100644 index 000000000000..494df272445f --- /dev/null +++ b/pkgs/development/python-modules/flit-scm/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitLab +, pythonOlder +, git +, flit-core +, setuptools-scm +, tomli +}: + +buildPythonPackage rec { + pname = "flit-scm"; + version = "1.7.0"; + + format = "pyproject"; + + src = fetchFromGitLab { + owner = "WillDaSilva"; + repo = "flit_scm"; + rev = version; + sha256 = "sha256-K5sH+oHgX/ftvhkY+vIg6wUokAP96YxrTWds3tnEtyg="; + leaveDotGit = true; + }; + + nativeBuildInputs = [ flit-core setuptools-scm tomli git ]; + propagatedBuildInputs = [ flit-core setuptools-scm ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + + meta = with lib; { + description = "A PEP 518 build backend that uses setuptools_scm to generate a version file from your version control system, then flit to build the package."; + homepage = "https://gitlab.com/WillDaSilva/flit_scm"; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ac7aea67d2e7..d25523db9bfd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3525,6 +3525,8 @@ in { flit-core = callPackage ../development/python-modules/flit-core { }; + flit-scm = callPackage ../development/python-modules/flit-scm { }; + flow-record = callPackage ../development/python-modules/flow-record { }; flower = callPackage ../development/python-modules/flower { }; From 43294d3272034caaee2fe6f0bb56f00c4daa7de5 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Wed, 26 Oct 2022 00:23:04 +0200 Subject: [PATCH 07/12] python3Packages.rtoml: 0.7 -> 0.8 --- pkgs/development/python-modules/rtoml/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/rtoml/default.nix b/pkgs/development/python-modules/rtoml/default.nix index 2d2aef6f7226..886073951f10 100644 --- a/pkgs/development/python-modules/rtoml/default.nix +++ b/pkgs/development/python-modules/rtoml/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rtoml"; - version = "0.7"; + version = "0.8"; disabled = pythonOlder "3.7"; @@ -18,13 +18,13 @@ buildPythonPackage rec { owner = "samuelcolvin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-h4vY63pDkrMHt2X244FssLxHsphsfjNd6gnVFUeZZTY="; + sha256 = "sha256-tvX4KcQGw0khBjEXVFmkhsVyAkdr2Bgm6IfD1yGZ37c="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "05fwcs6w023ihw3gyihzbnfwjaqy40d6h0z2yas4kqkkvz9x4f8j"; + sha256 = "sha256-KcF3Z71S7ZNZicViqwpClfT736nYYbKcKWylOP+S3HI="; }; nativeBuildInputs = with rustPlatform; [ @@ -50,11 +50,6 @@ buildPythonPackage rec { cd tests ''; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" - ]; - meta = with lib; { description = "Rust based TOML library for Python"; homepage = "https://github.com/samuelcolvin/rtoml"; From dc01cdfd4009e3c8ab0ca7467a972eae8c454d06 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Tue, 25 Oct 2022 16:51:50 -0700 Subject: [PATCH 08/12] svd2rust: 0.27.0 -> 0.27.1 --- pkgs/development/tools/rust/svd2rust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index 8250e7802cca..6bc79e163fb8 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "svd2rust"; - version = "0.27.0"; + version = "0.27.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-fU/qaYuuZM9tfveWYD4tCJugLELTR4DlQsr4WP/0f4o="; + sha256 = "sha256-Tnow5NjeDyz4oMY+UMs2TDquLTioElhSNzbC6eEYpTs="; }; - cargoSha256 = "sha256-csiwkBOiIzIVADjKFE8YvBRO0iqtEr4I4s0XDMyb7Sc="; + cargoSha256 = "sha256-sN3uJTU9h9Ls2fygz6My3hao77lQFdNkA0gkUevV7Jc="; meta = with lib; { description = "Generate Rust register maps (`struct`s) from SVD files"; From 5c7405264b4ba42b99a754392196e897ad68b360 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Oct 2022 01:07:17 +0000 Subject: [PATCH 09/12] python310Packages.trimesh: 3.15.5 -> 3.15.7 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 0256d396bc94..dfb8e5786f76 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.15.5"; + version = "3.15.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jzQEsrCwSB+OY9XGmztkvbM2ZzT4mUkuYvO86ed6XUc="; + sha256 = "sha256-4BVU2rubDyBpg6OmUl5dqiFAkgeHJvqW96kL/Im0su8="; }; propagatedBuildInputs = [ numpy ]; From f540aeda6f677354f1e7144ab04352f61aaa0118 Mon Sep 17 00:00:00 2001 From: Winter Date: Fri, 5 Aug 2022 23:30:00 -0400 Subject: [PATCH 10/12] nixos/make-options-doc: fix JSON generation on Darwin --- nixos/lib/make-options-doc/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix index 9a75956b0d69..dde3cac1c1ba 100644 --- a/nixos/lib/make-options-doc/default.nix +++ b/nixos/lib/make-options-doc/default.nix @@ -125,7 +125,11 @@ in rec { nativeBuildInputs = [ pkgs.brotli (let - self = (pkgs.python3Minimal.override { + # python3Minimal can't be overridden with packages on Darwin, due to a missing framework. + # Instead of modifying stdenv, we take the easy way out, since most people on Darwin will + # just be hacking on the Nixpkgs manual (which also uses make-options-doc). + python = if pkgs.stdenv.isDarwin then pkgs.python3 else pkgs.python3Minimal; + self = (python.override { inherit self; includeSiteCustomize = true; }); From 20b8341da16792b4869d4606400f465ecf135154 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Oct 2022 03:41:32 +0000 Subject: [PATCH 11/12] =?UTF-8?q?terraform-providers.baiducloud:=201.16.0?= =?UTF-8?q?=20=E2=86=92=201.16.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 61b60410141e..d34883b36fa4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -138,13 +138,13 @@ "version": "1.0.0" }, "baiducloud": { - "hash": "sha256-9r9Y1iegVgaZk+2bKB0uHy6w0JotDuNUXemOqtJSAeg=", + "hash": "sha256-7dNFy3UJ20HbacmaZDxv3IRxsDHGgJdMJFa4/pJIYdw=", "owner": "baidubce", "provider-source-address": "registry.terraform.io/baidubce/baiducloud", "repo": "terraform-provider-baiducloud", - "rev": "v1.16.0", + "rev": "v1.16.1", "vendorHash": null, - "version": "1.16.0" + "version": "1.16.1" }, "bigip": { "hash": "sha256-uSe+J4AlW8Dt96BVF1ZI/yrgWUbZsl64b/D+k5ysHC0=", From d012fa02810e009fa8a775f819faf44e10a13f23 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Oct 2022 03:43:56 +0000 Subject: [PATCH 12/12] =?UTF-8?q?terraform-providers.elasticsearch:=202.0.?= =?UTF-8?q?5=20=E2=86=92=202.0.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d34883b36fa4..49da95bd41eb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -349,13 +349,13 @@ "version": "2.22.0" }, "elasticsearch": { - "hash": "sha256-7sMF7LBM5tnOtERufh7LaJlfcJ5WHIynpzlTg/05u3I=", + "hash": "sha256-+cktPArBOysc4V+uR3KWsVlxtxSIbuVMCmPSU21xF/U=", "owner": "phillbaker", "provider-source-address": "registry.terraform.io/phillbaker/elasticsearch", "repo": "terraform-provider-elasticsearch", - "rev": "v2.0.5", + "rev": "v2.0.6", "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=", - "version": "2.0.5" + "version": "2.0.6" }, "equinix": { "hash": "sha256-gvI9awkKiWWnw6O/KvskFTHZfvajGfgYu8DGsT34Siw=",