movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2024-06-27 18:01:13 +00:00 • committed by GitHub
commit 1bfaa6d6e1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
33 changed files with 141 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

13
nixos/modules/hardware/video/nvidia.nix
View file

@ -46,8 +46,6 @@ in
TRUNK_LINK_FAILURE_MODE = 0;
NVSWITCH_FAILURE_MODE = 0;
ABORT_CUDA_JOBS_ON_FM_EXIT = 1;
TOPOLOGY_FILE_PATH = "${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch";
DATABASE_PATH = "${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch";
};
defaultText = lib.literalExpression ''
{
@ -69,8 +67,6 @@ in
TRUNK_LINK_FAILURE_MODE=0;
NVSWITCH_FAILURE_MODE=0;
ABORT_CUDA_JOBS_ON_FM_EXIT=1;
TOPOLOGY_FILE_PATH="''${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch";
DATABASE_PATH="''${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch";
}
'';
description = ''
@ -628,7 +624,14 @@ in
TimeoutStartSec = 240;
ExecStart =
let
nv-fab-conf = settingsFormat.generate "fabricmanager.conf" cfg.datacenter.settings;
# Since these rely on the `nvidia_x11.fabricmanager` derivation, they're
# unsuitable to be mentioned in the configuration defaults, but they _can_
# be overridden in `cfg.datacenter.settings` if needed.
fabricManagerConfDefaults = {
TOPOLOGY_FILE_PATH = "${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch";
DATABASE_PATH = "${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch";
};
nv-fab-conf = settingsFormat.generate "fabricmanager.conf" (fabricManagerConfDefaults // cfg.datacenter.settings);
in
"${lib.getExe nvidia_x11.fabricmanager} -c ${nv-fab-conf}";
LimitCORE = "infinity";

6
pkgs/applications/audio/waylyrics/default.nix
View file

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "waylyrics";
version = "0.3.12";
version = "0.3.13";
src = fetchFromGitHub {
owner = "waylyrics";
repo = "waylyrics";
rev = "v${version}";
hash = "sha256-FfrgeUDKiM9m0mvKlu02KEuvsq+3Gv3yPFW1DIQw05I=";
hash = "sha256-hx0g5JBf0v7B26GCcU5BkmxVvbHQNPSQ2d+ohDk3080=";
};
cargoHash = "sha256-xD46aKT18Kl+81Pfv+zleUUKhSV1Px7JFjhXw1/4cBA=";
cargoHash = "sha256-v1+1ivbJAZLqnnFaR6vmpcZ7vd5j3afZliggXaHiwWM=";
nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];
buildInputs = [ openssl dbus ];

23
pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
View file

