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

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-04-11 06:01:13 +00:00 committed by GitHub
parent df61e678f2 3ef25cb316
commit 9ddea66e46
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
26 changed files with 1321 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/cluster/zarf/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "zarf";
version = "0.32.6";
version = "0.33.0";
src = fetchFromGitHub {
owner = "defenseunicorns";
repo = "zarf";
rev = "v${version}";
hash = "sha256-YytP6JC3efREoVzKKYLz6e8YzuSZas89Sw43mQn+aBI=";
hash = "sha256-r/PRLOqzXANYWAq3hdLKWxw1WXJzgVjIenHky2+WXj4=";
};
vendorHash = "sha256-nV+Beciv81brFWPVl4131Mtcj/oUwRhVTGK+M4Yedus=";
vendorHash = "sha256-6DGkDHBoUj5Zk0KI3HVb+trkzWzB4+8nOh1ijE9PrEk=";
proxyVendor = true;
preBuild = ''

4
pkgs/applications/science/misc/boinc/default.nix
View File

@ -27,14 +27,14 @@
stdenv.mkDerivation rec {
pname = "boinc";
version = "7.24.3";
version = "8.0.1";
src = fetchFromGitHub {
name = "${pname}-${version}-src";
owner = "BOINC";
repo = "boinc";
rev = "client_release/${lib.versions.majorMinor version}/${version}";
hash = "sha256-0gyCO5t8t0SbOCBClVVu+C2VpBlxsnoRHBRYgI8nNO4=";
hash = "sha256-pjk9+VRWrFIoHolIEEWlRx89hifLNeFtIi34F1OBD38=";
};
nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ];

4
pkgs/applications/video/qmplay2/default.nix
View File

