colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into staging-next

Browse Source
This commit is contained in:
annalee 2024-03-13 06:02:24 +00:00
commit 68befa13bb
No known key found for this signature in database
20 changed files with 134 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -17847,6 +17847,12 @@
fingerprint = "ADF4 C13D 0E36 1240 BD01 9B51 D1DE 6D7F 6936 63A5";
}];
};
silky = {
name = "Noon van der Silk";
email = "noonsilk+nixpkgs@gmail.com";
github = "silky";
githubId = 129525;
};
Silver-Golden = {
name = "Brendan Golden";
email = "github+nixpkgs@brendan.ie";

2
nixos/doc/manual/development/writing-nixos-tests.section.md
View File

@ -261,7 +261,7 @@ added using the parameter `extraPythonPackages`. For example, you could add
testScript = ''
import numpy as np
assert str(np.zeros(4) == "array([0., 0., 0., 0.])")
assert str(np.zeros(4)) == "[0. 0. 0. 0.]"
'';
}
```

4
pkgs/applications/audio/mympd/default.nix
View File

@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mympd";
version = "14.0.4";
version = "14.1.0";
src = fetchFromGitHub {
owner = "jcorporation";
repo = "myMPD";
rev = "v${finalAttrs.version}";
sha256 = "sha256-kPh3u6mjTxoqGlhei8kPOyrjU9m7zpv16y5PaGHBsIA=";
sha256 = "sha256-yNB5WQi3M4cYogtxx/vLi2xJog2keyFrJIMlx663DLo=";
};
nativeBuildInputs = [

3
pkgs/applications/kde/cantor.nix
View File

@ -95,6 +95,9 @@ mkDerivation {
"--prefix PATH : ${placeholder "out"}/bin"
] ++ lib.optional withSage "--prefix PATH : ${sage-with-env}/bin";
# Causes failures on Hydra and ofborg from some reason
enableParallelBuilding = false;
meta = with lib; {
description = "Front end to powerful mathematics and statistics packages";
homepage = "https://cantor.kde.org/";

4
pkgs/applications/science/math/qalculate-gtk/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qalculate-gtk";
version = "4.9.0";
version = "5.0.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "qalculate-gtk";
rev = "v${finalAttrs.version}";
hash = "sha256-rQxOOxM4TazkDs/H3KEPbdo6WBl0ptyAlZwv8nnGMss=";
hash = "sha256-hlGNL7aMzxBxtATWJBqJTFEQqMv10oC3sRCdtRLHOww=";
};
hardeningDisable = [ "format" ];

4
pkgs/applications/science/math/qalculate-qt/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qalculate-qt";
version = "4.9.0";
version = "5.0.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "qalculate-qt";
rev = "v${finalAttrs.version}";
hash = "sha256-Ac8RRxLheaenlR7JqKzfBpPxsq7PHfE9qXFf3Vx4GSg=";
hash = "sha256-X7IY2yXpZiyE+T2dl0G4tWpJ5O6MVCy/sOY3v9inma0=";
};
nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ];

6
pkgs/by-name/fl/flarectl/package.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "flarectl";
version = "0.89.0";
version = "0.90.0";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflare-go";
rev = "v${version}";
hash = "sha256-BXG9pKkgSSlBNiWiDOWL6D/DSC2iVzVCktL4xyi6/Ao=";
hash = "sha256-4FgRK8tsds+4EFwYpZB2HrPvXN6LdZjehG2oilhOkVw=";
};
vendorHash = "sha256-AxBvmDB3mfgkv7U+BzR0Khdgx1hrDI61CSxr45pRZqg=";
vendorHash = "sha256-F1fwzzBg60E7B9iPV0gziGB3WE1tcZ/6nMpnEyTjV1g=";
subPackages = [ "cmd/flarectl" ];

41
pkgs/by-name/hi/highs/package.nix Normal file
View File

@ -0,0 +1,41 @@
{ lib
, stdenv
, fetchFromGitHub
, clang
, cmake
}:
stdenv.mkDerivation (finalAttrs: {
pname = "highs";
version = "1.7.0";
src = fetchFromGitHub {
owner = "ERGO-Code";
repo = "HiGHS";
rev = "v${finalAttrs.version}";
sha256 = "sha256-2dYKXckZ+npj1rA2mmBRuRcGI1YNcaiITSMjE2/TA2g=";
};
strictDeps = true;
outputs = [ "out" ];
doInstallCheck = true;
installCheckPhase = ''
"$out/bin/highs" --version
'';
nativeBuildInputs = [ clang cmake ];
enableParallelBuilding = true;
meta = with lib; {
homepage = "https://github.com/ERGO-Code/HiGHS";
description = "Linear optimization software";
license = licenses.mit;
platforms = platforms.all;
mainProgram = "highs";
maintainers = with maintainers; [ silky ];
};
})

6
pkgs/by-name/ho/home-manager/package.nix
View File

@ -16,14 +16,14 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "home-manager";
version = "0-unstable-2024-03-06";
version = "unstable-2024-03-12";
src = fetchFromGitHub {
name = "home-manager-source";
owner = "nix-community";
repo = "home-manager";
rev = "cf111d1a849ddfc38e9155be029519b0e2329615";
hash = "sha256-+lM4J4JoJeiN8V+3WSWndPHj1pJ9Jc1UMikGbXLqCTk=";
rev = "a500de54b2e3067201a40cefa5f210f719423ddf";
hash = "sha256-AfVYEQIhOK6vaYVndgqFV4Vb5REXG9R0ylv83QInsT0=";
};
nativeBuildInputs = [

6
pkgs/by-name/mo/mountpoint-s3/package.nix
View File

@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "mountpoint-s3";
version = "1.4.1";
version = "1.5.0";
src = fetchFromGitHub {
owner = "awslabs";
repo = "mountpoint-s3";
rev = "v${version}";
hash = "sha256-V9d3rAb1rbso69RUMgwZdqfchgcDUlFU2LFjCk59uew=";
hash = "sha256-DsxcQ/FEVcrzPyv9LgssNut4XnbU3mPKbuBwQKLiRLA=";
fetchSubmodules = true;
};
cargoHash = "sha256-9cdz1G4mKyg4TfsL+laoB6+6rqEgk8A3VkTjejETAKo=";
cargoHash = "sha256-UOQRdSQ/whlOTZL2vaNiIcKB+Zgpk8tbinWBRWPyllc=";
# thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9:
# cargo metadata failure: error: none of the selected packages contains these features: libfuse3

51
pkgs/by-name/ro/route-graph/package.nix Normal file
View File

@ -0,0 +1,51 @@
{ lib
, fetchFromGitHub
, graphviz
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "route-graph";
version = "0.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "audiusGmbH";
repo = "route-graph";
rev = "refs/tags/${version}";
hash = "sha256-+sEtzmQk7pglfs8vQbLCwdVVSBQRVazdDKgwdSH9EtI=";
};
pythonRelaxDeps = [
"typing-extensions"
];
nativeBuildInputs = with python3.pkgs; [
poetry-core
pythonRelaxDepsHook
];
propagatedBuildInputs = [
graphviz
] ++ (with python3.pkgs; [
scapy
typer
typing-extensions
] ++ typer.optional-dependencies.all);
# Project has no tests
doCheck = false;
pythonImportsCheck = [
"route_graph"
];
meta = with lib; {
description = "CLI tool for creating graphs of routes";
homepage = "https://github.com/audiusGmbH/route-graph";
changelog = "https://github.com/audiusGmbH/route-graph/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
mainProgram = "route-graph";
};
}

4
pkgs/development/libraries/libcifpp/default.nix
View File

@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libcifpp";
version = "7.0.1";
version = "7.0.3";
src = fetchFromGitHub {
owner = "PDB-REDO";
repo = "libcifpp";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-13jJH7YFlnb9hltCo/3kygPkXoE3ZZwZkG/ezbOxE2w=";
hash = "sha256-YRK648gJ2UlgeG5GHMjTid1At0lYt7Zqu4/+O5WG/OM=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/libqalculate/default.nix
View File

@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libqalculate";
version = "4.9.0";
version = "5.0.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "libqalculate";
rev = "v${finalAttrs.version}";
hash = "sha256-6W65dg2pZeio3ZVgVLQZrz/eReYcPiYf52zjcaRfE8E=";
hash = "sha256-VhaGgtSU6+7eMY7ksQMpybmt2JBI80Nwgu7PCKrTorA=";
};
outputs = [ "out" "dev" "doc" ];

4
pkgs/development/python-modules/grpcio-channelz/default.nix
View File

@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "grpcio-channelz";
version = "1.62.0";
version = "1.62.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-MjL6BjQx2G3TpQ4Pe8uB3zIgGrykLtI/6eLLQ8AyKnk=";
hash = "sha256-e+8XBt/tt4lNbgNGemBjrBCxUAR7aWXi+0gU1MKmQkU=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/litellm/default.nix
View File

@ -33,7 +33,7 @@
buildPythonPackage rec {
pname = "litellm";
version = "1.30.1";
version = "1.31.4";
pyproject = true;
disabled = pythonOlder "3.8";
@ -42,7 +42,7 @@ buildPythonPackage rec {
owner = "BerriAI";
repo = "litellm";
rev = "refs/tags/v${version}";
hash = "sha256-d2pfU0766IToVD305imuSVOCmX2S9HrF5lJQNECHA5w=";
hash = "sha256-xOdg1qsUkNHx2zzT7vvH+VZ/RVUXfbQIoNWGwAyM7n4=";
};
postPatch = ''

4
pkgs/development/python-modules/meshtastic/default.nix
View File

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "meshtastic";
version = "2.2.22";
version = "2.3.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "meshtastic";
repo = "Meshtastic-python";
rev = "refs/tags/${version}";
hash = "sha256-bAg7Rr17Q+a+S0ZuHcFmmTM0sRcX2w0zRClKdFwix30=";
hash = "sha256-HiksPxV5VTIOV71J0zlC8iiXmF85a0dTYjjnWthhdGY=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/publicsuffixlist/default.nix
View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "publicsuffixlist";
version = "0.10.0.20240305";
version = "0.10.0.20240312";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-bnnqc7AnjOGxAvOtaBXypbaDhk2plIugsOqzGAxBn38=";
hash = "sha256-ApEvPghPrWfiRjNl/UMVRJIdnbP1H21DzqcWnIax8Yg=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/streamlit/default.nix
View File

@ -32,14 +32,14 @@
buildPythonPackage rec {
pname = "streamlit";
version = "1.32.0";
version = "1.32.1";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-Zb8i4ZDelzuRDAsSezPYDTHFJ17Ykcb950DeRuXgUyM=";
hash = "sha256-7GQASW9niFIUPLwjxMQ4ifeLbJPC4nVv2OBgzM3kuP0=";
};
nativeBuildInputs = [

4
pkgs/development/tools/analysis/checkov/default.nix
View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.2.35";
version = "3.2.36";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
rev = "refs/tags/${version}";
hash = "sha256-Wjci5jGkakL75TtUzf1Hq2EzGgQD3jtbCdwoA69zjVA=";
hash = "sha256-Of09iIRON1YLdHjmRVxerTlvUff8I8G5m+Y3pRBfRnY=";
};
patches = [

1
pkgs/servers/ttyd/default.nix
View File

@ -1,6 +1,7 @@
{ lib, stdenv, fetchFromGitHub
, pkg-config, cmake, xxd
, openssl, libwebsockets, json_c, libuv, zlib
, nixosTests
}:
with builtins;