Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2026-04-04 12:11:19 +00:00
committed by GitHub
73 changed files with 676 additions and 388 deletions
@@ -16,6 +16,7 @@ let
DEBUG = "0";
DEBUG_TOOLBAR = "0";
MEDIA_ROOT = "${stateDir}${lib.optionalString useNewMediaRoot "/media"}";
ALLOWED_HOSTS = cfg.address;
}
// lib.optionalAttrs (config.time.timeZone != null) {
TZ = config.time.timeZone;
+64
View File
@@ -821,6 +821,8 @@ let
])
(assertInt "FirewallMark")
(assertRange "FirewallMark" 1 4294967295)
(assertInt "RouteMetric")
(assertRange "RouteMetric" 0 4294967295)
];
# NOTE Check whether the key starts with an @, in which case it is
@@ -842,6 +844,8 @@ let
])
(assertInt "PersistentKeepalive")
(assertRange "PersistentKeepalive" 0 65535)
(assertInt "RouteMetric")
(assertRange "RouteMetric" 0 4294967295)
];
sectionBond = checkUnitConfig "Bond" [
@@ -1303,6 +1307,7 @@ let
0
])
(assertInt "RouteMetric")
(assertRange "RouteMetric" 0 4294967295)
(assertValueOneOf "HomeAddress" boolValues)
(assertValueOneOf "DuplicateAddressDetection" [
"ipv4"
@@ -1454,6 +1459,7 @@ let
(assertValueOneOf "FastOpenNoCookie" boolValues)
(assertByteFormat "MTUBytes")
(assertByteFormat "TCPAdvertisedMaximumSegmentSize")
(assertInt "TCPRetransmissionTimeoutSec")
(assertRange "NextHop" 1 4294967295)
];
@@ -1512,6 +1518,19 @@ let
"NetLabel"
"NFTSet"
"BlackList" # removed
"UseCaptivePortal"
"SendVendorOption"
"IPServiceType"
"SocketPriority"
"BOOTP"
"RoutesToNTP"
"QuickAck"
"InitialCongestionWindow"
"InitialAdvertisedReceiveWindow"
"UnassignedSubnetPolicy"
"ServerPort"
"DenyList"
"AllowList"
])
(assertRemoved "BlackList" "Use DenyList instead")
(assertValueOneOf "SendHostname" boolValues)
@@ -1566,6 +1585,26 @@ let
(assertPort "ServerPort")
(assertValueOneOf "SendRelease" boolValues)
(assertValueOneOf "SendDecline" boolValues)
(assertValueOneOf "Use6RD" boolValues)
(assertValueOneOf "UseCaptivePortal" boolValues)
(assertValueOneOf "IPServiceType" [
"none"
"CS6"
"CS4"
])
(assertInt "SocketPriority")
(assertValueOneOf "BOOTP" boolValues)
(assertValueOneOf "RoutesToNTP" boolValues)
(assertValueOneOf "QuickAck" boolValues)
(assertValueOneOf "UnassignedSubnetPolicy" [
"none"
"unreachable"
"prohibit"
"blackhole"
"throw"
])
(assertValueOneOf "IPv6OnlyMode" boolValues)
(assertPort "ServerPort")
];
sectionDHCPv6 = checkUnitConfig "DHCPv6" [
@@ -1597,6 +1636,8 @@ let
"SendRelease"
"NFTSet"
"WithoutRA"
"UseCaptivePortal"
"UnassignedSubnetPolicy"
])
(assertInt "IAID")
(assertRange "SendOption" 1 65536)
@@ -1624,6 +1665,18 @@ let
"solicit"
"information-request"
])
(assertRange "SendOption" 1 65536)
(assertInt "IAID")
(assertValueOneOf "UseDelegatedPrefix" boolValues)
(assertValueOneOf "SendRelease" boolValues)
(assertValueOneOf "UseCaptivePortal" boolValues)
(assertValueOneOf "UnassignedSubnetPolicy" [
"none"
"unreachable"
"prohibit"
"blackhole"
"throw"
])
];
sectionDHCPPrefixDelegation = checkUnitConfig "DHCPPrefixDelegation" [
@@ -1641,6 +1694,7 @@ let
(assertValueOneOf "Announce" boolValues)
(assertValueOneOf "Assign" boolValues)
(assertValueOneOf "ManageTemporaryAddress" boolValues)
(assertInt "RouteMetric")
(assertRange "RouteMetric" 0 4294967295)
(assertValueOneOf "WithoutRA" [
"no"
@@ -1678,12 +1732,19 @@ let
"DHCPv6Client"
"NetLabel"
"NFTSet"
"UseCaptivePortal"
"UseRedirect"
"UseHopLimit"
"UseReachableTime"
"UseRetransmissionTime"
"QuickAck"
])
(assertValueOneOf "UseRedirect" boolValues)
(assertValueOneOf "UseDNS" boolValues)
(assertValueOneOf "UseDNR" boolValues)
(assertValueOneOf "UseDomains" (boolValues ++ [ "route" ]))
(assertRange "RouteTable" 0 4294967295)
(assertInt "RouteMetric")
(assertRange "RouteMetric" 0 4294967295)
(assertValueOneOf "QuickAck" boolValues)
(assertValueOneOf "UseMTU" boolValues)
@@ -1697,6 +1758,7 @@ let
(assertValueOneOf "UseAutonomousPrefix" boolValues)
(assertValueOneOf "UseOnLinkPrefix" boolValues)
(assertValueOneOf "DHCPv6Client" (boolValues ++ [ "always" ]))
(assertValueOneOf "QuickAck" boolValues)
];
sectionDHCPServer = checkUnitConfig "DHCPServer" [
@@ -1763,6 +1825,7 @@ let
(assertOnlyFields [
"MACAddress"
"Address"
"Hostname"
])
(assertHasField "MACAddress")
(assertHasField "Address")
@@ -1774,6 +1837,7 @@ let
"Managed"
"OtherInformation"
"RouterLifetimeSec"
"ReachableTimeSec"
"RetransmitSec"
"RouterPreference"
"HopLimit"
-1
View File
@@ -87,7 +87,6 @@ rec {
(onFullSupported "nixos.tests.containers-ip")
(onSystems [ "x86_64-linux" ] "nixos.tests.docker")
(onFullSupported "nixos.tests.env")
(onSystems [ "x86_64-linux" "aarch64-linux" ] "nixos.tests.ec2-userdata")
# Way too many manual retries required on Hydra.
# Apparently it's hard to track down the cause.
+2 -1
View File
@@ -489,8 +489,9 @@ in
early-mount-options = runTest ./early-mount-options.nix;
earlyoom = runTestOn [ "x86_64-linux" ] ./earlyoom.nix;
easytier = runTest ./easytier.nix;
ec2-config = (handleTestOn [ "x86_64-linux" ] ./ec2.nix { }).boot-ec2-config or { };
ec2-image = runTest ./ec2-image.nix;
ec2-userdata = (handleTestOn [ "x86_64-linux" ] ./ec2.nix { }).ec2-userdata or { };
ec2-nixops = (handleTestOn [ "x86_64-linux" ] ./ec2.nix { }).boot-ec2-nixops or { };
echoip = runTest ./echoip.nix;
ejabberd = runTest ./xmpp/ejabberd.nix;
elk = handleTestOn [ "x86_64-linux" ] ./elk.nix { };
+77 -2
View File
@@ -18,6 +18,12 @@ let
../modules/testing/test-instrumentation.nix
../modules/profiles/qemu-guest.nix
{
# Hack to make the partition resizing work in QEMU.
boot.initrd.postDeviceCommands = mkBefore ''
ln -s vda /dev/xvda
ln -s vda1 /dev/xvda1
'';
amazonImage.format = "qcow2";
# In a NixOS test the serial console is occupied by the "backdoor"
@@ -25,6 +31,30 @@ let
# the configuration in virtualisation/amazon-image.nix.
systemd.services."serial-getty@ttyS0".enable = mkForce false;
# Needed by nixos-rebuild due to the lack of network
# access. Determined by trial and error.
system.extraDependencies = with pkgs; [
# Needed for a nixos-rebuild.
busybox
cloud-utils
desktop-file-utils
libxslt.bin
mkinitcpio-nfs-utils
stdenv
stdenvNoCC
texinfo
unionfs-fuse
lndir
# These are used in the configure-from-userdata tests
# for EC2. Httpd and valgrind are requested by the
# configuration.
apacheHttpd
apacheHttpd.doc
apacheHttpd.man
valgrind.doc
];
nixpkgs.pkgs = pkgs;
}
];
@@ -38,8 +68,8 @@ let
in
{
ec2-userdata = makeEc2Test {
name = "ec2-userdata";
boot-ec2-nixops = makeEc2Test {
name = "nixops-userdata";
meta.timeout = 600;
inherit image;
sshPublicKey = snakeOilPublicKey; # That's right folks! My user's key is also the host key!
@@ -86,4 +116,49 @@ in
machine.wait_for_file("/etc/ec2-metadata/user-data")
'';
};
boot-ec2-config = makeEc2Test {
name = "config-userdata";
meta.broken = true; # amazon-init wants to download from the internet while building the system
inherit image;
sshPublicKey = snakeOilPublicKey;
# ### https://channels.nixos.org/nixos-unstable nixos
userData = ''
{ pkgs, ... }:
{
imports = [
<nixpkgs/nixos/modules/virtualisation/amazon-image.nix>
<nixpkgs/nixos/modules/testing/test-instrumentation.nix>
<nixpkgs/nixos/modules/profiles/qemu-guest.nix>
];
environment.etc.testFile = {
text = "whoa";
};
networking.hostName = "ec2-test-vm"; # required by services.httpd
services.httpd = {
enable = true;
adminAddr = "test@example.org";
virtualHosts.localhost.documentRoot = "''${pkgs.valgrind.doc}/share/doc/valgrind/html";
};
networking.firewall.allowedTCPPorts = [ 80 ];
}
'';
script = ''
machine.start()
# amazon-init must succeed. if it fails, make the test fail
# immediately instead of timing out in wait_for_file.
machine.wait_for_unit("amazon-init.service")
machine.wait_for_file("/etc/testFile")
assert "whoa" in machine.succeed("cat /etc/testFile")
machine.wait_for_unit("httpd.service")
assert "Valgrind" in machine.succeed("curl http://localhost")
'';
};
}
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "mednafen-vb";
version = "0-unstable-2026-02-19";
version = "0-unstable-2026-03-31";
src = fetchFromGitHub {
owner = "libretro";
repo = "beetle-vb-libretro";
rev = "65debc7c4c7b85e2fd988d2be53496c2cf0b5f44";
hash = "sha256-9LIGNbF0TuWm07TkTsRX8i7cBtJrOfSgBa8swKHddPQ=";
rev = "734205c5ead87a89cd1d53fe086f8f8fe660cf1d";
hash = "sha256-32l0CZmP1n/HGuTheaBIWoNuMWw/wMdiN9z4F5fhawI=";
};
makefile = "Makefile";
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "81";
version = "0-unstable-2024-10-21";
version = "0-unstable-2026-03-31";
src = fetchFromGitHub {
owner = "libretro";
repo = "81-libretro";
rev = "ffc99f27f092addc9ddd34dd0e3a3d4d1c053cbf";
hash = "sha256-3AIXk3LJHZHWIojMeo2BJHWYDHQ17WVbkwjFhXM14ZE=";
rev = "f9e5fa3bef9a6d6e1e19a4b1c7e5922467b582a2";
hash = "sha256-c/0L0NLAFyyjQcPNmmfHW29i1As4Wk2/U3qKtClk1VE=";
};
meta = {
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "prosystem";
version = "0-unstable-2024-10-21";
version = "0-unstable-2026-03-31";
src = fetchFromGitHub {
owner = "libretro";
repo = "prosystem-libretro";
rev = "acae250da8d98b8b9707cd499e2a0bf6d8500652";
hash = "sha256-AGF3K3meZEEsnzHmMTCsFXBGNvWVELH8a8qET07kP0o=";
rev = "980edb381b0bf9ea7992caab24039a537aeb510e";
hash = "sha256-uuh5YLKHW5aVe01GH12TqAlSp83s/PF/8Mlw105HIJg=";
};
makefile = "Makefile";
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "snes9x";
version = "0-unstable-2026-03-21";
version = "0-unstable-2026-04-02";
src = fetchFromGitHub {
owner = "snes9xgit";
repo = "snes9x";
rev = "871a88065ca2d4e218b95626b646742a40cf88ae";
hash = "sha256-2XyU+KKKNBrJ7brCeqc00+QK2moOPXaWCUJ5Wc/US9A=";
rev = "50e875548194429630e9c6a8d8522fa39c89d9ad";
hash = "sha256-3DKk1bhtcrxaZ2Dvrtddmaiq2niAkRIOEU+jBuSsaas=";
};
makefile = "Makefile";
@@ -25,7 +25,7 @@
"version": "0.0.1040"
},
"osx-development": {
"hash": "sha256-gQL2ibCxqHsSbMu5Cor+RbioNdbuupJo8JoP4PWmJyA=",
"hash": "sha256-dCRl0gpxFdnEa81sSymj8Te0+KmmI9uXsmCXSY1EeNw=",
"url": "https://development.dl2.discordapp.net/apps/osx/0.0.119/DiscordDevelopment.dmg",
"version": "0.0.119"
},
+3 -3
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation {
pname = "asmjit";
version = "0-unstable-2026-02-15";
version = "0-unstable-2026-03-26";
src = fetchFromGitHub {
owner = "asmjit";
repo = "asmjit";
rev = "64a88ed1d8abb2e2b17a938a5ce7c1b66dabb695";
hash = "sha256-NC0V5KsYNyJ/hrgAkz6oTCwQmZ8eCWNSOUl+dyTKfJk=";
rev = "0bd5787b54b575ed94bf32ac452153b34385c514";
hash = "sha256-mBnpoTG2c6RrTjOYSIeIANQKE6Uvd3/dnBGDnw3AfSA=";
};
nativeBuildInputs = [
+5
View File
@@ -15,6 +15,11 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-cGYrG7A4Ffh51KyR+UpeWu7A40eqxI8g4LefBIs18kg=";
};
postPatch = ''
substituteInPlace src/main.c \
--replace-fail "void refresh_screen()" "void refresh_screen(SDL_Surface *screen)"
'';
buildInputs = [
SDL
SDL_mixer
+3 -3
View File
@@ -8,17 +8,17 @@
buildGoModule (finalAttrs: {
pname = "bento";
version = "1.16.1";
version = "1.16.2";
src = fetchFromGitHub {
owner = "warpstreamlabs";
repo = "bento";
tag = "v${finalAttrs.version}";
hash = "sha256-iAPl23vj578hFgdVROED+owdBI9gJx6cnatpVeUSJgM=";
hash = "sha256-SNX80JTX4jqbcCQWP+HlQaXTkODOYzbDN1KQ4iOZqYs=";
};
proxyVendor = true;
vendorHash = "sha256-k98FIhsG4MeBNkcUYxZayRJHlJmY3giyCK5Gj7FMN5s=";
vendorHash = "sha256-N5CRU4Mv9e8kHXUXP95cNe02DkoEhJWcypF4vkEaMBA=";
subPackages = [
"cmd/bento"
+10 -8
View File
@@ -21,18 +21,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
src = fetchFromGitHub {
owner = "SamHH";
repo = "bukubrow-host";
rev = "v${finalAttrs.version}";
sha256 = "sha256-xz5Agsm+ATQXXgpPGN4EQ00i1t8qUlrviNHauVdCu4U=";
tag = "v${finalAttrs.version}";
hash = "sha256-xz5Agsm+ATQXXgpPGN4EQ00i1t8qUlrviNHauVdCu4U=";
};
cargoHash = "sha256-mCPJE9WW14NtahbMnDcE+0xXl5w25dzerPy3wv78l20=";
buildInputs = [ sqlite ];
passAsFile = [
"firefoxManifest"
"chromeManifest"
];
firefoxManifest = builtins.toJSON (
manifest
// {
@@ -46,14 +42,20 @@ rustPlatform.buildRustPackage (finalAttrs: {
}
);
postBuild = ''
substituteAll $firefoxManifestPath firefox.json
substituteAll $chromeManifestPath chrome.json
printf "%s" "$firefoxManifest" > firefox.json
substituteInPlace firefox.json \
--replace-fail "@out@" "$out"
printf "%s" "$chromeManifest" > chrome.json
substituteInPlace chrome.json \
--replace-fail "@out@" "$out"
'';
postInstall = ''
install -Dm0644 firefox.json $out/lib/mozilla/native-messaging-hosts/com.samhh.bukubrow.json
install -Dm0644 chrome.json $out/etc/chromium/native-messaging-hosts/com.samhh.bukubrow.json
'';
__structuredAttrs = true;
meta = {
description = "WebExtension for Buku, a command-line bookmark manager";
homepage = "https://github.com/SamHH/bukubrow-host";
@@ -86,6 +86,8 @@ instances:
- id: unfree
module: notesqml
config: unfree.conf
- module: nixos
weight: 48
# Sequence section. This section describes the sequence of modules, both
# viewmodules and jobmodules, as they should appear and/or run.
@@ -1,6 +1,7 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
import configparser
import json
import libcalamares
import os
import subprocess
@@ -409,12 +410,160 @@ def fix_btrfs_subvolumes(hardware_config, partitions):
return hardware_config
# nix internal-json activity/result types
_ACT_COPY_PATH = 100
_ACT_COPY_PATHS = 103
_ACT_BUILDS = 104
_RES_PROGRESS = 105
class NixProgress:
"""Parse nix internal-json output and track build/copy progress."""
def __init__(self):
self._builds_done = 0
self._builds_expected = 0
self._copies_done = 0
self._copies_expected = 0
self._per_act_progress = {}
self._copy_bytes = {}
self._activities = {}
self.fraction = 0.0
self._floor = 0.0
self._floor_done = 0
self.log_messages = []
def handle(self, line):
"""Process one line. Returns True for @nix lines, False for plain text."""
line = line.strip()
if not line:
return True
if not line.startswith("@nix "):
return False
try:
msg = json.loads(line[5:])
except (json.JSONDecodeError, ValueError):
return False
action = msg.get("action")
if action == "start":
self._on_start(msg)
elif action == "stop":
self._on_stop(msg)
elif action == "result":
self._on_result(msg)
elif action == "msg":
level = msg.get("level", 0)
text = msg.get("msg", "")
if level <= 1 and text:
self.log_messages.append(text)
self._update()
return True
def _on_start(self, msg):
act_id = msg["id"]
act_type = msg.get("type", 0)
self._activities[act_id] = act_type
text = msg.get("text", "")
if text and msg.get("level", 5) <= 3:
self.log_messages.append(text)
def _on_stop(self, msg):
act_id = msg["id"]
self._activities.pop(act_id, None)
self._copy_bytes.pop(act_id, None)
def _on_result(self, msg):
act_id = msg["id"]
res_type = msg.get("type", 0)
fields = msg.get("fields", [])
act_type = self._activities.get(act_id, 0)
if res_type != _RES_PROGRESS or len(fields) < 2:
return
if act_type == _ACT_BUILDS:
self._per_act_progress[(act_type, act_id)] = (
"builds",
fields[0],
fields[1],
)
self._recompute_counts()
elif act_type == _ACT_COPY_PATHS:
self._per_act_progress[(act_type, act_id)] = (
"copies",
fields[0],
fields[1],
)
self._recompute_counts()
elif act_type == _ACT_COPY_PATH:
self._copy_bytes[act_id] = (fields[0], max(fields[1], 1))
def _update(self):
count_total = self._builds_expected + self._copies_expected
count_done = self._builds_done + self._copies_done
if count_total <= 0:
return
# Prevents the channel copy (1 path) from dominating the
# entire progress bar before the main build starts.
effective_total = max(count_total, 3)
count_frac = count_done / effective_total
# large single-path copies move the bar.
total_bytes = sum(t for _, t in self._copy_bytes.values())
done_bytes = sum(d for d, _ in self._copy_bytes.values())
if total_bytes > 0:
byte_sub = done_bytes / total_bytes
step = len(self._copy_bytes) / effective_total
raw = count_frac + byte_sub * step
else:
raw = count_frac
raw = max(0.0, min(1.0, raw))
# When the denominator grows (e.g. main build discovers hundreds
# of new paths), remap remaining work into remaining bar space.
if raw >= self._floor:
self._floor = raw
self._floor_done = count_done
else:
new_items = count_done - self._floor_done
remaining = effective_total - self._floor_done
if remaining > 0 and new_items >= 0:
raw = self._floor + (new_items / remaining) * (1.0 - self._floor)
else:
raw = self._floor
raw = max(0.0, min(1.0, raw))
if raw > self._floor:
self._floor = raw
self._floor_done = count_done
self.fraction = raw
def _recompute_counts(self):
bd = be = cd = ce = 0
for kind, done, expected in self._per_act_progress.values():
if kind == "builds":
bd += done
be += expected
else:
cd += done
ce += expected
self._builds_done = bd
self._builds_expected = be
self._copies_done = cd
self._copies_expected = ce
def run():
"""NixOS Configuration."""
INSTALL_PROGRESS_START = 0.1
INSTALL_PROGRESS_END = 1.0
global status
status = _("Configuring NixOS")
libcalamares.job.setprogress(0.1)
libcalamares.job.setprogress(0.01)
ngc_cfg = configparser.ConfigParser()
ngc_cfg["Defaults"] = { "Kernel": "lts" }
@@ -491,7 +640,7 @@ def run():
):
cfg += cfgbootgrubcrypt
status = _("Setting up LUKS")
libcalamares.job.setprogress(0.15)
libcalamares.job.setprogress(0.02)
try:
libcalamares.utils.host_env_process_output(
["mkdir", "-p", root_mount_point + "/boot"], None
@@ -576,7 +725,7 @@ def run():
)
status = _("Configuring NixOS")
libcalamares.job.setprogress(0.18)
libcalamares.job.setprogress(0.03)
cfg += cfgnetwork
if gs.value("packagechooser_packagechooser") == "enlightenment":
@@ -781,7 +930,7 @@ def run():
cfg = cfg.replace(pattern, str(variables[key]))
status = _("Generating NixOS configuration")
libcalamares.job.setprogress(0.25)
libcalamares.job.setprogress(0.05)
try:
# Generate hardware.nix with mounted swap device
@@ -861,7 +1010,7 @@ def run():
libcalamares.utils.host_env_process_output(["cp", "/dev/stdin", config], None, cfg)
status = _("Installing NixOS")
libcalamares.job.setprogress(0.3)
libcalamares.job.setprogress(INSTALL_PROGRESS_START)
try:
subprocess.check_output(
@@ -880,6 +1029,8 @@ def run():
"--no-root-passwd",
"--root",
root_mount_point,
"--log-format",
"internal-json",
# Nix requires its build directory to have no
# world-writable parent directories. The chroot store that
# nixos-install uses will use the state dir in the chroot
@@ -892,7 +1043,8 @@ def run():
]
)
# Install customizations
progress = NixProgress()
try:
output = ""
proc = subprocess.Popen(
@@ -902,14 +1054,34 @@ def run():
)
while True:
line = proc.stdout.readline().decode("utf-8")
output += line
libcalamares.utils.debug("nixos-install: {}".format(line.strip()))
if not line:
break
was_json = progress.handle(line)
# Keep output for error reporting
if not was_json:
output += line
for log_line in progress.log_messages:
output += log_line + "\n"
mapped = INSTALL_PROGRESS_START + progress.fraction * (
INSTALL_PROGRESS_END - INSTALL_PROGRESS_START
)
libcalamares.job.setprogress(mapped)
for log_line in progress.log_messages:
libcalamares.utils.debug("nixos-install: {}".format(log_line))
progress.log_messages.clear()
if not was_json:
libcalamares.utils.debug("nixos-install: {}".format(line.strip()))
exit = proc.wait()
if exit != 0:
return (_("nixos-install failed"), _(output))
except:
return (_("nixos-install failed"), _("Installation failed to complete"))
libcalamares.job.setprogress(INSTALL_PROGRESS_END)
return None
+2 -2
View File
@@ -40,11 +40,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "calibre";
version = "9.5.0";
version = "9.6.0";
src = fetchurl {
url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
hash = "sha256-NDz3SxR8GyJi/POdpgEJzRdYNVV88/NkHczrA0JylfM=";
hash = "sha256-xNdA1QoMLjisM68Q6BU2bL0tCEagba/KMAjqr+Lwm+o=";
};
patches =
+10
View File
@@ -0,0 +1,10 @@
--- a/src/cartridge.cpp
+++ b/src/cartridge.cpp
@@ -7,6 +7,7 @@
#include <cstring>
#include <algorithm>
#include <memory>
+#include <cstdint>
const uint32_t CARTRIDGE_NB_PAGES = 32;
const uint32_t CARTRIDGE_PAGE_SIZE = 16*1024;
+4 -1
View File
@@ -38,7 +38,10 @@ stdenv.mkDerivation (finalAttrs: {
zlib
];
patches = [ ./string.patch ];
patches = [
./string.patch
./cstdint.patch
];
makeFlags = [
"APP_PATH=${placeholder "out"}/share/caprice32"
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cargo-local-registry";
version = "0.2.9";
version = "0.2.12";
src = fetchFromGitHub {
owner = "dhovart";
repo = "cargo-local-registry";
tag = "v${finalAttrs.version}";
hash = "sha256-DzBD7N7GQZ9nhF22DnxRse0P8MUGReOcXHQ56KOqW6I=";
hash = "sha256-b0twS9Vhz1FcsHXNtePYi+PIY7yqgrH4kgqdf2jqF7w=";
};
cargoHash = "sha256-9DW6DkWXoGvdHjxIwgXaQP9a5Kc90SdNDRNRq6G6pLg=";
cargoHash = "sha256-Cp54HkQ+8fG85wfFof5cexyAxo9spv78TstEEyKK7RE=";
nativeBuildInputs = [
curl
+3 -3
View File
@@ -8,7 +8,7 @@
buildGoModule rec {
pname = "consul";
version = "1.22.1";
version = "1.22.6";
# Note: Currently only release tags are supported, because they have the Consul UI
# vendored. See
@@ -22,7 +22,7 @@ buildGoModule rec {
owner = "hashicorp";
repo = "consul";
tag = "v${version}";
hash = "sha256-WlaJtiFlfLpdMATWHPbMneCqKzNcIRJrlf5TlbZgH8U=";
hash = "sha256-UgUhTiDfbKqS0uMEfXzm9j8eNT6UKEQ6OidMQB+KlcI=";
};
# This corresponds to paths with package main - normally unneeded but consul
@@ -32,7 +32,7 @@ buildGoModule rec {
"connect/certgen"
];
vendorHash = "sha256-QthyylbEkyfDPJIzIyL4u+d92MTZxIjZHBW39AZKmzo=";
vendorHash = "sha256-sovOseYC72zUPY9WHDgemU7HcDpJzcsQsRALgHveins=";
doCheck = false;
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "diff-so-fancy";
version = "1.4.6";
version = "1.4.8";
src = fetchFromGitHub {
owner = "so-fancy";
repo = "diff-so-fancy";
rev = "v${finalAttrs.version}";
sha256 = "sha256-Wbiz82mTqjJG3WeVOkaOzuPfXCdprJkCSs/Ye3OUlE0=";
sha256 = "sha256-dsWf7QhdvOfzen3ZOyu00Y869yYqKtgk7yHJvhmFSOs=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule (finalAttrs: {
pname = "feishu-cli";
version = "1.12.0";
version = "1.15.0";
src = fetchFromGitHub {
owner = "riba2534";
repo = "feishu-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-e1BXTJcQMv4oHrlt8NEe/bsI6x8spwSIEFf+uazmrHU=";
hash = "sha256-8GIEa2P3s3sF0o4SyAjLxgHNFi5+4F19T+EsJ1d1Oik=";
};
vendorHash = "sha256-MZv772U+3+Fcanaiuhz+OCqfIsYyCG7B4iZOnEftbi8=";
+7
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch2,
autoconf,
automake,
docbook_xml_dtd_42,
@@ -60,6 +61,12 @@ stdenv.mkDerivation (finalAttrs: {
./specify-localedir.patch
./gettext-0.25.patch
# CVE-2026-4948: https://github.com/NixOS/nixpkgs/issues/505280
(fetchpatch2 {
url = "https://github.com/Prince213/firewalld/commit/e621b4b54be7cd8d77ce549ec17c6f814f9bd337.patch?full_index=1";
hash = "sha256-8auXNPVYnNk1UI0jM82IEQrMBhG189/I+DbaXt0VEhc=";
})
];
postPatch = ''
+2 -2
View File
@@ -12,13 +12,13 @@
buildGoModule (finalAttrs: {
pname = "fzf";
version = "0.70.0";
version = "0.71.0";
src = fetchFromGitHub {
owner = "junegunn";
repo = "fzf";
rev = "v${finalAttrs.version}";
hash = "sha256-axp2w4gzf6c+W0bUCR2Kjms1eaWQR1Ii0Axdaquy8XE=";
hash = "sha256-fEHNE51VTggSwNutefCg/WueaXRE1J0D/dyVPFqhTJg=";
};
vendorHash = "sha256-uFXHoseFOxGIGPiWxWfDl339vUv855VHYgSs9rnDyuI=";
+104 -104
View File
@@ -42,159 +42,159 @@ in
{
app-schema = mkGeoserverExtension {
name = "app-schema";
version = "2.28.2"; # app-schema
hash = "sha256-wJ0grTy8ZeiifvINLgbuLXdDYQeQvXKkGcFoYxlkOjI="; # app-schema
version = "2.28.3"; # app-schema
hash = "sha256-fxMFV5/lvhCcgRfL+2Qf0ePo6EC/bLM1IeL5qNoKVrQ="; # app-schema
};
authkey = mkGeoserverExtension {
name = "authkey";
version = "2.28.2"; # authkey
hash = "sha256-vy9HLjt1Lefd1+2QlKPHKU9IcPYfDPWcfqzInFahBBk="; # authkey
version = "2.28.3"; # authkey
hash = "sha256-pAB8vPn+cZnKQKGLHtXrkLbieTs7wMi6ArGL8fxo31s="; # authkey
};
cas = mkGeoserverExtension {
name = "cas";
version = "2.28.2"; # cas
hash = "sha256-Z3FdAdVHrzNPiA1L/9cnSr/7QsevlqhxBoSwOfjap/E="; # cas
version = "2.28.3"; # cas
hash = "sha256-BEDE9dZ4sZBr15Wvbpio9JOIEai53cJLe4QhvYbQwKw="; # cas
};
charts = mkGeoserverExtension {
name = "charts";
version = "2.28.2"; # charts
hash = "sha256-ZLFI6taLpSw9uIsAr8zAsP0xIHqKHhlnffCglEhmvbU="; # charts
version = "2.28.3"; # charts
hash = "sha256-cFbMdIIQwZudSgDBW8YN81GduG1bSQFLldjtubaclqA="; # charts
};
control-flow = mkGeoserverExtension {
name = "control-flow";
version = "2.28.2"; # control-flow
hash = "sha256-ncKjBkYJGqtgsSU2RCMkfZd4jnqWCxaVf3VfQTHHv7Q="; # control-flow
version = "2.28.3"; # control-flow
hash = "sha256-HrS+/QntfSdMHLzA1+wJh7JWA2THLSOBDdIdeG7I4u4="; # control-flow
};
css = mkGeoserverExtension {
name = "css";
version = "2.28.2"; # css
hash = "sha256-TAvS6VoJEkxUHaz/5/Sng2f8tvTWUZVeriL8uOrtb0I="; # css
version = "2.28.3"; # css
hash = "sha256-7gYg4v8ekThV3k21hrJlu6jULJxdyUFZZh0ToaZSyeI="; # css
};
csw = mkGeoserverExtension {
name = "csw";
version = "2.28.2"; # csw
hash = "sha256-AR229hydrY1D5rxpGFfyDAPgsceDcs46nH/vyHyn484="; # csw
version = "2.28.3"; # csw
hash = "sha256-C/Th+KjiGWCfzMvVpby22BxXnkEtAYg1asYjO/Ge0fA="; # csw
};
csw-iso = mkGeoserverExtension {
name = "csw-iso";
version = "2.28.2"; # csw-iso
hash = "sha256-7s+Eu+Ik+9+C3+LMZ6gZowVLg8kuNOY9ZlsZEUDKRDg="; # csw-iso
version = "2.28.3"; # csw-iso
hash = "sha256-ctZgjCQDLZKHAmd2Og+Vvu7iYxCU+08pTniImDDjmz0="; # csw-iso
};
db2 = mkGeoserverExtension {
name = "db2";
version = "2.28.2"; # db2
hash = "sha256-ipjFaGsVfBebKjMS9r7ZNHanNdbSA2lcdsLufr/ohgI="; # db2
version = "2.28.3"; # db2
hash = "sha256-yVghGPW07USGx4ZYs6F2P5VuGbNaUo3wzOrx1BOvFkE="; # db2
};
# Needs wps extension.
dxf = mkGeoserverExtension {
name = "dxf";
version = "2.28.2"; # dxf
hash = "sha256-H7dugiW/fldMWVCqr3aPAYgYQUkBFutBALeOmYJouhE="; # dxf
version = "2.28.3"; # dxf
hash = "sha256-o40HBSTzAmaUdCHslpBnK8ALHKh36V8PqmGzqdAtl7w="; # dxf
};
excel = mkGeoserverExtension {
name = "excel";
version = "2.28.2"; # excel
hash = "sha256-wWxOVpy41sAQMqHgR+B8zIdQV05VIi7gV0on1rrqZ0g="; # excel
version = "2.28.3"; # excel
hash = "sha256-7kOEb3ayiUZs0PV8qSiz+FuniWI1JEfod7wcf4e+1LM="; # excel
};
feature-pregeneralized = mkGeoserverExtension {
name = "feature-pregeneralized";
version = "2.28.2"; # feature-pregeneralized
hash = "sha256-f6tqDnW3AI/Kg3Dd4w9CdoqhJoygN4EiNjht1mH3o3s="; # feature-pregeneralized
version = "2.28.3"; # feature-pregeneralized
hash = "sha256-/6qvxhpg5HG+FlTsUclxxEfAYdhqV/cefDAta1Iw3sg="; # feature-pregeneralized
};
# Note: The extension name ("gdal") clashes with pkgs.gdal.
gdal = mkGeoserverExtension {
name = "gdal";
version = "2.28.2"; # gdal
version = "2.28.3"; # gdal
buildInputs = [ pkgs.gdal ];
hash = "sha256-jT3QhjrQiTtZHCCyBE1F7MfEanNRdzjdRQ/Ao+Azars="; # gdal
hash = "sha256-0IFF+x7T6qupakRx0Y+nwlVAC4byiDDCqovdPewdJWY="; # gdal
};
# Throws "java.io.FileNotFoundException: URL [jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties] cannot be resolved to absolute file path because it does not reside in the file system: jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties" but seems to work out of the box.
#geofence = mkGeoserverExtension {
# name = "geofence";
# version = "2.28.2"; # geofence
# hash = "sha256-G72N5BRMIlkyfldeHdwNHM4kKEhbhp52VkJKaObtPQI="; # geofence
# version = "2.28.3"; # geofence
# hash = "sha256-IQ+s6Q/nEnUAKfCdWQNhVNIEOWyi2VhDxMxWg4lfWKI="; # geofence
#};
#geofence-server-h2 = mkGeoserverExtension {
# name = "geofence-server-h2";
# version = "2.28.2"; # geofence-server
# hash = "sha256-qgm2jNXGYJ40lFmWN/ksWf6GxzLTYhZwkIRr0/dvItc="; # geofence-server-h2
# version = "2.28.3"; # geofence-server
# hash = "sha256-WqzBPh0YNMcLbrKdNcYNZSQrVYPYczC/+uIw4I58A14="; # geofence-server-h2
#};
#geofence-server-postgres = mkGeoserverExtension {
# name = "geofence-server-postgres";
# version = "2.28.2"; # geofence-server
# hash = "sha256-3vkf+jIdmt/ZMci1PSeA7yVoUuo5d5vuuowQ1G7pz6M="; # geofence-server-postgres
# version = "2.28.3"; # geofence-server
# hash = "sha256-ox7EjhVcetJInONerxtLK4MQt4BPIZ9EtPmmK6cnKJY="; # geofence-server-postgres
#};
#geofence-wps = mkGeoserverExtension {
# name = "geofence-wps";
# version = "2.28.2"; # geofence-wps
# hash = "sha256-Bl+0gte7buh4uMbK6AEJOs3HHCZ1s6sED7UrB1v69BM="; # geofence-wps
# version = "2.28.3"; # geofence-wps
# hash = "sha256-txQwmE8mkCttfd57JFYbVuwIpfY+FFzb/hMcGEiEeW4="; # geofence-wps
#};
geopkg-output = mkGeoserverExtension {
name = "geopkg-output";
version = "2.28.2"; # geopkg-output
hash = "sha256-ccf6PP7lSnkPCguewaTkLiszmeNB1KRlc6sku1aUp3k="; # geopkg-output
version = "2.28.3"; # geopkg-output
hash = "sha256-JlMDDHvieYPTdKzYJxALzVrVZ+Jce447lq99hRQwP6Y="; # geopkg-output
};
grib = mkGeoserverExtension {
name = "grib";
version = "2.28.2"; # grib
hash = "sha256-5QQhxLA6LR9ahEhLJM3FhFr7T30vzbXZ72sv2IbQuwA="; # grib
version = "2.28.3"; # grib
hash = "sha256-ydDlRbTxxieQkeSHAR4gf1+KrjvjGBQhAEyTc0jTN9E="; # grib
buildInputs = [ netcdf ];
};
gwc-s3 = mkGeoserverExtension {
name = "gwc-s3";
version = "2.28.2"; # gwc-s3
hash = "sha256-ZKo10/k5aY6SNVKNPs4U9x9rMaz/P6nqPt1PJHr7U1Y="; # gwc-s3
version = "2.28.3"; # gwc-s3
hash = "sha256-OsfS7b4w6PsJ6s20wn09FFJzjMv32iZldF9T8qaHH8A="; # gwc-s3
};
h2 = mkGeoserverExtension {
name = "h2";
version = "2.28.2"; # h2
hash = "sha256-vkjZn5y0taVG13/1/RJuFoKIFcHx+Ju2yYYLV3K8Qdc="; # h2
version = "2.28.3"; # h2
hash = "sha256-3B0WJrYG7UaHHt2p98zd5mWPJWKz3J/R7iwH4b2PLe4="; # h2
};
iau = mkGeoserverExtension {
name = "iau";
version = "2.28.2"; # iau
hash = "sha256-yIpXjMCYjWE/xMGuNg3iNDyjMVdQCvRBeNCBOS0c1JA="; # iau
version = "2.28.3"; # iau
hash = "sha256-oIgED4jwp5QENorSdWSvj3Pvy92dSF/Pjm6YwdZrbw8="; # iau
};
importer = mkGeoserverExtension {
name = "importer";
version = "2.28.2"; # importer
hash = "sha256-Kb02ihQ9WIjcXRS1Yc9gO968/YK/FRlQ2CQGZCZmy20="; # importer
version = "2.28.3"; # importer
hash = "sha256-6ZCmlzu5/sN76ZgVDtU02L9D/aNL+kawcf/EKakdlgU="; # importer
};
inspire = mkGeoserverExtension {
name = "inspire";
version = "2.28.2"; # inspire
hash = "sha256-fU0/4VvTlIhyjPTNIYIVdT8dygWG8r0qk45O1q4fr3U="; # inspire
version = "2.28.3"; # inspire
hash = "sha256-O/WPgBfyyI/sHZK9xGMjlYf4qyTT7Sx3psYWbjV3z1E="; # inspire
};
# Needs Kakadu plugin from
# https://github.com/geosolutions-it/imageio-ext
#jp2k = mkGeoserverExtension {
# name = "jp2k";
# version = "2.28.2"; # jp2k
# hash = "sha256-eOg9w9z3KykTLvouWrUH4fvAJ1OaQJG7M9vA+3pwyFM="; # jp2k
# version = "2.28.3"; # jp2k
# hash = "sha256-rLwuY5aEIKrjgyAXexFEpsRt+pNZLxI/YFo0yiBCblc="; # jp2k
#};
# Throws "java.lang.UnsatisfiedLinkError: 'void org.libjpegturbo.turbojpeg.TJDecompressor.init()'"
@@ -202,174 +202,174 @@ in
# NOTE: When re-enabling this, RE-ENABLE THE CORRESPONDING TEST, TOO! (See tests/geoserver.nix)
#libjpeg-turbo = mkGeoserverExtension {
# name = "libjpeg-turbo";
# version = "2.28.2"; # libjpeg-turbo
# hash = "sha256-4RQzkMXuOdQKszmafTWG5PekU8nCGVb7/Oumql8vqFc="; # libjpeg-turbo
# version = "2.28.3"; # libjpeg-turbo
# hash = "sha256-cftD9VyJCxkYQBKuyBtnEeBAchYOAJGnl677MQAAdc4="; # libjpeg-turbo
# buildInputs = [ libjpeg.out ];
#};
mapml = mkGeoserverExtension {
name = "mapml";
version = "2.28.2"; # mapml
hash = "sha256-qOYI6MT+Ihpa+aSbC77J96aaA2cSaPBei0ppsPhC0ks="; # mapml
version = "2.28.3"; # mapml
hash = "sha256-r7GJbqCAnsxJV8zyHQG8EP3sbiXcfpQHNgMmj7viJac="; # mapml
};
mbstyle = mkGeoserverExtension {
name = "mbstyle";
version = "2.28.2"; # mbstyle
hash = "sha256-M9Eg8DbiWTFrpZ26v7MdeKcxS+CscNTT/r7CPqGe7RI="; # mbstyle
version = "2.28.3"; # mbstyle
hash = "sha256-RtxnQoWUSHOfizRS1eYR+o+n9HXpCt+bG1UOxFyRy9I="; # mbstyle
};
metadata = mkGeoserverExtension {
name = "metadata";
version = "2.28.2"; # metadata
hash = "sha256-EHtbBQpiqd56FtfizasbQtbMkwasOtZOcaRqStkjViU="; # metadata
version = "2.28.3"; # metadata
hash = "sha256-lFnZhs3FdGlQ4J37erOjLVB5QuRo6E0IUvAgONqvP4U="; # metadata
};
mongodb = mkGeoserverExtension {
name = "mongodb";
version = "2.28.2"; # mongodb
hash = "sha256-GlAXb1yx8bTAZr0z1H/3n6nODAsUeV21UgEej/97F4k="; # mongodb
version = "2.28.3"; # mongodb
hash = "sha256-M9l7jdp7oUfo0gMVfMcCVHizi0//YfBqh17tsiDMKno="; # mongodb
};
monitor = mkGeoserverExtension {
name = "monitor";
version = "2.28.2"; # monitor
hash = "sha256-zyCNr+Z/juYjD5cvcFssIe/fS/MxB8ZYaZsEOoPSBhI="; # monitor
version = "2.28.3"; # monitor
hash = "sha256-HPdoKySCLT3zVdOlNIuJlEu99mJ9J/VjTFEfT63UdUs="; # monitor
};
mysql = mkGeoserverExtension {
name = "mysql";
version = "2.28.2"; # mysql
hash = "sha256-xQPSia3O/K9wC9wQHiwle6Z1jXEgEUIWp59u4lVv2RU="; # mysql
version = "2.28.3"; # mysql
hash = "sha256-w/owOCOXJnw7EoJdPO8NGEw75MEfNMWSCySh0+2x84E="; # mysql
};
netcdf = mkGeoserverExtension {
name = "netcdf";
version = "2.28.2"; # netcdf
hash = "sha256-EXtbuSu0uBQ77BjKWTt6lw15Vb3X48MX7iF35JD8Z2s="; # netcdf
version = "2.28.3"; # netcdf
hash = "sha256-2O7s7SUjAm/V+O2LrdqOLou12WkjxIg0zuIgRMFUp9M="; # netcdf
buildInputs = [ netcdf ];
};
netcdf-out = mkGeoserverExtension {
name = "netcdf-out";
version = "2.28.2"; # netcdf-out
hash = "sha256-I7Snzevhl/hTxriKULartxda3ZX7pXP0HxFEwJMHFZE="; # netcdf-out
version = "2.28.3"; # netcdf-out
hash = "sha256-KgqbHHxBlr0EIPJ1MStCPzV/844C3CUUBuBMe2ljbuA="; # netcdf-out
buildInputs = [ netcdf ];
};
ogr-wfs = mkGeoserverExtension {
name = "ogr-wfs";
version = "2.28.2"; # ogr-wfs
version = "2.28.3"; # ogr-wfs
buildInputs = [ pkgs.gdal ];
hash = "sha256-/8EebpM9Ppc2BqsOTEly6i/U358X9mCAkC5PE3z3Uw0="; # ogr-wfs
hash = "sha256-+l9U1YoiKn1nxOUP5tRT/9WPRham5Lrk12xt/9rrZuM="; # ogr-wfs
};
# Needs ogr-wfs extension.
ogr-wps = mkGeoserverExtension {
name = "ogr-wps";
version = "2.28.2"; # ogr-wps
version = "2.28.3"; # ogr-wps
# buildInputs = [ pkgs.gdal ];
hash = "sha256-VTj2XBWXY+I73ux6Y/XTsAtvPpMXiuz+cieTmkNLr6M="; # ogr-wps
hash = "sha256-PBqObn/gle6A8RVPmKOPhi2YNTqR2MmhbqZT3X7TygI="; # ogr-wps
};
oracle = mkGeoserverExtension {
name = "oracle";
version = "2.28.2"; # oracle
hash = "sha256-a6idJZfCy2iSB5UWOepeZ1YGlhrOaMNpxHkJ5+8bJGc="; # oracle
version = "2.28.3"; # oracle
hash = "sha256-fHbgYIz7Kb7lTgDVlKPkMwldXIJn/mqG3oHDUk76rTc="; # oracle
};
params-extractor = mkGeoserverExtension {
name = "params-extractor";
version = "2.28.2"; # params-extractor
hash = "sha256-EEX0E3f4Y0A120Trz5molTFOIrcZVXXIdW3skn5ID7Y="; # params-extractor
version = "2.28.3"; # params-extractor
hash = "sha256-nseCXkh4V13FfbWtva79ydxg7sFMTeGrK3HygaVNPR8="; # params-extractor
};
printing = mkGeoserverExtension {
name = "printing";
version = "2.28.2"; # printing
hash = "sha256-uyhqI14sy1refOaZwJZ81IEobrOiKIGKR1y80llNAv0="; # printing
version = "2.28.3"; # printing
hash = "sha256-zGqDnmrO82cgCQgaorHa+O/Z5L42um/7CttZ2wC7Az4="; # printing
};
pyramid = mkGeoserverExtension {
name = "pyramid";
version = "2.28.2"; # pyramid
hash = "sha256-fHNbhIUBL9A4ND6QVT1Z1jPgqM0jz/MRt+WHmHIl2g4="; # pyramid
version = "2.28.3"; # pyramid
hash = "sha256-BCvGhp9WmdqutPu09kIExJzuFGdOWQ8Eyin95iIhdw8="; # pyramid
};
querylayer = mkGeoserverExtension {
name = "querylayer";
version = "2.28.2"; # querylayer
hash = "sha256-tQ/BSL12Zj1hYAl582p+kYz+7SS5HGLvKOrA5c/hUXA="; # querylayer
version = "2.28.3"; # querylayer
hash = "sha256-oA8F3J9i5sQTmUGLysddXF+GU6hR1yOHbNqiUAyPDTE="; # querylayer
};
sldservice = mkGeoserverExtension {
name = "sldservice";
version = "2.28.2"; # sldservice
hash = "sha256-tKow9r+0km/IyzlubSi7NwfyuCm8jYIBv3PYkmcDGN0="; # sldservice
version = "2.28.3"; # sldservice
hash = "sha256-AehHS+ELScFdeZi5kyqqJ9nldKla06r8Yq1PB43cYA0="; # sldservice
};
sqlserver = mkGeoserverExtension {
name = "sqlserver";
version = "2.28.2"; # sqlserver
hash = "sha256-6J7tEPUXqtKcD0aKgHQv7/24Lpv4pOZZnWvmkNHTeco="; # sqlserver
version = "2.28.3"; # sqlserver
hash = "sha256-ZS5ThHv/TEiH4BWcox68GKbqueFq7qhWDtDMgcUBINo="; # sqlserver
};
vectortiles = mkGeoserverExtension {
name = "vectortiles";
version = "2.28.2"; # vectortiles
hash = "sha256-MlP+mjoQZHc9SRPIfMcV7OtUFXM8Z9T+O+Ti6rWLQuc="; # vectortiles
version = "2.28.3"; # vectortiles
hash = "sha256-vvZSFfKgAFFtzLKv+RVh99frUyG2RkWrCwfR7scF+xw="; # vectortiles
};
wcs2_0-eo = mkGeoserverExtension {
name = "wcs2_0-eo";
version = "2.28.2"; # wcs2_0-eo
hash = "sha256-xxClO61LYNX80npRHoYvNvzz/eeVZ7yHoA2uhqGNLyQ="; # wcs2_0-eo
version = "2.28.3"; # wcs2_0-eo
hash = "sha256-x876KCXUbr1kGkAoHtDhoNqFGFVWw3te0tBt+03+ywU="; # wcs2_0-eo
};
web-resource = mkGeoserverExtension {
name = "web-resource";
version = "2.28.2"; # web-resource
hash = "sha256-hPS8B3DF+Em0ffL+z5z39dzyHlcdW0bgNNU3rRfzA9c="; # web-resource
version = "2.28.3"; # web-resource
hash = "sha256-gjeqIP0qGCjogDgxug3k+1daVCxKQeHAsEJJWmPbe/8="; # web-resource
};
wmts-multi-dimensional = mkGeoserverExtension {
name = "wmts-multi-dimensional";
version = "2.28.2"; # wmts-multi-dimensional
hash = "sha256-9wsLHgj0g+qGTfeVTkECfwIO1YwBRsxnS5H1NmsDqU0="; # wmts-multi-dimensional
version = "2.28.3"; # wmts-multi-dimensional
hash = "sha256-LbdMCDHjCiWpEUxL43RZY19a5DfJ9RKxmcq213NbAY8="; # wmts-multi-dimensional
};
wps = mkGeoserverExtension {
name = "wps";
version = "2.28.2"; # wps
hash = "sha256-DaL2b26sHW7a3WVB19H/S6pEJDde8fRwrHBDitWXqDI="; # wps
version = "2.28.3"; # wps
hash = "sha256-QgDpKbRGwGnAVrx/PW87N22D2yhrmzfg6qNmevXWI44="; # wps
};
# Needs hazelcast (https://github.com/hazelcast/hazelcast (?)) which is not
# available in nixpgs as of 2024/01.
#wps-cluster-hazelcast = mkGeoserverExtension {
# name = "wps-cluster-hazelcast";
# version = "2.28.2"; # wps-cluster-hazelcast
# hash = "sha256-+kgpkg+ZSi2IuupMUZ5O7aVXkeydylYv9ogALf4tDEM="; # wps-cluster-hazelcast
# version = "2.28.3"; # wps-cluster-hazelcast
# hash = "sha256-beSIkj3btLokQsS800vD0q2hiagLnnX+VTH8DMQy8NI="; # wps-cluster-hazelcast
#};
wps-download = mkGeoserverExtension {
name = "wps-download";
version = "2.28.2"; # wps-download
hash = "sha256-o3Ya6ez/Y0ia6dstYlkMd8t6UOc5dvfPo12BzsMpDh0="; # wps-download
version = "2.28.3"; # wps-download
hash = "sha256-2dIjMPA8Y3sPzJLtPxX0HFuq+dYxmz65dJzxugkSyS0="; # wps-download
};
# Needs Postrgres configuration or similar.
# See https://docs.geoserver.org/main/en/user/extensions/wps-jdbc/index.html
wps-jdbc = mkGeoserverExtension {
name = "wps-jdbc";
version = "2.28.2"; # wps-jdbc
hash = "sha256-9Toz6BKX6XN4ohEX8+jEJ1z7aEYxbdFCiUmbiWYLXk8="; # wps-jdbc
version = "2.28.3"; # wps-jdbc
hash = "sha256-yL5xw1g2FcWCSgfw28gbYmrvIiHD0coE9AAH601Bqbg="; # wps-jdbc
};
ysld = mkGeoserverExtension {
name = "ysld";
version = "2.28.2"; # ysld
hash = "sha256-XIQ6ksnySRNwtfMI696E57tIv1Aa2XKmyEpHdX7sRGs="; # ysld
version = "2.28.3"; # ysld
hash = "sha256-oe/eT/IdqnlrQ58HBpuQA6ZRw8oCPAWPQ2Tles71V8M="; # ysld
};
}
+2 -2
View File
@@ -10,11 +10,11 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "geoserver";
version = "2.28.2";
version = "2.28.3";
src = fetchurl {
url = "mirror://sourceforge/geoserver/GeoServer/${finalAttrs.version}/geoserver-${finalAttrs.version}-bin.zip";
hash = "sha256-Gp38NuG92I4RF+9VL5bmS0uIUU9/IAbw5FqLkiOxcLQ=";
hash = "sha256-jXvuIQvpOYGnRTcdHwa+p8lbMaaqiFDMLRRzpxs6wLg=";
};
sourceRoot = ".";
+3 -2
View File
@@ -9,17 +9,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gpxsee";
version = "15.11";
version = "16.0";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
tag = finalAttrs.version;
hash = "sha256-OZC4ClQUbOKb1nZD6kmZ2s6oHudhkLLW0HSrYiFCJfg=";
hash = "sha256-kZLIDgC1XGZlFyTeZYtbIe684Jnh5eJvlwTDlPbmei8=";
};
buildInputs = [
qt6.qtbase
qt6.qtmultimedia
qt6.qtpositioning
qt6.qtserialport
qt6.qtsvg
+5 -5
View File
@@ -11,20 +11,20 @@
}:
let
pname = "josm";
version = "19481";
version = "19555";
srcs = {
jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
hash = "sha256-Hl3ZJ4VWU7xthes4dxS1TFPMFWGQfC/kN7BGE10RuF4=";
hash = "sha256-OvpkNeppbaSnZBbRkHqoIVEVhKxhuJYTFDZm1n5reik=";
};
macosx = fetchurl {
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java24.zip";
hash = "sha256-FGnhyXYN3AyVDjL7aZBgHZ0eb61g2jUJjT5DQ3FUkb0=";
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip";
hash = "sha256-dVy+gEokVDImS/wOM8h6RqgfAnMHIiSQfb/8BoZICJo=";
};
pkg = fetchsvn {
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
rev = version;
hash = "sha256-9YTSX4chUxijtJ7a1pLE2kYo9hdOB/8vnnfFqMeXKbE=";
hash = "sha256-sAG9GI0SQpmdDqIXbSH/FN1io/QcsAJFv6/YT483aMA=";
};
};
@@ -7,16 +7,16 @@
buildGoModule (finalAttrs: {
pname = "kubectl-rook-ceph";
version = "0.9.5";
version = "0.9.6";
src = fetchFromGitHub {
owner = "rook";
repo = "kubectl-rook-ceph";
tag = "v${finalAttrs.version}";
hash = "sha256-OYK86GamU4m9vJUINfRbpM5U6mbjI3P6aiUp3+RZvIA=";
hash = "sha256-9keMfpYRtJ49fg8rVtwImPlkVHYKwjKWMtLHxhzUE18=";
};
vendorHash = "sha256-D2WbLc6/FVm9YB7meWdJ5Of0WYBB+kKC2+AepdgwJAA=";
vendorHash = "sha256-rXSXxSUR/F1eSsGUe1penn9eM2qTcPgE5pZmafQSISU=";
postInstall = ''
mv $out/bin/cmd $out/bin/kubectl-rook-ceph
+2 -2
View File
@@ -121,14 +121,14 @@ assert enableZfs -> isLinux;
stdenv.mkDerivation rec {
pname = "libvirt";
# if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
version = "12.1.0";
version = "12.2.0";
src = fetchFromGitLab {
owner = "libvirt";
repo = "libvirt";
tag = "v${version}";
fetchSubmodules = true;
hash = "sha256-gscVarCRdj7auFHedIFVAYT1de49QOWyhdm3NVWQ5zY=";
hash = "sha256-4F5cGEMg2TNyzt9Cmc3vLXdJnSEz4X5vPOsd0rHdpi0=";
};
patches = [
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "luau-lsp";
version = "1.62.0";
version = "1.64.1";
src = fetchFromGitHub {
owner = "JohnnyMorganz";
repo = "luau-lsp";
tag = finalAttrs.version;
hash = "sha256-dbuya7mjS0tZUX0nHHDoM7TXS/n9wAfXgcSBsfNW94M=";
hash = "sha256-8vUFPs+8SjeXxtNkLCepv27tLekBunqsrPj/IWONUVA=";
fetchSubmodules = true;
};
+2 -2
View File
@@ -31,13 +31,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mapnik";
version = "4.2.1";
version = "4.2.2";
src = fetchFromGitHub {
owner = "mapnik";
repo = "mapnik";
tag = "v${finalAttrs.version}";
hash = "sha256-olAM49kcYlhtQUwPk+YjQrLc+ChU+rl3f/A2DDbDLf4=";
hash = "sha256-Cx6RO22A4JKLlSeKBgXwSCpwh4P4B6i+jKaDa21PJXI=";
fetchSubmodules = true;
};
+3 -3
View File
@@ -7,13 +7,13 @@
}:
buildGoModule (finalAttrs: {
pname = "mimir";
version = "3.0.4";
version = "3.0.5";
src = fetchFromGitHub {
rev = "mimir-${finalAttrs.version}";
owner = "grafana";
repo = "mimir";
hash = "sha256-AVH2hY9BhQ6R8WCw6DcdkUSBzm5cTWyBL1pbqnRMVdE=";
hash = "sha256-C7vfJrcFin4zv/wO9IWIzUPtjiOAoOEWcniCTNm1eRs=";
};
vendorHash = null;
@@ -39,7 +39,7 @@ buildGoModule (finalAttrs: {
updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"mimir-([0-9.]+)"
"mimir-(3\.[0-9.]+)"
];
};
tests = {
+2 -2
View File
@@ -28,14 +28,14 @@ let
in
python3Packages.buildPythonApplication (finalAttrs: {
pname = "mistral-vibe";
version = "2.7.2";
version = "2.7.3";
pyproject = true;
src = fetchFromGitHub {
owner = "mistralai";
repo = "mistral-vibe";
tag = "v${finalAttrs.version}";
hash = "sha256-xQg7skgf0uFD8dLxESbbO1C341+I6BJXK716pX5xbNA=";
hash = "sha256-XRBrBd7X8HewrUJ7K8wQMcVJz3ITPKzyKpyCi7detsE=";
};
build-system = with python3Packages; [
@@ -26,6 +26,7 @@
.Op Fl -option Ar name value
.Op Fl -show-trace
.Op Fl -keep-going
.Op Fl -log-format Ar format
.Op Fl -help
.
.
@@ -193,6 +194,9 @@ Causes Nix to print out a stack trace in case of Nix expression evaluation error
.It Fl -keep-going
Causes Nix to continue building derivations as far as possible in the face of failed builds.
.
.It Fl -log-format Ar format
Set the format of log output; one of raw, internal-json, bar or bar-with-logs.
.
.It Fl -help
Synonym for
.Ic man nixos-install Ns
@@ -25,7 +25,7 @@ declare -A requestedBuildMethods
while [ "$#" -gt 0 ]; do
i="$1"; shift 1
case "$i" in
--max-jobs|-j|--cores|-I|--substituters)
--max-jobs|-j|--cores|-I|--substituters|--log-format)
j="$1"; shift 1
extraBuildFlags+=("$i" "$j")
;;
+3 -3
View File
@@ -14,13 +14,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "openasar";
version = "0-unstable-2026-03-04";
version = "0-unstable-2026-03-28";
src = fetchFromGitHub {
owner = "GooseMod";
repo = "OpenAsar";
rev = "a75870297df907d43ac6565385b0af4a781cf6fe";
hash = "sha256-tEKt2Qfk29HP448keMb7JR4+iTR3AXCho7PdkF0D1i0=";
rev = "2fa6bb6145320cb72c033bfffbf8162c5386a32f";
hash = "sha256-uzIbtoWCBbVpIxfc75H4isOOTJItH01S7hWzb17oDcg=";
};
postPatch = ''
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "openvr";
version = "2.12.14";
version = "2.15.6";
src = fetchFromGitHub {
owner = "ValveSoftware";
repo = "openvr";
rev = "v${finalAttrs.version}";
hash = "sha256-G+xoFIabSbYEaWATGSzHP3SWkaqQhQQ6kMkYfjBXBUU=";
hash = "sha256-xtCqro73fWQ6i0PiVmWYCK30DUSq1WeALoUolUjuWlE=";
};
patches = [
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "plasma-panel-colorizer";
version = "6.8.1";
version = "6.10.0";
src = fetchFromGitHub {
owner = "luisbocanegra";
repo = "plasma-panel-colorizer";
tag = "v${finalAttrs.version}";
hash = "sha256-ePY9Q+43ejFNyzHOObo4CkhYX9XTnwyelHO5+N+t1wE=";
hash = "sha256-s5KdQLBjy7RlgUwZScw9b6GLPsMBZzeV/kETtGdkNNE=";
};
nativeBuildInputs = [
+9 -7
View File
@@ -5,25 +5,22 @@
openssl,
pkg-config,
protobuf,
rocksdb_8_3,
rocksdb,
rust-jemalloc-sys-unprefixed,
rustPlatform,
rustc,
stdenv,
}:
let
rocksdb = rocksdb_8_3;
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "polkadot";
version = "2509-1";
version = "2603";
src = fetchFromGitHub {
owner = "paritytech";
repo = "polkadot-sdk";
rev = "polkadot-stable${finalAttrs.version}";
hash = "sha256-XisQA5WNmFaFfY7T4EMcwlOD8FUfAjmLDV7NSWsh3vA=";
hash = "sha256-vm8WUeIkgulCq9nwqQZsA5VHVv3vMEo66UNdHEhtmHY=";
# the build process of polkadot requires a .git folder in order to determine
# the git commit hash that is being built and add it to the version string.
@@ -44,7 +41,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
rm .git_commit
'';
cargoHash = "sha256-QqtLr6SvJGYrY0wGZw196amrGqLZg/Nea+QTYM1RzIs=";
cargoPatches = [
# make picosimd compile on nix (https://github.com/koute/picosimd/pull/3)
./picosimd-0.9.3.patch
];
cargoHash = "sha256-Da18rlsU8s045AzI3dZ6EhYm+CCAQFygrvVCZhudVaY=";
buildType = "production";
buildAndTestSubdir = "polkadot";
@@ -0,0 +1,16 @@
diff --git a/Cargo.lock b/Cargo.lock
index 966130af88..00710f9652 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -15086,9 +15086,9 @@ dependencies = [
[[package]]
name = "picosimd"
-version = "0.9.2"
+version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af35c838647fef3d6d052e27006ef88ea162336eee33063c50a63f163c18cdeb"
+checksum = "3f8cf1ae70818c6476eb2da0ac8f3f55ecdea41a7aa16824ea6efc4a31cccf41"
[[package]]
name = "pin-project"
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "domain-exporter";
version = "1.24.1";
version = "1.25.0";
src = fetchFromGitHub {
owner = "caarlos0";
repo = "domain_exporter";
rev = "v${version}";
hash = "sha256-qk/shaWY7M2JDx6W4e7z8Nv7yWUZKZNGZE/mj4zCZHw=";
hash = "sha256-LZsw3k/4h6nOVoaGiOASWrvIQf4wI6nSNuAjXsWcnd8=";
};
vendorHash = "sha256-1j5alRdCbO/ZJhuvVuiSsNBMRm7RqMOY/ex6US7qaxU=";
vendorHash = "sha256-gBcog+hw8yKYEBH6iokO7vnfDZn7zS0N/MWOGomxJGw=";
doCheck = false; # needs internet connection
+2 -2
View File
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "pyprland";
version = "3.3.0";
version = "3.3.1";
pyproject = true;
src = fetchFromGitHub {
owner = "hyprland-community";
repo = "pyprland";
tag = finalAttrs.version;
hash = "sha256-h7eoNn8ygdtg5rp9S2PSgCa9HSTgDZOjFvGl6KRbAtY=";
hash = "sha256-a4DT/lb9ZQo/4Rqb7tteuJ6ngdM7lav8BABvdhevri8=";
};
build-system = [ python3Packages.hatchling ];
+3 -3
View File
@@ -12,18 +12,18 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rtk";
version = "0.33.1";
version = "0.34.3";
src = fetchFromGitHub {
owner = "rtk-ai";
repo = "rtk";
tag = "v${finalAttrs.version}";
hash = "sha256-QkAtxSpMyjbscQgSUWks0aIkWaAYXgY6c9qM3sdPN+0=";
hash = "sha256-SQJhPit7efAjBezCNHtn5iZEEly6eApxsO9jGHLrKlg=";
};
strictDeps = true;
cargoHash = "sha256-Fz3P43sRl2DnzZtQrNzWk9XivGDiuNyt9+PBdkhLBkQ=";
cargoHash = "sha256-WpSwEx/pkGTIlDv1cTFtTcTC3YgddMYVbOLlqKYeDK0=";
nativeBuildInputs = [
makeWrapper
+3 -3
View File
@@ -16,18 +16,18 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ruff";
version = "0.15.8";
version = "0.15.9";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "ruff";
tag = finalAttrs.version;
hash = "sha256-hjllQ7lw2hecrwhPQlcq97LLxFYR28vCY14Ty6eBox4=";
hash = "sha256-ePivGE8izhG1fj6efV/UdN8P/KdWVCUGCYGP9abLN5w=";
};
cargoBuildFlags = [ "--package=ruff" ];
cargoHash = "sha256-iQKX+TqfP9r5P+UJKLqNysHYJm8N6qCCDfs8KYSb1vY=";
cargoHash = "sha256-DCTFjFl/fCbXwj7AGPNnrjvSTqxNW6PVWsUhbSGe/wI=";
nativeBuildInputs = [ installShellFiles ];
+13 -4
View File
@@ -4,25 +4,34 @@
buildGoModule,
go-mockery,
versionCheckHook,
writableTmpDirAsHomeHook,
}:
buildGoModule (finalAttrs: {
pname = "sesh";
version = "2.20.0";
version = "2.24.2";
nativeBuildInputs = [
go-mockery
writableTmpDirAsHomeHook
];
src = fetchFromGitHub {
owner = "joshmedeski";
repo = "sesh";
rev = "v${finalAttrs.version}";
hash = "sha256-YfgxXM8FPRAUk4jxUnQNNB8hMjiB5ZCRY2/S+OgzECs=";
tag = "v${finalAttrs.version}";
hash = "sha256-iisAIn4km/uFw2DohA2mjoYmKgDQ3lYUH284Le3xQD0=";
};
# NOTE: prevent crash when getting vendor deps/hash
overrideModAttrs = _: {
preBuild = "";
};
preBuild = ''
mockery
'';
vendorHash = "sha256-GEWtbhZhgussFzfg1wNEU0Gr5zhXmwlsgH6d1cXOwvc=";
vendorHash = "sha256-WHMQ7O5EZ43biR7HxjO9gUq8skFPCZVOx47NIPp5iSE=";
ldflags = [
"-s"
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "sslh";
version = "2.3.0";
version = "2.3.1";
src = fetchFromGitHub {
owner = "yrutschle";
repo = "sslh";
rev = "v${finalAttrs.version}";
hash = "sha256-qGOOqEe9wlR3pXmYEwMQTxuMcNLLX2i/39AIAb6I4jU=";
hash = "sha256-wHolBYn9pmCYEA6FkYkE1PJtlH0MZJkSVz+tSj3cS60=";
};
postPatch = "patchShebangs *.sh";
+3 -3
View File
@@ -1,15 +1,15 @@
{ lib, fetchFromGitHub }:
rec {
version = "2.6.0";
version = "2.6.4";
src = fetchFromGitHub {
owner = "TandoorRecipes";
repo = "recipes";
tag = version;
hash = "sha256-tjVqHcDy+Ms1L3IuGo3aKDKcrHU22YvDE8QBEQ8Hybg=";
hash = "sha256-PPx7rdJREh8qVHTk3a5j1lw3OwHXejravMGBak4u8b8=";
};
yarnHash = "sha256-yC8v/lYTL12YTJLX+/BrBLolzQ0O4kSZpcsduLHm65o=";
yarnHash = "sha256-9Oxp4C0iRaqsQG1e0DEdfUUAfSuZo/fiuQO0ofSJEXY=";
meta = {
homepage = "https://tandoor.dev/";
+2 -2
View File
@@ -52,14 +52,14 @@
}:
stdenv.mkDerivation (finalAttrs: {
version = "1.16.1";
version = "1.16.2";
pname = "tigervnc";
src = fetchFromGitHub {
owner = "TigerVNC";
repo = "tigervnc";
tag = "v${finalAttrs.version}";
hash = "sha256-mK9WjnAyEqikykCa6AzB6aB+QTZtxyCBmZV+rNbLxYM=";
hash = "sha256-yyJCtv48gKftyYND0v18qvh4gimxJt22vxiZBSNZ07U=";
};
postPatch =
+21 -8
View File
@@ -5,7 +5,7 @@
fetchpatch,
autoreconfHook,
libpcap,
wolfssl,
mbedtls,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -19,7 +19,14 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "sha256-Yf6QB7j5lYld2XtqhYspK4037lTtimoFc7nCavCP+mU=";
};
patches = lib.optionals stdenv.hostPlatform.isMusl [
patches = [
# See: <https://github.com/virtualsquare/vde-2/issues/69>
(fetchpatch {
name = "vde2-backport-mbedtls-support.patch";
url = "https://github.com/virtualsquare/vde-2/commit/e3f701978a0a20e56cd9829353d110d4ddcedd90.patch";
hash = "sha256-cq3yrA3w/K6J+RtwYX9AcG/nfctlAkc3aYJZpJxJXTQ=";
})
(fetchpatch {
url = "https://git.alpinelinux.org/aports/plain/main/vde2/musl-build-fix.patch?id=ddee2f86a48e087867d4a2c12849b2e3baccc238";
sha256 = "0b5382v541bkxhqylilcy34bh83ag96g71f39m070jzvi84kx8af";
@@ -30,21 +37,27 @@ stdenv.mkDerivation (finalAttrs: {
# https://github.com/virtualsquare/vde-2/commit/fedcb99c5f44c397f459ed0951a8fba4f4effb73
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") ''
MACOSX_DEPLOYMENT_TARGET=10.16
'';
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [
libpcap
wolfssl
mbedtls
];
configureFlags = [
"--with-crypt=mbedtls"
];
meta = {
homepage = "https://github.com/virtualsquare/vde-2";
description = "Virtual Distributed Ethernet, an Ethernet compliant virtual network";
platforms = lib.platforms.unix;
license = lib.licenses.gpl2Plus;
license = [
# Effectively `lib.licenses.gpl2Only`, but file headers differ.
lib.licenses.gpl2Plus
lib.licenses.gpl2Only
# libvdeplug and code copied from glibc.
lib.licenses.lgpl21Plus
];
};
})
@@ -9,13 +9,13 @@
ocamlPackages.buildDunePackage {
pname = "wayland-proxy-virtwl";
version = "0-unstable-2025-06-22";
version = "0-unstable-2026-04-03";
src = fetchFromGitHub {
owner = "talex5";
repo = "wayland-proxy-virtwl";
rev = "513f8d791f405154bb4053fe29861c03dc1302f7";
sha256 = "sha256-OBeq1p5vIoVvGPyOB03qtNo4GstYwr4MkvlFcpvI4ZI=";
rev = "34d499a119b9a903730144ba5836e70a73f812ac";
sha256 = "sha256-eU0HU0808Tp4Mw+RY2CZVikFIL1lk6rJg6lNVWj35jg=";
};
minimalOCamlVersion = "5.0";
+2 -2
View File
@@ -7,11 +7,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "wcslib";
version = "8.5";
version = "8.6";
src = fetchurl {
url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib-${finalAttrs.version}.tar.bz2";
hash = "sha256-8f0bePv9ur2jY/gEXgxZ4yc17KRUgqUwIZHlb+Bi6s4=";
hash = "sha256-4DBCNgWhme8JD+dCvJAagtnms6d+AQ4hHN1tLNBnzVo=";
};
nativeBuildInputs = [ flex ];
+1 -1
View File
@@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://www.wolfssl.com/";
changelog = "https://github.com/wolfSSL/wolfssl/releases/tag/v${finalAttrs.version}-stable";
platforms = lib.platforms.all;
license = lib.licenses.gpl2Plus;
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [
fab
vifino
+11 -1
View File
@@ -14,9 +14,14 @@
pam,
apacheHttpd,
pamtester,
xscreensaver,
coreutils,
makeWrapper,
# boolean flags
withXscreensaver ? true,
xscreensaver ? null,
withDocs ? false,
pandoc ? null,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -34,6 +39,9 @@ stdenv.mkDerivation (finalAttrs: {
autoreconfHook
pkg-config
makeWrapper
]
++ lib.optionals withDocs [
pandoc
];
buildInputs = [
@@ -51,6 +59,8 @@ stdenv.mkDerivation (finalAttrs: {
configureFlags = [
"--with-pam-service-name=login"
]
++ lib.optionals withXscreensaver [
"--with-xscreensaver=${xscreensaver}/libexec/xscreensaver"
];
@@ -5,13 +5,13 @@
}:
mkYaziPlugin {
pname = "gvfs.yazi";
version = "25.5.31-unstable-2026-03-24";
version = "25.5.31-unstable-2026-03-29";
src = fetchFromGitHub {
owner = "boydaihungst";
repo = "gvfs.yazi";
rev = "a908b623aef9c93b9921ce9b16cf50f0f3da0091";
hash = "sha256-3BM1XT1Kk0nXBwZ76MPfEHoYW0+4NXvB5o6Nlf+VL9g=";
rev = "3abc0a258f9d7aeaa453a2d0d6e103c5a305953d";
hash = "sha256-UHneVJ+YXyDuPrZS+PZbs9n9h+VN5M2QG36FdprBkJc=";
};
meta = {
@@ -5,13 +5,13 @@
}:
mkYaziPlugin {
pname = "mediainfo.yazi";
version = "26.1.22-unstable-2026-03-24";
version = "26.1.22-unstable-2026-03-31";
src = fetchFromGitHub {
owner = "boydaihungst";
repo = "mediainfo.yazi";
rev = "a7febc034d1a5bef73921d1a2b170224549870bd";
hash = "sha256-v/yq7Dyivbf05SJ8Yk3QOkKFixpYkoGMtjuQSrGsN8I=";
rev = "75f93be8f153709a22b798105462de6105f54d90";
hash = "sha256-G3Nh56OdQInByHDQbI+yFe0s2fEaQlejLdakcoJFf4I=";
};
meta = {
-82
View File
@@ -1,82 +0,0 @@
{
lib,
stdenv,
fetchurl,
p7zip,
cmake,
SDL2,
openal,
fluidsynth,
soundfont-fluid,
bzip2,
zlib,
libjpeg,
game-music-emu,
libsndfile,
mpg123,
}:
stdenv.mkDerivation rec {
pname = "zdoom";
majorVersion = "2.8";
version = "${majorVersion}.1";
src = fetchurl {
url = "https://zdoom.org/files/zdoom/${majorVersion}/zdoom-${version}-src.7z";
sha256 = "0453fqrh9l00xwphfxni5qkf9y134n3s1mr1dvi5cbkxcva7j8bq";
};
nativeBuildInputs = [
p7zip
cmake
];
buildInputs = [
SDL2
openal
fluidsynth
bzip2
zlib
libjpeg
game-music-emu
libsndfile
mpg123
];
cmakeFlags = [
"-DFORCE_INTERNAL_GME=OFF"
"-DGME_INCLUDE_DIR=${game-music-emu}/include"
"-DGME_LIBRARIES=${game-music-emu}/lib/libgme.so"
];
sourceRoot = ".";
env.NIX_CFLAGS_LINK = toString [
"-lopenal"
"-lfluidsynth"
];
preConfigure = ''
sed -i \
-e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \
-e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \
src/sound/music_fluidsynth_mididevice.cpp
'';
installPhase = ''
install -Dm755 zdoom "$out/lib/zdoom/zdoom"
for i in *.pk3; do
install -Dm644 "$i" "$out/lib/zdoom/$i"
done
mkdir -p $out/bin
ln -s $out/lib/zdoom/zdoom $out/bin/zdoom
'';
meta = {
homepage = "http://zdoom.org/";
description = "Enhanced port of the official DOOM source code";
# Doom source license, MAME license
license = lib.licenses.unfreeRedistributable;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ lassulus ];
};
}
@@ -25,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-keyboard";
version = "8.1.0";
version = "8.1.1";
src = fetchFromGitHub {
owner = "elementary";
repo = "settings-keyboard";
rev = version;
sha256 = "sha256-8lgoR7nYqUJfLr9UhqnFJWw9x9l97RxgIkAwodHgrzI=";
sha256 = "sha256-JuFx0PkbB6ctXhqtORlgtSq9oigaLL2N4IKX7NQgHcU=";
};
patches = [
@@ -25,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-pantheon-shell";
version = "8.2.1";
version = "8.3.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "settings-desktop";
tag = version;
hash = "sha256-8NPMZfOQIZtMiGrsFXYPOwNbPU+d9CgPBsT36VJsvHw=";
hash = "sha256-qczv+G0v47SiMsLlWjDPK0ZY4J+V/CXe/l7b6pWG+WY=";
};
nativeBuildInputs = [
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "elementary-onboarding";
version = "8.0.4";
version = "8.1.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "onboarding";
rev = version;
sha256 = "sha256-d/8kVAvEUKNlpXRsKQrA0LCJetut2MlQlLq7MgIKlhk=";
sha256 = "sha256-y5qMZoVqFpE3d6PRKDO1ldMULCaH3S4phJgAMhY2dSg=";
};
nativeBuildInputs = [
@@ -90,6 +90,9 @@ buildPythonPackage (finalAttrs: {
"test_duplicate_points_have_similar_scores"
# AssertionError: assert 'Annotators [1] did not label any examples.'
"test_label_quality_scores_multiannotator"
# AttributeError: module 'numpy' has no attribute 'in1d' (deprecated since numpy 2.x)
"test_bad_input_find_label_issues_internal"
"test_return_issues_ranked_by_scores"
]
++ lib.optionals (pythonAtLeast "3.12") [
# AttributeError: 'called_once_with' is not a valid assertion.
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "libvirt";
version = "12.1.0";
version = "12.2.0";
pyproject = true;
src = fetchFromGitLab {
owner = "libvirt";
repo = "libvirt-python";
tag = "v${version}";
hash = "sha256-1WxrDg3aJJ7lwIZXj3IXsyi3zSnxmknsVMmNQ8T+oHY=";
hash = "sha256-ACnRYDUb+1J7ZDFnuvktkwLGxwi91l2ursKG/NPt62o=";
};
postPatch = ''
@@ -8,14 +8,14 @@
buildPythonPackage (finalAttrs: {
pname = "oelint-data";
version = "1.4.7";
version = "1.4.8";
pyproject = true;
src = fetchFromGitHub {
owner = "priv-kweihmann";
repo = "oelint-data";
tag = finalAttrs.version;
hash = "sha256-V2WH24+I9e7gjtqt19O8sm8crzkkl90z6eDFiZAWLQY=";
hash = "sha256-ROnu57c6UNjFOfZvDs2FlCz/6UGXA4G63d7IBuloeaI=";
};
build-system = [
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "osc";
version = "1.25.0";
version = "1.26.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "osc";
rev = version;
hash = "sha256-ES4HhWlJx7fRf9rXWBeAANyCy1eC1Rz6yFczXvQ66Vo=";
hash = "sha256-2h9099tSGMjjSN8HN3B/mk6ZNV3Ga1eHhtWkULX1iJQ=";
};
buildInputs = [ bashInteractive ]; # needed for bash-completion helper
-25
View File
@@ -1,25 +0,0 @@
diff --git a/src/openvpn/ovpn_dco_linux.h b/src/openvpn/ovpn_dco_linux.h
index 73e19b5..46c2786 100644
--- a/src/openvpn/ovpn_dco_linux.h
+++ b/src/openvpn/ovpn_dco_linux.h
@@ -237,20 +237,4 @@ enum ovpn_netlink_packet_attrs {
OVPN_PACKET_ATTR_MAX = __OVPN_PACKET_ATTR_AFTER_LAST - 1,
};
-enum ovpn_ifla_attrs {
- IFLA_OVPN_UNSPEC = 0,
- IFLA_OVPN_MODE,
-
- __IFLA_OVPN_AFTER_LAST,
- IFLA_OVPN_MAX = __IFLA_OVPN_AFTER_LAST - 1,
-};
-
-enum ovpn_mode {
- __OVPN_MODE_FIRST = 0,
- OVPN_MODE_P2P = __OVPN_MODE_FIRST,
- OVPN_MODE_MP,
-
- __OVPN_MODE_AFTER_LAST,
-};
-
#endif /* _UAPI_LINUX_OVPN_DCO_H_ */
+2 -9
View File
@@ -23,20 +23,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "openvpn";
version = "2.6.14";
version = "2.6.19";
src = fetchurl {
url = "https://swupdate.openvpn.net/community/releases/openvpn-${finalAttrs.version}.tar.gz";
hash = "sha256-nramYYNS+ee3canTiuFjG17f7tbUAjPiQ+YC3fIZXno=";
hash = "sha256-E3AlJvaHwYslQMGj8uGJGHuqplIR7c9/9ncvpp8FNs8=";
};
# Effectively a backport of https://github.com/OpenVPN/openvpn/commit/1d3c2b67a73a0aa011c13e62f876d24e49d41df0
# to fix build on linux-headers 6.16.
# FIXME: remove in next update
patches = [
./dco.patch
];
nativeBuildInputs = [
pkg-config
]
+2 -2
View File
@@ -20,7 +20,7 @@
let
pkg_path = "$out/lib/ghidra";
pname = "ghidra";
version = "12.0.2";
version = "12.0.4";
isMacArm64 = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
@@ -30,7 +30,7 @@ let
owner = "NationalSecurityAgency";
repo = "Ghidra";
rev = "Ghidra_${version}_build";
hash = "sha256-sJINXAV43oKFOqEiVSfNcJXooLlju0GsogZ5bQoXewc=";
hash = "sha256-ETRsLbnE4RU+MdmSxMHNIbevYsZhgrzqQDQmBojchLk=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
+3 -3
View File
@@ -28,11 +28,11 @@ let
in
stdenv.mkDerivation rec {
pname = "ghidra";
version = "12.0.2";
versiondate = "20260129";
version = "12.0.4";
versiondate = "20260303";
src = fetchzip {
url = "https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_${version}_build/ghidra_${version}_PUBLIC_${versiondate}.zip";
hash = "sha256-E2edj1psLK1hrKCDcjQbQZaYls8iq5ZG3vdwSUUJts8=";
hash = "sha256-O+Y1k1fRVTZVJMBA62gyqWw0KZOwrBqqRC3dlhQHbhY=";
};
nativeBuildInputs = [
+12 -12
View File
@@ -104,40 +104,40 @@
}
},
"https://github.com": {
"NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/Debugger/dbgmodel": {
"NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/Debugger/dbgmodel": {
"tlb": "sha256-jPXzouuBFgqjSQVqXKTCxyaxtumL8wl81BNRRxYzQ8c="
},
"NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vs2012_x64": {
"NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vs2012_x64": {
"fidb": "sha256-1OmKs/eQuDF5MhhDC7oNiySl+/TaZbDB/6jLDPvrDNw="
},
"NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vs2012_x86": {
"NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vs2012_x86": {
"fidb": "sha256-pJDtfi7SHlh0Wf6urOcDa37eTOhOcuEN/YxXQ0ppGLY="
},
"NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vs2015_x64": {
"NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vs2015_x64": {
"fidb": "sha256-4E6eQPnstgHIX02E7Zv2a0U2O+HR6CwWLkyZArjLUI8="
},
"NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vs2015_x86": {
"NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vs2015_x86": {
"fidb": "sha256-tm7mlmU+LtNlkZ3qrviFEDEgx5LiLnmvcNEgnX4dhkQ="
},
"NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vs2017_x64": {
"NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vs2017_x64": {
"fidb": "sha256-1fpfaXKYF0+lPSR9NZnmoSiEYFrRgce5VOI4DsHwvYk="
},
"NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vs2017_x86": {
"NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vs2017_x86": {
"fidb": "sha256-04nLjXb/SlnKNfiRuFIccq1fDfluJTlzotIahhSkzIE="
},
"NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vs2019_x64": {
"NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vs2019_x64": {
"fidb": "sha256-FQAHeW/DakBpZgrWJEmq2q890Rs4ZKXvIeeYMcnOkRg="
},
"NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vs2019_x86": {
"NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vs2019_x86": {
"fidb": "sha256-62MKNvqlhqNx63NNwLvY0TzK72l/PbWHJZY1jz3SQyo="
},
"NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vsOlder_x64": {
"NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vsOlder_x64": {
"fidb": "sha256-jDtR9GYM0n4aDWEKnz8tX7yDOmasnuQ5PuLySB6FWGY="
},
"NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vsOlder_x86": {
"NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vsOlder_x86": {
"fidb": "sha256-mGBca2uSFKlF2ETkHIWGDVRkmkW8p4c+9pkcDpNyB4c="
},
"NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/lib/java-sarif-2.1-modified": {
"NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/lib/java-sarif-2.1-modified": {
"jar": "sha256-f3NlZklHVtJxql5LGvbIncUNB0qxxjdKR9+CImQiawE="
},
"Z3Prover/z3/releases/download/z3-4.13.0/z3-4.13.0-arm64-osx-11.0": {
@@ -15,10 +15,10 @@
let
# Incorporates source from binutils
# https://github.com/NationalSecurityAgency/ghidra/blob/7ab9bf6abffb6938d61d072040fc34ad3331332b/GPL/GnuDisassembler/build.gradle#L34-L35
binutils-version = "2.41";
binutils-version = "2.44";
binutils-src = fetchurl {
url = "mirror://gnu/binutils/binutils-${binutils-version}.tar.bz2";
sha256 = "sha256-pMS+wFL3uDcAJOYDieGUN38/SLVmGEGOpRBn9nqqsws=";
sha256 = "sha256-9mOQpmH6oRfQD6suec8tydCXtCzClr8/hnfR57RS3Do=";
};
in
buildGhidraExtension {
@@ -29,6 +29,8 @@ buildGhidraExtension {
postPatch = ''
ln -s ${binutils-src} binutils-${binutils-version}.tar.bz2
substituteInPlace build.gradle \
--replace-fail 'ext.binutils = "binutils-2.41"' 'ext.binutils = "binutils-${binutils-version}"'
'';
# Don't modify ELF stub resources
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "sslscan";
version = "2.2.1";
version = "2.2.2";
src = fetchFromGitHub {
owner = "rbsec";
repo = "sslscan";
tag = version;
hash = "sha256-HE0Jc0FSH/hK7wDhEOFR6nJJzyVAVlNhrCVlY0AlNU4=";
hash = "sha256-qrd0NJS7M3nKFpAOpd8raGLrMj6PixTqiuus25lv+PA=";
};
buildInputs = [ openssl ];
+1
View File
@@ -2475,6 +2475,7 @@ mapAliases {
zandronum-alpha-server = throw "'zandronum-alpha-server' has been removed as it was broken and the stable version has caught up"; # Added 2025-10-19
zashboard = throw "'zashboard' has been removed because upstream repository source code has been deleted"; # Added 2025-12-29
zbackup = throw "'zbackup' has been removed due to being unmaintained upstream"; # Added 2025-08-22
zdoom = throw "'zdoom' has been removed as it was broken and unmaintained upstream. Consider using UZDoom instead."; # Added 2026-04-04
zeal-qt5 = warnAlias "'zeal-qt5' has been removed from nixpkgs. Please use 'zeal' instead" zeal; # Added 2025-08-31
zeal-qt6 = warnAlias "'zeal-qt6' has been renamed to 'zeal'" zeal; # Added 2025-08-31
zeroadPackages.zeroad = throw "'zeroadPackages.zeroad' has been renamed to/replaced by 'zeroad'"; # Converted to throw 2025-10-27