@ -26,14 +26,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qmplay2";
version = "24.04.02";
version = "24.04.07";
src = fetchFromGitHub {
owner = "zaps166";
repo = "QMPlay2";
rev = finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-eJWXTcJU24QzPChFTKbvNcuL9UpIQD8rFzd5h591tjg=";
hash = "sha256-WIDGApvl+aaB3Vdv0sHY+FHWqzreWWd3/xOLV11YfxM=";
};
nativeBuildInputs = [

7
pkgs/by-name/_6/_64gram/package.nix
View File

@ -2,11 +2,12 @@
, stdenv
, fetchFromGitHub
, telegram-desktop
, nix-update-script
}:
telegram-desktop.overrideAttrs (old: rec {
pname = "64gram";
version = "1.1.16";
version = "1.1.17";
src = fetchFromGitHub {
owner = "TDesktop-x64";
@ -14,9 +15,11 @@ telegram-desktop.overrideAttrs (old: rec {
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-2IuNJleHtlkELcTHDwRT4pcDcDXSqM5YlLPGYiGT2TE=";
hash = "sha256-QWHC1NAAKpH9zU7cplCW2rNYckY87bpU7MEZ1ytSi58=";
};
passthru.updateScript = nix-update-script {};
meta = with lib; {
description = "An unofficial Telegram Desktop providing Windows 64bit build and extra features";
license = licenses.gpl3Only;

6
pkgs/by-name/fi/files-cli/package.nix
View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "files-cli";
version = "2.12.54";
version = "2.12.56";
src = fetchFromGitHub {
repo = "files-cli";
owner = "files-com";
rev = "v${version}";
hash = "sha256-NA71J7sfbUW1c/FxVrmkTw/hwbZqFbxqdPjeMoYA9nc=";
hash = "sha256-0cvGdYy84gfxDIPcz4GqUNwwADSDaSdTlpkD6eYh2CU=";
};
vendorHash = "sha256-/Zd5U/a/9mw/9llSRvmjLT+L7gcE0OZjkiRAOYHoQCU=";
vendorHash = "sha256-igFqxTkSJpWHfquvRnBDLXcW8VNsJJK4fNIDob5oCuE=";
ldflags = [
"-s"

1213
pkgs/by-name/hy/hyprdim/Cargo.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

11
pkgs/by-name/hy/hyprdim/package.nix
View File

@ -8,16 +8,21 @@
rustPlatform.buildRustPackage rec {
pname = "hyprdim";
version = "2.2.3";
version = "2.2.4";
src = fetchFromGitHub {
owner = "donovanglover";
repo = "hyprdim";
rev = version;
hash = "sha256-Eeh0D3DkC4ureDUE+BXTGcMFNmZ0hLSidlKlL4ZDgsQ=";
hash = "sha256-XRaBrn8gnXyMiCf3UQvdZGnZ//YMUivfVg0IoZF5F88=";
};
cargoHash = "sha256-hgcGzRLB1L3yxJjw1ECDJPmbl1W+2OS4KDojclyVYrc=";
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"hyprland-0.3.13" = "sha256-gjShmFcECdX0/t7mL035l9e9OzZuJqX0Ueozv38l03g=";
};
};
nativeBuildInputs = [ installShellFiles ];

14
pkgs/by-name/ju/justbuild/package.nix
View File

@ -11,7 +11,7 @@
openssl,
pkg-config,
protobuf_23,
protobuf_24,
grpc,
pandoc,
python3,
@ -75,19 +75,21 @@ stdenv.mkDerivation rec {
grpc
libgit2
openssl
# Using protobuf 23 because this is the same version upstream currently
# uses for bundled builds
# Using protobuf 24 because the current version of grpc is build using
# protobuf 24 and therefore the older protobuf version causes errors
# during build.
# Upstream currently uses protobuf 23 for bundled builds
# For future updates: The currently used version can be found in the file
# etc/repos.json: https://github.com/just-buildsystem/justbuild/blob/master/etc/repos.json
# under the key .repositories.protobuf
protobuf_23
protobuf_24
python3
];
postPatch = ''
sed -ie 's|\./bin/just-mr.py|${python3}/bin/python3 ./bin/just-mr.py|' bin/bootstrap.py
sed -ie 's|#!/usr/bin/env python3|#!${python3}/bin/python3|' bin/parallel-bootstrap-traverser.py
jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf_23}"' etc/repos.json > etc/repos.json.patched
jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf_24}"' etc/repos.json > etc/repos.json.patched
mv etc/repos.json.patched etc/repos.json
jq '.repositories.com_github_grpc_grpc.pkg_bootstrap.local_path = "${grpc}"' etc/repos.json > etc/repos.json.patched
mv etc/repos.json.patched etc/repos.json
@ -170,7 +172,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
broken = true; # last successful build 2024-01-26
broken = stdenv.isDarwin;
description = "a generic build tool";
homepage = "https://github.com/just-buildsystem/justbuild";
license = licenses.asl20;

4
pkgs/by-name/ll/llama-cpp/package.nix
View File

@ -72,13 +72,13 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "llama-cpp";
version = "2589";
version = "2636";
src = fetchFromGitHub {
owner = "ggerganov";
repo = "llama.cpp";
rev = "refs/tags/b${finalAttrs.version}";
hash = "sha256-VvTXNEl1pzzwSBT6JSOyvys3tHkjp1n6lVGngD97J74=";
hash = "sha256-FAU9Kv8cfFmx2gCx5oFgPmBQnwVuhkqlxIsB1yWDHUY=";
};
postPatch = ''

1
pkgs/development/libraries/duckdb/default.nix
View File

@ -108,6 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
in
''
runHook preInstallCheck
(($(ulimit -n) < 1024)) && ulimit -n 1024
HOME="$(mktemp -d)" ${LD_LIBRARY_PATH}="$lib/lib" ./test/unittest ${toString excludes}

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "simdjson";
version = "3.8.0";
version = "3.9.1";
src = fetchFromGitHub {
owner = "simdjson";
repo = "simdjson";
rev = "v${version}";
sha256 = "sha256-1WxQU9WAIZKVoNTYJRnwxLAloBfW1g5XSPH4b29x9rE=";
sha256 = "sha256-Az5QZNnzLYpEE7O+1/VceIT6vykkg8vMuAuN9u8OseM=";
};
nativeBuildInputs = [ cmake ];

22
pkgs/development/ocaml-modules/charInfo_width/default.nix
View File

@ -1,22 +0,0 @@
{ lib, fetchzip, buildDunePackage, camomile, result }:
buildDunePackage rec {
pname = "charInfo_width";
version = "1.1.0";
src = fetchzip {
url = "https://bitbucket.org/zandoye/charinfo_width/get/${version}.tar.bz2";
sha256 = "19mnq9a1yr16srqs8n6hddahr4f9d2gbpmld62pvlw1ps7nfrp9w";
};
propagatedBuildInputs = [
(camomile.override { version = "1.0.2"; })
result
];
meta = {
homepage = "https://bitbucket.org/zandoye/charinfo_width/";
description = "Determine column width for a character";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
};
}

26
pkgs/development/ocaml-modules/zed/default.nix
View File

@ -1,34 +1,16 @@
{ lib, buildDunePackage, fetchFromGitHub, ocaml, react, charInfo_width, result, uchar, uutf, uucp, uuseg }:
let
switch =
if lib.versionAtLeast ocaml.version "4.08"
then
{
version = "3.2.3";
sha256 = "sha256-lbhqjZxeUqHdd+yahRO+B6L2mc+h+4T2+qKVgWC2HY8=";
propagatedBuildInputs = [ react result uchar uutf uucp uuseg ];
}
else
{
version = "3.1.0";
sha256 = "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p";
propagatedBuildInputs = [ charInfo_width react ];
};
in
{ lib, buildDunePackage, fetchFromGitHub, react, result, uchar, uutf, uucp, uuseg }:
buildDunePackage rec {
pname = "zed";
version = "3.2.3";
inherit (switch) version propagatedBuildInputs;
duneVersion = "3";
propagatedBuildInputs = [ react result uchar uutf uucp uuseg ];
src = fetchFromGitHub {
owner = "ocaml-community";
repo = pname;
rev = version;
sha256 = switch.sha256;
sha256 = "sha256-lbhqjZxeUqHdd+yahRO+B6L2mc+h+4T2+qKVgWC2HY8=";
};
meta = {

17
pkgs/development/python-modules/jaraco-abode/default.nix
View File

@ -24,27 +24,18 @@
buildPythonPackage rec {
pname = "jaraco-abode";
version = "5.1.0";
format = "pyproject";
version = "5.1.1";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "jaraco";
repo = "jaraco.abode";
rev = "refs/tags/v${version}";
hash = "sha256-guLgmhjFgYLRZsQ0j92NXkktZ80bwVvMUJLZeg3dgxE=";
hash = "sha256-TUxljF1k/fvQoNcHx6jMRJrYgzxjXefvMl+mBD0DL8o=";
};
postPatch = ''
# https://github.com/jaraco/jaraco.abode/issues/19
echo "graft jaraco" > MANIFEST.in
# https://github.com/jaraco/jaraco.abode/commit/9e3e789efc96cddcaa15f920686bbeb79a7469e0
substituteInPlace jaraco/abode/helpers/timeline.py \
--replace "call_aside" "invoke"
'';
nativeBuildInputs = [
setuptools
setuptools-scm

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

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "mitogen";
version = "0.3.6";
version = "0.3.7";
pyproject = true;
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "mitogen-hq";
repo = "mitogen";
rev = "refs/tags/v${version}";
hash = "sha256-zQTto4SGPvQIXPAcTQx8FA+n/5RcpqKKn0UqlFM2yqI=";
hash = "sha256-RcgAyBF5qNw8Hp//aq6UuvElhUjJXS+ySSXsSweyFXE=";
};
build-system = [ setuptools ];

36
pkgs/development/python-modules/sagemaker/default.nix
View File

@ -2,7 +2,9 @@
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, fetchpatch
, pythonRelaxDepsHook
, setuptools
, attrs
, boto3
, cloudpickle
@ -20,14 +22,18 @@
, platformdirs
, tblib
, urllib3
, requests
, docker
, tqdm
, psutil
, scipy
, accelerate
}:
buildPythonPackage rec {
pname = "sagemaker";
version = "2.214.3";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.8";
@ -38,16 +44,30 @@ buildPythonPackage rec {
hash = "sha256-RE4uyIpFiZNDyS5R6+gMLlj0vcAIiHPattFPTSMGnCI=";
};
nativeBuildInputs = [
patches = [
# Distutils removal, fix build with python 3.12
# https://github.com/aws/sagemaker-python-sdk/pull/4544
(fetchpatch {
url = "https://github.com/aws/sagemaker-python-sdk/commit/84447ba59e544c810aeb842fd058e20d89e3fc74.patch";
hash = "sha256-B8Q18ViB7xYy1F5LoL1NvXj2lnFPgt+C9wssSODyAXM=";
})
(fetchpatch {
url = "https://github.com/aws/sagemaker-python-sdk/commit/e9e08a30cb42d4b2d7299c1c4b42d680a8c78110.patch";
hash = "sha256-uGPtXSXfeaIvt9kkZZKQDuiZfoRgw3teffuxai1kKlY=";
})
];
build-system = [
setuptools
pythonRelaxDepsHook
];
pythonRelaxDeps = [
"attrs"
"boto3"
"cloudpickle"
"importlib-metadata"
];
propagatedBuildInputs = [
dependencies = [
attrs
boto3
cloudpickle
@ -64,6 +84,11 @@ buildPythonPackage rec {
jsonschema
platformdirs
tblib
urllib3
requests
docker
tqdm
psutil
];
doCheck = false; # many test dependencies are not available in nixpkgs
@ -76,6 +101,7 @@ buildPythonPackage rec {
passthru.optional-dependencies = {
local = [ urllib3 docker pyyaml ];
scipy = [ scipy ];
huggingface = [ accelerate ];
# feature-processor = [ pyspark sagemaker-feature-store-pyspark ]; # not available in nixpkgs
};

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

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1126";
version = "3.0.1127";
pyproject = true;
disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-o8MECOLzs8JUxUTgAzSM5MpY3pK39Pt3hF/IQQrGMrA=";
hash = "sha256-NF3ygbCLbx2wszgnyWNSZWc+p7t/c2PtJ0N2zUGIkkg=";
};
build-system = [ setuptools ];

6
pkgs/development/tools/devbox/default.nix
View File

@ -5,13 +5,13 @@
}:
buildGoModule rec {
pname = "devbox";
version = "0.10.3";
version = "0.10.4";
src = fetchFromGitHub {
owner = "jetpack-io";
repo = pname;
rev = version;
hash = "sha256-rKFGcqvg82r4SxU0vaXk6Qsdbm613OwcTqrdykc5xak=";
hash = "sha256-HLoTQrC8LVI2LZFJPRaobFX0TgT8mwVkmzyuii5bGA8=";
};
ldflags = [
@ -23,7 +23,7 @@ buildGoModule rec {
# integration tests want file system access
doCheck = false;
vendorHash = "sha256-5rdB7vBWw3oU0OtYw7/51aQbEUCRAUwKsjA5AbUtRlI=";
vendorHash = "sha256-L7LDOfJ2v4FIdF8Ttpy7qOhMMLFFuhVxjuy5znn9Yb4=";
nativeBuildInputs = [ installShellFiles ];

6
pkgs/development/tools/rust/rust-analyzer/default.nix
View File

@ -13,14 +13,14 @@
rustPlatform.buildRustPackage rec {
pname = "rust-analyzer-unwrapped";
version = "2024-03-25";
cargoSha256 = "sha256-knvXvQ4e3Ab5zGcitfzlznad//0gAFSgWjOPiCjeFDM=";
version = "2024-04-08";
cargoSha256 = "sha256-lVVHp8kbi3bnDQ0lCZugGSNznJduXPftGDq7ByxXWgc=";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust-analyzer";
rev = version;
sha256 = "sha256-4na1ZTc6Iknu6V1Wo6jnt6d3H0JdZfpKF4GX/WNa/Zc=";
sha256 = "sha256-St7ZQrkrr5lmQX9wC1ZJAFxL8W7alswnyZk9d1se3Us=";
};
cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ];

6
pkgs/development/tools/supabase-cli/default.nix
View File

@ -9,16 +9,16 @@
buildGoModule rec {
pname = "supabase-cli";
version = "1.153.3";
version = "1.155.1";
src = fetchFromGitHub {
owner = "supabase";
repo = "cli";
rev = "v${version}";
hash = "sha256-fUSq8vbKLcWkh3y3jD6wXYjxLVorbGnw9dYLazzlJTE=";
hash = "sha256-2KoE7r2Uw5OegRChjDWAOzuml+rcHwah+GnlX1WPSGo=";
};
vendorHash = "sha256-9GlbpbWBYGNYnWqKXqjf6mYpgMOOYXRvCKwd7VpCsyM=";
vendorHash = "sha256-yo564Yqo28++nxJDv4/0ZBAxn1gRvxHv6TgBKm8iSTA=";
ldflags = [
"-s"

4
pkgs/servers/http/trafficserver/default.nix
View File

@ -49,11 +49,11 @@
stdenv.mkDerivation rec {
pname = "trafficserver";
version = "9.2.3";
version = "9.2.4";
src = fetchzip {
url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2";
hash = "sha256-WqRqf10QKYepCoaNzG26O2jv54Do3qFawDupSkrAPKk=";
hash = "sha256-oB3Wv4F6d0+lT1zIDUemgOJzwj+9Nz3uTklkXiWTBKg=";
};
# NOTE: The upstream README indicates that flex is needed for some features,

16
pkgs/servers/monitoring/loki/default.nix
View File

@ -5,17 +5,19 @@
, makeWrapper
, nixosTests
, systemd
, testers
, grafana-loki
}:
buildGoModule rec {
version = "2.9.6";
version = "3.0.0";
pname = "grafana-loki";
src = fetchFromGitHub {
owner = "grafana";
repo = "loki";
rev = "v${version}";
hash = "sha256-79hK7axHf6soku5DvdXkE/0K4WKc4pnS9VMbVc1FS2I=";
hash = "sha256-2+OST6bKIjuhrXJKA+8vUERKT1/min7tN8oFxKn3L74=";
};
vendorHash = null;
@ -38,9 +40,15 @@ buildGoModule rec {
--prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib"
'';
passthru.tests = { inherit (nixosTests) loki; };
passthru.tests = {
inherit (nixosTests) loki;
version = testers.testVersion {
command = "loki --version";
package = grafana-loki;
};
};
ldflags = let t = "github.com/grafana/loki/pkg/util/build"; in [
ldflags = let t = "github.com/grafana/loki/v3/pkg/util/build"; in [
"-s"
"-w"
"-X ${t}.Version=${version}"

4
pkgs/tools/networking/ooniprobe-cli/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "ooniprobe-cli";
version = "3.21.0";
version = "3.21.1";
src = fetchFromGitHub {
owner = "ooni";
repo = "probe-cli";
rev = "v${version}";
hash = "sha256-bV1eEuHYaqDKRImEMX9LP/3R3/lVpKpBfweRjucKtTc=";
hash = "sha256-H5QlyxNQdKGoTIdfh/neULakTddVIhXgMJ/wLbqvGbY=";
};
vendorHash = "sha256-I88cALmc8iTaVJ36ntQLw+wRMM2GLWMWLhv8EDJDRgg=";

4
pkgs/tools/security/opensc/default.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "opensc";
version = "0.25.0";
version = "0.25.1";
src = fetchFromGitHub {
owner = "OpenSC";
repo = "OpenSC";
rev = version;
sha256 = "sha256-pNorJiZzLGpxtlkog2d3E9xePMy9ASoHeWduqVZiBiA=";
sha256 = "sha256-Ktvp/9Hca87qWmDlQhFzvWsr7TvNpIAvOFS+4zTZbB8=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];

4
pkgs/tools/text/base16384/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "base16384";
version = "2.3.0";
version = "2.3.1";
src = fetchFromGitHub {
owner = "fumiama";
repo = pname;
rev = "v${version}";
hash = "sha256-FzZ8k7dkGksQvknrHoSjX1iUpIyL5xGlFTm3mgpBIig=";
hash = "sha256-2HZeom+8eEH4CrphCoOV+wJbqhYKVUcAQrYLyEVACkQ=";
};
nativeBuildInputs = [ cmake ];

2
pkgs/top-level/ocaml-packages.nix
View File

@ -186,8 +186,6 @@ let
chacha = callPackage ../development/ocaml-modules/chacha { };
charInfo_width = callPackage ../development/ocaml-modules/charInfo_width { };
checkseum = callPackage ../development/ocaml-modules/checkseum { };
chrome-trace = callPackage ../development/ocaml-modules/chrome-trace { };