mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-29 03:10:19 +00:00
Merge staging-next-25.05 into staging-25.05
This commit is contained in:
nixpkgs-ci[bot]
@@ -524,7 +524,6 @@ in
|
||||
'';
|
||||
extraConfig = ''
|
||||
add_header X-Frame-Options "SAMEORIGIN";
|
||||
add_header X-XSS-Protection "1; mode=block";
|
||||
add_header X-Content-Type-Options "nosniff";
|
||||
index index.html index.htm index.php;
|
||||
error_page 404 /index.php;
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.boot.bcachefs;
|
||||
cfgScrub = config.services.bcachefs.autoScrub;
|
||||
|
||||
bootFs = lib.filterAttrs (
|
||||
n: fs: (fs.fsType == "bcachefs") && (utils.fsNeededForBoot fs)
|
||||
@@ -90,26 +92,62 @@ let
|
||||
mkUnits =
|
||||
prefix: name: fs:
|
||||
let
|
||||
mountUnit = "${utils.escapeSystemdPath (prefix + (lib.removeSuffix "/" fs.mountPoint))}.mount";
|
||||
device = firstDevice fs;
|
||||
deviceUnit = "${utils.escapeSystemdPath device}.device";
|
||||
parseTags =
|
||||
device:
|
||||
if lib.hasPrefix "LABEL=" device then
|
||||
"/dev/disk/by-label/" + lib.removePrefix "LABEL=" device
|
||||
else if lib.hasPrefix "UUID=" device then
|
||||
"/dev/disk/by-uuid/" + lib.removePrefix "UUID=" device
|
||||
else if lib.hasPrefix "PARTLABEL=" device then
|
||||
"/dev/disk/by-partlabel/" + lib.removePrefix "PARTLABEL=" device
|
||||
else if lib.hasPrefix "PARTUUID=" device then
|
||||
"/dev/disk/by-partuuid/" + lib.removePrefix "PARTUUID=" device
|
||||
else if lib.hasPrefix "ID=" device then
|
||||
"/dev/disk/by-id/" + lib.removePrefix "ID=" device
|
||||
else
|
||||
device;
|
||||
device = parseTags (firstDevice fs);
|
||||
mkDeviceUnit = device: "${utils.escapeSystemdPath device}.device";
|
||||
mkMountUnit = path: "${utils.escapeSystemdPath (lib.removeSuffix "/" path)}.mount";
|
||||
deviceUnit = mkDeviceUnit device;
|
||||
mountUnit = mkMountUnit (prefix + fs.mountPoint);
|
||||
extractProperty =
|
||||
prop: options: (map (lib.removePrefix prop) (builtins.filter (lib.hasPrefix prop) options));
|
||||
normalizeUnits =
|
||||
unit:
|
||||
if lib.hasPrefix "/dev/" unit then
|
||||
mkDeviceUnit unit
|
||||
else if lib.hasPrefix "/" unit then
|
||||
mkMountUnit unit
|
||||
else
|
||||
unit;
|
||||
requiredUnits = map normalizeUnits (extractProperty "x-systemd.requires=" fs.options);
|
||||
wantedUnits = map normalizeUnits (extractProperty "x-systemd.wants=" fs.options);
|
||||
requiredMounts = extractProperty "x-systemd.requires-mounts-for=" fs.options;
|
||||
wantedMounts = extractProperty "x-systemd.wants-mounts-for=" fs.options;
|
||||
in
|
||||
{
|
||||
name = "unlock-bcachefs-${utils.escapeSystemdPath fs.mountPoint}";
|
||||
value = {
|
||||
description = "Unlock bcachefs for ${fs.mountPoint}";
|
||||
requiredBy = [ mountUnit ];
|
||||
after = [ deviceUnit ];
|
||||
after = [ deviceUnit ] ++ requiredUnits ++ wantedUnits;
|
||||
before = [
|
||||
mountUnit
|
||||
"shutdown.target"
|
||||
];
|
||||
bindsTo = [ deviceUnit ];
|
||||
requires = requiredUnits;
|
||||
wants = wantedUnits;
|
||||
unitConfig = {
|
||||
RequiresMountsFor = requiredMounts;
|
||||
WantsMountsFor = wantedMounts;
|
||||
};
|
||||
conflicts = [ "shutdown.target" ];
|
||||
unitConfig.DefaultDependencies = false;
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
ExecCondition = "${pkgs.bcachefs-tools}/bin/bcachefs unlock -c \"${device}\"";
|
||||
ExecCondition = "${cfg.package}/bin/bcachefs unlock -c \"${device}\"";
|
||||
Restart = "on-failure";
|
||||
RestartMode = "direct";
|
||||
# Ideally, this service would lock the key on stop.
|
||||
@@ -118,7 +156,7 @@ let
|
||||
};
|
||||
script =
|
||||
let
|
||||
unlock = ''${pkgs.bcachefs-tools}/bin/bcachefs unlock "${device}"'';
|
||||
unlock = ''${cfg.package}/bin/bcachefs unlock "${device}"'';
|
||||
unlockInteractively = ''${config.boot.initrd.systemd.package}/bin/systemd-ask-password --timeout=0 "enter passphrase for ${name}" | exec ${unlock}'';
|
||||
in
|
||||
if useClevis fs then
|
||||
@@ -137,40 +175,94 @@ let
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
assertions = [
|
||||
{
|
||||
assertion =
|
||||
let
|
||||
kernel = config.boot.kernelPackages.kernel;
|
||||
in
|
||||
(
|
||||
kernel.kernelAtLeast "6.7"
|
||||
|| (lib.elem (kernel.structuredExtraConfig.BCACHEFS_FS or null) [
|
||||
lib.kernel.module
|
||||
lib.kernel.yes
|
||||
(lib.kernel.option lib.kernel.yes)
|
||||
])
|
||||
);
|
||||
|
||||
message = "Linux 6.7-rc1 at minimum or a custom linux kernel with bcachefs support is required";
|
||||
}
|
||||
];
|
||||
in
|
||||
|
||||
{
|
||||
options.boot.bcachefs = {
|
||||
package = lib.mkPackageOption pkgs "bcachefs-tools" {
|
||||
extraDescription = ''
|
||||
This package should also provide a passthru 'kernelModule'
|
||||
attribute to build the out-of-tree kernel module.
|
||||
'';
|
||||
};
|
||||
|
||||
modulePackage = lib.mkOption {
|
||||
type = lib.types.package;
|
||||
# See NOTE in linux-kernels.nix
|
||||
default = config.boot.kernelPackages.callPackage cfg.package.kernelModule { };
|
||||
internal = true;
|
||||
};
|
||||
};
|
||||
|
||||
options.services.bcachefs.autoScrub = {
|
||||
enable = lib.mkEnableOption "regular bcachefs scrub";
|
||||
|
||||
fileSystems = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.path;
|
||||
example = [ "/" ];
|
||||
description = ''
|
||||
List of paths to bcachefs filesystems to regularly call {command}`bcachefs scrub` on.
|
||||
Defaults to all mount points with bcachefs filesystems.
|
||||
'';
|
||||
};
|
||||
|
||||
interval = lib.mkOption {
|
||||
default = "monthly";
|
||||
type = lib.types.str;
|
||||
example = "weekly";
|
||||
description = ''
|
||||
Systemd calendar expression for when to scrub bcachefs filesystems.
|
||||
The recommended period is a month but could be less.
|
||||
See
|
||||
{manpage}`systemd.time(7)`
|
||||
for more information on the syntax.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf (config.boot.supportedFilesystems.bcachefs or false) (
|
||||
lib.mkMerge [
|
||||
{
|
||||
inherit assertions;
|
||||
# needed for systemd-remount-fs
|
||||
system.fsPackages = [ pkgs.bcachefs-tools ];
|
||||
# FIXME: Remove this line when the LTS (default) kernel is at least version 6.7
|
||||
assertions = [
|
||||
{
|
||||
assertion =
|
||||
let
|
||||
kernel = config.boot.kernelPackages.kernel;
|
||||
in
|
||||
(
|
||||
kernel.kernelAtLeast "6.7"
|
||||
|| (lib.elem (kernel.structuredExtraConfig.BCACHEFS_FS or null) [
|
||||
lib.kernel.module
|
||||
lib.kernel.yes
|
||||
(lib.kernel.option lib.kernel.yes)
|
||||
])
|
||||
);
|
||||
|
||||
message = "Linux 6.7-rc1 at minimum or a custom linux kernel with bcachefs support is required";
|
||||
}
|
||||
];
|
||||
|
||||
warnings = lib.mkIf cfg.modulePackage.meta.broken [
|
||||
''
|
||||
Using unmaintained in-tree bcachefs kernel module. This
|
||||
will be removed in 26.05. Please use a kernel supported
|
||||
by the out-of-tree module package.
|
||||
''
|
||||
];
|
||||
|
||||
# Bcachefs upstream recommends using the latest kernel
|
||||
boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
|
||||
services.udev.packages = [ pkgs.bcachefs-tools ];
|
||||
|
||||
# needed for systemd-remount-fs
|
||||
system.fsPackages = [ cfg.package ];
|
||||
services.udev.packages = [ cfg.package ];
|
||||
|
||||
boot.extraModulePackages = lib.optionals (!cfg.modulePackage.meta.broken) [
|
||||
cfg.modulePackage
|
||||
];
|
||||
|
||||
systemd = {
|
||||
packages = [ pkgs.bcachefs-tools ];
|
||||
packages = [ cfg.package ];
|
||||
services = lib.mapAttrs' (mkUnits "") (
|
||||
lib.filterAttrs (n: fs: (fs.fsType == "bcachefs") && (!utils.fsNeededForBoot fs)) config.fileSystems
|
||||
);
|
||||
@@ -178,7 +270,6 @@ in
|
||||
}
|
||||
|
||||
(lib.mkIf ((config.boot.initrd.supportedFilesystems.bcachefs or false) || (bootFs != { })) {
|
||||
inherit assertions;
|
||||
boot.initrd.availableKernelModules = [
|
||||
"bcachefs"
|
||||
"sha256"
|
||||
@@ -192,12 +283,12 @@ in
|
||||
];
|
||||
boot.initrd.systemd.extraBin = {
|
||||
# do we need this? boot/systemd.nix:566 & boot/systemd/initrd.nix:357
|
||||
"bcachefs" = "${pkgs.bcachefs-tools}/bin/bcachefs";
|
||||
"mount.bcachefs" = "${pkgs.bcachefs-tools}/bin/mount.bcachefs";
|
||||
"bcachefs" = "${cfg.package}/bin/bcachefs";
|
||||
"mount.bcachefs" = "${cfg.package}/bin/mount.bcachefs";
|
||||
};
|
||||
boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) ''
|
||||
copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/bcachefs
|
||||
copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/mount.bcachefs
|
||||
copy_bin_and_libs ${cfg.package}/bin/bcachefs
|
||||
copy_bin_and_libs ${cfg.package}/bin/mount.bcachefs
|
||||
'';
|
||||
boot.initrd.extraUtilsCommandsTest = lib.mkIf (!config.boot.initrd.systemd.enable) ''
|
||||
$out/bin/bcachefs version
|
||||
@@ -209,6 +300,95 @@ in
|
||||
|
||||
boot.initrd.systemd.services = lib.mapAttrs' (mkUnits "/sysroot") bootFs;
|
||||
})
|
||||
|
||||
(lib.mkIf (cfgScrub.enable) {
|
||||
assertions = [
|
||||
{
|
||||
assertion = lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.14";
|
||||
message = "Bcachefs scrubbing is supported from kernel version 6.14 or later.";
|
||||
}
|
||||
{
|
||||
assertion = cfgScrub.enable -> (cfgScrub.fileSystems != [ ]);
|
||||
message = ''
|
||||
If 'services.bcachefs.autoScrub' is enabled, you need to have at least one
|
||||
bcachefs file system mounted via 'fileSystems' or specify a list manually
|
||||
in 'services.bcachefs.autoScrub.fileSystems'.
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
# This will remove duplicated units from either having a filesystem mounted multiple
|
||||
# time, or additionally mounted subvolumes, as well as having a filesystem span
|
||||
# multiple devices (provided the same device is used to mount said filesystem).
|
||||
services.bcachefs.autoScrub.fileSystems =
|
||||
let
|
||||
isDeviceInList = list: device: builtins.filter (e: e.device == device) list != [ ];
|
||||
|
||||
uniqueDeviceList = lib.foldl' (
|
||||
acc: e: if isDeviceInList acc e.device then acc else acc ++ [ e ]
|
||||
) [ ];
|
||||
in
|
||||
lib.mkDefault (
|
||||
map (e: e.mountPoint) (
|
||||
uniqueDeviceList (
|
||||
lib.mapAttrsToList (name: fs: {
|
||||
mountPoint = fs.mountPoint;
|
||||
device = fs.device;
|
||||
}) (lib.filterAttrs (name: fs: fs.fsType == "bcachefs") config.fileSystems)
|
||||
)
|
||||
)
|
||||
);
|
||||
|
||||
systemd.timers =
|
||||
let
|
||||
scrubTimer =
|
||||
fs:
|
||||
let
|
||||
fs' = if fs == "/" then "root" else utils.escapeSystemdPath fs;
|
||||
in
|
||||
lib.nameValuePair "bcachefs-scrub-${fs'}" {
|
||||
description = "regular bcachefs scrub timer on ${fs}";
|
||||
|
||||
wantedBy = [ "timers.target" ];
|
||||
timerConfig = {
|
||||
OnCalendar = cfgScrub.interval;
|
||||
AccuracySec = "1d";
|
||||
Persistent = true;
|
||||
};
|
||||
};
|
||||
in
|
||||
lib.listToAttrs (map scrubTimer cfgScrub.fileSystems);
|
||||
|
||||
systemd.services =
|
||||
let
|
||||
scrubService =
|
||||
fs:
|
||||
let
|
||||
fs' = if fs == "/" then "root" else utils.escapeSystemdPath fs;
|
||||
in
|
||||
lib.nameValuePair "bcachefs-scrub-${fs'}" {
|
||||
description = "bcachefs scrub on ${fs}";
|
||||
# scrub prevents suspend2ram or proper shutdown
|
||||
conflicts = [
|
||||
"shutdown.target"
|
||||
"sleep.target"
|
||||
];
|
||||
before = [
|
||||
"shutdown.target"
|
||||
"sleep.target"
|
||||
];
|
||||
|
||||
script = "${lib.getExe cfg.package} data scrub ${fs}";
|
||||
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
Nice = 19;
|
||||
IOSchedulingClass = "idle";
|
||||
};
|
||||
};
|
||||
in
|
||||
lib.listToAttrs (map scrubService cfgScrub.fileSystems);
|
||||
})
|
||||
]
|
||||
);
|
||||
|
||||
|
||||
@@ -85,13 +85,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.2-3";
|
||||
version = "7.1.2-5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-L4apUdF1VJXSVqWAyjYFG/4qDJoJ0ObmSOpd90kqXsU=";
|
||||
hash = "sha256-THStvhNWu4OYotzxksGJ6l6VeTVRNoJeKoRG1LaJhNI=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -808,7 +808,7 @@
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "141.0.7390.54",
|
||||
"version": "141.0.7390.65",
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
"rev": "3f41e54ae17d53d4a39feecad64c3d3e6871b219",
|
||||
@@ -820,16 +820,16 @@
|
||||
"hash": "sha256-WERLGrReUATmn3RhxtmyZcJBxdIY/WZqBDranCLDYEg="
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "141.0.7390.54-1",
|
||||
"hash": "sha256-Lu74ipJFj194vDPHmIXQ9FyPvexTNdbKJ/SlLZpW4B8="
|
||||
"rev": "141.0.7390.65-1",
|
||||
"hash": "sha256-xjfr2nSoytbbAEQg9WkWQCp4TuPadrBx8JSxJzjPZMI="
|
||||
},
|
||||
"npmHash": "sha256-i1eQ4YlrWSgY522OlFtGDDPmxE2zd1hDM03AzR8RafE="
|
||||
},
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "b95610d5c4a562d9cd834bc0a098d3316e2f533f",
|
||||
"hash": "sha256-jraDPodJBdyFFHS30BcQTZOEUD+h9SFHQrO0GoMhtk8=",
|
||||
"rev": "b2ec783d2b51a396804a4e3e33f6586be09a4e2d",
|
||||
"hash": "sha256-9jZ7411NThelyL0R5yoLXB0lOkydOI3v6K5ORhjqfF4=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
@@ -1059,8 +1059,8 @@
|
||||
},
|
||||
"src/third_party/devtools-frontend/src": {
|
||||
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
|
||||
"rev": "65f160d43dc97a2e8eb5e1c2814179a519313884",
|
||||
"hash": "sha256-VLMJ/WWCIzk92mmuBdx+P6Gi0ouiXuMGkiR0KVK5GWI="
|
||||
"rev": "9c2c4cc7cf6c82ad460e1f3b49f34bb702d5fe11",
|
||||
"hash": "sha256-qj1vR0FW2jiR2v18Nv8RqYgy/UEw2rgGUsQ68EhdHos="
|
||||
},
|
||||
"src/third_party/dom_distiller_js/dist": {
|
||||
"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"packageVersion": "143.0.3-1",
|
||||
"packageVersion": "143.0.4-1",
|
||||
"source": {
|
||||
"rev": "143.0.3-1",
|
||||
"hash": "sha256-0gOt8YEnyDcMHy+EdSi2MLtRZMnMzfeBBKiMa2QO3uQ="
|
||||
"rev": "143.0.4-1",
|
||||
"hash": "sha256-RyLz5se2AqXAmsa/MckiUgcBfRxZVVsrNg2L757qOuo="
|
||||
},
|
||||
"firefox": {
|
||||
"version": "143.0.3",
|
||||
"hash": "sha512-wJK9Oqx5+FaoBMkIt21AQJzgUrABdiaeowKbWjpohdTSHOJr12yeoTgn/3VFm2tLBWb1qkkDWsI0rliQxnhFsA=="
|
||||
"version": "143.0.4",
|
||||
"hash": "sha512-K8veTnLqQenMyYg2kBY1NQtdx7UMYY4Zq2EDonrcDwF8o/p1VTeMivbuHzoU0Ck1KJ/isNNdhA1hD1rAeojktg=="
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -19,11 +19,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fossil";
|
||||
version = "2.26";
|
||||
version = "2.27";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.fossil-scm.org/home/tarball/version-${finalAttrs.version}/fossil-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-uzT3iOGB1MRQXWmtQNZWazOYiGH4kdtt/KJ6uVQrcqo=";
|
||||
hash = "sha256-1YVOgyNBDy/CeuVfrhE/D4LfQwv5uFfykoYwiZ3eFFY=";
|
||||
};
|
||||
|
||||
# required for build time tool `./tools/translate.c`
|
||||
@@ -55,6 +55,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
export USER=nonexistent-but-specified-user
|
||||
'';
|
||||
|
||||
# see https://fossil-scm.org/home/vinfo/4619d2efab946460?diff=1
|
||||
preCheck = ''
|
||||
mv test/settings.test test/settings.test.off
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
INSTALLDIR=$out/bin make install
|
||||
|
||||
48
pkgs/by-name/bc/bcachefs-tools/kernel-module.nix
Normal file
48
pkgs/by-name/bc/bcachefs-tools/kernel-module.nix
Normal file
@@ -0,0 +1,48 @@
|
||||
bcachefs-tools:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
kernelModuleMakeFlags,
|
||||
kernel,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "bcachefs";
|
||||
version = "${kernel.version}-${bcachefs-tools.version}";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = bcachefs-tools.dkms;
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
makeFlags = kernelModuleMakeFlags ++ [
|
||||
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
"INSTALL_MOD_PATH=${placeholder "out"}"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
make -C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build M=$(pwd) modules_install "''${makeFlags[@]}" "''${installFlags[@]}"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit (bcachefs-tools.passthru) tests;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "out-of-tree bcachefs kernel module";
|
||||
|
||||
inherit (bcachefs-tools.meta)
|
||||
homepage
|
||||
license
|
||||
maintainers
|
||||
platforms
|
||||
;
|
||||
|
||||
broken = !(lib.versionAtLeast kernel.version "6.16" && lib.versionOlder kernel.version "6.18");
|
||||
};
|
||||
}
|
||||
@@ -28,13 +28,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bcachefs-tools";
|
||||
version = "1.31.0";
|
||||
version = "1.31.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "koverstreet";
|
||||
repo = "bcachefs-tools";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wYlfU4PTcVSPSHbIIDbl8pBOJsBAAl44XBapwFZ528U=";
|
||||
hash = "sha256-9oiXMMrMMfu9VR0zSFM4yCAQaBgThDdEILSrxH9a84k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -64,19 +64,29 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
src = finalAttrs.src;
|
||||
hash = "sha256-ZCzw3cDpQ8fb2jLYdIWrmlNTPStikIs09jx6jzzC2vM=";
|
||||
hash = "sha256-E2d9uAaja6OsCMhmWFyqIVbGdad5fJ+tw3S7+X7YzpM=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dkms"
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"VERSION=${finalAttrs.version}"
|
||||
"INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools"
|
||||
"DKMSDIR=${placeholder "dkms"}"
|
||||
|
||||
# Tries to install to the 'systemd-minimal' and 'udev' nix installation paths
|
||||
"PKGCONFIG_SERVICEDIR=$(out)/lib/systemd/system"
|
||||
"PKGCONFIG_UDEVDIR=$(out)/lib/udev"
|
||||
]
|
||||
++ lib.optional fuseSupport "BCACHEFS_FUSE=1";
|
||||
installFlags = [
|
||||
"install"
|
||||
"install_dkms"
|
||||
];
|
||||
|
||||
env = {
|
||||
CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
|
||||
@@ -96,11 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" ];
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace $out/libexec/bcachefsck_all \
|
||||
--replace-fail "/usr/bin/python3" "${python3.interpreter}"
|
||||
''
|
||||
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd bcachefs \
|
||||
--bash <($out/sbin/bcachefs completions bash) \
|
||||
--zsh <($out/sbin/bcachefs completions zsh) \
|
||||
@@ -108,6 +114,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
# See NOTE in linux-kernels.nix
|
||||
kernelModule = import ./kernel-module.nix finalAttrs.finalPackage;
|
||||
|
||||
tests = {
|
||||
version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
|
||||
@@ -3,24 +3,24 @@
|
||||
|
||||
let
|
||||
pname = "brave";
|
||||
version = "1.83.109";
|
||||
version = "1.83.112";
|
||||
|
||||
allArchives = {
|
||||
aarch64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
|
||||
hash = "sha256-mbhJnNheLdFGto4AuXMW0Gfajo+lThE4qqT7kzNvUHU=";
|
||||
hash = "sha256-IqPxbt3nCIrrqr3yVS0gDdiYsQ2OXVm3dabY8AH7IK0=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-ZpB0BhXeTa0SBRh2Dj/qLDi8cABUVmW8o5aK0kRPEUM=";
|
||||
hash = "sha256-Q0V5V9JYGAgKAV3L43fy5I8ojIcxyU7C5OnqvatlkPE=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
|
||||
hash = "sha256-8NzqrvxKiamBdpOnCxVfs50kmDu1xl3HApTUY9MdANQ=";
|
||||
hash = "sha256-bHePzMfb/FcCkH2aWqi8669mYcfTT/908ZasxOhFDHk=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
|
||||
hash = "sha256-EJ+eT0RyleAjAofRiVeAyk5yLWSeAOf7QFGT5/HhWjo=";
|
||||
hash = "sha256-DNtEb7stYQ5uG+L7pdXXQZp/6dtx9eUlLgM0MpNLJac=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"version" = "1.12.0";
|
||||
"version" = "1.12.1";
|
||||
"hashes" = {
|
||||
"desktopSrcHash" = "sha256-Epkjv6tT0I65JTu4O5nHFRn0q18kE1+7joyTF1S3y+4=";
|
||||
"desktopYarnHash" = "sha256-2zy2xNzamjTyGE+Vm/gacMnby5Z0KfIWbgkl5EI5zi4=";
|
||||
"desktopSrcHash" = "sha256-4C4WJ3HjiXh24umt80lWujeiDvRaS1mf2IjCj6+n87U=";
|
||||
"desktopYarnHash" = "sha256-CyP0zy/nJoGolmB/p81jL0qAoD7d5xe5kvlmKW7Yaw8=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"version" = "1.12.0";
|
||||
"version" = "1.12.1";
|
||||
"hashes" = {
|
||||
"webSrcHash" = "sha256-4e76IFOY7YiBX/cGobJNj1epH/Bnak+BgVPSjWC/8+s=";
|
||||
"webYarnHash" = "sha256-qZPHWPmcGFtwfOSCpft0hFLuS7smmq9w1JxJ+oqJZPA=";
|
||||
"webSrcHash" = "sha256-c9VoR+F33xDvLn4PkPGBXW5+Yl9vX7FzedN6HfjfHEI=";
|
||||
"webYarnHash" = "sha256-Bu0rrzPNRdY5G/nhSlhXpBMq6tcjuc16s0UQR64gUc8=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "18.4.1";
|
||||
version = "18.4.2";
|
||||
package_version = "v${lib.versions.major version}";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
||||
|
||||
@@ -21,7 +21,7 @@ let
|
||||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NsPOxnX8BF9J1SqTj6DhPUWSEq7E5+grumPlwHPbA/8=";
|
||||
hash = "sha256-jwImYofmGfpnj43FinFmo9SQP6vpM0C4K6fmUECifG0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-DNZgdP7juELUX0cs0tnyqdf1yiUJ0S17nm0xqTk3KHQ=";
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-pages";
|
||||
version = "18.4.1";
|
||||
version = "18.4.2";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-pages";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-C4zdBsZ+Sz9S5lQ5qivqmrlM6C6jEepq152v3XQvA6E=";
|
||||
hash = "sha256-21VCBUE6wGU7DT98YYPuEz7lw6EMqCfe14mofbai0lk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FdmozSo/eWTnAxrO+/TZOKataLwDkKfwGOXymkRBVCI=";
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gitlab-runner";
|
||||
version = "18.3.1";
|
||||
version = "18.4.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-runner";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-D8CNY+lQEK2DgiGfScPxDPday3re/LN4i5jEJTGbshY=";
|
||||
hash = "sha256-kLUQTxj4t6H/by6lzsLmG8S3Ft1QFdUjTa4Y9aCT88o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vP/htZiUp5qL4TMw6AgNW/TVcvx+pl6rxp41SK5g4XM=";
|
||||
vendorHash = "sha256-zXyyfJ3VBBcB3Qfsex2pDcDJIRg/HRgFAytWloHHUnM=";
|
||||
|
||||
# For patchShebangs
|
||||
buildInputs = [ bash ];
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
{
|
||||
"version": "18.4.1",
|
||||
"repo_hash": "0wqk6vcjsnv84qbngzri4klg299kk154cadl98zf9vzypv5l66rz",
|
||||
"version": "18.4.2",
|
||||
"repo_hash": "053fw6g1rrqlmgr22phbsv57pg04iy20yv3yvgz1hm4jn2jm0zln",
|
||||
"yarn_hash": "1s9fz2apb7wkpppq14b3020b2pqdah917wblvzk32np8s2dqqc14",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v18.4.1-ee",
|
||||
"rev": "v18.4.2-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "18.4.1",
|
||||
"GITLAB_PAGES_VERSION": "18.4.1",
|
||||
"GITALY_SERVER_VERSION": "18.4.2",
|
||||
"GITLAB_PAGES_VERSION": "18.4.2",
|
||||
"GITLAB_SHELL_VERSION": "14.45.2",
|
||||
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.9.1",
|
||||
"GITLAB_WORKHORSE_VERSION": "18.4.1"
|
||||
"GITLAB_WORKHORSE_VERSION": "18.4.2"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ in
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "18.4.1";
|
||||
version = "18.4.2";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
|
||||
@@ -211,7 +211,7 @@ gem 'fog-local', '~> 0.8', feature_category: :shared
|
||||
# We may want to update this dependency if this is ever addressed upstream, e.g. via
|
||||
# https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93
|
||||
gem 'fog-aliyun', '~> 0.4', feature_category: :shared
|
||||
gem 'gitlab-fog-azure-rm', '~> 2.3.0', require: 'fog/azurerm', feature_category: :shared
|
||||
gem 'gitlab-fog-azure-rm', '~> 2.4.0', require: 'fog/azurerm', feature_category: :shared
|
||||
|
||||
# for Google storage
|
||||
|
||||
|
||||
@@ -739,7 +739,7 @@ GEM
|
||||
gitlab-experiment (0.9.1)
|
||||
activesupport (>= 3.0)
|
||||
request_store (>= 1.0)
|
||||
gitlab-fog-azure-rm (2.3.0)
|
||||
gitlab-fog-azure-rm (2.4.0)
|
||||
faraday (~> 2.0)
|
||||
faraday-follow_redirects (~> 0.3.0)
|
||||
faraday-net_http_persistent (~> 2.0)
|
||||
@@ -2170,7 +2170,7 @@ DEPENDENCIES
|
||||
gitlab-dangerfiles (~> 4.10.0)
|
||||
gitlab-duo-workflow-service-client (~> 0.3)!
|
||||
gitlab-experiment (~> 0.9.1)
|
||||
gitlab-fog-azure-rm (~> 2.3.0)
|
||||
gitlab-fog-azure-rm (~> 2.4.0)
|
||||
gitlab-glfm-markdown (~> 0.0.33)
|
||||
gitlab-housekeeper!
|
||||
gitlab-http!
|
||||
|
||||
@@ -2939,10 +2939,10 @@ src: {
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "03xwn2477zhc4654c7s1ks72w9lbns79n2qhfca7m17349vivpw8";
|
||||
sha256 = "02rnrd403hp5hwgvrapl3mvqp6gzr422v81wwq8dlzm38bjqd2v7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
};
|
||||
gitlab-glfm-markdown = {
|
||||
dependencies = [ "rb_sys" ];
|
||||
|
||||
@@ -22,7 +22,7 @@ click_log.basic_config(logger)
|
||||
|
||||
|
||||
class GitLabRepo:
|
||||
version_regex = re.compile(r"^v\d+\.\d+\.\d+(\-rc\d+)?(\-ee)?(\-gitlab)?")
|
||||
version_regex = re.compile(r"^v\d+\.\d+\.\d+(\-rc\d+)?(\-ee)?(\-gitlab)?$")
|
||||
|
||||
def __init__(self, owner: str = "gitlab-org", repo: str = "gitlab"):
|
||||
self.owner = owner
|
||||
|
||||
@@ -170,11 +170,11 @@ let
|
||||
|
||||
linux = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "141.0.7390.54";
|
||||
version = "141.0.7390.65";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-vJMHfwIPf+aM3uj3UlYGo/YxTerNLrVouKNNFApGl48=";
|
||||
hash = "sha256-Vdjrfq53R6aPlH3jM3A8qJnlsUJs6mac/r+NAZqWlq0=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
@@ -272,11 +272,11 @@ let
|
||||
|
||||
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "141.0.7390.55";
|
||||
version = "141.0.7390.66";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.google.com/release2/chrome/ft5t2atavjdcw35pqqr5b5rp6e_141.0.7390.55/GoogleChrome-141.0.7390.55.dmg";
|
||||
hash = "sha256-F0IAksB2PHdl4yRV9Pdyd2iRAM7vLF7fJVO7V+l4KTE=";
|
||||
url = "http://dl.google.com/release2/chrome/pkzctxukoi3f5inudh2ua3hcnq_141.0.7390.66/GoogleChrome-141.0.7390.66.dmg";
|
||||
hash = "sha256-uh2WOBY6a6hE6xfHYPH1MnZsaNf8aTrt4JtUzKT2t+g=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
||||
@@ -12,7 +12,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "immich-cli";
|
||||
version = "2.2.89";
|
||||
version = "2.2.96";
|
||||
inherit (immich) src pnpmDeps;
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
}:
|
||||
let
|
||||
pnpm = pnpm_10;
|
||||
version = "1.142.0";
|
||||
version = "2.0.1";
|
||||
|
||||
esbuild' = buildPackages.esbuild.override {
|
||||
buildGoModule =
|
||||
@@ -108,14 +108,14 @@ let
|
||||
owner = "immich-app";
|
||||
repo = "immich";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-0nStZuSnb8tJ0+Y247MHitmMURl8vTuPLAhUm+OHctE=";
|
||||
hash = "sha256-lpFUjjS7Q2F/Uhog1NdJ8vaVIGjmZM9ZWxW5d0zoQsc=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
pname = "immich";
|
||||
inherit version src;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-aYG5SpFZxhbz32YAdP39RYwn2GV+mFWhddd4IFuPuz8=";
|
||||
hash = "sha256-+CwwTqjI+xOGCAb66lZplNMBwR2xJZBs6E0OyGHbSAE=";
|
||||
};
|
||||
|
||||
web = stdenv.mkDerivation {
|
||||
@@ -224,9 +224,9 @@ stdenv.mkDerivation {
|
||||
|
||||
echo '${builtins.toJSON buildLock}' > "$packageOut/build/build-lock.json"
|
||||
|
||||
makeWrapper '${lib.getExe nodejs}' "$out/bin/admin-cli" \
|
||||
makeWrapper '${lib.getExe nodejs}' "$out/bin/immich-admin" \
|
||||
--add-flags "$packageOut/dist/main" \
|
||||
--add-flags cli
|
||||
--add-flags immich-admin
|
||||
makeWrapper '${lib.getExe nodejs}' "$out/bin/server" \
|
||||
--add-flags "$packageOut/dist/main" \
|
||||
--chdir "$packageOut" \
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "moonlight";
|
||||
version = "1.3.30";
|
||||
version = "1.3.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moonlight-mod";
|
||||
repo = "moonlight";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-H8dngrWspbfis0l7YZaVkselIXVpYN3XWBkbwCEBwxg=";
|
||||
hash = "sha256-aXap/wUjjJTCy2eq7p7BL6ZYOVZEBVY4/YkrDtbIj2Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [ nodejs_22 ];
|
||||
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-hPEUb+wiHjGOgbaBu5QCFKsGV93d+GuoYMCFRR+afgI=";
|
||||
hash = "sha256-gv+PHGbo0IiPgcxi0RAvsNmGLHWZar3SB4eW7NbJRJY=";
|
||||
};
|
||||
|
||||
env = {
|
||||
|
||||
20
pkgs/by-name/ne/nexusmods-app/deps.json
generated
20
pkgs/by-name/ne/nexusmods-app/deps.json
generated
@@ -261,8 +261,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "DuckDB.NativeBinaries",
|
||||
"version": "1.3.2",
|
||||
"hash": "sha256-wHFmXCpJI44wr1mgybl+4QKhX+CwME9+Smzhi5G9G4w="
|
||||
"version": "1.4.0",
|
||||
"hash": "sha256-27G7ptdNsjebMOrcegl0tgR2pvfvLS4RxQmw21k5Zuc="
|
||||
},
|
||||
{
|
||||
"pname": "DynamicData",
|
||||
@@ -1926,23 +1926,23 @@
|
||||
},
|
||||
{
|
||||
"pname": "NexusMods.HyperDuck",
|
||||
"version": "0.24.0",
|
||||
"hash": "sha256-DQP/Jq+19282NbTrwiCEOFwtbagbVhc8tmtruBLV470="
|
||||
"version": "0.28.0",
|
||||
"hash": "sha256-vJW/9DbnSIzxH6CR1CzMru0w/BA7HwxuJ0TiKt6NgcQ="
|
||||
},
|
||||
{
|
||||
"pname": "NexusMods.MnemonicDB",
|
||||
"version": "0.24.0",
|
||||
"hash": "sha256-QIuX3I/tAc37hmmvhrOQZcv5U40Sa6HeR00wTlmgFF0="
|
||||
"version": "0.28.0",
|
||||
"hash": "sha256-AzSzn2mdp4sx1ntOfm03kWlfo/mxxURcEMmChxSyEAI="
|
||||
},
|
||||
{
|
||||
"pname": "NexusMods.MnemonicDB.Abstractions",
|
||||
"version": "0.24.0",
|
||||
"hash": "sha256-SaVCEfgG1d+4wAtBdq9i5atbZsyBe6OEXt367eMOj1A="
|
||||
"version": "0.28.0",
|
||||
"hash": "sha256-c6hEojlKk8B//lpEyxrYBy/QlpixzDE4LJq+sk4XZDY="
|
||||
},
|
||||
{
|
||||
"pname": "NexusMods.MnemonicDB.SourceGenerator",
|
||||
"version": "0.24.0",
|
||||
"hash": "sha256-vEALZe2bs1fm2r7TyOG2UJNbeudadc3BtdE5ezppINg="
|
||||
"version": "0.28.0",
|
||||
"hash": "sha256-o888EyOAzDypNzhZTtW8BZp0Ew/fOUsho6IeBbGlmNM="
|
||||
},
|
||||
{
|
||||
"pname": "NexusMods.Paths",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ fetchurl }:
|
||||
let
|
||||
release = "vD0E6FC9F3A82C2E9";
|
||||
release = "vc2e27b8bf8632dca";
|
||||
owner = "Nexus-Mods";
|
||||
repo = "game-hashes";
|
||||
repoURL = "https://github.com/${owner}/${repo}";
|
||||
@@ -8,7 +8,7 @@ let
|
||||
# Define a binding so that `update-source-version` can find it
|
||||
src = fetchurl {
|
||||
url = "${repoURL}/releases/download/${release}/game_hashes_db.zip";
|
||||
hash = "sha256-ACwhWSoxe1CxBWhkgixZeLKpfdXAnavd/30ELInVtZM=";
|
||||
hash = "sha256-lu/C/WkjXtGJuZrsTg9fc/aEyJSsj9unjz1Sym39/b8=";
|
||||
passthru = {
|
||||
inherit
|
||||
src # Also for `update-source-version` support
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
{
|
||||
_7zz,
|
||||
avalonia,
|
||||
buildDotnetModule,
|
||||
callPackage,
|
||||
desktop-file-utils,
|
||||
dotnetCorePackages,
|
||||
fetchgit,
|
||||
fetchFromGitHub,
|
||||
imagemagick,
|
||||
lib,
|
||||
xdg-utils,
|
||||
@@ -23,12 +22,13 @@ let
|
||||
in
|
||||
buildDotnetModule (finalAttrs: {
|
||||
inherit pname;
|
||||
version = "0.17.2";
|
||||
version = "0.18.2";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/Nexus-Mods/NexusMods.App.git";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-2B5n1yN42birMJ1YaUU/KjzhHIJTv8nwrupc0ULc8Hc=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nexus-Mods";
|
||||
repo = "NexusMods.App";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+ayYRNclxbBedH6gIWTh5wI/AIvMzSq4x5fQXzxOT5c=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -44,11 +44,6 @@ buildDotnetModule (finalAttrs: {
|
||||
projectFile = "src/NexusMods.App/NexusMods.App.csproj";
|
||||
testProjectFile = "NexusMods.App.sln";
|
||||
|
||||
buildInputs = [
|
||||
# TODO: bump avalonia to 11.1.3
|
||||
# avalonia
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ _7zz ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -106,8 +101,8 @@ buildDotnetModule (finalAttrs: {
|
||||
|
||||
# Bitmap icons
|
||||
for i in 16 24 48 64 96 128 256 512; do
|
||||
size=''${i}x''${i}
|
||||
dir=$out/share/icons/hicolor/$size/apps
|
||||
size="$i"x"$i"
|
||||
dir="$out/share/icons/hicolor/$size/apps"
|
||||
mkdir -p $dir
|
||||
magick -background none $icon -resize $size $dir/com.nexusmods.app.png
|
||||
done
|
||||
@@ -196,7 +191,7 @@ buildDotnetModule (finalAttrs: {
|
||||
meta = {
|
||||
mainProgram = "NexusMods.App";
|
||||
homepage = "https://github.com/Nexus-Mods/NexusMods.App";
|
||||
changelog = "https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v${finalAttrs.version}";
|
||||
changelog = "https://github.com/Nexus-Mods/NexusMods.App/releases/tag/${finalAttrs.src.tag}";
|
||||
license = [ lib.licenses.gpl3Plus ];
|
||||
maintainers = with lib.maintainers; [
|
||||
l0b0
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
"forum_url": "https://forums.nexusmods.com/games/19-stardew-valley/",
|
||||
"nexusmods_url": "https://www.nexusmods.com/stardewvalley",
|
||||
"genre": "Simulation",
|
||||
"file_count": 141253,
|
||||
"downloads": 614556730,
|
||||
"file_count": 141993,
|
||||
"downloads": 619854329,
|
||||
"domain_name": "stardewvalley",
|
||||
"approved_date": 1457432329,
|
||||
"mods": 25471,
|
||||
"collections": 2025
|
||||
"mods": 25658,
|
||||
"collections": 2049
|
||||
},
|
||||
{
|
||||
"id": 1704,
|
||||
@@ -20,12 +20,12 @@
|
||||
"forum_url": "https://forums.nexusmods.com/games/6-skyrim/",
|
||||
"nexusmods_url": "https://www.nexusmods.com/skyrimspecialedition",
|
||||
"genre": "RPG",
|
||||
"file_count": 653576,
|
||||
"downloads": 8992667521,
|
||||
"file_count": 656636,
|
||||
"downloads": 9072303822,
|
||||
"domain_name": "skyrimspecialedition",
|
||||
"approved_date": 1477480498,
|
||||
"mods": 117157,
|
||||
"collections": 4847
|
||||
"mods": 117768,
|
||||
"collections": 4872
|
||||
},
|
||||
{
|
||||
"id": 3174,
|
||||
@@ -34,12 +34,12 @@
|
||||
"forum_url": "https://forums.nexusmods.com/games/9-mount-blade-ii-bannerlord/",
|
||||
"nexusmods_url": "https://www.nexusmods.com/mountandblade2bannerlord",
|
||||
"genre": "Strategy",
|
||||
"file_count": 50070,
|
||||
"downloads": 114524055,
|
||||
"file_count": 50300,
|
||||
"downloads": 115343239,
|
||||
"domain_name": "mountandblade2bannerlord",
|
||||
"approved_date": 1582898627,
|
||||
"mods": 6265,
|
||||
"collections": 292
|
||||
"mods": 6294,
|
||||
"collections": 293
|
||||
},
|
||||
{
|
||||
"id": 3333,
|
||||
@@ -48,12 +48,12 @@
|
||||
"forum_url": "https://forums.nexusmods.com/games/1-cyberpunk-2077/",
|
||||
"nexusmods_url": "https://www.nexusmods.com/cyberpunk2077",
|
||||
"genre": "Action",
|
||||
"file_count": 123015,
|
||||
"downloads": 894075844,
|
||||
"file_count": 123906,
|
||||
"downloads": 908587568,
|
||||
"domain_name": "cyberpunk2077",
|
||||
"approved_date": 1607433331,
|
||||
"mods": 17664,
|
||||
"collections": 1584
|
||||
"mods": 17809,
|
||||
"collections": 1602
|
||||
},
|
||||
{
|
||||
"id": 3474,
|
||||
@@ -62,11 +62,11 @@
|
||||
"forum_url": "https://forums.nexusmods.com/games/2-baldurs-gate-3/",
|
||||
"nexusmods_url": "https://www.nexusmods.com/baldursgate3",
|
||||
"genre": "RPG",
|
||||
"file_count": 103892,
|
||||
"downloads": 342668709,
|
||||
"file_count": 104549,
|
||||
"downloads": 345662936,
|
||||
"domain_name": "baldursgate3",
|
||||
"approved_date": 1602863114,
|
||||
"mods": 14725,
|
||||
"collections": 1800
|
||||
"mods": 14843,
|
||||
"collections": 1805
|
||||
}
|
||||
]
|
||||
|
||||
@@ -17,16 +17,15 @@
|
||||
ipv6 ? true,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "squid";
|
||||
version = "7.0.1";
|
||||
version = "7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/squid-cache/squid/releases/download/SQUID_${
|
||||
builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version
|
||||
}/squid-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-Bw3Y5iGtItRdcAYF6xnSysG2zae3PwTzRXjTw/2N35s=";
|
||||
hash = "sha256-djtaeFYc7cTkdjT6QrjmuNRsh8lJoVG056wjltL5feo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
@@ -81,16 +80,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cd test-suite/
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin $out/libexec $out/etc $out/share
|
||||
# exit from test-suite/ dir back to src root for correct makefile
|
||||
postCheck = ''
|
||||
cd ..
|
||||
cp src/squid $out/bin
|
||||
cp src/unlinkd $out/libexec
|
||||
cp src/mime.conf.default $out/etc/mime.conf
|
||||
cp -r icons $out/share
|
||||
cp -r errors $out/share
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# remove unusual nixos paths (pre-made /var dirs, config grammar) and rename sbin output
|
||||
postInstall = ''
|
||||
rm -r $out/var
|
||||
rm $out/share/mib.txt
|
||||
mv $out/sbin $out/bin
|
||||
'';
|
||||
|
||||
passthru.tests.squid = nixosTests.squid;
|
||||
|
||||
@@ -109,7 +109,7 @@ lib.warnIf (useHardenedMalloc != null)
|
||||
++ lib.optionals mediaSupport [ ffmpeg ]
|
||||
);
|
||||
|
||||
version = "14.5.7";
|
||||
version = "14.5.8";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
@@ -119,7 +119,7 @@ lib.warnIf (useHardenedMalloc != null)
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-ZQn4m4BnAaHXXXy4qnyqqNDEJDbk4uOlVp3wOKZxPzw=";
|
||||
hash = "sha256-hf3pkl+J9Hs28XSyNoXCZM0B9A7g4/n6F7WFkD/hl/o=";
|
||||
};
|
||||
|
||||
i686-linux = fetchurl {
|
||||
@@ -129,7 +129,7 @@ lib.warnIf (useHardenedMalloc != null)
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-oJYtgqf4p3Mwrj9ew5qYo4h42rZXd5vqL4+iJZ4OLjo=";
|
||||
hash = "sha256-iSHeHCyBg66pbGw8glmViTFMvys3EArOkXVpqJBXEfc=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -432,8 +432,8 @@ in
|
||||
};
|
||||
|
||||
ruby_3_4 = generic {
|
||||
version = rubyVersion "3" "4" "6" "";
|
||||
hash = "sha256-48Gauej0GzcjEk+8ARTN58v1XmWqnFjBKs2J7JwN0bk=";
|
||||
version = rubyVersion "3" "4" "7" "";
|
||||
hash = "sha256-I4FabQlWlveRkJD9w+L5RZssg9VyJLLkRs4fX3Mz7zY=";
|
||||
cargoHash = "sha256-5Tp8Kth0yO89/LIcU8K01z6DdZRr8MAA0DPKqDEjIt0=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -86,6 +86,10 @@ buildPythonPackage rec {
|
||||
# these only fail on aarch64
|
||||
"test_png_rgba8"
|
||||
"test_png_gray8a"
|
||||
# AssertionError: assert 'resolution' not in ...
|
||||
# (starting with ImagMagick 7.1.2-5)
|
||||
"test_date"
|
||||
"test_jpg"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "img2pdf" ];
|
||||
|
||||
@@ -16,9 +16,9 @@ let
|
||||
variants = {
|
||||
# ./update-zen.py zen
|
||||
zen = {
|
||||
version = "6.17"; # zen
|
||||
version = "6.17.1"; # zen
|
||||
suffix = "zen1"; # zen
|
||||
sha256 = "1qnl4fm077n2w3idip74v7y70ngg25fbyd8x8bqrb3s2kdw9r9nc"; # zen
|
||||
sha256 = "0610gcmzmvc70nw7n225avf1spahzffc6ajq18ibidra1k5q2msj"; # zen
|
||||
isLqx = false;
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
|
||||
@@ -57,7 +57,7 @@ in
|
||||
};
|
||||
|
||||
jetty_12 = common {
|
||||
version = "12.1.1";
|
||||
hash = "sha256-VHmPhVEqq4eoOwo9O7sbdv6bJB9dCFkN+64jTlnFarM=";
|
||||
version = "12.1.2";
|
||||
hash = "sha256-GtaEIXqOSutgrSJJ/+oFuGSe7y8omVX7sBgcG3GJzvs=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ callPackage, ... }@args:
|
||||
|
||||
callPackage ./generic.nix args {
|
||||
version = "1.29.1";
|
||||
hash = "sha256-xYn35+2AHdvZBK+/PeJq4k6wzOJ8dxei6U33+xLWrSc=";
|
||||
version = "1.29.2";
|
||||
hash = "sha256-Vmnjwp1Jv39utXcnW4bv5FBM+Br4hcWKHtfS57hJJDc=";
|
||||
}
|
||||
|
||||
@@ -60,17 +60,17 @@ let
|
||||
in
|
||||
{
|
||||
tomcat9 = common {
|
||||
version = "9.0.109";
|
||||
hash = "sha256-/masqdxAAgA4VwluYMSCsfAFr1RXx2fKnFgE9zLePMI=";
|
||||
version = "9.0.110";
|
||||
hash = "sha256-lDk+uSjtAdWACK9pJWYNen03JmHeXO+NY8ZqGqoolhg=";
|
||||
};
|
||||
|
||||
tomcat10 = common {
|
||||
version = "10.1.46";
|
||||
hash = "sha256-RenV71YatGt0x19AwzuD9J4T556Z9zbf+OiUhVfpaNo=";
|
||||
version = "10.1.47";
|
||||
hash = "sha256-pqPfam1tuW5J4gxZc6WyNKEYW88cGn7zo2yuTDaM+FI=";
|
||||
};
|
||||
|
||||
tomcat11 = common {
|
||||
version = "11.0.11";
|
||||
hash = "sha256-KpG4DB6n279K8Fux+Aq7l15d5BXAyAPep0XlqhEm4IE=";
|
||||
version = "11.0.12";
|
||||
hash = "sha256-GmW8ga7V1ME60iUlj110bC1jaZ3JagT/4z4W4y9CDFU=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -391,6 +391,12 @@ in
|
||||
|
||||
bbswitch = callPackage ../os-specific/linux/bbswitch { };
|
||||
|
||||
# NOTE: The bcachefs module is called this way to facilitate
|
||||
# easy overriding, as it is expected many users will want to
|
||||
# pull from the upstream git repo, which may include
|
||||
# unreleased changes to the module build process.
|
||||
bcachefs = callPackage pkgs.bcachefs-tools.kernelModule { };
|
||||
|
||||
ch9344 = callPackage ../os-specific/linux/ch9344 { };
|
||||
|
||||
chipsec = callPackage ../tools/security/chipsec {
|
||||
|
||||
Reference in New Issue
Block a user