Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
18ad263272
|
|
@ -241,7 +241,7 @@ let
|
|||
pkgs.vmTools.override {
|
||||
rootModules =
|
||||
[ "zfs" "9p" "9pnet_virtio" "virtio_pci" "virtio_blk" ] ++
|
||||
(pkgs.lib.optional (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) "rtc_cmos");
|
||||
(pkgs.lib.optional pkgs.stdenv.hostPlatform.isx86 "rtc_cmos");
|
||||
kernel = modulesTree;
|
||||
}
|
||||
).runInLinuxVM (
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ rec {
|
|||
''-netdev vde,id=vlan${toString nic},sock="$QEMU_VDE_SOCKET_${toString net}"''
|
||||
];
|
||||
|
||||
qemuSerialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0"
|
||||
qemuSerialDevice = if pkgs.stdenv.hostPlatform.isx86 then "ttyS0"
|
||||
else if (with pkgs.stdenv.hostPlatform; isAarch32 || isAarch64 || isPower) then "ttyAMA0"
|
||||
else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'";
|
||||
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ in {
|
|||
b43Firmware_5_1_138
|
||||
b43Firmware_6_30_163_46
|
||||
b43FirmwareCutter
|
||||
] ++ optional (pkgs.stdenv.hostPlatform.isi686 || pkgs.stdenv.hostPlatform.isx86_64) facetimehd-firmware;
|
||||
] ++ optional pkgs.stdenv.hostPlatform.isx86 facetimehd-firmware;
|
||||
})
|
||||
(mkIf cfg.wirelessRegulatoryDatabase {
|
||||
hardware.firmware = [ pkgs.wireless-regdb ];
|
||||
|
|
|
|||
|
|
@ -467,7 +467,7 @@ let
|
|||
throw "Unsupported architecture";
|
||||
|
||||
# Syslinux (and isolinux) only supports x86-based architectures.
|
||||
canx86BiosBoot = pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64;
|
||||
canx86BiosBoot = pkgs.stdenv.hostPlatform.isx86;
|
||||
|
||||
in
|
||||
|
||||
|
|
|
|||
|
|
@ -243,7 +243,7 @@ in
|
|||
"hid_generic" "hid_lenovo" "hid_apple" "hid_roccat"
|
||||
"hid_logitech_hidpp" "hid_logitech_dj" "hid_microsoft"
|
||||
|
||||
] ++ optionals (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [
|
||||
] ++ optionals pkgs.stdenv.hostPlatform.isx86 [
|
||||
# Misc. x86 keyboard stuff.
|
||||
"pcips2" "atkbd" "i8042"
|
||||
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ in
|
|||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [ {
|
||||
assertion = pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64;
|
||||
assertion = pkgs.stdenv.hostPlatform.isx86;
|
||||
message = "Azure not currently supported on ${pkgs.stdenv.hostPlatform.system}";
|
||||
} {
|
||||
assertion = config.networking.networkmanager.enable == false;
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ let
|
|||
imap1 (idx: drive: drive // { device = driveDeviceName idx; });
|
||||
|
||||
efiPrefix =
|
||||
if (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then "${pkgs.OVMF.fd}/FV/OVMF"
|
||||
if pkgs.stdenv.hostPlatform.isx86 then "${pkgs.OVMF.fd}/FV/OVMF"
|
||||
else if pkgs.stdenv.isAarch64 then "${pkgs.OVMF.fd}/FV/AAVMF"
|
||||
else throw "No EFI firmware available for platform";
|
||||
efiFirmware = "${efiPrefix}_CODE.fd";
|
||||
|
|
@ -296,7 +296,7 @@ in
|
|||
virtualisation.memorySize =
|
||||
mkOption {
|
||||
type = types.ints.positive;
|
||||
default = 384;
|
||||
default = 1024;
|
||||
description =
|
||||
''
|
||||
The memory size in megabytes of the virtual machine.
|
||||
|
|
@ -833,7 +833,7 @@ in
|
|||
|
||||
# FIXME: Consolidate this one day.
|
||||
virtualisation.qemu.options = mkMerge [
|
||||
(mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [
|
||||
(mkIf pkgs.stdenv.hostPlatform.isx86 [
|
||||
"-usb" "-device usb-tablet,bus=usb-bus.0"
|
||||
])
|
||||
(mkIf (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) [
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ in
|
|||
|
||||
config = mkIf cfg.enable (mkMerge [{
|
||||
assertions = [{
|
||||
assertion = pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64;
|
||||
assertion = pkgs.stdenv.hostPlatform.isx86;
|
||||
message = "Virtualbox not currently supported on ${pkgs.stdenv.hostPlatform.system}";
|
||||
}];
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ in
|
|||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [ {
|
||||
assertion = pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64;
|
||||
assertion = pkgs.stdenv.hostPlatform.isx86;
|
||||
message = "VMWare guest is not currently supported on ${pkgs.stdenv.hostPlatform.system}";
|
||||
} ];
|
||||
|
||||
|
|
|
|||
|
|
@ -11,10 +11,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
enable = true;
|
||||
maxMemory = 800;
|
||||
};
|
||||
|
||||
# Airsonic is a Java application, and unfortunately requires a significant
|
||||
# amount of memory.
|
||||
virtualisation.memorySize = 1024;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ import ./make-test-python.nix ({ pkgs, ...} :
|
|||
program = "${pkgs.xterm}/bin/xterm -cm -pc -fa Monospace -fs 24";
|
||||
};
|
||||
|
||||
virtualisation.memorySize = 1024;
|
||||
# Need to switch to a different GPU driver than the default one (-vga std) so that Cage can launch:
|
||||
virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ in
|
|||
programs.xwayland.enable = true;
|
||||
environment.systemPackages = [ pkgs.cagebreak pkgs.wayland-utils ];
|
||||
|
||||
virtualisation.memorySize = 1024;
|
||||
# Need to switch to a different GPU driver than the default one (-vga std) so that Cagebreak can launch:
|
||||
virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -41,7 +41,6 @@ let
|
|||
];
|
||||
};
|
||||
services.cassandra = cassandraCfg ipAddress // extra;
|
||||
virtualisation.memorySize = 1024;
|
||||
};
|
||||
in
|
||||
{
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ let
|
|||
|
||||
generateHost = { pkgs, cephConfig, networkConfig, ... }: {
|
||||
virtualisation = {
|
||||
memorySize = 1024;
|
||||
emptyDiskImages = [ 20480 ];
|
||||
vlans = [ 1 ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ let
|
|||
|
||||
generateHost = { pkgs, cephConfig, networkConfig, ... }: {
|
||||
virtualisation = {
|
||||
memorySize = 1024;
|
||||
emptyDiskImages = [ 20480 20480 20480 ];
|
||||
vlans = [ 1 ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ let
|
|||
|
||||
generateHost = { pkgs, cephConfig, networkConfig, ... }: {
|
||||
virtualisation = {
|
||||
memorySize = 1024;
|
||||
emptyDiskImages = [ 20480 20480 20480 ];
|
||||
vlans = [ 1 ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
};
|
||||
|
||||
virtualisation = {
|
||||
memorySize = 1024;
|
||||
qemu.options = [ "-vga virtio" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
{ pkgs, ... }:
|
||||
{ imports = [ ../modules/installer/cd-dvd/channel.nix ];
|
||||
virtualisation.writableStore = true;
|
||||
virtualisation.memorySize = 768;
|
||||
|
||||
networking.bridges = {
|
||||
br0 = {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
};
|
||||
|
||||
machine = { pkgs, ... }: {
|
||||
virtualisation.memorySize = 768;
|
||||
virtualisation.writableStore = true;
|
||||
|
||||
containers.webserver = {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
{ pkgs, ... }:
|
||||
{ imports = [ ../modules/installer/cd-dvd/channel.nix ];
|
||||
virtualisation.writableStore = true;
|
||||
virtualisation.memorySize = 768;
|
||||
virtualisation.vlans = [];
|
||||
|
||||
networking.useDHCP = false;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
machine =
|
||||
{ lib, ... }:
|
||||
{
|
||||
virtualisation.memorySize = 256;
|
||||
virtualisation.vlans = [];
|
||||
|
||||
networking.bridges.br0.interfaces = [];
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
nix.binaryCaches = []; # don't try to access cache.nixos.org
|
||||
|
||||
virtualisation.writableStore = true;
|
||||
virtualisation.memorySize = 1024;
|
||||
# Make sure we always have all the required dependencies for creating a
|
||||
# container available within the VM, because we don't have network access.
|
||||
virtualisation.additionalPaths = let
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ in import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
imports = [ ../modules/installer/cd-dvd/channel.nix ];
|
||||
virtualisation = {
|
||||
writableStore = true;
|
||||
memorySize = 768;
|
||||
};
|
||||
|
||||
containers.webserver4 = webserverFor "10.231.136.1" "10.231.136.2";
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
machine1 =
|
||||
{ lib, ... }:
|
||||
{
|
||||
virtualisation.memorySize = 256;
|
||||
virtualisation.vlans = [ 1 ];
|
||||
|
||||
# To be able to ping containers from the host, it is necessary
|
||||
|
|
@ -55,7 +54,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
machine2 =
|
||||
{ ... }:
|
||||
{
|
||||
virtualisation.memorySize = 256;
|
||||
virtualisation.vlans = [ 1 ];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
nodes = {
|
||||
server = { ... }:
|
||||
{
|
||||
virtualisation.memorySize = 256;
|
||||
virtualisation.vlans = [ 1 ];
|
||||
|
||||
containers.server = {
|
||||
|
|
@ -23,7 +22,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
};
|
||||
};
|
||||
bridged = { ... }: {
|
||||
virtualisation.memorySize = 128;
|
||||
virtualisation.vlans = [ 1 ];
|
||||
|
||||
containers.bridged = {
|
||||
|
|
@ -41,7 +39,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
};
|
||||
|
||||
bonded = { ... }: {
|
||||
virtualisation.memorySize = 128;
|
||||
virtualisation.vlans = [ 1 ];
|
||||
|
||||
containers.bonded = {
|
||||
|
|
@ -62,7 +59,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
};
|
||||
|
||||
bridgedbond = { ... }: {
|
||||
virtualisation.memorySize = 128;
|
||||
virtualisation.vlans = [ 1 ];
|
||||
|
||||
containers.bridgedbond = {
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
{ pkgs, ... }:
|
||||
{ imports = [ ../modules/installer/cd-dvd/channel.nix ];
|
||||
virtualisation.writableStore = true;
|
||||
virtualisation.memorySize = 768;
|
||||
|
||||
containers.webserver =
|
||||
{ privateNetwork = true;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
{ pkgs, ... }:
|
||||
{ imports = [ ../modules/installer/cd-dvd/channel.nix ];
|
||||
virtualisation.writableStore = true;
|
||||
virtualisation.memorySize = 768;
|
||||
|
||||
containers.tmpfs =
|
||||
{
|
||||
|
|
|
|||
|
|
@ -81,8 +81,6 @@ in
|
|||
|
||||
# chromium-based browsers refuse to run as root
|
||||
test-support.displayManager.auto.user = "alice";
|
||||
# browsers may hang with the default memory
|
||||
virtualisation.memorySize = 500;
|
||||
|
||||
networking.hosts."127.0.0.1" = [ "good.example.com" "bad.example.com" ];
|
||||
security.pki.certificateFiles = [ "${example-good-cert}/ca.crt" ];
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ import ./make-test-python.nix ({ pkgs, ...} :
|
|||
};
|
||||
};
|
||||
hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
|
||||
virtualisation.memorySize = 1024;
|
||||
environment.systemPackages = [ pkgs.xdotool ];
|
||||
services.acpid.enable = true;
|
||||
services.connman.enable = true;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ import ../make-test-python.nix (
|
|||
...
|
||||
}:
|
||||
{
|
||||
virtualisation.memorySize = 1024;
|
||||
|
||||
imports = [
|
||||
../common/user-account.nix
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ in
|
|||
gcc
|
||||
(python3.withPackages (ps: with ps; [ fenics ]))
|
||||
];
|
||||
virtualisation.memorySize = 512;
|
||||
};
|
||||
};
|
||||
testScript =
|
||||
|
|
|
|||
|
|
@ -13,9 +13,6 @@ import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: {
|
|||
pkgs.xdotool
|
||||
];
|
||||
|
||||
# Need some more memory to record audio.
|
||||
virtualisation.memorySize = 500;
|
||||
|
||||
# Create a virtual sound device, with mixing
|
||||
# and all, for recording audio.
|
||||
boot.kernelModules = [ "snd-aloop" ];
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ in {
|
|||
{ config, pkgs, ... }: {
|
||||
networking.firewall.allowedTCPPorts = [ 80 2222 ];
|
||||
|
||||
virtualisation.memorySize = 1024;
|
||||
|
||||
services.gerrit = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
|
|||
};
|
||||
};
|
||||
|
||||
virtualisation.memorySize = 1024;
|
||||
};
|
||||
|
||||
testScript = { nodes, ... }: let
|
||||
|
|
|
|||
|
|
@ -45,7 +45,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
|
|||
};
|
||||
};
|
||||
|
||||
virtualisation.memorySize = 1024;
|
||||
};
|
||||
|
||||
testScript = { nodes, ... }: let
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ import ./make-test-python.nix ({ pkgs, ... } :
|
|||
nodes = {
|
||||
one =
|
||||
{ ... }: {
|
||||
virtualisation.memorySize = 1024;
|
||||
time.timeZone = "UTC";
|
||||
services.graphite = {
|
||||
web = {
|
||||
|
|
|
|||
|
|
@ -95,7 +95,6 @@ import ../make-test-python.nix ({pkgs, ...}: {
|
|||
|
||||
# YARN cluster
|
||||
rm1 = {pkgs, options, ...}: {
|
||||
virtualisation.memorySize = 1024;
|
||||
services.hadoop = {
|
||||
inherit package coreSite hdfsSite;
|
||||
yarnSite = options.services.hadoop.yarnSite.default // yarnSiteHA;
|
||||
|
|
@ -103,7 +102,6 @@ import ../make-test-python.nix ({pkgs, ...}: {
|
|||
};
|
||||
};
|
||||
rm2 = {pkgs, options, ...}: {
|
||||
virtualisation.memorySize = 1024;
|
||||
services.hadoop = {
|
||||
inherit package coreSite hdfsSite;
|
||||
yarnSite = options.services.hadoop.yarnSite.default // yarnSiteHA;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
import ../make-test-python.nix ({...}: {
|
||||
nodes = {
|
||||
namenode = {pkgs, ...}: {
|
||||
virtualisation.memorySize = 1024;
|
||||
services.hadoop = {
|
||||
package = pkgs.hadoop;
|
||||
hdfs = {
|
||||
|
|
|
|||
|
|
@ -7,6 +7,5 @@ makeInstalledTest {
|
|||
services.fwupd.enable = true;
|
||||
services.fwupd.disabledPlugins = lib.mkForce []; # don't disable test plugin
|
||||
services.fwupd.enableTestRemote = true;
|
||||
virtualisation.memorySize = 768;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ let
|
|||
let iface = if grubVersion == 1 then "ide" else "virtio";
|
||||
isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi);
|
||||
bios = if pkgs.stdenv.isAarch64 then "QEMU_EFI.fd" else "OVMF.fd";
|
||||
in if !isEfi && !(pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then
|
||||
in if !isEfi && !pkgs.stdenv.hostPlatform.isx86 then
|
||||
throw "Non-EFI boot methods are only supported on i686 / x86_64"
|
||||
else ''
|
||||
def assemble_qemu_flags():
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
client = { nodes, pkgs, ... }: {
|
||||
};
|
||||
server = { config, pkgs, ... }: {
|
||||
virtualisation.memorySize = 512;
|
||||
services.jitsi-meet = {
|
||||
enable = true;
|
||||
hostName = "server";
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ let
|
|||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ 2181 ];
|
||||
virtualisation.memorySize = 1024;
|
||||
};
|
||||
kafka = { ... }: {
|
||||
services.apache-kafka = {
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ let
|
|||
|
||||
nodes = {
|
||||
keycloak = { ... }: {
|
||||
virtualisation.memorySize = 1024;
|
||||
|
||||
security.pki.certificateFiles = [
|
||||
certs.ca.cert
|
||||
|
|
|
|||
|
|
@ -46,8 +46,6 @@ in {
|
|||
|
||||
machine = { lib, ... }: {
|
||||
virtualisation = {
|
||||
# OOMs otherwise
|
||||
memorySize = 1024;
|
||||
# disk full otherwise
|
||||
diskSize = 2048;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
nodes = {
|
||||
machine = { ... }: {
|
||||
services.metabase.enable = true;
|
||||
virtualisation.memorySize = 1024;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -64,10 +64,6 @@ in
|
|||
{
|
||||
imports = [ users ];
|
||||
|
||||
# prevent oom:
|
||||
# Kernel panic - not syncing: Out of memory: compulsory panic_on_oom is enabled
|
||||
virtualisation.memorySize = 1024;
|
||||
|
||||
services.mysql.enable = true;
|
||||
services.mysql.initialDatabases = [
|
||||
{ name = "testdb3"; schema = ./testdb.sql; }
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ let default-config = {
|
|||
|
||||
services.xserver.enable = false;
|
||||
|
||||
virtualisation.memorySize = 128;
|
||||
};
|
||||
in import ./make-test-python.nix ({ pkgs, ...} : {
|
||||
name = "networking-proxy";
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ import ./make-test-python.nix {
|
|||
};
|
||||
|
||||
client = { pkgs, lib, ... }: {
|
||||
virtualisation.memorySize = 512;
|
||||
environment.systemPackages = let
|
||||
testRunner = pkgs.writers.writePython3Bin "test-runner" {
|
||||
libraries = [ pkgs.python3Packages.selenium ];
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ let
|
|||
nix.binaryCaches = lib.mkForce [ ];
|
||||
users.users.person.isNormalUser = true;
|
||||
virtualisation.writableStore = true;
|
||||
virtualisation.memorySize = 1024 /*MiB*/;
|
||||
virtualisation.additionalPaths = [
|
||||
pkgs.hello
|
||||
pkgs.figlet
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@ import ./make-test-python.nix {
|
|||
|
||||
smtp2 = { pkgs, ... }: {
|
||||
imports = [ common/user-account.nix ];
|
||||
virtualisation.memorySize = 512;
|
||||
networking = {
|
||||
firewall.allowedTCPPorts = [ 25 143 ];
|
||||
useDHCP = false;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
|
|||
services.xserver.enable = true;
|
||||
services.xserver.desktopManager.pantheon.enable = true;
|
||||
|
||||
virtualisation.memorySize = 1024;
|
||||
};
|
||||
|
||||
enableOCR = true;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ import ./make-test-python.nix ({ lib, ... }: {
|
|||
enable = true;
|
||||
passwordFile = builtins.toFile "password" "admin";
|
||||
};
|
||||
virtualisation.memorySize = 1024;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ import ./make-test-python.nix ({ pkgs, ...} :
|
|||
user = "alice";
|
||||
};
|
||||
};
|
||||
virtualisation.memorySize = 1024;
|
||||
};
|
||||
|
||||
testScript = { nodes, ... }: let
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ import ./make-test-python.nix ({ pkgs, ...} :
|
|||
user = "alice";
|
||||
};
|
||||
hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
|
||||
virtualisation.memorySize = 1024;
|
||||
};
|
||||
|
||||
testScript = { nodes, ... }: let
|
||||
|
|
|
|||
|
|
@ -202,7 +202,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||
security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ];
|
||||
networking.extraHosts = hosts nodes;
|
||||
networking.firewall.enable = false;
|
||||
virtualisation.memorySize = 512;
|
||||
environment.systemPackages = with pkgs; [
|
||||
provision-db
|
||||
provision-secrets
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ import ./make-test-python.nix ({ pkgs, ...} : rec {
|
|||
|
||||
machine = { ... }: {
|
||||
virtualisation.cores = 2;
|
||||
virtualisation.memorySize = 512;
|
||||
|
||||
services.privacyidea = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -464,7 +464,6 @@ let
|
|||
extraFlags = [ "--lnd.network=regtest" ];
|
||||
};
|
||||
metricProvider = {
|
||||
virtualisation.memorySize = 1024;
|
||||
systemd.services.prometheus-lnd-exporter.serviceConfig.RestartSec = 15;
|
||||
systemd.services.prometheus-lnd-exporter.after = [ "lnd.service" ];
|
||||
services.bitcoind.regtest = {
|
||||
|
|
@ -953,7 +952,6 @@ let
|
|||
};
|
||||
metricProvider = {
|
||||
services.rspamd.enable = true;
|
||||
virtualisation.memorySize = 1024;
|
||||
};
|
||||
exporterTest = ''
|
||||
wait_for_unit("rspamd.service")
|
||||
|
|
|
|||
|
|
@ -188,7 +188,6 @@ in import ./make-test-python.nix {
|
|||
# Minio requires at least 1GiB of free disk space to run.
|
||||
virtualisation = {
|
||||
diskSize = 2 * 1024;
|
||||
memorySize = 1024;
|
||||
};
|
||||
networking.firewall.allowedTCPPorts = [ minioPort ];
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ let
|
|||
machine = {
|
||||
services.rspamd.enable = true;
|
||||
networking.enableIPv6 = enableIPv6;
|
||||
virtualisation.memorySize = 1024;
|
||||
};
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
|
@ -69,7 +68,6 @@ in
|
|||
group = "rspamd";
|
||||
}];
|
||||
};
|
||||
virtualisation.memorySize = 1024;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
|
|
@ -118,7 +116,6 @@ in
|
|||
'';
|
||||
};
|
||||
};
|
||||
virtualisation.memorySize = 1024;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
|
|
@ -224,7 +221,6 @@ in
|
|||
rspamd_logger.infox(rspamd_config, 'Work dammit!!!')
|
||||
'';
|
||||
};
|
||||
virtualisation.memorySize = 1024;
|
||||
};
|
||||
testScript = ''
|
||||
${initMachine}
|
||||
|
|
@ -291,7 +287,6 @@ in
|
|||
postfix.enable = true;
|
||||
workers.rspamd_proxy.type = "rspamd_proxy";
|
||||
};
|
||||
virtualisation.memorySize = 1024;
|
||||
};
|
||||
testScript = ''
|
||||
${initMachine}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }:
|
||||
let
|
||||
client = { config, pkgs, ... }: {
|
||||
virtualisation.memorySize = 256;
|
||||
environment.systemPackages = [ pkgs.seafile-shared pkgs.curl ];
|
||||
};
|
||||
in {
|
||||
|
|
@ -12,7 +11,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||
|
||||
nodes = {
|
||||
server = { config, pkgs, ... }: {
|
||||
virtualisation.memorySize = 512;
|
||||
services.seafile = {
|
||||
enable = true;
|
||||
ccnetSettings.General.SERVICE_URL = "http://server";
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@ in {
|
|||
environment.systemPackages = with pkgs; [
|
||||
signal-desktop file sqlite sqlcipher-signal
|
||||
];
|
||||
virtualisation.memorySize = 1024;
|
||||
};
|
||||
|
||||
enableOCR = true;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ import ../make-test-python.nix ({...}: {
|
|||
|
||||
nodes = {
|
||||
worker = { nodes, pkgs, ... }: {
|
||||
virtualisation.memorySize = 1024;
|
||||
services.spark.worker = {
|
||||
enable = true;
|
||||
master = "master:7077";
|
||||
|
|
|
|||
|
|
@ -44,7 +44,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
|
|||
# To test pinentry via gpg-agent:
|
||||
programs.gnupg.agent.enable = true;
|
||||
|
||||
virtualisation.memorySize = 1024;
|
||||
# Need to switch to a different GPU driver than the default one (-vga std) so that Sway can launch:
|
||||
virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
machine =
|
||||
{ ... }:
|
||||
{
|
||||
virtualisation.memorySize = 1024;
|
||||
|
||||
services.sympa = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
environment.systemPackages = [ pkgs.cryptsetup ];
|
||||
virtualisation = {
|
||||
emptyDiskImages = [ 512 ];
|
||||
memorySize = 1024;
|
||||
qemu.options = [
|
||||
"-chardev socket,id=chrtpm,path=/tmp/swtpm-sock"
|
||||
"-tpmdev emulator,id=tpm0,chardev=chrtpm"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
imports = [ common/user-account.nix common/x11.nix ];
|
||||
|
||||
virtualisation.emptyDiskImages = [ 512 512 ];
|
||||
virtualisation.memorySize = 1024;
|
||||
|
||||
environment.systemPackages = [ pkgs.cryptsetup ];
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||
maintainers = [ lnl7 roberth ];
|
||||
};
|
||||
machine = { lib, pkgs, ... }: {
|
||||
virtualisation.memorySize = 512;
|
||||
environment.systemPackages = [ pkgs.vault ];
|
||||
environment.variables.VAULT_ADDR = "http://127.0.0.1:8200";
|
||||
services.vault.enable = true;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||
environment.systemPackages = [ pkgs.vault ];
|
||||
environment.variables.VAULT_ADDR = "http://127.0.0.1:8200";
|
||||
services.vault.enable = true;
|
||||
virtualisation.memorySize = 512;
|
||||
};
|
||||
|
||||
testScript =
|
||||
|
|
|
|||
|
|
@ -140,7 +140,6 @@ let
|
|||
in
|
||||
[ pkgs.firefox-unwrapped pkgs.geckodriver testRunner ];
|
||||
|
||||
virtualisation.memorySize = 768;
|
||||
}
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
|||
|
||||
hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
|
||||
|
||||
virtualisation.memorySize = 1024;
|
||||
};
|
||||
|
||||
testScript = { nodes, ... }: let
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ mkDerivation rec {
|
|||
openjpeg opencolorio_1 poppler curl ilmbase
|
||||
qtmultimedia qtx11extras quazip
|
||||
python3Packages.pyqt5
|
||||
] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc;
|
||||
] ++ lib.optional stdenv.hostPlatform.isx86 vc;
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]
|
||||
++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy";
|
||||
|
|
|
|||
|
|
@ -1,13 +1,15 @@
|
|||
{ lib
|
||||
, mkDerivation
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, substituteAll
|
||||
, wrapQtAppsHook
|
||||
, qmake
|
||||
, qtsvg
|
||||
, qtx11extras
|
||||
, graphviz
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qvge";
|
||||
version = "0.6.3";
|
||||
|
||||
|
|
@ -25,15 +27,15 @@ mkDerivation rec {
|
|||
inherit graphviz;
|
||||
});
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
nativeBuildInputs = [ wrapQtAppsHook qmake ];
|
||||
|
||||
buildInputs = [ qtx11extras ];
|
||||
buildInputs = if stdenv.isDarwin then [ qtsvg ] else [ qtx11extras ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Qt Visual Graph Editor";
|
||||
homepage = "https://github.com/ArsMasiuk/qvge";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = with platforms; linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,9 @@
|
|||
, ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages
|
||||
, gssSupport ? true, libkrb5
|
||||
, pipewireSupport ? waylandSupport && webrtcSupport, pipewire
|
||||
, jemallocSupport ? true, jemalloc
|
||||
# Workaround: disabled since currently jemalloc causes crashes with LLVM 13.
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1741454
|
||||
, jemallocSupport ? false, jemalloc
|
||||
|
||||
## privacy-related options
|
||||
|
||||
|
|
@ -71,6 +73,9 @@
|
|||
# > the experience of Firefox users, you won't have any issues using the
|
||||
# > official branding.
|
||||
, enableOfficialBranding ? true
|
||||
|
||||
# On 32bit platforms, we disable adding "-g" for easier linking.
|
||||
, enableDebugSymbols ? !stdenv.is32bit
|
||||
}:
|
||||
|
||||
assert stdenv.cc.libc or null != null;
|
||||
|
|
@ -116,12 +121,6 @@ let
|
|||
})
|
||||
else stdenv;
|
||||
|
||||
# --enable-release adds -ffunction-sections & LTO that require a big amount of
|
||||
# RAM and the 32-bit memory space cannot handle that linking
|
||||
# We also disable adding "-g" for easier linking
|
||||
releaseFlags = if stdenv.is32bit
|
||||
then [ "--disable-release" "--disable-debug-symbols" ]
|
||||
else [ "--enable-release" ];
|
||||
in
|
||||
|
||||
buildStdenv.mkDerivation ({
|
||||
|
|
@ -174,10 +173,6 @@ buildStdenv.mkDerivation ({
|
|||
AVFoundation MediaToolbox CoreLocation
|
||||
Foundation libobjc AddressBook cups ];
|
||||
|
||||
NIX_LDFLAGS = lib.optionalString ltoSupport ''
|
||||
-rpath ${llvmPackages.libunwind.out}/lib
|
||||
'';
|
||||
|
||||
MACH_USE_SYSTEM_PYTHON = "1";
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -206,6 +201,9 @@ buildStdenv.mkDerivation ({
|
|||
++ lib.optionals buildStdenv.isDarwin [ xcbuild rsync ]
|
||||
++ extraNativeBuildInputs;
|
||||
|
||||
separateDebugInfo = enableDebugSymbols;
|
||||
setOutputFlags = false; # `./mach configure` doesn't understand `--*dir=` flags.
|
||||
|
||||
preConfigure = ''
|
||||
# remove distributed configuration files
|
||||
rm -f configure
|
||||
|
|
@ -229,7 +227,11 @@ buildStdenv.mkDerivation ({
|
|||
${lib.optionalString buildStdenv.cc.isClang "-idirafter ${buildStdenv.cc.cc.lib}/lib/clang/${lib.getVersion buildStdenv.cc.cc}/include"} \
|
||||
${lib.optionalString buildStdenv.cc.isGNU "-isystem ${lib.getDev buildStdenv.cc.cc}/include/c++/${lib.getVersion buildStdenv.cc.cc} -isystem ${buildStdenv.cc.cc}/include/c++/${lib.getVersion buildStdenv.cc.cc}/${buildStdenv.hostPlatform.config}"} \
|
||||
$NIX_CFLAGS_COMPILE"
|
||||
|
||||
${
|
||||
# Bindgen doesn't like the flag added by `separateDebugInfo`.
|
||||
lib.optionalString enableDebugSymbols ''
|
||||
BINDGEN_CFLAGS="''${BINDGEN_CFLAGS/ -Wa,--compress-debug-sections/}"
|
||||
''}
|
||||
echo "ac_add_options BINDGEN_CFLAGS='$BINDGEN_CFLAGS'" >> $MOZCONFIG
|
||||
'' + (lib.optionalString googleAPISupport ''
|
||||
# Google API key used by Chromium and Firefox.
|
||||
|
|
@ -273,7 +275,7 @@ buildStdenv.mkDerivation ({
|
|||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1538724
|
||||
# elf-hack is broken when using clang+lld:
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
|
||||
++ lib.optional ltoSupport "--enable-lto"
|
||||
++ lib.optional ltoSupport "--enable-lto=cross" # Cross-language LTO.
|
||||
++ lib.optional (ltoSupport && (buildStdenv.isAarch32 || buildStdenv.isi686 || buildStdenv.isx86_64)) "--disable-elf-hack"
|
||||
++ lib.optional (ltoSupport && !buildStdenv.isDarwin) "--enable-linker=lld"
|
||||
|
||||
|
|
@ -287,9 +289,13 @@ buildStdenv.mkDerivation ({
|
|||
++ lib.optional drmSupport "--enable-eme=widevine"
|
||||
|
||||
++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ]
|
||||
else ([ "--disable-debug"
|
||||
"--enable-optimize"
|
||||
"--enable-strip" ] ++ releaseFlags))
|
||||
else [ "--disable-debug" "--enable-optimize" ])
|
||||
# --enable-release adds -ffunction-sections & LTO that require a big amount of
|
||||
# RAM and the 32-bit memory space cannot handle that linking
|
||||
++ flag (!debugBuild && !stdenv.is32bit) "release"
|
||||
++ flag enableDebugSymbols "debug-symbols"
|
||||
++ lib.optionals enableDebugSymbols [ "--disable-strip" "--disable-install-strip" ]
|
||||
|
||||
++ lib.optional enableOfficialBranding "--enable-official-branding"
|
||||
++ extraConfigureFlags;
|
||||
|
||||
|
|
@ -297,14 +303,7 @@ buildStdenv.mkDerivation ({
|
|||
cd obj-*
|
||||
'';
|
||||
|
||||
makeFlags = lib.optionals ltoSupport [
|
||||
"AR=${buildStdenv.cc.bintools.bintools}/bin/llvm-ar"
|
||||
"LLVM_OBJDUMP=${buildStdenv.cc.bintools.bintools}/bin/llvm-objdump"
|
||||
"NM=${buildStdenv.cc.bintools.bintools}/bin/llvm-nm"
|
||||
"RANLIB=${buildStdenv.cc.bintools.bintools}/bin/llvm-ranlib"
|
||||
"STRIP=${buildStdenv.cc.bintools.bintools}/bin/llvm-strip"
|
||||
]
|
||||
++ extraMakeFlags;
|
||||
makeFlags = extraMakeFlags;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
doCheck = false; # "--disable-tests" above
|
||||
|
|
@ -322,6 +321,42 @@ buildStdenv.mkDerivation ({
|
|||
gappsWrapperArgs+=(--argv0 "$out/bin/.${binaryName}-wrapped")
|
||||
'';
|
||||
|
||||
# Workaround: The separateDebugInfo hook skips artifacts whose build ID's length is not 40.
|
||||
# But we got 16-length build ID here. The function body is mainly copied from pkgs/build-support/setup-hooks/separate-debug-info.sh
|
||||
# Remove it when PR #146275 is merged.
|
||||
preFixup = lib.optionalString enableDebugSymbols ''
|
||||
_separateDebugInfo() {
|
||||
[ -e "$prefix" ] || return 0
|
||||
|
||||
local dst="''${debug:-$out}"
|
||||
if [ "$prefix" = "$dst" ]; then return 0; fi
|
||||
|
||||
dst="$dst/lib/debug/.build-id"
|
||||
|
||||
# Find executables and dynamic libraries.
|
||||
local i
|
||||
while IFS= read -r -d $'\0' i; do
|
||||
if ! isELF "$i"; then continue; fi
|
||||
|
||||
# Extract the Build ID. FIXME: there's probably a cleaner way.
|
||||
local id="$($READELF -n "$i" | sed 's/.*Build ID: \([0-9a-f]*\).*/\1/; t; d')"
|
||||
if [[ -z "$id" ]]; then
|
||||
echo "could not find build ID of $i, skipping" >&2
|
||||
continue
|
||||
fi
|
||||
|
||||
# Extract the debug info.
|
||||
header "separating debug info from $i (build ID $id)"
|
||||
mkdir -p "$dst/''${id:0:2}"
|
||||
$OBJCOPY --only-keep-debug "$i" "$dst/''${id:0:2}/''${id:2}.debug"
|
||||
$STRIP --strip-debug "$i"
|
||||
|
||||
# Also a create a symlink <original-name>.debug.
|
||||
ln -sfn ".build-id/''${id:0:2}/''${id:2}.debug" "$dst/../$(basename "$i")"
|
||||
done < <(find "$prefix" -type f -print0)
|
||||
}
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
# Some basic testing
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://hmmer.org/";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.iimog ];
|
||||
platforms = platforms.unix;
|
||||
# at least SSE is *required*
|
||||
platforms = platforms.x86_64;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ let
|
|||
# source behind __linux__ check assumes system is also x86 and
|
||||
# tries to disable x86/x87-specific extended precision mode
|
||||
# https://github.com/sambayless/monosat/issues/33
|
||||
commonPostPatch = lib.optionalString (!(stdenv.isi686 || stdenv.isx86_64)) ''
|
||||
commonPostPatch = lib.optionalString (!stdenv.hostPlatform.isx86) ''
|
||||
substituteInPlace src/monosat/Main.cc \
|
||||
--replace 'defined(__linux__)' '0'
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ stdenv.mkDerivation rec {
|
|||
(useUnfreeCodecs && codecs != null && !crossBuild)
|
||||
"--codecsdir=${codecs}"
|
||||
++ optional
|
||||
((stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) && !crossBuild)
|
||||
(stdenv.hostPlatform.isx86 && !crossBuild)
|
||||
"--enable-runtime-cpudetection"
|
||||
++ optional fribidiSupport "--enable-fribidi"
|
||||
++ optional stdenv.isLinux "--enable-vidix"
|
||||
|
|
|
|||
|
|
@ -151,6 +151,7 @@
|
|||
cpan = [
|
||||
"https://cpan.metacpan.org/"
|
||||
"https://cpan.perl.org/"
|
||||
"https://mirrors.kernel.org/CPAN/"
|
||||
"https://backpan.perl.org/" # for old releases
|
||||
];
|
||||
|
||||
|
|
@ -171,6 +172,7 @@
|
|||
debian = [
|
||||
"https://httpredir.debian.org/debian/"
|
||||
"https://ftp.debian.org/debian/"
|
||||
"https://mirrors.edge.kernel.org/debian/"
|
||||
"ftp://ftp.de.debian.org/debian/"
|
||||
"ftp://ftp.fr.debian.org/debian/"
|
||||
"ftp://ftp.nl.debian.org/debian/"
|
||||
|
|
@ -183,6 +185,7 @@
|
|||
ubuntu = [
|
||||
"https://nl.archive.ubuntu.com/ubuntu/"
|
||||
"https://old-releases.ubuntu.com/ubuntu/"
|
||||
"https://mirrors.edge.kernel.org/ubuntu/"
|
||||
"http://de.archive.ubuntu.com/ubuntu/"
|
||||
"http://archive.ubuntu.com/ubuntu/"
|
||||
];
|
||||
|
|
@ -206,6 +209,7 @@
|
|||
"https://ftp.funet.fi/pub/linux/mirrors/opensuse/distribution/"
|
||||
"https://ftp.opensuse.org/pub/opensuse/distribution/"
|
||||
"https://ftp5.gwdg.de/pub/opensuse/discontinued/distribution/"
|
||||
"https://mirrors.edge.kernel.org/opensuse/distribution/"
|
||||
"http://ftp.hosteurope.de/mirror/ftp.opensuse.org/discontinued/"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -749,7 +749,7 @@ rec {
|
|||
{ package,
|
||||
command ? "${package.meta.mainProgram or package.pname or package.name} --version",
|
||||
version ? package.version,
|
||||
}: runCommand "test-version" { nativeBuildInputs = [ package ]; meta.timeout = 60; } ''
|
||||
}: runCommand "${package.name}-test-version" { nativeBuildInputs = [ package ]; meta.timeout = 60; } ''
|
||||
${command} |& grep -Fw ${version}
|
||||
touch $out
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, storeDir ? builtins.storeDir
|
||||
, rootModules ?
|
||||
[ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" ]
|
||||
++ pkgs.lib.optional (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) "rtc_cmos"
|
||||
++ pkgs.lib.optional pkgs.stdenv.hostPlatform.isx86 "rtc_cmos"
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
withFwupd = stdenv.isx86_64 || stdenv.isi686;
|
||||
withFwupd = stdenv.hostPlatform.isx86;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
useX11 = stdenv.isi686 || stdenv.isx86_64;
|
||||
useX11 = stdenv.hostPlatform.isx86;
|
||||
x11deps = [ libX11 xorgproto ];
|
||||
inherit (lib) optionals;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
{ lib, stdenv, fetchurl, fetchpatch, writeText, sbclBootstrap
|
||||
, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
|
||||
, threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.hostPlatform.system || "aarch64-darwin" == stdenv.hostPlatform.system)
|
||||
, linkableRuntime ? (stdenv.isi686 || stdenv.isx86_64)
|
||||
, threadSupport ? (stdenv.hostPlatform.isx86 || "aarch64-linux" == stdenv.hostPlatform.system || "aarch64-darwin" == stdenv.hostPlatform.system)
|
||||
, linkableRuntime ? stdenv.hostPlatform.isx86
|
||||
, disableImmobileSpace ? false
|
||||
# Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die.
|
||||
# Note that the created binaries still need `patchelf --set-interpreter ...`
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
, libffcall
|
||||
, coreutils
|
||||
# build options
|
||||
, threadSupport ? (stdenv.isi686 || stdenv.isx86_64)
|
||||
, x11Support ? (stdenv.isi686 || stdenv.isx86_64)
|
||||
, threadSupport ? stdenv.hostPlatform.isx86
|
||||
, x11Support ? stdenv.hostPlatform.isx86
|
||||
, dllSupport ? true
|
||||
, withModules ? [
|
||||
"pcre"
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@
|
|||
, libffi, libffcall, automake
|
||||
, coreutils
|
||||
# build options
|
||||
, threadSupport ? (stdenv.isi686 || stdenv.isx86_64)
|
||||
, x11Support ? (stdenv.isi686 || stdenv.isx86_64)
|
||||
, threadSupport ? stdenv.hostPlatform.isx86
|
||||
, x11Support ? stdenv.hostPlatform.isx86
|
||||
, dllSupport ? true
|
||||
, withModules ? [
|
||||
"pcre"
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ SDL2 ]
|
||||
++ lib.optional stdenv.isDarwin darwin.libobjc;
|
||||
|
||||
configureFlags = [(if stdenv.isi686 || stdenv.isx86_64 then "--enable-mmx" else "--disable-mmx")]
|
||||
configureFlags = [(if stdenv.hostPlatform.isx86 then "--enable-mmx" else "--disable-mmx")]
|
||||
++ lib.optional stdenv.isDarwin "--disable-sdltest";
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@ stdenv.mkDerivation ({
|
|||
"--enable-bind-now"
|
||||
(lib.withFeatureAs withLinuxHeaders "headers" "${linuxHeaders}/include")
|
||||
(lib.enableFeature profilingLibraries "profile")
|
||||
] ++ lib.optionals (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isAarch64) [
|
||||
] ++ lib.optionals (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64) [
|
||||
# This feature is currently supported on
|
||||
# i386, x86_64 and x32 with binutils 2.29 or later,
|
||||
# and on aarch64 with binutils 2.30 or later.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gettext
|
||||
{ lib, stdenv, fetchFromGitHub, buildPackages
|
||||
, autoreconfHook, pkg-config, gettext
|
||||
, libusb1
|
||||
, libtool
|
||||
, libexif
|
||||
, libgphoto2
|
||||
, libjpeg
|
||||
}:
|
||||
|
||||
|
|
@ -16,17 +18,17 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-c7fBl6GBLAU+RL5WFC4PL+n/nEHZUfqIJ9qq1+qNNCg=";
|
||||
};
|
||||
|
||||
patches = [];
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
gettext
|
||||
libtool
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libjpeg
|
||||
libtool # for libltdl
|
||||
libusb1
|
||||
];
|
||||
|
||||
|
|
@ -35,9 +37,16 @@ stdenv.mkDerivation rec {
|
|||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
postInstall = ''
|
||||
postInstall = let
|
||||
executablePrefix = if stdenv.buildPlatform == stdenv.hostPlatform then
|
||||
"$out"
|
||||
else
|
||||
buildPackages.libgphoto2;
|
||||
in ''
|
||||
mkdir -p $out/lib/udev/rules.d
|
||||
$out/lib/libgphoto2/print-camera-list udev-rules version 175 group camera >$out/lib/udev/rules.d/40-gphoto2.rules
|
||||
${executablePrefix}/lib/libgphoto2/print-camera-list \
|
||||
udev-rules version 175 group camera \
|
||||
>$out/lib/udev/rules.d/40-gphoto2.rules
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
patchShebangs ./configure
|
||||
'';
|
||||
|
||||
configureFlags = lib.optionals (!stdenv.isi686 && !stdenv.isx86_64) [ "--disable-sse" ];
|
||||
configureFlags = lib.optionals (!stdenv.hostPlatform.isx86) [ "--disable-sse" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://pngquant.org/lib/";
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ libconfuse ];
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
description = "Lightweight library of frog DNA";
|
||||
longDescription = ''
|
||||
Libite is a lightweight library of frog DNA. It can be used to fill
|
||||
|
|
@ -29,7 +28,8 @@ stdenv.mkDerivation rec {
|
|||
_SAFE macros in the BSD sys/queue.h API — highly recommended when
|
||||
traversing lists to delete/free nodes.
|
||||
'';
|
||||
platforms = platforms.unix;
|
||||
homepage = "https://github.com/troglobit/libite";
|
||||
platforms = with platforms; linux ++ netbsd;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
license = with licenses; [ mit isc bsd2 bsd3 ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://www.freedesktop.org/wiki/Software/kmscon/libtsm/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
platforms = with platforms; unix;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
# External libyamlcpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517
|
||||
"-DUSE_EXTERNAL_YAML=OFF"
|
||||
] ++ lib.optional stdenv.isDarwin "-DOCIO_USE_BOOST_PTR=ON"
|
||||
++ lib.optional (!stdenv.hostPlatform.isi686 && !stdenv.hostPlatform.isx86_64) "-DOCIO_USE_SSE=OFF";
|
||||
++ lib.optional (!stdenv.hostPlatform.isx86) "-DOCIO_USE_SSE=OFF";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $bin/bin; mv $out/bin $bin/
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# remove attempt to prevent (x86/x87-specific) extended precision use
|
||||
# when SSE not detected
|
||||
postPatch = lib.optionalString (!(stdenv.isi686 || stdenv.isx86_64)) ''
|
||||
postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) ''
|
||||
sed -i '/-ffloat-store/d' cmake/pcl_find_sse.cmake
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optional (!stdenv.isi686) "--enable-pic"
|
||||
++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--cross-prefix=${stdenv.cc.targetPrefix}";
|
||||
|
||||
nativeBuildInputs = lib.optional (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isi686) nasm;
|
||||
nativeBuildInputs = lib.optional stdenv.hostPlatform.isx86 nasm;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for encoding H264/AVC video streams";
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "casbin";
|
||||
version = "1.9.7";
|
||||
version = "1.11.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = "pycasbin";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wNygKs37PtMLij3f+pAh6PNLqQ45cvrpF43Aj+cO8p8=";
|
||||
sha256 = "sha256-gFGYpHd1kp4JMtoe47VbJ0uDnuGQegggbjXaw6nEMR4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,18 +8,22 @@
|
|||
, pillow
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, pythonOlder
|
||||
, voluptuous
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "env-canada";
|
||||
version = "0.5.16";
|
||||
version = "0.5.17";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "michaeldavie";
|
||||
repo = "env_canada";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5Cxpl5iwbBtpwQ9//yhEZNCIzBZgTm/fqAo9PNNxoG4=";
|
||||
sha256 = "sha256-viuBuyGzAUcfb4qSecZsDvoAU++FNhuwNJET/s0qyOI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -49,7 +53,9 @@ buildPythonPackage rec {
|
|||
"test_ecradar"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "env_canada" ];
|
||||
pythonImportsCheck = [
|
||||
"env_canada"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to get Environment Canada weather data";
|
||||
|
|
|
|||
|
|
@ -7,8 +7,9 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flux_led";
|
||||
version = "0.24.24";
|
||||
pname = "flux-led";
|
||||
version = "0.24.25";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -16,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "Danielhiversen";
|
||||
repo = "flux_led";
|
||||
rev = version;
|
||||
sha256 = "sha256-99EHmhyc6lAjYPHFvvqnd5r8HeEEJM6W3VK0/yLsz7I=";
|
||||
sha256 = "sha256-HhoqsdaqNKdKH63glYEl5mRBFImu6Nxw5gwF7JAJABk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,6 +12,10 @@ buildPythonPackage rec {
|
|||
sha256 = "0pfqfr5xqgsqkxzrmj8xl2glyl4nbq0irs0k6ik7iy3gd3mxf5g1";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace '"pytest-runner"' ""
|
||||
'';
|
||||
|
||||
buildInputs = [ keyutils ];
|
||||
checkInputs = [ pytest pytest-runner ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,25 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oath";
|
||||
version = "1.4.3";
|
||||
version = "1.4.4";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1xqgcqgx6aa0j21hwsdb3aqpqhviwj756bcqjjjcm1h1aij11p6m";
|
||||
sha256 = "sha256-vWsg0g8sTj9TUj7pACEdynWu7KcvT1qf2NyswXX+HAs=";
|
||||
};
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"oath"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python implementation of the three main OATH specifications: HOTP, TOTP and OCRA";
|
||||
|
|
|
|||
|
|
@ -8,14 +8,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyads";
|
||||
version = "3.3.8";
|
||||
disabled = pythonOlder "3.6";
|
||||
version = "3.3.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stlehmann";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-jhEVBndUOKM8rBX0LEqPTMLqbpizCiD7T+OCzbVgLM8=";
|
||||
sha256 = "sha256-eNouFJQDgp56fgkA7wZKfosKWOKU6OvXRjFwjCMvZqI=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -31,7 +33,9 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyads" ];
|
||||
pythonImportsCheck = [
|
||||
"pyads"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python wrapper for TwinCAT ADS library";
|
||||
|
|
|
|||
|
|
@ -15,6 +15,11 @@ buildPythonPackage rec {
|
|||
sha256 = "13x3718if28l50474xrz1b9709kvnvdg3nzm6y8bh7mc9a4zyss5";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace unittests.py \
|
||||
--replace '(tmp, "test.dat")' "(\"$TMPDIR\", \"test.dat\")"
|
||||
'';
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pytestFlagsArray = [ "unittests.py" ];
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user