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

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source
This commit is contained in:
K900
2025-04-29 10:19:50 +03:00
parent 87f1602a02 0344f99dd4
commit 300fb309b3
25 changed files with 206 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/installer/sd-card/sd-image.nix
+1 -1
View File
@@ -185,7 +185,7 @@ in
config = {
hardware.enableAllHardware = true;
fileSystems = lib.mkImageMediaOverride {
fileSystems = {
"/boot/firmware" = {
device = "/dev/disk/by-label/${config.sdImage.firmwarePartitionName}";
fsType = "vfat";
nixos/modules/virtualisation/azure-image.nix
+1 -1
View File
@@ -113,7 +113,7 @@ in
'';
};
fileSystems = lib.mkImageMediaOverride {
fileSystems = {
"/" = {
device = "/dev/disk/by-label/${cfg.label}";
inherit (cfg) label;
nixos/modules/virtualisation/digital-ocean-config.nix
+1 -1
View File
@@ -39,7 +39,7 @@ with lib;
in
mkMerge [
{
fileSystems."/" = lib.mkImageMediaOverride {
fileSystems."/" = lib.mkDefault {
device = "/dev/disk/by-label/nixos";
autoResize = true;
fsType = "ext4";
nixos/modules/virtualisation/disk-image.nix
+1 -1
View File
@@ -37,7 +37,7 @@ in
boot.loader.systemd-boot.enable = lib.mkDefault cfg.efiSupport;
boot.growPartition = lib.mkDefault true;
fileSystems = lib.mkImageMediaOverride {
fileSystems = {
"/" = {
device = "/dev/disk/by-label/nixos";
autoResize = true;
nixos/modules/virtualisation/google-compute-config.nix
+1 -1
View File
@@ -21,7 +21,7 @@ in
../profiles/qemu-guest.nix
];
fileSystems."/" = lib.mkImageMediaOverride {
fileSystems."/" = {
fsType = "ext4";
device = "/dev/disk/by-label/nixos";
autoResize = true;
nixos/modules/virtualisation/hyperv-image.nix
+8 -10
View File
@@ -73,17 +73,15 @@ in
inherit config lib pkgs;
};
fileSystems = lib.mkImageMediaOverride {
"/" = {
device = "/dev/disk/by-label/nixos";
autoResize = true;
fsType = "ext4";
};
fileSystems."/" = {
device = "/dev/disk/by-label/nixos";
autoResize = true;
fsType = "ext4";
};
"/boot" = {
device = "/dev/disk/by-label/ESP";
fsType = "vfat";
};
fileSystems."/boot" = {
device = "/dev/disk/by-label/ESP";
fsType = "vfat";
};
boot.growPartition = true;
nixos/modules/virtualisation/kubevirt.nix
+1 -1
View File
@@ -12,7 +12,7 @@
];
config = {
fileSystems."/" = lib.mkImageMediaOverride {
fileSystems."/" = {
device = "/dev/disk/by-label/nixos";
fsType = "ext4";
autoResize = true;
nixos/modules/virtualisation/linode-config.nix
+5 -3
View File
@@ -1,8 +1,10 @@
{
config,
lib,
pkgs,
...
}:
with lib;
{
imports = [ ../profiles/qemu-guest.nix ];
@@ -10,7 +12,7 @@
enable = true;
settings.PermitRootLogin = "prohibit-password";
settings.PasswordAuthentication = lib.mkDefault false;
settings.PasswordAuthentication = mkDefault false;
};
networking = {
@@ -32,13 +34,13 @@
sysstat
];
fileSystems."/" = lib.mkImageMediaOverride {
fileSystems."/" = {
fsType = "ext4";
device = "/dev/sda";
autoResize = true;
};
swapDevices = lib.mkDefault [ { device = "/dev/sdb"; } ];
swapDevices = mkDefault [ { device = "/dev/sdb"; } ];
# Enable LISH and Linode Booting w/ GRUB
boot = {
nixos/modules/virtualisation/oci-common.nix
+8 -10
View File
@@ -30,17 +30,15 @@ in
boot.growPartition = true;
fileSystems = lib.mkImageMediaOverride {
"/" = {
device = "/dev/disk/by-label/nixos";
fsType = "ext4";
autoResize = true;
};
fileSystems."/" = {
device = "/dev/disk/by-label/nixos";
fsType = "ext4";
autoResize = true;
};
"/boot" = lib.mkIf cfg.efi {
device = "/dev/disk/by-label/ESP";
fsType = "vfat";
};
fileSystems."/boot" = lib.mkIf cfg.efi {
device = "/dev/disk/by-label/ESP";
fsType = "vfat";
};
boot.loader.efi.canTouchEfiVariables = false;
nixos/modules/virtualisation/openstack-config.nix
+11 -15
View File
@@ -33,22 +33,18 @@ in
];
config = {
fileSystems."/" = mkIf (!cfg.zfs.enable) (
lib.mkImageMediaOverride {
device = "/dev/disk/by-label/nixos";
fsType = "ext4";
autoResize = true;
}
);
fileSystems."/" = mkIf (!cfg.zfs.enable) {
device = "/dev/disk/by-label/nixos";
fsType = "ext4";
autoResize = true;
};
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";
}
);
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";
};
boot.growPartition = true;
boot.kernelParams = [ "console=tty1" ];
nixos/modules/virtualisation/openstack-options.nix
+7 -9
View File
@@ -70,14 +70,12 @@ in
_: value: ((value.mount or null) != null)
) config.openstack.zfs.datasets;
in
lib.mkImageMediaOverride (
lib.mapAttrs' (
dataset: opts:
lib.nameValuePair opts.mount {
device = dataset;
fsType = "zfs";
}
) mountable
);
lib.mapAttrs' (
dataset: opts:
lib.nameValuePair opts.mount {
device = dataset;
fsType = "zfs";
}
) mountable;
};
}
nixos/modules/virtualisation/proxmox-image.nix
+9 -17
View File
@@ -306,13 +306,7 @@ with lib;
''
${vma}/bin/vma create "${config.image.baseName}.vma" \
-c ${
cfgFile "qemu-server.conf" (
(builtins.removeAttrs cfg.qemuConf [ "diskSize" ])
// {
inherit (config.virtualisation) diskSize;
}
// cfg.qemuExtraConf
)
cfgFile "qemu-server.conf" (cfg.qemuConf // cfg.qemuExtraConf)
}/qemu-server.conf drive-virtio0=$diskImage
rm $diskImage
${pkgs.zstd}/bin/zstd "${config.image.baseName}.vma"
@@ -352,16 +346,14 @@ with lib;
];
};
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";
};
fileSystems."/" = {
device = "/dev/disk/by-label/nixos";
autoResize = true;
fsType = "ext4";
};
fileSystems."/boot" = lib.mkIf hasBootPartition {
device = "/dev/disk/by-label/ESP";
fsType = "vfat";
};
networking = mkIf cfg.cloudInit.enable {
nixos/modules/virtualisation/virtualbox-image.nix
+1 -1
View File
@@ -275,7 +275,7 @@ in
};
fileSystems =
lib.mkImageMediaOverride {
{
"/" = {
device = "/dev/disk/by-label/nixos";
autoResize = true;
nixos/modules/virtualisation/vmware-image.nix
+8 -10
View File
@@ -83,17 +83,15 @@ in
inherit config lib pkgs;
};
fileSystems = lib.mkImageMediaOverride {
"/" = {
device = "/dev/disk/by-label/nixos";
autoResize = true;
fsType = "ext4";
};
fileSystems."/" = {
device = "/dev/disk/by-label/nixos";
autoResize = true;
fsType = "ext4";
};
"/boot" = {
device = "/dev/disk/by-label/ESP";
fsType = "vfat";
};
fileSystems."/boot" = {
device = "/dev/disk/by-label/ESP";
fsType = "vfat";
};
boot.growPartition = true;
pkgs/by-name/ho/home-manager/package.nix
+3 -3
View File
@@ -19,14 +19,14 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "home-manager";
version = "0-unstable-2025-04-19";
version = "0-unstable-2025-04-28";
src = fetchFromGitHub {
name = "home-manager-source";
owner = "nix-community";
repo = "home-manager";
rev = "9676e8a52a177d80c8a42f66566362a6d74ecf78";
hash = "sha256-bvcatss0xodcdxXm0LUSLPd2jjrhqO3yFSu3stOfQXg=";
rev = "d0d9d0a1454d5a0200693570618084d80a8b336c";
hash = "sha256-B1FQwPCFLL3cbHc2nxT3/UI1uprHp2h1EA6M2JVe0oQ=";
};
nativeBuildInputs = [
pkgs/by-name/mu/mujoco/package.nix
+2 -2
View File
@@ -132,7 +132,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "mujoco";
version = "3.3.1";
version = "3.3.2";
# Bumping version? Make sure to look though the MuJoCo's commit
# history for bumped dependency pins!
@@ -140,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "google-deepmind";
repo = "mujoco";
tag = finalAttrs.version;
hash = "sha256-1bCB+z3Puo+AmdwEYy8v5+TJGBVk5xrN9rz+9I3h+r8=";
hash = "sha256-ftohDFsQv6/N82QjPONiQV/Hr7Eb1h2pFDwHaOOhJE0=";
};
patches = [ ./mujoco-system-deps-dont-fetch.patch ];
pkgs/by-name/su/suricata/package.nix
+4 -7
View File
@@ -8,7 +8,6 @@
makeWrapper,
elfutils,
file,
hyperscan,
jansson,
libbpf_0,
libcap_ng,
@@ -25,6 +24,7 @@
nspr,
pcre2,
python3,
vectorscan,
zlib,
redisSupport ? true,
valkey,
@@ -36,7 +36,6 @@
}:
let
libmagic = file;
hyperscanSupport = stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
in
stdenv.mkDerivation rec {
pname = "suricata";
@@ -83,9 +82,9 @@ stdenv.mkDerivation rec {
nspr
pcre2
python3
vectorscan
zlib
]
++ lib.optional hyperscanSupport hyperscan
++ lib.optionals redisSupport [
valkey
hiredis
@@ -121,13 +120,11 @@ stdenv.mkDerivation rec {
"--enable-unix-socket"
"--localstatedir=/var"
"--sysconfdir=/etc"
"--with-libhs-includes=${lib.getDev vectorscan}/include/hs"
"--with-libhs-libraries=${lib.getLib vectorscan}/lib"
"--with-libnet-includes=${libnet}/include"
"--with-libnet-libraries=${libnet}/lib"
]
++ lib.optionals hyperscanSupport [
"--with-libhs-includes=${hyperscan.dev}/include/hs"
"--with-libhs-libraries=${hyperscan}/lib"
]
++ lib.optional redisSupport "--enable-hiredis"
++ lib.optionals rustSupport [
"--enable-rust"
pkgs/development/compilers/temurin-bin/generate-sources.py
+1 -1
View File
@@ -6,7 +6,7 @@ import re
import requests
import sys
feature_versions = (8, 11, 17, 21, 23)
feature_versions = (8, 11, 17, 21, 23, 24)
oses = ("mac", "linux", "alpine-linux")
types = ("jre", "jdk")
impls = ("hotspot",)
pkgs/development/compilers/temurin-bin/jdk-darwin.nix
+3
View File
@@ -21,4 +21,7 @@ in
jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; };
jre-23 = common { sourcePerArch = sources.jre.openjdk23; };
jdk-24 = common { sourcePerArch = sources.jdk.openjdk24; };
jre-24 = common { sourcePerArch = sources.jre.openjdk24; };
}
pkgs/development/compilers/temurin-bin/jdk-linux.nix
+3
View File
@@ -26,4 +26,7 @@ in
jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; };
jre-23 = common { sourcePerArch = sources.jre.openjdk23; };
jdk-24 = common { sourcePerArch = sources.jdk.openjdk24; };
jre-24 = common { sourcePerArch = sources.jre.openjdk24; };
}
pkgs/development/compilers/temurin-bin/sources.json
+120
View File
@@ -54,6 +54,22 @@
"version": "23.0.2"
}
},
"openjdk24": {
"aarch64": {
"build": "36",
"sha256": "4a673456aa6e726b86108a095a21868b7ebcdde050a92b3073d50105ff92f07f",
"url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_aarch64_alpine-linux_hotspot_24_36.tar.gz",
"version": "24.0.0"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
"build": "36",
"sha256": "a642608f0da78344ee6812fb1490b8bc1d7ad5a18064c70994d6f330568c51cb",
"url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_x64_alpine-linux_hotspot_24_36.tar.gz",
"version": "24.0.0"
}
},
"openjdk8": {
"packageType": "jdk",
"vmType": "hotspot",
@@ -118,6 +134,22 @@
"version": "23.0.2"
}
},
"openjdk24": {
"aarch64": {
"build": "36",
"sha256": "0bc8181c7e85d55bba652503db62e60846439f279271d583b740ac70f9f5ae87",
"url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_aarch64_alpine-linux_hotspot_24_36.tar.gz",
"version": "24.0.0"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
"build": "36",
"sha256": "0f738719d0483d6fe7f08a1371d1c696d68dcfe39f073b4241673f35ffc8d655",
"url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_x64_alpine-linux_hotspot_24_36.tar.gz",
"version": "24.0.0"
}
},
"openjdk8": {
"packageType": "jre",
"vmType": "hotspot",
@@ -262,6 +294,34 @@
"version": "23.0.2"
}
},
"openjdk24": {
"aarch64": {
"build": "36",
"sha256": "18071047526ab4b53131f9bb323e8703485ae37fcb2f2c5ef0f1b7bab66d1b94",
"url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_aarch64_linux_hotspot_24_36.tar.gz",
"version": "24.0.0"
},
"packageType": "jdk",
"powerpc64le": {
"build": "36",
"sha256": "3a5641ab862a2bbae56886d4ec47f735052780bfe124df7aea2ca40e0f973b5a",
"url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_ppc64le_linux_hotspot_24_36.tar.gz",
"version": "24.0.0"
},
"riscv64": {
"build": "36",
"sha256": "a1d993ab0b4b80101ec2e2452bdd37735572b734c255576a47c5130eab55f09a",
"url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_riscv64_linux_hotspot_24_36.tar.gz",
"version": "24.0.0"
},
"vmType": "hotspot",
"x86_64": {
"build": "36",
"sha256": "c340dee97b6aa215d248bc196dcac5b56e7be9b5c5d45e691344d40d5d0b171d",
"url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_x64_linux_hotspot_24_36.tar.gz",
"version": "24.0.0"
}
},
"openjdk8": {
"aarch64": {
"build": "6",
@@ -428,6 +488,34 @@
"version": "23.0.2"
}
},
"openjdk24": {
"aarch64": {
"build": "36",
"sha256": "782a46008490272affe0b797155c2ae8e759e10c8ba4540f1f7285ef3d2902de",
"url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_aarch64_linux_hotspot_24_36.tar.gz",
"version": "24.0.0"
},
"packageType": "jre",
"powerpc64le": {
"build": "36",
"sha256": "e7c90ab80d5e9419f794aee63c8f1bf3ed29e656d4e8e967a45d3069bd643c07",
"url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_ppc64le_linux_hotspot_24_36.tar.gz",
"version": "24.0.0"
},
"riscv64": {
"build": "36",
"sha256": "3a670b2116cfc7e806ebccf6ad3b5601936581afc666587653c47e642c0acf19",
"url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_riscv64_linux_hotspot_24_36.tar.gz",
"version": "24.0.0"
},
"vmType": "hotspot",
"x86_64": {
"build": "36",
"sha256": "e8d8f5707d765a6bfca3de61320e0bb2618191c77947bc467ac5021e6193f351",
"url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_x64_linux_hotspot_24_36.tar.gz",
"version": "24.0.0"
}
},
"openjdk8": {
"aarch64": {
"build": "6",
@@ -530,6 +618,22 @@
"version": "23.0.2"
}
},
"openjdk24": {
"aarch64": {
"build": "36",
"sha256": "8e343d2aaa1d00fdee351d392a4a3f537d81fa4a36f5fdf05e2e2c26d5c50af9",
"url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_aarch64_mac_hotspot_24_36.tar.gz",
"version": "24.0.0"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
"build": "36",
"sha256": "07a99d4a81c4d5e0c4936bf4b9f901565213781c67e865f304a8d8eb75e880d8",
"url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_x64_mac_hotspot_24_36.tar.gz",
"version": "24.0.0"
}
},
"openjdk8": {
"packageType": "jdk",
"vmType": "hotspot",
@@ -606,6 +710,22 @@
"version": "23.0.2"
}
},
"openjdk24": {
"aarch64": {
"build": "36",
"sha256": "fa9783caf9298b7e927b4589435257cf9a2cf12e1eb915992911b988f3d310bc",
"url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_aarch64_mac_hotspot_24_36.tar.gz",
"version": "24.0.0"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
"build": "36",
"sha256": "10b2a32a5544c03a4bf36f12efc3a770bb789be20ff3c9edf85102c5879479de",
"url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_x64_mac_hotspot_24_36.tar.gz",
"version": "24.0.0"
}
},
"openjdk8": {
"packageType": "jre",
"vmType": "hotspot",
pkgs/development/python-modules/faraday-plugins/default.nix
+2 -2
View File
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "faraday-plugins";
version = "1.23.0";
version = "1.24.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "infobyte";
repo = "faraday_plugins";
tag = version;
hash = "sha256-EHXGn68GPtFrQZjj6IIEUrDe3PaszAB+mkQap0fcuX4=";
hash = "sha256-GADunGRBcVTnzYzBgXQH2IkDXHRSJiPsdeRBEdJJs0s=";
};
postPatch = ''
pkgs/development/python-modules/mujoco/default.nix
+1 -1
View File
@@ -38,7 +38,7 @@ buildPythonPackage rec {
# in the project's CI.
src = fetchPypi {
inherit pname version;
hash = "sha256-UhSjXBVngiwMi4DoZX6+KHJry5Tni9Uyg/+RfS2IECg=";
hash = "sha256-d3c8cU9XL25xqTe8OH96NsEp0JMv0kaWLD5qSP32u6w=";
};
nativeBuildInputs = [ cmake ];
pkgs/development/python-modules/streamz/default.nix
+1
View File
@@ -63,6 +63,7 @@ buildPythonPackage rec {
# Tests are flaky
"test_buffer"
"test_partition_timeout_cancel"
];
__darwinAllowLocalNetworking = true;
pkgs/top-level/all-packages.nix
+3
View File
@@ -5285,6 +5285,9 @@ with pkgs;
### DEVELOPMENT / COMPILERS
temurin-bin-24 = javaPackages.compiler.temurin-bin.jdk-24;
temurin-jre-bin-24 = javaPackages.compiler.temurin-bin.jre-24;
temurin-bin-23 = javaPackages.compiler.temurin-bin.jdk-23;
temurin-jre-bin-23 = javaPackages.compiler.temurin-bin.jre-23;