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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2024-12-02 05:46:56 +00:00
committed by GitHub
parent 238b952e97 91071a2b27
commit 5c6c7bd759
25 changed files with 94 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
+2
View File
@@ -14,6 +14,7 @@
, libglvnd
, libjack2
, libjpeg
, libnghttp2
, libxkbcommon
, makeWrapper
, pango
@@ -55,6 +56,7 @@ stdenv.mkDerivation rec {
libjack2
# libjpeg8 is required for converting jpeg's to colour palettes
libjpeg
libnghttp2
libxcb
libXcursor
libX11
pkgs/applications/networking/cluster/terraform-providers/providers.json
+14 -14
View File
@@ -36,13 +36,13 @@
"vendorHash": "sha256-UM4EjL1qXOn2TMOupVxSyJVLarHIGTySXNJtWPrseSE="
},
"akamai": {
"hash": "sha256-KnX+PAhT7TPp9SRkGwYPvxgk/ExaJPr7vKj9hTbJGhg=",
"hash": "sha256-v1Y34+SoxVyBqO6QOCrfHFf+ng8ER3ngw8+0HDrB4Hc=",
"homepage": "https://registry.terraform.io/providers/akamai/akamai",
"owner": "akamai",
"repo": "terraform-provider-akamai",
"rev": "v6.5.0",
"rev": "v6.6.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-qLJnhwMz9Lz47Iih7tvFORng8j3IKjBkksLeK9o6TQE="
"vendorHash": "sha256-PUKSCQwVUkEfvGpk18joVnHGdacsiOB/Xk5yE4Y6Nbg="
},
"alicloud": {
"hash": "sha256-CWXA7Ljd9wx0c5toLszQFfGqAGPNVpm3pSvzbVnCrtI=",
@@ -408,13 +408,13 @@
"vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw="
},
"equinix": {
"hash": "sha256-RlJsM5gZPHQxE7Lab2J1MVFL1YaSz2kC/1F68Nep1jc=",
"hash": "sha256-UCgxXvUD7nqfAAQv4Hfu3PNfyV6lw09j+uh5YqlxCuo=",
"homepage": "https://registry.terraform.io/providers/equinix/equinix",
"owner": "equinix",
"repo": "terraform-provider-equinix",
"rev": "v2.9.0",
"rev": "v2.11.0",
"spdx": "MIT",
"vendorHash": "sha256-D08K1+0m5HcLTr6VfP0adMdTBh6st4cQyWf95fd6GlY="
"vendorHash": "sha256-E77/PwZiMEbxv+UkG9tSUHdD1AbzXpZ28KeP9zyadN0="
},
"exoscale": {
"hash": "sha256-5hhq+ecaTR4kz+23xObDGjyreJ3UuHYBRMoBl7bxnJw=",
@@ -435,11 +435,11 @@
"vendorHash": "sha256-xlcOCdgRTQbJCsL39hs3dUVjssGpyNij0ickjSn8EX0="
},
"fastly": {
"hash": "sha256-Kpb5TiWDGOvIZLhzxG27wY+h1B9fgYN1WYGrmLps28c=",
"hash": "sha256-PtmJISWgOXM2og0LaxLqBq9gB0AVegNaIFGbdckDcKc=",
"homepage": "https://registry.terraform.io/providers/fastly/fastly",
"owner": "fastly",
"repo": "terraform-provider-fastly",
"rev": "v5.14.0",
"rev": "v5.15.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -705,13 +705,13 @@
"vendorHash": "sha256-F78OR8EG0Vy3WVJWTOlAsIBazsSXGD6KeceYuGnBqjQ="
},
"kubectl": {
"hash": "sha256-UkUwWi7Z9cSMyZakD6JxMl+qdczAYfZQgwroCUjFIUM=",
"hash": "sha256-/tlwr6fh7/8FQew0MVaftvZQVuR/FGWVcEyHXTTCIUo=",
"homepage": "https://registry.terraform.io/providers/gavinbunney/kubectl",
"owner": "gavinbunney",
"repo": "terraform-provider-kubectl",
"rev": "v1.14.0",
"rev": "v1.16.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao="
"vendorHash": "sha256-K4Ro2q1dn5EdjZOGKfIuirx3kaFmRj9a1iPhgvjiFkQ="
},
"kubernetes": {
"hash": "sha256-xznolig6OYs6igpz3CoB5Vu3UHlfDi4zmfbTHWFJacI=",
@@ -1183,13 +1183,13 @@
"vendorHash": "sha256-m/J390su2nUpYMXrrYcOfKSjZb5Y23+g24rroLRss4U="
},
"spotinst": {
"hash": "sha256-BQL8ZwLAOaNO42Hhmq0XvgcLe7STAIN9xLXaHMM1x6Y=",
"hash": "sha256-Yq52eCxT+XWoTONcLTDlIpy/jnU76JajsoqKYXFK8AM=",
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
"owner": "spotinst",
"repo": "terraform-provider-spotinst",
"rev": "v1.195.0",
"rev": "v1.199.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-/2t6Yv0ceSweRGPNOUOHj/fv6/VQNZEP8et++rxmfiE="
"vendorHash": "sha256-DWFPqjFLDJSfxQHXUSog2Cyn6RD1BdOz1zRIXXZVjkY="
},
"ssh": {
"hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=",
pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
+1
View File
@@ -196,6 +196,7 @@ let
ln -s /usr/lib32 $out/lib32
ln -s /usr/lib64 $out/lib64
ln -s /usr/lib64 $out/usr/lib
ln -s /usr/libexec $out/libexec
# symlink 32-bit ld-linux so it's visible in /lib
if [ -e $out/usr/lib32/ld-linux.so.2 ]; then
pkgs/build-support/build-fhsenv-bubblewrap/rootfs-builder/src/main.rs
+1 -1
View File
@@ -159,7 +159,7 @@ fn collect_candidate_paths(
}
fn remap_native_path(root: &Path, p: &Path) -> Option<PathBuf> {
if p.starts_with("bin/") || p.starts_with("sbin/") {
if p.starts_with("bin/") || p.starts_with("sbin/") || p.starts_with("libexec/") {
return Some(PathBuf::from("usr/").join(p));
}
pkgs/by-name/bt/btrfs-progs/package.nix
+2 -2
View File
@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "btrfs-progs";
version = "6.11";
version = "6.12";
src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
hash = "sha256-/5rpFSEwOpDYfhxL4jDwEh85xE3b5Swq6uJjxv7PoJk=";
hash = "sha256-mn2WUf/VL75SEqjkhSo82weePSI/xVBOalCwupbNIKE=";
};
nativeBuildInputs = [
pkgs/by-name/fa/fanbox-dl/package.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "fanbox-dl";
version = "0.23.2";
version = "0.27.1";
src = fetchFromGitHub {
owner = "hareku";
repo = "fanbox-dl";
rev = "v${version}";
hash = "sha256-JARIY6z912XDvZ6JviLMP8OZLOIzUPLuJtWGpKcqwvY=";
hash = "sha256-2fxptsETjWyQxQv/VDx2A5UMZ3oLgC298YY/To3qaqk=";
};
vendorHash = "sha256-l/mgjCqRzidJ1QxH8bKGa7ZnRZVOqkuNifgEyFVU7fA=";
pkgs/by-name/fo/folio/package.nix
+2 -2
View File
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "folio";
version = "24.13";
version = "24.14";
src = fetchFromGitHub {
owner = "toolstack";
repo = "Folio";
rev = "refs/tags/${version}";
hash = "sha256-mtUo1auHpE0kmbF0EvJUtGrPehuRfP1y/m8rDmqWYPs=";
hash = "sha256-A0vUM6oIchpC/1NEjPmZkT2/f/CmEWmPsMHQrGkDKXQ=";
};
nativeBuildInputs = [
pkgs/by-name/he/helvum/package.nix
-2
View File
@@ -1,6 +1,5 @@
{ lib
, cargo
, clang
, desktop-file-utils
, fetchFromGitLab
, glib
@@ -35,7 +34,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
clang
meson
ninja
pkg-config
pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix
+3 -3
View File
@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation {
pname = "jawiki-all-titles-in-ns0";
version = "0-unstable-2024-10-01";
version = "0-unstable-2024-12-01";
src = fetchFromGitHub {
owner = "musjj";
repo = "jawiki-archive";
rev = "1e26e5efa36eea5322f55b178a5c4d5a5439feb9";
hash = "sha256-8jzsECzrrcHeMvV2K89WagSiCXHjEDEfUwLDanVVuas=";
rev = "a4146faaca34c37a36f26e1e75990187cac40954";
hash = "sha256-FuLtXgyEpHZWeZbbrKXalXeycf7gtkfWMYoM7j2mOds=";
};
installPhase = ''
pkgs/by-name/jp/jp-zip-codes/package.nix
+3 -3
View File
@@ -7,15 +7,15 @@
stdenvNoCC.mkDerivation {
pname = "jp-zip-code";
version = "0-unstable-2024-10-01";
version = "0-unstable-2024-12-01";
# This package uses a mirror as the source because the
# original provider uses the same URL for updated content.
src = fetchFromGitHub {
owner = "musjj";
repo = "jp-zip-codes";
rev = "94ddc993224a6e2c65480f9109564f7f68125665";
hash = "sha256-/2f/HXxrxKc6dv5E67S59xIpdJUkh0fX0lyTuo2y1N4=";
rev = "94071d5f73bcea043694d1e9a557f6e526b44096";
hash = "sha256-RyXJZOwZmtW9vP0lEctE3t1DItBFOop7vdTi0IAH8E8=";
};
installPhase = ''
pkgs/by-name/la/latexminted/package.nix
+2 -2
View File
@@ -7,12 +7,12 @@
python3Packages.buildPythonApplication rec {
pname = "latexminted";
version = "0.3.0";
version = "0.3.2";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-bxv7dKSnlJ5njvCgAKjRVJeoE2BluP1nx9QFZ/2JYeg=";
hash = "sha256-lxqu39RkSdBcSuLbuMmjrD9kiKHZ2yBjLZkJhSUpsSI=";
};
build-system = with python3Packages; [
pkgs/by-name/li/libdeltachat/package.nix
+3 -3
View File
@@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "libdeltachat";
version = "1.151.1";
version = "1.151.2";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = "v${version}";
hash = "sha256-sQPJ1IQicHzgjc2l1JYG7ieC+GKvp8cqhwZbL1yU29M=";
hash = "sha256-PSVRLJAnogWu9XUoVv/PBXkXxC4xS3FS7UE3fQ/jnKY=";
};
patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.fetchCargoVendor {
pname = "deltachat-core-rust";
inherit version src;
hash = "sha256-EyOT88XEjIVTFv7XGUEsUIu4NcDdD89W5Hbl4xa/urc=";
hash = "sha256-OlwIcfseJSN/f57T3g0OcBPQ/KvtquV51nJqNcd2Q7I=";
};
nativeBuildInputs = [
pkgs/by-name/ni/niri/package.nix
-2
View File
@@ -1,6 +1,5 @@
{
lib,
clang,
dbus,
eudev,
fetchFromGitHub,
@@ -51,7 +50,6 @@ rustPlatform.buildRustPackage rec {
strictDeps = true;
nativeBuildInputs = [
clang
pkg-config
rustPlatform.bindgenHook
];
pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix
+2 -2
View File
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "poetry-plugin-up";
version = "0.7.3";
version = "0.8.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "MousaZeidBaker";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-yhGoiuqPUzEPiq+zO/RD4pB1LvOo80yLIpM+rRQHOmY=";
hash = "sha256-PWHbMDGL9CGLRmvFWLOztUW0f/TJioPjQtAgpyCbAqw=";
};
nativeBuildInputs = [
pkgs/by-name/sv/svkbd/package.nix
+34 -32
View File
@@ -1,37 +1,38 @@
{ lib
, stdenv
, fetchurl
, writeText
, pkg-config
, libX11
, libXft
, libXi
, libXinerama
, libXtst
, layout ? null
, conf ? null
, patches ? [ ]
{
lib,
stdenv,
fetchurl,
writeText,
pkg-config,
libX11,
libXft,
libXi,
libXinerama,
libXtst,
layout ? "mobile-intl",
conf ? null,
patches ? [ ],
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "svkbd";
version = "0.4.1";
version = "0.4.2";
src = fetchurl {
url = "https://dl.suckless.org/tools/svkbd-${version}.tar.gz";
sha256 = "sha256-+8Jh/D4dgULhRXtC1tZQg6AK4POh9czyRyrMi0auD1o=";
url = "https://dl.suckless.org/tools/svkbd-${finalAttrs.version}.tar.gz";
hash = "sha256-bZQyGeMzMUdYY0ZmdKB2CFhZygDc6UDlTU4kdx+UZoA=";
};
inherit patches;
postPatch = let
configFile = if lib.isDerivation conf || lib.isPath conf then
conf
else
writeText "config.def.h" conf;
in lib.optionalString (conf != null) ''
cp ${configFile} config.def.h
'';
postPatch =
let
configFile =
if lib.isDerivation conf || lib.isPath conf then conf else writeText "config.def.h" conf;
in
lib.optionalString (conf != null) ''
cp ${configFile} config.def.h
'';
nativeBuildInputs = [
pkg-config
@@ -47,14 +48,15 @@ stdenv.mkDerivation rec {
makeFlags = [
"PREFIX=${placeholder "out"}"
] ++ lib.optional (layout != null) "LAYOUT=${layout}";
"LAYOUT=${layout}"
];
meta = with lib; {
meta = {
description = "Simple virtual keyboard";
homepage = "https://tools.suckless.org/x/svkbd/";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ dotlambda ];
mainProgram = "svkbd-mobile-intl";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ dotlambda ];
mainProgram = "svkbd-${layout}";
};
}
})
pkgs/by-name/t-/t-rex/package.nix
+1
View File
@@ -26,5 +26,6 @@ rustPlatform.buildRustPackage rec {
maintainers = teams.geospatial.members;
mainProgram = "t_rex";
platforms = platforms.unix;
broken = true; # see https://github.com/t-rex-tileserver/t-rex/issues/320
};
}
pkgs/by-name/xe/xen-guest-agent/package.nix
-2
View File
@@ -2,7 +2,6 @@
lib,
fetchFromGitLab,
rustPlatform,
llvmPackages,
pkg-config,
xen,
}:
@@ -21,7 +20,6 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [
rustPlatform.bindgenHook
llvmPackages.clang
pkg-config
];
pkgs/development/libraries/botan/default.nix
+1 -3
View File
@@ -79,13 +79,11 @@ let
"--with-bzip2"
"--with-zlib"
"--with-rst2man"
"--cpu=${stdenv.hostPlatform.parsed.cpu.name}"
]
++ lib.optionals stdenv.cc.isClang [
"--cc=clang"
]
++ lib.optionals stdenv.hostPlatform.isAarch64 [
"--cpu=aarch64"
]
++ lib.optionals (lib.versionAtLeast version "3.6.0") [
"--enable-modules=jitter_rng"
];
pkgs/development/libraries/proj/default.nix
+2 -2
View File
@@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "proj";
version = "9.5.0";
version = "9.5.1";
src = fetchFromGitHub {
owner = "OSGeo";
repo = "PROJ";
rev = finalAttrs.version;
hash = "sha256-j7Bvv8F9wxrcQlquRa7Pdj5HTUJhwo8Wc1/JbULkUhM=";
hash = "sha256-gKfsuznAhq29sOw78gpQ7TNZ6xCgmDBad3TcqFzoWVc=";
};
patches = [
pkgs/development/python-modules/ihcsdk/default.nix
+2 -2
View File
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "ihcsdk";
version = "2.8.7";
version = "2.8.9";
pyproject = true;
src = fetchFromGitHub {
owner = "dingusdk";
repo = "PythonIhcSdk";
rev = "refs/tags/v${version}";
hash = "sha256-Ct+ONqvvm1OcZKi+5P3o5ievfVK0pg8DpjNwkbuczCE=";
hash = "sha256-WI9RjVR2KdLaqklGtIUJErV4pBfffXx3odu3hdoyLWc=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/pynecil/default.nix
+2 -2
View File
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pynecil";
version = "0.2.1";
version = "1.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "tr4nt0r";
repo = "pynecil";
rev = "refs/tags/v${version}";
hash = "sha256-ZltGA3O6DDOiOddKHMalqmOYrp3IbhAGN7wGfPBP2aA=";
hash = "sha256-95tHT3n4QbYkbAnzFZ0PJ8EHNQdjOqONOKma+QcZSD8=";
};
build-system = [
pkgs/development/python-modules/recurring-ical-events/default.nix
+1 -1
View File
@@ -31,7 +31,7 @@ buildPythonPackage rec {
build-system = [ setuptools ];
pythonRelaxDeps = [ "icalendar" ];
pythonRelaxDeps = [ "x-wr-timezone" ];
dependencies = [
icalendar
pkgs/development/python-modules/rmscene/default.nix
+5 -5
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "rmscene";
version = "0.5.0";
version = "0.6.0";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -19,17 +19,17 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "ricklupton";
repo = "rmscene";
rev = "v${version}";
hash = "sha256-uIvoKdW7caOfc8OEGIcyDwyos9NLwtZ++CeZdUO/G8M=";
rev = "refs/tags/v${version}";
hash = "sha256-BnTr3rLehP5uhzXWXKPaXcJCWW2ofk5N8amqoEUmlWo=";
};
nativeBuildInputs = [
build-system = [
poetry-core
];
pythonRelaxDeps = [ "packaging" ];
propagatedBuildInputs = [ packaging ];
dependencies = [ packaging ];
pythonImportsCheck = [ "rmscene" ];
pkgs/development/python-modules/x-wr-timezone/default.nix
+7 -3
View File
@@ -3,29 +3,32 @@
buildPythonPackage,
fetchFromGitHub,
setuptools,
click,
icalendar,
tzdata,
pytestCheckHook,
restructuredtext-lint,
pygments,
pytz,
pytest-click,
}:
buildPythonPackage rec {
pname = "x-wr-timezone";
version = "1.0.1";
version = "2.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "niccokunzmann";
repo = "x-wr-timezone";
rev = "v${version}";
hash = "sha256-MDFniFhgRuNtYITH/IUUP/HHC79coqxgXrlErj+Yrcs=";
rev = "refs/tags/v${version}";
hash = "sha256-F/bNETgscbhEkpG/D1eSJaBNdpi0+xEYuNL4RURGST0=";
};
build-system = [ setuptools ];
dependencies = [
click
icalendar
tzdata
];
@@ -35,6 +38,7 @@ buildPythonPackage rec {
restructuredtext-lint
pygments
pytz
pytest-click
];
preCheck = ''
pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/default.nix
+2 -2
View File
@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "bubble-card";
version = "2.2.4";
version = "2.3.0";
dontBuild = true;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
owner = "Clooos";
repo = "Bubble-Card";
rev = "v${version}";
hash = "sha256-vsgu1hvtlppADvaFLeB4xQHbP3wBc6H4p5HbeS3JY80=";
hash = "sha256-CzjbTNacrfgzeV/rHoJZntjE3EdfZK/GUPg4uPfTNFg=";
};
installPhase = ''