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

Merge staging-next into staging

parents b9c15824 3e58565f

pkgs/by-name/ar/arc-browser/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ 


stdenvNoCC.mkDerivation (finalAttrs: {

  pname = "arc-browser";

  version = "1.91.2-62278";

  version = "1.97.0-63507";



  src = fetchurl {

    url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg";

    hash = "sha256-8ry7FomJem6rMv3q6w0LffWl3bDHSdyxlWzDf58oNnc=";

    hash = "sha256-8HdPyJJT1boiMpflIe6wX4oOTqw4oKm982gm1Ei8h4w=";

  };



  nativeBuildInputs = [ undmg ];

pkgs/by-name/ar/arrow-cpp/package.nix

+12 −4
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
  fetchurl,

  fetchFromGitHub,

  fixDarwinDylibNames,

  apache-orc,

  autoconf,

  aws-sdk-cpp,

  aws-sdk-cpp-arrow ? aws-sdk-cpp.override {
@@ -36,7 +37,7 @@ 
  openssl,

  perl,

  pkg-config,

  protobuf_29,

  protobuf,

  python3,

  rapidjson,

  re2,
@@ -61,9 +62,6 @@ 
}:



let

  # https://github.com/apache/arrow/issues/45807

  protobuf = protobuf_29;



  arrow-testing = fetchFromGitHub {

    name = "arrow-testing";

    owner = "apache";
@@ -136,6 +134,7 @@ stdenv.mkDerivation (finalAttrs: { 
  ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;

  buildInputs =

    [

      apache-orc

      boost

      brotli

      bzip2
@@ -173,6 +172,12 @@ stdenv.mkDerivation (finalAttrs: { 
      nlohmann_json

    ];



  # apache-orc looks for things in caps

  env = {

    LZ4_ROOT = lz4;

    ZSTD_ROOT = zstd.dev;

  };



  preConfigure = ''

    patchShebangs build-support/

    substituteInPlace "src/arrow/vendored/datetime/tz.cpp" \
@@ -217,6 +222,7 @@ stdenv.mkDerivation (finalAttrs: { 
      "-DARROW_FLIGHT_TESTING=${if enableFlight then "ON" else "OFF"}"

      "-DARROW_S3=${if enableS3 then "ON" else "OFF"}"

      "-DARROW_GCS=${if enableGcs then "ON" else "OFF"}"

      "-DARROW_ORC=ON"

      # Parquet options:

      "-DARROW_PARQUET=ON"

      "-DPARQUET_BUILD_EXECUTABLES=ON"
@@ -281,6 +287,8 @@ stdenv.mkDerivation (finalAttrs: { 
        # requires networking

        "arrow-gcsfs-test"

        "arrow-flight-integration-test"

        # File already exists in database: orc_proto.proto

        "arrow-orc-adapter-test"

      ];

    in

    ''

pkgs/by-name/bu/bugstalker/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -8,17 +8,17 @@ 


rustPlatform.buildRustPackage (finalAttrs: {

  pname = "bugstalker";

  version = "0.3.0";

  version = "0.3.1";



  src = fetchFromGitHub {

    owner = "godzie44";

    repo = "BugStalker";

    rev = "v${finalAttrs.version}";

    hash = "sha256-8Iqg2coFsPQY3ws5MEC1LhTu+Z1lXeI3ccjgoBS454o=";

    hash = "sha256-c3NyYDz+Ha5jHTpXLw9xsY+h0NjW9Uvpyn2PStmahKA=";

  };



  useFetchCargoVendor = true;

  cargoHash = "sha256-a5YI6bOo/rsi9hZO1BcVMjJtdrYq2aHqxtlO3F+P+8s=";

  cargoHash = "sha256-/FSV/avsg7kbgtinmKBb0+gemLFZdSE+A+tfLvtfNas=";



  buildInputs = [ libunwind ];

pkgs/by-name/cp/cpc/package.nix

0 → 100644
+29 −0
Original line number Diff line number Diff line 
{

  lib,

  fetchFromGitHub,

  rustPlatform,

}:



rustPlatform.buildRustPackage rec {

  pname = "cpc";

  version = "3.0.0";



  src = fetchFromGitHub {

    owner = "probablykasper";

    repo = "cpc";

    tag = "v${version}";

    hash = "sha256-DjJIXV5rJxQOiMH8/0yZQBvDh+jbejzADt4WSGyhozI=";

  };



  cargoHash = "sha256-2k+aFrP/PQmlGr3gIF1queDjuo/+3KtnrOrx1+wrqEg=";



  meta = {

    mainProgram = "cpc";

    description = "Text calculator with support for units and conversion";

    homepage = "https://github.com/probablykasper/cpc";

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [

      s0me1newithhand7s

    ];

  };

}

pkgs/by-name/dn/dnscontrol/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -9,16 +9,16 @@ 


buildGoModule rec {

  pname = "dnscontrol";

  version = "4.20.0";

  version = "4.21.0";



  src = fetchFromGitHub {

    owner = "StackExchange";

    repo = "dnscontrol";

    tag = "v${version}";

    hash = "sha256-GiwmSAcExafo5fJcdNsMF8BuvHdUaNoCLpl5y1pautw=";

    hash = "sha256-M1Ertf/0GBICci8CV/LyfuubsVTvQ1dql7hDKuHGM6k=";

  };



  vendorHash = "sha256-8KSqPDEI5gmxzcgFsaCzeXzYN6tO9Fjq7rnQN/vSThw=";

  vendorHash = "sha256-BTysXvuE+LOHkUhsV+p8+5VOFcMUidz2i7uo2fdzyXg=";



  nativeBuildInputs = [ installShellFiles ];