@ -508,14 +508,29 @@ let
rime = super.rime.overrideAttrs (old: {
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.librime ];
preBuild = (old.preBuild or "") + ''
preBuild = (old.preBuild or "") +
(if pkgs.stdenv.isDarwin then
''
export MODULE_FILE_SUFFIX=".dylib"
make lib
mkdir -p /tmp/build/rime-lib
cp *.dylib /tmp/build/rime-lib
''
else
''
make lib
mkdir -p /build/rime-lib
cp *.so /build/rime-lib
'';
postInstall = (old.postInstall or "") + ''
'');
postInstall = (old.postInstall or "") +
(if pkgs.stdenv.isDarwin then
''
install -m444 -t $out/share/emacs/site-lisp/elpa/rime-* /tmp/build/rime-lib/*.dylib
''
else
''
install -m444 -t $out/share/emacs/site-lisp/elpa/rime-* /build/rime-lib/*.so
'';
'');
});
shm = super.shm.overrideAttrs (attrs: {

6
pkgs/applications/misc/elastic/default.nix
View file

@ -11,21 +11,20 @@
, gtksourceview5
, blueprint-compiler
, wrapGAppsHook4
, appstream-glib
, desktop-file-utils
, template-glib
}:
stdenv.mkDerivation rec {
pname = "elastic";
version = "0.1.4";
version = "0.1.5";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "elastic";
rev = version;
hash = "sha256-EExVhf71SEWVcAOAt+IuQH3umNOY4hzzkFVIqnESppo=";
hash = "sha256-y/XBXN5RIqnFmxnmkThBGW0B5owgy/1Q/6jmkBCi+rk=";
};
nativeBuildInputs = [
@ -34,7 +33,6 @@ stdenv.mkDerivation rec {
vala
pkg-config
wrapGAppsHook4
appstream-glib
desktop-file-utils
blueprint-compiler
];

6
pkgs/applications/misc/obsidian/default.nix
View file

@ -13,7 +13,7 @@
let
inherit (stdenv.hostPlatform) system;
pname = "obsidian";
version = "1.6.3";
version = "1.6.5";
appname = "Obsidian";
meta = with lib; {
description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files";
@ -23,10 +23,10 @@ let
maintainers = with maintainers; [ atila conradmearns zaninime qbit kashw2 w-lfchen ];
};
filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
filename = if stdenv.isDarwin then "Obsidian-${version}.dmg" else "obsidian-${version}.tar.gz";
src = fetchurl {
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
hash = if stdenv.isDarwin then "sha256-o5ELpG82mJgcd9Pil6A99BPK6Hoa0OKJJkYpyfGJR9I=" else "sha256-ho8E2Iq+s/w8NjmxzZo/y5aj3MNgbyvIGjk3nSKPLDw=";
hash = if stdenv.isDarwin then "sha256-gA6FkCalGw0pgnCbOJliItLzMGr+CG9r6mSMdvVUAoQ=" else "sha256-9goJnKOgJk5TrFUNz4vff8704cvHfqZpGL/iBkcU2GY=";
};
icon = fetchurl {

2
pkgs/applications/misc/sc-im/default.nix
View file

@ -46,6 +46,8 @@ stdenv.mkDerivation rec {
makeFlags = [ "prefix=${placeholder "out"}" ];
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration";
postInstall = ''
wrapProgram "$out/bin/sc-im" --prefix PATH : "${lib.makeBinPath [ gnuplot ]}"
'';

12
pkgs/applications/version-management/gitlab/data.json
View file

@ -1,15 +1,15 @@
{
"version": "16.11.4",
"repo_hash": "sha256-VtjGV/0Xtmwqu/YZa6P6jUvlTYj9FNKALcJ3ZvMUJBw=",
"version": "16.11.5",
"repo_hash": "1bhg6glb644m55m50q2kp0azf3c4if11vymjn823rhs68jw3jqcp",
"yarn_hash": "03q7h8dyssvsr91klr1jk65f5jz1ac71lx0114zq9c7awxrgp6kq",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v16.11.4-ee",
"rev": "v16.11.5-ee",
"passthru": {
"GITALY_SERVER_VERSION": "16.11.4",
"GITLAB_PAGES_VERSION": "16.11.4",
"GITALY_SERVER_VERSION": "16.11.5",
"GITLAB_PAGES_VERSION": "16.11.5",
"GITLAB_SHELL_VERSION": "14.35.0",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.8.0",
"GITLAB_WORKHORSE_VERSION": "16.11.4"
"GITLAB_WORKHORSE_VERSION": "16.11.5"
}
}

4
pkgs/applications/version-management/gitlab/gitaly/default.nix
View file

@ -5,7 +5,7 @@
}:
let
version = "16.11.4";
version = "16.11.5";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@ -17,7 +17,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
hash = "sha256-sdRKKOWoX0yyqUGpu/mqDdTq2nLZ2Gr5GNV9x99rdeU=";
hash = "sha256-iBLRhkFPsopy6m3y+9Qc+v3FCbV5nOWMs+DMwW+JiSk=";
};
vendorHash = "sha256-WCZF7XVW6J1zyPx8e/Mcn+HmHElAUGcEICxiF5HLzBg=";

4
pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
View file

@ -2,14 +2,14 @@
buildGoModule rec {
pname = "gitlab-pages";
version = "16.11.4";
version = "16.11.5";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
hash = "sha256-6Fh1IKCs2Bg7Eg44kbCMM8YhLmwWvdZnXp39fphLzcE=";
hash = "sha256-mJKzaFICE7f4aIFGeV/4PbbQkaxwmRd9QO2pRXpM2ag=";
};
vendorHash = "sha256-WrR4eZRAuYkhr7ZqP7OXqJ6uwvxzn+t+3OdBNcNaq0M=";

2
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View file

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "16.11.4";
version = "16.11.5";
# nixpkgs-update: no auto update
src = fetchFromGitLab {

5
pkgs/applications/video/streamlink/default.nix
View file

@ -7,12 +7,12 @@
python3Packages.buildPythonApplication rec {
pname = "streamlink";
version = "6.7.4";
version = "6.8.1";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-kzdTerEZ/ndSSl1mWq7Ou/sG4suN8o0SYNkodkJXUc4=";
hash = "sha256-TEN++sKCtN8CZRnyBp4niRFlb+LPSNcyMCu9Rm+GOZ0=";
};
patches = [
@ -42,7 +42,6 @@ python3Packages.buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [
certifi
exceptiongroup
isodate
lxml
pycountry

93
pkgs/applications/misc/cartridges/default.nix → pkgs/by-name/ca/cartridges/package.nix
View file

@ -1,66 +1,61 @@
{ blueprint-compiler
, desktop-file-utils
, fetchFromGitHub
, gobject-introspection
, lib
, libadwaita
, meson
, ninja
, python3Packages
, stdenv
, wrapGAppsHook4
, nix-update-script
{
lib,
fetchFromGitHub,
python3Packages,
appstream,
blueprint-compiler,
desktop-file-utils,
gobject-introspection,
glib-networking,
libadwaita,
meson,
ninja,
pkg-config,
wrapGAppsHook4,
}:
stdenv.mkDerivation (finalAttrs: {
python3Packages.buildPythonApplication rec {
pname = "cartridges";
version = "2.8.5";
pyproject = false;
src = fetchFromGitHub {
owner = "kra-mo";
repo = "cartridges";
rev = "v${finalAttrs.version}";
rev = "v${version}";
hash = "sha256-7T+q3T8z8SCpAn3ayodZeETOsTwL+hhVWzY2JyBEoi4=";
};
pythonPath = with python3Packages; [
# TODO: remove this when #286814 hits master
mesonFlags = [ "-Dtiff_compression=jpeg" ];
nativeBuildInputs = [
appstream
blueprint-compiler
desktop-file-utils
gobject-introspection
meson
ninja
pkg-config
wrapGAppsHook4
];
buildInputs = [
glib-networking
libadwaita
];
dependencies = with python3Packages; [
pillow
pygobject3
pyyaml
requests
];
# TODO: remove this when #286814 hits master
mesonFlags = [ "-Dtiff_compression=jpeg" ];
buildInputs = [
libadwaita
(python3Packages.python.withPackages (_: finalAttrs.pythonPath))
];
nativeBuildInputs = [
blueprint-compiler
desktop-file-utils
gobject-introspection
meson
ninja
python3Packages.wrapPython
wrapGAppsHook4
];
dontWrapGApps = true;
makeWrapperArgs = [ ''''${gappsWrapperArgs[@]}'' ];
postFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
wrapPythonPrograms "$out/bin" "$out" "$pythonPath"
'';
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
meta = {
description = "GTK4 + Libadwaita game launcher";
mainProgram = "cartridges";
longDescription = ''
A simple game launcher for all of your games.
It has support for importing games from Steam, Lutris, Heroic
@ -68,8 +63,10 @@ stdenv.mkDerivation (finalAttrs: {
You can sort and hide games or download cover art from SteamGridDB.
'';
homepage = "https://apps.gnome.org/Cartridges/";
license = licenses.gpl3Plus;
maintainers = [ maintainers.getchoo ];
platforms = platforms.linux;
changelog = "https://github.com/kra-mo/cartridges/releases/tag/${src.rev}";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ getchoo ];
mainProgram = "cartridges";
platforms = lib.platforms.linux;
};
})
}

6
pkgs/by-name/hy/hyperlink/package.nix
View file

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "hyperlink";
version = "0.1.31";
version = "0.1.32";
src = fetchFromGitHub {
owner = "untitaker";
repo = "hyperlink";
rev = version;
hash = "sha256-ZmNw4NmDD0VWwnmNjxsA4y5gzVbTzshZLRYzaNJ4iGw=";
hash = "sha256-QejpyleugPWvr4p8JOMieswVtfQMGxtH+fb46mRLlH4=";
};
cargoHash = "sha256-5j1Ziwk5uQNIKCRMZpJP4qR0tcyUUvT8i/KZbXq3WzI=";
cargoHash = "sha256-d0JwxxI6Quyan2lgymxGpROKR757LEOUIgJcs5c9Kmc=";
meta = with lib; {
description = "Very fast link checker for CI";

4
pkgs/by-name/li/limine/package.nix
View file

@ -12,7 +12,7 @@
}:
let
version = "7.7.2";
version = "7.8.0";
in
# The output of the derivation is a tool to create bootable images using Limine
# as bootloader for various platforms and corresponding binary and helper files.
@ -24,7 +24,7 @@ stdenv.mkDerivation {
# Packaging that in Nix is very cumbersome.
src = fetchurl {
url = "https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz";
sha256 = "sha256-t3ymsKn+pFW2xOn+BKJriqx2cMbCjtnGGgvCF82/8TE=";
sha256 = "sha256-Fue2KPyJ76Q1f+chvhwmJlmQ4QwXksyCeztd2d2cTH0=";
};
nativeBuildInputs = [

4
pkgs/by-name/li/livi/package.nix
View file

@ -15,14 +15,14 @@
stdenv.mkDerivation rec {
pname = "livi";
version = "0.1.0";
version = "0.2.0";
src = fetchFromGitLab {
owner = "guidog";
repo = "livi";
domain = "gitlab.gnome.org";
rev = "v${version}";
sha256 = "sha256-FJ43BDRsZUFuRrNFWuEJ/nSO+suWad2QvqhwzuXWBtY=";
hash = "sha256-4CWH8TWxuDGYlOilxyCa/HL/vtO6A9u/x39s1OLDODo";
};
nativeBuildInputs = [
meson

4
pkgs/development/python-modules/google-cloud-bigquery/default.nix
View file

@ -30,14 +30,14 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery";
version = "3.24.0";
version = "3.25.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-6V5vbgqjLmxFPUTisymJMf3XlHwwnqMpoxtv8fk54X4=";
hash = "sha256-Wyr/MgWoVEgRF0NoNq4UA/EfJZTmgQqYiGr9V+2ihQk=";
};
build-system = [ setuptools ];

4
pkgs/development/python-modules/google-cloud-monitoring/default.nix
View file

@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "google-cloud-monitoring";
version = "2.21.0";
version = "2.22.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-57HIdY/DVj/7mjR7xRcuJ4L0TBIbyA/BUoPiic/2db8=";
hash = "sha256-SUaW4XiMVe9bL61GSBP92fWRF/wogZt9nSehhz17f60=";
};
build-system = [ setuptools ];

4
pkgs/development/python-modules/google-cloud-pubsub/default.nix
View file

@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "google-cloud-pubsub";
version = "2.21.4";
version = "2.21.5";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-LLjHaYrb/qBEjbbIm3iqchf84HweN7RtPlNfoWM/OuY=";
hash = "sha256-T6lufyADWczEnPZlfjGsNfXm5V0A+7PO36ZykDz3WyQ=";
};
build-system = [ setuptools ];

4
pkgs/development/python-modules/influxdb-client/default.nix
View file

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "influxdb-client";
version = "1.43.0";
version = "1.44.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "influxdata";
repo = "influxdb-client-python";
rev = "refs/tags/v${version}";
hash = "sha256-CwSqJj9MslcvTzYGaDRygskSxbSh80uCJQM2tNz743k=";
hash = "sha256-iG9edGHqhExUoL+1q8s5QvY/mrYOMosgtA2P1zwO3o8=";
};
build-system = [ setuptools ];

4
pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-graph-stores-neo4j";
version = "0.2.5";
version = "0.2.6";
pyproject = true;
disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_graph_stores_neo4j";
inherit version;
hash = "sha256-K+k3tsELhF6TXVK/voMRYpb0vVkGQpkzYnB9syCLmoY=";
hash = "sha256-xv/Z/HLFUEfLqjE4052bc8aBJq3bvreYD/XZw1vijQQ=";
};
build-system = [ poetry-core ];

4
pkgs/development/python-modules/neo4j/default.nix
View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "neo4j";
version = "5.21.0";
version = "5.22.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "neo4j";
repo = "neo4j-python-driver";
rev = "refs/tags/${version}";
hash = "sha256-SGRe5O+6HqLFu4VQc0QC+91KVjqKeqNt5hIBwophvP0=";
hash = "sha256-/yilbKui0D49zviNM9MI5ElGAYPB3MlbMgpDyI1kVX8=";
};
postPatch = ''

4
pkgs/development/python-modules/pyTelegramBotAPI/default.nix
View file

@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "pytelegrambotapi";
version = "4.19.0";
version = "4.20.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "eternnoir";
repo = "pyTelegramBotAPI";
rev = "refs/tags/${version}";
hash = "sha256-vyhX6TG3B6f1u49ngzdaCOZwSnEUQ2XMiq80bqCSmxU=";
hash = "sha256-JKT3kllOV9VEwhUwv3geAP5ibJgaAApCahD1N4V5SE8=";
};
build-system = [ hatchling ];

8
pkgs/development/tools/rubyfmt/default.nix
View file

@ -73,12 +73,12 @@ rustPlatform.buildRustPackage rec {
mv $out/bin/rubyfmt{-main,}
'';
meta = with lib; {
meta = {
description = "Ruby autoformatter";
homepage = "https://github.com/fables-tales/rubyfmt";
license = licenses.mit;
maintainers = with maintainers; [ bobvanderlinden ];
broken = stdenv.isDarwin && stdenv.isx86_64;
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ bobvanderlinden ];
broken = stdenv.isDarwin;
mainProgram = "rubyfmt";
};
}

6
pkgs/development/web/flyctl/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "flyctl";
version = "0.2.72";
version = "0.2.75";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
hash = "sha256-v2+xDeErVkgiGavPpBtKg7+BBhiKZdmbo2NIFL7iXvw=";
hash = "sha256-7qJDlMy2LmrUMxeacH6n/JP8Zg4ln12iC1BGysejMws=";
};
vendorHash = "sha256-iRZrjkWQxuUW/YM5TygFt+g8suM5iLGsWsCt4QQOX3M=";
vendorHash = "sha256-RSLwEOtZsYfTgBdkZIxccxehz8lbozWJV5UdKiMeoLU=";
subPackages = [ "." ];

29
pkgs/servers/http/envoy/0004-nixpkgs-add-cstdint-in-dd-trace-cpp.patch
View file

@ -1,29 +0,0 @@
From dd3509a7d646a970480f94a8e09f377e9783504d Mon Sep 17 00:00:00 2001
From: Malte Poll <1780588+malt3@users.noreply.github.com>
Date: Mon, 22 Apr 2024 16:07:58 +0200
Subject: [PATCH 4/4] nixpkgs: add cstdint in dd-trace-cpp
---
bazel/repositories.bzl | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index d91aa712bd..467348e773 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -772,7 +772,11 @@ def _io_opentelemetry_api_cpp():
)
def _com_github_datadog_dd_trace_cpp():
- external_http_archive("com_github_datadog_dd_trace_cpp")
+ external_http_archive(
+ name = "com_github_datadog_dd_trace_cpp",
+ patch_args = ["-p1"],
+ patches = ["@envoy//bazel:dd_trace_cpp.patch"],
+ )
native.bind(
name = "dd_trace_cpp",
actual = "@com_github_datadog_dd_trace_cpp//:dd_trace_cpp",
--
2.42.0

25
pkgs/servers/http/envoy/dd_trace_cpp.patch
View file

@ -1,25 +0,0 @@
From 4851a6a722b228ecbfd9df255dab3d8f30bd84b9 Mon Sep 17 00:00:00 2001
From: Malte Poll <1780588+malt3@users.noreply.github.com>
Date: Mon, 22 Apr 2024 15:36:33 +0200
Subject: [PATCH] nixpkgs: add cstdint to fix compilation under GCC 13
https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
---
src/datadog/parse_util.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/datadog/parse_util.h b/src/datadog/parse_util.h
index c603286..c8e4e83 100644
--- a/src/datadog/parse_util.h
+++ b/src/datadog/parse_util.h
@@ -2,6 +2,7 @@
// This component provides parsing-related miscellanea.
+#include <cstdint>
#include <string>
#include <unordered_map>
#include <vector>
--
2.42.0

17
pkgs/servers/http/envoy/default.nix
View file

@ -24,15 +24,15 @@ let
# However, the version string is more useful for end-users.
# These are contained in a attrset of their own to make it obvious that
# people should update both.
version = "1.30.2";
rev = "d79f6e8d453ee260e9094093b8dd31af0056e67b";
hash = "sha256-qbe9M4dH7NFDY5UF17urJ6WvnZNhvdMU4HAg0BaL+KA=";
version = "1.30.3";
rev = "12a6a79966203969a23aa2f0d705f39b679744c2";
hash = "sha256-S18bnAVha4CnYKHTzytKY6PHWSbOzmObbyZEhzIHsf8=";
};
# these need to be updated for any changes to fetchAttrs
depsHash = {
x86_64-linux = "sha256-/IpTRFBkif1HSycPrWxphKTnhL6wHgPAweyxoXZ1oVg=";
aarch64-linux = "sha256-uA1CHKzdBht+WYxgwR2g5t7fRybhbo6Hgpzdr+H1vqY=";
x86_64-linux = "sha256-m7dMr/dCmjpKLPT+8FXBHGkTlNoN9x1oQ7D6uO0sHtQ=";
aarch64-linux = "sha256-9GqVpWkMHP9nb5EZHjGKixkWazi//oLlIUum45xTvoM=";
}.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
in
buildBazelPackage {
@ -55,8 +55,6 @@ buildBazelPackage {
sed -i 's,#!/usr/bin/env python3,#!${python3}/bin/python,' bazel/foreign_cc/luajit.patch
sed -i '/javabase=/d' .bazelrc
sed -i '/"-Werror"/d' bazel/envoy_internal.bzl
cp ${./dd_trace_cpp.patch} bazel/dd_trace_cpp.patch
'';
patches = [
@ -68,11 +66,6 @@ buildBazelPackage {
# use system C/C++ tools
./0003-nixpkgs-use-system-C-C-toolchains.patch
# apply patch to dd-trace-cpp
# remove once a version of dd-trace-cpp is released and adopted by envoy
# that contains https://github.com/DataDog/dd-trace-cpp/commit/3a8e1e9a3cf4e87ef053e954a39dc7a967ac6965
./0004-nixpkgs-add-cstdint-in-dd-trace-cpp.patch
];
nativeBuildInputs = [

6
pkgs/tools/admin/stripe-cli/default.nix
View file

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "stripe-cli";
version = "1.19.5";
version = "1.21.0";
src = fetchFromGitHub {
owner = "stripe";
repo = pname;
rev = "v${version}";
hash = "sha256-gunLbZOT0cnWGxc6714XcPdHJVK4LbDBwC2zt03WrUM=";
hash = "sha256-8r+Gu36zAmNTZb6xA5iS0+smkmJ7UrdGi9TaUXUr5aQ=";
};
vendorHash = "sha256-xFWU+OazwLTb5qdFeYth1MlPJ76nEK4qSCNGVhC/PxE=";
vendorHash = "sha256-TuxYJ3u4/5PJYRoRgom+M1au9XerZ+vj9X3jUWTPM58=";
nativeBuildInputs = [ installShellFiles ];

4
pkgs/tools/filesystems/btrfs-progs/default.nix
View file

@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "btrfs-progs";
version = "6.9.1";
version = "6.9.2";
src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
hash = "sha256-7VSz1w0MfBHaBCipz6WoHLguYzFkx7pXz2cU+LaUGLo=";
hash = "sha256-Q4ZbsnLcCrJYXeNgVDTYG6IXV48Il79wDNNsFKxAZSo=";
};
nativeBuildInputs = [

6
pkgs/tools/security/asnmap/default.nix
View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "asnmap";
version = "1.1.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "asnmap";
rev = "refs/tags/v${version}";
hash = "sha256-Of4IVra6kMHY9btWcF9grM/r3lTWFP/geeT309Seasw=";
hash = "sha256-dGSWUuM4Zcz9QYjYaHur3RYryxe1wJycx/wUL5yqCpM=";
};
vendorHash = "sha256-RDv8vkBI3miyeNAbhUsMpuZCYRUZ0ATfXYHxaTgTVfA=";
vendorHash = "sha256-bSpMYQvrlR9T06dYF8gaTZmMAp6Gnb2cfsYCUes7i2s=";
ldflags = [
"-w"

4
pkgs/tools/security/exploitdb/default.nix
View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2024-06-15";
version = "2024-06-27";
src = fetchFromGitLab {
owner = "exploit-database";
repo = "exploitdb";
rev = "refs/tags/${version}";
hash = "sha256-bETNSUv36GobOke1bwE+uTSRqln3kANqfl8UIx7bdjM=";
hash = "sha256-8TYraSY6dA7Q9CE9sTjfteNzrVIc6CuMPD6umOmAoHk=";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/tools/security/trufflehog/default.nix
View file

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "trufflehog";
version = "3.78.2";
version = "3.79.0";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
rev = "refs/tags/v${version}";
hash = "sha256-s+8l203ntPsp54yZpEX2wz8Dt/p3rokfu6KI8LSwpko=";
hash = "sha256-YgalvCAhtL0y2bVqeI0w/n5eVMIW2QPPbm9zpBzzuAM=";
};
vendorHash = "sha256-0YNvqJlSF6TIGSbQrAu47G2oXPY9+2wiZbDP94oAaVA=";
vendorHash = "sha256-fBcBY6P2V2ZkBDqCLk5AMBtGF1vTZzZ8ohxc1BPTSVQ=";
proxyVendor = true;

2
pkgs/top-level/all-packages.nix
View file

@ -411,8 +411,6 @@ with pkgs;
caroline = callPackage ../development/libraries/caroline { };
cartridges = callPackage ../applications/misc/cartridges { };
castget = callPackage ../applications/networking/feedreaders/castget { };
catatonit = callPackage ../applications/virtualization/catatonit { };