Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
fd272c4af4
|
|
@ -19356,6 +19356,13 @@
|
|||
githubId = 42933;
|
||||
name = "Andrew Childs";
|
||||
};
|
||||
thefossguy = {
|
||||
name = "Pratham Patel";
|
||||
email = "prathampatel@thefossguy.com";
|
||||
matrix = "@thefossguy:matrix.org";
|
||||
github = "thefossguy";
|
||||
githubId = 44400303;
|
||||
};
|
||||
thehedgeh0g = {
|
||||
name = "The Hedgehog";
|
||||
email = "hedgehog@mrhedgehog.xyz";
|
||||
|
|
|
|||
|
|
@ -337,6 +337,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
|||
- Similarly, please use `services.xserver.desktopManager.mate.extraCajaExtensions` option for installing Caja extensions.
|
||||
- To use the Wayland session, enable `services.xserver.desktopManager.mate.enableWaylandSession`. This is opt-in for now as it is in early stage and introduces a new set of Wayfire closure. Due to [known issues with LightDM](https://github.com/canonical/lightdm/issues/63), we suggest using SDDM for display manager.
|
||||
|
||||
- The Budgie module installs gnome-terminal by default (instead of mate-terminal).
|
||||
|
||||
- New `boot.loader.systemd-boot.xbootldrMountPoint` allows setting up a separate [XBOOTLDR partition](https://uapi-group.org/specifications/specs/boot_loader_specification/) to store boot files. Useful on systems with a small EFI System partition that cannot be easily repartitioned.
|
||||
|
||||
- `boot.loader.systemd-boot` will now verify that `efiSysMountPoint` (and `xbootldrMountPoint` if configured) are mounted partitions.
|
||||
|
|
|
|||
|
|
@ -32,8 +32,8 @@ in
|
|||
};
|
||||
plasma6Support = mkOption {
|
||||
type = types.bool;
|
||||
default = config.services.xserver.desktopManager.plasma6.enable;
|
||||
defaultText = literalExpression "config.services.xserver.desktopManager.plasma6.enable";
|
||||
default = config.services.desktopManager.plasma6.enable;
|
||||
defaultText = literalExpression "config.services.desktopManager.plasma6.enable";
|
||||
description = lib.mdDoc ''
|
||||
Use qt6 versions of fcitx5 packages.
|
||||
Required for configuring fcitx5 in KDE System Settings.
|
||||
|
|
|
|||
|
|
@ -146,7 +146,6 @@ in {
|
|||
mate.atril
|
||||
mate.engrampa
|
||||
mate.mate-calc
|
||||
mate.mate-terminal
|
||||
mate.mate-system-monitor
|
||||
vlc
|
||||
|
||||
|
|
@ -160,6 +159,9 @@ in {
|
|||
] config.environment.budgie.excludePackages)
|
||||
++ cfg.sessionPath;
|
||||
|
||||
# Both budgie-desktop-view and nemo defaults to this emulator.
|
||||
programs.gnome-terminal.enable = mkDefault true;
|
||||
|
||||
# Fonts.
|
||||
fonts.packages = [
|
||||
pkgs.noto-fonts
|
||||
|
|
@ -214,7 +216,6 @@ in {
|
|||
services.colord.enable = mkDefault true; # for BCC's Color panel.
|
||||
services.gnome.at-spi2-core.enable = mkDefault true; # for BCC's A11y panel.
|
||||
services.accounts-daemon.enable = mkDefault true; # for BCC's Users panel.
|
||||
services.fprintd.enable = mkDefault true; # for BCC's Users panel.
|
||||
services.udisks2.enable = mkDefault true; # for BCC's Details panel.
|
||||
|
||||
# For BCC's Online Accounts panel.
|
||||
|
|
|
|||
|
|
@ -82,9 +82,9 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
machine.wait_until_succeeds("${su "budgie-screensaver-command -q"} | grep 'The screensaver is inactive'")
|
||||
machine.sleep(2)
|
||||
|
||||
with subtest("Open MATE terminal"):
|
||||
machine.succeed("${su "mate-terminal >&2 &"}")
|
||||
machine.wait_for_window("Terminal")
|
||||
with subtest("Open GNOME terminal"):
|
||||
machine.succeed("${su "gnome-terminal"}")
|
||||
machine.wait_for_window("${user.name}@machine: ~")
|
||||
|
||||
with subtest("Check if Budgie has ever coredumped"):
|
||||
machine.fail("coredumpctl --json=short | grep budgie")
|
||||
|
|
|
|||
|
|
@ -25,13 +25,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc";
|
||||
version = "0.28.11";
|
||||
version = "0.28.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitcoin-ABC";
|
||||
repo = "bitcoin-abc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JOAEaz9b89qIpHOJ+aHMu8RVpEvzuVtFv8plUMKcmlM=";
|
||||
hash = "sha256-D8ZKxvB8kfNkVTaI6uESEzw+ABtmNk0nJLK5N/pJ6W8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pueue";
|
||||
version = "3.3.3";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nukesor";
|
||||
repo = "pueue";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Q1x97eJNjtET+L3KpWTXLKbz62XgkjxNZkAAZWhbMmM=";
|
||||
hash = "sha256-kKu/+F+zK0UyRHGkrZdD8alvsQTZFHhTqYK2phxo/ZA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-i9SPOZo9AuITm6iI++D3ipY8c0xfZzkeHW7tb9SZ3iQ=";
|
||||
cargoHash = "sha256-KwIGJiCGcFEKuloVtJr0GQxoFQVt/OHyJ/YCp4bCSGc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -22,18 +22,18 @@
|
|||
ungoogled-chromium = {
|
||||
deps = {
|
||||
gn = {
|
||||
hash = "sha256-UhdDsq9JyP0efGpAaJ/nLp723BbjM6pkFPcAnQbgMKY=";
|
||||
rev = "f99e015ac35f689cfdbf46e4eb174e5d2da78d8e";
|
||||
hash = "sha256-JvilCnnb4laqwq69fay+IdAujYC1EHD7uWpkF/C8tBw=";
|
||||
rev = "d4f94f9a6c25497b2ce0356bb99a8d202c8c1d32";
|
||||
url = "https://gn.googlesource.com/gn";
|
||||
version = "2024-01-22";
|
||||
version = "2024-02-19";
|
||||
};
|
||||
ungoogled-patches = {
|
||||
hash = "sha256-YIJysusNifUPN3Ii2tCUSvHEe63RWlTrTdOt5KBVyK4=";
|
||||
rev = "122.0.6261.128-1";
|
||||
hash = "sha256-vaL5lClzUzksjeJ/qneQ0uJ7IO5pJKBXa/cEgRx8s70=";
|
||||
rev = "123.0.6312.58-1";
|
||||
};
|
||||
};
|
||||
hash = "sha256-BzLSwDQrmKavh4s2uOSfP935NnB5+Hw7oD7YDbSWp2g=";
|
||||
hash_deb_amd64 = "sha256-SxdYfWhV3ZpiGWmagOM6JUfjAmU9pzFGDQDinXrweas=";
|
||||
version = "122.0.6261.128";
|
||||
hash = "sha256-GrCYCUjxV16tinqrIqW4DQD51dKIgKNu2fLLz9Yqq7k=";
|
||||
hash_deb_amd64 = "sha256-z+UC7wUsWAX7kPIgk8S9ujW2n6HlUp0m3zHTvsAiTps=";
|
||||
version = "123.0.6312.58";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -86,6 +86,7 @@ let
|
|||
heroku = automated-providers.heroku.override { spdx = "MPL-2.0"; };
|
||||
# mkisofs needed to create ISOs holding cloud-init data and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630
|
||||
libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; });
|
||||
minio = automated-providers.minio.override { spdx = "AGPL-3.0-only"; };
|
||||
};
|
||||
|
||||
# Put all the providers we not longer support in this list.
|
||||
|
|
|
|||
|
|
@ -776,7 +776,7 @@
|
|||
"owner": "aminueza",
|
||||
"repo": "terraform-provider-minio",
|
||||
"rev": "v2.2.0",
|
||||
"spdx": "AGPL-3.0-only",
|
||||
"spdx": "AGPL-3.0",
|
||||
"vendorHash": "sha256-Uxexx5sK6D+EEEPWLnWFE0HPG1RKUsYnSJ/1bV9JBkw="
|
||||
},
|
||||
"mongodbatlas": {
|
||||
|
|
|
|||
|
|
@ -1,31 +1,41 @@
|
|||
{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder,
|
||||
attrs, aiohttp, appdirs, click, keyring, logbook, peewee, janus,
|
||||
prompt-toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3,
|
||||
setuptools, installShellFiles, nixosTests,
|
||||
|
||||
pytest, faker, pytest-aiohttp, aioresponses,
|
||||
|
||||
enableDbusUi ? true
|
||||
{ lib
|
||||
, stdenv
|
||||
, python3Packages
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, nixosTests
|
||||
, enableDbusUi ? true
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pantalaimon";
|
||||
version = "0.10.5";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
pyproject = true;
|
||||
|
||||
# pypi tarball miss tests
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = pname;
|
||||
repo = "pantalaimon";
|
||||
rev = version;
|
||||
sha256 = "sha256-yMhE3wKRbFHoL0vdFR8gMkNU7Su4FHbAwKQYADaaWpk=";
|
||||
hash = "sha256-yMhE3wKRbFHoL0vdFR8gMkNU7Su4FHbAwKQYADaaWpk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [
|
||||
installShellFiles
|
||||
] ++ (with python3Packages; [
|
||||
setuptools
|
||||
pythonRelaxDepsHook
|
||||
]);
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"matrix-nio"
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
aiohttp
|
||||
appdirs
|
||||
attrs
|
||||
cachetools
|
||||
click
|
||||
janus
|
||||
keyring
|
||||
|
|
@ -33,34 +43,28 @@ buildPythonApplication rec {
|
|||
matrix-nio
|
||||
peewee
|
||||
prompt-toolkit
|
||||
setuptools
|
||||
]
|
||||
++ matrix-nio.optional-dependencies.e2e
|
||||
++ lib.optionals enableDbusUi [
|
||||
dbus-python
|
||||
notify2
|
||||
pygobject3
|
||||
pydbus
|
||||
++ lib.optionals enableDbusUi optional-dependencies.ui;
|
||||
|
||||
optional-dependencies.ui = with python3Packages; [
|
||||
dbus-python
|
||||
notify2
|
||||
pygobject3
|
||||
pydbus
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
aioresponses
|
||||
faker
|
||||
pytest-aiohttp
|
||||
aioresponses
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
pytestCheckHook
|
||||
]
|
||||
++ lib.flatten (lib.attrValues optional-dependencies);
|
||||
|
||||
# darwin has difficulty communicating with server, fails some integration tests
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
checkPhase = ''
|
||||
pytest
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
installManPage docs/man/*.[1-9]
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -69,13 +69,13 @@ let
|
|||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "2454";
|
||||
version = "2481";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggerganov";
|
||||
repo = "llama.cpp";
|
||||
rev = "refs/tags/b${finalAttrs.version}";
|
||||
hash = "sha256-eZvApj2yLFCbS/TWaHeXJIVQ4PXbPlrxxu/eiov2T8k=";
|
||||
hash = "sha256-40GSZZEnjM9L9KVVKdSKtBoSRy996l98ORM4NeltsSM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "rkbin";
|
||||
version = "unstable-2024.02.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rockchip-linux";
|
||||
repo = "rkbin";
|
||||
rev = "a2a0b89b6c8c612dca5ed9ed8a68db8a07f68bc0";
|
||||
hash = "sha256-U/jeUsV7bhqMw3BljmO6SI07NCDAd/+sEp3dZnyXeeA=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
mv bin doc $out/
|
||||
'';
|
||||
|
||||
BL31_RK3568 = "bin/rk35/rk3568_ddr_1056MHz_v1.21.bin";
|
||||
ROCKCHIP_TPL_RK3568 = "bin/rk35/rk3568_ddr_1056MHz_v1.21.bin";
|
||||
|
||||
ROCKCHIP_TPL_RK3588 = "bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Rockchip proprietary bootloader blobs";
|
||||
homepage = "https://github.com/rockchip-linux/rkbin";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ thefossguy ];
|
||||
platforms = [ "aarch64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,7 +5,6 @@
|
|||
, glib
|
||||
, gsettings-desktop-schemas
|
||||
, gnome
|
||||
, mate
|
||||
, nixos-artwork
|
||||
, nixos-background-light ? nixos-artwork.wallpapers.nineish
|
||||
, nixos-background-dark ? nixos-artwork.wallpapers.nineish-dark-gray
|
||||
|
|
@ -54,7 +53,6 @@ let
|
|||
[org.buddiesofbudgie.budgie-desktop-view:Budgie]
|
||||
show=true
|
||||
show-active-mounts=true
|
||||
terminal="${mate.mate-terminal}/bin/mate-terminal"
|
||||
|
||||
${extraGSettingsOverrides}
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py
|
||||
index 4856594755..6769ab8026 100644
|
||||
--- a/Lib/venv/__init__.py
|
||||
+++ b/Lib/venv/__init__.py
|
||||
@@ -522,6 +522,7 @@ def skip_file(f):
|
||||
with open(dstfile, 'wb') as f:
|
||||
f.write(new_data)
|
||||
shutil.copymode(srcfile, dstfile)
|
||||
+ os.chmod(dstfile, 0o644)
|
||||
|
||||
def upgrade_dependencies(self, context):
|
||||
logger.debug(
|
||||
|
|
@ -60,6 +60,7 @@
|
|||
, static ? stdenv.hostPlatform.isStatic
|
||||
, enableFramework ? false
|
||||
, noldconfigPatch ? ./. + "/${sourceVersion.major}.${sourceVersion.minor}/no-ldconfig.patch"
|
||||
, enableGIL ? true
|
||||
|
||||
# pgo (not reproducible) + -fno-semantic-interposition
|
||||
# https://docs.python.org/3/using/configure.html#cmdoption-enable-optimizations
|
||||
|
|
@ -111,6 +112,7 @@ let
|
|||
inherit (lib)
|
||||
concatMapStringsSep
|
||||
concatStringsSep
|
||||
enableFeature
|
||||
getDev
|
||||
getLib
|
||||
optionals
|
||||
|
|
@ -304,7 +306,10 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
|
|||
# Make sure that the virtualenv activation scripts are
|
||||
# owner-writable, so venvs can be recreated without permission
|
||||
# errors.
|
||||
] ++ optionals (pythonOlder "3.13") [
|
||||
./virtualenv-permissions.patch
|
||||
] ++ optionals (pythonAtLeast "3.13") [
|
||||
./3.13/virtualenv-permissions.patch
|
||||
] ++ optionals mimetypesSupport [
|
||||
# Make the mimetypes module refer to the right file
|
||||
./mimetypes.patch
|
||||
|
|
@ -399,6 +404,8 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
|
|||
"--enable-shared"
|
||||
] ++ optionals enableFramework [
|
||||
"--enable-framework=${placeholder "out"}/Library/Frameworks"
|
||||
] ++ optionals (pythonAtLeast "3.13") [
|
||||
(enableFeature enableGIL "gil")
|
||||
] ++ optionals enableOptimizations [
|
||||
"--enable-optimizations"
|
||||
] ++ optionals (sqlite != null) [
|
||||
|
|
|
|||
|
|
@ -93,9 +93,9 @@ in {
|
|||
major = "3";
|
||||
minor = "13";
|
||||
patch = "0";
|
||||
suffix = "a3";
|
||||
suffix = "a5";
|
||||
};
|
||||
hash = "sha256-IHhMgwTrHGnID5ZuvfB3W+LjfiPfO2JGHuwSqF3Pfq0=";
|
||||
hash = "sha256-Hom1NVGD58iYpaAbL2AXKP5J/bidnJeB8TNghHqu+mI=";
|
||||
inherit (darwin) configd;
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, dbt-postgres
|
||||
, fetchFromGitHub
|
||||
, hatchling
|
||||
, pythonRelaxDepsHook
|
||||
, hypothesis
|
||||
, importlib-metadata
|
||||
, jinja2
|
||||
|
|
@ -31,8 +32,13 @@ buildPythonPackage rec {
|
|||
hash = "sha256-uvwcnOKjwxEmA+/QRGSRofpoE4jZzmE02mGSDLINrJw=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"importlib-metadata"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatchling
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "libtmux";
|
||||
version = "0.32.0";
|
||||
version = "0.35.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tmux-python";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8x98yYgA8dY9btFePDTB61gsRZeOVpnErkgJRVlYYFY=";
|
||||
hash = "sha256-1Xt2sl4L56TnveufD2j9k6eQQ+HllDxagv1APrErQYc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -64,6 +64,6 @@ buildPythonPackage rec {
|
|||
homepage = "https://libtmux.git-pull.com/";
|
||||
changelog = "https://github.com/tmux-python/libtmux/raw/v${version}/CHANGES";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ otavio ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "marimo";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-l5QehU/LqEWb7ybKxace4sm6C9mcNlaHNOp55ExglpQ=";
|
||||
hash = "sha256-nCH8JmeU81aJHHGJ1DOOCL9iarBXTBGauQKyHpU66Rk=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
let
|
||||
pname = "dump_syms";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
|
|
@ -26,10 +26,10 @@ rustPlatform.buildRustPackage {
|
|||
owner = "mozilla";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-F+yXFT6PsHpluxyF+aUiuLTLqlsjfQ5tk/JjcHgJkQ8=";
|
||||
hash = "sha256-mSup3AMYsPu/Az6QXhdCFSxGcIpel4zNN0g/95gPDS0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-I5CfrLWVTUwOtZrje3eATFen5u9MEH79Rk30ZNhaG98=";
|
||||
cargoSha256 = "sha256-INzCyF/tvCp4L6Btrw8AGTBAgdFiBlywzO3+SSE4beI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, openssl, pkgsCross, buildPackages
|
||||
{ lib, stdenv, fetchFromGitHub, fetchFromGitLab, openssl, pkgsCross, buildPackages
|
||||
|
||||
# Warning: this blob (hdcp.bin) runs on the main CPU (not the GPU) at
|
||||
# privilege level EL3, which is above both the kernel and the
|
||||
|
|
@ -151,6 +151,25 @@ in {
|
|||
platformCanUseHDCPBlob = true;
|
||||
};
|
||||
|
||||
armTrustedFirmwareRK3588 = buildArmTrustedFirmware rec {
|
||||
extraMakeFlags = [ "bl31" ];
|
||||
platform = "rk3588";
|
||||
extraMeta.platforms = ["aarch64-linux"];
|
||||
filesToInstall = [ "build/${platform}/release/bl31/bl31.elf"];
|
||||
platformCanUseHDCPBlob = true;
|
||||
|
||||
# TODO: remove this once the following get merged:
|
||||
# 1: https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/21840
|
||||
# 2: https://review.trustedfirmware.org/c/ci/tf-a-ci-scripts/+/21833
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.collabora.com";
|
||||
owner = "hardware-enablement/rockchip-3588";
|
||||
repo = "trusted-firmware-a";
|
||||
rev = "002d8e85ce5f4f06ebc2c2c52b4923a514bfa701";
|
||||
hash = "sha256-1XOG7ILIgWa3uXUmAh9WTfSGLD/76OsmWrUhIxm/zTg=";
|
||||
};
|
||||
};
|
||||
|
||||
armTrustedFirmwareS905 = buildArmTrustedFirmware rec {
|
||||
extraMakeFlags = [ "bl31" ];
|
||||
platform = "gxbb";
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
, meson-tools
|
||||
, ncurses
|
||||
, openssl
|
||||
, rkbin
|
||||
, swig
|
||||
, which
|
||||
, python3
|
||||
|
|
@ -21,6 +22,7 @@
|
|||
, armTrustedFirmwareAllwinnerH616
|
||||
, armTrustedFirmwareRK3328
|
||||
, armTrustedFirmwareRK3399
|
||||
, armTrustedFirmwareRK3588
|
||||
, armTrustedFirmwareS905
|
||||
, buildPackages
|
||||
}:
|
||||
|
|
@ -371,6 +373,14 @@ in {
|
|||
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
|
||||
};
|
||||
|
||||
ubootOrangePi5 = buildUBoot {
|
||||
defconfig = "orangepi-5-rk3588s_defconfig";
|
||||
extraMeta.platforms = ["aarch64-linux"];
|
||||
BL31 = "${armTrustedFirmwareRK3588}/bl31.elf";
|
||||
ROCKCHIP_TPL = "${rkbin}/${rkbin.ROCKCHIP_TPL_RK3588}";
|
||||
filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" ];
|
||||
};
|
||||
|
||||
ubootOrangePiPc = buildUBoot {
|
||||
defconfig = "orangepi_pc_defconfig";
|
||||
extraMeta.platforms = ["armv7l-linux"];
|
||||
|
|
@ -515,6 +525,14 @@ in {
|
|||
filesToInstall = ["u-boot.bin"];
|
||||
};
|
||||
|
||||
ubootRock5ModelB = buildUBoot {
|
||||
defconfig = "rock5b-rk3588_defconfig";
|
||||
extraMeta.platforms = ["aarch64-linux"];
|
||||
BL31 = "${armTrustedFirmwareRK3588}/bl31.elf";
|
||||
ROCKCHIP_TPL = "${rkbin}/${rkbin.ROCKCHIP_TPL_RK3588}";
|
||||
filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ];
|
||||
};
|
||||
|
||||
ubootRock64 = buildUBoot {
|
||||
defconfig = "rock64-rk3328_defconfig";
|
||||
extraMeta.platforms = [ "aarch64-linux" ];
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "mini-graph-card";
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kalkih";
|
||||
repo = "mini-graph-card";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-o87c1tqZAQDlzxsxVdPZj1ei37nx7dVIZDzoQIUkmPk=";
|
||||
hash = "sha256-cDgfAfS4U3ihN808KPcG+jEQR+S2Q1M5SPqOkkYwYkI=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-4GgFlSpqGxY7TCgyovqMSoLUin46bKN8tUQTdjv1eog=";
|
||||
npmDepsHash = "sha256-v+DqUAMNtDruR8E0sy7uAu3jndZUHkOw2xKtpY163R8=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pg_uuidv7";
|
||||
version = "1.4.1";
|
||||
version = "1.5.0";
|
||||
|
||||
buildInputs = [ postgresql ];
|
||||
|
||||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "fboulnois";
|
||||
repo = "pg_uuidv7";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1qEsDCcULceMqvR3DIC5rOfpzn2PYbFGq0H8p2+9GR4=";
|
||||
hash = "sha256-oVyRtjl3KsD3j96qvQb8bFLMhoWO81OudOL4wVXrjzI=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "copilot-cli";
|
||||
version = "1.33.1";
|
||||
version = "1.33.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/xuS5tJBV67gXGHQ93FpMXMLXnhAgnicQnKx/pnwyAM=";
|
||||
hash = "sha256-+1ri9l6ngNIMFYg+n0wDluqZ6/Zl3it4yPOBglk/0JU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ekAuvvLxk9cwIuElosc6QbsW7+3f/mO8vsA74DA82D0=";
|
||||
vendorHash = "sha256-HoiBg32L+aRsdDXFOvwZFURV2RttLIGuOOjB8lcYGXU=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,28 @@
|
|||
{ buildPerlPackage, shortenPerlShebang, stdenv, lib, fetchFromGitHub, which, bzip2, PodMarkdown, JSONXS
|
||||
, TextCSV_XS }:
|
||||
{
|
||||
buildPerlPackage,
|
||||
bzip2,
|
||||
fetchFromGitHub,
|
||||
JSONXS,
|
||||
lib,
|
||||
nix-update-script,
|
||||
pgbadger,
|
||||
PodMarkdown,
|
||||
shortenPerlShebang,
|
||||
stdenv,
|
||||
testers,
|
||||
TextCSV_XS,
|
||||
which,
|
||||
}:
|
||||
|
||||
buildPerlPackage rec {
|
||||
pname = "pgbadger";
|
||||
version = "12.2";
|
||||
version = "12.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darold";
|
||||
repo = "pgbadger";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IzfpDqzS5VcehkPsFxyn3kJsvXs8nLgJ3WT8ZCmIDxI=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-an/BOkQsMkTXS0HywV1JWerS16HRbO1MHVleYhVqmBM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -25,10 +40,27 @@ buildPerlPackage rec {
|
|||
|
||||
PERL_MM_OPT = "INSTALL_BASE=${placeholder "out"}";
|
||||
|
||||
buildInputs = [ PodMarkdown JSONXS TextCSV_XS ];
|
||||
buildInputs = [
|
||||
JSONXS
|
||||
PodMarkdown
|
||||
TextCSV_XS
|
||||
];
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isDarwin [ shortenPerlShebang ];
|
||||
|
||||
nativeCheckInputs = [ which bzip2 ];
|
||||
nativeCheckInputs = [
|
||||
bzip2
|
||||
which
|
||||
];
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
inherit version;
|
||||
command = "${lib.getExe pgbadger} --version";
|
||||
package = pgbadger;
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/darold/pgbadger";
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "starship";
|
||||
version = "1.17.1";
|
||||
version = "1.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "starship";
|
||||
repo = pname;
|
||||
repo = "starship";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-e+vhisUzSYKUUoYfSaQwpfMz2OzNcZbeHgbvyPon18g=";
|
||||
hash = "sha256-f9alFoTH461y1EYnhxnnPN98ujLTnlVBJa8lEp8t44Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles cmake ];
|
||||
|
|
@ -41,10 +41,10 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
presetdir=$out/share/starship/presets/
|
||||
mkdir -p $presetdir
|
||||
cp docs/.vuepress/public/presets/toml/*.toml $presetdir
|
||||
cp docs/public/presets/toml/*.toml $presetdir
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-xLlZyLvS9AcXQHxjyL4Dden1rEwCLB8/comfRyqXXCI=";
|
||||
cargoHash = "sha256-7k7qb5jLz2mk27ayYYE5uFXYgQkjbIIwdppJxM8YgtY=";
|
||||
|
||||
nativeCheckInputs = [ git ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, buildPythonApplication
|
||||
, colorama, decorator, psutil, pyte, six
|
||||
, go, mock, pytestCheckHook, pytest-mock
|
||||
, go, mock, pytestCheckHook, pytest-mock, pytest_7
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonApplication rec {
|
|||
|
||||
propagatedBuildInputs = [ colorama decorator psutil pyte six ];
|
||||
|
||||
nativeCheckInputs = [ go mock pytestCheckHook pytest-mock ];
|
||||
nativeCheckInputs = [ go mock (pytestCheckHook.override { pytest = pytest_7; }) pytest-mock ];
|
||||
|
||||
disabledTests = lib.optionals stdenv.isDarwin [
|
||||
"test_settings_defaults"
|
||||
|
|
@ -39,6 +39,6 @@ buildPythonApplication rec {
|
|||
homepage = "https://github.com/nvbn/thefuck";
|
||||
description = "Magnificent app which corrects your previous console command";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ marcusramberg ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "tmuxp";
|
||||
version = "1.39.0";
|
||||
version = "1.43.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-E8Q1uCV3kl4rYg/bzwjk3CNQU/uP9lEZzSqcOFkLrY0=";
|
||||
hash = "sha256-SbMZpMrcOGNzEqa/2x0OtgC2/fhKp8Prs8Hspy3I3tA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -828,7 +828,7 @@ conditext-55387={run="0g6clck3v75yvg7gv42w24zv18vi5jcg1q9k663cxldix77lkgbc";doc=
|
|||
confproc-29349={run="1s4mv0g2x5mfxnkp0i29wa3ncbx9fa05qqf734fjppdzsgic079i";doc="021kbis3c73gnavrjhqa34fsbq5c94lmjym2d4ny2wpk9xagh994";source="0dpghxh9mq2sr7aqgcj15h6b4xh7x5hvdzph6606izpff8ac7h8c";};
|
||||
constants-15878={run="11naj0z8ppb6h07r7cff0lcmr8zgc29kp3x7spi60zi6cq2546gk";doc="1wgvq0x1kjgd0bs0024fkh7wis9aw9qryd7y0igrbgdgc722pjnp";source="01skagh044v62vw12kmibgd6y42z5r1glrsvi9y0h76vs52jz7hr";};
|
||||
conteq-37868={run="1h7b98qw9hl73gh4zidy59z4rly9afnvmah75jgvh0k1v1hm09df";doc="0kgdggc8gpd1h7kdbh3ala5kz8rs56bgmwgv9wvxsqx4sn19q2fy";source="1y0g7sj696d6qhcw8vrpxr8gwik54slp7lijbxz64ksqbw5xjqv8";};
|
||||
context-69665={run="0f5pcqh9msx64hbrg4jfr4cfp6hzcy6di7hnly5whw4yvs9wr9s6";doc="1nh2yf7vb800cnnmzic5hmy4w5kxd38y1py1xjg7madphb9zdc60";};
|
||||
context-69665={run="1z6knaa8mffb4ds36k1h15qymh7f2aw9fwq38jw5cqzna6s8zzs0";doc="1nh2yf7vb800cnnmzic5hmy4w5kxd38y1py1xjg7madphb9zdc60";};
|
||||
context-calendar-examples-66947={run="0asc49mn24ql4fk73089viy3s6wff865xk8af7h67ffsb5qjnld8";doc="0wza057wz18yf2zl1j77hddzimwnraw5wg1579ncksywvhnmx3rp";};
|
||||
context-collating-marks-68696={run="12vqvbp7ns9r5nc7p7nrlsll3jp3hc4xi9wjyjq8lrmd8ly3v26w";doc="0nawd3x4rl73s4mhpq2wd1sqa8i6k2n0a39sqcaf21zx99mpiqp0";};
|
||||
context-cyrillicnumbers-47085={run="1gk4ncbfzilj98s7k7s43k6vb3il511k434aj34fsvqh5x9x4aw2";doc="0f7r9qgfc8h92jprjqa24q4vpz4bqrrns3glhmwh3qmk1f2gyw73";};
|
||||
|
|
|
|||
|
|
@ -89,3 +89,18 @@
|
|||
local method,list=r[1],r[2]
|
||||
if method and list then
|
||||
for i=1,#list do
|
||||
--- a/scripts/context/lua/mtx-context.lua 1970-01-01 01:00:01
|
||||
+++ b/scripts/context/lua/mtx-context.lua 2024-03-11 08:34:49
|
||||
@@ -613,8 +615,11 @@
|
||||
-- context flags get prepended by c: ... this will move to the sbx module
|
||||
local t = { }
|
||||
for k, v in table.sortedhash(flags) do
|
||||
+ local p
|
||||
if prefix then
|
||||
- k = format("c:%s",k)
|
||||
+ p = format("c:%s",k)
|
||||
+ else
|
||||
+ p = k
|
||||
end
|
||||
if not v or v == "" or v == '""' then
|
||||
-- no need to flag false
|
||||
|
|
@ -356,11 +356,11 @@ in lib.recursiveUpdate orig rec {
|
|||
# tlpdb lists license as "unknown", but the README says lppl13: http://mirrors.ctan.org/language/arabic/arabi-add/README
|
||||
arabi-add.license = [ "lppl13c" ];
|
||||
|
||||
# mtxrun.lua writes to const loop variables which is forbidden in recent LuaTeX
|
||||
# mtxrun.lua and mtx-context.lua write to const loop variables which is forbidden in recent LuaTeX
|
||||
# patch manually generated by diffing against a recent cont-lmt.zip
|
||||
context.postUnpack = ''
|
||||
if [[ -f "$out"/scripts/context/lua/mtxrun.lua ]] ; then
|
||||
patch -p1 -d "$out" < ${./mtxrun-local-vars.patch}
|
||||
patch -p1 -d "$out" < ${./mtx-local-vars.patch}
|
||||
fi
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -27155,6 +27155,7 @@ with pkgs;
|
|||
armTrustedFirmwareQemu
|
||||
armTrustedFirmwareRK3328
|
||||
armTrustedFirmwareRK3399
|
||||
armTrustedFirmwareRK3588
|
||||
armTrustedFirmwareS905
|
||||
;
|
||||
|
||||
|
|
@ -28360,6 +28361,7 @@ with pkgs;
|
|||
ubootOlimexA64Olinuxino
|
||||
ubootOlimexA64Teres1
|
||||
ubootOrangePi3
|
||||
ubootOrangePi5
|
||||
ubootOrangePiPc
|
||||
ubootOrangePiZeroPlus2H5
|
||||
ubootOrangePiZero
|
||||
|
|
@ -28380,6 +28382,7 @@ with pkgs;
|
|||
ubootRaspberryPi4_32bit
|
||||
ubootRaspberryPi4_64bit
|
||||
ubootRaspberryPiZero
|
||||
ubootRock5ModelB
|
||||
ubootRock64
|
||||
ubootRock64v2
|
||||
ubootRockPi4
|
||||
|
|
@ -33978,9 +33981,9 @@ with pkgs;
|
|||
|
||||
paprefs = callPackage ../applications/audio/paprefs { };
|
||||
|
||||
pantalaimon = python3Packages.callPackage ../applications/networking/instant-messengers/pantalaimon { };
|
||||
pantalaimon = callPackage ../applications/networking/instant-messengers/pantalaimon { };
|
||||
|
||||
pantalaimon-headless = python3Packages.callPackage ../applications/networking/instant-messengers/pantalaimon {
|
||||
pantalaimon-headless = callPackage ../applications/networking/instant-messengers/pantalaimon {
|
||||
enableDbusUi = false;
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue