Unverified Commit 03bb3f79 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents 63261390 c9320d56
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -949,13 +949,13 @@
    "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0="
  },
  "newrelic_newrelic": {
    "hash": "sha256-1OpvSayWq194591u/z9oHz80ZmPA9fSZpKSBwDHL/tk=",
    "hash": "sha256-OdvDvo40fjuKoRjI1r1re/h2i5JopssRF5dQye4AsSM=",
    "homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
    "owner": "newrelic",
    "repo": "terraform-provider-newrelic",
    "rev": "v3.74.0",
    "rev": "v3.75.2",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-7zUUV3cqVesItNnE/EcO5/l+nafV04JdoNkmTxnulio="
    "vendorHash": "sha256-LBOxoSGvJ5AWS71UINBbVgDxLZqDpNgq7lY8LaPZsvs="
  },
  "ns1-terraform_ns1": {
    "hash": "sha256-S0ji/gZsbMTgug7DwPODAcPx3IfRaw1JHYPJ6V+tqeM=",
+3 −3
Original line number Diff line number Diff line
@@ -11,16 +11,16 @@

rustPlatform.buildRustPackage rec {
  pname = "cargo-semver-checks";
  version = "0.44.0";
  version = "0.45.0";

  src = fetchFromGitHub {
    owner = "obi1kenobi";
    repo = "cargo-semver-checks";
    tag = "v${version}";
    hash = "sha256-QU8vLdq129gcGi8/VfjflY6zkIXXam/Ri2zjbO3sPNg=";
    hash = "sha256-sDx449IXsFUeNL7rXbGC+HUshwqcbpjvGwl0WIJZmwo=";
  };

  cargoHash = "sha256-0oPAIhhBcCwZT8sD2PWJ5ZDuMMFvmwxhyOXJWA9+jZg=";
  cargoHash = "sha256-meF1qnISB60JXKZyYfnwE2LywGqKEVgZbwzZQEZ1Cmc=";

  nativeBuildInputs = [
    cmake
+3 −3
Original line number Diff line number Diff line
@@ -7,18 +7,18 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
  pname = "emmylua_ls";
  version = "0.16.0";
  version = "0.17.0";

  src = fetchFromGitHub {
    owner = "EmmyLuaLs";
    repo = "emmylua-analyzer-rust";
    tag = finalAttrs.version;
    hash = "sha256-6mcVIOKsC+1cboZ8e23J0m2ed/2ohR0F3LfrM9UlaR4=";
    hash = "sha256-CAYSaRjpQwnPZojeX/VyV9/xz8SY8Lt+e1wc79qvGZg=";
  };

  buildAndTestSubdir = "crates/emmylua_ls";

  cargoHash = "sha256-d6dhrib4mz7KmHo3EbkUXBPpjEGu35GeYNkpIrJrKJI=";
  cargoHash = "sha256-nGSN7LqvAwYg2Z+2tTAc+vIwrYmb+W0OLw9EeG7e/V8=";

  nativeInstallCheckInputs = [
    versionCheckHook
+57 −0
Original line number Diff line number Diff line
{
  lib,
  python3Packages,
  fetchFromGitHub,
  libkrb5,
  versionCheckHook,
  nix-update-script,
  enableKerberos ? true,
}:

python3Packages.buildPythonApplication rec {
  pname = "evil-winrm-py";
  version = "1.5.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "adityatelange";
    repo = "evil-winrm-py";
    tag = "v${version}";
    hash = "sha256-IACFPPlkgyJh78p6Jy740CQqcySkMTV/8VVPSRJKTPI=";
  };

  # Removes the additional binary ewp
  postPatch = ''
    substituteInPlace setup.py \
      --replace-fail '"ewp = evil_winrm_py.evil_winrm_py:main",' ""
  '';

  build-system = [ python3Packages.setuptools ];

  dependencies =
    with python3Packages;
    [
      pypsrp
      prompt-toolkit
      tqdm
    ]
    ++ lib.optionals enableKerberos pypsrp.optional-dependencies.kerberos;

  # Add the C library if Kerberos is enabled
  buildInputs = lib.optionals enableKerberos [ libkrb5 ];

  nativeInstallCheckInputs = [ versionCheckHook ];
  versionCheckProgramArg = "--version";
  doInstallCheck = true;

  passthru.updateScript = nix-update-script { };

  meta = {
    description = "Execute commands interactively on remote Windows machines using the WinRM protocol";
    homepage = "https://github.com/adityatelange/evil-winrm-py";
    changelog = "https://github.com/adityatelange/evil-winrm-py/releases/tag/v${version}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ letgamer ];
    mainProgram = "evil-winrm-py";
  };
}
+3 −3
Original line number Diff line number Diff line
@@ -11,13 +11,13 @@

buildNpmPackage rec {
  pname = "ghostfolio";
  version = "2.214.0";
  version = "2.215.0";

  src = fetchFromGitHub {
    owner = "ghostfolio";
    repo = "ghostfolio";
    tag = version;
    hash = "sha256-x8GUlC1/TxA40rDQu3Ae2P5v5LFtberOQWtx5GJ7rMw=";
    hash = "sha256-j7UmjyayVbun4PrNSPwOi2+EGUhyTFuLQLSIZp8l95g=";
    # populate values that require us to use git. By doing this in postFetch we
    # can delete .git afterwards and maintain better reproducibility of the src.
    leaveDotGit = true;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
    '';
  };

  npmDepsHash = "sha256-hHfT4gsf0D5XPY4RuQCKWNWp+iav9B75YMs70xayqtc=";
  npmDepsHash = "sha256-58e/LBgB4MQIp3xUdQXVvmq7krQ8+i0ku9xineC1HRU=";

  nativeBuildInputs = [
    prisma
Loading