mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-09 09:36:20 +09:00
Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
commit
c376a565f9
GPG key ID:
B5690EEEBB952194
80 changed files with 912 additions and 4980 deletions
|
|
@ -121,8 +121,6 @@ let
|
|||
"uclibc"
|
||||
else if final.isAndroid then
|
||||
"bionic"
|
||||
else if final.isLLVMLibc then
|
||||
"llvm"
|
||||
else if
|
||||
final.isLinux # default
|
||||
then
|
||||
|
|
@ -248,7 +246,7 @@ let
|
|||
# don't support dynamic linking, but don't get the `staticMarker`.
|
||||
# `pkgsStatic` sets `isStatic=true`, so `pkgsStatic.hostPlatform` always
|
||||
# has the `staticMarker`.
|
||||
isStatic = final.isWasi || final.isRedox || final.isLLVMLibc;
|
||||
isStatic = final.isWasi || final.isRedox;
|
||||
|
||||
# Just a guess, based on `system`
|
||||
inherit
|
||||
|
|
|
|||
|
|
@ -386,7 +386,6 @@ rec {
|
|||
uclibceabi
|
||||
uclibceabihf
|
||||
];
|
||||
isLLVMLibc = [ { abi = abis.llvm; } ];
|
||||
|
||||
isEfi = [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -740,9 +740,6 @@ rec {
|
|||
};
|
||||
uclibc = { };
|
||||
|
||||
# LLVM libc
|
||||
llvm = { };
|
||||
|
||||
unknown = { };
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -8,10 +8,19 @@
|
|||
}:
|
||||
|
||||
{
|
||||
imports = [ ../../../modules/virtualisation/cloudstack-config.nix ];
|
||||
imports = [
|
||||
|
||||
../../../modules/virtualisation/cloudstack-config.nix
|
||||
../../../modules/image/file-options.nix
|
||||
];
|
||||
|
||||
system.nixos.tags = [ "cloudstack" ];
|
||||
image.extension = "qcow2";
|
||||
system.build.image = config.system.build.cloudstackImage;
|
||||
system.build.cloudstackImage = import ../../../lib/make-disk-image.nix {
|
||||
inherit lib config pkgs;
|
||||
inherit (config.virtualisation) diskSize;
|
||||
baseName = config.image.baseName;
|
||||
format = "qcow2";
|
||||
configFile = pkgs.writeText "configuration.nix" ''
|
||||
{
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ let
|
|||
imageModules = {
|
||||
amazon = ../../maintainers/scripts/ec2/amazon-image.nix;
|
||||
azure = ../virtualisation/azure-image.nix;
|
||||
cloudstack = ../../maintainers/scripts/cloudstack/cloudstack-image.nix;
|
||||
digital-ocean = ../virtualisation/digital-ocean-image.nix;
|
||||
google-compute = ../virtualisation/google-compute-image.nix;
|
||||
hyperv = ../virtualisation/hyperv-image.nix;
|
||||
|
|
|
|||
|
|
@ -185,7 +185,7 @@ in
|
|||
config = {
|
||||
hardware.enableAllHardware = true;
|
||||
|
||||
fileSystems = {
|
||||
fileSystems = lib.mkImageMediaOverride {
|
||||
"/boot/firmware" = {
|
||||
device = "/dev/disk/by-label/${config.sdImage.firmwarePartitionName}";
|
||||
fsType = "vfat";
|
||||
|
|
|
|||
|
|
@ -286,7 +286,7 @@ in
|
|||
in
|
||||
{
|
||||
sudo = {
|
||||
source = "${cfg.package.out}/bin/sudo";
|
||||
source = "${lib.getExe cfg.package}";
|
||||
inherit
|
||||
owner
|
||||
group
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
fileSystems = {
|
||||
fileSystems = lib.mkImageMediaOverride {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-label/${cfg.label}";
|
||||
inherit (cfg) label;
|
||||
|
|
|
|||
|
|
@ -8,9 +8,10 @@ with lib;
|
|||
];
|
||||
|
||||
config = {
|
||||
fileSystems."/" = {
|
||||
fileSystems."/" = lib.mkImageMediaOverride {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
autoResize = true;
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
boot.growPartition = true;
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ with lib;
|
|||
in
|
||||
mkMerge [
|
||||
{
|
||||
fileSystems."/" = lib.mkDefault {
|
||||
fileSystems."/" = lib.mkImageMediaOverride {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
autoResize = true;
|
||||
fsType = "ext4";
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ in
|
|||
boot.loader.systemd-boot.enable = lib.mkDefault cfg.efiSupport;
|
||||
boot.growPartition = lib.mkDefault true;
|
||||
|
||||
fileSystems = {
|
||||
fileSystems = lib.mkImageMediaOverride {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
autoResize = true;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ in
|
|||
../profiles/qemu-guest.nix
|
||||
];
|
||||
|
||||
fileSystems."/" = {
|
||||
fileSystems."/" = lib.mkImageMediaOverride {
|
||||
fsType = "ext4";
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
autoResize = true;
|
||||
|
|
|
|||
|
|
@ -73,15 +73,17 @@ in
|
|||
inherit config lib pkgs;
|
||||
};
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
autoResize = true;
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems = lib.mkImageMediaOverride {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
autoResize = true;
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-label/ESP";
|
||||
fsType = "vfat";
|
||||
"/boot" = {
|
||||
device = "/dev/disk/by-label/ESP";
|
||||
fsType = "vfat";
|
||||
};
|
||||
};
|
||||
|
||||
boot.growPartition = true;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
];
|
||||
|
||||
config = {
|
||||
fileSystems."/" = {
|
||||
fileSystems."/" = lib.mkImageMediaOverride {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
fsType = "ext4";
|
||||
autoResize = true;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
{
|
||||
imports = [ ../profiles/qemu-guest.nix ];
|
||||
|
||||
|
|
@ -12,7 +10,7 @@ with lib;
|
|||
enable = true;
|
||||
|
||||
settings.PermitRootLogin = "prohibit-password";
|
||||
settings.PasswordAuthentication = mkDefault false;
|
||||
settings.PasswordAuthentication = lib.mkDefault false;
|
||||
};
|
||||
|
||||
networking = {
|
||||
|
|
@ -34,13 +32,13 @@ with lib;
|
|||
sysstat
|
||||
];
|
||||
|
||||
fileSystems."/" = {
|
||||
fileSystems."/" = lib.mkImageMediaOverride {
|
||||
fsType = "ext4";
|
||||
device = "/dev/sda";
|
||||
autoResize = true;
|
||||
};
|
||||
|
||||
swapDevices = mkDefault [ { device = "/dev/sdb"; } ];
|
||||
swapDevices = lib.mkDefault [ { device = "/dev/sdb"; } ];
|
||||
|
||||
# Enable LISH and Linode Booting w/ GRUB
|
||||
boot = {
|
||||
|
|
|
|||
|
|
@ -30,15 +30,17 @@ in
|
|||
|
||||
boot.growPartition = true;
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
fsType = "ext4";
|
||||
autoResize = true;
|
||||
};
|
||||
fileSystems = lib.mkImageMediaOverride {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
fsType = "ext4";
|
||||
autoResize = true;
|
||||
};
|
||||
|
||||
fileSystems."/boot" = lib.mkIf cfg.efi {
|
||||
device = "/dev/disk/by-label/ESP";
|
||||
fsType = "vfat";
|
||||
"/boot" = lib.mkIf cfg.efi {
|
||||
device = "/dev/disk/by-label/ESP";
|
||||
fsType = "vfat";
|
||||
};
|
||||
};
|
||||
|
||||
boot.loader.efi.canTouchEfiVariables = false;
|
||||
|
|
|
|||
|
|
@ -33,18 +33,22 @@ in
|
|||
];
|
||||
|
||||
config = {
|
||||
fileSystems."/" = mkIf (!cfg.zfs.enable) {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
fsType = "ext4";
|
||||
autoResize = true;
|
||||
};
|
||||
fileSystems."/" = mkIf (!cfg.zfs.enable) (
|
||||
lib.mkImageMediaOverride {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
fsType = "ext4";
|
||||
autoResize = true;
|
||||
}
|
||||
);
|
||||
|
||||
fileSystems."/boot" = mkIf (cfg.efi || cfg.zfs.enable) {
|
||||
# The ZFS image uses a partition labeled ESP whether or not we're
|
||||
# booting with EFI.
|
||||
device = "/dev/disk/by-label/ESP";
|
||||
fsType = "vfat";
|
||||
};
|
||||
fileSystems."/boot" = mkIf (cfg.efi || cfg.zfs.enable) (
|
||||
lib.mkImageMediaOverride {
|
||||
# The ZFS image uses a partition labeled ESP whether or not we're
|
||||
# booting with EFI.
|
||||
device = "/dev/disk/by-label/ESP";
|
||||
fsType = "vfat";
|
||||
}
|
||||
);
|
||||
|
||||
boot.growPartition = true;
|
||||
boot.kernelParams = [ "console=tty1" ];
|
||||
|
|
|
|||
|
|
@ -70,12 +70,14 @@ in
|
|||
_: value: ((value.mount or null) != null)
|
||||
) config.openstack.zfs.datasets;
|
||||
in
|
||||
lib.mapAttrs' (
|
||||
dataset: opts:
|
||||
lib.nameValuePair opts.mount {
|
||||
device = dataset;
|
||||
fsType = "zfs";
|
||||
}
|
||||
) mountable;
|
||||
lib.mkImageMediaOverride (
|
||||
lib.mapAttrs' (
|
||||
dataset: opts:
|
||||
lib.nameValuePair opts.mount {
|
||||
device = dataset;
|
||||
fsType = "zfs";
|
||||
}
|
||||
) mountable
|
||||
);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -306,7 +306,13 @@ with lib;
|
|||
''
|
||||
${vma}/bin/vma create "${config.image.baseName}.vma" \
|
||||
-c ${
|
||||
cfgFile "qemu-server.conf" (cfg.qemuConf // cfg.qemuExtraConf)
|
||||
cfgFile "qemu-server.conf" (
|
||||
(builtins.removeAttrs cfg.qemuConf [ "diskSize" ])
|
||||
// {
|
||||
inherit (config.virtualisation) diskSize;
|
||||
}
|
||||
// cfg.qemuExtraConf
|
||||
)
|
||||
}/qemu-server.conf drive-virtio0=$diskImage
|
||||
rm $diskImage
|
||||
${pkgs.zstd}/bin/zstd "${config.image.baseName}.vma"
|
||||
|
|
@ -346,14 +352,16 @@ with lib;
|
|||
];
|
||||
};
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
autoResize = true;
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/boot" = lib.mkIf hasBootPartition {
|
||||
device = "/dev/disk/by-label/ESP";
|
||||
fsType = "vfat";
|
||||
fileSystems = lib.mkImageMediaOverride {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
autoResize = true;
|
||||
fsType = "ext4";
|
||||
};
|
||||
"/boot" = lib.mkIf hasBootPartition {
|
||||
device = "/dev/disk/by-label/ESP";
|
||||
fsType = "vfat";
|
||||
};
|
||||
};
|
||||
|
||||
networking = mkIf cfg.cloudInit.enable {
|
||||
|
|
|
|||
|
|
@ -275,7 +275,7 @@ in
|
|||
};
|
||||
|
||||
fileSystems =
|
||||
{
|
||||
lib.mkImageMediaOverride {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
autoResize = true;
|
||||
|
|
|
|||
|
|
@ -83,15 +83,17 @@ in
|
|||
inherit config lib pkgs;
|
||||
};
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
autoResize = true;
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems = lib.mkImageMediaOverride {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
autoResize = true;
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-label/ESP";
|
||||
fsType = "vfat";
|
||||
"/boot" = {
|
||||
device = "/dev/disk/by-label/ESP";
|
||||
fsType = "vfat";
|
||||
};
|
||||
};
|
||||
|
||||
boot.growPartition = true;
|
||||
|
|
|
|||
|
|
@ -32,6 +32,8 @@
|
|||
taglib,
|
||||
util-linux,
|
||||
wrapQtAppsHook,
|
||||
sparsehash,
|
||||
rapidjson,
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -40,13 +42,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "strawberry";
|
||||
version = "1.2.7";
|
||||
version = "1.2.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonaski";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-EJE6GDyXYMjJUQeTRgmjd0HX3hf4ajSRGsv/2s2oItc=";
|
||||
hash = "sha256-ByZHyHkMlU571QSu1bbYZC7aEX4Jc8N3j05WbXRQaBY=";
|
||||
};
|
||||
|
||||
# the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead
|
||||
|
|
@ -73,6 +75,8 @@ stdenv.mkDerivation rec {
|
|||
qtbase
|
||||
sqlite
|
||||
taglib
|
||||
sparsehash
|
||||
rapidjson
|
||||
]
|
||||
++ optionals stdenv.hostPlatform.isLinux [
|
||||
libgpod
|
||||
|
|
|
|||
58
pkgs/applications/display-managers/greetd/qtgreet.nix
Normal file
58
pkgs/applications/display-managers/greetd/qtgreet.nix
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
kdePackages,
|
||||
qt6,
|
||||
dfl-ipc,
|
||||
dfl-utils,
|
||||
dfl-applications,
|
||||
dfl-login1,
|
||||
mpvSupport ? true,
|
||||
mpv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qtgreet";
|
||||
version = "2.0.3.95";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "marcusbritanicus";
|
||||
repo = "QtGreet";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-5csKvBiffW+yHuNyFqxOE5bcsTWlyoLwFxuPH0WlFAE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
kdePackages.wayqt
|
||||
qt6.qtbase
|
||||
dfl-ipc
|
||||
dfl-utils
|
||||
dfl-applications
|
||||
dfl-login1
|
||||
] ++ lib.optionals mpvSupport [ mpv ];
|
||||
|
||||
mesonFlags = [
|
||||
(lib.mesonOption "dynpath" "${placeholder "out"}/var/lib/qtgreet")
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Qt based greeter for greetd, to be run under wayfire or similar wlr-based compositors";
|
||||
homepage = "https://gitlab.com/marcusbritanicus/QtGreet";
|
||||
changelog = "https://gitlab.com/marcusbritanicus/QtGreet/-/blob/${finalAttrs.src.rev}/Changelog";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ arthsmn ];
|
||||
mainProgram = "qtgreet";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
vimUtils.buildVimPlugin {
|
||||
pname = "sonarlint.nvim";
|
||||
version = "0-unstable-2025-04-18";
|
||||
version = "0-unstable-2025-04-24";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "schrieveslaach";
|
||||
repo = "sonarlint.nvim";
|
||||
rev = "0b78f1db800f9ba76f81de773ba09ce2222bdcc2";
|
||||
hash = "sha256-EUwuIFFe4tmw8u6RqEvOLL0Yi8J5cLBQx7ICxnmkT4k=";
|
||||
rev = "89d3d3b0dd239dbbdf4c1d728e41759d5378f049";
|
||||
hash = "sha256-EOAdSvugcDEDuBuFv/HL35HXWvB/V97UtOJqdRuU7ak=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
mkLibretroCore {
|
||||
core = "vice-${type}";
|
||||
version = "0-unstable-2025-03-28";
|
||||
version = "0-unstable-2025-04-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "vice-libretro";
|
||||
rev = "9b201cdd612bfb12c8d86696656b79eaf25924ab";
|
||||
hash = "sha256-YilHxQLZC8MVnZ9EekCqtU8rgOB/0FH2vKFdn6l3i5Q=";
|
||||
rev = "e5b036f0be19f7a70fde75cc0e8b1b43476adc13";
|
||||
hash = "sha256-GzvsXPZcBfGvA0g7zLR3R7w5CEIw2slL3EyQdcDjqCc=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
|
|
|||
|
|
@ -398,6 +398,7 @@ buildStdenv.mkDerivation {
|
|||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ rsync ]
|
||||
++ lib.optionals stdenv.hostPlatform.isx86 [ nasm ]
|
||||
++ lib.optionals crashreporterSupport [
|
||||
dump_syms
|
||||
patchelf
|
||||
|
|
@ -573,7 +574,6 @@ buildStdenv.mkDerivation {
|
|||
libGL
|
||||
libGLU
|
||||
libstartup_notification
|
||||
nasm
|
||||
perl
|
||||
zip
|
||||
]
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "protonvpn-gui";
|
||||
version = "4.9.5";
|
||||
version = "4.9.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ProtonVPN";
|
||||
repo = "proton-vpn-gtk-app";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-mXRTXr7u049pgPRK5gwaGfQUmUl4vlKca4lRH06HZj8=";
|
||||
tag = "${version}";
|
||||
hash = "sha256-Undf3qSClcRa1e9f6B/1hLPIjc2KPG745AXxYHQA0nE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Generated by ./update.sh - do not update manually!
|
||||
{
|
||||
version = "1.16.3-3";
|
||||
arm64-hash = "sha256-tZlTNK3kBvIjYARQO7YSj/dbQ0iCuPeWM7+XYFYg8/M=";
|
||||
x86_64-hash = "sha256-o3QP3gfotqRisN6tCch6JFlf8jNVbv6XB8xAnQpYQqA=";
|
||||
version = "1.16.4-1";
|
||||
arm64-hash = "sha256-x+sVupWT8CrEPSTOJFW1DYuc3tuVepHXjRF7+8NdTbw=";
|
||||
x86_64-hash = "sha256-zMw8NfeLNMBbJZqoZeNy9j65otJ8iWnq79PLqzlR+6I=";
|
||||
}
|
||||
|
|
|
|||
49
pkgs/by-name/df/dfl-applications/package.nix
Normal file
49
pkgs/by-name/df/dfl-applications/package.nix
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
qt6,
|
||||
dfl-ipc,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dfl-applications";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "desktop-frameworks";
|
||||
repo = "applications";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-VDkJkrkhjWi61YD7qNQSF9/ctXtvVf+nh/zUVxAAE4Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qt6.qtbase
|
||||
dfl-ipc
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Library provides a thin wrapper around QApplication, QGuiApplication and QCoreApplication";
|
||||
homepage = "https://gitlab.com/desktop-frameworks/applications";
|
||||
changelog = "https://gitlab.com/desktop-frameworks/applications/-/blob/${finalAttrs.src.rev}/ChangeLog";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ arthsmn ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
45
pkgs/by-name/df/dfl-ipc/package.nix
Normal file
45
pkgs/by-name/df/dfl-ipc/package.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
meson,
|
||||
ninja,
|
||||
qt6,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dfl-ipc";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "desktop-frameworks";
|
||||
repo = "ipc";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-GjQg7Fq7fWal1vh/jR5qqm+qs+D/McCoQfktOvO86eA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qt6.qtbase
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A very simple set of IPC classes for inter-process communication";
|
||||
homepage = "https://gitlab.com/desktop-frameworks/ipc";
|
||||
changelog = "https://gitlab.com/desktop-frameworks/ipc/-/blob/${finalAttrs.src.rev}/ChangeLog";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ arthsmn ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
49
pkgs/by-name/df/dfl-login1/package.nix
Normal file
49
pkgs/by-name/df/dfl-login1/package.nix
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
qt6,
|
||||
systemd,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dfl-login1";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "desktop-frameworks";
|
||||
repo = "login1";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Aw2yg5KH618/lG+BQU8JZhQ/8qr6L3vWiEgUNu7aGYY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qt6.qtbase
|
||||
systemd
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Implementation of systemd/elogind for DFL";
|
||||
homepage = "https://gitlab.com/desktop-frameworks/login1";
|
||||
changelog = "https://gitlab.com/desktop-frameworks/login1/-/blob/${finalAttrs.src.rev}/ChangeLog";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ arthsmn ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
45
pkgs/by-name/df/dfl-utils/package.nix
Normal file
45
pkgs/by-name/df/dfl-utils/package.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
meson,
|
||||
ninja,
|
||||
qt6,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dfl-utils";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "desktop-frameworks";
|
||||
repo = "utils";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-XiOLVx9X2i+IWORde05P2cFulQRU/EQErbyr5fgZDY4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qt6.qtbase
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Some utilities for DFL";
|
||||
homepage = "https://gitlab.com/desktop-frameworks/utils";
|
||||
changelog = "https://gitlab.com/desktop-frameworks/utils/-/blob/${finalAttrs.src.rev}/ChangeLog";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ arthsmn ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
@ -2,26 +2,31 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
jdk8,
|
||||
which,
|
||||
makeWrapper,
|
||||
jdk8,
|
||||
coreutils,
|
||||
which,
|
||||
gnumake,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "drip";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "drip";
|
||||
owner = "ninjudd";
|
||||
rev = version;
|
||||
sha256 = "1zl62wdwfak6z725asq5lcqb506la1aavj7ag78lvp155wyh8aq1";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ASsEPS8l3E3ReerIrVRQ1ICyMKMFa1XE+WYqxxsXhv4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildInputs = [ jdk8 ];
|
||||
|
||||
patches = [ ./wait.patch ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
|
@ -31,16 +36,29 @@ stdenv.mkDerivation rec {
|
|||
mkdir $out
|
||||
cp ./* $out -r
|
||||
wrapProgram $out/bin/drip \
|
||||
--prefix PATH : "${which}/bin"
|
||||
$out/bin/drip version
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
coreutils
|
||||
which
|
||||
gnumake
|
||||
jdk8
|
||||
]
|
||||
}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "version";
|
||||
|
||||
meta = {
|
||||
description = "Launcher for the Java Virtual Machine intended to be a drop-in replacement for the java command, only faster";
|
||||
license = licenses.epl10;
|
||||
license = lib.licenses.epl10;
|
||||
homepage = "https://github.com/ninjudd/drip";
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.rybern ];
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
rybern
|
||||
awwpotato
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
11
pkgs/by-name/dr/drip/wait.patch
Normal file
11
pkgs/by-name/dr/drip/wait.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
diff --git a/src/drip_daemon.c b/src/drip_daemon.c
|
||||
index cbfd4d9..79fdaf4 100644
|
||||
--- a/src/drip_daemon.c
|
||||
+++ b/src/drip_daemon.c
|
||||
@@ -5,6 +5,7 @@
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/stat.h>
|
||||
+#include <sys/wait.h>
|
||||
|
||||
static char* jvm_dir;
|
||||
|
|
@ -7,17 +7,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "flirt";
|
||||
version = "0.3";
|
||||
version = "0.4";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~hadronized";
|
||||
repo = "flirt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xhNo85xwcVI4qliHU4/uNEvS7rW5avKOv8fMfRrvqD0=";
|
||||
hash = "sha256-wH6WLLUqUj5YrrudNbGkzZ4i15xRPDBE3UKwyhkQSxg=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-Nu4sOjwF/MlsoCmgUEGEqMIW+aSD9PuiFBQMnfQRL8Q=";
|
||||
cargoHash = "sha256-m1aLJFa6C5X9HwNweezoUcFnpG09AuYf9ooet8GUGFE=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "hugo";
|
||||
version = "0.146.4";
|
||||
version = "0.146.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = "hugo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-acOHFKNtzGV6CAhdBBBWAyS9Iuf3rq4XaIUnf2m6UWE=";
|
||||
hash = "sha256-I2SJh984uBwJRCMOiHxM1OKBwzbMgxoycovy4U4l6HM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-LSNy65sIuq/zK3swdUvxGwbo/3ulq+JP5ur7M7aTdAs=";
|
||||
vendorHash = "sha256-Ey0vN5/TbLb7p2M5zOHytl0PLCC658njoR8xZaFJyfo=";
|
||||
|
||||
checkFlags =
|
||||
let
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
bison,
|
||||
flex,
|
||||
intel-compute-runtime,
|
||||
llvmPackages_14,
|
||||
llvmPackages_15,
|
||||
opencl-clang,
|
||||
python3,
|
||||
spirv-tools,
|
||||
|
|
@ -26,8 +26,8 @@ let
|
|||
hash = "sha256-dSK+kNEZoF4bBx24S0No9aZLZiHK0U9TR1jRyEBL+2U=";
|
||||
};
|
||||
|
||||
inherit (llvmPackages_14) lld llvm;
|
||||
inherit (if buildWithPatches then opencl-clang else llvmPackages_14) clang libclang;
|
||||
inherit (llvmPackages_15) lld llvm;
|
||||
inherit (if buildWithPatches then opencl-clang else llvmPackages_15) clang libclang;
|
||||
spirv-llvm-translator' = spirv-llvm-translator.override { inherit llvm; };
|
||||
|
||||
# Handholding the braindead build script
|
||||
|
|
@ -42,13 +42,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-graphics-compiler";
|
||||
version = "2.8.3";
|
||||
version = "2.10.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "intel-graphics-compiler";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-1YzvzVmMW5s4keQfa7r6xfyVg7RWSdKNgBtdTN6SADg=";
|
||||
hash = "sha256-BFEl2LiaGRZXnQtOTEY/86ymKuQO3QN4HPbwHsdSZMs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -10,15 +10,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mongodb-atlas-cli";
|
||||
version = "1.42.0";
|
||||
version = "1.42.1";
|
||||
|
||||
vendorHash = "sha256-5kCaQ4bBRiGjRh65Tx3g5SlwAb+/S8o+z/2x8IqSXDM=";
|
||||
vendorHash = "sha256-BYeNYL4W1ufv9pCSDVNL8p69DGgQM+noaDtfwZFBeTk=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mongodb";
|
||||
repo = "mongodb-atlas-cli";
|
||||
rev = "refs/tags/atlascli/v${version}";
|
||||
sha256 = "sha256-7umwluhPNhY/AGmVhxITLeoAGJPglRP+1PuXOM6TmBA=";
|
||||
sha256 = "sha256-8fkdocpySd+cXwp2txec+fNQAdXlJlLhTpLQnyRMtZ0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
${lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p $out/{Applications,bin}
|
||||
mv "build/mac/MQTT Explorer.app" $out/Applications
|
||||
mv build/mac*/MQTT\ Explorer.app $out/Applications
|
||||
|
||||
makeWrapper "$out/Applications/MQTT Explorer.app/Contents/MacOS/MQTT Explorer" \
|
||||
$out/bin/mqtt-explorer
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2025-04-13";
|
||||
version = "2025-04-19";
|
||||
pname = "oh-my-zsh";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
rev = "a84a0332a822a78ddf3f66d0e1ed3990d4badd12";
|
||||
sha256 = "sha256-oBSs8DuPI7DgKaSSbuK5FgFwmGIVAp2B+YI9Hr1/mRw=";
|
||||
rev = "de1ca65dcaebd19f5ca6626616bb79b529362458";
|
||||
sha256 = "sha256-ag/hVeCvrGHYSchdeTQKOtqFvmtn12vJZJM+EIpyYpE=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -229,6 +229,12 @@ goBuild (finalAttrs: {
|
|||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
# required for github.com/ollama/ollama/detect's tests
|
||||
sandboxProfile = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
(allow file-read* (subpath "/System/Library/Extensions"))
|
||||
(allow iokit-open (iokit-user-client-class "AGXDeviceUserClient"))
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests =
|
||||
{
|
||||
|
|
@ -261,7 +267,6 @@ goBuild (finalAttrs: {
|
|||
dit7ya
|
||||
elohmeier
|
||||
prusnak
|
||||
roydubnium
|
||||
];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
fetchFromGitHub,
|
||||
cmake,
|
||||
git,
|
||||
llvmPackages_14,
|
||||
llvmPackages_15,
|
||||
spirv-llvm-translator,
|
||||
buildWithPatches ? true,
|
||||
}:
|
||||
|
|
@ -23,7 +23,7 @@ let
|
|||
'';
|
||||
});
|
||||
|
||||
llvmPkgs = llvmPackages_14;
|
||||
llvmPkgs = llvmPackages_15;
|
||||
inherit (llvmPkgs) llvm;
|
||||
spirv-llvm-translator' = spirv-llvm-translator.override { inherit llvm; };
|
||||
libclang = if buildWithPatches then passthru.libclang else llvmPkgs.libclang;
|
||||
|
|
@ -46,8 +46,8 @@ let
|
|||
postPatch = ''
|
||||
for filename in patches/clang/*.patch; do
|
||||
substituteInPlace "$filename" \
|
||||
--replace "a/clang/" "a/" \
|
||||
--replace "b/clang/" "b/"
|
||||
--replace-fail "a/clang/" "a/" \
|
||||
--replace-fail "b/clang/" "b/"
|
||||
done
|
||||
'';
|
||||
|
||||
|
|
@ -58,14 +58,13 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
version = "14.0.0-unstable-2024-07-09";
|
||||
version = "15.0.1";
|
||||
src = applyPatches {
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "opencl-clang";
|
||||
# https://github.com/intel/opencl-clang/compare/ocl-open-140
|
||||
rev = "470cf0018e1ef6fc92eda1356f5f31f7da452abc";
|
||||
hash = "sha256-Ja+vJ317HI3Nh45kcAMhyLVTIqyy6pE5KAsKs4ou9J8=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-mUqxe3lZQdhz/CRE1+NU2q5g2Taxlh7nzPwUHOB6I0c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -78,13 +77,13 @@ let
|
|||
''
|
||||
# fix not be able to find clang from PATH
|
||||
substituteInPlace cl_headers/CMakeLists.txt \
|
||||
--replace " NO_DEFAULT_PATH" ""
|
||||
--replace-fail " NO_DEFAULT_PATH" ""
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
# Uses linker flags that are not supported on Darwin.
|
||||
sed -i -e '/SET_LINUX_EXPORTS_FILE/d' CMakeLists.txt
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace '-Wl,--no-undefined' ""
|
||||
--replace-fail '-Wl,--no-undefined' ""
|
||||
'';
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -1,37 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
python3,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "proton-vpn-local-agent";
|
||||
version = "1.4.4";
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-i/qJwN8693MRaWTcvGGcWMCqclyOOIb/wlqiUilOhzQ=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ProtonVPN";
|
||||
repo = "python-proton-vpn-local-agent";
|
||||
rev = version;
|
||||
hash = "sha256-9dyyLZZEOB2080KxN0ffdkRhyvEY8xKE/7b2mA7JL+o=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/python-proton-vpn-local-agent";
|
||||
|
||||
installPhase = ''
|
||||
# manually install the python binding
|
||||
mkdir -p $out/${python3.sitePackages}/proton/vpn/
|
||||
cp ./target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/libpython_proton_vpn_local_agent.so $out/${python3.sitePackages}/proton/vpn/local_agent.so
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Proton VPN local agent written in Rust with Python bindings";
|
||||
homepage = "https://github.com/ProtonVPN/python-proton-vpn-local-agent";
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ sebtm ];
|
||||
};
|
||||
}
|
||||
68
pkgs/by-name/rp/rpcs3/fix-qt6.9-compilation.patch
Normal file
68
pkgs/by-name/rp/rpcs3/fix-qt6.9-compilation.patch
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
From 600e4604169464c64cbf548e7629e483ad2aad1e Mon Sep 17 00:00:00 2001
|
||||
From: Megamouse <studienricky89@googlemail.com>
|
||||
Date: Mon, 7 Apr 2025 20:49:15 +0200
|
||||
Subject: [PATCH] Fix compilation with newer Qt
|
||||
|
||||
---
|
||||
rpcs3/rpcs3qt/game_list_base.cpp | 2 +-
|
||||
rpcs3/rpcs3qt/game_list_frame.cpp | 4 ++--
|
||||
rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp | 4 ++--
|
||||
3 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/rpcs3/rpcs3qt/game_list_base.cpp b/rpcs3/rpcs3qt/game_list_base.cpp
|
||||
index 72b45d33bfbb..21640906ee7e 100644
|
||||
--- a/rpcs3/rpcs3qt/game_list_base.cpp
|
||||
+++ b/rpcs3/rpcs3qt/game_list_base.cpp
|
||||
@@ -25,7 +25,7 @@ void game_list_base::repaint_icons(std::vector<game_info>& game_data, const QCol
|
||||
for (game_info& game : game_data)
|
||||
{
|
||||
game->pxmap = placeholder;
|
||||
-
|
||||
+
|
||||
if (movie_item_base* item = game->item)
|
||||
{
|
||||
item->set_icon_load_func([this, game, device_pixel_ratio, cancel = item->icon_loading_aborted()](int)
|
||||
diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp
|
||||
index a294d69cc68e..439913760053 100644
|
||||
--- a/rpcs3/rpcs3qt/game_list_frame.cpp
|
||||
+++ b/rpcs3/rpcs3qt/game_list_frame.cpp
|
||||
@@ -2363,7 +2363,7 @@ void game_list_frame::BatchActionBySerials(progress_dialog* pdlg, const std::set
|
||||
|
||||
connect(future_watcher, &QFutureWatcher<void>::finished, this, [=, this]()
|
||||
{
|
||||
- pdlg->setLabelText(progressLabel.arg(*index).arg(serials_size));
|
||||
+ pdlg->setLabelText(progressLabel.arg(index->load()).arg(serials_size));
|
||||
pdlg->setCancelButtonText(tr("OK"));
|
||||
QApplication::beep();
|
||||
|
||||
@@ -2396,7 +2396,7 @@ void game_list_frame::BatchActionBySerials(progress_dialog* pdlg, const std::set
|
||||
return;
|
||||
}
|
||||
|
||||
- pdlg->setLabelText(progressLabel.arg(*index).arg(serials_size));
|
||||
+ pdlg->setLabelText(progressLabel.arg(index->load()).arg(serials_size));
|
||||
pdlg->setCancelButtonText(tr("OK"));
|
||||
connect(pdlg, &progress_dialog::canceled, this, [pdlg](){ pdlg->deleteLater(); });
|
||||
QApplication::beep();
|
||||
diff --git a/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp b/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp
|
||||
index 45fbe6f59e7d..4b9bc5dd6e4f 100644
|
||||
--- a/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp
|
||||
+++ b/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp
|
||||
@@ -362,7 +362,7 @@ void ps_move_tracker_dialog::update_saturation_threshold(bool update_slider)
|
||||
}
|
||||
void ps_move_tracker_dialog::update_min_radius(bool update_slider)
|
||||
{
|
||||
- ui->minRadiusGb->setTitle(tr("Min Radius: %0 %").arg(g_cfg_move.min_radius));
|
||||
+ ui->minRadiusGb->setTitle(tr("Min Radius: %0 %").arg(g_cfg_move.min_radius.get()));
|
||||
|
||||
if (update_slider)
|
||||
{
|
||||
@@ -372,7 +372,7 @@ void ps_move_tracker_dialog::update_min_radius(bool update_slider)
|
||||
|
||||
void ps_move_tracker_dialog::update_max_radius(bool update_slider)
|
||||
{
|
||||
- ui->maxRadiusGb->setTitle(tr("Max Radius: %0 %").arg(g_cfg_move.max_radius));
|
||||
+ ui->maxRadiusGb->setTitle(tr("Max Radius: %0 %").arg(g_cfg_move.max_radius.get()));
|
||||
|
||||
if (update_slider)
|
||||
{
|
||||
|
|
@ -58,6 +58,11 @@ stdenv.mkDerivation {
|
|||
hash = rpcs3Hash;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Modified from https://github.com/RPCS3/rpcs3/pull/17009; doesn't apply cleanly due to intermediate commits
|
||||
./fix-qt6.9-compilation.patch
|
||||
];
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -63,14 +63,14 @@ let
|
|||
in
|
||||
flutter.buildFlutterApplication rec {
|
||||
pname = "rustdesk";
|
||||
version = "1.3.8";
|
||||
version = "1.3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rustdesk";
|
||||
repo = "rustdesk";
|
||||
tag = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-m1bFljZL8vNaugepVs8u1EWNpDLtxgSSZqKGQmgrmsA=";
|
||||
hash = "sha256-DvFsHrYLdAaEh2cXF8Zp5AvyG8Okiy2guW/r2x7Kz4U=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
@ -78,13 +78,13 @@ flutter.buildFlutterApplication rec {
|
|||
|
||||
# Configure the Flutter/Dart build
|
||||
sourceRoot = "${src.name}/flutter";
|
||||
# curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.3.8/flutter/pubspec.lock | yq > pubspec.lock.json
|
||||
# curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.3.9/flutter/pubspec.lock | yq > pubspec.lock.json
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
gitHashes = {
|
||||
dash_chat_2 = "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow=";
|
||||
desktop_multi_window = "sha256-NOe0jMcH02c0TDTtv62OMTR/qDPnRQrRe73vXDuEq8Q=";
|
||||
dynamic_layouts = "sha256-eFp1YVI6vI2HRgtE5nTqGZIylB226H0O8kuxy9ypuf8=";
|
||||
flutter_gpu_texture_renderer = "sha256-6m34FB9Zi4wWbpQQ7uwtMnjUBvdCQnqlkHtWcZddtqU=";
|
||||
flutter_gpu_texture_renderer = "sha256-EZa1FOMbcwdVs/m0vsUvlHv+MifPby4I97ZFe1bqmwQ=";
|
||||
window_manager = "sha256-40mwj4D8W2xW8C7RshTjOhelOiLPM7uU9rsF4NvQn8c=";
|
||||
window_size = "sha256-XelNtp7tpZ91QCEcvewVphNUtgQX7xrp5QP0oFo6DgM=";
|
||||
texture_rgba_renderer = "sha256-V/bmT/5x+Bt7kdjLTkgkoXdBcFVXxPyp9kIUhf+Rnt4=";
|
||||
|
|
@ -100,7 +100,7 @@ flutter.buildFlutterApplication rec {
|
|||
src
|
||||
patches
|
||||
;
|
||||
hash = "sha256-uuoyEGmGkpPFeHDUX3dLT/VWhBRWum5CcQ7bGq+z/8w=";
|
||||
hash = "sha256-D64W2+eBR2RGiN+puJW3QIO1334SgOOHv5fws5r3wmg=";
|
||||
};
|
||||
|
||||
dontCargoBuild = true;
|
||||
|
|
|
|||
|
|
@ -653,8 +653,8 @@
|
|||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": ".",
|
||||
"ref": "2ded7f146437a761ffe6981e2f742038f85ca68d",
|
||||
"resolved-ref": "2ded7f146437a761ffe6981e2f742038f85ca68d",
|
||||
"ref": "08a471bb8ceccdd50483c81cdfa8b81b07b14b87",
|
||||
"resolved-ref": "08a471bb8ceccdd50483c81cdfa8b81b07b14b87",
|
||||
"url": "https://github.com/rustdesk-org/flutter_gpu_texture_renderer"
|
||||
},
|
||||
"source": "git",
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "slint-lsp";
|
||||
version = "1.10.0";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-5LDEjJx+PC6pOem06DKFkPcjpIkF20gbxi/PAVZT1ns=";
|
||||
hash = "sha256-bFYoXIe/AFN2eNUOGoFhxjD0fWtxujrdhmLx0TZOH0U=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1/4dOlhByJDpduExu9ZOjb7JYFKehnLiLCboWUnmfp8=";
|
||||
cargoHash = "sha256-GYEItiyUVAAL7K/6o31U4Ss75JOUE8Mxxf0Ut6T7X04=";
|
||||
|
||||
rpathLibs =
|
||||
[
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snapper";
|
||||
version = "0.12.1";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openSUSE";
|
||||
repo = "snapper";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yVjsbWa7t+md0xdy5eFST+pkPbXhgfyJcTt+aNkQpsQ=";
|
||||
sha256 = "sha256-SHwF9FMfrrf2IXrGjT/lTI8rDltVkRXkAQ9MpeNVeWw=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -43,9 +43,9 @@ let
|
|||
}
|
||||
else if llvmMajor == "15" then
|
||||
rec {
|
||||
version = "15.0.0";
|
||||
version = "15.0.11";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OsDohXRxovtEXaWiRGp8gJ0dXmoALyO+ZimeSO8aPVI=";
|
||||
hash = "sha256-q4WhUaBDw0cnv1eqC6wSvrApHKvyg5/4QetybDLQkEw=";
|
||||
}
|
||||
else if llvmMajor == "14" then
|
||||
{
|
||||
|
|
@ -82,7 +82,7 @@ stdenv.mkDerivation {
|
|||
hash = "sha256-71sJuGqVjTcB549eIiCO0LoqAgxkdEHCoxh8Pd/Qzz8=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals (lib.versionAtLeast llvmMajor "15" && lib.versionOlder llvmMajor "18") [
|
||||
++ lib.optionals (lib.versionAtLeast llvmMajor "16" && lib.versionOlder llvmMajor "18") [
|
||||
# Fixes build after spirv-headers breaking change
|
||||
(fetchpatch {
|
||||
url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/0166a0fb86dc6c0e8903436bbc3a89bc3273ebc0.patch";
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "stylelint";
|
||||
version = "16.18.0";
|
||||
version = "16.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stylelint";
|
||||
repo = "stylelint";
|
||||
tag = version;
|
||||
hash = "sha256-DtNZHxWmOwStUAYqfF37QoUpHjrDU1C7Tzmya4OCibc=";
|
||||
hash = "sha256-mQQhO63zX69ke7774t4YYpKTC4JHKBFFOlE8ovJYhco=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-h8ryKrh5A+PWMLcDFq7xC/NRmLUhsWqjsw4pIwtcy6g=";
|
||||
npmDepsHash = "sha256-dx5FQsiL6XtsJh8wYq+q8j4n/vwlr0U0HpZqLwbIAXY=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -84,6 +84,7 @@ rustPlatform.buildRustPackage rec {
|
|||
mit
|
||||
];
|
||||
maintainers = with maintainers; [ nicoo ];
|
||||
mainProgram = "sudo";
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,25 +1,25 @@
|
|||
{
|
||||
"version": "0.146.1",
|
||||
"version": "0.147.0",
|
||||
"binaries": {
|
||||
"aarch64-darwin": {
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.146.1/darwin/arm64/yc",
|
||||
"hash": "sha256-CB8TjVYK7BvfMxGa/i4/Nx/6CDVEO942yC+FvSGPVdQ="
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.147.0/darwin/arm64/yc",
|
||||
"hash": "sha256-1HJPKu7R0+xwxQQHd/vcxASAhtkQYNJypvKKeehVub8="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.146.1/linux/arm64/yc",
|
||||
"hash": "sha256-Lftf19hdhw/vulo3jwMxfoIWkGrKZIFh8GmslLXzUng="
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.147.0/linux/arm64/yc",
|
||||
"hash": "sha256-guw6dKsXWDH8VYTCBkxC5BxkrCCt/WEG6BBwTU0K1SY="
|
||||
},
|
||||
"i686-linux": {
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.146.1/linux/386/yc",
|
||||
"hash": "sha256-2RQHVU7uglR7FQDJQQ5KnFkNtVsMeO9RAH1g0OX28vQ="
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.147.0/linux/386/yc",
|
||||
"hash": "sha256-nACjbD1/iZ4HVUNGXC7TgAnof5Xf48wvz+tKhCP/AXc="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.146.1/darwin/amd64/yc",
|
||||
"hash": "sha256-Qvp3HiHlg6ddReTFRSpc2MDQgnwcQohF1ugFhzWR0os="
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.147.0/darwin/amd64/yc",
|
||||
"hash": "sha256-SAVTTdI1EXAK6AqnycVVxtsOAnRC2rKvito+j9Wmzk4="
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.146.1/linux/amd64/yc",
|
||||
"hash": "sha256-yHl67bzX4HKcaaAH2dRNI6+bWfvM90Zkh/qkXC3Cw14="
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.147.0/linux/amd64/yc",
|
||||
"hash": "sha256-k3Mn3sxPzPu6XfLEP07kkSYZP4LWx8NJe8OIS3yfcgQ="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "yay";
|
||||
version = "12.4.2";
|
||||
version = "12.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jguer";
|
||||
repo = "yay";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-QLkqpeHVdR9dxhSGl2wQ7WL1mX6JJm3z6pLeI37z3oM=";
|
||||
hash = "sha256-qcNjEy8W+6hjTqzkYk8MqHN8owrSONZPB4sXSOstGSE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BKxhRa2y/liBDtMLg0Rlf/ysjQOgIaFjXbPWYBw53Po=";
|
||||
vendorHash = "sha256-8auZMcfaC0nI0vj1VRz8g/4ijFd57oALYaszGUb0K9A=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
4690
pkgs/by-name/yt/ytermusic/Cargo.lock
generated
4690
pkgs/by-name/yt/ytermusic/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -15,18 +15,18 @@ rustPlatform.buildRustPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "ccgauche";
|
||||
repo = "ytermusic";
|
||||
rev = "beta-${version}";
|
||||
tag = "beta-${version}";
|
||||
hash = "sha256-nu/vedQNs5TgCG1v5qwwDTnFTyXCS2KnLVrnEhCtzCs=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"rusty_ytdl-0.6.6" = "sha256-htXD8v9Yd7S0iLjP6iZu94tP5KO5vbmkdUybqA7OtlU=";
|
||||
"symphonia-0.5.4" = "sha256-uf0BbpqtlpZhsnV7Cm8egxjb/fXSINsOANTjDUQ4U9M=";
|
||||
};
|
||||
};
|
||||
postPatch = "cp ${./Cargo.lock} Cargo.lock";
|
||||
cargoPatches = [
|
||||
# Fix compilation with Rust 1.80 (https://github.com/NixOS/nixpkgs/issues/332957)
|
||||
./time-crate.patch
|
||||
];
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
|
||||
cargoHash = "sha256-5KbqX8HU7s5ZLoCVUmZhvrliAl3wXV4/nMEI5tq2piU=";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
|
@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
|
|||
meta = {
|
||||
description = "TUI based Youtube Music Player that aims to be as fast and simple as possible";
|
||||
homepage = "https://github.com/ccgauche/ytermusic";
|
||||
changelog = "https://github.com/ccgauche/ytermusic/releases/tag/${src.rev}";
|
||||
changelog = "https://github.com/ccgauche/ytermusic/releases/tag/${src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ codebam ];
|
||||
mainProgram = "ytermusic";
|
||||
|
|
|
|||
48
pkgs/by-name/yt/ytermusic/time-crate.patch
Normal file
48
pkgs/by-name/yt/ytermusic/time-crate.patch
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 1fbd706..6578477 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -884,9 +884,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deranged"
|
||||
-version = "0.3.11"
|
||||
+version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
|
||||
+checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
|
||||
dependencies = [
|
||||
"powerfmt",
|
||||
]
|
||||
@@ -3710,9 +3710,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "time"
|
||||
-version = "0.3.34"
|
||||
+version = "0.3.41"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
|
||||
+checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
|
||||
dependencies = [
|
||||
"deranged",
|
||||
"itoa",
|
||||
@@ -3725,15 +3725,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "time-core"
|
||||
-version = "0.1.2"
|
||||
+version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
|
||||
+checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
|
||||
|
||||
[[package]]
|
||||
name = "time-macros"
|
||||
-version = "0.2.17"
|
||||
+version = "0.2.22"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
|
||||
+checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
|
||||
dependencies = [
|
||||
"num-conv",
|
||||
"time-core",
|
||||
|
|
@ -99,7 +99,7 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zed-editor";
|
||||
version = "0.182.11";
|
||||
version = "0.183.10";
|
||||
|
||||
outputs =
|
||||
[ "out" ]
|
||||
|
|
@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-q7kE+CdQtUboL/NSBDx8E8Hktkr+CnygxwzOS0Athf4=";
|
||||
hash = "sha256-0OiErSiYGobh4CrdFEdEeeYEd4V28qHoo8Af5d/brug=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -129,7 +129,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
'';
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-rQImMVrFNOT43tdDpoSrRAqk7K5V8f+gzqEdrwJfO90=";
|
||||
cargoHash = "sha256-/3OqgKN3SUeA9tPG8g9RfqP0gAT2OA44mNF5US5aUa0=";
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ function zigBuildPhase {
|
|||
zigBuildFlags zigBuildFlagsArray
|
||||
|
||||
echoCmd 'zig build flags' "${flagsArray[@]}"
|
||||
zig build "${flagsArray[@]}"
|
||||
TERM=dumb zig build "${flagsArray[@]}" --verbose
|
||||
|
||||
runHook postBuild
|
||||
}
|
||||
|
|
@ -29,7 +29,7 @@ function zigCheckPhase {
|
|||
zigCheckFlags zigCheckFlagsArray
|
||||
|
||||
echoCmd 'zig check flags' "${flagsArray[@]}"
|
||||
zig build test "${flagsArray[@]}"
|
||||
TERM=dumb zig build test "${flagsArray[@]}" --verbose
|
||||
|
||||
runHook postCheck
|
||||
}
|
||||
|
|
@ -48,7 +48,7 @@ function zigInstallPhase {
|
|||
fi
|
||||
|
||||
echoCmd 'zig install flags' "${flagsArray[@]}"
|
||||
zig build install "${flagsArray[@]}"
|
||||
TERM=dumb zig build install "${flagsArray[@]}" --verbose
|
||||
|
||||
runHook postInstall
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
replaceVars,
|
||||
meson,
|
||||
pkg-config,
|
||||
qttools,
|
||||
ninja,
|
||||
qtbase,
|
||||
qtwayland,
|
||||
|
|
@ -33,7 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
nativeBuildInputs = [
|
||||
meson
|
||||
pkg-config
|
||||
qttools
|
||||
ninja
|
||||
];
|
||||
|
||||
|
|
@ -43,10 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
wayland
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Duse_qt_version=qt6"
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
outputs = [
|
||||
|
|
|
|||
|
|
@ -4,10 +4,12 @@
|
|||
fetchPypi,
|
||||
setuptools,
|
||||
python,
|
||||
croniter,
|
||||
cronsim,
|
||||
python-dateutil,
|
||||
tzlocal,
|
||||
pytestCheckHook,
|
||||
pytest-cov-stub,
|
||||
pytest-xdist,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -20,23 +22,21 @@ buildPythonPackage rec {
|
|||
hash = "sha256-G7ZaNq7hN+iDNZJ4OVbgx9xHi8PpJz/ChB1dDGBF5NI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
croniter
|
||||
dependencies = [
|
||||
cronsim
|
||||
python-dateutil
|
||||
tzlocal
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-cov-stub
|
||||
pytest-xdist
|
||||
tzlocal
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i "/--ignore/d" setup.cfg
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
rm -rf $out/${python.sitePackages}/tests
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioesphomeapi";
|
||||
version = "29.10.0";
|
||||
version = "30.0.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
|||
owner = "esphome";
|
||||
repo = "aioesphomeapi";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ltGQthw0iTaLEKAeA3MjjLFyQsqJgZu9O8U4rcJw5dU=";
|
||||
hash = "sha256-15PIjqglLu4vARbUUL/OVdRcSJWfOFIKqIa2ugpNbUw=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
51
pkgs/development/python-modules/csaps/default.nix
Normal file
51
pkgs/development/python-modules/csaps/default.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
|
||||
poetry-core,
|
||||
setuptools,
|
||||
|
||||
typing-extensions,
|
||||
numpy,
|
||||
scipy,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "csaps";
|
||||
version = "1.3.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "espdev";
|
||||
repo = "csaps";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-T1B0ta104UKLCUc97RQrvUSFt8ZCn9Y1Qiqo4DKHDsI=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
typing-extensions
|
||||
numpy
|
||||
scipy
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "csaps" ];
|
||||
|
||||
meta = {
|
||||
description = "Cubic spline approximation (smoothing)";
|
||||
homepage = "https://github.com/espdev/csaps";
|
||||
changelog = "https://github.com/espdev/csaps/blob/v${version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ flokli ];
|
||||
};
|
||||
}
|
||||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-annoying";
|
||||
version = "0.10.7";
|
||||
version = "0.10.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skorokithakis";
|
||||
repo = "django-annoying";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-lEl9k2DOJUiCxiSp1xWIGsKbZ9iJlNWr3mxTXlKXbt4=";
|
||||
hash = "sha256-zBOHVar4iKb+BioIwmDosNZKi/0YcjYfBusn0Lv8pMw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -28,14 +28,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "docling-core";
|
||||
version = "2.26.4";
|
||||
version = "2.28.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docling-project";
|
||||
repo = "docling-core";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-SMjA/OSMKsQkT00kiDz6HLrE+FQoWVQuHvnHhPfJJ0g=";
|
||||
hash = "sha256-vvaqO9rsXeQUt5+u9aEC1JNvXSgFMgfqNjjZLXjqkmA=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
72
pkgs/development/python-modules/ipydatagrid/default.nix
Normal file
72
pkgs/development/python-modules/ipydatagrid/default.nix
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
|
||||
hatchling,
|
||||
hatch-jupyter-builder,
|
||||
jupyterlab,
|
||||
bqplot,
|
||||
ipywidgets,
|
||||
pandas,
|
||||
py2vega,
|
||||
yarn-berry_3,
|
||||
}:
|
||||
|
||||
let
|
||||
yarn-berry = yarn-berry_3;
|
||||
in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ipydatagrid";
|
||||
version = "1.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jupyter-widgets";
|
||||
repo = "ipydatagrid";
|
||||
tag = version;
|
||||
hash = "sha256-6jaIYgLbNXIYzM+mZIVMZ1CXOpcbVK5k9nzGjq5UdLI=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
hatchling
|
||||
hatch-jupyter-builder
|
||||
jupyterlab
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
yarn-berry.yarnBerryConfigHook
|
||||
yarn-berry
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
bqplot
|
||||
ipywidgets
|
||||
pandas
|
||||
py2vega
|
||||
];
|
||||
|
||||
offlineCache = yarn-berry.fetchYarnBerryDeps {
|
||||
inherit src;
|
||||
hash = "sha256-5KZl9mK6xNvy2XdWieH20hEZJ+h/KzvjOfpo78FlWpg=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace pyproject.toml package.json \
|
||||
--replace-fail 'jlpm' 'yarn'
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Fast Datagrid widget for the Jupyter Notebook and JupyterLab";
|
||||
homepage = "https://github.com/jupyter-widgets/ipydatagrid";
|
||||
changelog = "https://github.com/jupyter-widgets/ipydatagrid/releases/tag/${version}";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ flokli ];
|
||||
};
|
||||
}
|
||||
|
|
@ -20,14 +20,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "proton-vpn-api-core";
|
||||
version = "0.42.3";
|
||||
version = "0.42.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ProtonVPN";
|
||||
repo = "python-proton-vpn-api-core";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/GV5DFWc6RBWP723APNxn9FTxdePumYOtdwDQEg4ccA=";
|
||||
hash = "sha256-WzyxBeIiOXDxyv0/guPWO16pN41ZVXnxd6iiiZ+bLR4=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,67 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
python,
|
||||
buildPythonPackage,
|
||||
cargo,
|
||||
rustPlatform,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "proton-vpn-local-agent";
|
||||
version = "1.4.5";
|
||||
pyproject = false;
|
||||
withDistOutput = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ProtonVPN";
|
||||
repo = "python-proton-vpn-local-agent";
|
||||
rev = version;
|
||||
hash = "sha256-njulvM8CNURy5Gy8thOT08y4cq9T68Ktl6wlfvg5I4w=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
src
|
||||
sourceRoot
|
||||
;
|
||||
hash = "sha256-RrMhkOZyG0JBEk+ikRpQtsNVR6Jt94u71+srQ6qMq5U=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/python-proton-vpn-local-agent";
|
||||
|
||||
cargoBuildType = "release";
|
||||
nativeBuildInputs = [
|
||||
cargo
|
||||
rustPlatform.cargoSetupHook
|
||||
rustPlatform.cargoBuildHook
|
||||
];
|
||||
|
||||
cargoCheckType = "release";
|
||||
nativeCheckInputs = [
|
||||
rustPlatform.cargoCheckHook
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
# manually install the python binding
|
||||
mkdir -p $out/${python.sitePackages}/proton/vpn/
|
||||
cp ./target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/libpython_proton_vpn_local_agent.so $out/${python.sitePackages}/proton/vpn/local_agent.so
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "proton.vpn.local_agent" ];
|
||||
|
||||
meta = {
|
||||
description = "Proton VPN local agent written in Rust with Python bindings";
|
||||
homepage = "https://github.com/ProtonVPN/python-proton-vpn-local-agent";
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ sebtm ];
|
||||
};
|
||||
}
|
||||
|
|
@ -77,7 +77,6 @@ buildPythonPackage rec {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
broken = true; # ModuleNotFoundError: No module named 'proton.vpn.local_agent'
|
||||
description = "Provides the necessary functionality for other ProtonVPN components to interact with NetworkManager";
|
||||
homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager";
|
||||
license = lib.licenses.gpl3Only;
|
||||
|
|
|
|||
42
pkgs/development/python-modules/py2vega/default.nix
Normal file
42
pkgs/development/python-modules/py2vega/default.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
gast,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "py2vega";
|
||||
version = "0.6.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "QuantStack";
|
||||
repo = "py2vega";
|
||||
tag = version;
|
||||
hash = "sha256-M6vrObEj4cB53nvEi1oQdVWABlqGwG3xc2unY44Yhuc=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "gast" ];
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
gast
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Python to Vega-expression transpiler";
|
||||
homepage = "https://github.com/QuantStack/py2vega";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ flokli ];
|
||||
};
|
||||
}
|
||||
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "trino-python-client";
|
||||
version = "0.322.0";
|
||||
version = "0.323.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = pname;
|
||||
owner = "trinodb";
|
||||
tag = version;
|
||||
hash = "sha256-Hl88Keavyp1QBw67AFbevy/btzNs7UlsKQ93K02YgLM=";
|
||||
hash = "sha256-Nr7p7x5cxxuPv2NUh1uMth97OQ+H2KBlu0SHVJ7Zu1M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
|
@ -65,6 +65,9 @@ buildPythonPackage rec {
|
|||
description = "Client for the Trino distributed SQL Engine";
|
||||
homepage = "https://github.com/trinodb/trino-python-client";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ cpcloud ];
|
||||
maintainers = with maintainers; [
|
||||
cpcloud
|
||||
flokli
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "uiprotect";
|
||||
version = "7.5.2";
|
||||
version = "7.5.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
|
@ -49,7 +49,7 @@ buildPythonPackage rec {
|
|||
owner = "uilibs";
|
||||
repo = "uiprotect";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-cXvjxXvGnIJ5lRtH8t5TFTUgGKUZOcGkyur9e+Anbf4=";
|
||||
hash = "sha256-bDkMG+4XtniojoOnrfGRDewaDOP+jnUQRFYYFAHKxyE=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
|
|
|||
|
|
@ -49,7 +49,10 @@ buildPythonPackage rec {
|
|||
setuptools
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [ "packaging" ];
|
||||
pythonRelaxDeps = [
|
||||
"packaging"
|
||||
"rich"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
babel
|
||||
|
|
|
|||
|
|
@ -9,9 +9,12 @@
|
|||
pkg-config,
|
||||
openssl,
|
||||
curl,
|
||||
writableTmpDirAsHomeHook,
|
||||
installShellFiles,
|
||||
zlib,
|
||||
libiconv,
|
||||
xz,
|
||||
buildPackages,
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -20,15 +23,15 @@ let
|
|||
];
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rustup";
|
||||
version = "1.27.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "rustup";
|
||||
rev = version;
|
||||
sha256 = "sha256-BehkJTEIbZHaM+ABaWN/grl9pX75lPqyBj1q1Kt273M=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-BehkJTEIbZHaM+ABaWN/grl9pX75lPqyBj1q1Kt273M=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
|
|
@ -37,11 +40,14 @@ rustPlatform.buildRustPackage rec {
|
|||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
pkg-config
|
||||
writableTmpDirAsHomeHook
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
(curl.override { inherit openssl; })
|
||||
openssl
|
||||
curl
|
||||
zlib
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
|
|
@ -99,18 +105,26 @@ rustPlatform.buildRustPackage rec {
|
|||
wrapProgram $out/bin/rustup --prefix "LD_LIBRARY_PATH" : "${libPath}"
|
||||
|
||||
# tries to create .rustup
|
||||
export HOME=$(mktemp -d)
|
||||
mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions}
|
||||
|
||||
# generate completion scripts for rustup
|
||||
$out/bin/rustup completions bash rustup > "$out/share/bash-completion/completions/rustup"
|
||||
$out/bin/rustup completions fish rustup > "$out/share/fish/vendor_completions.d/rustup.fish"
|
||||
$out/bin/rustup completions zsh rustup > "$out/share/zsh/site-functions/_rustup"
|
||||
${lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
|
||||
let
|
||||
emulator = stdenv.hostPlatform.emulator buildPackages;
|
||||
in
|
||||
''
|
||||
# generate completion scripts for rustup
|
||||
installShellCompletion --cmd rustup \
|
||||
--bash <(${emulator} $out/bin/rustup completions bash rustup) \
|
||||
--fish <(${emulator} $out/bin/rustup completions fish rustup) \
|
||||
--zsh <(${emulator} $out/bin/rustup completions zsh rustup)
|
||||
|
||||
# generate completion scripts for cargo
|
||||
# Note: fish completion script is not supported.
|
||||
$out/bin/rustup completions bash cargo > "$out/share/bash-completion/completions/cargo"
|
||||
$out/bin/rustup completions zsh cargo > "$out/share/zsh/site-functions/_cargo"
|
||||
# generate completion scripts for cargo
|
||||
# Note: fish completion script is not supported.
|
||||
installShellCompletion --cmd cargo \
|
||||
--bash <(${emulator} $out/bin/rustup completions bash cargo) \
|
||||
--zsh <(${emulator} $out/bin/rustup completions zsh cargo)
|
||||
''
|
||||
)}
|
||||
|
||||
# add a wrapper script for ld.lld
|
||||
mkdir -p $out/nix-support
|
||||
|
|
@ -124,7 +138,7 @@ rustPlatform.buildRustPackage rec {
|
|||
chmod +x $out/nix-support/ld-wrapper.sh
|
||||
'';
|
||||
|
||||
env = lib.optionalAttrs (pname == "rustup") {
|
||||
env = {
|
||||
inherit (stdenv.cc.bintools)
|
||||
expandResponseParams
|
||||
shell
|
||||
|
|
@ -135,13 +149,16 @@ rustPlatform.buildRustPackage rec {
|
|||
hardening_unsupported_flags = "";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Rust toolchain installer";
|
||||
homepage = "https://www.rustup.rs/";
|
||||
license = with licenses; [
|
||||
license = with lib.licenses; [
|
||||
asl20 # or
|
||||
mit
|
||||
];
|
||||
maintainers = [ maintainers.mic92 ];
|
||||
maintainers = with lib.maintainers; [
|
||||
mic92
|
||||
];
|
||||
mainProgram = "rustup";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1510,6 +1510,9 @@ mapAliases {
|
|||
protoc-gen-connect-es = throw "'protoc-gen-connect-es' has been removed because it is deprecated upstream. Functionality has been integrated into 'protoc-gen-es' v2."; # Added 2025-02-18
|
||||
protonup = protonup-ng; # Added 2022-11-06
|
||||
protonvpn-gui_legacy = throw "protonvpn-gui_legacy source code was removed from upstream. Use protonvpn-gui instead."; # Added 2024-10-12
|
||||
proton-vpn-local-agent = lib.warnOnInstantiate "'proton-vpn-local-agent' has been renamed to 'python3Packages.proton-vpn-local-agent'" (
|
||||
python3Packages.toPythonApplication python3Packages.proton-vpn-local-agent
|
||||
); # Added 2025-04-23
|
||||
proxmark3-rrg = proxmark3; # Added 2023-07-25
|
||||
psensor = throw "'psensor' has been removed due to lack of maintenance upstream. Consider using 'mission-center', 'resources' or 'monitorets' instead"; # Added 2024-09-14
|
||||
pwndbg = throw "'pwndbg' has been removed due to dependency version incompatibilities that are infeasible to maintain in nixpkgs. Use the downstream flake that pwndbg provides instead: https://github.com/pwndbg/pwndbg"; # Added 2025-02-09
|
||||
|
|
|
|||
|
|
@ -13056,6 +13056,7 @@ with pkgs;
|
|||
{
|
||||
greetd = callPackage ../applications/display-managers/greetd { };
|
||||
gtkgreet = callPackage ../applications/display-managers/greetd/gtkgreet.nix { };
|
||||
qtgreet = callPackage ../applications/display-managers/greetd/qtgreet.nix { };
|
||||
regreet = callPackage ../applications/display-managers/greetd/regreet.nix { };
|
||||
tuigreet = callPackage ../applications/display-managers/greetd/tuigreet.nix { };
|
||||
wlgreet = callPackage ../applications/display-managers/greetd/wlgreet.nix { };
|
||||
|
|
|
|||
|
|
@ -2956,6 +2956,8 @@ self: super: with self; {
|
|||
|
||||
csaf-tool = callPackage ../development/python-modules/csaf-tool { };
|
||||
|
||||
csaps = callPackage ../development/python-modules/csaps { };
|
||||
|
||||
cson = callPackage ../development/python-modules/cson { };
|
||||
|
||||
csrmesh = callPackage ../development/python-modules/csrmesh { };
|
||||
|
|
@ -6797,6 +6799,8 @@ self: super: with self; {
|
|||
|
||||
ipycanvas = callPackage ../development/python-modules/ipycanvas { };
|
||||
|
||||
ipydatagrid = callPackage ../development/python-modules/ipydatagrid { };
|
||||
|
||||
ipydatawidgets = callPackage ../development/python-modules/ipydatawidgets { };
|
||||
|
||||
ipykernel = callPackage ../development/python-modules/ipykernel { };
|
||||
|
|
@ -11471,6 +11475,8 @@ self: super: with self; {
|
|||
callPackage ../development/python-modules/proton-vpn-network-manager
|
||||
{ };
|
||||
|
||||
proton-vpn-local-agent = callPackage ../development/python-modules/proton-vpn-local-agent { };
|
||||
|
||||
protonup-ng = callPackage ../development/python-modules/protonup-ng { };
|
||||
|
||||
protonvpn-nm-lib = callPackage ../development/python-modules/protonvpn-nm-lib {
|
||||
|
|
@ -11723,6 +11729,8 @@ self: super: with self; {
|
|||
|
||||
py2bit = callPackage ../development/python-modules/py2bit { };
|
||||
|
||||
py2vega = callPackage ../development/python-modules/py2vega { };
|
||||
|
||||
py3buddy = callPackage ../development/python-modules/py3buddy { };
|
||||
|
||||
py3dns = callPackage ../development/python-modules/py3dns { };
|
||||
|
|
|
|||
|
|
@ -50,7 +50,6 @@ let
|
|||
|
||||
# cross packagesets
|
||||
pkgsLLVM = true;
|
||||
pkgsLLVMLibc = true;
|
||||
pkgsMusl = true;
|
||||
pkgsStatic = true;
|
||||
pkgsCross = true;
|
||||
|
|
|
|||
|
|
@ -379,10 +379,6 @@ let
|
|||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
pkgsLLVMLibc.stdenv = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
pkgsArocc.stdenv = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
|
|
|
|||
|
|
@ -115,15 +115,6 @@ let
|
|||
}
|
||||
);
|
||||
|
||||
makeLLVMParsedPlatform =
|
||||
parsed:
|
||||
(
|
||||
parsed
|
||||
// {
|
||||
abi = lib.systems.parse.abis.llvm;
|
||||
}
|
||||
);
|
||||
|
||||
stdenvAdapters =
|
||||
self: super:
|
||||
let
|
||||
|
|
@ -246,21 +237,6 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
pkgsLLVMLibc = nixpkgsFun {
|
||||
overlays = [
|
||||
(self': super': {
|
||||
pkgsLLVMLibc = super';
|
||||
})
|
||||
] ++ overlays;
|
||||
# Bootstrap a cross stdenv using LLVM libc.
|
||||
# This is currently not possible when compiling natively,
|
||||
# so we don't need to check hostPlatform != buildPlatform.
|
||||
crossSystem = stdenv.hostPlatform // {
|
||||
config = lib.systems.parse.tripleFromSystem (makeLLVMParsedPlatform stdenv.hostPlatform.parsed);
|
||||
libc = "llvm";
|
||||
};
|
||||
};
|
||||
|
||||
pkgsArocc = nixpkgsFun {
|
||||
overlays = [
|
||||
(self': super': {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue