diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md
index 03db19602c86..3ab04c40e34d 100644
--- a/doc/release-notes/rl-2605.section.md
+++ b/doc/release-notes/rl-2605.section.md
@@ -26,6 +26,8 @@
- `python3Packages.gradio` has been updated to version 6. See upstream's migration guide at https://www.gradio.app/main/guides/gradio-6-migration-guide.
+- `vicinae` has been updated to v0.17. Version 0.17 contains a complete overhaul of the configuration system. For update instructions, see the [release notes for v0.17.0](https://github.com/vicinaehq/vicinae/releases/tag/v0.17.0) and the [upstream configuration documentation](https://docs.vicinae.com/config).
+
- All Log4Shell vulnerability scanners were removed, as they were all unmaintained upstream and are no longer relevant given that the vulnerability has been fixed upstream for several years.
- `asio` (standalone version of `boost::asio`) has been updated from 1.24.0 to 1.36.0. Some breaking changes were introduced between these
diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json
index 1b858ceb30d8..ab0fd2491d3c 100644
--- a/maintainers/github-teams.json
+++ b/maintainers/github-teams.json
@@ -153,11 +153,12 @@
"id": 5704451,
"maintainers": {
"ConnorBaker": 3880346,
+ "GaetanLepage": 33058747,
"SomeoneSerge": 9720532,
+ "YorikSar": 428074,
"samuela": 226872
},
"members": {
- "GaetanLepage": 33058747,
"prusnak": 42201
},
"name": "cuda-maintainers"
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 838378e0591a..72d1d859d3ab 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6897,6 +6897,12 @@
githubId = 53937537;
keys = [ { fingerprint = "BBC4 C071 516B A147 8D07 F9DC D2FD E6EC 2E8C 2BF4"; } ];
};
+ doprz = {
+ name = "Diego Perez";
+ github = "doprz";
+ githubId = 52579214;
+ keys = [ { fingerprint = "B423 DDC0 5EAC 14B4 67A6 F826 0323 AA44 BA23 6DF7"; } ];
+ };
doronbehar = {
email = "me@doronbehar.com";
github = "doronbehar";
diff --git a/nixos/modules/hardware/facter/debug.nix b/nixos/modules/hardware/facter/debug.nix
new file mode 100644
index 000000000000..810a6abbcd9e
--- /dev/null
+++ b/nixos/modules/hardware/facter/debug.nix
@@ -0,0 +1,81 @@
+{
+ lib,
+ pkgs,
+ config,
+ extendModules,
+ ...
+}:
+{
+
+ options = {
+
+ system.build = {
+ noFacter = lib.mkOption {
+ type = lib.types.unspecified;
+ description = "A version of the system closure with facter disabled";
+ };
+ };
+
+ hardware.facter.debug = {
+ nvd = lib.mkOption {
+ type = lib.types.package;
+ description = ''
+ A shell application which will produce an nvd diff of the system closure with and without facter enabled.
+ '';
+ };
+ nix-diff = lib.mkOption {
+ type = lib.types.package;
+ description = ''
+ A shell application which will produce a nix-diff of the system closure with and without facter enabled.
+ '';
+ };
+ };
+
+ };
+
+ config.system.build = {
+ noFacter = extendModules {
+ modules = [
+ {
+ # we 'disable' facter by overriding the report and setting it to empty with one caveat: hostPlatform
+ config.hardware.facter.report = lib.mkForce {
+ system = config.nixpkgs.hostPlatform;
+ };
+ }
+ ];
+ };
+ };
+
+ config.hardware.facter.debug = {
+
+ nvd = pkgs.writeShellApplication {
+ name = "facter-nvd-diff";
+ runtimeInputs = [
+ config.nix.package
+ pkgs.nvd
+ ];
+ text = ''
+ nvd diff \
+ ${config.system.build.noFacter.config.system.build.toplevel} \
+ ${config.system.build.toplevel} \
+ "$@"
+ '';
+ };
+
+ nix-diff = pkgs.writeShellApplication {
+ name = "facter-nix-diff";
+ runtimeInputs = [
+ config.nix.package
+ pkgs.nix-diff
+ ];
+ text = ''
+ nix-diff \
+ ${config.system.build.noFacter.config.system.build.toplevel} \
+ ${config.system.build.toplevel} \
+ "$@"
+ '';
+ };
+
+ };
+
+}
diff --git a/nixos/modules/hardware/facter/default.nix b/nixos/modules/hardware/facter/default.nix
index 12499b5ad31f..e1376769a333 100644
--- a/nixos/modules/hardware/facter/default.nix
+++ b/nixos/modules/hardware/facter/default.nix
@@ -7,6 +7,7 @@
imports = [
./bluetooth.nix
./camera
+ ./debug.nix
./disk.nix
./fingerprint
./firmware.nix
diff --git a/nixos/tests/prometheus/ui.nix b/nixos/tests/prometheus/ui.nix
index fb5ddcd58f55..3ef784f3ad8b 100644
--- a/nixos/tests/prometheus/ui.nix
+++ b/nixos/tests/prometheus/ui.nix
@@ -7,6 +7,8 @@
browser =
{ config, pkgs, ... }:
{
+ virtualisation.memorySize = 1024 * 2;
+
environment.systemPackages =
let
prometheusSeleniumScript =
@@ -18,20 +20,87 @@
from selenium import webdriver
from selenium.webdriver.common.by import By
from selenium.webdriver.firefox.options import Options
+ from selenium.webdriver.support.relative_locator import locate_with
from selenium.webdriver.support.ui import WebDriverWait
options = Options()
options.add_argument("--headless")
- service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}") # noqa: E501
+ service = webdriver.FirefoxService(
+ executable_path="${lib.getExe pkgs.geckodriver}") # noqa: E501
driver = webdriver.Firefox(options=options, service=service)
driver.implicitly_wait(10)
- driver.get("http://prometheus:9090/")
+ driver.get("http://prometheus:9090/")
wait = WebDriverWait(driver, 60)
- assert len(driver.find_elements(By.CLASS_NAME, "mantine-AppShell-header")) > 0 # noqa: E501
- assert len(driver.find_elements(By.CLASS_NAME, "mantine-AppShell-main")) > 0 # noqa: E501
+ # There should have been a redirect
+ url = driver.current_url
+ assert url == "http://prometheus:9090/query"
+
+ assert len(driver.find_elements(
+ By.CLASS_NAME, "mantine-AppShell-header")) > 0
+ assert len(driver.find_elements(
+ By.CLASS_NAME, "mantine-AppShell-main")) > 0
+
+ # Do a Prometheus query
+ query_box = driver.find_element(
+ By.XPATH, "//div[@role='textbox']")
+ query_box.click()
+ query_box.send_keys("up")
+
+ # Run query with execute button
+ driver.find_element(
+ By.XPATH, "//span[contains(text(),'Execute')]").click()
+
+ # Find query result table
+ table_tr_elements = driver.find_elements(
+ By.CLASS_NAME, "mantine-Table-tr")
+ assert len(table_tr_elements) == 1
+
+ # Navigate to target health page
+ driver.find_element(
+ By.XPATH, "//span[text()='Status']").click()
+
+ driver.find_element(
+ By.LINK_TEXT, "Target health").click()
+
+ url = driver.current_url
+ assert url == "http://prometheus:9090/targets"
+
+ # Click on the prometheus job dropdown button
+ prometheus_job_dropdown = driver.find_element(
+ By.CLASS_NAME, "mantine-Accordion-chevron").click()
+
+ targets_healthy = len(driver.find_elements(
+ By.CSS_SELECTOR, "div[class^='_healthOk']"))
+ assert targets_healthy == 1
+
+ targets_errored = len(driver.find_elements(
+ By.CSS_SELECTOR, "div[class^='_healthErr']"))
+ assert targets_errored == 0
+
+ # Go back to homepage
+ driver.find_element(
+ By.XPATH, "//span[text()='Query']").click()
+
+ # Navigate to build info section and verify correct version
+ # number shown
+ driver.find_element(
+ By.XPATH, "//span[text()='Status']").click()
+
+ driver.find_element(
+ By.LINK_TEXT, "Runtime & build information").click()
+
+ url = driver.current_url
+ assert url == "http://prometheus:9090/status"
+
+ # Find table
+ version_th_element = driver.find_element(
+ By.XPATH, "//th[text()='version']")
+ version_td_element = driver.find_element(
+ locate_with(By.TAG_NAME, "td").near(version_th_element))
+ assert version_td_element.text == "${pkgs.prometheus.version}"
driver.close()
'';
@@ -59,8 +128,7 @@
static_configs = [
{
targets = [
- "prometheus1:${toString config.services.prometheus.port}"
- "prometheus2:${toString config.services.prometheus.port}"
+ "prometheus:${toString config.services.prometheus.port}"
];
}
];
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index ea400ebe4deb..30ff7d823f17 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1225,8 +1225,8 @@ let
mktplcRef = {
name = "vscode-markdownlint";
publisher = "DavidAnson";
- version = "0.60.0";
- hash = "sha256-Buwa63HahT96qhhuvARW7p1u9kbkoEyA9usoh60m3KE=";
+ version = "0.61.1";
+ hash = "sha256-3O4ii6RUuw35pv95zJwJhgnI/8ryAnSKfnHC01l3FDw=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog";
diff --git a/pkgs/applications/editors/vscode/extensions/llvm-vs-code-extensions.lldb-dap/default.nix b/pkgs/applications/editors/vscode/extensions/llvm-vs-code-extensions.lldb-dap/default.nix
index 5b69faed8bba..e8205d021eda 100644
--- a/pkgs/applications/editors/vscode/extensions/llvm-vs-code-extensions.lldb-dap/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/llvm-vs-code-extensions.lldb-dap/default.nix
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "lldb-dap";
publisher = "llvm-vs-code-extensions";
- version = "0.2.18";
- hash = "sha256-H2CSy+Zow6inLUgSW5VNHZBEmag1acslX3bkw3XYcKA=";
+ version = "0.4.1";
+ hash = "sha256-7eMVniepE4lDLAYsMpE5bKYvkfskGaOapxYUJy58mJA=";
};
meta = {
diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix
index 5244d4dd10ce..6dc1150dcb77 100644
--- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix
@@ -14,19 +14,19 @@ let
vsix = stdenvNoCC.mkDerivation (finalAttrs: {
name = "roo-code-${finalAttrs.version}.vsix";
pname = "roo-code-vsix";
- version = "3.36.2";
+ version = "3.36.6";
src = fetchFromGitHub {
owner = "RooCodeInc";
repo = "Roo-Code";
tag = "v${finalAttrs.version}";
- hash = "sha256-YO3TxKcCDoIJeBoMGFFrHUp6lne1e84Tf1I2vHF6w1c=";
+ hash = "sha256-bb6IXi88TPqXnC5eCXj7G0y7xO4yOJWSp1frHkLRwH0=";
};
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
fetcherVersion = 2;
- hash = "sha256-k6Bw6MlFDNPNPdaKJ7tW8wje2j9LJvREtlAWyySnOC0=";
+ hash = "sha256-YfDWspdDBiEWiGuitqZLChntVHFly4O2HE/eKVL/ZGY=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/emulators/libretro/cores/yabause.nix b/pkgs/applications/emulators/libretro/cores/yabause.nix
index a825ad01c7ce..7b6539f8e470 100644
--- a/pkgs/applications/emulators/libretro/cores/yabause.nix
+++ b/pkgs/applications/emulators/libretro/cores/yabause.nix
@@ -6,13 +6,13 @@
}:
mkLibretroCore {
core = "yabause";
- version = "0-unstable-2024-10-21";
+ version = "0-unstable-2025-12-20";
src = fetchFromGitHub {
owner = "libretro";
repo = "yabause";
- rev = "c35712c5ed33e18d77097f2059a036e19d1d66f2";
- hash = "sha256-4/gxWNPkGKBf4ti7ZF4GXgng6ZPyM9prrvK0S5tZ6V8=";
+ rev = "65af22e96beb6d9b0b9a50a81a39c86a6d604c1c";
+ hash = "sha256-LafC48f1m6pRWhXmfN+D+5r9qCNm1v9uLJVq5Wa5naE=";
};
makefile = "Makefile";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index a03a7d869cc5..75e2ad6947de 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -45,13 +45,13 @@
"vendorHash": "sha256-weHY7ZV3HaFBYlDNhwAYN9vDItkI+wtk9UNlM0uuwfY="
},
"aliyun_alicloud": {
- "hash": "sha256-pDbTdKYTpRBN/o5bWg5VRfD+AJNhpqIWmGpzMAaHfAg=",
+ "hash": "sha256-i53+JvEr5K4/RCsk5Kfa1Nbox1/KfsgXjX5wCa4zd7o=",
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
"owner": "aliyun",
"repo": "terraform-provider-alicloud",
- "rev": "v1.265.0",
+ "rev": "v1.266.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-LSvX63g4GWcr2Uo6H50dOWG0XWUhmbhUw9EYsQqs+HU="
+ "vendorHash": "sha256-xRoj0X06lhoVXFLfrV8ganqsyzc4PFk+6R2Jx67VIpE="
},
"aminueza_minio": {
"hash": "sha256-G6eQeoxIeuUJK7LF8gByOrNP27i3p0OccZNxL2DxDw0=",
diff --git a/pkgs/by-name/ai/airgorah/package.nix b/pkgs/by-name/ai/airgorah/package.nix
index bd9710c940b5..82b9c16d7646 100644
--- a/pkgs/by-name/ai/airgorah/package.nix
+++ b/pkgs/by-name/ai/airgorah/package.nix
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
install -Dm644 icons/app_icon.png $out/share/icons/hicolor/1024x1024/apps/airgorah.png
'';
- dessktopItems = [
+ desktopItems = [
(makeDesktopItem {
name = "airgorah";
comment = "A WiFi auditing software that can perform deauth attacks and passwords cracking";
diff --git a/pkgs/by-name/an/animeko/package.nix b/pkgs/by-name/an/animeko/package.nix
index 76d65d77c071..35a4d225876c 100644
--- a/pkgs/by-name/an/animeko/package.nix
+++ b/pkgs/by-name/an/animeko/package.nix
@@ -75,8 +75,31 @@
writeShellScript,
nix-update,
libxml2,
+ boost,
+ thrift,
+ libGL,
+ libX11,
+ libXdamage,
+ nss,
+ nspr,
}:
+let
+ thrift20 = thrift.overrideAttrs (old: {
+ version = "0.20.0";
+ src = fetchFromGitHub {
+ owner = "apache";
+ repo = "thrift";
+ tag = "v0.20.0";
+ hash = "sha256-cwFTcaNHq8/JJcQxWSelwAGOLvZHoMmjGV3HBumgcWo=";
+ };
+
+ cmakeFlags = (old.cmakeFlags or [ ]) ++ [
+ "-DCMAKE_POLICY_VERSION_MINIMUM=3.10"
+ ];
+ });
+
+in
stdenv.mkDerivation (finalAttrs: {
pname = "animeko";
version = "5.2.0";
@@ -191,6 +214,13 @@ stdenv.mkDerivation (finalAttrs: {
libdvdnav
flac
libxml2
+ boost
+ thrift20
+ nss
+ nspr
+ libGL
+ libX11
+ libXdamage
];
dontWrapQtApps = true;
diff --git a/pkgs/by-name/an/anyk/package.nix b/pkgs/by-name/an/anyk/package.nix
index 883ee9450c45..f73a53a47a0e 100644
--- a/pkgs/by-name/an/anyk/package.nix
+++ b/pkgs/by-name/an/anyk/package.nix
@@ -1,10 +1,9 @@
{
stdenv,
lib,
- fetchurl,
+ maven,
fetchzip,
- openjdk,
- openjfx,
+ jre,
writeScript,
runCommandLocal,
bash,
@@ -26,39 +25,38 @@ let
stripRoot = false;
};
- # ÁNYK needs JavaFX for the Ügyfélkapu login webview.
- jdkWithFX = openjdk.override {
- enableJavaFX = true;
- openjfx_jdk = openjfx.override { withWebKit = true; };
+ # ÁNYK uses some SOAP stuff that's not shipped with OpenJDK any more.
+ # We don't really want to use openjdk8 because it's unusable on HiDPI
+ # and people are more likely to have a modern OpenJDK installed.
+ # We use Maven to resolve these unbundled dependencies.
+ # jdk_headless is just overriden so we don't have to fetch another OpenJDK for no reason.
+ soapDeps = (maven.override { jdk_headless = jre; }).buildMavenPackage {
+ pname = "anyk-soap-deps";
+ version = "1.0.0";
+
+ src = lib.sources.sourceFilesBySuffices ./. [ "pom.xml" ];
+
+ mvnHash = "sha256-4keHPzS8pbIIwODmBUMofJt27n5WqYh+IGqE6d9od7k=";
+
+ installPhase = ''
+ mkdir -p $out/share/java
+ cp target/lib/*.jar $out/share/java/
+ '';
};
- extraClasspath = [
- # ÁNYK uses some SOAP stuff that's not shipped with OpenJDK any more.
- # We don't really want to use openjdk8 because it's unusable on HiDPI
- # and people are more likely to have a modern OpenJDK installed.
- (fetchurl {
- url = "mirror://maven/org/glassfish/metro/webservices-rt/2.4.10/webservices-rt-2.4.10.jar";
- hash = "sha256-lHclIZn3HR2B2lMttmmQGIV67qJi5KhL5jT2WNUQpPI=";
- })
-
- (fetchurl {
- url = "mirror://maven/org/glassfish/metro/webservices-api/2.4.10/webservices-api-2.4.10.jar";
- hash = "sha256-1jiabjPkRnh+l/fmTt8aKE5hpeLreYOiLH9sVIcLUQE=";
- })
-
- (fetchurl {
- url = "mirror://maven/com/sun/activation/jakarta.activation/2.0.1/jakarta.activation-2.0.1.jar";
- hash = "sha256-ueJLfdbgdJVWLqllMb4xMMltuk144d/Yitu96/QzKHE=";
- })
-
- # Patch one of the ÁNYK classes so it works with the packages above by removing .internal. from the package names.
- (runCommandLocal "anyk-patch" { } ''
- mkdir $out
- cd $out
- ${unzip}/bin/unzip ${src}/application/abevjava.jar hu/piller/enykp/niszws/ClientStubBuilder.class
- ${python3}/bin/python ${./patch_paths.py} hu/piller/enykp/niszws/ClientStubBuilder.class
- '')
- ];
+ # Binary patch ÁNYK so it works with the JARs we fetch above (removing .internal. from some package names).
+ anykSoapPatch =
+ runCommandLocal "anyk-patch"
+ {
+ nativeBuildInputs = [ unzip ];
+ }
+ ''
+ mkdir $out
+ cd $out
+ unzip ${src}/application/abevjava.jar \
+ hu/piller/enykp/niszws/ClientStubBuilder.class
+ shopt -s globstar; ${python3}/bin/python ${./patch_paths.py} **/*.class
+ '';
# This script can be used to run template installation jars (or use the Szervíz -> Telepítés menu)
anyk-java = writeScript "anyk-java" ''
@@ -91,7 +89,7 @@ let
SCALING_PROP="-Dsun.java2d.uiScale=''${WINDOW_SCALING_FACTOR}"
fi
# ÁNYK crashes with NullPointerException with the GTK look and feel so use the cross-platform one.
- exec ${jdkWithFX}/bin/java -Dswing.systemlaf=javax.swing.plaf.metal.MetalLookAndFeel $SCALING_PROP "$@"
+ exec ${jre}/bin/java -Dswing.systemlaf=javax.swing.plaf.metal.MetalLookAndFeel $SCALING_PROP "$@"
'';
in
stdenv.mkDerivation {
@@ -124,8 +122,8 @@ stdenv.mkDerivation {
substituteAll ${anyk-java} $out/bin/anyk-java
chmod +x $out/bin/anyk-java
- # ÁNYK has some old school dependencies that are no longer bundled with Java, put them on the classpath.
- makeWrapper $out/bin/anyk-java $out/bin/anyk --add-flags "-cp ${lib.concatStringsSep ":" extraClasspath}:$out/opt/abevjava.jar hu.piller.enykp.gui.framework.MainFrame"
+ # ÁNYK has some old school dependencies that are no longer bundled with Java, put them on the classpath. The * is resolved by Java at runtime.
+ makeWrapper $out/bin/anyk-java $out/bin/anyk --add-flags "-cp '${soapDeps}/share/java/*:${anykSoapPatch}:$out/opt/abevjava.jar' hu.piller.enykp.gui.framework.MainFrame"
mkdir -p $out/share/applications $out/share/pixmaps $out/share/icons
@@ -145,7 +143,7 @@ stdenv.mkDerivation {
homepage = "https://nav.gov.hu/nyomtatvanyok/letoltesek/nyomtatvanykitolto_programok/nyomtatvany_apeh/keretprogramok/javakitolto";
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ chpatrick ];
- platforms = openjdk.meta.platforms;
+ platforms = jre.meta.platforms;
sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
mainProgram = "anyk";
};
diff --git a/pkgs/by-name/an/anyk/patch_paths.py b/pkgs/by-name/an/anyk/patch_paths.py
index 5e2306bd3c9a..af55b76d277d 100644
--- a/pkgs/by-name/an/anyk/patch_paths.py
+++ b/pkgs/by-name/an/anyk/patch_paths.py
@@ -1,35 +1,41 @@
from pathlib import Path
from struct import pack
import sys
+import argparse
def to_java_string(string) -> bytes:
string_bytes = string.encode("utf-8")
# Java constant pool string entries are prefixed by 0x01 and 16-bit big-endian string length.
return pack(">BH", 1, len(string_bytes)) + string_bytes
-class_file = Path(sys.argv[1])
+parser = argparse.ArgumentParser()
-clazz = class_file.read_bytes()
+parser.add_argument("class_files", nargs="+", type=Path)
-# We want to fix these package names so they work with the open-source Java EE releases instead of OpenJDK 8.
-patches = [
- ( "com/sun/xml/internal/ws/developer/WSBindingProvider", "com/sun/xml/ws/developer/WSBindingProvider" ),
- ( "com/sun/xml/internal/ws/api/message/Header", "com/sun/xml/ws/api/message/Header" ),
- ( "com.sun.xml.internal.ws.transport.http.client.streaming.chunk.size", "com.sun.xml.ws.transport.http.client.streaming.chunk.size" ),
- ( "com/sun/xml/internal/ws/api/message/Headers", "com/sun/xml/ws/api/message/Headers" ),
- ( "(Lorg/w3c/dom/Element;)Lcom/sun/xml/internal/ws/api/message/Header;", "(Lorg/w3c/dom/Element;)Lcom/sun/xml/ws/api/message/Header;" ),
- ( "([Lcom/sun/xml/internal/ws/api/message/Header;)V", "([Lcom/sun/xml/ws/api/message/Header;)V" ),
-]
+args = parser.parse_args()
-for old, new in patches:
- old_java = to_java_string(old)
- new_java = to_java_string(new)
- assert old_java in clazz
- clazz = clazz.replace(old_java, new_java)
- assert old_java not in clazz
- assert new_java in clazz
+for class_file in args.class_files:
+ clazz = class_file.read_bytes()
-assert b".internal." not in clazz
+ # We want to fix these package names so they work with the open-source Java EE releases instead of OpenJDK 8.
+ patches = [
+ ( "com/sun/xml/internal/ws/developer/WSBindingProvider", "com/sun/xml/ws/developer/WSBindingProvider" ),
+ ( "com/sun/xml/internal/ws/api/message/Header", "com/sun/xml/ws/api/message/Header" ),
+ ( "com.sun.xml.internal.ws.transport.http.client.streaming.chunk.size", "com.sun.xml.ws.transport.http.client.streaming.chunk.size" ),
+ ( "com/sun/xml/internal/ws/api/message/Headers", "com/sun/xml/ws/api/message/Headers" ),
+ ( "(Lorg/w3c/dom/Element;)Lcom/sun/xml/internal/ws/api/message/Header;", "(Lorg/w3c/dom/Element;)Lcom/sun/xml/ws/api/message/Header;" ),
+ ( "([Lcom/sun/xml/internal/ws/api/message/Header;)V", "([Lcom/sun/xml/ws/api/message/Header;)V" ),
+ ]
-class_file.write_bytes(clazz)
+ for old, new in patches:
+ old_java = to_java_string(old)
+ new_java = to_java_string(new)
+ assert old_java in clazz
+ clazz = clazz.replace(old_java, new_java)
+ assert new_java in clazz
+ assert old_java not in clazz
+
+ assert b".internal." not in clazz
+
+ class_file.write_bytes(clazz)
diff --git a/pkgs/by-name/an/anyk/pom.xml b/pkgs/by-name/an/anyk/pom.xml
new file mode 100644
index 000000000000..3212f9802f3d
--- /dev/null
+++ b/pkgs/by-name/an/anyk/pom.xml
@@ -0,0 +1,43 @@
+
+ 4.0.0
+
+ nix.deps
+ dependency-fetcher
+ 1.0.0
+
+
+
+ com.sun.xml.ws
+ jaxws-rt
+ 2.3.7
+
+
+ org.glassfish.jaxb
+ jaxb-runtime
+ 2.3.9
+
+
+
+
+
+
+
+ maven-dependency-plugin
+ 3.6.0
+
+
+ package
+
+ copy-dependencies
+
+
+ ${project.build.directory}/lib
+
+
+
+
+
+
+
diff --git a/pkgs/by-name/an/anyk/version.json b/pkgs/by-name/an/anyk/version.json
index 6bed10760e38..c0bdfd9940da 100644
--- a/pkgs/by-name/an/anyk/version.json
+++ b/pkgs/by-name/an/anyk/version.json
@@ -1,5 +1,5 @@
{
- "url": "https://web.archive.org/web/20250801205917/https://nav.gov.hu/pfile/programFile?path=%252Fnyomtatvanyok%252Fletoltesek%252Fnyomtatvanykitolto_programok%252Fnyomtatvany_apeh%252Fkeretprogramok%252FAbevJava",
- "sha256": "0b0b197ifqwsnnw375gvnhdsvmgqwmw5fkfcfw0wmh0f6xjdapam",
- "version": "3.44.0"
+ "url": "https://web.archive.org/web/20251201151010/https://nav.gov.hu/pfile/programFile?path=%252Fnyomtatvanyok%252Fletoltesek%252Fnyomtatvanykitolto_programok%252Fnyomtatvany_apeh%252Fkeretprogramok%252FAbevJava",
+ "sha256": "12l1ghjcaxqi80bpxqwvsy3krz7qkdcg3zcvvif3g3hvqz5wc31s",
+ "version": "3.45.0"
}
diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix
index 7171dc913724..5a4f2a4cc8c5 100644
--- a/pkgs/by-name/be/beeper/package.nix
+++ b/pkgs/by-name/be/beeper/package.nix
@@ -9,10 +9,10 @@
}:
let
pname = "beeper";
- version = "4.2.330";
+ version = "4.2.367";
src = fetchurl {
url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage";
- hash = "sha256-7Jf/dKShD7UBiv2CHj+cYaojqlpfshG1D09beX79g4o=";
+ hash = "sha256-t2knYAy6G/Xd/dOAvqA+wiTa6K//maHiwjY7Apshjhk=";
};
appimageContents = appimageTools.extract {
inherit pname version src;
diff --git a/pkgs/by-name/co/container/package.nix b/pkgs/by-name/co/container/package.nix
index 535134667b2b..d5cd3bb9e059 100644
--- a/pkgs/by-name/co/container/package.nix
+++ b/pkgs/by-name/co/container/package.nix
@@ -11,11 +11,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "container";
- version = "0.6.0";
+ version = "0.7.1";
src = fetchurl {
- url = "https://github.com/apple/container/releases/download/${finalAttrs.version}/container-${finalAttrs.version}-installer-signed.pkg";
- hash = "sha256-RGL6a8EY+rOC5Er9zHfbMrYHQY4LyApOUPcFP1haOGY=";
+ url = "https://github.com/apple/container/releases/download/${finalAttrs.version}/container-installer-signed.pkg";
+ hash = "sha256-2rfh8OD0H5BQkJsnST886U2dyf4aedJvCQziJ9YTxnE=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/de/deadlock-mod-manager/package.nix b/pkgs/by-name/de/deadlock-mod-manager/package.nix
index ba2331e2c38b..7d5a4e1899f9 100644
--- a/pkgs/by-name/de/deadlock-mod-manager/package.nix
+++ b/pkgs/by-name/de/deadlock-mod-manager/package.nix
@@ -27,19 +27,19 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "deadlock-mod-manager";
- version = "0.11.1";
+ version = "0.13.0";
src = fetchFromGitHub {
owner = "deadlock-mod-manager";
repo = "deadlock-mod-manager";
tag = "v${finalAttrs.version}";
- hash = "sha256-0T2/8mfSxfJXWTbLfXaRrrVeBrf0PvpIr41BrnuSwOU=";
+ hash = "sha256-ja7B48UVpwj1gCZfrFWZjtTTaUh1QLTAE88oXwDt18Y=";
};
cargoRoot = "apps/desktop";
buildAndTestSubdir = finalAttrs.cargoRoot;
- cargoHash = "sha256-tzF1mFzFCdnB6h43TiVKEKWWQgWlrEm9Xh3HKKnNXZ0=";
+ cargoHash = "sha256-PeY59bvL/JGl8KyE0X+nPY3XC4TNa15lGcG2i///bCI=";
nativeBuildInputs = [
rustPlatform.cargoSetupHook
@@ -79,7 +79,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pnpm = pnpm_9;
fetcherVersion = 2;
sourceRoot = "source";
- hash = "sha256-MCzRZt+l2wHETOxzSatPnz5G48HjjGrOj3BVP+S7/Ss=";
+ hash = "sha256-dS9s5oy8GtRek7OwiGDwv7280zZuyjxIhiA6BqH8C1w=";
};
patches = [
diff --git a/pkgs/by-name/de/deco/package.nix b/pkgs/by-name/de/deco/package.nix
deleted file mode 100644
index cfbd4098333b..000000000000
--- a/pkgs/by-name/de/deco/package.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
- lib,
- stdenv,
- fetchFromGitHub,
- scsh,
- feh,
- xorg,
- xdg-user-dirs,
-}:
-
-stdenv.mkDerivation {
- pname = "deco";
- version = "0-unstable-2025-07-07";
-
- src = fetchFromGitHub {
- owner = "vedatechnologiesinc";
- repo = "deco";
- rev = "2fd28241ed28c07b9d641061d4e1bf3cacfcc7a0";
- hash = "sha256-kjXEvgYO1p/dX9nXQ3HHcXmJdtxDM6xzKqDQu3yM4Tw=";
- };
-
- installPhase = ''
- mkdir -p $out/bin
- cp deco $out/bin
- chmod +x $out/bin/deco
- '';
-
- postFixup = ''
- substituteInPlace $out/bin/deco --replace-fail "/usr/bin/env scsh" "${scsh}/bin/scsh"
- substituteInPlace $out/bin/deco --replace-fail "feh" "${feh}/bin/feh"
- substituteInPlace $out/bin/deco --replace-fail "xdpyinfo" "${xorg.xdpyinfo}/bin/xdpyinfo"
- substituteInPlace $out/bin/deco --replace-fail "xdg-user-dir" "${xdg-user-dirs}/bin/xdg-user-dir"
- '';
-
- meta = {
- homepage = "https://github.com/vedatechnologiesinc/deco";
- description = "Simple root image setter";
- license = lib.licenses.bsd3;
- platforms = lib.platforms.unix;
- mainProgram = "deco";
- };
-
- dontBuild = true;
-}
diff --git a/pkgs/by-name/di/dipc/package.nix b/pkgs/by-name/di/dipc/package.nix
index 585f46badbca..e5055ae9d055 100644
--- a/pkgs/by-name/di/dipc/package.nix
+++ b/pkgs/by-name/di/dipc/package.nix
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage {
pname = "dipc";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "doprz";
repo = "dipc";
- rev = "bf578bd9474084b7099ef665138667e486dce671";
- hash = "sha256-RXEC8bwdnUOaDmYIb7ci/JD+vi16tBn55FRsUmwaRzk=";
+ rev = "b111b8cb997e3337974f861f44a73b557fb3c294";
+ hash = "sha256-qP7LRwNIM92p5xQeuvQ03kwBM/HnRH+BniiKeYoihKw=";
};
- cargoHash = "sha256-1vjVuAawuquPqem1as6xIv/ZJCzjgC4k0uyPSlrvpeg=";
+ cargoHash = "sha256-F6EYnkquvTsw4C7rl28Y1h9i9ChGccwZGkYSVrsEhVk=";
meta = {
description = "Convert your favorite images and wallpapers with your favorite color palettes/themes";
@@ -24,7 +24,10 @@ rustPlatform.buildRustPackage {
mit
asl20
];
- maintainers = with lib.maintainers; [ ByteSudoer ];
+ maintainers = with lib.maintainers; [
+ doprz
+ ByteSudoer
+ ];
mainProgram = "dipc";
};
}
diff --git a/pkgs/by-name/em/emem/package.nix b/pkgs/by-name/em/emem/package.nix
deleted file mode 100644
index 064ecbbce211..000000000000
--- a/pkgs/by-name/em/emem/package.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
- lib,
- stdenv,
- fetchurl,
- jdk,
-}:
-
-stdenv.mkDerivation rec {
- pname = "emem";
- version = "0.2.50";
-
- inherit jdk;
-
- src = fetchurl {
- url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
- sha256 = "18x3s3jrph8k3pc75jgwkfqazygpsx93zjxx68zms58my17cybh1";
- };
-
- dontUnpack = true;
-
- buildPhase = ''
- mkdir -p $out/bin $out/share/java
- '';
-
- installPhase = ''
- cp $src $out/share/java/${pname}.jar
-
- cat > $out/bin/${pname} << EOF
- #! $SHELL
- $jdk/bin/java -jar $out/share/java/${pname}.jar "\$@"
- EOF
-
- chmod +x $out/bin/${pname}
- '';
-
- meta = {
- homepage = "https://github.com/ebzzry/emem";
- description = "Trivial Markdown to HTML converter";
- sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
- license = lib.licenses.epl10;
- platforms = lib.platforms.unix;
- mainProgram = "emem";
- };
-}
diff --git a/pkgs/by-name/go/go-ios/package.nix b/pkgs/by-name/go/go-ios/package.nix
index f40eac77b0f6..3b01f35e1f8b 100644
--- a/pkgs/by-name/go/go-ios/package.nix
+++ b/pkgs/by-name/go/go-ios/package.nix
@@ -12,13 +12,13 @@
buildGoModule rec {
pname = "go-ios";
- version = "1.0.189";
+ version = "1.0.192";
src = fetchFromGitHub {
owner = "danielpaulus";
repo = "go-ios";
rev = "v${version}";
- sha256 = "sha256-gvC3s9cMRhhdzG/PWt8Nhgh/6I/g76ULCiscCaErfHE=";
+ sha256 = "sha256-2M53jcAZXzUjV53YdENjLpK9o26Xr/gFniuS0T2NZ0E=";
};
proxyVendor = true;
diff --git a/pkgs/by-name/io/ios-safari-remote-debug/package.nix b/pkgs/by-name/io/ios-safari-remote-debug/package.nix
index 339418666d21..0986c2f83f43 100644
--- a/pkgs/by-name/io/ios-safari-remote-debug/package.nix
+++ b/pkgs/by-name/io/ios-safari-remote-debug/package.nix
@@ -1,21 +1,18 @@
{
lib,
buildGoModule,
- fetchFromGitea,
+ fetchgit,
}:
buildGoModule rec {
pname = "ios-safari-remote-debug";
version = "unstable-2024-09-09";
- src = fetchFromGitea {
- domain = "git.gay";
- owner = "besties";
- repo = "ios-safari-remote-debug";
+ src = fetchgit {
+ url = "https://git.gay/besties/ios-safari-remote-debug.git";
rev = "b3c69873997c08fce83c48a5ab42f5a2354efdf2";
hash = "sha256-Hh/CeH0ba4uPMlEo+OZ3w36pTpsW6OLtYIE5v6dkUjo=";
};
-
vendorHash = "sha256-O8Dr4UAISZmCUGao0cBnAx4dUJm6+u4Swiw0H5NVeeA=";
patches = [ ./add-permissions-to-the-output-directory.patch ];
diff --git a/pkgs/by-name/li/libbfio/package.nix b/pkgs/by-name/li/libbfio/package.nix
index 21fad908b6f1..a43baf04c5a2 100644
--- a/pkgs/by-name/li/libbfio/package.nix
+++ b/pkgs/by-name/li/libbfio/package.nix
@@ -9,11 +9,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libbfio";
- version = "20221025";
+ version = "20240414";
src = fetchzip {
url = "https://github.com/libyal/libbfio/releases/download/${finalAttrs.version}/libbfio-alpha-${finalAttrs.version}.tar.gz";
- hash = "sha256-SwKQlmifyUo49yvo8RV+0nfvScPY5u+UrwjRZK2+qAg=";
+ hash = "sha256-xxMHOSVpGyw5rGXhU1tIOTKwt9yVw0KrPdYby0AEdv8=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/li/libpqxx/package.nix b/pkgs/by-name/li/libpqxx/package.nix
index 2c7b7ac64969..c0c7e0c38db1 100644
--- a/pkgs/by-name/li/libpqxx/package.nix
+++ b/pkgs/by-name/li/libpqxx/package.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libpqxx";
- version = "7.10.1";
+ version = "7.10.4";
src = fetchFromGitHub {
owner = "jtv";
repo = "libpqxx";
rev = finalAttrs.version;
- hash = "sha256-BVmIyJA5gDibwtmDvw7b300D0KdWv7c3Ytye6fiLAXU=";
+ hash = "sha256-0/gkfoJg+Zt9LLLQ/TVkUhBZ3NYIzg+uIClU89ORr+4=";
};
outputs = [
diff --git a/pkgs/by-name/ma/maccy/package.nix b/pkgs/by-name/ma/maccy/package.nix
index 8c462db0fb44..c0c2a3852e6b 100644
--- a/pkgs/by-name/ma/maccy/package.nix
+++ b/pkgs/by-name/ma/maccy/package.nix
@@ -7,11 +7,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "maccy";
- version = "2.5.1";
+ version = "2.6.1";
src = fetchurl {
url = "https://github.com/p0deje/Maccy/releases/download/${finalAttrs.version}/Maccy.app.zip";
- hash = "sha256-pwMiCAS+1uEtEQv2e1UflxYuuh/qqYJbMcp2ZVvZBTA=";
+ hash = "sha256-hLlbrxlhvfMARRiMhVI3+QwUJqyPEjtK6PdBkfnzhoI=";
};
dontUnpack = true;
diff --git a/pkgs/by-name/ma/mas/package.nix b/pkgs/by-name/ma/mas/package.nix
index f6d23f94f493..618c20bedaaf 100644
--- a/pkgs/by-name/ma/mas/package.nix
+++ b/pkgs/by-name/ma/mas/package.nix
@@ -26,7 +26,8 @@ stdenvNoCC.mkDerivation rec {
hash = "sha256-8zaZOPOCyLHOFmHhviJXIy5SB5trqQM/MFHhB9ygilQ=";
};
}
- .${stdenvNoCC.hostPlatform.system};
+ .${stdenvNoCC.hostPlatform.system}
+ or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
in
fetchurl {
url = "https://github.com/mas-cli/mas/releases/download/v${version}/mas-${version}-${sources.arch}.pkg";
diff --git a/pkgs/by-name/mi/microsoft-gsl/package.nix b/pkgs/by-name/mi/microsoft-gsl/package.nix
index 8c9d270b8316..b3ac62f24f3c 100644
--- a/pkgs/by-name/mi/microsoft-gsl/package.nix
+++ b/pkgs/by-name/mi/microsoft-gsl/package.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "microsoft-gsl";
- version = "4.2.0";
+ version = "4.2.1";
src = fetchFromGitHub {
owner = "Microsoft";
repo = "GSL";
rev = "v${version}";
- hash = "sha256-NrnYfCCeQ50oHYFbn9vh5Z4mfyxc0kAM3qnzQdq9gyM=";
+ hash = "sha256-rfSfgyjU1U6gaWzlx2CeaCSb784L29vHDAC/PQl+s6E=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index 15f282dc61e9..58688dc64611 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -5,7 +5,6 @@
desktop-file-utils,
dotnetCorePackages,
fetchFromGitHub,
- fetchurl,
imagemagick,
lib,
xdg-utils,
@@ -35,12 +34,6 @@ buildDotnetModule (finalAttrs: {
gameHashes = callPackage ./game-hashes { };
- gamesJson = fetchurl {
- name = "games.json";
- url = "https://web.archive.org/web/20251221212501id_/https://data.nexusmods.com/file/nexus-data/games.json";
- hash = "sha256-OVy6b/n6n2/TdzfHCWDOTw2yai87ieki21fEp1IGamY=";
- };
-
enableParallelBuilding = false;
# If the whole solution is published, there seems to be a race condition where
@@ -73,9 +66,9 @@ buildDotnetModule (finalAttrs: {
substituteInPlace src/NexusMods.Games.FileHashes/NexusMods.Games.FileHashes.csproj \
--replace-fail '$(BaseIntermediateOutputPath)games_hashes_db.zip' "$gameHashes"
- # Use a pinned version of the nexus API's games.json data
+ # Use a vendored version of the nexus API's games.json data
substituteInPlace src/NexusMods.Networking.NexusWebApi/NexusMods.Networking.NexusWebApi.csproj \
- --replace-fail '$(BaseIntermediateOutputPath)games.json' "$gamesJson"
+ --replace-fail '$(BaseIntermediateOutputPath)games.json' ${./vendored/games.json}
${lib.optionalString finalAttrs.doCheck ''
# For some reason these tests fail (intermittently?) with a zero timestamp
diff --git a/pkgs/by-name/ne/nexusmods-app/update-games-json.sh b/pkgs/by-name/ne/nexusmods-app/update-games-json.sh
deleted file mode 100755
index 17e15cc452f8..000000000000
--- a/pkgs/by-name/ne/nexusmods-app/update-games-json.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -i bash -p bash curl common-updater-scripts
-
-set -eu -o pipefail
-
-# Set a default attrpath to allow running this update script directly
-export UPDATE_NIX_ATTR_PATH="${UPDATE_NIX_ATTR_PATH:-"nexusmods-app"}"
-
-save_url=https://web.archive.org/save
-json_url=https://data.nexusmods.com/file/nexus-data/games.json
-self=$(realpath "$0")
-dir=$(dirname "$self")
-curl_args=(
- "$save_url/$json_url"
-
- --silent
- --fail
- --location # follow redirects
- --head # we only need headers
- --output /dev/null # discard body
- --write-out '%{url_effective}'
-
- # Format --data-urlencode as GET query params
- --get
- # Instruct IA not to crawl linked content
- --data-urlencode capture_all=0
- # Only create a snapshot if older than 1 day
- --data-urlencode if_not_archived_within=86400
-)
-cd "$dir"/../../../../
-
-# Ask the Internet Archive to save a snapshot of `games.json`
-# We capture its 'HTTP 302 Found' redirect location
-echo "Fetching games.json Internet Archive URL" >&2
-url=$(curl "${curl_args[@]}")
-
-# Use raw replay mode to avoid rewritten links in the JSON content
-url=$(
- sed -E 's|^https://web\.archive\.org/web/([0-9]+)/|https://web.archive.org/web/\1id_/|' \
- <<<"$url"
-)
-
-# The query parameters are only used in the snapshot request,
-# but remain in the redirected URL. Strip them:
-url="${url%%\?*}"
-
-current_url=$(
- nix-instantiate --eval --raw \
- --attr "$UPDATE_NIX_ATTR_PATH.gamesJson.url"
-)
-if [ "$current_url" = "$url" ]; then
- echo "games.json has no changes" >&2
- exit
-fi
-
-echo "Downloading and hashing games.json" >&2
-hash=$(
- nix --extra-experimental-features nix-command \
- hash convert --hash-algo sha256 --to sri \
- "$(nix-prefetch-url "$url" --type sha256)"
-)
-
-# `update-source-version` needs the package version,
-# even though we're updating the games.json source
-package_version=$(
- nix-instantiate --eval --raw \
- --attr "$UPDATE_NIX_ATTR_PATH.version"
-)
-
-echo "Updating games.json source" >&2
-update-source-version \
- "$UPDATE_NIX_ATTR_PATH" \
- "$package_version" \
- "$hash" \
- "$url" \
- --ignore-same-version \
- --source-key=gamesJson \
- --file="$dir"/package.nix
diff --git a/pkgs/by-name/ne/nexusmods-app/update.sh b/pkgs/by-name/ne/nexusmods-app/update.sh
index 05ff0144d6f4..8f9e74304345 100755
--- a/pkgs/by-name/ne/nexusmods-app/update.sh
+++ b/pkgs/by-name/ne/nexusmods-app/update.sh
@@ -10,28 +10,15 @@ self=$(realpath "$0")
dir=$(dirname "$self")
cd "$dir"/../../../../
-current_version=$(
- nix-instantiate --eval --raw \
- --attr "$UPDATE_NIX_ATTR_PATH.version"
-)
+# Update vendored files
+"$dir"/vendored/update.sh
+
+# Update game_hashes_db
+UPDATE_NIX_ATTR_PATH="$UPDATE_NIX_ATTR_PATH.gameHashes" \
+ "$dir"/game-hashes/update.sh
url=$(
nix-instantiate --eval --raw \
--attr "$UPDATE_NIX_ATTR_PATH.meta.homepage"
)
-
nix-update --url "$url"
-
-new_version=$(
- nix-instantiate --eval --raw \
- --attr "$UPDATE_NIX_ATTR_PATH.version"
-)
-
-if [ "$current_version" != "$new_version" ]; then
- # Update games.json
- "$dir"/update-games-json.sh
-
- # Update game_hashes_db
- UPDATE_NIX_ATTR_PATH="$UPDATE_NIX_ATTR_PATH.gameHashes" \
- "$dir"/game-hashes/update.sh
-fi
diff --git a/pkgs/by-name/ne/nexusmods-app/vendored/README.md b/pkgs/by-name/ne/nexusmods-app/vendored/README.md
new file mode 100644
index 000000000000..f92cbf87e634
--- /dev/null
+++ b/pkgs/by-name/ne/nexusmods-app/vendored/README.md
@@ -0,0 +1,31 @@
+This directory contains a vendored copy of `games.json`, along with tooling to generate it.
+
+## Purpose
+
+The games data is fetched at runtime by NexusMods.App, however it is also included at build time for two reasons:
+
+1. It allows tests to run against real data.
+2. It is used as cached data, speeding up the app's initial run.
+
+It is not vital for the file to contain all games, however ideally it should contain all games _supported_ by this version of NexusMods.App.
+That way the initial run's cached data is more useful.
+
+If this file grows too large, because we are including too many games, we can patch the `csproj` build spec so that `games.json` is not used at build time.
+We would also need to patch or disable any tests that rely on it.
+
+## Generating
+
+`games.json` is generated automatically by `update.sh`, using data from [nexusmods' API][url] and the games listed in `game-ids.nix`.
+
+To add a new game to `games.json`:
+- Inspect the [nexusmods endpoint][url] to find the game's name and ID
+- Add the name and ID to `game-ids.nix`
+- Run `update.sh`
+- Commit the result
+
+> [!Note]
+> Running `update.sh` may also update the existing games, so you may wish to create two separate commits using `git add --patch`.
+> One for updating the existing data and another for adding the new game.
+
+[url]: https://data.nexusmods.com/file/nexus-data/games.json
+
diff --git a/pkgs/by-name/ne/nexusmods-app/vendored/game-ids.nix b/pkgs/by-name/ne/nexusmods-app/vendored/game-ids.nix
new file mode 100644
index 000000000000..764658cd596d
--- /dev/null
+++ b/pkgs/by-name/ne/nexusmods-app/vendored/game-ids.nix
@@ -0,0 +1,12 @@
+# This file lists games to be included in the vendored games.json file.
+# It is not critical to include all games, other than those referenced by the test suite.
+# Ideally, all games supported by the app will be included, as this can improve first-run performance.
+{
+ # keep-sorted start case=no numeric=yes
+ "Baldur's Gate 3" = 3474;
+ "Cyberpunk 2077" = 3333;
+ "Mount & Blade II: Bannerlord" = 3174;
+ "Skyrim Special Edition" = 1704;
+ "Stardew Valley" = 1303;
+ # keep-sorted end
+}
diff --git a/pkgs/by-name/ne/nexusmods-app/vendored/games.json b/pkgs/by-name/ne/nexusmods-app/vendored/games.json
new file mode 100644
index 000000000000..6d7b4767e012
--- /dev/null
+++ b/pkgs/by-name/ne/nexusmods-app/vendored/games.json
@@ -0,0 +1,72 @@
+[
+ {
+ "id": 1303,
+ "name": "Stardew Valley",
+ "name_lower": "stardew valley",
+ "forum_url": "https://forums.nexusmods.com/games/19-stardew-valley/",
+ "nexusmods_url": "https://www.nexusmods.com/stardewvalley",
+ "genre": "Simulation",
+ "file_count": 145440,
+ "downloads": 642501970,
+ "domain_name": "stardewvalley",
+ "approved_date": 1457432329,
+ "mods": 26417,
+ "collections": 1958
+ },
+ {
+ "id": 1704,
+ "name": "Skyrim Special Edition",
+ "name_lower": "skyrim special edition",
+ "forum_url": "https://forums.nexusmods.com/games/6-skyrim/",
+ "nexusmods_url": "https://www.nexusmods.com/skyrimspecialedition",
+ "genre": "RPG",
+ "file_count": 671705,
+ "downloads": 9497429062,
+ "domain_name": "skyrimspecialedition",
+ "approved_date": 1477480498,
+ "mods": 120722,
+ "collections": 4886
+ },
+ {
+ "id": 3174,
+ "name": "Mount & Blade II: Bannerlord",
+ "name_lower": "mount & blade ii: bannerlord",
+ "forum_url": "https://forums.nexusmods.com/games/9-mount-blade-ii-bannerlord/",
+ "nexusmods_url": "https://www.nexusmods.com/mountandblade2bannerlord",
+ "genre": "Strategy",
+ "file_count": 51310,
+ "downloads": 118459993,
+ "domain_name": "mountandblade2bannerlord",
+ "approved_date": 1582898627,
+ "mods": 6455,
+ "collections": 294
+ },
+ {
+ "id": 3333,
+ "name": "Cyberpunk 2077",
+ "name_lower": "cyberpunk 2077",
+ "forum_url": "https://forums.nexusmods.com/games/1-cyberpunk-2077/",
+ "nexusmods_url": "https://www.nexusmods.com/cyberpunk2077",
+ "genre": "Action",
+ "file_count": 127687,
+ "downloads": 981788054,
+ "domain_name": "cyberpunk2077",
+ "approved_date": 1607433331,
+ "mods": 18464,
+ "collections": 1613
+ },
+ {
+ "id": 3474,
+ "name": "Baldur's Gate 3",
+ "name_lower": "baldur's gate 3",
+ "forum_url": "https://forums.nexusmods.com/games/2-baldurs-gate-3/",
+ "nexusmods_url": "https://www.nexusmods.com/baldursgate3",
+ "genre": "RPG",
+ "file_count": 107598,
+ "downloads": 366648874,
+ "domain_name": "baldursgate3",
+ "approved_date": 1602863114,
+ "mods": 15345,
+ "collections": 1725
+ }
+]
diff --git a/pkgs/by-name/ne/nexusmods-app/vendored/update.sh b/pkgs/by-name/ne/nexusmods-app/vendored/update.sh
new file mode 100755
index 000000000000..ac44e25fae48
--- /dev/null
+++ b/pkgs/by-name/ne/nexusmods-app/vendored/update.sh
@@ -0,0 +1,53 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p bash curl jq
+
+set -eu -o pipefail
+
+url='https://data.nexusmods.com/file/nexus-data/games.json'
+self=$(realpath "$0")
+dir=$(dirname "$self")
+tmp=$(mktemp)
+
+cd "$dir"/../../../../../
+
+ids=$(
+ nix-instantiate --eval --json \
+ --argstr file "$dir"/game-ids.nix \
+ --expr '{file}: builtins.attrValues (import file)'
+)
+
+echo "Fetching games data" >&2
+curl "$url" \
+ --silent \
+ --show-error \
+ --location |
+ jq --argjson ids "$ids" \
+ 'map(select( .id | IN($ids[]) )) | sort_by(.id)' \
+ >"$tmp"
+
+echo "Validating result" >&2
+nix-instantiate --eval --strict \
+ --argstr idsNix "$dir"/game-ids.nix \
+ --argstr gamesJson "$tmp" \
+ --expr '
+ {
+ idsNix,
+ gamesJson,
+ lib ? import ,
+ }:
+ let
+ ids = import idsNix;
+ games = lib.importJSON gamesJson;
+ in
+ lib.forEach games (
+ { id, name, ... }:
+ lib.throwIfNot
+ (id == ids.${name})
+ "${name}: id ${toString id} does not match ${toString ids.${name}}"
+ null
+ )
+ ' \
+ >/dev/null
+
+echo "Installing games.json to $dir" >&2
+mv --force "$tmp" "$dir"/games.json
diff --git a/pkgs/by-name/ni/nixos-facter/package.nix b/pkgs/by-name/ni/nixos-facter/package.nix
index bf5e2b4ecca6..7578c0ad78b0 100644
--- a/pkgs/by-name/ni/nixos-facter/package.nix
+++ b/pkgs/by-name/ni/nixos-facter/package.nix
@@ -1,6 +1,7 @@
{
lib,
buildGoModule,
+ callPackage,
fetchFromGitHub,
hwinfo,
libusb1,
@@ -64,6 +65,8 @@ buildGoModule rec {
passthru.tests = {
inherit (nixosTests) facter;
+ debug-nvd = callPackage ./test-debug-nvd.nix { };
+ debug-nix-diff = nixosTests.facter.nodes.machine.hardware.facter.debug.nix-diff;
};
meta = {
diff --git a/pkgs/by-name/ni/nixos-facter/test-debug-nvd.nix b/pkgs/by-name/ni/nixos-facter/test-debug-nvd.nix
new file mode 100644
index 000000000000..f6b8a8f90cd8
--- /dev/null
+++ b/pkgs/by-name/ni/nixos-facter/test-debug-nvd.nix
@@ -0,0 +1,52 @@
+{
+ runCommand,
+ jq,
+ nix,
+ nixosTests,
+}:
+let
+ facterDebug = nixosTests.facter.nodes.machine.hardware.facter.debug;
+ withFacter = nixosTests.facter.nodes.machine.system.build.toplevel;
+ noFacter = nixosTests.facter.nodes.machine.system.build.noFacter.config.system.build.toplevel;
+in
+runCommand "facter-debug-nvd-test"
+ {
+ nativeBuildInputs = [
+ facterDebug.nvd
+ jq
+ nix
+ ];
+ __structuredAttrs = true;
+ unsafeDiscardReferences.out = true;
+ exportReferencesGraph.withFacter = [ withFacter ];
+ exportReferencesGraph.noFacter = [ noFacter ];
+ }
+ ''
+ # Set up nix environment with read-only store but writable state
+ mkdir -p "$TMPDIR/nix"/{var/nix,var/log/nix,etc}
+
+ export NIX_REMOTE=""
+ export NIX_STATE_DIR="$TMPDIR/nix/var/nix"
+ export NIX_LOG_DIR="$TMPDIR/nix/var/log/nix"
+ export NIX_CONF_DIR="$TMPDIR/nix/etc"
+ cat > "$TMPDIR/nix/etc/nix.conf" < 0 then "\n" + (.references | join("\n")) else "" end)"' \
+ < "$NIX_ATTRS_JSON_FILE" | nix-store --load-db
+
+ # Run nvd and verify it produces output
+ facter-nvd-diff > nvd-output.txt
+ if [ ! -s nvd-output.txt ]; then
+ echo "facter-nvd-diff produced no output"
+ exit 1
+ fi
+ cat nvd-output.txt
+ echo "nvd debug utility works correctly" > $out
+ ''
diff --git a/pkgs/by-name/ow/owi/package.nix b/pkgs/by-name/ow/owi/package.nix
index 83c2ae8f4d13..b94a14af7dc9 100644
--- a/pkgs/by-name/ow/owi/package.nix
+++ b/pkgs/by-name/ow/owi/package.nix
@@ -11,18 +11,18 @@
}:
let
- ocamlPackages = ocaml-ng.ocamlPackages_5_2;
+ ocamlPackages = ocaml-ng.ocamlPackages_5_3;
in
ocamlPackages.buildDunePackage {
pname = "owi";
- version = "0.2-unstable-2025-12-13";
+ version = "0.2-unstable-2025-12-22";
src = fetchFromGitHub {
owner = "ocamlpro";
repo = "owi";
- rev = "0ce0a3136bfeaca01bbf9c596d79c093282cff3f";
+ rev = "014840cd9d87c912577822b171407bf7453373f0";
fetchSubmodules = true;
- hash = "sha256-2WrUbrwi3dSXf/eEdZCK1SnYzo52aJeTfqtN65bjW60=";
+ hash = "sha256-Mjd2XyPmAsonCcV98L8p9S0yYlJV8OEg2TPjZhzVBj8=";
};
nativeBuildInputs = with ocamlPackages; [
@@ -42,15 +42,11 @@ ocamlPackages.buildDunePackage {
bos
cmdliner
digestif
- dolmen_type
dune-build-info
dune-site
- hc
- integers
menhirLib
ocaml_intrinsics
ocamlgraph
- patricia-tree
prelude
processor
scfg
@@ -61,7 +57,6 @@ ocamlPackages.buildDunePackage {
xmlm
yojson
z3
- zarith
];
postInstall = ''
@@ -88,7 +83,10 @@ ocamlPackages.buildDunePackage {
homepage = "https://ocamlpro.github.io/owi/";
downloadPage = "https://github.com/OCamlPro/owi";
license = lib.licenses.agpl3Plus;
- maintainers = [ lib.maintainers.ethancedwards8 ];
+ maintainers = with lib.maintainers; [
+ ethancedwards8
+ redianthus
+ ];
teams = with lib.teams; [ ngi ];
mainProgram = "owi";
badPlatforms = lib.platforms.darwin;
diff --git a/pkgs/by-name/pe/pell/package.nix b/pkgs/by-name/pe/pell/package.nix
deleted file mode 100644
index 548a328d4006..000000000000
--- a/pkgs/by-name/pe/pell/package.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
- lib,
- stdenv,
- fetchFromGitHub,
- scsh,
- sox,
- libnotify,
-}:
-
-stdenv.mkDerivation {
- pname = "pell";
- version = "0.0.4";
-
- src = fetchFromGitHub {
- owner = "ebzzry";
- repo = "pell";
- rev = "3b8a9a59c4a8671705805edb7be7c35b1654971f";
- sha256 = "0k8m1lv2kyrs8fylxmbgxg3jn65g57frf2bndc82gkr5svwb554a";
- };
-
- installPhase = ''
- mkdir -p $out/bin
- mkdir -p $out/share
- cp pell $out/bin
- cp resources/online.mp3 $out/share
- cp resources/offline.mp3 $out/share
- chmod +x $out/bin/pell
- '';
-
- postFixup = ''
- substituteInPlace $out/bin/pell --replace "/usr/bin/env scsh" "${scsh}/bin/scsh"
- substituteInPlace $out/bin/pell --replace "(play " "(${sox}/bin/play "
- substituteInPlace $out/bin/pell --replace "(notify-send " "(${libnotify}/bin/notify-send "
- substituteInPlace $out/bin/pell --replace "/usr/share/pell/online.mp3" "$out/share/online.mp3"
- substituteInPlace $out/bin/pell --replace "/usr/share/pell/offline.mp3" "$out/share/offline.mp3"
- '';
-
- meta = {
- homepage = "https://github.com/ebzzry/pell";
- description = "Simple host availability monitor";
- license = lib.licenses.mit;
- platforms = lib.platforms.unix;
- mainProgram = "pell";
- };
-
- dontBuild = true;
-}
diff --git a/pkgs/by-name/po/polar-bookshelf/package.nix b/pkgs/by-name/po/polar-bookshelf/package.nix
index 7a3f6babb2ab..ac8498bf66e7 100644
--- a/pkgs/by-name/po/polar-bookshelf/package.nix
+++ b/pkgs/by-name/po/polar-bookshelf/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
# fetching a .deb because there's no easy way to package this Electron app
src = fetchurl {
- url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-desktop-app-${version}-amd64.deb";
+ url = "mirror://sourceforge/polar-bookshelf.mirror/v${version}/polar-desktop-app-${version}-amd64.deb";
hash = "sha256-jcq0hW698bAhVM3fLQQeKAnld33XLkHsGjS3QwUpciQ=";
};
diff --git a/pkgs/by-name/po/polar-bookshelf1/package.nix b/pkgs/by-name/po/polar-bookshelf1/package.nix
index 5ea080a27dbb..3cb13af1e229 100644
--- a/pkgs/by-name/po/polar-bookshelf1/package.nix
+++ b/pkgs/by-name/po/polar-bookshelf1/package.nix
@@ -42,11 +42,11 @@
stdenv.mkDerivation rec {
pname = "polar-bookshelf1";
- version = "1.100.14";
+ version = "1.100.13";
src = fetchurl {
- url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-bookshelf-${version}-amd64.deb";
- hash = "sha256-5xa+Nwu0p1x5DLn1GNI0HDt7GtBGoFQ/9qGTeq9uBgU=";
+ url = "mirror://sourceforge/polar-bookshelf.mirror/v${version}/polar-bookshelf-${version}-amd64.deb";
+ hash = "sha256-TeegAq3x8LZ01KEPIlP4lTGC0a9ilnf1xX/Dqci1wEQ=";
};
buildInputs = [
diff --git a/pkgs/by-name/r2/r2mod_cli/package.nix b/pkgs/by-name/r2/r2mod_cli/package.nix
index 49fba2aedb72..2c5bbc119f24 100644
--- a/pkgs/by-name/r2/r2mod_cli/package.nix
+++ b/pkgs/by-name/r2/r2mod_cli/package.nix
@@ -1,22 +1,22 @@
{
- fetchFromGitHub,
bashInteractive,
jq,
makeWrapper,
p7zip,
lib,
stdenv,
+ fetchzip,
}:
stdenv.mkDerivation rec {
pname = "r2mod_cli";
- version = "1.3.3.1";
+ version = "1.3.3";
- src = fetchFromGitHub {
- owner = "Foldex";
- repo = "r2mod_cli";
- rev = "v${version}";
- sha256 = "sha256-Y9ZffztxfGYiUSphqwhe3rTbnJ/vmGGi1pLml+1tLP8=";
+ src = fetchzip {
+ url = "https://thunderstore.io/package/download/Foldex/r2mod_cli/${version}/";
+ hash = "sha256-J7ybNZa44/H+AjQ7L949I3iClXoDwinl/ITMK/QsTR0=";
+ extension = "zip";
+ stripRoot = false;
};
buildInputs = [ bashInteractive ];
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Risk of Rain 2 Mod Manager in Bash";
- homepage = "https://github.com/foldex/r2mod_cli";
+ homepage = "https://thunderstore.io/package/Foldex/r2mod_cli";
license = lib.licenses.gpl3Only;
maintainers = [ lib.maintainers.reedrw ];
mainProgram = "r2mod";
diff --git a/pkgs/by-name/rp/rpi-imager/package.nix b/pkgs/by-name/rp/rpi-imager/package.nix
index 66707935a002..1cbc20fdae59 100644
--- a/pkgs/by-name/rp/rpi-imager/package.nix
+++ b/pkgs/by-name/rp/rpi-imager/package.nix
@@ -20,13 +20,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rpi-imager";
- version = "2.0.0";
+ version = "2.0.2";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "rpi-imager";
tag = "v${finalAttrs.version}";
- hash = "sha256-33txlTRRzA1XxuKgWgz1lNIfzIMrPny6wGFHaecy7FY=";
+ hash = "sha256-dfzWVmRthoLzI//jfeY6P1W/sfT0cNjhp5EiNQQy8zA=";
};
patches = [ ./remove-vendoring.patch ];
diff --git a/pkgs/by-name/sm/sm64coopdx/package.nix b/pkgs/by-name/sm/sm64coopdx/package.nix
index f360d9b6da5b..e8d7f7300b76 100644
--- a/pkgs/by-name/sm/sm64coopdx/package.nix
+++ b/pkgs/by-name/sm/sm64coopdx/package.nix
@@ -3,6 +3,9 @@
lib,
makeWrapper,
writeTextFile,
+ copyDesktopItems,
+ makeDesktopItem,
+ imagemagick,
curl,
hexdump,
@@ -48,7 +51,11 @@ stdenv.mkDerivation (finalAttrs: {
patches = [ ./no-update-check.patch ];
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [
+ makeWrapper
+ copyDesktopItems
+ imagemagick
+ ];
buildInputs = [
curl
@@ -60,6 +67,17 @@ stdenv.mkDerivation (finalAttrs: {
libGL
];
+ icon = "${finalAttrs.src}/res/icon.ico";
+ desktopItems = [
+ (makeDesktopItem {
+ name = finalAttrs.pname;
+ desktopName = "Super Mario 64 Coop Deluxe";
+ exec = "sm64coopdx";
+ icon = finalAttrs.pname;
+ categories = [ "Game" ];
+ })
+ ];
+
enableParallelBuilding = true;
makeFlags = [
@@ -92,6 +110,12 @@ stdenv.mkDerivation (finalAttrs: {
cp $built/libdiscord_game_sdk* $share
''}
+ magick ${finalAttrs.icon} icon.png
+ for size in 16 24 32 48 64 128 256 512; do
+ mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
+ magick icon-0.png -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/${finalAttrs.pname}.png
+ done
+
# coopdx always tries to load resources from the binary's directory, with no obvious way to change. Thus this small wrapper script to always run from the /share directory that has all the resources
mkdir -p $out/bin
makeWrapper $share/sm64coopdx $out/bin/sm64coopdx \
diff --git a/pkgs/by-name/st/strawberry/package.nix b/pkgs/by-name/st/strawberry/package.nix
index 8450c8d539d9..e9faff43c7a8 100644
--- a/pkgs/by-name/st/strawberry/package.nix
+++ b/pkgs/by-name/st/strawberry/package.nix
@@ -38,13 +38,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "strawberry";
- version = "1.2.13";
+ version = "1.2.16";
src = fetchFromGitHub {
owner = "jonaski";
repo = "strawberry";
rev = finalAttrs.finalPackage.version;
- hash = "sha256-0peM1d8ks4yYwK9+3bUf713MjEzI25TSexyFIP/r3b0=";
+ hash = "sha256-4V/geww/M0FD3McBuz8MgkwdXA7j+d71SJn5Q4AZrvU=";
};
# the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead
diff --git a/pkgs/by-name/st/strobealign/package.nix b/pkgs/by-name/st/strobealign/package.nix
index 0dd0a976f512..239bb1c04974 100644
--- a/pkgs/by-name/st/strobealign/package.nix
+++ b/pkgs/by-name/st/strobealign/package.nix
@@ -9,13 +9,13 @@
}:
stdenv.mkDerivation (self: {
pname = "strobealign";
- version = "0.16.1";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "ksahlin";
repo = "strobealign";
tag = "v${self.version}";
- hash = "sha256-RZxIT6iwanRuPk2sWv/QRkUaPMdterOKCo30FPZHC8o=";
+ hash = "sha256-ah21ptyfZbgdJrtCCftYhGh1hfcJ9JpXNsXUp8pZDJw=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/tr/trufflehog/package.nix b/pkgs/by-name/tr/trufflehog/package.nix
index fed50ee46549..74e83f4442c7 100644
--- a/pkgs/by-name/tr/trufflehog/package.nix
+++ b/pkgs/by-name/tr/trufflehog/package.nix
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "trufflehog";
- version = "3.92.3";
+ version = "3.92.4";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
tag = "v${version}";
- hash = "sha256-vSJncJzHxiZqDG0BQrLUjU7mFvZ6PnoE2FkITRvKmes=";
+ hash = "sha256-fV1PO8e4ezU4Nzhfqc1vCLH9ex0eEaQyQkrwGpRK4vc=";
};
- vendorHash = "sha256-Qz0tKqqT3PlZFCiYxLBmHeICIx2ogOUW7rfXHadcVPg=";
+ vendorHash = "sha256-98yTB5Wu2W2xesg9NMPv+Yij/stutRSP98MeTf807Jo=";
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/ty/typesetter/package.nix b/pkgs/by-name/ty/typesetter/package.nix
index 9b02751eb273..897bb80be710 100644
--- a/pkgs/by-name/ty/typesetter/package.nix
+++ b/pkgs/by-name/ty/typesetter/package.nix
@@ -30,19 +30,19 @@
stdenv.mkDerivation (finalAttrs: {
pname = "typesetter";
- version = "0.8.2";
+ version = "0.8.3";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "haydn";
repo = "typesetter";
tag = "v${finalAttrs.version}";
- hash = "sha256-ialZTGhzLGLybOSP+cBsV4GzftVzEMYZEoRlAbBQRvY=";
+ hash = "sha256-IJK5ZqrQ7I85d5ULJ9TW61gQ5G0E4XRwPn93i6Sk+OU=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
- hash = "sha256-ohcJds29nDZ/OYb3L7n7QVkXuX32P8ExbtwEvgVoLag=";
+ hash = "sha256-rqcJuDyuw/kpXp4MIboKLWmHvV7AtdH/Qrv9Phcvhjs=";
};
strictDeps = true;
diff --git a/pkgs/by-name/us/usync/package.nix b/pkgs/by-name/us/usync/package.nix
deleted file mode 100644
index 64cddf861a1b..000000000000
--- a/pkgs/by-name/us/usync/package.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- lib,
- stdenv,
- fetchFromGitHub,
- scsh,
- rsync,
- unison,
-}:
-
-stdenv.mkDerivation {
- pname = "usync";
- version = "0.0.3";
-
- src = fetchFromGitHub {
- owner = "ebzzry";
- repo = "usync";
- rev = "99f11b0c196a81843f55ca3456abcb85149b6d51";
- sha256 = "16i1q8f0jmfd43rb8d70l2b383vr5ib4kh7iq3yd345q7xjz9c2j";
- };
-
- installPhase = ''
- install -m 555 -Dt $out/bin $pname
- '';
-
- postFixup = ''
- substituteInPlace $out/bin/$pname --replace "/usr/bin/env scsh" "${scsh}/bin/scsh"
- substituteInPlace $out/bin/$pname --replace "(rsync " "(${rsync}/bin/rsync "
- substituteInPlace $out/bin/$pname --replace "(unison " "(${unison}/bin/unison "
- '';
-
- meta = {
- homepage = "https://github.com/ebzzry/usync";
- description = "Simple site-to-site synchronization tool";
- license = lib.licenses.mit;
- platforms = lib.platforms.unix;
- mainProgram = "usync";
- };
-
- dontBuild = true;
-}
diff --git a/pkgs/by-name/vi/vicinae/package.nix b/pkgs/by-name/vi/vicinae/package.nix
index fc7e8e8a6306..8e75a1dbcc94 100644
--- a/pkgs/by-name/vi/vicinae/package.nix
+++ b/pkgs/by-name/vi/vicinae/package.nix
@@ -5,6 +5,7 @@
coreutils,
fetchFromGitHub,
fetchNpmDeps,
+ glaze,
kdePackages,
lib,
libqalculate,
@@ -21,13 +22,13 @@
}:
gcc15Stdenv.mkDerivation (finalAttrs: {
pname = "vicinae";
- version = "0.16.14";
+ version = "0.17.1";
src = fetchFromGitHub {
owner = "vicinaehq";
repo = "vicinae";
tag = "v${finalAttrs.version}";
- hash = "sha256-G9zuw0IuzOxCeAcLE+IXcsdp0vAGMXBBdlfjBISnL90=";
+ hash = "sha256-xKEfWYf3gJ5wEYd8krT5w70rr0QYEu+7rqJ/IZmCHeQ=";
};
apiDeps = fetchNpmDeps {
@@ -44,6 +45,7 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
"VICINAE_GIT_TAG" = "v${finalAttrs.version}";
"VICINAE_PROVENANCE" = "nix";
"INSTALL_NODE_MODULES" = "OFF";
+ "USE_SYSTEM_GLAZE" = "ON";
"CMAKE_INSTALL_PREFIX" = placeholder "out";
"CMAKE_INSTALL_DATAROOTDIR" = "share";
"CMAKE_INSTALL_BINDIR" = "bin";
@@ -64,6 +66,7 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
buildInputs = [
abseil-cpp
cmark-gfm
+ glaze
kdePackages.layer-shell-qt
kdePackages.qtkeychain
libqalculate
diff --git a/pkgs/by-name/wa/wazero/package.nix b/pkgs/by-name/wa/wazero/package.nix
index fb640dc5e3b2..203abd29262f 100644
--- a/pkgs/by-name/wa/wazero/package.nix
+++ b/pkgs/by-name/wa/wazero/package.nix
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "wazero";
- version = "1.10.1";
+ version = "1.11.0";
src = fetchFromGitHub {
owner = "tetratelabs";
repo = "wazero";
tag = "v${finalAttrs.version}";
- hash = "sha256-VCbXPD34QXpcIdGL/vxD9d/+vmZXkZ5fCePktWZy6fM=";
+ hash = "sha256-FYaWh1zfNcgtQ5S0flk0y6ehP4ZzCwIA+SZgLnha95U=";
};
- vendorHash = null;
+ vendorHash = "sha256-5jAwOu4F3DLVKhnEfEs/IvKwfan7hv65d8OY7gcawNo=";
subPackages = [
"cmd/wazero"
diff --git a/pkgs/by-name/xi/xivlauncher/deps.json b/pkgs/by-name/xi/xivlauncher/deps.json
index 3e020d21239b..cead806085d2 100644
--- a/pkgs/by-name/xi/xivlauncher/deps.json
+++ b/pkgs/by-name/xi/xivlauncher/deps.json
@@ -2,1141 +2,1046 @@
{
"pname": "Castle.Core",
"version": "4.4.1",
- "sha256": "13dja1jxl5zwhi0ghkgvgmqdrixn57f9hk52jy5vpaaakzr550r7"
- },
- {
- "pname": "CheapLoc",
- "version": "1.1.6",
- "sha256": "1m6cgx9yh7h3vrq2d4f99xyvsxc9jvz8zjq1q14qgylfmyq4hx4l"
+ "hash": "sha256-J4NS8p9KqbuLl6JMmNwptsfccH37TfhAhPwX2mVQso0="
},
{
"pname": "CommandLineParser",
"version": "2.9.1",
- "sha256": "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"
+ "hash": "sha256-ApU9y1yX60daSjPk3KYDBeJ7XZByKW8hse9NRZGcjeo="
},
{
"pname": "Config.Net",
"version": "4.19.0",
- "sha256": "17iv0vy0693s6d8626lbz3w1ppn5abn77aaki7h4qi4izysizgim"
- },
- {
- "pname": "Downloader",
- "version": "2.2.8",
- "sha256": "0farwh3pc6m8hsgqywigdpcb4gr2m9myyxm2idzjmhhkzfqghj28"
+ "hash": "sha256-Nb4ftf+RREzgiVOpc+xSxd4b+PiLGmFQM3okA/wGO54="
},
{
"pname": "goaaats.Steamworks",
"version": "2.3.4",
- "sha256": "1khxkkjvh6af60rxc13bacxn85amdfzr8z0b9a6gfg6m1fnmlkss"
+ "hash": "sha256-Wk9arQvVPPeMSgt8lL9rVRVkO1NrBNYzME4ZuOWcHc4="
},
{
"pname": "ImGui.NET",
"version": "1.87.2",
- "sha256": "0rv0n18fvz1gbh45crhzn1f8xw8zkc8qyiyj91vajjcry8mq1x7q"
+ "hash": "sha256-+PSAK/KZSal2SNJHjxGbH/GOXLAfZlYIXC/87VCwYGc="
},
{
"pname": "KeySharp",
"version": "1.0.5",
- "sha256": "1ic10v0a174fw6w89iyg4yzji36bsj15573y676cj5n09n6s75d4"
+ "hash": "sha256-pJWjjU3AFsnMMX6cUoLUy4wovyfPx4S44Y6coMAGgcU="
},
{
"pname": "Microsoft.Bcl.AsyncInterfaces",
- "version": "6.0.0",
- "sha256": "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"
+ "version": "9.0.2",
+ "hash": "sha256-D+MR5Rzxn+aFPVJWF83pc0dTWnQes658xBM4bPZ6HPc="
},
{
"pname": "Microsoft.CodeAnalysis.Analyzers",
"version": "3.3.3",
- "sha256": "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"
+ "hash": "sha256-pkZiggwLw8k+CVSXKTzsVGsT+K49LxXUS3VH5PNlpCY="
},
{
"pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
- "version": "3.3.3",
- "sha256": "1z6x0d8lpcfjr3sxy25493i17vvcg5bsay6c03qan6mnj5aqzw2k"
+ "version": "3.3.4",
+ "hash": "sha256-YPTHTZ8xRPMLADdcVYRO/eq3O9uZjsD+OsGRZE+0+e8="
+ },
+ {
+ "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
+ "version": "4.14.0",
+ "hash": "sha256-f7svtnkq4xLTjGVj6kNZ1ZGFCV/RESsM+GJZmEpezh4="
},
{
"pname": "Microsoft.CodeAnalysis.Common",
"version": "4.0.1",
- "sha256": "0axjv1nhk1z9d4c51d9yxdp09l8yqqnqaifhqcwnxnv0r4y5cka9"
+ "hash": "sha256-SU1WPMlg2245w9BFhS3GHtEEbus+tVAYaemHCW3Ysis="
},
{
"pname": "Microsoft.CodeAnalysis.CSharp",
"version": "4.0.1",
- "sha256": "1h6jfifg7pw2vacpdds4v4jqnaydg9b108irf315wzx6rh8yv9cb"
+ "hash": "sha256-i6XtEcymf17CcDkiEFZ6zSuLJdlEt3aZ2oLf81x00sA="
},
{
"pname": "Microsoft.CodeAnalysis.NetAnalyzers",
- "version": "6.0.0",
- "sha256": "06zy947m5lrbwb684g42ijb07r5jsqycvfnphc6cqfdrfnzqv6k9"
+ "version": "10.0.101",
+ "hash": "sha256-7rrB4tBiF3t+yoHcg170KlypFS/Z7xAPOM9OQZOs1Yg="
},
{
"pname": "Microsoft.CodeAnalysis.NetAnalyzers",
- "version": "7.0.0",
- "sha256": "1rl5zi8s213g70nvqfacf50ff8vqvaj8i7jxv0gjw2hkz73dg4h1"
- },
- {
- "pname": "Microsoft.CSharp",
- "version": "4.0.1",
- "sha256": "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"
+ "version": "9.0.0",
+ "hash": "sha256-UBTANXmzAS6KuCKDIGhi0MGphAI83FizpRCPebqJ9GE="
},
{
"pname": "Microsoft.DotNet.PlatformAbstractions",
"version": "2.0.3",
- "sha256": "020214swxm0hip1d9gjskrzmqzjnji7c6l5b3xcch8vp166066m9"
+ "hash": "sha256-qRoDjAl3I8hYH6tQw06UVn5cf55avtTCjRDUzjUJAgg="
},
{
"pname": "Microsoft.Extensions.DependencyModel",
"version": "2.0.3",
- "sha256": "0dpyjp0hy9kkvk2dd4dclfmb10yq5avsw2a6v8nra9g6ii2p1nla"
- },
- {
- "pname": "Microsoft.NETCore.Platforms",
- "version": "1.0.1",
- "sha256": "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"
+ "hash": "sha256-itpwRYzmJZUt2kYJrrcq2IOwqqOskdbE3HMmD8GV/jY="
},
{
"pname": "Microsoft.NETCore.Platforms",
"version": "1.1.0",
- "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"
- },
- {
- "pname": "Microsoft.NETCore.Targets",
- "version": "1.0.1",
- "sha256": "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"
+ "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
},
{
"pname": "Microsoft.NETCore.Targets",
"version": "1.1.0",
- "sha256": "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"
+ "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
},
{
"pname": "Microsoft.Win32.Primitives",
"version": "4.3.0",
- "sha256": "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"
+ "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="
},
{
"pname": "Microsoft.Win32.Registry",
"version": "6.0.0-preview.5.21301.5",
- "sha256": "02712s86n2i8s5j6vxdayqwcc7r538yw3frhf1gfrc6ah6hvqnzc"
+ "hash": "sha256-7Fu8oYHKsOxecDC7wT0aJR/GOPaq9W1k0SgKa5AW4Qg="
},
{
"pname": "Microsoft.Win32.SystemEvents",
"version": "6.0.0",
- "sha256": "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"
- },
- {
- "pname": "Mono.Cecil",
- "version": "0.9.6.1",
- "sha256": "1fr7969h5q611l5227xw6nvv5rzap76vbpk0wg9hxbcxk3hn7szf"
+ "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="
},
{
"pname": "NativeLibraryLoader",
"version": "1.0.13",
- "sha256": "18vi5gpa243jvz8cixyhbbrccj4js5sc8g4gy10ldjy50szrpnqh"
+ "hash": "sha256-ENubvwbFy0ZB8I88xHTRkkjG8lrQ98jQ33IQoe4rcaM="
},
{
"pname": "NETStandard.Library",
"version": "1.6.1",
- "sha256": "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"
+ "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="
},
{
"pname": "NETStandard.Library",
"version": "2.0.3",
- "sha256": "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"
+ "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="
},
{
"pname": "Newtonsoft.Json",
- "version": "12.0.2",
- "sha256": "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"
+ "version": "13.0.3",
+ "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
},
{
"pname": "Newtonsoft.Json",
"version": "9.0.1",
- "sha256": "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"
+ "hash": "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="
},
{
"pname": "PInvoke.Kernel32",
"version": "0.7.124",
- "sha256": "0n1245s2p5735n8xgmahrx7g8mw32pxdn4rr9dydb9r6mvgm9bhk"
+ "hash": "sha256-E65U364mp9V8SzkT2/oVg1f0Ts9Q1deRLeOUK3QhIlg="
},
{
"pname": "PInvoke.Windows.Core",
"version": "0.7.124",
- "sha256": "16qkn91gh3aiab2330q5j1vlx2ni4m4kkz04dvsqlm8lr7ldizlz"
+ "hash": "sha256-n/7Y6MkUVYr1bgT8OUkl0YpOd5AFgzHEUlEN+EKyE5s="
},
{
"pname": "PolySharp",
"version": "1.10.0",
- "sha256": "06qici3hhk6a0jmy0nyvspcnmhbapnic6iin3i28pkdvrii02hnz"
+ "hash": "sha256-30IBYsy7zYtEHDZGw6K9asFq2dXbW+CrBMpMCEdkERs="
},
{
"pname": "runtime.any.System.Collections",
"version": "4.3.0",
- "sha256": "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"
+ "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="
},
{
"pname": "runtime.any.System.Diagnostics.Tools",
"version": "4.3.0",
- "sha256": "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"
+ "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="
},
{
"pname": "runtime.any.System.Diagnostics.Tracing",
"version": "4.3.0",
- "sha256": "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"
+ "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="
},
{
"pname": "runtime.any.System.Globalization",
"version": "4.3.0",
- "sha256": "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"
+ "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="
},
{
"pname": "runtime.any.System.Globalization.Calendars",
"version": "4.3.0",
- "sha256": "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"
+ "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="
},
{
"pname": "runtime.any.System.IO",
"version": "4.3.0",
- "sha256": "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"
+ "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="
},
{
"pname": "runtime.any.System.Reflection",
"version": "4.3.0",
- "sha256": "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"
+ "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="
},
{
"pname": "runtime.any.System.Reflection.Extensions",
"version": "4.3.0",
- "sha256": "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"
+ "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="
},
{
"pname": "runtime.any.System.Reflection.Primitives",
"version": "4.3.0",
- "sha256": "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"
+ "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="
},
{
"pname": "runtime.any.System.Resources.ResourceManager",
"version": "4.3.0",
- "sha256": "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"
+ "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="
},
{
"pname": "runtime.any.System.Runtime",
"version": "4.3.0",
- "sha256": "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"
+ "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="
},
{
"pname": "runtime.any.System.Runtime.Handles",
"version": "4.3.0",
- "sha256": "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"
+ "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="
},
{
"pname": "runtime.any.System.Runtime.InteropServices",
"version": "4.3.0",
- "sha256": "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"
+ "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="
},
{
"pname": "runtime.any.System.Text.Encoding",
"version": "4.3.0",
- "sha256": "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"
+ "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="
},
{
"pname": "runtime.any.System.Text.Encoding.Extensions",
"version": "4.3.0",
- "sha256": "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"
+ "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="
},
{
"pname": "runtime.any.System.Threading.Tasks",
"version": "4.3.0",
- "sha256": "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"
+ "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="
},
{
"pname": "runtime.any.System.Threading.Timer",
"version": "4.3.0",
- "sha256": "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"
+ "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="
},
{
"pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
- "sha256": "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"
+ "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="
},
{
"pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
- "sha256": "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"
+ "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="
},
{
"pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
- "sha256": "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"
- },
- {
- "pname": "runtime.native.System",
- "version": "4.0.0",
- "sha256": "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"
+ "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="
},
{
"pname": "runtime.native.System",
"version": "4.3.0",
- "sha256": "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"
+ "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
},
{
"pname": "runtime.native.System.IO.Compression",
"version": "4.3.0",
- "sha256": "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"
+ "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="
},
{
"pname": "runtime.native.System.Net.Http",
"version": "4.3.0",
- "sha256": "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"
+ "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="
},
{
"pname": "runtime.native.System.Security.Cryptography.Apple",
"version": "4.3.0",
- "sha256": "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"
+ "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="
},
{
"pname": "runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
- "sha256": "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"
+ "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="
},
{
"pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
- "sha256": "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"
+ "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="
},
{
"pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
- "sha256": "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"
+ "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="
},
{
"pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple",
"version": "4.3.0",
- "sha256": "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"
+ "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="
},
{
"pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
- "sha256": "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"
+ "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="
},
{
"pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
- "sha256": "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"
+ "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="
},
{
"pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
- "sha256": "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"
+ "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="
},
{
"pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
- "sha256": "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"
+ "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="
},
{
"pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
- "sha256": "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"
+ "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="
},
{
"pname": "runtime.unix.Microsoft.Win32.Primitives",
"version": "4.3.0",
- "sha256": "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"
+ "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="
},
{
"pname": "runtime.unix.System.Console",
"version": "4.3.0",
- "sha256": "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"
+ "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="
},
{
"pname": "runtime.unix.System.Diagnostics.Debug",
"version": "4.3.0",
- "sha256": "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"
+ "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="
},
{
"pname": "runtime.unix.System.IO.FileSystem",
"version": "4.3.0",
- "sha256": "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"
+ "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="
},
{
"pname": "runtime.unix.System.Net.Primitives",
"version": "4.3.0",
- "sha256": "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"
+ "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="
},
{
"pname": "runtime.unix.System.Net.Sockets",
"version": "4.3.0",
- "sha256": "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"
+ "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="
},
{
"pname": "runtime.unix.System.Private.Uri",
"version": "4.3.0",
- "sha256": "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"
+ "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="
},
{
"pname": "runtime.unix.System.Runtime.Extensions",
"version": "4.3.0",
- "sha256": "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"
+ "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="
},
{
"pname": "Serilog",
- "version": "2.12.0",
- "sha256": "0lqxpc96qcjkv9pr1rln7mi4y7n7jdi4vb36c2fv3845w1vswgr4"
+ "version": "4.0.0",
+ "hash": "sha256-j8hQ5TdL1TjfdGiBO9PyHJFMMPvATHWN1dtrrUZZlNw="
+ },
+ {
+ "pname": "Serilog",
+ "version": "4.1.0",
+ "hash": "sha256-r89nJ5JE5uZlsRrfB8QJQ1byVVfCWQbySKQ/m9PYj0k="
+ },
+ {
+ "pname": "Serilog",
+ "version": "4.2.0",
+ "hash": "sha256-7f3EpCsEbDxXgsuhE430KVI14p7oDUuCtwRpOCqtnbs="
+ },
+ {
+ "pname": "Serilog",
+ "version": "4.3.0",
+ "hash": "sha256-jyIy4BjsyFXge3aO4GRFAdnX4/rz1MHfBkBDIpCDsTw="
},
{
"pname": "Serilog.Enrichers.Sensitive",
- "version": "1.7.2",
- "sha256": "1f3r4jrfiz47vnvy7m0w6d8280nhhna67xwbagx1i557m9qvjssg"
+ "version": "1.7.3",
+ "hash": "sha256-1HnnaGEwTiDo11w5wWdjDxNxVO4WLFBnAggxmyZCYIg="
},
{
"pname": "Serilog.Enrichers.Thread",
- "version": "3.1.0",
- "sha256": "1y75aiv2k1sxnh012ixkx92fq1yl8srqggy8l439igg4p223hcqi"
+ "version": "4.0.0",
+ "hash": "sha256-lo+3ohNHKe/hTq9vGbk29p/OWcNlcyJToGL6EpCJQm8="
},
{
"pname": "Serilog.Sinks.Async",
- "version": "1.5.0",
- "sha256": "0bcb3n6lmg5wfj806mziybfmbb8gyiszrivs3swf0msy8w505gyg"
+ "version": "2.1.0",
+ "hash": "sha256-LDoLpXkleD2MVPK2KBsLGRf5yqrwckBiAnYDbuIbaUM="
},
{
"pname": "Serilog.Sinks.Console",
- "version": "3.1.1",
- "sha256": "0j99as641y1k6havwwkhyr0n08vibiblmfjj6nz051mz8g3864fn"
- },
- {
- "pname": "Serilog.Sinks.Console",
- "version": "4.0.1",
- "sha256": "080vh9kcyn9lx4j7p34146kp9byvhqlaz5jn9wzx70ql9cwd0hlz"
+ "version": "6.0.0",
+ "hash": "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro="
},
{
"pname": "Serilog.Sinks.Debug",
- "version": "1.0.1",
- "sha256": "0969mb254kr59bgkq01ybyzca89z3f4n9ng5mdj8m53d5653zf22"
+ "version": "3.0.0",
+ "hash": "sha256-7/LmoRF1rUDFhJ47bTRQQFRgSHnZDO8484r3sCGqYvE="
},
{
"pname": "Serilog.Sinks.File",
- "version": "5.0.0",
- "sha256": "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"
+ "version": "6.0.0",
+ "hash": "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow="
+ },
+ {
+ "pname": "Serilog.Sinks.File",
+ "version": "7.0.0",
+ "hash": "sha256-LxZYUoUPkCjIIVarJilnXnqQiMrFNJtoRilmzTNtUjo="
},
{
"pname": "SharedMemory",
"version": "2.3.2",
- "sha256": "078qaab0j8p2fjcc9n7r4sr5pr7567a9bspfiikkc85bsx7vfm8w"
+ "hash": "sha256-HFW3T9erIDZnjO7qldQx5eRbsib52MSYdOIiCZZSGB0="
},
{
"pname": "SharpGen.Runtime",
"version": "2.0.0-beta.13",
- "sha256": "1250z6sa9ghf84czlkzvaysb29c0n229z1f0vh5qls89akrkl7h8"
+ "hash": "sha256-CB4681QJaYoL3MCFn4SwgCWxtFf7T/oZQQ6+pLT5oIg="
},
{
"pname": "SharpGen.Runtime.COM",
"version": "2.0.0-beta.13",
- "sha256": "1lmv3jp2g7mgy9j23pd3j0wr3p89qiq8v6c6qxqf688izyni1166"
+ "hash": "sha256-xoQQrf8RIeNwx4aZjXDECd2ROZCj3SFk8q+eJ64cu9I="
},
{
"pname": "SixLabors.ImageSharp",
"version": "1.0.4",
- "sha256": "0fmgn414my76gjgp89qlc210a0lqvnvkvk2fcwnpwxdhqpfvyilr"
+ "hash": "sha256-mUa/3cWwdX4tZ07MPbfdmAIFgmAUJ3SffOb4SgKxrzo="
},
{
"pname": "System.AppContext",
"version": "4.1.0",
- "sha256": "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"
+ "hash": "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs="
},
{
"pname": "System.AppContext",
"version": "4.3.0",
- "sha256": "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"
+ "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="
},
{
"pname": "System.Buffers",
"version": "4.3.0",
- "sha256": "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"
+ "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="
},
{
"pname": "System.Buffers",
"version": "4.4.0",
- "sha256": "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"
+ "hash": "sha256-KTxAhYawFG2V5VX1jw3pzx3IrQXRgn1TsvgjPgxAbqA="
},
{
"pname": "System.Buffers",
"version": "4.5.1",
- "sha256": "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"
+ "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
+ },
+ {
+ "pname": "System.Buffers",
+ "version": "4.6.0",
+ "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc="
},
{
"pname": "System.Collections",
"version": "4.0.11",
- "sha256": "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"
+ "hash": "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="
},
{
"pname": "System.Collections",
"version": "4.3.0",
- "sha256": "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"
+ "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="
},
{
"pname": "System.Collections.Concurrent",
"version": "4.3.0",
- "sha256": "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"
+ "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="
},
{
"pname": "System.Collections.Immutable",
"version": "5.0.0",
- "sha256": "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"
+ "hash": "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="
},
{
"pname": "System.Collections.NonGeneric",
"version": "4.3.0",
- "sha256": "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"
+ "hash": "sha256-8/yZmD4jjvq7m68SPkJZLBQ79jOTOyT5lyzX4SCYAx8="
},
{
"pname": "System.Collections.Specialized",
"version": "4.3.0",
- "sha256": "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"
+ "hash": "sha256-QNg0JJNx+zXMQ26MJRPzH7THdtqjrNtGLUgaR1SdvOk="
},
{
"pname": "System.ComponentModel",
"version": "4.3.0",
- "sha256": "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"
+ "hash": "sha256-i00uujMO4JEDIEPKLmdLY3QJ6vdSpw6Gh9oOzkFYBiU="
},
{
"pname": "System.ComponentModel.Primitives",
"version": "4.3.0",
- "sha256": "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"
+ "hash": "sha256-IOMJleuIBppmP4ECB3uftbdcgL7CCd56+oAD/Sqrbus="
},
{
"pname": "System.ComponentModel.TypeConverter",
"version": "4.3.0",
- "sha256": "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"
+ "hash": "sha256-PSDiPYt8PgTdTUBz+GH6lHCaM1YgfObneHnZsc8Fz54="
},
{
"pname": "System.Configuration.ConfigurationManager",
"version": "6.0.0",
- "sha256": "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"
+ "hash": "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms="
},
{
"pname": "System.Console",
"version": "4.3.0",
- "sha256": "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"
+ "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="
},
{
"pname": "System.Diagnostics.Debug",
"version": "4.0.11",
- "sha256": "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"
+ "hash": "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="
},
{
"pname": "System.Diagnostics.Debug",
"version": "4.3.0",
- "sha256": "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"
+ "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="
},
{
"pname": "System.Diagnostics.DiagnosticSource",
"version": "4.3.0",
- "sha256": "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"
+ "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="
},
{
- "pname": "System.Diagnostics.Tools",
- "version": "4.0.1",
- "sha256": "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"
+ "pname": "System.Diagnostics.DiagnosticSource",
+ "version": "8.0.1",
+ "hash": "sha256-zmwHjcJgKcbkkwepH038QhcnsWMJcHys+PEbFGC0Jgo="
},
{
"pname": "System.Diagnostics.Tools",
"version": "4.3.0",
- "sha256": "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"
+ "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="
},
{
"pname": "System.Diagnostics.TraceSource",
"version": "4.3.0",
- "sha256": "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"
+ "hash": "sha256-xpxwaXsRcgso8Gj0cqY4+Hvvz6vZkmEMh5/J204j3M8="
},
{
"pname": "System.Diagnostics.Tracing",
"version": "4.3.0",
- "sha256": "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"
+ "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="
},
{
"pname": "System.Drawing.Common",
"version": "6.0.0",
- "sha256": "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"
+ "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="
},
{
"pname": "System.Dynamic.Runtime",
"version": "4.0.11",
- "sha256": "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"
+ "hash": "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="
},
{
"pname": "System.Dynamic.Runtime",
"version": "4.3.0",
- "sha256": "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"
- },
- {
- "pname": "System.Globalization",
- "version": "4.0.11",
- "sha256": "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"
+ "hash": "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="
},
{
"pname": "System.Globalization",
"version": "4.3.0",
- "sha256": "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"
+ "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="
},
{
"pname": "System.Globalization.Calendars",
"version": "4.3.0",
- "sha256": "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"
+ "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="
},
{
"pname": "System.Globalization.Extensions",
"version": "4.3.0",
- "sha256": "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"
+ "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="
},
{
"pname": "System.IO",
"version": "4.1.0",
- "sha256": "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"
+ "hash": "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="
},
{
"pname": "System.IO",
"version": "4.3.0",
- "sha256": "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"
+ "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="
},
{
"pname": "System.IO.Compression",
"version": "4.3.0",
- "sha256": "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"
+ "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="
},
{
"pname": "System.IO.Compression.ZipFile",
"version": "4.3.0",
- "sha256": "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"
+ "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="
},
{
"pname": "System.IO.FileSystem",
"version": "4.0.1",
- "sha256": "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"
+ "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="
},
{
"pname": "System.IO.FileSystem",
"version": "4.3.0",
- "sha256": "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"
- },
- {
- "pname": "System.IO.FileSystem.Primitives",
- "version": "4.0.1",
- "sha256": "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"
+ "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="
},
{
"pname": "System.IO.FileSystem.Primitives",
"version": "4.3.0",
- "sha256": "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"
+ "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="
+ },
+ {
+ "pname": "System.IO.Pipelines",
+ "version": "9.0.2",
+ "hash": "sha256-uxM7J0Q/dzEsD0NGcVBsOmdHiOEawZ5GNUKBwpdiPyE="
},
{
"pname": "System.Linq",
"version": "4.1.0",
- "sha256": "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"
+ "hash": "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="
},
{
"pname": "System.Linq",
"version": "4.3.0",
- "sha256": "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"
- },
- {
- "pname": "System.Linq.Expressions",
- "version": "4.1.0",
- "sha256": "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"
+ "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="
},
{
"pname": "System.Linq.Expressions",
"version": "4.3.0",
- "sha256": "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"
+ "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="
},
{
"pname": "System.Memory",
"version": "4.5.4",
- "sha256": "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"
+ "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="
+ },
+ {
+ "pname": "System.Memory",
+ "version": "4.5.5",
+ "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
+ },
+ {
+ "pname": "System.Memory",
+ "version": "4.6.0",
+ "hash": "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo="
},
{
"pname": "System.Net.Http",
"version": "4.3.0",
- "sha256": "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"
+ "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="
},
{
"pname": "System.Net.NameResolution",
"version": "4.3.0",
- "sha256": "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"
+ "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="
},
{
"pname": "System.Net.Primitives",
"version": "4.3.0",
- "sha256": "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"
+ "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="
},
{
"pname": "System.Net.Sockets",
"version": "4.3.0",
- "sha256": "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"
+ "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="
},
{
"pname": "System.Numerics.Vectors",
"version": "4.4.0",
- "sha256": "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"
+ "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="
},
{
"pname": "System.Numerics.Vectors",
"version": "4.5.0",
- "sha256": "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"
+ "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="
},
{
- "pname": "System.ObjectModel",
- "version": "4.0.12",
- "sha256": "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"
+ "pname": "System.Numerics.Vectors",
+ "version": "4.6.0",
+ "hash": "sha256-fKS3uWQ2HmR69vNhDHqPLYNOt3qpjiWQOXZDHvRE1HU="
},
{
"pname": "System.ObjectModel",
"version": "4.3.0",
- "sha256": "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"
+ "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="
},
{
"pname": "System.Private.Uri",
"version": "4.3.0",
- "sha256": "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"
- },
- {
- "pname": "System.Reflection",
- "version": "4.1.0",
- "sha256": "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"
+ "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
},
{
"pname": "System.Reflection",
"version": "4.3.0",
- "sha256": "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"
- },
- {
- "pname": "System.Reflection.Emit",
- "version": "4.0.1",
- "sha256": "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"
+ "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="
},
{
"pname": "System.Reflection.Emit",
"version": "4.3.0",
- "sha256": "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"
- },
- {
- "pname": "System.Reflection.Emit.ILGeneration",
- "version": "4.0.1",
- "sha256": "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"
+ "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="
},
{
"pname": "System.Reflection.Emit.ILGeneration",
"version": "4.3.0",
- "sha256": "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"
+ "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="
},
{
"pname": "System.Reflection.Emit.ILGeneration",
"version": "4.7.0",
- "sha256": "0l8jpxhpgjlf1nkz5lvp61r4kfdbhr29qi8aapcxn3izd9wd0j8r"
- },
- {
- "pname": "System.Reflection.Emit.Lightweight",
- "version": "4.0.1",
- "sha256": "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"
+ "hash": "sha256-GUnQeGo/DtvZVQpFnESGq7lJcjB30/KnDY7Kd2G/ElE="
},
{
"pname": "System.Reflection.Emit.Lightweight",
"version": "4.3.0",
- "sha256": "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"
+ "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="
},
{
"pname": "System.Reflection.Emit.Lightweight",
"version": "4.7.0",
- "sha256": "0mbjfajmafkca47zr8v36brvknzks5a7pgb49kfq2d188pyv6iap"
- },
- {
- "pname": "System.Reflection.Extensions",
- "version": "4.0.1",
- "sha256": "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"
+ "hash": "sha256-V0Wz/UUoNIHdTGS9e1TR89u58zJjo/wPUWw6VaVyclU="
},
{
"pname": "System.Reflection.Extensions",
"version": "4.3.0",
- "sha256": "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"
+ "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="
},
{
"pname": "System.Reflection.Metadata",
"version": "5.0.0",
- "sha256": "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"
- },
- {
- "pname": "System.Reflection.Primitives",
- "version": "4.0.1",
- "sha256": "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"
+ "hash": "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="
},
{
"pname": "System.Reflection.Primitives",
"version": "4.3.0",
- "sha256": "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"
+ "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="
},
{
"pname": "System.Reflection.TypeExtensions",
"version": "4.1.0",
- "sha256": "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"
+ "hash": "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="
},
{
"pname": "System.Reflection.TypeExtensions",
"version": "4.3.0",
- "sha256": "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"
- },
- {
- "pname": "System.Resources.ResourceManager",
- "version": "4.0.1",
- "sha256": "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"
+ "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="
},
{
"pname": "System.Resources.ResourceManager",
"version": "4.3.0",
- "sha256": "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"
- },
- {
- "pname": "System.Runtime",
- "version": "4.1.0",
- "sha256": "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"
+ "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="
},
{
"pname": "System.Runtime",
"version": "4.3.0",
- "sha256": "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"
+ "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
},
{
"pname": "System.Runtime.CompilerServices.Unsafe",
"version": "4.4.0",
- "sha256": "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"
+ "hash": "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig="
},
{
"pname": "System.Runtime.CompilerServices.Unsafe",
"version": "4.5.0",
- "sha256": "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"
+ "hash": "sha256-g9jIdQtXSAhY+ezQtYNgHEUoQR3HzznHs3JMzD9bip4="
+ },
+ {
+ "pname": "System.Runtime.CompilerServices.Unsafe",
+ "version": "4.5.2",
+ "hash": "sha256-8eUXXGWO2LL7uATMZye2iCpQOETn2jCcjUhG6coR5O8="
},
{
"pname": "System.Runtime.CompilerServices.Unsafe",
"version": "4.5.3",
- "sha256": "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"
+ "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="
},
{
"pname": "System.Runtime.CompilerServices.Unsafe",
"version": "5.0.0",
- "sha256": "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"
+ "hash": "sha256-neARSpLPUzPxEKhJRwoBzhPxK+cKIitLx7WBYncsYgo="
},
{
"pname": "System.Runtime.CompilerServices.Unsafe",
"version": "6.0.0",
- "sha256": "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"
+ "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
+ },
+ {
+ "pname": "System.Runtime.CompilerServices.Unsafe",
+ "version": "6.1.0",
+ "hash": "sha256-NyqqpRcHumzSxpsgRDguD5SGwdUNHBbo0OOdzLTIzCU="
},
{
"pname": "System.Runtime.Extensions",
"version": "4.1.0",
- "sha256": "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"
+ "hash": "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="
},
{
"pname": "System.Runtime.Extensions",
"version": "4.3.0",
- "sha256": "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"
- },
- {
- "pname": "System.Runtime.Handles",
- "version": "4.0.1",
- "sha256": "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"
+ "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="
},
{
"pname": "System.Runtime.Handles",
"version": "4.3.0",
- "sha256": "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"
+ "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="
},
{
"pname": "System.Runtime.InteropServices",
"version": "4.1.0",
- "sha256": "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"
+ "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="
},
{
"pname": "System.Runtime.InteropServices",
"version": "4.3.0",
- "sha256": "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"
+ "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="
},
{
"pname": "System.Runtime.InteropServices.RuntimeInformation",
"version": "4.0.0",
- "sha256": "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"
+ "hash": "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4="
},
{
"pname": "System.Runtime.InteropServices.RuntimeInformation",
"version": "4.3.0",
- "sha256": "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"
+ "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="
},
{
"pname": "System.Runtime.Numerics",
"version": "4.3.0",
- "sha256": "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"
- },
- {
- "pname": "System.Runtime.Serialization.Primitives",
- "version": "4.1.1",
- "sha256": "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"
+ "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="
},
{
"pname": "System.Security.AccessControl",
"version": "6.0.0",
- "sha256": "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"
+ "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="
},
{
"pname": "System.Security.AccessControl",
"version": "6.0.0-preview.5.21301.5",
- "sha256": "131f3z3ikv3n8442chr11nj4x46amq00mb53pb2ds42dabldkdgy"
- },
- {
- "pname": "System.Security.Claims",
- "version": "4.3.0",
- "sha256": "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"
+ "hash": "sha256-/rXZ6FJNEN3EuqOsCgCuypBOpA0hQyYIQXbsGccfLow="
},
{
"pname": "System.Security.Cryptography.Algorithms",
"version": "4.3.0",
- "sha256": "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"
+ "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="
},
{
"pname": "System.Security.Cryptography.Cng",
"version": "4.3.0",
- "sha256": "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"
+ "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="
},
{
"pname": "System.Security.Cryptography.Csp",
"version": "4.3.0",
- "sha256": "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"
+ "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="
},
{
"pname": "System.Security.Cryptography.Encoding",
"version": "4.3.0",
- "sha256": "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"
+ "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="
},
{
"pname": "System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
- "sha256": "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"
+ "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="
},
{
"pname": "System.Security.Cryptography.Primitives",
"version": "4.3.0",
- "sha256": "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"
+ "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="
},
{
"pname": "System.Security.Cryptography.ProtectedData",
"version": "6.0.0",
- "sha256": "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"
+ "hash": "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY="
},
{
"pname": "System.Security.Cryptography.X509Certificates",
"version": "4.3.0",
- "sha256": "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"
+ "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="
},
{
"pname": "System.Security.Permissions",
"version": "6.0.0",
- "sha256": "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"
- },
- {
- "pname": "System.Security.Principal",
- "version": "4.3.0",
- "sha256": "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"
+ "hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="
},
{
"pname": "System.Security.Principal.Windows",
"version": "4.3.0",
- "sha256": "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"
+ "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="
},
{
"pname": "System.Security.Principal.Windows",
"version": "5.0.0",
- "sha256": "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"
+ "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="
},
{
"pname": "System.Security.Principal.Windows",
"version": "6.0.0-preview.5.21301.5",
- "sha256": "1q3iikvjcfrm5p89p1j7qlw1szvryq680qypk023wgy9phmlwi57"
- },
- {
- "pname": "System.Text.Encoding",
- "version": "4.0.11",
- "sha256": "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"
+ "hash": "sha256-p0ROK7zJPz4EmNdjgAz2eX8dOMVHhpvQLTU7JveMceA="
},
{
"pname": "System.Text.Encoding",
"version": "4.3.0",
- "sha256": "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"
+ "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="
},
{
"pname": "System.Text.Encoding.CodePages",
"version": "4.5.1",
- "sha256": "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"
- },
- {
- "pname": "System.Text.Encoding.Extensions",
- "version": "4.0.11",
- "sha256": "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"
+ "hash": "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="
},
{
"pname": "System.Text.Encoding.Extensions",
"version": "4.3.0",
- "sha256": "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"
+ "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="
},
{
"pname": "System.Text.Encodings.Web",
- "version": "6.0.0",
- "sha256": "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"
+ "version": "9.0.2",
+ "hash": "sha256-tZhc/Xe+SF9bCplthph2QmQakWxKVjMfQJZzD1Xbpg8="
},
{
"pname": "System.Text.Json",
- "version": "6.0.6",
- "sha256": "0bkfrnr9618brbl1gvhyqrf5720syawf9dvpk8xfvkxbg7imlpjx"
- },
- {
- "pname": "System.Text.RegularExpressions",
- "version": "4.1.0",
- "sha256": "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"
+ "version": "9.0.2",
+ "hash": "sha256-kftKUuGgZtF4APmp77U79ws76mEIi+R9+DSVGikA5y8="
},
{
"pname": "System.Text.RegularExpressions",
"version": "4.3.0",
- "sha256": "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"
- },
- {
- "pname": "System.Threading",
- "version": "4.0.11",
- "sha256": "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"
+ "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="
},
{
"pname": "System.Threading",
"version": "4.3.0",
- "sha256": "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"
+ "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="
},
{
- "pname": "System.Threading.Tasks",
- "version": "4.0.11",
- "sha256": "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"
+ "pname": "System.Threading.Channels",
+ "version": "8.0.0",
+ "hash": "sha256-c5TYoLNXDLroLIPnlfyMHk7nZ70QAckc/c7V199YChg="
},
{
"pname": "System.Threading.Tasks",
"version": "4.3.0",
- "sha256": "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"
- },
- {
- "pname": "System.Threading.Tasks.Extensions",
- "version": "4.0.0",
- "sha256": "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"
+ "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="
},
{
"pname": "System.Threading.Tasks.Extensions",
"version": "4.3.0",
- "sha256": "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"
+ "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="
},
{
"pname": "System.Threading.Tasks.Extensions",
"version": "4.5.4",
- "sha256": "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"
+ "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
},
{
"pname": "System.Threading.ThreadPool",
"version": "4.3.0",
- "sha256": "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"
+ "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="
},
{
"pname": "System.Threading.Timer",
"version": "4.3.0",
- "sha256": "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"
+ "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="
},
{
"pname": "System.Windows.Extensions",
"version": "6.0.0",
- "sha256": "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"
- },
- {
- "pname": "System.Xml.ReaderWriter",
- "version": "4.0.11",
- "sha256": "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"
+ "hash": "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="
},
{
"pname": "System.Xml.ReaderWriter",
"version": "4.3.0",
- "sha256": "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"
- },
- {
- "pname": "System.Xml.XDocument",
- "version": "4.0.11",
- "sha256": "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"
+ "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="
},
{
"pname": "System.Xml.XDocument",
"version": "4.3.0",
- "sha256": "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"
+ "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="
},
{
"pname": "System.Xml.XmlDocument",
"version": "4.3.0",
- "sha256": "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"
+ "hash": "sha256-kbuV4Y7rVJkfMp2Kgoi8Zvdatm9CZNmlKB3GZgANvy4="
},
{
"pname": "Veldrid",
"version": "4.9.0",
- "sha256": "0l1sqz0jinw6d5rxhjaavckgmv1b8cc909crjjc9wvf7hp70gzmg"
+ "hash": "sha256-r/4HzoXHbZ6YlJklkBhDK+z6JttKSdhzaYbbKMHHOlA="
},
{
"pname": "Veldrid.ImageSharp",
"version": "4.9.0",
- "sha256": "0w1wvfhkf85c81chpcqlln41kzi2rk49pw6imyypqhpvsi1nw9n6"
+ "hash": "sha256-xiZuQ9T7Qny9r9Hwm8jMIv4ZiKUUswtZQKwgN6HbPHA="
},
{
"pname": "Veldrid.MetalBindings",
"version": "4.9.0",
- "sha256": "1zd04q70fdlxsy045yk4pj499n8vl9qdcr86vj9wj4qq1jmd8pr3"
+ "hash": "sha256-I1/UqgwYE8mT3AZl1nCiG9mUiLxk+kKA1502Bw4moP0="
},
{
"pname": "Veldrid.OpenGLBindings",
"version": "4.9.0",
- "sha256": "06cjfrzig75lms930861339v35y96n421236318pjad9jmwhac74"
+ "hash": "sha256-5DAFeZWpKXlRGGaIIIg1yZex0xjBIDCSrrScF392khk="
},
{
"pname": "Veldrid.SDL2",
"version": "4.9.0",
- "sha256": "0cm5jx24wvzk88mip68n34sfg7psdjiyng7pf01g67blz56rlzhl"
+ "hash": "sha256-FH6aTfl0HfMCcPc866Ns+p7nNBkWmRsrQvNvTkSXpTI="
},
{
"pname": "Veldrid.StartupUtilities",
"version": "4.9.0",
- "sha256": "10b62ni8ihbnb213rkpw38n1gpk0blli9cb8agihml7za41x3b4y"
+ "hash": "sha256-nqzRA1H/0ArjU2ixFCldYN4XLBr8zjyCWHbBiKIVZoE="
},
{
"pname": "Vk",
"version": "1.0.25",
- "sha256": "18kx3g088215803yznnmf6621wgwvgakj8hlmrb726b7zwb3x53l"
+ "hash": "sha256-dJQ+Fv9nGXFWrhQiOdXb/PEgjHHV2u8HQCUIhMAbfaI="
},
{
"pname": "Vortice.D3DCompiler",
"version": "2.3.0",
- "sha256": "08an0z9xk6vqz2cdyhmbvvg7nzk7r1vcn0jp4c986s2sqk9jv5dj"
+ "hash": "sha256-spUt08RaaIMSI1cCy3bIZ3573t6rQt+Y+Hib2dMHViE="
},
{
"pname": "Vortice.Direct3D11",
"version": "2.3.0",
- "sha256": "05lgnkjslcsyrxg206cy9s33qlxj7cb3v47x4accp4p7f6v7k6lr"
+ "hash": "sha256-mZp5tnHnksuYIv2QPRY7slM8hk6eGSBez14zquW0jxY="
},
{
"pname": "Vortice.DirectX",
"version": "2.3.0",
- "sha256": "07inc3msd3baizx03is5djbw6jg9ihzx7dxvalsdz4n7b61lli3h"
+ "hash": "sha256-cERKg1nHkt80Vbu30z+M6UnDl2xFxwH6j2qNputgNh4="
},
{
"pname": "Vortice.DXGI",
"version": "2.3.0",
- "sha256": "0j47ywcs1rq8q4hjj0axchjv08dnvyd33yy4nxilz4synyiidf77"
+ "hash": "sha256-57gWo7dek09jt8T7MZrftiGwJWRdASkhwQjnoBn3h0g="
},
{
"pname": "Vortice.Mathematics",
"version": "1.4.25",
- "sha256": "0vl6g087disxyzskvkbnwym74s47lkza0ly3nk4y0y88zibcggrj"
+ "hash": "sha256-Mr/HVvwIeeDJtMNToP6kh2hyqud2zT31913HdhB4hm4="
}
]
diff --git a/pkgs/by-name/xi/xivlauncher/package.nix b/pkgs/by-name/xi/xivlauncher/package.nix
index a11ca8cdd4b2..d8fe8dc10d29 100644
--- a/pkgs/by-name/xi/xivlauncher/package.nix
+++ b/pkgs/by-name/xi/xivlauncher/package.nix
@@ -17,7 +17,7 @@
}:
let
- rev = "1.2.1";
+ rev = "1.3.0";
in
buildDotnetModule rec {
pname = "XIVLauncher";
@@ -27,7 +27,7 @@ buildDotnetModule rec {
owner = "goatcorp";
repo = "XIVLauncher.Core";
inherit rev;
- hash = "sha256-bGHUDPUrohcc/lLE647cicaEIYo9t1/anc2VeMJlsGc=";
+ hash = "sha256-tPziHwHK4B+LJ8xNWEBmpFStkczZF3G5jhjxYYG59m0=";
fetchSubmodules = true;
};
@@ -49,8 +49,8 @@ buildDotnetModule rec {
nugetDeps = ./deps.json; # File generated with `nix-build -A xivlauncher.passthru.fetch-deps`
# please do not unpin these even if they match the defaults, xivlauncher is sensitive to .NET versions
- dotnet-sdk = dotnetCorePackages.sdk_8_0;
- dotnet-runtime = dotnetCorePackages.runtime_8_0;
+ dotnet-sdk = dotnetCorePackages.sdk_9_0;
+ dotnet-runtime = dotnetCorePackages.runtime_9_0;
dotnetFlags = [
"-p:BuildHash=${rev}"
diff --git a/pkgs/development/compilers/ghc/9.14.1.nix b/pkgs/development/compilers/ghc/9.14.1.nix
new file mode 100644
index 000000000000..a31344c891f6
--- /dev/null
+++ b/pkgs/development/compilers/ghc/9.14.1.nix
@@ -0,0 +1,4 @@
+import ./common-hadrian.nix {
+ version = "9.14.1";
+ sha256 = "2a83779c9af86554a3289f2787a38d6aa83d00d136aa9f920361dd693c101e77";
+}
diff --git a/pkgs/development/compilers/jetbrains-jdk/17.nix b/pkgs/development/compilers/jetbrains-jdk/17.nix
index 9d1445e074e6..1991c7f5bf31 100644
--- a/pkgs/development/compilers/jetbrains-jdk/17.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/17.nix
@@ -87,7 +87,7 @@ openjdk17.overrideAttrs (oldAttrs: rec {
-i jb/project/tools/linux/scripts/mkimages_${arch}.sh
patchShebangs .
- ./jb/project/tools/linux/scripts/mkimages_${arch}.sh ${build} ${
+ ./jb/project/tools/linux/scripts/mkimages_${arch}.sh -w ${build} ${
if debugBuild then "fd" else (if withJcef then "jcef" else "nomod")
}
diff --git a/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/pkgs/development/compilers/jetbrains-jdk/jcef.nix
index 04183c9346ae..4dbf85637819 100644
--- a/pkgs/development/compilers/jetbrains-jdk/jcef.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/jcef.nix
@@ -1,4 +1,5 @@
{
+ autoPatchelfHook,
fetchFromGitHub,
fetchurl,
fetchpatch,
@@ -18,6 +19,7 @@
nss,
nspr,
+ libGL,
libX11,
libXdamage,
boost,
@@ -89,11 +91,11 @@ let
in
stdenv.mkDerivation rec {
pname = "jcef-jetbrains";
- rev = "bb9fb310ed7f3abf858faf248c53bbb707be21f7";
+ rev = "6f9ab690b28a1262f82e6f869c310bdf1d0697ac";
# This is the commit number
# Currently from the branch: https://github.com/JetBrains/jcef/tree/251
# Run `git rev-list --count HEAD`
- version = "1083";
+ version = "1086";
nativeBuildInputs = [
cmake
@@ -105,9 +107,11 @@ stdenv.mkDerivation rec {
ninja
strip-nondeterminism
stripJavaArchivesHook
+ autoPatchelfHook
];
buildInputs = [
boost
+ libGL
libX11
libXdamage
nss
@@ -119,7 +123,7 @@ stdenv.mkDerivation rec {
owner = "jetbrains";
repo = "jcef";
inherit rev;
- hash = "sha256-BHmGEhfkrUWDfrUFR8d5AgIq8qkAr+blX9n7ZVg8mtc=";
+ hash = "sha256-w5t1M66KW5cUbNTpAc4ksGd+414EJsXwbq1UP1COFsw=";
};
# Find the hash in tools/buildtools/linux64/clang-format.sha1
@@ -164,7 +168,6 @@ stdenv.mkDerivation rec {
outputs = [
"out"
- "unpacked"
];
postBuild = ''
@@ -172,14 +175,12 @@ stdenv.mkDerivation rec {
../tools/compile.sh ${platform} Release
'';
- # N.B. For new versions, manually synchronize the following
- # definitions with jb/tools/common/create_modules.sh to include
- # newly added modules
installPhase = ''
runHook preInstall
export JCEF_ROOT_DIR=$(realpath ..)
export OUT_NATIVE_DIR=$JCEF_ROOT_DIR/jcef_build/native/${buildType}
+ export OUT_REMOTE_DIR=$JCEF_ROOT_DIR/jcef_build/remote/${buildType}
export JB_TOOLS_DIR=$(realpath ../jb/tools)
export JB_TOOLS_OS_DIR=$JB_TOOLS_DIR/linux
export OUT_CLS_DIR=$(realpath ../out/${platform})
@@ -187,80 +188,21 @@ stdenv.mkDerivation rec {
export OS=linux
export JOGAMP_DIR="$JCEF_ROOT_DIR"/third_party/jogamp/jar
- mkdir -p $unpacked/{jogl,gluegen,jcef}
+ bash "$JB_TOOLS_DIR"/common/create_modules.sh
- function extract_jar {
- __jar=$1
- __dst_dir=$2
- __content_dir="''${3:-.}"
- __tmp=.tmp_extract_jar
- rm -rf "$__tmp" && mkdir "$__tmp"
- (
- cd "$__tmp" || exit 1
- jar -xf "$__jar"
- )
- rm -rf "$__tmp/META-INF"
- rm -rf "$__dst_dir" && mkdir "$__dst_dir"
- if [ -z "$__content_dir" ]
- then
- cp -R "$__tmp"/* "$__dst_dir"
- else
- cp -R "$__tmp"/"$__content_dir"/* "$__dst_dir"
- fi
- rm -rf $__tmp
- }
-
- cd $unpacked/gluegen
- cp "$JOGAMP_DIR"/gluegen-rt.jar .
- cp "$JB_TOOLS_DIR"/common/gluegen-module-info.java module-info.java
- javac --patch-module gluegen.rt=gluegen-rt.jar module-info.java
- jar uf gluegen-rt.jar module-info.class
- rm module-info.class module-info.java
- mkdir lib
- ''
- # see https://github.com/JetBrains/jcef/commit/f3b787e3326c1915d663abded7f055c0866f32ec
- + lib.optionalString (platform != "linuxarm64") ''
- extract_jar "$JOGAMP_DIR"/gluegen-rt-natives-"$OS"-"$DEPS_ARCH".jar lib natives/"$OS"-"$DEPS_ARCH"
- ''
- + ''
-
- cd ../jogl
- cp "$JOGAMP_DIR"/gluegen-rt.jar .
- cp "$JOGAMP_DIR"/jogl-all.jar .
- cp "$JB_TOOLS_OS_DIR"/jogl-module-info.java module-info.java
- javac --module-path . --patch-module jogl.all=jogl-all.jar module-info.java
- jar uf jogl-all.jar module-info.class
- rm module-info.class module-info.java
- mkdir lib
- ''
- # see https://github.com/JetBrains/jcef/commit/f3b787e3326c1915d663abded7f055c0866f32ec
- + lib.optionalString (platform != "linuxarm64") ''
- extract_jar "$JOGAMP_DIR"/jogl-all-natives-"$OS"-"$DEPS_ARCH".jar lib natives/"$OS"-"$DEPS_ARCH"
- ''
- + ''
-
- cd ../jcef
- cp "$OUT_CLS_DIR"/jcef.jar .
- mkdir lib
- cp -R "$OUT_NATIVE_DIR"/* lib
-
- mkdir -p $out/jmods
+ mkdir -p $out
bash "$JB_TOOLS_DIR"/common/create_version_file.sh $out
+ cp -r $JCEF_ROOT_DIR/jmods/ $out
+ cp -r $JCEF_ROOT_DIR/cef_server/ $out
+
runHook postInstall
'';
dontStrip = debugBuild;
postFixup = ''
- cd $unpacked/gluegen
- jmod create --class-path gluegen-rt.jar --libs lib $out/jmods/gluegen.rt.jmod
- cd ../jogl
- jmod create --module-path . --class-path jogl-all.jar --libs lib $out/jmods/jogl.all.jmod
- cd ../jcef
- jmod create --module-path . --class-path jcef.jar --libs lib $out/jmods/jcef.jmod
-
# stripJavaArchivesHook gets rid of jar file timestamps, but not of jmod file timestamps
# We have to manually call strip-nondeterminism to do this for jmod files too
find $out -name "*.jmod" -exec strip-nondeterminism --type jmod {} +
@@ -274,5 +216,8 @@ stdenv.mkDerivation rec {
"aarch64-linux"
"x86_64-linux"
];
+ maintainers = with lib.maintainers; [
+ aoli-al
+ ];
};
}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix
new file mode 100644
index 000000000000..922a1bb72554
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix
@@ -0,0 +1,90 @@
+{ pkgs, haskellLib }:
+
+self: super:
+
+let
+ inherit (pkgs) lib;
+
+ warnAfterVersion =
+ ver: pkg:
+ lib.warnIf (lib.versionOlder ver
+ super.${pkg.pname}.version
+ ) "override for haskell.packages.ghc912.${pkg.pname} may no longer be needed" pkg;
+
+in
+
+with haskellLib;
+
+{
+ # Disable GHC core libraries
+ array = null;
+ base = null;
+ binary = null;
+ bytestring = null;
+ Cabal = null;
+ Cabal-syntax = null;
+ containers = null;
+ deepseq = null;
+ directory = null;
+ exceptions = null;
+ file-io = null;
+ filepath = null;
+ ghc-bignum = null;
+ ghc-boot = null;
+ ghc-boot-th = null;
+ ghc-compact = null;
+ ghc-experimental = null;
+ ghc-heap = null;
+ ghc-internal = null;
+ ghc-platform = null;
+ ghc-prim = null;
+ ghc-toolchain = null;
+ ghci = null;
+ haddock-api = null;
+ haddock-library = null;
+ haskeline = null;
+ hpc = null;
+ integer-gmp = null;
+ mtl = null;
+ os-string = null;
+ parsec = null;
+ pretty = null;
+ process = null;
+ rts = null;
+ semaphore-compat = null;
+ stm = null;
+ system-cxx-std-lib = null;
+ template-haskell = null;
+ template-haskell-lift = null;
+ template-haskell-quasiquoter = null;
+ # GHC only builds terminfo if it is a native compiler
+ terminfo =
+ if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then
+ null
+ else
+ haskellLib.doDistribute self.terminfo_0_4_1_7;
+ text = null;
+ time = null;
+ transformers = null;
+ unix = null;
+ xhtml = null;
+ Win32 = null;
+
+ #
+ # Version upgrades
+ #
+
+ #
+ # Jailbreaks
+ #
+
+ primitive = doJailbreak (dontCheck super.primitive); # base <4.22 and a lot of dependencies on packages not yet working.
+ splitmix = doJailbreak super.splitmix; # base <4.22
+
+ # https://github.com/sjakobi/newtype-generics/pull/28/files
+ newtype-generics = warnAfterVersion "0.6.2" (doJailbreak super.newtype-generics);
+
+ #
+ # Test suite issues
+ #
+}
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index faaeec4fbdb8..9512cbf8f36f 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -409,9 +409,9 @@ in
cargoHash = "sha256-5Tp8Kth0yO89/LIcU8K01z6DdZRr8MAA0DPKqDEjIt0=";
};
- ruby_3_5 = generic {
- version = rubyVersion "3" "5" "0" "preview1";
- hash = "sha256-7PCcfrkC6Rza+cxVPNAMypuEiz/A4UKXhQ+asIzdRvA=";
+ ruby_4_0 = generic {
+ version = rubyVersion "4" "0" "0" "preview3";
+ hash = "sha256-Q9CSbndvvVWZrcx7zLTMyAThCfQCogaGB6KoZWLCzcA=";
cargoHash = "sha256-z7NwWc4TaR042hNx0xgRkh/BQEpEJtE53cfrN0qNiE0=";
};
diff --git a/pkgs/development/libraries/qodeassist-plugin/default.nix b/pkgs/development/libraries/qodeassist-plugin/default.nix
index c08355cd34aa..49116be124fc 100644
--- a/pkgs/development/libraries/qodeassist-plugin/default.nix
+++ b/pkgs/development/libraries/qodeassist-plugin/default.nix
@@ -17,13 +17,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "qodeassist-plugin";
- version = "0.9.4";
+ version = "0.9.7";
src = fetchFromGitHub {
owner = "Palm1r";
repo = "QodeAssist";
tag = "v${finalAttrs.version}";
- hash = "sha256-n+MDFJbFl/miVt8qm90PNOQE2QWc0kGgRfaQMu9MPA4=";
+ hash = "sha256-aS2ZA5rFSxIpc4RfVIyWbae/nQa2lBkQQJacGQdC8kI=";
};
dontWrapQtApps = true;
diff --git a/pkgs/development/ocaml-modules/smtml/default.nix b/pkgs/development/ocaml-modules/smtml/default.nix
index e3d891720ca0..0d5753568d74 100644
--- a/pkgs/development/ocaml-modules/smtml/default.nix
+++ b/pkgs/development/ocaml-modules/smtml/default.nix
@@ -16,7 +16,6 @@
mtime,
# fix eval on legacy ocaml versions
ocaml_intrinsics ? null,
- patricia-tree,
prelude,
scfg,
yojson,
@@ -28,13 +27,13 @@
buildDunePackage (finalAttrs: {
pname = "smtml";
- version = "0.15.0";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "formalsec";
repo = "smtml";
tag = "v${finalAttrs.version}";
- hash = "sha256-z3DDdzU39tg2F3+pAFPILiKY3pQxOpehdoxwckyhZBI=";
+ hash = "sha256-IFjaZcwBiM/xA39W+FuJ87OSEvAhvhEsZ1cF2KrxrhY=";
};
nativeBuildInputs = [
@@ -52,7 +51,6 @@ buildDunePackage (finalAttrs: {
menhirLib
mtime
ocaml_intrinsics
- patricia-tree
prelude
scfg
yojson
@@ -82,6 +80,9 @@ buildDunePackage (finalAttrs: {
downloadPage = "https://github.com/formalsec/smtml";
changelog = "https://github.com/formalsec/smtml/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
- maintainers = [ lib.maintainers.ethancedwards8 ];
+ maintainers = with lib.maintainers; [
+ ethancedwards8
+ redianthus
+ ];
};
})
diff --git a/pkgs/development/ocaml-modules/synchronizer/default.nix b/pkgs/development/ocaml-modules/synchronizer/default.nix
index 8d827b2c0bd9..f61c99238f43 100644
--- a/pkgs/development/ocaml-modules/synchronizer/default.nix
+++ b/pkgs/development/ocaml-modules/synchronizer/default.nix
@@ -3,30 +3,35 @@
fetchFromGitHub,
buildDunePackage,
prelude,
+ alcotest,
}:
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
pname = "synchronizer";
- version = "0.1";
+ version = "0.2";
minimalOCamlVersion = "5.1";
src = fetchFromGitHub {
owner = "OCamlPro";
repo = "synchronizer";
- tag = version;
- hash = "sha256-VlKqORXTXafT88GXHIYkz+A1VkEL3jP9SMqDdMyEdrw=";
+ tag = "${finalAttrs.version}";
+ hash = "sha256-0XtPHpDlyH1h8W2ZlRvJbZjCN9WP5mzk2N01WFd8eLQ=";
};
propagatedBuildInputs = [
prelude
];
+ checkInputs = [
+ alcotest
+ ];
+
meta = {
homepage = "https://github.com/OCamlPro/synchronizer";
description = "Synchronizer to make datastructures thread-safe";
- changelog = "https://raw.githubusercontent.com/OCamlPro/synchronizer/${src.rev}/CHANGES.md";
+ changelog = "https://raw.githubusercontent.com/OCamlPro/synchronizer/${finalAttrs.src.rev}/CHANGES.md";
license = lib.licenses.agpl3Plus;
maintainers = with lib.maintainers; [ redianthus ];
};
-}
+})
diff --git a/pkgs/development/perl-modules/Percona-Toolkit/default.nix b/pkgs/development/perl-modules/Percona-Toolkit/default.nix
index f155a9542d47..43794e71f105 100644
--- a/pkgs/development/perl-modules/Percona-Toolkit/default.nix
+++ b/pkgs/development/perl-modules/Percona-Toolkit/default.nix
@@ -18,7 +18,7 @@ let
owner = "percona";
repo = "percona-toolkit";
rev = "v${version}";
- sha256 = "sha256-fJGeL9XZHTFmpns5CE7It35HRnF3JiC6muOpOS1zboI=";
+ sha256 = "sha256-NpLUHIdGnuNJmSYBYErU7yzFkxKRFQVWJHJqJ2q4U5E=";
# needed for build script
leaveDotGit = true;
diff --git a/pkgs/development/python-modules/bilibili-api-python/default.nix b/pkgs/development/python-modules/bilibili-api-python/default.nix
index 15daa93fd125..e5560e774213 100644
--- a/pkgs/development/python-modules/bilibili-api-python/default.nix
+++ b/pkgs/development/python-modules/bilibili-api-python/default.nix
@@ -24,13 +24,13 @@
buildPythonPackage rec {
pname = "bilibili-api-python";
- version = "17.4.0";
+ version = "17.4.1";
pyproject = true;
src = fetchPypi {
pname = "bilibili_api_python";
inherit version;
- hash = "sha256-OWMQwYIP2TGkahDGEVIzviUOjbMVombupgjA9iXN8e8=";
+ hash = "sha256-Ww8WRoz7s+6AHH18yXD5CCJS9nWMbYxIxdjaxCI1y2I=";
};
# The upstream uses requirements.txt, which overly strict version constraints.
diff --git a/pkgs/development/python-modules/conda/default.nix b/pkgs/development/python-modules/conda/default.nix
index cc9512bd9bbc..daf9d0b89e0e 100644
--- a/pkgs/development/python-modules/conda/default.nix
+++ b/pkgs/development/python-modules/conda/default.nix
@@ -28,7 +28,7 @@
buildPythonPackage rec {
__structuredAttrs = true;
pname = "conda";
- version = "25.7.0";
+ version = "25.11.1";
pyproject = true;
src = fetchFromGitHub {
@@ -36,7 +36,7 @@ buildPythonPackage rec {
owner = "conda";
repo = "conda";
tag = version;
- hash = "sha256-lvqR1ksYE23enSf4pxFpb/Z8yPoU9bVb4Hi2ZrhI0XA=";
+ hash = "sha256-Jp7C7rwgzVGjNBRwViyDIBom67VevYG5e46/wpAWJX4=";
};
build-system = [
diff --git a/pkgs/development/python-modules/dbt-protos/default.nix b/pkgs/development/python-modules/dbt-protos/default.nix
index 778df8d045d7..425cd0b8f6cd 100644
--- a/pkgs/development/python-modules/dbt-protos/default.nix
+++ b/pkgs/development/python-modules/dbt-protos/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "dbt-protos";
- version = "1.0.380";
+ version = "1.0.412";
pyproject = true;
src = fetchFromGitHub {
owner = "dbt-labs";
repo = "proto-python-public";
tag = "v${version}";
- hash = "sha256-gXaIIcxIKnUe4Pz5CidfWtM3iofUizJ+lXWNcTzL2pY=";
+ hash = "sha256-Q9Pki95OaQKpBJn423/2DBLXHUWjpgOqTpJX3ASeXKs=";
};
build-system = [
diff --git a/pkgs/development/python-modules/django-celery-beat/default.nix b/pkgs/development/python-modules/django-celery-beat/default.nix
index bdccdae03418..4109ba3d3c8a 100644
--- a/pkgs/development/python-modules/django-celery-beat/default.nix
+++ b/pkgs/development/python-modules/django-celery-beat/default.nix
@@ -1,18 +1,23 @@
{
lib,
buildPythonPackage,
+ fetchFromGitHub,
+
+ # build-system
+ setuptools,
+
+ # dependencies
celery,
cron-descriptor,
django-timezone-field,
+ python-crontab,
+ tzdata,
+
+ # tests
ephem,
- fetchFromGitHub,
pytest-django,
pytest-timeout,
pytestCheckHook,
- python-crontab,
- pythonOlder,
- setuptools,
- tzdata,
}:
buildPythonPackage rec {
@@ -20,8 +25,6 @@ buildPythonPackage rec {
version = "2.8.1";
pyproject = true;
- disabled = pythonOlder "3.8";
-
src = fetchFromGitHub {
owner = "celery";
repo = "django-celery-beat";
@@ -34,17 +37,17 @@ buildPythonPackage rec {
build-system = [ setuptools ];
dependencies = [
- cron-descriptor
- python-crontab
celery
+ cron-descriptor
django-timezone-field
+ python-crontab
tzdata
];
nativeCheckInputs = [
ephem
- pytest-timeout
pytest-django
+ pytest-timeout
pytestCheckHook
];
@@ -53,6 +56,11 @@ buildPythonPackage rec {
"t/unit/test_schedulers.py"
];
+ disabledTests = [
+ # AssertionError: 'At 02:00, only on Monday UTC' != 'At 02:00 AM, only on Monday UTC'
+ "test_long_name"
+ ];
+
pythonImportsCheck = [ "django_celery_beat" ];
meta = {
diff --git a/pkgs/development/python-modules/exdown/default.nix b/pkgs/development/python-modules/exdown/default.nix
index 506d69a41a19..09470125179b 100644
--- a/pkgs/development/python-modules/exdown/default.nix
+++ b/pkgs/development/python-modules/exdown/default.nix
@@ -18,7 +18,8 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- hash = "sha256-r0SCigkUpOiba4MDf80+dLjOjjruVNILh/raWfvjXA0=";
+ extension = "zip";
+ hash = "sha256-+IN+0P4SljUWxF01Ln9PgeFVA/+qGKFVoKMGluAuYDw=";
};
nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/intbitset/default.nix b/pkgs/development/python-modules/intbitset/default.nix
index 3e275c3c1308..c4b7e3ab708a 100644
--- a/pkgs/development/python-modules/intbitset/default.nix
+++ b/pkgs/development/python-modules/intbitset/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "intbitset";
- version = "4.0.0";
+ version = "4.1.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-wUHtqhwXuRwph1N+Jp2VWra9w5Zq89624eDSDtvQndI=";
+ hash = "sha256-cxRf8F5CJ8dlhf+FUGOLagg80TABC3gQRdga9Y97aSA=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/medvol/default.nix b/pkgs/development/python-modules/medvol/default.nix
index 494653921650..d84be27050f6 100644
--- a/pkgs/development/python-modules/medvol/default.nix
+++ b/pkgs/development/python-modules/medvol/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "medvol";
- version = "0.0.16";
+ version = "0.0.17";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "MIC-DKFZ";
repo = "medvol";
rev = "v${version}";
- hash = "sha256-MMYBPyXXS6hTehyWUcvQso9HBLhWMGWzRDGSTtT1iZc=";
+ hash = "sha256-AuVTJvKalRXf/ObxXFk0aBVkqRffo4Ph5/LJ2vDK1nU=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/nuclear/default.nix b/pkgs/development/python-modules/nuclear/default.nix
index 090c453d0d1e..c6fd2b0f8128 100644
--- a/pkgs/development/python-modules/nuclear/default.nix
+++ b/pkgs/development/python-modules/nuclear/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "nuclear";
- version = "2.6.1";
+ version = "2.7.0";
pyproject = true;
src = fetchFromGitHub {
owner = "igrek51";
repo = "nuclear";
rev = version;
- hash = "sha256-63BYwfLWUDN18AOAUjDPG/QLM1RBqsBs54oTDq1lKrk=";
+ hash = "sha256-xKsYS+v/7xm9LRdpFKMsbrPggw4VfVMWst/3olj2n3E=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix
index 405effcb5d32..b6472c24528d 100644
--- a/pkgs/development/python-modules/pendulum/default.nix
+++ b/pkgs/development/python-modules/pendulum/default.nix
@@ -56,7 +56,9 @@ buildPythonPackage rec {
python-dateutil
tzdata
]
- ++ lib.optional (!isPyPy) [ time-machine ]
+ ++ lib.optionals (!isPyPy) [
+ time-machine
+ ]
++ lib.optionals (pythonOlder "3.9") [
importlib-resources
];
diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index 77f19c3eefb9..11be7e4b3c11 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "publicsuffixlist";
- version = "1.0.2.20251217";
+ version = "1.0.2.20251222";
pyproject = true;
src = fetchPypi {
inherit pname version;
- hash = "sha256-9ejbvyQMukwcXUJv79coU2L7YEe8fA393cyBC6S2QCo=";
+ hash = "sha256-AH9okvxG0VBeh6tM1BStIKyWhd1OjfiNmVlX8s8sykU=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/pylion/default.nix b/pkgs/development/python-modules/pylion/default.nix
index f93a6078a364..a1c431c09996 100644
--- a/pkgs/development/python-modules/pylion/default.nix
+++ b/pkgs/development/python-modules/pylion/default.nix
@@ -1,7 +1,7 @@
{
lib,
buildPythonPackage,
- fetchFromBitbucket,
+ fetchFromGitHub,
h5py,
termcolor,
pexpect,
@@ -15,7 +15,7 @@ buildPythonPackage {
version = "0.5.3";
format = "setuptools";
- src = fetchFromBitbucket {
+ src = fetchFromGitHub {
owner = "dtrypogeorgos";
repo = "pylion";
# Version is set in setup.cfg, but not in a git tag / bitbucket release
@@ -49,7 +49,7 @@ buildPythonPackage {
meta = {
description = "LAMMPS wrapper for molecular dynamics simulations of trapped ions";
- homepage = "https://bitbucket.org/dtrypogeorgos/pylion";
+ homepage = "https://github.com/dtrypogeorgos/pylion";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ doronbehar ];
};
diff --git a/pkgs/development/python-modules/pyls-flake8/default.nix b/pkgs/development/python-modules/pyls-flake8/default.nix
index 02a8af9b187c..166d1513fa50 100644
--- a/pkgs/development/python-modules/pyls-flake8/default.nix
+++ b/pkgs/development/python-modules/pyls-flake8/default.nix
@@ -7,7 +7,7 @@
pythonOlder,
}:
-buildPythonPackage {
+buildPythonPackage rec {
pname = "pyls-flake8";
version = "0.4.0";
format = "setuptools";
@@ -16,7 +16,7 @@ buildPythonPackage {
src = fetchFromGitHub {
owner = "emanspeaks";
repo = "pyls-flake8";
- rev = "v{version}";
+ rev = "v${version}";
sha256 = "14wkmwh8mqr826vdzxhvhdwrnx2akzmnbv3ar391qs4imwqfjx3l";
};
diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix
index 5a3c141bf44e..a99b72d0b395 100644
--- a/pkgs/development/python-modules/ray/default.nix
+++ b/pkgs/development/python-modules/ray/default.nix
@@ -74,7 +74,7 @@
let
pname = "ray";
- version = "2.52.1";
+ version = "2.53.0";
in
buildPythonPackage rec {
inherit pname version;
@@ -94,22 +94,22 @@ buildPythonPackage rec {
# Results are in ./ray-hashes.nix
hashes = {
x86_64-linux = {
- cp310 = "sha256-s/nmG3mfs8yP1wd6PS62dt3+99tkT2tqK2V8XDIUzxk=";
- cp311 = "sha256-paPCaNRQYMUM0CmXnsxfHqrsBAsZ+ojdT+npJ9Gf8T4=";
- cp312 = "sha256-hDwBCK1yu3/Gwjoi4p5gmVRqXqrTrWdceKFG2QgPbsY=";
- cp313 = "sha256-u+SSx4CjmmS9PQdmytENVM8SIi34jSh+wtjy1S3jfHk=";
+ cp310 = "sha256-TbtfzhNkdj8pdBBV9Qq+M89yY5cUH5zA6EXdPMlj5FU=";
+ cp311 = "sha256-6wAMF/cwEHH90VxExM06wPeVO7THwifmFxn+cEgZW80=";
+ cp312 = "sha256-FPRjY+m0zwwci02GI+wzfFvUCDd4MbXltQBnkwE3u8o=";
+ cp313 = "sha256-c9u6p5Yqf144qoz5SD4OmBcgXpiao9yFnHOMKvGuAd8=";
};
aarch64-linux = {
- cp310 = "sha256-Zb9GH9/k/6ZnxG+UVfh0CyrWwfpHG0YdX1z2t7rxd7U=";
- cp311 = "sha256-K1fvJyoqCg265tGNcKpUHqtiC0/jtE1QRm06UzwW+dk=";
- cp312 = "sha256-COuPX9VSkrpr7jY6MkkRNqXlSvVOAH+B4GA5hvvqQaQ=";
- cp313 = "sha256-44Jq605Dmd4MaIW9i+fOL2KfoAEPABPxGD4HJrPSXkA=";
+ cp310 = "sha256-QQgoDYocuQ19aOXJVMNeY7i7mkuhX4jF59oOICVkdxI=";
+ cp311 = "sha256-oLu5iwsPJaPuB1yhAXHhJg5wtrxpDNUJ7NfOEiivhU0=";
+ cp312 = "sha256-ZeLOWNPca6o89Fgk2InBlo695WXuVN/YCpivjzGvjko=";
+ cp313 = "sha256-cZblNY38yCEb6GT0Xm3+SCcgLfKUrzx6dv+PvAgOBSI=";
};
aarch64-darwin = {
- cp310 = "sha256-mTGUqL5wVA4PgZhiAxu/GaZEAfvmwxtCBl/TE7pGbTQ=";
- cp311 = "sha256-9Z47LRoUZqwHePLG+snMtfMBB9d+Pd3R1gFnJI0mhHQ=";
- cp312 = "sha256-aDFZL+3woSIBb12rS2fYX6PU2zsh9YjRiDS1wDE5bRw=";
- cp313 = "sha256-tbwpVIq7Cgp66eb/OwzMooJO2vARpDNuFaMnk9V0+/0=";
+ cp310 = "sha256-TbkUoKbdYI+knAZpKaEoJ0Wi29c8ruZ9e4D+aEymW90=";
+ cp311 = "sha256-vT7Ew0J3bdrCOuKxCMZPWTn0F8zEh1kA1YbHyXhGMmk=";
+ cp312 = "sha256-2LldBH2UdJOAP7hBeuoxIl3KzasVr9x1uKI4kBlJ1Fc=";
+ cp313 = "sha256-hbRyq2+48RifjO+BkT/ZGyTdabP6fcyn4USCe9kk9sA=";
};
};
in
@@ -119,7 +119,9 @@ buildPythonPackage rec {
python = pyShortVersion;
abi = pyShortVersion;
platform = platforms.${stdenv.hostPlatform.system} or { };
- sha256 = hashes.${stdenv.hostPlatform.system}.${pyShortVersion} or { };
+ sha256 =
+ hashes.${stdenv.hostPlatform.system}.${pyShortVersion}
+ or (throw "No hash specified for '${stdenv.hostPlatform.system}.${pyShortVersion}'");
};
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/development/python-modules/rigour/default.nix b/pkgs/development/python-modules/rigour/default.nix
index e436ea617f3a..ab5148a8d1fa 100644
--- a/pkgs/development/python-modules/rigour/default.nix
+++ b/pkgs/development/python-modules/rigour/default.nix
@@ -21,14 +21,14 @@
buildPythonPackage rec {
pname = "rigour";
- version = "1.5.0";
+ version = "1.6.0";
pyproject = true;
src = fetchFromGitHub {
owner = "opensanctions";
repo = "rigour";
tag = "v${version}";
- hash = "sha256-0uqKcjGxI22jNt7lLP0LvhIyQO2yxV5tS6fW9QiQ814=";
+ hash = "sha256-meeM/ylRJkZ1/Oh16oX572AkqxtU6gf8QtMIe8cCf8Y=";
};
build-system = [
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
index b4639e67d8c9..2e591408ff0b 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
@@ -421,9 +421,9 @@
};
nickel = {
- version = "0.3.0";
- url = "github:nickel-lang/tree-sitter-nickel?ref=0.3";
- hash = "sha256-jL054OJj+1eXksNYOTTTFzZjwPqTFp06syC3TInN8rc=";
+ version = "0.5.0";
+ url = "github:nickel-lang/tree-sitter-nickel";
+ hash = "sha256-2la/9XxL2dN+rzTotgDXQFz9ktDXQ3Og9svX5Din2zo=";
};
nix = {
@@ -647,9 +647,9 @@
};
sql = {
- version = "0.3.9";
+ version = "0.3.11";
url = "github:derekstride/tree-sitter-sql";
- hash = "sha256-DC7cZs8ePQmj5t/6GgnmgT5ubuOBaaS3Xch/f76/ZWM=";
+ hash = "sha256-efeDAUgCwV9UBXbLyZ1a4Rwcvr/+wke8IzkxRUQnddM=";
generate = true;
};
diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index ff059b76904e..77bc36841a80 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -16,9 +16,9 @@ let
variants = {
# ./update-zen.py zen
zen = {
- version = "6.18.1"; # zen
- suffix = "zen1"; # zen
- sha256 = "1y3xp1zf6d1vxqb6crnpp1wn6j4xfcpjd11k05h85ggsq3ry10z5"; # zen
+ version = "6.18.2"; # zen
+ suffix = "zen2"; # zen
+ sha256 = "1jagav0yp2s09461wrn7vjmhvb92qnhlqdhx6pdza21zbzbscpvj"; # zen
isLqx = false;
};
# ./update-zen.py lqx
diff --git a/pkgs/servers/http/apache-modules/mod_tile/default.nix b/pkgs/servers/http/apache-modules/mod_tile/default.nix
index c7400c6d37f0..9733faa9168f 100644
--- a/pkgs/servers/http/apache-modules/mod_tile/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_tile/default.nix
@@ -16,18 +16,22 @@
iniparser,
libmemcached,
mapnik,
+ ps,
+ jq,
+ memcached,
+ iana-etc,
nix-update-script,
}:
stdenv.mkDerivation rec {
pname = "mod_tile";
- version = "0.7.2";
+ version = "0.8.1";
src = fetchFromGitHub {
owner = "openstreetmap";
repo = "mod_tile";
tag = "v${version}";
- hash = "sha256-JC275LKsCeEo5DcIX0X7kcLoijQJqfJvBvw8xi2gwpk=";
+ hash = "sha256-zDe+pFzK16K+8I0v1Z7p83PIgQlVDbjcnD4vzwdB1Oo=";
};
nativeBuildInputs = [
@@ -68,6 +72,15 @@ stdenv.mkDerivation rec {
# Do not run tests in parallel
enableParallelChecking = false;
+ nativeCheckInputs = [
+ iana-etc
+ ps
+ ]
+ ++ lib.filter (pkg: !pkg.meta.broken) [
+ jq
+ memcached
+ ];
+
passthru.updateScript = nix-update-script { };
meta = {
diff --git a/pkgs/servers/monitoring/prometheus/shelly-exporter.nix b/pkgs/servers/monitoring/prometheus/shelly-exporter.nix
index 955999592903..566d8c338077 100644
--- a/pkgs/servers/monitoring/prometheus/shelly-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/shelly-exporter.nix
@@ -5,15 +5,15 @@
nixosTests,
}:
-buildGoModule rec {
+buildGoModule {
pname = "shelly_exporter";
- version = "1.0.0";
+ version = "0-unstable-2025-03-19";
src = fetchFromGitHub {
owner = "aexel90";
- repo = pname;
- rev = "v${version}";
- sha256 = "sha256-L0TuBDq5eEahQvzqd1WuvmXuQbbblCM+Nvj15IybnVo=";
+ repo = "shelly_exporter";
+ rev = "2e82fb01ec9337f6e2c68267e6d43c0f1677c481";
+ hash = "sha256-FYz0hmZiVWL6/bBccOBzFVpjN8HqbG+7+uODC2LwxZk=";
};
vendorHash = "sha256-BCrge2xLT4b4wpYA+zcsH64a/nfV8+HeZF7L49p2gEw=";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 033c9e542bed..2fcda0b528da 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -509,6 +509,7 @@ mapAliases {
dbus-sharp-glib-2_0 = throw "'dbus-sharp-glib-2_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25
dclib = throw "'dclib' has been removed as it is unmaintained for 16 years and broken"; # Added 2025-05-25
deadpixi-sam = throw "'deadpixi-sam' has been renamed to/replaced by 'deadpixi-sam-unstable'"; # Converted to throw 2025-10-27
+ deco = throw "'deco' has been removed as it is unused"; # Added 2025-12-18
deepin = throw "the Deepin desktop environment and associated tools have been removed from nixpkgs due to lack of maintenance"; # Added 2025-08-21
deepsea = throw "deepsea has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
degit-rs = throw "'degit-rs' has been removed because it is unmaintained upstream and has vulnerable dependencies."; # Added 2025-07-11
@@ -556,6 +557,7 @@ mapAliases {
emacsNativeComp = throw "'emacsNativeComp' has been renamed to/replaced by 'emacs'"; # Converted to throw 2025-10-27
emanote = throw "'emanote' has been removed due to lack of a Nixpkgs maintainer"; # Added 2025-09-18
embree2 = throw "embree2 has been removed, as it is unmaintained upstream and depended on tbb_2020"; # Added 2025-09-14
+ emem = throw "'emem' has been removed as it is unused"; # Added 2025-12-18
emojione = throw "emojione has beem removed, as it has been archived upstream."; # Added 2025-11-06
EmptyEpsilon = throw "'EmptyEpsilon' has been renamed to/replaced by 'empty-epsilon'"; # Converted to throw 2025-10-27
emulationstation = throw "emulationstation was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
@@ -1269,6 +1271,7 @@ mapAliases {
pds = warnAlias "'pds' has been renamed to 'bluesky-pds'" bluesky-pds; # Added 2025-08-20
pdsadmin = warnAlias "'pdsadmin' has been renamed to 'bluesky-pdsadmin'" bluesky-pdsadmin; # Added 2025-08-20
peach = throw "'peach' has been renamed to/replaced by 'asouldocs'"; # Converted to throw 2025-10-27
+ pell = throw "'pell' has been removed as it is unused and unmaintained upstream"; # Added 2025-12-18
pentablet-driver = throw "'pentablet-driver' has been renamed to/replaced by 'xp-pen-g430-driver'"; # Converted to throw 2025-10-27
perceptual-diff = throw "perceptual-diff was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
percona-server_innovation = throw "'percona-server_innovation' has been renamed to/replaced by 'percona-server'"; # Converted to throw 2025-10-27
@@ -1442,8 +1445,10 @@ mapAliases {
ruby-zoom = throw "'ruby-zoom' has been removed due to lack of maintaince and had not been updated since 2020"; # Added 2025-08-24
ruby_3_1 = throw "ruby_3_1 has been removed, as it is has reached end‐of‐life upstream"; # Added 2025-10-12
ruby_3_2 = throw "ruby_3_2 has been removed, as it will reach end‐of‐life upstream during Nixpkgs 25.11’s support cycle"; # Added 2025-10-12
+ ruby_3_5 = ruby_4_0; # Added 2025-12-22
rubyPackages_3_1 = throw "rubyPackages_3_1 has been removed, as it is has reached end‐of‐life upstream"; # Added 2025-10-12
- rubyPackages_3_2 = throw "rubyPackages_3_2 has been removed, as it will reach end‐of‐life upstream during Nixpkgs 25.11’s support cycle"; # Added 2025-10-12
+ rubyPackages_3_2 = throw "rubyPackages_3_2 has been removed, as it will reach end‐of‐life upstream during Nixpkgs 25.11's support cycle"; # Added 2025-10-12
+ rubyPackages_3_5 = rubyPackages_4_0; # Added 2025-12-22
rucksack = throw "rucksack was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
runCommandNoCC = warnAlias "'runCommandNoCC' has been renamed to/replaced by 'runCommand'" runCommand; # Converted to warning 2025-10-28
runCommandNoCCLocal = warnAlias "'runCommandNoCCLocal' has been renamed to/replaced by 'runCommandLocal'" runCommandLocal; # Converted to warning 2025-10-28
@@ -1655,6 +1660,7 @@ mapAliases {
unicap = throw "'unicap' has been removed because it is unmaintained"; # Added 2025-05-17
unifi-poller = throw "'unifi-poller' has been renamed to/replaced by 'unpoller'"; # Converted to throw 2025-10-27
unzoo = throw "'unzoo' has been removed since it is unmaintained upstream and doesn't compile with newer versions of GCC anymore"; # Removed 2025-05-24
+ usync = throw "'usync' has been removed as it is unused and unmaintained upstream"; # Added 2025-12-18
util-linuxCurses = throw "'util-linuxCurses' has been renamed to/replaced by 'util-linux'"; # Converted to throw 2025-10-27
utillinux = warnAlias "'utillinux' has been renamed to/replaced by 'util-linux'" util-linux; # Converted to warning 2025-10-28
vaapiIntel = throw "'vaapiIntel' has been renamed to/replaced by 'intel-vaapi-driver'"; # Converted to throw 2025-10-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39c526d0e31c..9610f3bbc25b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5733,7 +5733,7 @@ with pkgs;
mkRuby
ruby_3_3
ruby_3_4
- ruby_3_5
+ ruby_4_0
;
ruby = ruby_3_3;
@@ -5741,7 +5741,7 @@ with pkgs;
rubyPackages_3_3 = recurseIntoAttrs ruby_3_3.gems;
rubyPackages_3_4 = recurseIntoAttrs ruby_3_4.gems;
- rubyPackages_3_5 = recurseIntoAttrs ruby_3_5.gems;
+ rubyPackages_4_0 = recurseIntoAttrs ruby_4_0.gems;
inherit (callPackages ../applications/networking/cluster/spark { })
spark_4_0
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6cf6be084b43..3826bbc16788 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -134,6 +134,15 @@ in
inherit buildTargetLlvmPackages llvmPackages;
};
ghc912 = compiler.ghc9122;
+ ghc9141 = callPackage ../development/compilers/ghc/9.14.1.nix {
+ bootPkgs =
+ # No suitable bindist packaged yet
+ bb.packages.ghc9103;
+ inherit (buildPackages.python3Packages) sphinx;
+ inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
+ inherit buildTargetLlvmPackages llvmPackages;
+ };
+ ghc914 = compiler.ghc9141;
ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
bootPkgs = bb.packages.ghc984Binary;
inherit (buildPackages.python3Packages) sphinx;
@@ -221,6 +230,12 @@ in
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.12.x.nix { };
};
ghc912 = packages.ghc9122;
+ ghc9141 = callPackage ../development/haskell-modules {
+ buildHaskellPackages = bh.packages.ghc9141;
+ ghc = bh.compiler.ghc9141;
+ compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.14.x.nix { };
+ };
+ ghc914 = packages.ghc9141;
ghcHEAD = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghcHEAD;
ghc = bh.compiler.ghcHEAD;