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

Merge staging-next into staging

parents b172c0fa 897b3203
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -570,22 +570,22 @@
    "vendorHash": null
  },
  "harbor": {
    "hash": "sha256-IxtPbdgjRpqN2ZRSLjtrl6sHrVAiQI+TkZboHsD/6qU=",
    "hash": "sha256-Z3lytylGY67wOajPPLqnmmhzxoJD1EfjSU0h3yg+kzY=",
    "homepage": "https://registry.terraform.io/providers/goharbor/harbor",
    "owner": "goharbor",
    "repo": "terraform-provider-harbor",
    "rev": "v3.11.0",
    "rev": "v3.11.2",
    "spdx": "MIT",
    "vendorHash": "sha256-UmlhKa2SVgrhRc1EOO9sEkherIS77CP+hkAL3Y79h3U="
  },
  "hcloud": {
    "hash": "sha256-O6GaMSL5E9t5v9nsRh7aGIXy/w04sCy7AYG4AvGsbLc=",
    "hash": "sha256-2IEi5YE7iXGmf1bKDZgswf5v5Hw9SdhSb1GxNzsm8qM=",
    "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud",
    "owner": "hetznercloud",
    "repo": "terraform-provider-hcloud",
    "rev": "v1.52.0",
    "rev": "v1.53.1",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-pYetWQ7IIEvm2p9DoAh91W9atoCRgYDXCmthCiL5Vu0="
    "vendorHash": "sha256-vwuWz881nn901lAubv2xNCCIoNtyaVQJ77PM8E1LHjg="
  },
  "helm": {
    "hash": "sha256-i4ceWiEXJYL1x9DmqAfcUidiW5+x/sRCxevDz4MnzHs=",
@@ -1318,11 +1318,11 @@
    "vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo="
  },
  "sysdig": {
    "hash": "sha256-KAwuE67gNOrDDLxgbxMtub0tMa45IiIOJ9Sq9mncK4c=",
    "hash": "sha256-C2jHcYSVdDyP42XyMleMmTYo5A+xDJuTVcE4LXHwFWk=",
    "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",
    "owner": "sysdiglabs",
    "repo": "terraform-provider-sysdig",
    "rev": "v1.59.0",
    "rev": "v1.60.0",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-rWiafaFE1RolO9JUN1WoW4EWJjR7kpfeVEOTLf21j50="
  },
+3 −3
Original line number Diff line number Diff line
@@ -8,13 +8,13 @@

stdenv.mkDerivation {
  pname = "btor2tools";
  version = "0-unstable-2024-08-07";
  version = "0-unstable-2025-09-18";

  src = fetchFromGitHub {
    owner = "boolector";
    repo = "btor2tools";
    rev = "44bcadbfede292ff4c4a4a8962cc18130de522fb";
    sha256 = "0ncl4xwms8d656x95ga8v8zjybx4cmdl5hlcml7dpcgm3p8qj4ks";
    rev = "d33c73ff1d173f1bfac8ba6b1c6d68ba62c55f8e";
    sha256 = "sha256-RVjZ5HM2yQ3eAICFuzwvNeQDXzWzzSiCCslIWMJi6U8=";
  };

  nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+3 −3
Original line number Diff line number Diff line
@@ -9,17 +9,17 @@
}:
rustPlatform.buildRustPackage rec {
  pname = "codeberg-cli";
  version = "0.5.0";
  version = "0.5.1";

  src = fetchFromGitea {
    domain = "codeberg.org";
    owner = "Aviac";
    repo = "codeberg-cli";
    rev = "v${version}";
    hash = "sha256-eTr+vkHHbUnUIli7PDEb/1abr2z2m0AZK8sTrkADaqM=";
    hash = "sha256-81435dgw7fy4igUN3TYNjRans8uRZ/6TQWBxu0benwU=";
  };

  cargoHash = "sha256-/cPso8VGG7a1ODHLFMQ1Pyr6NA+7umY+Z2iCBJfIGdE=";
  cargoHash = "sha256-1E7UuDbJKrnhMQI6trk7nHkeywCPFg1021pQhRcb4kQ=";
  nativeBuildInputs = [
    pkg-config
    installShellFiles
+5 −5
Original line number Diff line number Diff line
@@ -65,12 +65,12 @@
let
  sources = {
    x86_64-linux = fetchurl {
      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/72e0cee3/Feishu-linux_x64-7.46.12.deb";
      sha256 = "sha256-qdaWx4vQQWJtEX+3xo6oGp82sblsWb1jB96w8djc7wM=";
      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/1d078929/Feishu-linux_x64-7.50.13.deb";
      sha256 = "sha256-wP3Uyz3KiWLADzUhZnPJori2gqdzEm5azUcGv8w1BXM=";
    };
    aarch64-linux = fetchurl {
      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/ea20b00e/Feishu-linux_arm64-7.46.12.deb";
      sha256 = "sha256-zh65+v9JWRv631hQDSnKwH1C8I35ddRpq8kcnhRe4wo=";
      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/05ade0ea/Feishu-linux_arm64-7.50.13.deb";
      sha256 = "sha256-9YTk3Jx1Ap5ym2N/GiN8YcB6XfyVElSWZV3/O6gJWNE=";
    };
  };

@@ -133,7 +133,7 @@ let
  ];
in
stdenv.mkDerivation {
  version = "7.46.12";
  version = "7.50.13";
  pname = "feishu";

  src =
+2 −2
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@

stdenvNoCC.mkDerivation rec {
  pname = "lxgw-neoxihei";
  version = "1.220";
  version = "1.223";

  src = fetchurl {
    url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
    hash = "sha256-rPZjNLysOYrOcGtDvXF3ok3bjtsN2/GDLWRRcXmq0zw=";
    hash = "sha256-mTfA4gHGtCKP7diimj9YzzEEQpXVdyYAXBezBEWiWHE=";
  };

  dontUnpack = true;
Loading