Unverified Commit 8158f1d5 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents dcad9b57 47375cbe

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -21841,6 +21841,12 @@ 
    githubId = 19894025;

    name = "Vinny Meller";

  };

  vinylen = {

    email = "victor@viclab.se";

    github = "vinylen";

    githubId = 98466471;

    name = "Victor Nilsson";

  };

  vinymeuh = {

    email = "vinymeuh@gmail.com";

    github = "vinymeuh";

nixos/doc/manual/release-notes/rl-2411.section.md

+2 −0
Original line number Diff line number Diff line
@@ -246,6 +246,8 @@ 
  and `nodePackages.vscode-json-languageserver-bin` were dropped due to an unmaintained upstream.

  The `vscode-langservers-extracted` package is a maintained drop-in replacement.



- `nodePackages.prisma` has been replaced by `prisma`.



- `fetchNextcloudApp` has been rewritten to use `fetchurl` rather than

  `fetchzip`. This invalidates all existing hashes but you can restore the old

  behavior by passing it `unpack = true`.

pkgs/applications/misc/databricks-sql-cli/default.nix

+11 −18
Original line number Diff line number Diff line 
{ lib

, fetchFromGitHub

, fetchpatch

, python3

}:



python3.pkgs.buildPythonApplication rec {

  pname = "databricks-sql-cli";

  version = "0.1.4";

  format = "pyproject";

  version = "0.3.3";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "databricks";

    repo = "databricks-sql-cli";

    rev = "refs/tags/v${version}";

    hash = "sha256-gr7LJfnvIu2Jf1XgILqfZoi8CbXeQyq0g1wLEBa5TPM=";

    hash = "sha256-wmwXw1o+pRsRjA7ai9x5o1el7mNBqM6xlGrvw0IqfMo=";

  };



  patches = [

    # https://github.com/databricks/databricks-sql-cli/pull/38

    (fetchpatch {

      url = "https://github.com/databricks/databricks-sql-cli/commit/fc294e00819b6966f1605e5c1ce654473510aefe.patch";

      sha256 = "sha256-QVrb7mD0fVbHrbrDywI6tsFNYM19x74LY8rhqqC8szE=";

    })

  ];



  postPatch = ''

    substituteInPlace pyproject.toml \

      --replace 'python = ">=3.7.1,<4.0"' 'python = ">=3.8,<4.0"' \

      --replace 'pandas = "1.3.4"' 'pandas = "~1.5"'

  '';



  nativeBuildInputs = with python3.pkgs; [

    poetry-core

  ];



  pythonRelaxDeps = [

    "pandas"

    "databricks-sql-connector"

    "sqlparse"

    "numpy"

  ];



  propagatedBuildInputs = with python3.pkgs; [

    cli-helpers

    click
@@ -51,6 +43,7 @@ python3.pkgs.buildPythonApplication rec { 


  meta = with lib; {

    description = "CLI for querying Databricks SQL";

    mainProgram = "dbsqlcli";

    homepage = "https://github.com/databricks/databricks-sql-cli";

    changelog = "https://github.com/databricks/databricks-sql-cli/releases/tag/v${version}";

    license = licenses.databricks;

pkgs/applications/office/documenso/default.nix

+4 −2
Original line number Diff line number Diff line 
{ lib

, fetchFromGitHub

, buildNpmPackage

, nodePackages

, prisma

, nix-update-script

}:

let
@@ -18,12 +18,14 @@ buildNpmPackage { 
    hash = "sha256-uKOJVZ0GRHo/CYvd/Ix/tq1WDhutRji1tSGdcITsNlo=";

  };



  nativeBuildInputs = [ prisma ];



  preBuild = ''

    # somehow for linux, npm is not finding the prisma package with the

    # packages installed with the lockfile.

    # This generates a prisma version incompatibility warning and is a kludge

    # until the upstream package-lock is modified.

    ${nodePackages.prisma}/bin/prisma generate

    prisma generate

  '';



  npmDepsHash = "sha256-+JbvFMi8xoyxkuL9k96K1Vq0neciCGkkyZUPd15ES2E=";

pkgs/applications/office/qownnotes/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -20,14 +20,14 @@ 
let

  pname = "qownnotes";

  appname = "QOwnNotes";

  version = "24.8.5";

  version = "24.9.0";

in

stdenv.mkDerivation {

  inherit pname version;



  src = fetchurl {

    url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz";

    hash = "sha256-2aXKb9epApscoxt9I2oL6pl1jnGu6sbHTr9+pz6QJu4=";

    hash = "sha256-xlGBpRiak/th/z9zKbQXpuk3py/W1ns90NjKw4w3FtI=";

  };



  nativeBuildInputs = [