diff --git a/nixos/modules/services/display-managers/cosmic-greeter.nix b/nixos/modules/services/display-managers/cosmic-greeter.nix
index aa4243cfa700..e7aa9da63321 100644
--- a/nixos/modules/services/display-managers/cosmic-greeter.nix
+++ b/nixos/modules/services/display-managers/cosmic-greeter.nix
@@ -12,6 +12,7 @@
let
cfg = config.services.displayManager.cosmic-greeter;
+ cfgAutoLogin = config.services.displayManager.autoLogin;
in
{
@@ -35,6 +36,10 @@ in
user = "cosmic-greeter";
command = ''${lib.getExe' pkgs.coreutils "env"} XCURSOR_THEME="''${XCURSOR_THEME:-Pop}" systemd-cat -t cosmic-greeter ${lib.getExe pkgs.cosmic-comp} ${lib.getExe cfg.package}'';
};
+ initial_session = lib.mkIf (cfgAutoLogin.enable && (cfgAutoLogin.user != null)) {
+ user = cfgAutoLogin.user;
+ command = ''${lib.getExe' pkgs.coreutils "env"} XCURSOR_THEME="''${XCURSOR_THEME:-Pop}" systemd-cat -t cosmic-session ${lib.getExe pkgs.cosmic-session}'';
+ };
};
};
diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix
index 136cd20eee55..6637141d0330 100644
--- a/nixos/modules/virtualisation/incus.nix
+++ b/nixos/modules/virtualisation/incus.nix
@@ -129,6 +129,7 @@ let
environment = lib.mkMerge [
{
+ INCUS_DOCUMENTATION = "${cfg.package.doc}/html";
INCUS_EDK2_PATH = ovmf;
INCUS_LXC_HOOK = "${cfg.lxcPackage}/share/lxc/hooks";
INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config";
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 2b3ac8774c60..d10902b722d4 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -243,7 +243,7 @@ in
imports = [ ./binary-cache.nix ];
_module.args.compression = "xz";
};
- bind = handleTest ./bind.nix { };
+ bind = runTest ./bind.nix;
bird = handleTest ./bird.nix { };
birdwatcher = handleTest ./birdwatcher.nix { };
bitbox-bridge = runTest ./bitbox-bridge.nix;
@@ -294,7 +294,7 @@ in
] ./ceph-single-node-bluestore-dmcrypt.nix { };
certmgr = handleTest ./certmgr.nix { };
cfssl = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./cfssl.nix { };
- cgit = handleTest ./cgit.nix { };
+ cgit = runTest ./cgit.nix;
charliecloud = handleTest ./charliecloud.nix { };
chromadb = runTest ./chromadb.nix;
chromium = (handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./chromium.nix { }).stable or { };
@@ -584,7 +584,7 @@ in
herbstluftwm = handleTest ./herbstluftwm.nix { };
homebox = handleTest ./homebox.nix { };
homer = handleTest ./homer { };
- homepage-dashboard = handleTest ./homepage-dashboard.nix { };
+ homepage-dashboard = runTest ./homepage-dashboard.nix;
honk = runTest ./honk.nix;
installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests { });
invidious = handleTest ./invidious.nix { };
@@ -795,7 +795,7 @@ in
defaults.services.mongodb.package = config.node.pkgs.mongodb-ce;
}
);
- moodle = handleTest ./moodle.nix { };
+ moodle = runTest ./moodle.nix;
moonraker = handleTest ./moonraker.nix { };
mopidy = handleTest ./mopidy.nix { };
morph-browser = runTest ./morph-browser.nix;
diff --git a/nixos/tests/bind.nix b/nixos/tests/bind.nix
index 5eb75392a382..3b2edec9d19e 100644
--- a/nixos/tests/bind.nix
+++ b/nixos/tests/bind.nix
@@ -1,4 +1,5 @@
-import ./make-test-python.nix {
+{ ... }:
+{
name = "bind";
nodes.machine =
diff --git a/nixos/tests/cgit.nix b/nixos/tests/cgit.nix
index fce3dc16b854..2c48e6bde47d 100644
--- a/nixos/tests/cgit.nix
+++ b/nixos/tests/cgit.nix
@@ -1,113 +1,111 @@
-import ./make-test-python.nix (
- { pkgs, ... }:
- let
- robotsTxt = pkgs.writeText "cgit-robots.txt" ''
- User-agent: *
- Disallow: /
- '';
- in
- {
- name = "cgit";
- meta = with pkgs.lib.maintainers; {
- maintainers = [ schnusch ];
- };
+{ pkgs, ... }:
+let
+ robotsTxt = pkgs.writeText "cgit-robots.txt" ''
+ User-agent: *
+ Disallow: /
+ '';
+in
+{
+ name = "cgit";
+ meta = with pkgs.lib.maintainers; {
+ maintainers = [ schnusch ];
+ };
- nodes = {
- server =
- { ... }:
- {
- services.cgit."localhost" = {
- enable = true;
- package = pkgs.cgit.overrideAttrs (
- { postInstall, ... }:
- {
- postInstall = ''
- ${postInstall}
- cp ${robotsTxt} "$out/cgit/robots.txt"
- '';
- }
- );
- nginx.location = "/(c)git/";
- repos = {
- some-repo = {
- path = "/tmp/git/some-repo";
- desc = "some-repo description";
- };
- };
- settings = {
- readme = [
- ":README.md"
- ":date.txt"
- ];
+ nodes = {
+ server =
+ { ... }:
+ {
+ services.cgit."localhost" = {
+ enable = true;
+ package = pkgs.cgit.overrideAttrs (
+ { postInstall, ... }:
+ {
+ postInstall = ''
+ ${postInstall}
+ cp ${robotsTxt} "$out/cgit/robots.txt"
+ '';
+ }
+ );
+ nginx.location = "/(c)git/";
+ repos = {
+ some-repo = {
+ path = "/tmp/git/some-repo";
+ desc = "some-repo description";
};
};
-
- environment.systemPackages = [ pkgs.git ];
+ settings = {
+ readme = [
+ ":README.md"
+ ":date.txt"
+ ];
+ };
};
- };
- testScript =
- { nodes, ... }:
- ''
- start_all()
+ environment.systemPackages = [ pkgs.git ];
+ };
+ };
- server.wait_for_unit("nginx.service")
- server.wait_for_unit("network.target")
- server.wait_for_open_port(80)
+ testScript =
+ { nodes, ... }:
+ ''
+ start_all()
- server.succeed("curl -fsS http://localhost/%28c%29git/cgit.css")
+ server.wait_for_unit("nginx.service")
+ server.wait_for_unit("network.target")
+ server.wait_for_open_port(80)
- server.succeed("curl -fsS http://localhost/%28c%29git/robots.txt | diff -u - ${robotsTxt}")
+ server.succeed("curl -fsS http://localhost/%28c%29git/cgit.css")
- server.succeed(
- "curl -fsS http://localhost/%28c%29git/ | grep -F 'some-repo description'"
- )
+ server.succeed("curl -fsS http://localhost/%28c%29git/robots.txt | diff -u - ${robotsTxt}")
- server.fail("curl -fsS http://localhost/robots.txt")
+ server.succeed(
+ "curl -fsS http://localhost/%28c%29git/ | grep -F 'some-repo description'"
+ )
- server.succeed("sudo -u cgit ${pkgs.writeShellScript "setup-cgit-test-repo" ''
- set -e
- git init --bare -b master /tmp/git/some-repo
- git init -b master reference
- cd reference
- git remote add origin /tmp/git/some-repo
- { echo -n "cgit NixOS Test at "; date; } > date.txt
- git add date.txt
- git -c user.name=test -c user.email=test@localhost commit -m 'add date'
- git push -u origin master
- ''}")
+ server.fail("curl -fsS http://localhost/robots.txt")
- # test web download
- server.succeed(
- "curl -fsS 'http://localhost/%28c%29git/some-repo/plain/date.txt?id=master' | diff -u reference/date.txt -"
- )
+ server.succeed("sudo -u cgit ${pkgs.writeShellScript "setup-cgit-test-repo" ''
+ set -e
+ git init --bare -b master /tmp/git/some-repo
+ git init -b master reference
+ cd reference
+ git remote add origin /tmp/git/some-repo
+ { echo -n "cgit NixOS Test at "; date; } > date.txt
+ git add date.txt
+ git -c user.name=test -c user.email=test@localhost commit -m 'add date'
+ git push -u origin master
+ ''}")
- # test http clone
- server.succeed(
- "git clone http://localhost/%28c%29git/some-repo && diff -u reference/date.txt some-repo/date.txt"
- )
+ # test web download
+ server.succeed(
+ "curl -fsS 'http://localhost/%28c%29git/some-repo/plain/date.txt?id=master' | diff -u reference/date.txt -"
+ )
- # test list settings by greping for the fallback readme
- server.succeed(
- "curl -fsS 'http://localhost/%28c%29git/some-repo/about/' | grep -F 'cgit NixOS Test at'"
- )
+ # test http clone
+ server.succeed(
+ "git clone http://localhost/%28c%29git/some-repo && diff -u reference/date.txt some-repo/date.txt"
+ )
- # add real readme
- server.succeed("sudo -u cgit ${pkgs.writeShellScript "cgit-commit-readme" ''
- set -e
- echo '# cgit NixOS test README' > reference/README.md
- git -C reference add README.md
- git -C reference -c user.name=test -c user.email=test@localhost commit -m 'add readme'
- git -C reference push
- ''}")
+ # test list settings by greping for the fallback readme
+ server.succeed(
+ "curl -fsS 'http://localhost/%28c%29git/some-repo/about/' | grep -F 'cgit NixOS Test at'"
+ )
- # test list settings by greping for the real readme
- server.succeed(
- "curl -fsS 'http://localhost/%28c%29git/some-repo/about/' | grep -F '# cgit NixOS test README'"
- )
- server.fail(
- "curl -fsS 'http://localhost/%28c%29git/some-repo/about/' | grep -F 'cgit NixOS Test at'"
- )
- '';
- }
-)
+ # add real readme
+ server.succeed("sudo -u cgit ${pkgs.writeShellScript "cgit-commit-readme" ''
+ set -e
+ echo '# cgit NixOS test README' > reference/README.md
+ git -C reference add README.md
+ git -C reference -c user.name=test -c user.email=test@localhost commit -m 'add readme'
+ git -C reference push
+ ''}")
+
+ # test list settings by greping for the real readme
+ server.succeed(
+ "curl -fsS 'http://localhost/%28c%29git/some-repo/about/' | grep -F '# cgit NixOS test README'"
+ )
+ server.fail(
+ "curl -fsS 'http://localhost/%28c%29git/some-repo/about/' | grep -F 'cgit NixOS Test at'"
+ )
+ '';
+}
diff --git a/nixos/tests/homepage-dashboard.nix b/nixos/tests/homepage-dashboard.nix
index ed70ead01820..d654dcaf53df 100644
--- a/nixos/tests/homepage-dashboard.nix
+++ b/nixos/tests/homepage-dashboard.nix
@@ -1,28 +1,26 @@
-import ./make-test-python.nix (
- { lib, ... }:
- {
- name = "homepage-dashboard";
- meta.maintainers = with lib.maintainers; [ jnsgruk ];
+{ lib, ... }:
+{
+ name = "homepage-dashboard";
+ meta.maintainers = with lib.maintainers; [ jnsgruk ];
- nodes.machine = _: {
- services.homepage-dashboard = {
- enable = true;
- settings.title = "test title rodUsEagid"; # something random/unique
- };
+ nodes.machine = _: {
+ services.homepage-dashboard = {
+ enable = true;
+ settings.title = "test title rodUsEagid"; # something random/unique
};
+ };
- testScript = ''
- # Ensure the services are started on managed machine
- machine.wait_for_unit("homepage-dashboard.service")
- machine.wait_for_open_port(8082)
- machine.succeed("curl --fail http://localhost:8082/")
+ testScript = ''
+ # Ensure the services are started on managed machine
+ machine.wait_for_unit("homepage-dashboard.service")
+ machine.wait_for_open_port(8082)
+ machine.succeed("curl --fail http://localhost:8082/")
- # Ensure /etc/homepage-dashboard is created.
- machine.succeed("test -d /etc/homepage-dashboard")
+ # Ensure /etc/homepage-dashboard is created.
+ machine.succeed("test -d /etc/homepage-dashboard")
- # Ensure that we see the custom title *only in the managed config*
- page = machine.succeed("curl --fail http://localhost:8082/")
- assert "test title rodUsEagid" in page, "Custom title not found"
- '';
- }
-)
+ # Ensure that we see the custom title *only in the managed config*
+ page = machine.succeed("curl --fail http://localhost:8082/")
+ assert "test title rodUsEagid" in page, "Custom title not found"
+ '';
+}
diff --git a/nixos/tests/incus/ui.nix b/nixos/tests/incus/ui.nix
index 27b90c218d78..300388a19f93 100644
--- a/nixos/tests/incus/ui.nix
+++ b/nixos/tests/incus/ui.nix
@@ -66,6 +66,7 @@ import ../make-test-python.nix (
testScript = ''
machine.wait_for_unit("incus.service")
+ machine.wait_for_unit("incus-preseed.service")
# Check that the INCUS_UI environment variable is populated in the systemd unit
machine.succeed("systemctl cat incus.service | grep 'INCUS_UI'")
@@ -73,6 +74,9 @@ import ../make-test-python.nix (
# Ensure the endpoint returns an HTML page with 'Incus UI' in the title
machine.succeed("curl -kLs https://localhost:8443/ui | grep 'Incus UI'")
+ # Ensure the documentation is rendering correctly
+ machine.succeed("curl -kLs https://localhost:8443/documentation/ | grep 'Incus documentation'")
+
# Ensure the application is actually rendered by the Javascript
machine.succeed("PYTHONUNBUFFERED=1 selenium-script")
'';
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 6be3346d9850..db9fccaa2bb4 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -638,6 +638,7 @@ let
clevisTest ? false,
clevisFallbackTest ? false,
disableFileSystems ? false,
+ selectNixPackage ? pkgs: pkgs.nixStable,
}:
let
isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi);
@@ -701,6 +702,7 @@ let
virtualisation.rootDevice = "/dev/vdb";
hardware.enableAllFirmware = mkForce false;
+ nix.package = selectNixPackage pkgs;
# The test cannot access the network, so any packages we
# need must be included in the VM.
@@ -1101,6 +1103,9 @@ in
# The (almost) simplest partitioning scheme: a swap partition and
# one big filesystem partition.
simple = makeInstallerTest "simple" simple-test-config;
+ lix-simple = makeInstallerTest "simple" simple-test-config // {
+ selectNixPackage = pkgs: pkgs.lix;
+ };
switchToFlake = makeInstallerTest "switch-to-flake" simple-test-config-flake;
diff --git a/nixos/tests/moodle.nix b/nixos/tests/moodle.nix
index 4bf1c5e6c702..f3eee04b0d62 100644
--- a/nixos/tests/moodle.nix
+++ b/nixos/tests/moodle.nix
@@ -1,26 +1,24 @@
-import ./make-test-python.nix (
- { pkgs, lib, ... }:
- {
- name = "moodle";
- meta.maintainers = [ lib.maintainers.aanderse ];
+{ lib, ... }:
+{
+ name = "moodle";
+ meta.maintainers = [ lib.maintainers.aanderse ];
- nodes.machine =
- { ... }:
- {
- services.moodle.enable = true;
- services.moodle.virtualHost.hostName = "localhost";
- services.moodle.virtualHost.adminAddr = "root@example.com";
- services.moodle.initialPassword = "correcthorsebatterystaple";
+ nodes.machine =
+ { ... }:
+ {
+ services.moodle.enable = true;
+ services.moodle.virtualHost.hostName = "localhost";
+ services.moodle.virtualHost.adminAddr = "root@example.com";
+ services.moodle.initialPassword = "correcthorsebatterystaple";
- # Ensure the virtual machine has enough memory to avoid errors like:
- # Fatal error: Out of memory (allocated 152047616) (tried to allocate 33554440 bytes)
- virtualisation.memorySize = 2000;
- };
+ # Ensure the virtual machine has enough memory to avoid errors like:
+ # Fatal error: Out of memory (allocated 152047616) (tried to allocate 33554440 bytes)
+ virtualisation.memorySize = 2000;
+ };
- testScript = ''
- start_all()
- machine.wait_for_unit("phpfpm-moodle.service", timeout=1800)
- machine.wait_until_succeeds("curl http://localhost/ | grep 'You are not logged in'")
- '';
- }
-)
+ testScript = ''
+ start_all()
+ machine.wait_for_unit("phpfpm-moodle.service", timeout=1800)
+ machine.wait_until_succeeds("curl http://localhost/ | grep 'You are not logged in'")
+ '';
+}
diff --git a/pkgs/applications/audio/munt/libmt32emu.nix b/pkgs/applications/audio/munt/libmt32emu.nix
index 31db8595ca10..7015d978d394 100644
--- a/pkgs/applications/audio/munt/libmt32emu.nix
+++ b/pkgs/applications/audio/munt/libmt32emu.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "libmt32emu";
- version = "2.7.1";
+ version = "2.7.2";
src = fetchFromGitHub {
owner = "munt";
repo = "munt";
rev = "${pname}_${lib.replaceStrings [ "." ] [ "_" ] version}";
- sha256 = "sha256-zY1AFcm8uvFkrKUZHsqtKY2CYTY4bWmkTJ7bZPqXoxk=";
+ sha256 = "sha256-wXIvdGoup/AOQggkeXvtbi3pXhyKUKWmyt/ZbGzufds=";
};
outputs = [
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index af8b2895dd41..5ffe51880b44 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5038,8 +5038,8 @@ let
mktplcRef = {
name = "uiua-vscode";
publisher = "uiua-lang";
- version = "0.0.61";
- hash = "sha256-cKiIva4nzROp+bbwkMxBvguLMXVe/9uGcdhVhLxmae0=";
+ version = "0.0.62";
+ hash = "sha256-Fq3NmCL17QVAmOmFWSkxc0qRwCRDsRbkeRzwyP02Nq4=";
};
meta = {
description = "VSCode language extension for Uiua";
diff --git a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
index 531be9bba85e..4d5cbbc44878 100644
--- a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "mongodb-vscode";
publisher = "mongodb";
- version = "1.12.1";
- hash = "sha256-jbR6NGYgDYArCHqMHKPXuht7UViw0Ii3Uc8IqTGTe8k=";
+ version = "1.13.0";
+ hash = "sha256-xOwffd2//P7wS+uuUmuIU0ITOH1pj35h53F1HhvGNMo=";
};
meta = {
diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.isort/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.isort/default.nix
index 06b7c1dceab7..599216b831ea 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-python.isort/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-python.isort/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "ms-python";
name = "isort";
- version = "2023.13.13171013";
- hash = "sha256-UBV9i3LPVv60+toy+kJvESAuJHRmH/uEIwjTidYUXLc=";
+ version = "2025.0.0";
+ hash = "sha256-nwt9Pv084jt9nWvxSXLIWu7981UGSbCgVRTrFfJA6q4=";
};
meta = with lib; {
description = "Import sorting extension for Visual Studio Code using isort";
diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix
index 2b51e4cf207b..82362ee6d90c 100644
--- a/pkgs/applications/graphics/drawpile/default.nix
+++ b/pkgs/applications/graphics/drawpile/default.nix
@@ -19,6 +19,7 @@
qtsvg,
qttools,
libsecret,
+ libwebp,
# optional client deps
giflib,
@@ -51,6 +52,7 @@ let
qtsvg
qttools
libsecret
+ libwebp
# optional:
giflib # gif animation export support
kdnssd # local server discovery with Zeroconf
@@ -67,18 +69,18 @@ let
in
mkDerivation rec {
pname = "drawpile";
- version = "2.2.1";
+ version = "2.2.2";
src = fetchFromGitHub {
owner = "drawpile";
repo = "drawpile";
rev = version;
- sha256 = "sha256-NS1aQlWpn3f+SW0oUjlYwHtOS9ZgbjFTrE9grjK5REM=";
+ sha256 = "sha256-xcutcSpbFt+pb7QP1E/RG6iNnZwpfhIZTxr+1usLKHc=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
- hash = "sha256-rY4zWSCBfVXvl6p9GvtDg/PFZfLkWTl8FTYdlKTzWYM=";
+ hash = "sha256-VUX6J7TfxWpa07HPFZ8JzpltIwJUYAl5TABIpBmGYYo=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index b687e910b4b7..29f084a35e29 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -787,27 +787,27 @@
}
},
"ungoogled-chromium": {
- "version": "134.0.6998.165",
+ "version": "135.0.7049.52",
"deps": {
"depot_tools": {
- "rev": "e42fac3e9c1726ab14a61a25e6291d9ccc49e688",
- "hash": "sha256-BvEkk15Rm4nSoV/uWiwmQW/+gg2vpLQ187TbBAHl9Rk="
+ "rev": "85ec2718b5a29990c7eb67778348c9f76a00f392",
+ "hash": "sha256-eWlHnSRfLFcd3OoyCTIFewDf0eC9KQowScQOnphgfg8="
},
"gn": {
- "rev": "ed1abc107815210dc66ec439542bee2f6cbabc00",
- "hash": "sha256-EqbwCLkseND1v3UqM+49N7GuoXJ3PlJjWOes4OijQ3U="
+ "rev": "4a8016dc391553fa1644c0740cc04eaac844121e",
+ "hash": "sha256-8NynNvLNCHxy8EYmsnPovKhXu9DcDcYBhg4A6d2QIfY="
},
"ungoogled-patches": {
- "rev": "134.0.6998.165-1",
- "hash": "sha256-Uia8tI3ZpryD+YVV9duH6sAmB/gKvsFg9RZVKYo/HX0="
+ "rev": "135.0.7049.52-1",
+ "hash": "sha256-i7fSJsbuXgzDvh/4RJwHvVEalS134SoRzvcJZbYsIIo="
},
- "npmHash": "sha256-oVoTruhxTymYiGkELd2Oa1wOfjGLtChQZozP4GzOO1A="
+ "npmHash": "sha256-wNrZaugdKJCyV1WchkKXzr/I1OW1AtjiC2p7qTZZOqU="
},
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
- "rev": "fd886e2cb29dd984c13deec032832dee68d8abe3",
- "hash": "sha256-xD06hGSrccTGB6fUGw0b7RrGNBQjNmdGKPaRqhXVVOY=",
+ "rev": "9ba7e609d28c509a8ce9265c2247065d8d251173",
+ "hash": "sha256-PjvfckdlaMq9HWefGxFppgBumlqh7xoCoxYFwk/r630=",
"recompress": true
},
"src/third_party/clang-format/script": {
@@ -817,23 +817,23 @@
},
"src/third_party/libc++/src": {
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
- "rev": "2e25154d49c29fa9aa42c30ad4a027bd30123434",
- "hash": "sha256-QxEbtsEKCs2Xgulq7nVWtAeOGkIYFOy/L1ROfXa5u8U="
+ "rev": "7f8b68f91ca8b192375f5e71cd81fb3ed9650ef3",
+ "hash": "sha256-1P+p5MPXm0WkeYgzIxG2SBKZVPWplUlEo7xYI//Y0uw="
},
"src/third_party/libc++abi/src": {
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
- "rev": "634228a732a1d9ae1a6d459556e8fc58707cf961",
- "hash": "sha256-ln/DCNYJXVksbwdDBnxCfc4VwtjQlJXF7ktl/NxLupg="
+ "rev": "94c5d7a8edc09f0680aee57548c0b5d400c2840d",
+ "hash": "sha256-wMMfj3E2AQJxovoSEIuT2uTyrcGBurS1HrHZOmP36+g="
},
"src/third_party/libunwind/src": {
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
- "rev": "e55d8cf51c6db1fdd4bb56c158945ec59772c8ee",
- "hash": "sha256-JazjgI+ch9RgnsDgu6p4cT4UmCBor4x4sRi1ClLISAY="
+ "rev": "62e217a12ee1133833d9890b2f7adde900e4efbd",
+ "hash": "sha256-FBMrvCCVwm0mmaQHDvKXljxxLwthpsFqhPE8yqBx5Aw="
},
"src/third_party/llvm-libc/src": {
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
- "rev": "6d0c8ee02e2fd44e69ac30e721e13be463035ee5",
- "hash": "sha256-bF4hV9fY0GLYAHUnxSXkCxdZLMKR3wYWaqYJaM9aQiE="
+ "rev": "a02de4d0d992b110c8b180fdec91258e7b60265f",
+ "hash": "sha256-LtxaimMmnman7BKLKpSR8rJtbEvHsmGVeHvzEukB4EY="
},
"src/chrome/test/data/perf/canvas_bench": {
"url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -852,8 +852,8 @@
},
"src/docs/website": {
"url": "https://chromium.googlesource.com/website.git",
- "rev": "600fc3a0b121d5007b4bb97b001e756625e6d418",
- "hash": "sha256-f3Tdz0ykxQ2FHbNweJwPdAZHA8eVpjPuxqRpxwhYtRM="
+ "rev": "441c86221443f48e818335d51f84cf1880c35aa4",
+ "hash": "sha256-nMLn2wTAr+3U1VpqWWq93zJHrlT+f1Yky8ONKk0kWjg="
},
"src/media/cdm/api": {
"url": "https://chromium.googlesource.com/chromium/cdm.git",
@@ -862,8 +862,8 @@
},
"src/net/third_party/quiche/src": {
"url": "https://quiche.googlesource.com/quiche.git",
- "rev": "e7d001c82ee5bead5140481671828d5e156a525a",
- "hash": "sha256-5YFqWgkyQ/PUKTkk1j3mAFD8JMbI+E4XRdSq34HFMWA="
+ "rev": "25a56e315359eaebb2ff4213771016a4978a346d",
+ "hash": "sha256-ZkrAaNgCqG09CufQN35wFi09TVxvbf/U4jGNNMRLY0M="
},
"src/testing/libfuzzer/fuzzers/wasm_corpus": {
"url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
@@ -877,13 +877,13 @@
},
"src/third_party/angle": {
"url": "https://chromium.googlesource.com/angle/angle.git",
- "rev": "914c97c116e09ef01a99fbbbe9cd28cda56552c7",
- "hash": "sha256-Y4eX8YHwVXiXW4U8KGbFd4fTU/v/EAUpfwv6lB127Y4="
+ "rev": "079266db445215380befce453b1ab3bbdfeaf73d",
+ "hash": "sha256-Bcm9wxlLqp/ANg+cPvsuwAlaxVmef6g+12L5ZE4uCGA="
},
"src/third_party/angle/third_party/glmark2/src": {
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
- "rev": "cb550a25c75a99ae0def91a02e16ae29d73e6d1e",
- "hash": "sha256-kqBpWHCxUl1ekmrbdPn6cL2y75nK4FxECJ5mo83Zgf4="
+ "rev": "6edcf02205fd1e8979dc3f3964257a81959b80c8",
+ "hash": "sha256-VebUALLFKwEa4+oE+jF8mBSzhJd6aflphPmcK1Em8bw="
},
"src/third_party/angle/third_party/rapidjson/src": {
"url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson",
@@ -892,8 +892,8 @@
},
"src/third_party/angle/third_party/VK-GL-CTS/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
- "rev": "48e7f3020f52ef9adc31aa0f5db01dc42cc487cd",
- "hash": "sha256-g59uC7feByGR1Ema8LqUCr5XWKpDMeXXvlS2thOo5Ks="
+ "rev": "ba86fb95004331f2cf571dd9adefe2458290ee11",
+ "hash": "sha256-wl/T/WxVNctM4m4VSFFqqtJ0xkEBiuILYywAylqa0Oo="
},
"src/third_party/anonymous_tokens/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
@@ -907,13 +907,13 @@
},
"src/third_party/dav1d/libdav1d": {
"url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git",
- "rev": "42b2b24fb8819f1ed3643aa9cf2a62f03868e3aa",
- "hash": "sha256-qcs9QoZ/uWEQ8l1ChZ8nYctZnnWJ0VvCw1q2rEktC9g="
+ "rev": "7d4b789f55389dad1820d6caf6a650038dad06e2",
+ "hash": "sha256-O6WOm6qTSgRmDR+yY2wH6t+7ob+TtZIA5Gax1ysEZh0="
},
"src/third_party/dawn": {
"url": "https://dawn.googlesource.com/dawn.git",
- "rev": "7056f50fdefc6bc46aa442e720d0336e2855b570",
- "hash": "sha256-aYlcplXSGjFov9dqql6d+a1PxJWtZJNQaaezof0u9QQ="
+ "rev": "bdc68b25b620d7302a955e2c38c548ebfe74ef31",
+ "hash": "sha256-R9SQiKUjLkLmPJwuWpw7fcibrWxSlXWkDsCra7Ci0UQ="
},
"src/third_party/dawn/third_party/glfw": {
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -922,8 +922,8 @@
},
"src/third_party/dawn/third_party/dxc": {
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
- "rev": "c2ed9ad4ee775f3de903ce757c994aecc59a5306",
- "hash": "sha256-jecGwARtdSr2OEC68749mpFUAHuYP/IzYUZyj23CwJE="
+ "rev": "0a1143572d107c8b6980df092b84a79190ec1fbd",
+ "hash": "sha256-sUSQTOi0EuIHX9h27RXb5HnbcdfkG/U1K6EbBdjSto8="
},
"src/third_party/dawn/third_party/dxheaders": {
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
@@ -942,8 +942,8 @@
},
"src/third_party/dawn/third_party/webgpu-cts": {
"url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
- "rev": "24d5dfa7725d6ece31941c3f3343ba6362986d6b",
- "hash": "sha256-AEGYE2rSsPcRzJSm97DGsrPVbhCH+lyVI61Z4qavKc8="
+ "rev": "ce91fc1d085136f9c7ddca684d1764689d49b337",
+ "hash": "sha256-SsxohjLb+uoN5cMXU5DJDrtF1QVk8EWK/qvTLxCleUI="
},
"src/third_party/highway/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
@@ -957,8 +957,8 @@
},
"src/third_party/boringssl/src": {
"url": "https://boringssl.googlesource.com/boringssl.git",
- "rev": "ea42fe28775844ec8fe0444fc421398be42d51fe",
- "hash": "sha256-g9i5v11uZy/3Smn8zSCFmC27Gdp5VP2b0ROrj+VmP1k="
+ "rev": "673e61fc215b178a90c0e67858bbf162c8158993",
+ "hash": "sha256-8Dl6Aol33o2FYID3oIw9grB0jY9VJnnnhmiNdyycTlU="
},
"src/third_party/breakpad/breakpad": {
"url": "https://chromium.googlesource.com/breakpad/breakpad.git",
@@ -967,13 +967,13 @@
},
"src/third_party/cast_core/public/src": {
"url": "https://chromium.googlesource.com/cast_core/public",
- "rev": "fbc5e98031e1271a0a566fcd4d9092b2d3275d05",
- "hash": "sha256-o5/Lbhh6HHSWCVCEyDwDCgs+PLm67si981w0HuIWY7c="
+ "rev": "dcb3d2e87cebe20b6dda06d8b29abb9af27ca422",
+ "hash": "sha256-e8+rQhEU5+FfwjyEE1TM6emO0cUntuS4GN7y/BuC/U8="
},
"src/third_party/catapult": {
"url": "https://chromium.googlesource.com/catapult.git",
- "rev": "d5166861902b565df446e15181eba270fe168275",
- "hash": "sha256-xkvz743+w0xsI0w4reAo2rfC4J7opl1biA3eNYuRn+o="
+ "rev": "93e56257a5089dc49f1dfd1240c527f5fe1b237f",
+ "hash": "sha256-K5sOlXx72YmXlm7cc7jWf3lKmHcMdVHTwVueJo5CoHY="
},
"src/third_party/ced/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -982,8 +982,8 @@
},
"src/third_party/chromium-variations": {
"url": "https://chromium.googlesource.com/chromium-variations.git",
- "rev": "84c18c7a0205fbd0a27b0214b16ded7fc44dc062",
- "hash": "sha256-zXAmoKyj104BaIe4Rug18WbVKkyAsyWPCTPPEerinVo="
+ "rev": "270a25f8795caf0a798ebf5a7d69284e3d830d19",
+ "hash": "sha256-ZkETD+Pka5vItN70nhlGQelycFAEnb1Qfv9k2aDXZSE="
},
"src/third_party/cld_3/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git",
@@ -1002,8 +1002,8 @@
},
"src/third_party/cpuinfo/src": {
"url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
- "rev": "8a1772a0c5c447df2d18edf33ec4603a8c9c04a6",
- "hash": "sha256-dKmZ5YXLhvVdxaJ4PefR+SWlh+MTFHNxOMeM6Vj7Gvo="
+ "rev": "aaac07ee499895770c89163ce0920ef8bb41ed23",
+ "hash": "sha256-A86nAbKs7trVwwa1HFUNbV//6O1minvlHTpZR3vabrU="
},
"src/third_party/crc32c/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
@@ -1012,23 +1012,23 @@
},
"src/third_party/cros_system_api": {
"url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
- "rev": "ea21b22629965105426f3df5e58190513e95a17e",
- "hash": "sha256-xUaGf4MaEXg2RHgrGS1Uuz97vq5Vbt4HFV/AXYB4lCA="
+ "rev": "b8d797a61689892adb182c9bec457c9bd24b26d2",
+ "hash": "sha256-44bD1nG7CRrvBcd9NbU4yksn7Ly9WYsWETXat/L3f0I="
},
"src/third_party/crossbench": {
"url": "https://chromium.googlesource.com/crossbench.git",
- "rev": "0391f0d11cbf3cf3c5bcf82e19e9d9839b1936ed",
- "hash": "sha256-EL+lOTe1Vzg4JW2q7t3UoXzHHiEmLjf7khH9fXdplbo="
+ "rev": "bf8d1d3aaf469343576db89f81df26aeb16bd62b",
+ "hash": "sha256-XscXxoCUSVGsBCB8xymEsaLc4WgzZPXu6zkRbv8ZQZw="
},
"src/third_party/depot_tools": {
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
- "rev": "e42fac3e9c1726ab14a61a25e6291d9ccc49e688",
- "hash": "sha256-BvEkk15Rm4nSoV/uWiwmQW/+gg2vpLQ187TbBAHl9Rk="
+ "rev": "85ec2718b5a29990c7eb67778348c9f76a00f392",
+ "hash": "sha256-eWlHnSRfLFcd3OoyCTIFewDf0eC9KQowScQOnphgfg8="
},
"src/third_party/devtools-frontend/src": {
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
- "rev": "65b3f414b81ffe4df49202af6fc75bc26a3cb109",
- "hash": "sha256-rdBpJWdQ5VtFnIfbr/Vq1q1euSvkbY8iIqyuTMAS2KM="
+ "rev": "ad4e2fc82183b1463ac870818c28680bbc3de889",
+ "hash": "sha256-HS5O+r0GFe3Dfh+86JQlsEC+5Gcs1xmUkDyZ7qixqXw="
},
"src/third_party/dom_distiller_js/dist": {
"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -1037,8 +1037,8 @@
},
"src/third_party/eigen3/src": {
"url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
- "rev": "2a35a917be47766a895be610bedd66006980b7e6",
- "hash": "sha256-WG7uiduuMnXrvEpXJNGksrYkBsim+l7eiu5N+mx0Yr0="
+ "rev": "4c38131a16803130b66266a912029504f2cf23cd",
+ "hash": "sha256-dOq8RJ/V8kulSMK0OUWzHruiwJSP3f/86ih5gk2MMWQ="
},
"src/third_party/farmhash/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
@@ -1052,8 +1052,8 @@
},
"src/third_party/ffmpeg": {
"url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
- "rev": "d10a0f8bf5ddcce572df95105152bc74041cae0c",
- "hash": "sha256-OXumpRb9XB38dOCJmL3jDcabiJ08wAvydVlJwMgpCoQ="
+ "rev": "fbce2a76c00cd2e5aeffe3c2e71d44c284ec52d6",
+ "hash": "sha256-bGa0BCvzNxEKu9VZEwJ1NLt+b2KKWUxshpKSN2FHNEM="
},
"src/third_party/flac": {
"url": "https://chromium.googlesource.com/chromium/deps/flac.git",
@@ -1080,15 +1080,10 @@
"rev": "13d57703abca3005d97b19df1f2db731607a7dc2",
"hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA="
},
- "src/third_party/grpc/src": {
- "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git",
- "rev": "a363b6c001139b9c8ffb7cd63f60a72f15349c3b",
- "hash": "sha256-RKGZWtH2JmP2mXN+4ln/nCJvOyzynrYcfrxSY8k1vVg="
- },
"src/third_party/freetype/src": {
"url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
- "rev": "b1f47850878d232eea372ab167e760ccac4c4e32",
- "hash": "sha256-YxWz3O9see1dktqZnC551V12yU5jcOERTB1Hn1lwUNM="
+ "rev": "5d4e649f740c675426fbe4cdaffc53ee2a4cb954",
+ "hash": "sha256-DxLHuzIvw7WIKKMCRBz4ne97j9DufoohXQZV6yZ5zfY="
},
"src/third_party/freetype-testing/src": {
"url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git",
@@ -1102,8 +1097,8 @@
},
"src/third_party/harfbuzz-ng/src": {
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
- "rev": "6d8035a99c279e32183ad063f0de201ef1b2f05c",
- "hash": "sha256-isQvwaVdL4cM465A8Gs06VioAu8RvZFrwXDsXhfOoFo="
+ "rev": "8efd2d85c78fbba6ca09a3e454f77525f3b296ce",
+ "hash": "sha256-/WNGrvyvJ+FGqoIoHapaux1iu63zjID0yR30HYPpxaw="
},
"src/third_party/ink/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/ink.git",
@@ -1137,8 +1132,8 @@
},
"src/third_party/googletest/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
- "rev": "e235eb34c6c4fed790ccdad4b16394301360dcd4",
- "hash": "sha256-jpXIcz5Uy6fDEvxTq8rTFx/M+0+SQ6TCDaqnp7nMtng="
+ "rev": "24a9e940d481f992ba852599c78bb2217362847b",
+ "hash": "sha256-oLknxClUh7l72ZAx7sxNDM6dUhMT0vUE2IdDjRLDKtk="
},
"src/third_party/hunspell_dictionaries": {
"url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git",
@@ -1167,8 +1162,8 @@
},
"src/third_party/fuzztest/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
- "rev": "44ac6c2594a880edbb9cb1e4e197c2b53d078130",
- "hash": "sha256-AKXKxXqOMUb3APf5r15NmIMyhJ4ZmW5+t7y5XdgdZkw="
+ "rev": "a32ca113e3b050693e4bb379525dfae519ebd0d9",
+ "hash": "sha256-eoV+g/QVzcI7PqDmAic5Ra9K/ba4IV1wXE4RFecuMuk="
},
"src/third_party/domato/src": {
"url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
@@ -1182,18 +1177,18 @@
},
"src/third_party/libaom/source/libaom": {
"url": "https://aomedia.googlesource.com/aom.git",
- "rev": "3990233fc06a35944d6d33797e63931802122a95",
- "hash": "sha256-4NOQug0MlWZ18527V3IDuGcxGEJ4b+mZZbdzugWoBgQ="
+ "rev": "99fcd816eeaa7da46688bc4b9f4f9e71be13c2e8",
+ "hash": "sha256-SOIvGkR3k7TAs9KFA3mFbBSq5h4eJghKo38IVioOK3U="
},
"src/third_party/crabbyavif/src": {
"url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
- "rev": "c5938b119ef52f9ff628436c1e66c9a5322ece83",
- "hash": "sha256-+6339vcd0KJj5V11dvJvs0YpQpTxsLmDuBoYVzyn9Ec="
+ "rev": "a75457c637a365910508f3c2c2b986a701b03a2e",
+ "hash": "sha256-v3+Rj3jS/lCYZNjjAXB6zohdvM45PKayB43jX37ntsU="
},
"src/third_party/nearby/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
- "rev": "97690c6996f683a6f3e07d75fc4557958c55ac7b",
- "hash": "sha256-d1D9/6d7a1+27nD8VijhzRMglE2PqvAMK8+GbMeesSQ="
+ "rev": "45d6317a64aad3d5060b800db267f7cea3f27198",
+ "hash": "sha256-SmU+c9YveQ4N13bteuhtmo0uvySeCnmZYpC5NYiMJuo="
},
"src/third_party/beto-core/src": {
"url": "https://beto-core.googlesource.com/beto-core.git",
@@ -1210,21 +1205,26 @@
"rev": "d6b5ffea959ad31e231c203d7446bf8b39e987ce",
"hash": "sha256-lCwGk4Q+OXwO8vOlOQrkgygYqLrwpku/PkR03oEdX3Y="
},
+ "src/third_party/speedometer/v3.1": {
+ "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
+ "rev": "cc9ee085ae18f05961ff3dfa1ee1a90d67b7f8ee",
+ "hash": "sha256-28vGPZLaD9xSwursTRRK1xndedeBUZ5TF/4hdy0RjFc="
+ },
"src/third_party/speedometer/v3.0": {
"url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
"rev": "8d67f28d0281ac4330f283495b7f48286654ad7d",
"hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU="
},
- "src/third_party/speedometer/v2.0": {
- "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
- "rev": "732af0dfe867f8815e662ac637357e55f285dbbb",
- "hash": "sha256-p7WUS8gZUaS+LOm7pNmRkwgxjx+V8R6yy7bbaEHaIs4="
- },
"src/third_party/speedometer/v2.1": {
"url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
"rev": "8bf7946e39e47c875c00767177197aea5727e84a",
"hash": "sha256-0z5tZlz32fYh9I1ALqfLm2WWO8HiRBwt0hcmgKQhaeM="
},
+ "src/third_party/speedometer/v2.0": {
+ "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
+ "rev": "732af0dfe867f8815e662ac637357e55f285dbbb",
+ "hash": "sha256-p7WUS8gZUaS+LOm7pNmRkwgxjx+V8R6yy7bbaEHaIs4="
+ },
"src/third_party/ukey2/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git",
"rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47",
@@ -1232,8 +1232,8 @@
},
"src/third_party/cros-components/src": {
"url": "https://chromium.googlesource.com/external/google3/cros_components.git",
- "rev": "1f1c782f06956a2deb5d33f09c466e4852099c71",
- "hash": "sha256-80WqSMP5Vlc4OY+gfpU3SRGavs7fJbTQVW1AIhq6jmE="
+ "rev": "97dc8c7a1df880206cc54d9913a7e9d73677072a",
+ "hash": "sha256-CT9c4LqTwhldsxoEny8MesULwQC4k95F4tfCtRZErGM="
},
"src/third_party/libdrm/src": {
"url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git",
@@ -1267,8 +1267,8 @@
},
"src/third_party/libprotobuf-mutator/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git",
- "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf",
- "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614="
+ "rev": "7bf98f78a30b067e22420ff699348f084f802e12",
+ "hash": "sha256-EaEC6R7SzqLw4QjEcWXFXhZc84lNBp6RSa9izjGnWKE="
},
"src/third_party/libsrtp": {
"url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git",
@@ -1287,8 +1287,8 @@
},
"src/third_party/libvpx/source/libvpx": {
"url": "https://chromium.googlesource.com/webm/libvpx.git",
- "rev": "7b3fa8114cf8ef23cbf91e50c368c1ca768d95d5",
- "hash": "sha256-2FgBb0HzgMihGsWbEtQqyN2EXZs/y5+ToWL1ZXG35W0="
+ "rev": "2bfb9f9e0a9cca18cd5a0045e931b49dac390c79",
+ "hash": "sha256-BWid6iU7CDEElh8j13a+S767vwnO8qQg26Vp5nQGEHc="
},
"src/third_party/libwebm/source": {
"url": "https://chromium.googlesource.com/webm/libwebm.git",
@@ -1302,8 +1302,8 @@
},
"src/third_party/libyuv": {
"url": "https://chromium.googlesource.com/libyuv/libyuv.git",
- "rev": "5a9a6ea936085310f3b9fbd4a774868e6a984ec4",
- "hash": "sha256-E5ePVHrEXMM8mS1qaUwPTqYO0BdP7TYuUhfX+BCiq/0="
+ "rev": "ccdf870348764e4b77fa3b56accb2a896a901bad",
+ "hash": "sha256-8sH11psWPXLMy3Q0tAizCZ/woUWvTCCUf44jcr2C4Xs="
},
"src/third_party/lss": {
"url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -1332,18 +1332,18 @@
},
"src/third_party/openh264/src": {
"url": "https://chromium.googlesource.com/external/github.com/cisco/openh264",
- "rev": "33f7f48613258446decb33b3575fc0a3c9ed14e3",
- "hash": "sha256-lZlZjX8GCJOc77VJ9i1fSWn63pfVOEcwwlzh0UpIgy4="
+ "rev": "652bdb7719f30b52b08e506645a7322ff1b2cc6f",
+ "hash": "sha256-tf0lnxATCkoq+xRti6gK6J47HwioAYWnpEsLGSA5Xdg="
},
"src/third_party/openscreen/src": {
"url": "https://chromium.googlesource.com/openscreen",
- "rev": "38d1445b41d1eb597fcd100688dbaff98aa072ed",
- "hash": "sha256-KGVFyGp7ItKeapub3Bd+htXH/gMaaBd+k8iC7hLtvl0="
+ "rev": "b756f3c04ba53983a94cd12eb29b7f22e472fd58",
+ "hash": "sha256-P6vAoVF1/geM6MjihcEBQtbf8CxE8sPSKTRLz8/c2yE="
},
"src/third_party/openscreen/src/buildtools": {
"url": "https://chromium.googlesource.com/chromium/src/buildtools",
- "rev": "56013b77b6c0a650d00bde40e750e7c3b7c6bc3d",
- "hash": "sha256-Dz7wMYQHVR7sjCGaQe2nxIxZsAxsK6GGDNpDvypPefo="
+ "rev": "00459762409cb29cecf398a23cdb0cae918b7515",
+ "hash": "sha256-QXGJRGyyuN0EPDAF7CAzcTSbjHkz8FRjhqd1JEFF/1o="
},
"src/third_party/openscreen/src/third_party/tinycbor/src": {
"url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git",
@@ -1352,23 +1352,23 @@
},
"src/third_party/pdfium": {
"url": "https://pdfium.googlesource.com/pdfium.git",
- "rev": "12f7715a6390050c5cffb7e4c9b2be1c2f2956d0",
- "hash": "sha256-/u+HYjmxSIX2GlriEWYZQJ8TDFNfzSufATGq1j9zx9w="
+ "rev": "9afffebfa895ea6cdcc05516908c50bd7fe72797",
+ "hash": "sha256-89rJdhwUJtJCMO7FvVoTYO80swFRkoWUB/ZYs1tOLzE="
},
"src/third_party/perfetto": {
"url": "https://android.googlesource.com/platform/external/perfetto.git",
- "rev": "0d78d85c2bfb993ab8dd9a85b6fee6caa6a0f357",
- "hash": "sha256-bjgSwq4LPz9qN9rVqIJUTHetRguCx67Uq5oe1ksPqGE="
+ "rev": "aa4d8267bafad6782a1f2c8d979104f2aaa622a0",
+ "hash": "sha256-smVQykQVZdhybEUz7BlRLc+FVNH0UyGh+0eSxP8Jzrc="
},
"src/third_party/protobuf-javascript/src": {
"url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
- "rev": "e34549db516f8712f678fcd4bc411613b5cc5295",
- "hash": "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U="
+ "rev": "426b2e025aa59c23a1b6e19fbacd6b4a11bfad16",
+ "hash": "sha256-5uieIE6ygM4Ooz9xbu1NVKCHHsPn6Ekz6OzqfWiA7/M="
},
"src/third_party/pthreadpool/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
- "rev": "e1469417238e13eebaa001779fa031ed25c59def",
- "hash": "sha256-cFRELaRtWspZaqtmdKmVPqM7HVskHlFMAny+Zv/Zflw="
+ "rev": "f94ab76fe99754960035d520dce28e15b647e8cf",
+ "hash": "sha256-NdKKMnXZ6rYOC2wA6a1bPNStxpemzGckN6PPWom6mFA="
},
"src/third_party/pyelftools": {
"url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
@@ -1387,8 +1387,8 @@
},
"src/third_party/re2/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/re2.git",
- "rev": "6dcd83d60f7944926bfd308cc13979fc53dd69ca",
- "hash": "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc="
+ "rev": "c84a140c93352cdabbfb547c531be34515b12228",
+ "hash": "sha256-f/k2rloV2Nwb0KuJGUX4SijFxAx69EXcsXOG4vo+Kis="
},
"src/third_party/ruy/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/ruy.git",
@@ -1397,13 +1397,13 @@
},
"src/third_party/search_engines_data/resources": {
"url": "https://chromium.googlesource.com/external/search_engines_data.git",
- "rev": "6dc3b54b420e6e03a34ee7259fcd2b1978fac5f3",
- "hash": "sha256-8RY3AU2V4iZKEmVwT7Z1Q3QlcTXDIdeyYwnQoyJcAUY="
+ "rev": "48ba13bfb5488755a5d72aa60ff4a47069be498f",
+ "hash": "sha256-//z0HlMOkGTcp1IjbS0m+0dmgVYsG7EkfCiK2vvG2wU="
},
"src/third_party/skia": {
"url": "https://skia.googlesource.com/skia.git",
- "rev": "aefbd9403c1b3032ad4cd0281ef312ed262c7125",
- "hash": "sha256-tP6DnMeOoVqfTSn6bYXMLiCb4wg5f9uB28KzYMAeBUw="
+ "rev": "b99f146a03d3c98049768fd91c2bbe6594b02b2c",
+ "hash": "sha256-tl1GDmcStkuKMmzzsYuRG6Nrk4xDqgYYBoa1VsQNOwY="
},
"src/third_party/smhasher/src": {
"url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -1422,8 +1422,8 @@
},
"src/third_party/swiftshader": {
"url": "https://swiftshader.googlesource.com/SwiftShader.git",
- "rev": "86cf34f50cbe5a9f35da7eedad0f4d4127fb8342",
- "hash": "sha256-PSkIU8zC+4AVcYu0vaYo6I1SSykrHgcgGVMBJanux8o="
+ "rev": "c12c13839d689f411911326b1f72e96eb525686c",
+ "hash": "sha256-C8y5ShwMffNZpFuILYNw3WOMVJp/jPen/wNbFl1vqBY="
},
"src/third_party/text-fragments-polyfill/src": {
"url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
@@ -1432,18 +1432,18 @@
},
"src/third_party/tflite/src": {
"url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
- "rev": "51c6eed226abcfeeb46864e837d01563cc5b907b",
- "hash": "sha256-qXHENS/6NwHAr1/16eb079XzmwAnpLtVZuva8uGCf+8="
+ "rev": "d120e39920c0e61cc1227bc1abe50fd6ecd3ce66",
+ "hash": "sha256-9p0/tR3bPvCJn+6eofmQXKbyfzxfbeVexdvuHpn50wk="
},
"src/third_party/vulkan-deps": {
"url": "https://chromium.googlesource.com/vulkan-deps",
- "rev": "2e4b45a53a0e2e66bcb6540ae384c53a517218d0",
- "hash": "sha256-9ebWETg/fsS4MYZg74XHs/Nz3nX6BXBNVRN2PmyWXWM="
+ "rev": "c1c31f4d17a9e4b2af40d85c89d573eb43187e0d",
+ "hash": "sha256-uEsy4PBhO3EBJF6YdWj32GmMabgKWQJUeW3cWInAinE="
},
"src/third_party/glslang/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
- "rev": "0549c7127c2fbab2904892c9d6ff491fa1e93751",
- "hash": "sha256-LwspMo771iaV5YeEJWgdb8xi37KMa0rsSdvO3uqMOAI="
+ "rev": "8b822ee8ac2c3e52926820f46ad858532a895951",
+ "hash": "sha256-hPd5roeHOgMiz2VUx13bUsKKDSvgQAXRdk7wfdi6e48="
},
"src/third_party/spirv-cross/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -1452,38 +1452,38 @@
},
"src/third_party/spirv-headers/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
- "rev": "e7294a8ebed84f8c5bd3686c68dbe12a4e65b644",
- "hash": "sha256-/p7kBW7mwpG/Uz0goMM7L3zjpOMBzGiuN+0ZBEOpORo="
+ "rev": "54a521dd130ae1b2f38fef79b09515702d135bdd",
+ "hash": "sha256-PScDq8HhQPFUs78N75QyL9oEykmjZmAhdxCAqQ0LJds="
},
"src/third_party/spirv-tools/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
- "rev": "ce37fd67f83cd1e8793b988d2e4126bbf72b19dd",
- "hash": "sha256-SJcxmKdzOjg6lOJk/3m8qo7puvtci1YEU6dXKjthx0Q="
+ "rev": "f289d047f49fb60488301ec62bafab85573668cc",
+ "hash": "sha256-2Wv0dxVQ8NvuDRTcsXkH1GKmuA6lsIuwTl0j6kbTefo="
},
"src/third_party/vulkan-headers/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
- "rev": "39f924b810e561fd86b2558b6711ca68d4363f68",
- "hash": "sha256-twJJVBfnZbH/8Wn273h45K3BOnlAicqL2zJl6OfLm2E="
+ "rev": "952f776f6573aafbb62ea717d871cd1d6816c387",
+ "hash": "sha256-LfJ7um+rzc4HdkJerHWkuPWeEc7ZFSBafbP+svAjklk="
},
"src/third_party/vulkan-loader/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
- "rev": "0508dee4ff864f5034ae6b7f68d34cb2822b827d",
- "hash": "sha256-QqFC3Iyhw9Pq6TwBHxa0Ss7SW0bHo0Uz5N18oxl2ROg="
+ "rev": "809941a4ca137df69dc9c6e8eb456bd70309197c",
+ "hash": "sha256-FPXAofnMfgUkwwRGh8rqtXrmLjouP5A8umXV1pHm1ck="
},
"src/third_party/vulkan-tools/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
- "rev": "c52931f012cb7b48e42bbf2050a7fb2183b76406",
- "hash": "sha256-nIzrishMMxWzOuD3aX8B6Iuq2kPsUF0Uuvz7GijTulY="
+ "rev": "fb8f5a5d69f4590ff1f5ecacb5e3957b6d11daee",
+ "hash": "sha256-fO6fkWOMYbf/um7gKFyjtrFE21g1kYx3lLvPv4gY7qw="
},
"src/third_party/vulkan-utility-libraries/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
- "rev": "fe7a09b13899c5c77d956fa310286f7a7eb2c4ed",
- "hash": "sha256-zI3y5aoP4QcYp677Oxj5Ef7lJyJwOMdGsaRBe+X9vpI="
+ "rev": "2d8f273ebd4b843c402d9ee881616895b854e42f",
+ "hash": "sha256-nD/WTBTwCnfZdwdNKldDVpcuirSghCIeJRBeX+uQXBk="
},
"src/third_party/vulkan-validation-layers/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
- "rev": "a30aa23cfaff4f28f039c025c159128a6c336a7e",
- "hash": "sha256-foa5hzqf1hPwOj3k57CloCe/j0qXW3zCQ4mwCT4epF4="
+ "rev": "4e7b0c905b1a0401e24333800937cc8792efa037",
+ "hash": "sha256-CCpfWpyGki9klgHInjs6gAhw5shPXlzmFgccCHNfGQY="
},
"src/third_party/vulkan_memory_allocator": {
"url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
@@ -1492,8 +1492,8 @@
},
"src/third_party/wasm_tts_engine/src": {
"url": "https://chromium.googlesource.com/chromium/wasm-tts-engine",
- "rev": "7a91dbfddd93afa096a69fb7d292e22d4afecad2",
- "hash": "sha256-bV+1YFEtCyTeZujsZtZiexT/aUTN3MaVerR2UdkUPBY="
+ "rev": "6ab3e63276a2d66ba3e7db4f87c5b7cb00e22130",
+ "hash": "sha256-ZcnKKnHsN1UyztAXClc2EUwfeX3yuLtMM2Zjwpnh62U="
},
"src/third_party/wayland/src": {
"url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git",
@@ -1527,8 +1527,8 @@
},
"src/third_party/webgpu-cts/src": {
"url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
- "rev": "fb2b951ac3c23e453335edf35c9b3bad431d9009",
- "hash": "sha256-tjY5ADd5tMFsYHk6xT+TXwsDYV5eI2oOywmyTjjAxYc="
+ "rev": "dcfb0d153f1e19905b0af26e640470c9ec5578e7",
+ "hash": "sha256-726p6OfKAzHtnjz/8WtMcsRxuq4wqyJv3+DHOHDTeYY="
},
"src/third_party/webpagereplay": {
"url": "https://chromium.googlesource.com/webpagereplay.git",
@@ -1537,8 +1537,8 @@
},
"src/third_party/webrtc": {
"url": "https://webrtc.googlesource.com/src.git",
- "rev": "8d78f5de6c27b2c793039989ea381f1428fb0100",
- "hash": "sha256-IsjTrEnxIqINYYjWJmDp7rlubl5dJ2YMpJf/DrG/mRM="
+ "rev": "04413d62f754a7b1a3a2d8c3df23bcde040112b2",
+ "hash": "sha256-sFoBgpPeMJQNSjNp8dDEUlB/7lJUpIXTpu0eRq94cGk="
},
"src/third_party/wuffs/src": {
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -1557,18 +1557,18 @@
},
"src/third_party/xnnpack/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
- "rev": "0824e2965f6edc2297e55c8dff5a8ac4cb12aaad",
- "hash": "sha256-eb9B9lXPB2GiC4qehB/HOU36W1e9RZ0N2oEbIifyrHE="
+ "rev": "7702e723fa25102db8b633ead4e3c221a5121487",
+ "hash": "sha256-n3FxY4HESzNyccQLENbuisU29v79c2x+7fYOsUrQnFg="
},
"src/third_party/zstd/src": {
"url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
- "rev": "ea0aa030cdf31f7897c5bfc153f0d36e92768095",
- "hash": "sha256-UJsuaSzR4V8alLdtxzpla1v9WYHPKPp13YrgA4Y6/yA="
+ "rev": "ef2bf5781112a4cd6b62ac1817f7842bbdc7ea8f",
+ "hash": "sha256-hDDNrUXGxG/o1oZnypAnuLyIeM16Hy6x1KacGu9Hhmw="
},
"src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git",
- "rev": "4f282ae4acae85cdcc8c167cbc296a86d24c1cf6",
- "hash": "sha256-wpz9W/ZurpCT/dGIHGpmdkI3dsXbP8TPNeee2w9zBU8="
+ "rev": "e2591684c45463aa1e46ebefc3fd35deee63f37c",
+ "hash": "sha256-tbGzFdqmkoSiVGk1WMRroWC3NR5GaHRuMwGzPhVodxk="
}
}
}
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
index bdedeeed9c78..9e542067069d 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "obs-move-transition";
- version = "3.1.1";
+ version = "3.1.2";
src = fetchFromGitHub {
owner = "exeldro";
repo = "obs-move-transition";
rev = version;
- sha256 = "sha256-kCiRgfpcFdxoK6e8jtrtzkBD4w5B/ilO1YyBHCG13gg=";
+ sha256 = "sha256-BCivYK18T4b+lRo6Qf9qFwmjAyjCPZDekQVi03QBLHc=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
index 03f3f6453386..2ddb895e7fbb 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
@@ -9,13 +9,13 @@
}:
mkHyprlandPlugin hyprland rec {
pluginName = "hyprsplit";
- version = "0.48.0";
+ version = "0.48.1";
src = fetchFromGitHub {
owner = "shezdy";
repo = "hyprsplit";
rev = "refs/tags/v${version}";
- hash = "sha256-FTp5mkrrgo/plCFHuFnx+EtDnQQoChq0mdKpb2a4LrQ=";
+ hash = "sha256-MN7eipww5r/I4tlEPTN6U+RZAkXPyf1YYx/YSCqVmoU=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/ab/ab-av1/package.nix b/pkgs/by-name/ab/ab-av1/package.nix
index bf0bdb0bc06f..436e38f35b79 100644
--- a/pkgs/by-name/ab/ab-av1/package.nix
+++ b/pkgs/by-name/ab/ab-av1/package.nix
@@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "ab-av1";
- version = "0.9.3";
+ version = "0.9.4";
src = fetchFromGitHub {
owner = "alexheretic";
repo = "ab-av1";
rev = "v${version}";
- hash = "sha256-rj02Opkwi4M249Ya4uBl4u1l8Mx+FBcRcxDgD6ng9kg=";
+ hash = "sha256-dDD0hnKov5cgNoc1m/0rG/cx2ZaB7TmLfcXdm8myRUQ=";
};
useFetchCargoVendor = true;
- cargoHash = "sha256-Vi38eNn+SnhQx7Gp1T2RPIBeu3bUAZ74dr0mMG5Mha0=";
+ cargoHash = "sha256-01tH5uvfrPIKRv+iYJWm/5QyQZtz1d/nEtN/tmGXD14=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix
index 2b578f86bb47..545cdc0548ed 100644
--- a/pkgs/by-name/al/all-the-package-names/package.nix
+++ b/pkgs/by-name/al/all-the-package-names/package.nix
@@ -7,16 +7,16 @@
buildNpmPackage rec {
pname = "all-the-package-names";
- version = "2.0.2117";
+ version = "2.0.2128";
src = fetchFromGitHub {
owner = "nice-registry";
repo = "all-the-package-names";
tag = "v${version}";
- hash = "sha256-jcExEGUtBMeKesdYVkkJSlJ59HhHZUAqhVvXkJVZp8g=";
+ hash = "sha256-x//g+TetH8wT6RP3W4f+exPOpiTBMTfEIJr2SgxyrmE=";
};
- npmDepsHash = "sha256-2SrPy3OybchYATCs0bmU1dZGBCKGhto1M1fPk68V/h8=";
+ npmDepsHash = "sha256-MUDeXJk+WqKGEuUlEqb3SUdh3P/gQMWgF78SboksJ2M=";
passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ba/bashunit/package.nix b/pkgs/by-name/ba/bashunit/package.nix
new file mode 100644
index 000000000000..d458858dfdd0
--- /dev/null
+++ b/pkgs/by-name/ba/bashunit/package.nix
@@ -0,0 +1,78 @@
+{
+ stdenvNoCC,
+ lib,
+ fetchFromGitHub,
+ bash,
+ which,
+ versionCheckHook,
+ coreutils,
+ makeBinaryWrapper,
+ nix-update-script,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+ pname = "bashunit";
+ version = "0.19.0";
+ src = fetchFromGitHub {
+ owner = "TypedDevs";
+ repo = "bashunit";
+ tag = finalAttrs.version;
+ hash = "sha256-EoCCqESzmCW12AuAqA3qh2VcE8gyUPIGJEoCcZhMA/Y=";
+ forceFetchGit = true; # needed to include the tests directory for the check phase
+ };
+
+ nativeBuildInputs = [ makeBinaryWrapper ];
+
+ postConfigure = ''
+ patchShebangs src tests build.sh bashunit
+ substituteInPlace Makefile \
+ --replace-fail "SHELL=/bin/bash" "SHELL=${lib.getExe bash}"
+ '';
+
+ buildPhase = ''
+ runHook preBuild
+ ./build.sh
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ install -m755 -D bin/bashunit $out/bin/bashunit
+ runHook postInstall
+ '';
+
+ # some tests are currently broken on linux and it is not easy to disable them
+ # reenable them after https://github.com/TypedDevs/bashunit/pull/397 has been merged
+ doCheck = false;
+ nativeCheckInputs = [ which ];
+ checkPhase = ''
+ runHook preCheck
+ make test
+ runHook postCheck
+ '';
+
+ postFixup = ''
+ wrapProgram $out/bin/bashunit \
+ --prefix PATH : "${
+ lib.makeBinPath [
+ coreutils
+ which
+ ]
+ }"
+ '';
+
+ nativeInstallCheckInputs = [ versionCheckHook ];
+ doInstallCheck = true;
+ versionCheckProgramArg = "--version";
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ description = "Simple testing framework for bash scripts";
+ homepage = "https://bashunit.typeddevs.com";
+ changelog = "https://github.com/TypedDevs/bashunit/releases/tag/${finalAttrs.version}";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ tricktron ];
+ mainProgram = "bashunit";
+ };
+})
diff --git a/pkgs/by-name/bl/bluespec/package.nix b/pkgs/by-name/bl/bluespec/package.nix
index 766bc20cfdaf..5f9fd46c3aa0 100644
--- a/pkgs/by-name/bl/bluespec/package.nix
+++ b/pkgs/by-name/bl/bluespec/package.nix
@@ -22,7 +22,7 @@
asciidoctor,
texliveFull,
which,
- makeWrapper,
+ makeBinaryWrapper,
cctools,
targetPackages,
# install -m 644 lib/libstp.dylib /private/tmp/nix-build-bluespec-2024.07.drv-5/source/inst/lib/SAT
@@ -160,15 +160,17 @@ stdenv.mkDerivation rec {
[
automake
autoconf
- asciidoctor
bison
flex
ghcWithPackages
perl
pkg-config
- texliveFull
tcl
- makeWrapper
+ makeBinaryWrapper
+ ]
+ ++ lib.optionals withDocs [
+ texliveFull
+ asciidoctor
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# https://github.com/B-Lang-org/bsc/blob/main/src/comp/bsc.hs#L1838
@@ -212,12 +214,16 @@ stdenv.mkDerivation rec {
postFixup = ''
# https://github.com/B-Lang-org/bsc/blob/65e3a87a17f6b9cf38cbb7b6ad7a4473f025c098/src/comp/bsc.hs#L1839
- wrapProgram $out/bin/bsc --prefix PATH : ${
- lib.makeBinPath (if stdenv.hostPlatform.isDarwin then [ cctools ] else [ targetPackages.stdenv.cc ])
- }
+ # `/bin/bsc` is a bash script which the script name to call the binary in the `/bin/core` directory
+ # thus wrapping `/bin/bsc` messes up the scriptname detection in it.
+ wrapProgram $out/bin/core/bsc \
+ --prefix PATH : ${
+ lib.makeBinPath (if stdenv.hostPlatform.isDarwin then [ cctools ] else [ targetPackages.stdenv.cc ])
+ }
'';
doCheck = true;
+ doInstallCheck = true;
# TODO To fix check-suite:
# On darwin
@@ -276,6 +282,13 @@ stdenv.mkDerivation rec {
)
'';
+ installCheckPhase = ''
+ output="$($out/bin/bsc 2>&1 || true)"
+ echo "bsc output:"
+ echo "$output"
+ echo "$output" | grep -q "to get help"
+ '';
+
meta = {
description = "Toolchain for the Bluespec Hardware Definition Language";
homepage = "https://github.com/B-Lang-org/bsc";
diff --git a/pkgs/by-name/co/cobalt/package.nix b/pkgs/by-name/co/cobalt/package.nix
index 7ee588a34ef1..fc3e31e941e6 100644
--- a/pkgs/by-name/co/cobalt/package.nix
+++ b/pkgs/by-name/co/cobalt/package.nix
@@ -9,17 +9,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cobalt";
- version = "0.19.8";
+ version = "0.19.9";
src = fetchFromGitHub {
owner = "cobalt-org";
repo = "cobalt.rs";
tag = "v${finalAttrs.version}";
- hash = "sha256-neOJ3UqRisCcyarRIXfHyl9nAe2Wl9IXVDNwIYEQYys=";
+ hash = "sha256-T88XyrMVCLfhsz3RWD85ErHxAmuTXprOAiS5B8GkH9s=";
};
useFetchCargoVendor = true;
- cargoHash = "sha256-j2xmEoMV7lVhqj4lKWA3QdEDEGUpRlZc4ikZoDQJlB8=";
+ cargoHash = "sha256-0BJAbxBbw6wfnDcZkOic13iuWTBEslJ2mQ9nfq+/RXc=";
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
diff --git a/pkgs/by-name/co/concessio/package.nix b/pkgs/by-name/co/concessio/package.nix
index 803182fc4686..c8fa52d89ce4 100644
--- a/pkgs/by-name/co/concessio/package.nix
+++ b/pkgs/by-name/co/concessio/package.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "concessio";
- version = "0.1.9";
+ version = "0.1.10";
src = fetchFromGitHub {
owner = "ronniedroid";
repo = "concessio";
tag = "v${finalAttrs.version}";
- hash = "sha256-XH+4oEZSKa6lAS0zXxdlCsVJcGDglKSgaD+zoRM6Pws=";
+ hash = "sha256-GDiwpErxz6GiYajcRBOnX0RO1jeaSmpLLxqEsB3nJLA=";
};
strictDeps = true;
diff --git a/pkgs/by-name/co/cozette/package.nix b/pkgs/by-name/co/cozette/package.nix
index d62f7930f3b5..ad640a6a6077 100644
--- a/pkgs/by-name/co/cozette/package.nix
+++ b/pkgs/by-name/co/cozette/package.nix
@@ -6,13 +6,13 @@
stdenvNoCC.mkDerivation rec {
pname = "cozette";
- version = "1.27.0";
+ version = "1.28.0";
src = fetchzip {
url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts-v-${
builtins.replaceStrings [ "." ] [ "-" ] version
}.zip";
- hash = "sha256-L/C1fohaLSVbrxAr4v3R83x1/Yt8fI3Lo+c84cZvEHY=";
+ hash = "sha256-KxlChsydFtm26CFugbWqeJi5DQP0BxONSz5mOcyiE28=";
};
installPhase = ''
diff --git a/pkgs/games/doom-ports/zdoom/bcc-warning-fix.patch b/pkgs/by-name/do/doom-bcc/bcc-warning-fix.patch
similarity index 100%
rename from pkgs/games/doom-ports/zdoom/bcc-warning-fix.patch
rename to pkgs/by-name/do/doom-bcc/bcc-warning-fix.patch
diff --git a/pkgs/games/doom-ports/zdoom/bcc-git.nix b/pkgs/by-name/do/doom-bcc/package.nix
similarity index 100%
rename from pkgs/games/doom-ports/zdoom/bcc-git.nix
rename to pkgs/by-name/do/doom-bcc/package.nix
diff --git a/pkgs/by-name/fa/fabric-installer/package.nix b/pkgs/by-name/fa/fabric-installer/package.nix
index 21fdd3945316..09b9f44f225e 100644
--- a/pkgs/by-name/fa/fabric-installer/package.nix
+++ b/pkgs/by-name/fa/fabric-installer/package.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "fabric-installer";
- version = "1.0.1";
+ version = "1.0.3";
src = fetchurl {
url = "https://maven.fabricmc.net/net/fabricmc/fabric-installer/${version}/fabric-installer-${version}.jar";
- sha256 = "sha256-Yu3xcL3MQe3qhdM6zz64VHQlhpmz1B+UGNKGyDbLCI0=";
+ sha256 = "sha256-OKqCqx74KbeqPyFD/Mk7unBqjhiDW+cx0P3yMdJ0sH8=";
};
dontUnpack = true;
diff --git a/pkgs/by-name/fa/fangfrisch/package.nix b/pkgs/by-name/fa/fangfrisch/package.nix
index 529b57f48f16..48e1726c7518 100644
--- a/pkgs/by-name/fa/fangfrisch/package.nix
+++ b/pkgs/by-name/fa/fangfrisch/package.nix
@@ -4,7 +4,7 @@
fetchFromGitHub,
}:
let
- version = "1.9.0";
+ version = "1.9.2";
in
python3.pkgs.buildPythonApplication {
pname = "fangfrisch";
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication {
owner = "rseichter";
repo = "fangfrisch";
tag = version;
- hash = "sha256-B2fVXVYzrtWMh/WjgFBOqrq8Jt+jqudbtpY/w4rJG08=";
+ hash = "sha256-8upIh9Z+ismvuKcuEe+gJ4W9NLw/Wq15zjFpy8X9yVo=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/go/go-judge/package.nix b/pkgs/by-name/go/go-judge/package.nix
index 7a96e9827c25..c94afc6622b9 100644
--- a/pkgs/by-name/go/go-judge/package.nix
+++ b/pkgs/by-name/go/go-judge/package.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "go-judge";
- version = "1.9.2";
+ version = "1.9.3";
src = fetchFromGitHub {
owner = "criyle";
repo = pname;
rev = "v${version}";
- hash = "sha256-4KBMDqHw8EJGSDK9+jCZvaxkQymhw4RRGByrFngiIug=";
+ hash = "sha256-AmbhfCKUpvZt/me73EhBQqw8yDnItn1zKiemf/JRz24=";
};
- vendorHash = "sha256-FnX3u6DLB9qPE4+Hy/+00mD4U/6Pa+CsZoEroi7cNO0=";
+ vendorHash = "sha256-eUtkelLucf11ANT6vkWuBOaL5bgb+9D8YsVsZTMMjmg=";
tags = [
"nomsgpack"
diff --git a/pkgs/by-name/hy/hyprprop/package.nix b/pkgs/by-name/hy/hyprprop/package.nix
index d37a8e05b0c6..8552abed3d0a 100644
--- a/pkgs/by-name/hy/hyprprop/package.nix
+++ b/pkgs/by-name/hy/hyprprop/package.nix
@@ -14,13 +14,13 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "hyprprop";
- version = "0.1-unstable-2025-03-17";
+ version = "0.1-unstable-2025-03-31";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "contrib";
- rev = "bd81329944be53b0ffb99e05864804b95f1d7c65";
- hash = "sha256-I8JVdQRu8eWvY5W8XWYZkdd5pojDHkxeqQV7mMIsbhs=";
+ rev = "bc2ad24e0b2e66c3e164994c4897cd94a933fd10";
+ hash = "sha256-YItzk1pj8Kz+b7VlC9zN1pSZ6CuX35asYy3HuMQ3lBQ=";
};
sourceRoot = "${finalAttrs.src.name}/hyprprop";
diff --git a/pkgs/by-name/in/incus/docs.patch b/pkgs/by-name/in/incus/docs.patch
new file mode 100644
index 000000000000..6857df48e230
--- /dev/null
+++ b/pkgs/by-name/in/incus/docs.patch
@@ -0,0 +1,26 @@
+diff --git i/doc/conf.py w/doc/conf.py
+index 8d042818b..b4f0572bd 100644
+--- i/doc/conf.py
++++ w/doc/conf.py
+@@ -8,10 +8,6 @@ import yaml
+ from git import Repo
+ import filecmp
+
+-# Download and link swagger-ui files
+-if not os.path.isdir('.sphinx/deps/swagger-ui'):
+- Repo.clone_from('https://github.com/swagger-api/swagger-ui', '.sphinx/deps/swagger-ui', depth=1)
+-
+ os.makedirs('.sphinx/_static/swagger-ui/', exist_ok=True)
+
+ if not os.path.islink('.sphinx/_static/swagger-ui/swagger-ui-bundle.js'):
+@@ -151,10 +147,6 @@ if os.path.exists("./related_topics.yaml"):
+ with open("./related_topics.yaml", "r") as fd:
+ myst_substitutions.update(yaml.safe_load(fd.read()))
+
+-intersphinx_mapping = {
+- 'cloud-init': ('https://cloudinit.readthedocs.io/en/latest/', None)
+-}
+-
+ if ("LOCAL_SPHINX_BUILD" in os.environ) and (os.environ["LOCAL_SPHINX_BUILD"] == "True"):
+ swagger_url_scheme = "/api/#{{path}}"
+ else:
diff --git a/pkgs/by-name/in/incus/generic.nix b/pkgs/by-name/in/incus/generic.nix
index be969c84e4a6..2620ea098c24 100644
--- a/pkgs/by-name/in/incus/generic.nix
+++ b/pkgs/by-name/in/incus/generic.nix
@@ -13,6 +13,7 @@
buildGoModule,
fetchFromGitHub,
acl,
+ buildPackages,
cowsql,
incus-ui-canonical,
libcap,
@@ -27,11 +28,30 @@
let
pname = "incus${lib.optionalString lts "-lts"}";
+ docsPython = buildPackages.python3.withPackages (
+ py: with py; [
+ furo
+ gitpython
+ linkify-it-py
+ canonical-sphinx-extensions
+ myst-parser
+ pyspelling
+ sphinx
+ sphinx-autobuild
+ sphinx-copybutton
+ sphinx-design
+ sphinx-notfound-page
+ sphinx-remove-toctrees
+ sphinx-reredirects
+ sphinx-tabs
+ sphinxcontrib-jquery
+ sphinxext-opengraph
+ ]
+ );
in
-buildGoModule rec {
+buildGoModule (finalAttrs: {
inherit
- patches
pname
vendorHash
version
@@ -40,15 +60,18 @@ buildGoModule rec {
outputs = [
"out"
"agent_loader"
+ "doc"
];
src = fetchFromGitHub {
owner = "lxc";
repo = "incus";
- rev = "refs/tags/v${version}";
+ tag = "v${version}";
inherit hash;
};
+ patches = [ ./docs.patch ] ++ patches;
+
excludedPackages = [
# statically compile these
"cmd/incus-agent"
@@ -61,6 +84,7 @@ buildGoModule rec {
nativeBuildInputs = [
installShellFiles
pkg-config
+ docsPython
];
buildInputs = [
@@ -82,6 +106,13 @@ buildGoModule rec {
CGO_LDFLAGS_ALLOW = "(-Wl,-wrap,pthread_create)|(-Wl,-z,now)";
postBuild = ''
+ # build docs
+ mkdir -p .sphinx/deps
+ ln -s ${buildPackages.python3.pkgs.swagger-ui-bundle.src} .sphinx/deps/swagger-ui
+ substituteInPlace Makefile --replace-fail '. $(SPHINXENV) ; ' ""
+ make doc-incremental
+
+ # build some static executables
make incus-agent incus-migrate
'';
@@ -111,18 +142,20 @@ buildGoModule rec {
cp internal/server/instance/drivers/agent-loader/systemd/incus-agent.service $agent_loader/etc/systemd/system/
cp internal/server/instance/drivers/agent-loader/systemd/incus-agent.rules $agent_loader/lib/udev/rules.d/99-incus-agent.rules
substituteInPlace $agent_loader/etc/systemd/system/incus-agent.service --replace-fail 'TARGET/systemd' "$agent_loader/bin"
+
+ mkdir $doc
+ cp -R doc/html $doc/
'';
passthru = {
client = callPackage ./client.nix {
inherit
lts
- meta
patches
- src
vendorHash
version
;
+ inherit (finalAttrs) meta src;
};
tests = if lts then nixosTests.incus-lts.all else nixosTests.incus.all;
@@ -143,4 +176,4 @@ buildGoModule rec {
platforms = lib.platforms.linux;
mainProgram = "incus";
};
-}
+})
diff --git a/pkgs/by-name/ko/koji/package.nix b/pkgs/by-name/ko/koji/package.nix
index fb3729958667..42f605d553c1 100644
--- a/pkgs/by-name/ko/koji/package.nix
+++ b/pkgs/by-name/ko/koji/package.nix
@@ -1,45 +1,74 @@
{
lib,
+ stdenv,
rustPlatform,
fetchFromGitHub,
pkg-config,
perl,
udev,
openssl,
+ gitMinimal,
+ writableTmpDirAsHomeHook,
+ installShellFiles,
+ versionCheckHook,
}:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
pname = "koji";
- version = "2.2.0";
+ version = "3.2.0";
src = fetchFromGitHub {
- owner = "its-danny";
+ owner = "cococonscious";
repo = "koji";
- rev = version;
- hash = "sha256-2kBjHX7izo4loJ8oyPjE9FtCvUODC3Sm4T8ETIdeGZM=";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-+xtq4btFbOfiyFMDHXo6riSBMhAwTLQFuE91MUHtg5Q=";
};
useFetchCargoVendor = true;
- cargoHash = "sha256-ZHti7nMfHiYur1kjxj+ySIF4/l0UU9q2urabUWZyk6E=";
+ cargoHash = "sha256-WiFXDXLJc2ictv29UoRFRpIpAqeJlEBEOvThXhLXLJA=";
OPENSSL_NO_VENDOR = 1;
nativeBuildInputs = [
pkg-config
perl
- udev
+ installShellFiles
];
buildInputs = [
- openssl.dev
+ openssl
+ ] ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ];
+
+ nativeCheckInputs = [
+ gitMinimal
+ writableTmpDirAsHomeHook
];
- meta = with lib; {
+ preCheck = ''
+ git config --global user.name 'nix-user'
+ git config --global user.email 'nix-user@example.com'
+ '';
+
+ postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+ installShellCompletion --cmd koji \
+ --bash <($out/bin/koji completions bash) \
+ --fish <($out/bin/koji completions fish) \
+ --zsh <($out/bin/koji completions zsh)
+ '';
+
+ doInstallCheck = true;
+ nativeInstallCheckInputs = [ versionCheckHook ];
+ versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
+
+ meta = {
description = "Interactive CLI for creating conventional commits";
homepage = "https://github.com/its-danny/koji";
- license = with licenses; [ mit ];
- maintainers = with maintainers; [ ByteSudoer ];
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [
+ ByteSudoer
+ WeetHet
+ ];
mainProgram = "koji";
- platforms = platforms.unix;
+ platforms = lib.platforms.unix;
};
-}
+})
diff --git a/pkgs/by-name/kr/krep/package.nix b/pkgs/by-name/kr/krep/package.nix
index b94232de2330..12426c953ed1 100644
--- a/pkgs/by-name/kr/krep/package.nix
+++ b/pkgs/by-name/kr/krep/package.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "krep";
- version = "0.3.4";
+ version = "0.3.6";
src = fetchFromGitHub {
owner = "davidesantangelo";
repo = "krep";
rev = "v${finalAttrs.version}";
- hash = "sha256-kAsOAcEFjfxlJs6fJvB0viCMxGFCG1BUs9qPgGMvBpM=";
+ hash = "sha256-wfMNyqZgqoEkp51gompWUn65kaeVZIMfvo0VStW4EPA=";
};
makeFlags = [
diff --git a/pkgs/by-name/li/lighttpd/package.nix b/pkgs/by-name/li/lighttpd/package.nix
index 5abe45061795..edfd21231602 100644
--- a/pkgs/by-name/li/lighttpd/package.nix
+++ b/pkgs/by-name/li/lighttpd/package.nix
@@ -34,11 +34,11 @@
stdenv.mkDerivation rec {
pname = "lighttpd";
- version = "1.4.78";
+ version = "1.4.79";
src = fetchurl {
url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz";
- sha256 = "sha256-PAc56Lx1yen8HPqJ4cME3UsOSruHrcZGodILxqLbKj4=";
+ sha256 = "sha256-OymmJbOtiHAtH+pPX0K7fYdIjy5O/Jd9fxhTKcpghL0=";
};
separateDebugInfo = true;
diff --git a/pkgs/by-name/ln/lnav/package.nix b/pkgs/by-name/ln/lnav/package.nix
index 9af958ac6723..3cf636be8240 100644
--- a/pkgs/by-name/ln/lnav/package.nix
+++ b/pkgs/by-name/ln/lnav/package.nix
@@ -19,24 +19,28 @@
cargo,
rustPlatform,
rustc,
+ libunistring,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "lnav";
- version = "0.12.3";
+ version = "0.12.4";
src = fetchFromGitHub {
owner = "tstack";
repo = "lnav";
- rev = "v${version}";
- sha256 = "sha256-m0r7LAo9pYFpS+oimVCNCipojxPzMMsLLjhjkitEwow=";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-XS3/km2sJwRnWloLKu9X9z07+qBFRfUsaRpZVYjoclI=";
};
enableParallelBuilding = true;
+
separateDebugInfo = true;
strictDeps = true;
+
depsBuildBuild = [ buildPackages.stdenv.cc ];
+
nativeBuildInputs = [
autoconf
automake
@@ -47,6 +51,7 @@ stdenv.mkDerivation rec {
rustPlatform.cargoSetupHook
rustc
];
+
buildInputs =
[
bzip2
@@ -56,14 +61,15 @@ stdenv.mkDerivation rec {
sqlite
curl
libarchive
+ libunistring
]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
gpm
];
cargoDeps = rustPlatform.fetchCargoVendor {
- src = "${src}/src/third-party/prqlc-c";
- hash = "sha256-jfmr6EuNW2mEHTEVHn6YnBDMzKxKI097vEFHXC4NT2Y=";
+ src = "${finalAttrs.src}/src/third-party/prqlc-c";
+ hash = "sha256-svi+C3ELw6Ly0mtji8xOv+DDqR0z5shFNazHa3kDQVg=";
};
cargoRoot = "src/third-party/prqlc-c";
@@ -74,7 +80,7 @@ stdenv.mkDerivation rec {
passthru.updateScript = nix-update-script { };
- meta = with lib; {
+ meta = {
homepage = "https://github.com/tstack/lnav";
description = "Logfile Navigator";
longDescription = ''
@@ -87,14 +93,13 @@ stdenv.mkDerivation rec {
will allow the user to quickly and efficiently zero in on problems.
'';
downloadPage = "https://github.com/tstack/lnav/releases";
- license = licenses.bsd2;
- maintainers = with maintainers; [
+ license = lib.licenses.bsd2;
+ maintainers = with lib.maintainers; [
dochang
symphorien
pcasaretto
];
- platforms = platforms.unix;
+ platforms = lib.platforms.unix;
mainProgram = "lnav";
};
-
-}
+})
diff --git a/pkgs/by-name/lo/lokalise2-cli/package.nix b/pkgs/by-name/lo/lokalise2-cli/package.nix
index 6614c9a3382d..32cfb4202228 100644
--- a/pkgs/by-name/lo/lokalise2-cli/package.nix
+++ b/pkgs/by-name/lo/lokalise2-cli/package.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "lokalise2-cli";
- version = "3.1.1";
+ version = "3.1.2";
src = fetchFromGitHub {
owner = "lokalise";
repo = "lokalise-cli-2-go";
rev = "v${version}";
- sha256 = "sha256-CFZB1nELQOBNOuISTjes4vhXMr8Pjq4Rj83nq/FfpMY=";
+ sha256 = "sha256-R8vzHuWkNznq/eeXUVHm9SJJmRV2B2WXKQFEHil+HiY=";
};
- vendorHash = "sha256-sM4v1EWxXPUFKFWcl9EBc8ZTmm2STOVoeGH9Zv+KEng=";
+ vendorHash = "sha256-thD8NtG9uVI4KwNQiNsVCUdyUcgAmnr+szsUQ2Ika1c=";
doCheck = false;
diff --git a/pkgs/by-name/ma/mangojuice/package.nix b/pkgs/by-name/ma/mangojuice/package.nix
index aab7000014e8..5c2908802ff9 100644
--- a/pkgs/by-name/ma/mangojuice/package.nix
+++ b/pkgs/by-name/ma/mangojuice/package.nix
@@ -25,13 +25,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "mangojuice";
- version = "0.8.2";
+ version = "0.8.3";
src = fetchFromGitHub {
owner = "radiolamp";
repo = "mangojuice";
tag = finalAttrs.version;
- hash = "sha256-NpNsYwktcce9R1LpoIL2vh5UzsgDqdPyS0D3mhM3F0w=";
+ hash = "sha256-373Ws+U7fuwWLrKOnj1dD9gIJPKOd1b6I78VWOtOjTM=";
};
patches = [
@@ -80,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Convenient alternative to GOverlay for setting up MangoHud";
homepage = "https://github.com/radiolamp/mangojuice";
+ changelog = "https://github.com/radiolamp/mangojuice/releases/tag/${finalAttrs.version}";
license = with lib.licenses; [ gpl3Only ];
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/ma/mapproxy/package.nix b/pkgs/by-name/ma/mapproxy/package.nix
index 75a6ecac099c..8c81b04f3b8b 100644
--- a/pkgs/by-name/ma/mapproxy/package.nix
+++ b/pkgs/by-name/ma/mapproxy/package.nix
@@ -1,26 +1,27 @@
{
lib,
- python3,
fetchFromGitHub,
+
+ python3Packages,
}:
-with python3.pkgs;
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
pname = "mapproxy";
- version = "3.1.3";
+ version = "4.0.1";
+ disabled = python3Packages.pythonOlder "3.8";
src = fetchFromGitHub {
owner = "mapproxy";
repo = "mapproxy";
tag = version;
- hash = "sha256-Dltr4JlgE1aJfSybTbAxlUyjqkfaobupNNSj90j9taE=";
+ hash = "sha256-bqM25exBPUB7hFtseWMw4Q1W6IeHLx+JrplOkZVEIl0=";
};
prePatch = ''
substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv"
'';
- dependencies = [
+ dependencies = with python3Packages; [
boto3 # needed for caches service
future
jsonschema
@@ -33,13 +34,10 @@ buildPythonApplication rec {
setuptools
werkzeug
];
+
# Tests are disabled:
# 1) Dependency list is huge.
# https://github.com/mapproxy/mapproxy/blob/master/requirements-tests.txt
- #
- # 2) There are security issues with package Riak
- # https://github.com/NixOS/nixpkgs/issues/33876
- # https://github.com/NixOS/nixpkgs/pull/56480
doCheck = false;
meta = {
diff --git a/pkgs/servers/metabase/default.nix b/pkgs/by-name/me/metabase/package.nix
similarity index 62%
rename from pkgs/servers/metabase/default.nix
rename to pkgs/by-name/me/metabase/package.nix
index d6cac37c3e2d..1a7af0ffce8f 100644
--- a/pkgs/servers/metabase/default.nix
+++ b/pkgs/by-name/me/metabase/package.nix
@@ -3,17 +3,20 @@
stdenv,
fetchurl,
makeWrapper,
- jdk11,
+ jre_headless,
nixosTests,
}:
-stdenv.mkDerivation rec {
+let
+ jre = jre_headless;
+in
+stdenv.mkDerivation (finalAttrs: {
pname = "metabase";
- version = "0.52.8";
+ version = "0.54.1";
src = fetchurl {
- url = "https://downloads.metabase.com/v${version}/metabase.jar";
- hash = "sha256-Z14BuKaSAMzlgdtqppc/3ItCxVZwE4E1EQUVMVR6JwQ=";
+ url = "https://downloads.metabase.com/v${finalAttrs.version}/metabase.jar";
+ hash = "sha256-gHLugoL3wCvlCzN2fNJtCt+1iSW+kKPzWPpqqHAn/D0=";
};
nativeBuildInputs = [ makeWrapper ];
@@ -22,12 +25,12 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
- makeWrapper ${jdk11}/bin/java $out/bin/metabase --add-flags "-jar $src"
+ makeWrapper ${lib.getExe jre} $out/bin/metabase --add-flags "-jar $src"
runHook postInstall
'';
meta = with lib; {
- description = "Easy, open source way for everyone in your company to ask questions and learn from data";
+ description = "Business Intelligence and Embedded Analytics tool";
homepage = "https://metabase.com";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.agpl3Only;
@@ -42,4 +45,4 @@ stdenv.mkDerivation rec {
passthru.tests = {
inherit (nixosTests) metabase;
};
-}
+})
diff --git a/pkgs/by-name/mo/moosefs/package.nix b/pkgs/by-name/mo/moosefs/package.nix
index 56944ad6be76..37dc19b74b25 100644
--- a/pkgs/by-name/mo/moosefs/package.nix
+++ b/pkgs/by-name/mo/moosefs/package.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "moosefs";
- version = "4.57.5";
+ version = "4.57.6";
src = fetchFromGitHub {
owner = "moosefs";
repo = "moosefs";
rev = "v${version}";
- sha256 = "sha256-5sVnr+bUbmIc4qYC/h+d/s1ow3cxeL2Yo/JitCs6cbE=";
+ sha256 = "sha256-vCwRM6UIcT71e6u5QZzcTW6LK/VNlVG/19XxsHnn2a8=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/op/opencascade-occt/package.nix b/pkgs/by-name/op/opencascade-occt/package.nix
index 85ee2f4d1683..293eac8660b2 100644
--- a/pkgs/by-name/op/opencascade-occt/package.nix
+++ b/pkgs/by-name/op/opencascade-occt/package.nix
@@ -5,6 +5,7 @@
fetchpatch,
cmake,
ninja,
+ rapidjson,
tcl,
tk,
libGL,
@@ -48,9 +49,11 @@ stdenv.mkDerivation rec {
libXext
libXmu
libXi
+ rapidjson
] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa;
NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
+ cmakeFlags = [ "-DUSE_RAPIDJSON=ON" ];
meta = with lib; {
description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation";
diff --git a/pkgs/by-name/ra/rabbitmq-server/package.nix b/pkgs/by-name/ra/rabbitmq-server/package.nix
index 236533dcc3a2..c1bcbd99b138 100644
--- a/pkgs/by-name/ra/rabbitmq-server/package.nix
+++ b/pkgs/by-name/ra/rabbitmq-server/package.nix
@@ -42,12 +42,12 @@ in
stdenv.mkDerivation rec {
pname = "rabbitmq-server";
- version = "4.0.7";
+ version = "4.0.8";
# when updating, consider bumping elixir version in all-packages.nix
src = fetchurl {
url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
- hash = "sha256-ScqNRa1itxawGyRruNihA60xbltw7Lek36SP9Nd+LfI=";
+ hash = "sha256-FWB5riSCb8WsGLfNJO6SZRtQxvHpwea+YosvvU8iqng=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/ra/rain/package.nix b/pkgs/by-name/ra/rain/package.nix
index 05b2b0189e8b..eb1a8ec4d010 100644
--- a/pkgs/by-name/ra/rain/package.nix
+++ b/pkgs/by-name/ra/rain/package.nix
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "rain";
- version = "1.21.0";
+ version = "1.22.0";
src = fetchFromGitHub {
owner = "aws-cloudformation";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-2yb965fDzNgrPXT2xMRdqD/inyvlwdKlkMj16YSFHBk=";
+ sha256 = "sha256-0FjJXOmLHM0At0TJdcsYTafgDbw+C37BH11ft+UjEl0=";
};
- vendorHash = "sha256-TlS9SfqMJa5w+JMUx+7ZMF0xk/VsnjOScSGXEw1dVkU=";
+ vendorHash = "sha256-A+fQCiA2jArnhxbKxNmRQB6wY5mcmrY+fMtZQX5aBmU=";
subPackages = [ "cmd/rain" ];
diff --git a/pkgs/by-name/re/refine/package.nix b/pkgs/by-name/re/refine/package.nix
index 648818481f40..c5bee1e438de 100644
--- a/pkgs/by-name/re/refine/package.nix
+++ b/pkgs/by-name/re/refine/package.nix
@@ -34,7 +34,7 @@ in
python3Packages.buildPythonApplication rec {
pname = "refine";
- version = "0.5.5";
+ version = "0.5.6";
pyproject = false; # uses meson
src = fetchFromGitLab {
@@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec {
owner = "TheEvilSkeleton";
repo = "Refine";
tag = version;
- hash = "sha256-b2dNhd5UJqH/l5BOEgcOUZrhCZa8ErdBzNw5g4VjtM8=";
+ hash = "sha256-cIJWTzeLm2YP8Pm/nzcYHIGzBOmQlPe0lQ+b6BufIMg=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix
index b63543b59cad..9e00c8711a80 100644
--- a/pkgs/by-name/re/remnote/package.nix
+++ b/pkgs/by-name/re/remnote/package.nix
@@ -6,10 +6,10 @@
}:
let
pname = "remnote";
- version = "1.18.49";
+ version = "1.19.8";
src = fetchurl {
url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
- hash = "sha256-LSjPQbRYl61c7I/TT0ePSoXkXqiVuCD8RdaFFJsK02M=";
+ hash = "sha256-xMr+UftIWxtlYzzdOtidCJWisSwJd+xEtaKyoZnyVXc=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in
diff --git a/pkgs/by-name/rm/rmfakecloud/package.nix b/pkgs/by-name/rm/rmfakecloud/package.nix
index b76e3a3b9567..30a1709b67a5 100644
--- a/pkgs/by-name/rm/rmfakecloud/package.nix
+++ b/pkgs/by-name/rm/rmfakecloud/package.nix
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "rmfakecloud";
- version = "0.0.23";
+ version = "0.0.24";
src = fetchFromGitHub {
owner = "ddvk";
repo = "rmfakecloud";
rev = "v${version}";
- hash = "sha256-XlKqh6GKGreWLPjS8XfEUJCMMxiOw8pP2qX8otD+RCo=";
+ hash = "sha256-ZsYq1+Bb6SyMGdbiy5UzanDiUiFOt4uhttiPKC0ESis=";
};
- vendorHash = "sha256-9tfxE03brUvCYusmewiqNpCkKyIS9qePqylrzDWrJLY=";
+ vendorHash = "sha256-S2P80uhX86IVUVEoR4tZ7e6qMe7CK+6bmmjBgjXGZmo=";
# if using webUI build it
# use env because of https://github.com/NixOS/nixpkgs/issues/358844
diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/by-name/rs/rssguard/package.nix
similarity index 100%
rename from pkgs/applications/networking/feedreaders/rssguard/default.nix
rename to pkgs/by-name/rs/rssguard/package.nix
diff --git a/pkgs/by-name/sv/svd2rust/package.nix b/pkgs/by-name/sv/svd2rust/package.nix
index 1dd1dda5dbd7..62d524001654 100644
--- a/pkgs/by-name/sv/svd2rust/package.nix
+++ b/pkgs/by-name/sv/svd2rust/package.nix
@@ -6,15 +6,15 @@
rustPlatform.buildRustPackage rec {
pname = "svd2rust";
- version = "0.36.0";
+ version = "0.36.1";
src = fetchCrate {
inherit pname version;
- hash = "sha256-HdE4XWAM1e25kRwryMzGqo2sUpzgwk2aiWsi+qXZ7bU=";
+ hash = "sha256-+wVcUpSlJsd6GAZgBor7eAu6IYnlfJwzZDYKqUKpa9M=";
};
useFetchCargoVendor = true;
- cargoHash = "sha256-JiGTGdrudmDCNmJOtHgIBwTVCLB3m4RCqxlypa2KdDQ=";
+ cargoHash = "sha256-rZusngSIwdDfNe7tIA2WtIzzje6UBxyz/hfeRLqJHUY=";
# error: linker `aarch64-linux-gnu-gcc` not found
postPatch = ''
diff --git a/pkgs/by-name/ta/tagparser/package.nix b/pkgs/by-name/ta/tagparser/package.nix
index 6910a8f1900d..5bd6c959a538 100644
--- a/pkgs/by-name/ta/tagparser/package.nix
+++ b/pkgs/by-name/ta/tagparser/package.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "tagparser";
- version = "12.4.0";
+ version = "12.5.0";
src = fetchFromGitHub {
owner = "Martchus";
repo = "tagparser";
rev = "v${version}";
- hash = "sha256-wVdE1lgSQsH4g10/lxa8bZlYT141Vd7gRhefxyz8kRM=";
+ hash = "sha256-Xu6pvqyBWew3xD0nD5k7QKUOEpDchF1FiuSN7oHfYME=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/tf/tfswitch/package.nix b/pkgs/by-name/tf/tfswitch/package.nix
index c62723fe880b..b4558be4d273 100644
--- a/pkgs/by-name/tf/tfswitch/package.nix
+++ b/pkgs/by-name/tf/tfswitch/package.nix
@@ -5,16 +5,16 @@
}:
buildGoModule rec {
pname = "tfswitch";
- version = "1.4.2";
+ version = "1.4.3";
src = fetchFromGitHub {
owner = "warrensbox";
repo = "terraform-switcher";
rev = "v${version}";
- sha256 = "sha256-y9MoDtF0104HRjDqpRuMfBbsNqseynq2azKnXNdRhso=";
+ sha256 = "sha256-5Zyu0SLF+xjemFKInzRKCcDZs72gwAJN7bacO+5StMg=";
};
- vendorHash = "sha256-m3QzNSAcUrI4Pg7LMDZftlBbk4Uhjirc6eNSrQxxwLA=";
+ vendorHash = "sha256-EjbS+1osM6Qauoi95JHLOdxeLOz0Jgz6ZaTFtfs6IgM=";
# Disable tests since it requires network access and relies on the
# presence of release.hashicorp.com
diff --git a/pkgs/by-name/tr/trdl-client/package.nix b/pkgs/by-name/tr/trdl-client/package.nix
index 121c792fbc58..b0ba4f81af4e 100644
--- a/pkgs/by-name/tr/trdl-client/package.nix
+++ b/pkgs/by-name/tr/trdl-client/package.nix
@@ -8,18 +8,18 @@
buildGoModule rec {
pname = "trdl-client";
- version = "0.8.7";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "werf";
repo = "trdl";
rev = "v${version}";
- hash = "sha256-4RN2vrTP4horjDvuuFJbQhToL/4boIuaG+efoTbmebI=";
+ hash = "sha256-f7gyGGClMk/5+FCivuLasiIG/Ty17yeJ8qQ/GVEbC14=";
};
sourceRoot = "${src.name}/client";
- vendorHash = "sha256-f7FPeR+us3WvwqzcSQLbkKv905CCIAAm+HNV2FFF8OY=";
+ vendorHash = "sha256-veSgWyk1ytHRNHuuZJBV+1rqGDsdEb01CImm+EexFCk=";
subPackages = [ "cmd/trdl" ];
diff --git a/pkgs/by-name/ui/uiua/stable.nix b/pkgs/by-name/ui/uiua/stable.nix
index 59cb86f7329d..a46416c8c21c 100644
--- a/pkgs/by-name/ui/uiua/stable.nix
+++ b/pkgs/by-name/ui/uiua/stable.nix
@@ -1,7 +1,7 @@
rec {
- version = "0.14.1";
+ version = "0.15.0";
tag = version;
- hash = "sha256-+FiJYxB2Lb1B7l9QEuB/XzdEYgJZmYAQpKimRIhWwhc=";
- cargoHash = "sha256-bDj7pvZORP1cc2PXd1W9TWptWCvIKW9TXzaQAmni6hg=";
+ hash = "sha256-XjU8XPi8jTydJ439X6hjyZhXho2zbtt4Fqq3uIQg09M=";
+ cargoHash = "sha256-tMNIk52nq4dYfJU+nP2IKW21ex13YdrDvrEm2GSAAF4=";
updateScript = ./update-stable.sh;
}
diff --git a/pkgs/by-name/ui/uiua/unstable.nix b/pkgs/by-name/ui/uiua/unstable.nix
index 8212d238c290..a245509ec20c 100644
--- a/pkgs/by-name/ui/uiua/unstable.nix
+++ b/pkgs/by-name/ui/uiua/unstable.nix
@@ -1,7 +1,7 @@
rec {
- version = "0.15.0-rc.2";
+ version = "0.15.0";
tag = version;
- hash = "sha256-nGuSofBDstaBJNRS6MHdSD6nXyUqkGE/rcnAjaJICtk=";
- cargoHash = "sha256-FzO5YOYrnwfcdrQHMJR5dR2qdFNL3Jfmyqpu1iPeN2o=";
+ hash = "sha256-XjU8XPi8jTydJ439X6hjyZhXho2zbtt4Fqq3uIQg09M=";
+ cargoHash = "sha256-tMNIk52nq4dYfJU+nP2IKW21ex13YdrDvrEm2GSAAF4=";
updateScript = ./update-unstable.sh;
}
diff --git a/pkgs/by-name/va/vale/package.nix b/pkgs/by-name/va/vale/package.nix
index b75fe852fb43..33bf556a4031 100644
--- a/pkgs/by-name/va/vale/package.nix
+++ b/pkgs/by-name/va/vale/package.nix
@@ -11,7 +11,7 @@
buildGoModule rec {
pname = "vale";
- version = "3.11.0";
+ version = "3.11.1";
subPackages = [ "cmd/vale" ];
@@ -19,7 +19,7 @@ buildGoModule rec {
owner = "errata-ai";
repo = "vale";
rev = "v${version}";
- hash = "sha256-NJ8QmF2ZGlbkHhc0OQSVl11pQDHO88KL/MLr+8ABLYs=";
+ hash = "sha256-UPbeml7W90ICmbDjvNIy+DmolAAYF6Tci4R/kZa5cr8=";
};
vendorHash = "sha256-Zhhp/qbwGTQEZ28S+p7GJodwQcnkFNqNU7WCZKdeoz0=";
diff --git a/pkgs/by-name/ya/yafc-ce/package.nix b/pkgs/by-name/ya/yafc-ce/package.nix
index 164cd559b1e4..0d8ebe02570f 100644
--- a/pkgs/by-name/ya/yafc-ce/package.nix
+++ b/pkgs/by-name/ya/yafc-ce/package.nix
@@ -12,13 +12,13 @@ let
in
buildDotnetModule (finalAttrs: {
pname = "yafc-ce";
- version = "2.10.0";
+ version = "2.11.0";
src = fetchFromGitHub {
owner = "shpaass";
repo = "yafc-ce";
rev = finalAttrs.version;
- hash = "sha256-AFFu4yqnBq0OD3XY1V97zxAIfZuXswT9KOJzU8GqQuU";
+ hash = "sha256-jWJOJ00VXBaHogm3xUsV9Shvv9islRA+Z4fkln5VuWM=";
};
projectFile = [ "Yafc/Yafc.csproj" ];
diff --git a/pkgs/games/doom-ports/zdoom/zdbsp.nix b/pkgs/by-name/zd/zdbsp/package.nix
similarity index 100%
rename from pkgs/games/doom-ports/zdoom/zdbsp.nix
rename to pkgs/by-name/zd/zdbsp/package.nix
diff --git a/pkgs/games/doom-ports/zdoom/default.nix b/pkgs/by-name/zd/zdoom/package.nix
similarity index 100%
rename from pkgs/games/doom-ports/zdoom/default.nix
rename to pkgs/by-name/zd/zdoom/package.nix
diff --git a/pkgs/by-name/zi/zigbee2mqtt_2/package.nix b/pkgs/by-name/zi/zigbee2mqtt_2/package.nix
index b52d9615b64a..795565e78913 100644
--- a/pkgs/by-name/zi/zigbee2mqtt_2/package.nix
+++ b/pkgs/by-name/zi/zigbee2mqtt_2/package.nix
@@ -16,18 +16,18 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "zigbee2mqtt";
- version = "2.2.0";
+ version = "2.2.1";
src = fetchFromGitHub {
owner = "Koenkk";
repo = "zigbee2mqtt";
tag = finalAttrs.version;
- hash = "sha256-Tkfly1icG/T/szkziXABtG0tvvgq/evJ3qN7ShYtdAM=";
+ hash = "sha256-hct761D92PqgiXUtclk/X2ifySSSta7dgDQEibqPBaM=";
};
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
- hash = "sha256-uFFLXEByK9fpMQone7hodrQyAtRBc5Tk3u+Jtq0MkyA=";
+ hash = "sha256-0ophLiyTbdYEZcm4nO63OCRxENr5X2CXepHkfy1+QJM=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/zr/zrc/package.nix b/pkgs/by-name/zr/zrc/package.nix
new file mode 100644
index 000000000000..d28906026580
--- /dev/null
+++ b/pkgs/by-name/zr/zrc/package.nix
@@ -0,0 +1,36 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ bison,
+ flex,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "zrc";
+ version = "2.1";
+
+ src = fetchFromGitHub {
+ owner = "Edd12321";
+ repo = "zrc";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-prUbuXyhIJczCvjqwm9pp2n75LY10+6SzYaOHd+S748=";
+ };
+
+ nativeBuildInputs = [
+ bison
+ flex
+ ];
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ meta = {
+ description = "UNIX shell and scripting language with syntax similar to Tcl";
+ homepage = "https://github.com/Edd12321/zrc";
+ license = lib.licenses.bsd2;
+ maintainers = with lib.maintainers; [ fgaz ];
+ mainProgram = "zrc";
+ platforms = lib.platforms.all;
+ broken = stdenv.hostPlatform.isDarwin;
+ };
+})
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 6d0ea709e46e..4072c31dc296 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -55,6 +55,7 @@
pkgsBuildTarget,
pkgsHostHost,
pkgsTargetTarget,
+ __splices ? { },
# build customization
sourceVersion,
@@ -145,10 +146,28 @@ let
# When we override the interpreter we also need to override the spliced versions of the interpreter
# bluez is excluded manually to break an infinite recursion.
inputs' = lib.filterAttrs (n: v: n != "bluez" && n != "passthruFun" && !lib.isDerivation v) inputs;
+ # Memoization of the splices to avoid re-evaluating this function for all combinations of splices e.g.
+ # python3.pythonOnBuildForHost.pythonOnBuildForTarget == python3.pythonOnBuildForTarget by consuming
+ # __splices as an arg and using the cache if populated.
+ splices = {
+ pythonOnBuildForBuild = override pkgsBuildBuild.${pythonAttr};
+ pythonOnBuildForHost = override pkgsBuildHost.${pythonAttr};
+ pythonOnBuildForTarget = override pkgsBuildTarget.${pythonAttr};
+ pythonOnHostForHost = override pkgsHostHost.${pythonAttr};
+ pythonOnTargetForTarget = lib.optionalAttrs (lib.hasAttr pythonAttr pkgsTargetTarget) (
+ override pkgsTargetTarget.${pythonAttr}
+ );
+ } // __splices;
override =
attr:
let
- python = attr.override (inputs' // { self = python; });
+ python = attr.override (
+ inputs'
+ // {
+ self = python;
+ __splices = splices;
+ }
+ );
in
python;
in
@@ -160,13 +179,13 @@ let
pythonVersion = with sourceVersion; "${major}.${minor}";
sitePackages = "lib/${libPrefix}/site-packages";
inherit hasDistutilsCxxPatch pythonAttr;
- pythonOnBuildForBuild = override pkgsBuildBuild.${pythonAttr};
- pythonOnBuildForHost = override pkgsBuildHost.${pythonAttr};
- pythonOnBuildForTarget = override pkgsBuildTarget.${pythonAttr};
- pythonOnHostForHost = override pkgsHostHost.${pythonAttr};
- pythonOnTargetForTarget = lib.optionalAttrs (lib.hasAttr pythonAttr pkgsTargetTarget) (
- override pkgsTargetTarget.${pythonAttr}
- );
+ inherit (splices)
+ pythonOnBuildForBuild
+ pythonOnBuildForHost
+ pythonOnBuildForTarget
+ pythonOnHostForHost
+ pythonOnTargetForTarget
+ ;
};
version = with sourceVersion; "${major}.${minor}.${patch}${suffix}";
diff --git a/pkgs/development/interpreters/python/passthrufun.nix b/pkgs/development/interpreters/python/passthrufun.nix
index d4e20aa24fc9..be5d8a11add5 100644
--- a/pkgs/development/interpreters/python/passthrufun.nix
+++ b/pkgs/development/interpreters/python/passthrufun.nix
@@ -106,10 +106,6 @@ let
python = self;
}
);
- pythonOnBuildForHost_overridden = pythonOnBuildForHost.override {
- inherit packageOverrides;
- self = pythonOnBuildForHost_overridden;
- };
in
rec {
isPy27 = pythonVersion == "2.7";
@@ -144,7 +140,7 @@ rec {
pythonAtLeast = lib.versionAtLeast pythonVersion;
pythonOlder = lib.versionOlder pythonVersion;
inherit hasDistutilsCxxPatch;
- pythonOnBuildForHost = pythonOnBuildForHost_overridden;
+ inherit pythonOnBuildForHost;
tests = callPackage ./tests.nix {
python = self;
diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 8e533813fbe1..bd67e851476d 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
buildPythonPackage rec {
pname = "boto3-stubs";
- version = "1.37.26";
+ version = "1.37.27";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "boto3_stubs";
inherit version;
- hash = "sha256-GdIYvWcTsvcxbIauQAg6xVSL7RmFA8YM+YhqTQGJZeI=";
+ hash = "sha256-qzErE4igpVsgwKCnm+etOUux6ueK4TofCe8aE0Mwf3E=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index eb51061c0cb5..3dec178205d4 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "botocore-stubs";
- version = "1.37.26";
+ version = "1.37.27";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "botocore_stubs";
inherit version;
- hash = "sha256-EwXFEbYgeQgh36bosFKAXELob5jnwBe/isZQKuYqU1U=";
+ hash = "sha256-ezb+79/Sp0VwQNQ0MiJa3ws0xGMk9dECkbNPoVWHsSM=";
};
nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/canonical-sphinx-extensions/default.nix b/pkgs/development/python-modules/canonical-sphinx-extensions/default.nix
new file mode 100644
index 000000000000..1ad27acb2833
--- /dev/null
+++ b/pkgs/development/python-modules/canonical-sphinx-extensions/default.nix
@@ -0,0 +1,44 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchPypi,
+ setuptools,
+ beautifulsoup4,
+ docutils,
+ gitpython,
+ requests,
+ sphinx,
+}:
+
+buildPythonPackage rec {
+ pname = "canonical-sphinx-extensions";
+ version = "0.0.27";
+ pyproject = true;
+
+ src = fetchPypi {
+ pname = "canonical_sphinx_extensions";
+ inherit version;
+ hash = "sha256-ZorSmn+PAVS8xO7X3zk6u3W7pn3JB9w0PhFAXzv6l78=";
+ };
+
+ build-system = [
+ setuptools
+ ];
+
+ dependencies = [
+ beautifulsoup4
+ docutils
+ gitpython
+ requests
+ sphinx
+ ];
+
+ doCheck = false;
+
+ meta = {
+ description = "A collection of Sphinx extensions used by Canonical documentation";
+ homepage = "https://pypi.org/project/canonical-sphinx-extensions";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ ];
+ };
+}
diff --git a/pkgs/development/python-modules/ihm/default.nix b/pkgs/development/python-modules/ihm/default.nix
index 65d839375f15..902bdf44b985 100644
--- a/pkgs/development/python-modules/ihm/default.nix
+++ b/pkgs/development/python-modules/ihm/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "ihm";
- version = "2.3";
+ version = "2.4";
pyproject = true;
src = fetchFromGitHub {
owner = "ihmwg";
repo = "python-ihm";
tag = version;
- hash = "sha256-oznORD5iN0izC19NeHo1G1nORJQgiC4iZNlThHJyd/8=";
+ hash = "sha256-vlt1YDF8TiWOfql/pasHU1Q7N0EU1wz60yh3+KAVnvM=";
};
nativeBuildInputs = [ swig ];
diff --git a/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix
deleted file mode 100644
index a0ca4c328599..000000000000
--- a/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{
- lib,
- buildPythonPackage,
- fetchFromGitHub,
- langgraph-checkpoint,
- aiosqlite,
- duckdb,
- pytest-asyncio,
- pytestCheckHook,
- langgraph-sdk,
- poetry-core,
-}:
-
-buildPythonPackage rec {
- pname = "langgraph-checkpoint-duckdb";
- version = "2.0.2";
- pyproject = true;
-
- src = fetchFromGitHub {
- owner = "langchain-ai";
- repo = "langgraph";
- tag = "checkpointduckdb==${version}";
- hash = "sha256-ppgViNRkkCTOGPfdB04DOnEzFgHN1KGDLLVjuwhRgNE=";
- };
-
- sourceRoot = "${src.name}/libs/checkpoint-duckdb";
-
- build-system = [ poetry-core ];
-
- dependencies = [
- aiosqlite
- duckdb
- langgraph-checkpoint
- ];
-
- # Checkpoint clients are lagging behind langgraph-checkpoint
- pythonRelaxDeps = [ "langgraph-checkpoint" ];
-
- pythonImportsCheck = [ "langgraph.checkpoint.duckdb" ];
-
- nativeCheckInputs = [
- pytest-asyncio
- pytestCheckHook
- ];
-
- disabledTests = [ "test_basic_store_ops" ]; # depends on networking
-
- passthru = {
- inherit (langgraph-sdk) updateScript;
-
- skipBulkUpdate = true; # Broken, see https://github.com/NixOS/nixpkgs/issues/379898
- };
-
- meta = {
- changelog = "https://github.com/langchain-ai/langgraph/releases/tag/checkpointduckdb==${version}";
- description = "Library with a DuckDB implementation of LangGraph checkpoint saver";
- homepage = "https://github.com/langchain-ai/langgraph/tree/main/libs/checkpoint-duckdb";
- license = lib.licenses.mit;
- maintainers = with lib.maintainers; [
- drupol
- sarahec
- ];
- };
-}
diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix
index f99b92d1de14..855d854f3d8c 100644
--- a/pkgs/development/python-modules/langgraph/default.nix
+++ b/pkgs/development/python-modules/langgraph/default.nix
@@ -17,7 +17,6 @@
dataclasses-json,
grandalf,
httpx,
- langgraph-checkpoint-duckdb,
langgraph-checkpoint-postgres,
langgraph-checkpoint-sqlite,
langsmith,
@@ -142,7 +141,6 @@ buildPythonPackage rec {
dataclasses-json
grandalf
httpx
- langgraph-checkpoint-duckdb
langgraph-checkpoint-postgres
langgraph-checkpoint-sqlite
langsmith
diff --git a/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix b/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix
index 2bb5cb2c1644..a84bacb4a974 100644
--- a/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix
+++ b/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix
@@ -16,14 +16,14 @@
}:
buildPythonPackage rec {
pname = "mkdocs-awesome-nav";
- version = "3.0.0";
+ version = "3.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "lukasgeiter";
repo = "mkdocs-awesome-nav";
tag = "v${version}";
- hash = "sha256-EgHiphpMAL+1ZC+I8PxRHMk1gcyAgHcUm4eoVu67+Qc=";
+ hash = "sha256-UxqOaAXy5Sc41FYE3mSKDBpWWJ3g0YwkRkOeSXwqz7o=";
};
build-system = [ flit-core ];
@@ -57,7 +57,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Plugin for customizing the navigation structure of your MkDocs site";
homepage = "https://github.com/lukasgeiter/mkdocs-awesome-nav";
- changelog = "https://github.com/lukasgeiter/mkdocs-awesome-nav/blob/v${version}/CHANGELOG";
+ changelog = "https://github.com/lukasgeiter/mkdocs-awesome-nav/blob/${src.tag}/CHANGELOG";
license = licenses.mit;
maintainers = with maintainers; [ phaer ];
};
diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 5195b54bc1e5..5e6e21d41b90 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -206,8 +206,8 @@ rec {
"sha256-c7p/kch9H2Skn48ue8emfMkt5+mTmLZWEeuAuAhvX0w=";
mypy-boto3-chime-sdk-voice =
- buildMypyBoto3Package "chime-sdk-voice" "1.37.0"
- "sha256-FINgDMmIhMn5M/qVGE3rzZJZEU121rDXNQYa39veAYk=";
+ buildMypyBoto3Package "chime-sdk-voice" "1.37.27"
+ "sha256-j7HoSHz0ZBmVBruvlMNFfYMgGrYYvKSPVy/NoGXsE70=";
mypy-boto3-cleanrooms =
buildMypyBoto3Package "cleanrooms" "1.37.25"
@@ -970,8 +970,8 @@ rec {
"sha256-L+XFhueTb9fq32oyVVbysBMXgds1UlXryqRwiDOI+Io=";
mypy-boto3-opensearch =
- buildMypyBoto3Package "opensearch" "1.37.0"
- "sha256-i+EBCV4AIOaSam0MYrtnqD+BPvr5CraDzOownJ18VmI=";
+ buildMypyBoto3Package "opensearch" "1.37.27"
+ "sha256-I6WTuWXwC7c8LcRUTKn2VRNntm5DYmxnT8NEjha0LGA=";
mypy-boto3-opensearchserverless =
buildMypyBoto3Package "opensearchserverless" "1.37.0"
@@ -1134,8 +1134,8 @@ rec {
"sha256-axaTu4XmHGc3a/Uzs1/0IqLJdZFBfEQ9pzi42XW11y0=";
mypy-boto3-route53 =
- buildMypyBoto3Package "route53" "1.37.15"
- "sha256-sXSxaqe0kqx1ZCinJKI67ekBZW81RwoC1fSEDrlCDc4=";
+ buildMypyBoto3Package "route53" "1.37.27"
+ "sha256-9K+1O7X5Ey2xED7rFT5Qfv8XGAxzGYIdf2SGqb95KqE=";
mypy-boto3-route53-recovery-cluster =
buildMypyBoto3Package "route53-recovery-cluster" "1.37.0"
@@ -1174,8 +1174,8 @@ rec {
"sha256-c0vXkW5sR7JkdzvsS/rMFme9EwY1x5eZAbRWYKew0v4=";
mypy-boto3-sagemaker =
- buildMypyBoto3Package "sagemaker" "1.37.25"
- "sha256-HDTInC3myzlGgbJ/mSUmcSdoUuRxC0RP/D1BicDy0P8=";
+ buildMypyBoto3Package "sagemaker" "1.37.27"
+ "sha256-DgY+LFW6PzwYsFbJ7Fjs4fzlWe45ZEAa2zo1is87a8Y=";
mypy-boto3-sagemaker-a2i-runtime =
buildMypyBoto3Package "sagemaker-a2i-runtime" "1.37.0"
@@ -1254,8 +1254,8 @@ rec {
"sha256-hD2HVQKPSoNJ/t8VVOkaz+kVV3bF9DXLvYh6vG15GvM=";
mypy-boto3-sesv2 =
- buildMypyBoto3Package "sesv2" "1.37.24"
- "sha256-g0RNkpXVarw0EbB04cby6HLjCuyPwWEeN9pjI3/jL2U=";
+ buildMypyBoto3Package "sesv2" "1.37.27"
+ "sha256-rJ0eb2xRnLf0LO1DW7L955QcCBdE3LtWjsvDUN+HFi8=";
mypy-boto3-shield =
buildMypyBoto3Package "shield" "1.37.0"
@@ -1366,8 +1366,8 @@ rec {
"sha256-mGqJUJF826MADOYCDXwPNbk+x82zumHRb+cTazCEzAY=";
mypy-boto3-transcribe =
- buildMypyBoto3Package "transcribe" "1.37.5"
- "sha256-UonLSCWk8CUYjVBkxwbwxnR+NdQnsFTx11dZXIesDv0=";
+ buildMypyBoto3Package "transcribe" "1.37.27"
+ "sha256-UW0b40n+M8za5guDPxhU5cRvtbkqzX6G7M2UaxNq5ws=";
mypy-boto3-transfer =
buildMypyBoto3Package "transfer" "1.37.24"
diff --git a/pkgs/development/python-modules/pure-protobuf/default.nix b/pkgs/development/python-modules/pure-protobuf/default.nix
index 5b481b09f7d9..0ea2944d77d1 100644
--- a/pkgs/development/python-modules/pure-protobuf/default.nix
+++ b/pkgs/development/python-modules/pure-protobuf/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pure-protobuf";
- version = "3.1.3";
+ version = "3.1.4";
format = "pyproject";
# < 3.10 requires get-annotations which isn't packaged yet
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "eigenein";
repo = "protobuf";
tag = version;
- hash = "sha256-AsiJDi3SF3nlWKFvZujUsoHY8AJ21JKzEuTdR9FtFQI=";
+ hash = "sha256-k67AvY9go62BZN7kCg+kFo9+bQB3wGJVbLra5pOhkPU=";
};
build-system = [
@@ -49,7 +49,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python implementation of Protocol Buffers with dataclass-based schemas";
homepage = "https://github.com/eigenein/protobuf";
- changelog = "https://github.com/eigenein/protobuf/releases/tag/${version}";
+ changelog = "https://github.com/eigenein/protobuf/releases/tag/${src.tag}";
license = licenses.mit;
maintainers = with maintainers; [ chuangzhu ];
};
diff --git a/pkgs/development/python-modules/pyspelling/default.nix b/pkgs/development/python-modules/pyspelling/default.nix
new file mode 100644
index 000000000000..78b5871c07b1
--- /dev/null
+++ b/pkgs/development/python-modules/pyspelling/default.nix
@@ -0,0 +1,49 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchPypi,
+ hatchling,
+ beautifulsoup4,
+ html5lib,
+ lxml,
+ markdown,
+ pyyaml,
+ soupsieve,
+ wcmatch,
+}:
+
+buildPythonPackage rec {
+ pname = "pyspelling";
+ version = "2.10";
+ pyproject = true;
+
+ src = fetchPypi {
+ inherit pname version;
+ hash = "sha256-rNZxM8G3zs1BDj1EieYfLksfC2rPGubEjCQPuyFynDc=";
+ };
+
+ build-system = [
+ hatchling
+ ];
+
+ dependencies = [
+ beautifulsoup4
+ html5lib
+ lxml
+ markdown
+ pyyaml
+ soupsieve
+ wcmatch
+ ];
+
+ pythonImportsCheck = [
+ "pyspelling"
+ ];
+
+ meta = {
+ description = "Spell checker";
+ homepage = "https://pypi.org/project/pyspelling";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ ];
+ };
+}
diff --git a/pkgs/development/python-modules/sphinx-remove-toctrees/default.nix b/pkgs/development/python-modules/sphinx-remove-toctrees/default.nix
new file mode 100644
index 000000000000..7f381ff997bd
--- /dev/null
+++ b/pkgs/development/python-modules/sphinx-remove-toctrees/default.nix
@@ -0,0 +1,60 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchPypi,
+ hatchling,
+ sphinx,
+ pre-commit,
+ ipython,
+ myst-parser,
+ sphinx-book-theme,
+ pytest,
+}:
+
+buildPythonPackage rec {
+ pname = "sphinx-remove-toctrees";
+ version = "1.0.0.post1";
+ pyproject = true;
+
+ src = fetchPypi {
+ pname = "sphinx_remove_toctrees";
+ inherit version;
+ hash = "sha256-SAjR7fFRwG7/bSw5Iux+vJ/Tqhdi3hsuFnSjf1rJzi0=";
+ };
+
+ build-system = [
+ hatchling
+ ];
+
+ dependencies = [
+ sphinx
+ ];
+
+ optional-dependencies = {
+ code_style = [
+ pre-commit
+ ];
+ docs = [
+ ipython
+ myst-parser
+ sphinx-book-theme
+ ];
+ tests = [
+ ipython
+ myst-parser
+ pytest
+ sphinx-book-theme
+ ];
+ };
+
+ pythonImportsCheck = [
+ "sphinx_remove_toctrees"
+ ];
+
+ meta = {
+ description = "Reduce your documentation build size by selectively removing toctrees from pages";
+ homepage = "https://pypi.org/project/sphinx-remove-toctrees/";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ ];
+ };
+}
diff --git a/pkgs/development/python-modules/sphinx-reredirects/default.nix b/pkgs/development/python-modules/sphinx-reredirects/default.nix
new file mode 100644
index 000000000000..8fc57ab6d1f0
--- /dev/null
+++ b/pkgs/development/python-modules/sphinx-reredirects/default.nix
@@ -0,0 +1,41 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchPypi,
+ setuptools,
+ sphinx,
+}:
+
+buildPythonPackage rec {
+ pname = "sphinx-reredirects";
+ version = "0.1.6";
+ pyproject = true;
+
+ src = fetchPypi {
+ pname = "sphinx_reredirects";
+ inherit version;
+ hash = "sha256-xJHLpUX2e+lpdQhyeBjYYmYmNmJFrmRFb+KfN+m76mQ=";
+ };
+
+ build-system = [
+ setuptools
+ ];
+
+ dependencies = [
+ sphinx
+ ];
+
+ pythonImportsCheck = [
+ "sphinx_reredirects"
+ ];
+
+ meta = {
+ description = "Handles redirects for moved pages in Sphinx documentation projects";
+ homepage = "https://pypi.org/project/sphinx-reredirects";
+ license = with lib.licenses; [
+ bsd3
+ mit
+ ];
+ maintainers = with lib.maintainers; [ ];
+ };
+}
diff --git a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix
index e51f7d067f52..c17d6d1507b9 100644
--- a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix
+++ b/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix
@@ -6,22 +6,23 @@
callPackage ../generic.nix rec {
pname = "tower-pixel-dungeon";
- version = "0.3.2";
+ version = "0.5.4";
src = fetchFromGitHub {
owner = "FixAkaTheFix";
repo = "Tower-Pixel-Dungeon";
- rev = "TPDv${lib.replaceStrings [ "." ] [ "" ] version}";
- hash = "sha256-ZyqrrSuA++L7FOUj6Ytk2lld0YMY4B7WOCzpohOKhdU=";
+ tag = "TPDv${lib.replaceStrings [ "." ] [ "" ] version}";
+ hash = "sha256-6b7EC7rye7nSevMJhRwSKJU7zuzta6KUCgzizWPFk8I=";
};
sourceRoot = src.name + "/pixel-towers-master";
desktopName = "Tower Pixel Dungeon";
- # Sprite sources (Paint.NET files) interfere with the build process.
+ # Sprite sources (Paint.NET files) and other files interfere with the build process.
postPatch = ''
rm core/src/main/assets/{levelsplashes,sprites}/*.pdn
+ rm core/src/main/assets/environment/*.lnk
'';
meta = {
diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix
index 2e23c9c9e049..6f819fb734ef 100644
--- a/pkgs/tools/package-management/lix/common-lix.nix
+++ b/pkgs/tools/package-management/lix/common-lix.nix
@@ -3,11 +3,22 @@
suffix ? "",
version,
src,
- docCargoDeps,
+ # For Lix versions >= 2.92, Rust sources are in the Lix repository root.
+ cargoDeps ? null,
+ # For previous versions, Rust sources are only in a subdirectory for
+ # `lix-doc`.
+ docCargoDeps ? null,
patches ? [ ],
maintainers ? lib.teams.lix.members,
}@args:
+assert lib.assertMsg (
+ lib.versionOlder version "2.92" -> docCargoDeps != null
+) "`lix-doc` `cargoDeps` must be set for Lix < 2.92";
+assert lib.assertMsg (
+ lib.versionAtLeast version "2.92" -> cargoDeps != null
+) "`cargoDeps` must be set for Lix ≥ 2.92";
+
{
stdenv,
meson,
@@ -18,6 +29,8 @@
busybox-sandbox-shell,
bzip2,
callPackage,
+ capnproto,
+ cargo,
curl,
cmake,
doxygen,
@@ -30,6 +43,7 @@
libarchive,
libcpuid,
libsodium,
+ llvmPackages,
lowdown,
lowdown-unsandboxed,
lsof,
@@ -39,6 +53,7 @@
nlohmann_json,
ninja,
openssl,
+ rustc,
toml11,
pegtl,
python3,
@@ -47,8 +62,11 @@
Security,
sqlite,
util-linuxMinimal,
+ removeReferencesTo,
xz,
nixosTests,
+ rustPlatform,
+ # Only used for versions before 2.92.
lix-doc ? callPackage ./doc {
inherit src;
version = "${version}${suffix}";
@@ -57,6 +75,7 @@
enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform,
enableStatic ? stdenv.hostPlatform.isStatic,
+ enableStrictLLVMChecks ? true,
withAWS ? !enableStatic && (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin),
aws-sdk-cpp,
# RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50
@@ -67,11 +86,16 @@
stateDir,
storeDir,
}:
-
let
+ isLLVMOnly = lib.versionAtLeast version "2.92";
+ hasExternalLixDoc = lib.versionOlder version "2.92";
isLegacyParser = lib.versionOlder version "2.91";
in
-stdenv.mkDerivation {
+# gcc miscompiles coroutines at least until 13.2, possibly longer
+# do not remove this check unless you are sure you (or your users) will not report bugs to Lix upstream about GCC miscompilations.
+assert lib.assertMsg (enableStrictLLVMChecks && isLLVMOnly -> stdenv.cc.isClang)
+ "Lix upstream strongly discourage the usage of GCC to compile Lix as there's known miscompilations in important places. If you are a compiler developer, please get in touch with us.";
+stdenv.mkDerivation (finalAttrs: {
pname = "lix";
version = "${version}${suffix}";
@@ -91,9 +115,24 @@ stdenv.mkDerivation {
];
strictDeps = true;
+ disallowedReferences = lib.optionals isLLVMOnly [
+ # We don't want the Clang.
+ stdenv.cc.cc
+ # We don't want the underlying GCC neither!
+ stdenv.cc.cc.stdenv.cc.cc
+ ];
+
+ # We only include CMake so that Meson can locate toml11, which only ships CMake dependency metadata.
+ dontUseCmakeConfigure = true;
nativeBuildInputs =
[
+ # python3.withPackages does not splice properly, see https://github.com/NixOS/nixpkgs/issues/305858
+ (python3.pythonOnBuildForHost.withPackages (p: [
+ p.pytest
+ p.pytest-xdist
+ p.python-frontmatter
+ ]))
pkg-config
flex
jq
@@ -101,6 +140,8 @@ stdenv.mkDerivation {
ninja
cmake
python3
+ # Required for libstd++ assertions that leaks inside of the final binary.
+ removeReferencesTo
# Tests
git
@@ -108,6 +149,11 @@ stdenv.mkDerivation {
jq
lsof
]
+ ++ lib.optionals isLLVMOnly [
+ rustc
+ cargo
+ rustPlatform.cargoSetupHook
+ ]
++ lib.optionals isLegacyParser [ bison ]
++ lib.optionals enableDocumentation [
(lib.getBin lowdown-unsandboxed)
@@ -123,6 +169,7 @@ stdenv.mkDerivation {
brotli
bzip2
curl
+ capnproto
editline
libsodium
openssl
@@ -133,14 +180,31 @@ stdenv.mkDerivation {
lowdown
rapidcheck
toml11
- lix-doc
]
+ ++ lib.optionals hasExternalLixDoc [ lix-doc ]
++ lib.optionals (!isLegacyParser) [ pegtl ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]
+ # NOTE(Raito): I'd have expected that the LLVM packaging would inject the
+ # libunwind library path directly in the wrappers, but it does inject
+ # -lunwind without injecting the library path...
+ ++ lib.optionals stdenv.hostPlatform.isStatic [ llvmPackages.libunwind ]
++ lib.optionals (stdenv.hostPlatform.isx86_64) [ libcpuid ]
++ lib.optionals withLibseccomp [ libseccomp ]
++ lib.optionals withAWS [ aws-sdk-cpp ];
+ inherit cargoDeps;
+
+ env = {
+ # Meson allows referencing a /usr/share/cargo/registry shaped thing for subproject sources.
+ # Turns out the Nix-generated Cargo dependencies are named the same as they
+ # would be in a Cargo registry cache.
+ MESON_PACKAGE_CACHE_DIR =
+ if finalAttrs.cargoDeps != null then
+ finalAttrs.cargoDeps
+ else
+ "lix: no `MESON_PACKAGE_CACHE_DIR`, set `cargoDeps`";
+ };
+
propagatedBuildInputs = [
boehmgc
nlohmann_json
@@ -179,8 +243,9 @@ stdenv.mkDerivation {
mesonFlags =
[
# Enable LTO, since it improves eval performance a fair amount
- # LTO is disabled on static due to strange linking errors
- (lib.mesonBool "b_lto" (!stdenv.hostPlatform.isStatic && stdenv.cc.isGNU))
+ # LTO is disabled on:
+ # - static builds (strange linkage errors)
+ (lib.mesonBool "b_lto" (!stdenv.hostPlatform.isStatic && (isLLVMOnly || stdenv.cc.isGNU)))
(lib.mesonEnable "gc" true)
(lib.mesonBool "enable-tests" true)
(lib.mesonBool "enable-docs" enableDocumentation)
@@ -208,6 +273,11 @@ stdenv.mkDerivation {
mkdir -p $devdoc/nix-support
echo "devdoc internal-api $devdoc/share/doc/nix/internal-api" >> $devdoc/nix-support/hydra-build-products
''
+ + lib.optionalString (!hasExternalLixDoc) ''
+ # We do not need static archives.
+ # FIXME(Raito): why are they getting installed _at all_ ?
+ rm $out/lib/liblix_doc.a
+ ''
+ lib.optionalString stdenv.hostPlatform.isStatic ''
mkdir -p $out/nix-support
echo "file binary-dist $out/bin/nix" >> $out/nix-support/hydra-build-products
@@ -219,6 +289,10 @@ stdenv.mkDerivation {
"$out/lib/libboost_context.dylib" \
"$out/lib/$lib"
done
+ ''
+ + ''
+ # Drop all references to libstd++ include files due to `__FILE__` leaking in libstd++ assertions.
+ find "$out" -type f -exec remove-references-to -t ${stdenv.cc.cc.stdenv.cc.cc} '{}' +
'';
# This needs to run after _multioutDocs moves the docs to $doc
@@ -277,6 +351,7 @@ stdenv.mkDerivation {
inherit aws-sdk-cpp boehmgc;
tests = {
misc = nixosTests.nix-misc.lix;
+ installer = nixosTests.installer.lix-simple;
};
};
@@ -299,4 +374,4 @@ stdenv.mkDerivation {
outputsToInstall = [ "out" ] ++ lib.optional enableDocumentation "man";
mainProgram = "nix";
};
-}
+})
diff --git a/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix b/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix
index f80353d1754f..d3be7a626d97 100644
--- a/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix
+++ b/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix
@@ -17,7 +17,7 @@
pkg-config,
ninja,
cmake,
- clang-tools,
+ buildPackages,
}:
stdenv.mkDerivation {
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
ninja
# nlohmann_json can be only discovered via cmake files
cmake
- ] ++ (lib.optional stdenv.cc.isClang [ clang-tools ]);
+ ] ++ (lib.optional stdenv.cc.isClang [ buildPackages.clang-tools ]);
# point 'nix edit' and ofborg at the file that defines the attribute,
# not this common file.
@@ -52,5 +52,6 @@ stdenv.mkDerivation {
license = lib.licenses.gpl3;
inherit maintainers;
platforms = lib.platforms.unix;
+ broken = stdenv.hostPlatform.isStatic;
};
}
diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index d6b44473fd9c..21834a5299c3 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -8,6 +8,10 @@
rustPlatform,
Security,
newScope,
+ editline,
+ ncurses,
+ stdenv,
+ clangStdenv,
storeDir ? "/nix/store",
stateDir ? "/nix/var",
@@ -19,6 +23,10 @@ let
lix-args,
nix-eval-jobs-args,
}:
+ let
+ # GCC 13.2 is known to miscompile Lix coroutines (introduced in 2.92).
+ lixStdenv = if lib.versionAtLeast lix-args.version "2.92" then clangStdenv else stdenv;
+ in
lib.makeScope newScope (
self:
lib.recurseIntoAttrs {
@@ -58,6 +66,11 @@ let
requiredSystemFeatures = [ ];
};
+ editline = editline.override {
+ inherit ncurses;
+ enableTermcap = true;
+ };
+
# NOTE: The `common-*.nix` helpers contain a top-level function which
# takes the Lix source to build and version information. We use the
# outer `callPackage` for that.
@@ -65,12 +78,15 @@ let
# That *returns* another function which takes the actual build
# dependencies, and that uses the new scope's `self.callPackage` so
# that `nix-eval-jobs` can be built against the correct `lix` version.
- lix = self.callPackage (callPackage ./common-lix.nix lix-args) { };
+ lix = self.callPackage (callPackage ./common-lix.nix lix-args) {
+ stdenv = lixStdenv;
+ };
- nix-eval-jobs = self.callPackage (callPackage ./common-nix-eval-jobs.nix nix-eval-jobs-args) { };
+ nix-eval-jobs = self.callPackage (callPackage ./common-nix-eval-jobs.nix nix-eval-jobs-args) {
+ stdenv = lixStdenv;
+ };
}
);
-
in
lib.makeExtensible (self: {
inherit makeLixScope;
@@ -135,7 +151,39 @@ lib.makeExtensible (self: {
};
};
- latest = self.lix_2_91;
+ lix_2_92 = self.makeLixScope {
+ lix-args = rec {
+ version = "2.92.0";
+
+ src = fetchFromGitHub {
+ owner = "lix-project";
+ repo = "lix";
+ rev = version;
+ hash = "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=";
+ };
+
+ cargoDeps = rustPlatform.fetchCargoVendor {
+ name = "lix-${version}";
+ inherit src;
+ allowGitDependencies = false;
+ hash = "sha256-YMyNOXdlx0I30SkcmdW/6DU0BYc3ZOa2FMJSKMkr7I8=";
+ };
+ };
+
+ nix-eval-jobs-args = rec {
+ version = "2.92.0";
+ src = fetchgit {
+ url = "https://git.lix.systems/lix-project/nix-eval-jobs.git";
+ rev = version;
+ hash = "sha256-tPr61X9v/OMVt7VXOs1RRStciwN8gDGxEKx+h0/Fg48=";
+ };
+ };
+ };
+
+ latest = self.lix_2_92;
+
+ # Note: This is not yet 2.92 because of a non-deterministic `curl` error.
+ # See: https://git.lix.systems/lix-project/lix/issues/662
stable = self.lix_2_91;
# Previously, `nix-eval-jobs` was not packaged here, so we export an
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 042b02d713a4..6010ea721ff8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -580,6 +580,8 @@ mapAliases {
erlangR26_javac = throw "erlangR26_javac has been removed in favor of erlang_26_javac"; # added 2024-05-24
erlangR26_odbc_javac = throw "erlangR26_odbc_javac has been removed in favor of erlang_26_odbc_javac"; # added 2024-05-24
+ erlang_language_platform = throw "erlang_language_platform has been renamed erlang-language-platform"; # added 2025-04-04
+
ethabi = throw "ethabi has been removed due to lack of maintainence upstream and no updates in Nixpkgs"; # Added 2024-07-16
eww-wayland = lib.warnOnInstantiate "eww now can build for X11 and wayland simultaneously, so `eww-wayland` is deprecated, use the normal `eww` package instead." eww;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec66dd6bc01d..b2ed9d41c624 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2627,10 +2627,6 @@ with pkgs;
throw "mesonEmulatorHook may only be added to nativeBuildInputs when the target binaries can't be executed; however you are attempting to use it in a situation where ${stdenv.hostPlatform.config} can execute ${stdenv.targetPlatform.config}. Consider only adding mesonEmulatorHook according to a conditional based canExecute in your package expression."
);
- metabase = callPackage ../servers/metabase {
- jdk11 = jdk11_headless;
- };
-
mkspiffs = callPackage ../tools/filesystems/mkspiffs { };
mkspiffs-presets = recurseIntoAttrs (callPackages ../tools/filesystems/mkspiffs/presets.nix { });
@@ -7428,8 +7424,6 @@ with pkgs;
# 28 is pre-release
beamMinimal28Packages = dontRecurseIntoAttrs beam_minimal.packages.erlang_28.beamPackages;
- erlang_language_platform = callPackage ../by-name/er/erlang-language-platform/package.nix { };
-
gnudatalanguage = callPackage ../development/interpreters/gnudatalanguage {
inherit (llvmPackages) openmp;
inherit (darwin.apple_sdk.frameworks) Cocoa;
@@ -15592,8 +15586,6 @@ with pkgs;
roxctl = callPackage ../applications/networking/cluster/roxctl {
};
- rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { };
-
scx = recurseIntoAttrs (callPackage ../os-specific/linux/scx { });
shogun = callPackage ../applications/science/machine-learning/shogun {
@@ -17221,12 +17213,6 @@ with pkgs;
fmodex = callPackage ../games/doom-ports/zandronum/fmod.nix { };
- doom-bcc = callPackage ../games/doom-ports/zdoom/bcc-git.nix { };
-
- zdbsp = callPackage ../games/doom-ports/zdoom/zdbsp.nix { };
-
- zdoom = callPackage ../games/doom-ports/zdoom { };
-
pro-office-calculator = libsForQt5.callPackage ../games/pro-office-calculator { };
qgo = libsForQt5.callPackage ../games/qgo { };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index cd9be2d154a9..3a5ad71b68a9 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -372,6 +372,7 @@ mapAliases ({
lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04
langchain-standard-tests = langchain-tests; # added 2025-01-22
langchainplus-sdk = langsmith; # added 2023-08-01
+ langgraph-checkpoint-duckdb = throw "langgraph-checkpoint-duckdb has been removed as of langgraph 0.2.63"; # added 2025-04-04
lazr_config = lazr-config; # added 2023-11-03
lazr_delegates = lazr-delegates; # added 2023-11-03
lazy_import = lazy-import; # added 2024-01-07
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 344f93c65830..900605acde9c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2194,6 +2194,10 @@ self: super: with self; {
canmatrix = callPackage ../development/python-modules/canmatrix { };
+ canonical-sphinx-extensions =
+ callPackage ../development/python-modules/canonical-sphinx-extensions
+ { };
+
canonicaljson = callPackage ../development/python-modules/canonicaljson { };
canopen = callPackage ../development/python-modules/canopen { };
@@ -7460,10 +7464,6 @@ self: super: with self; {
langgraph-checkpoint = callPackage ../development/python-modules/langgraph-checkpoint { };
- langgraph-checkpoint-duckdb =
- callPackage ../development/python-modules/langgraph-checkpoint-duckdb
- { };
-
langgraph-checkpoint-postgres =
callPackage ../development/python-modules/langgraph-checkpoint-postgres
{ };
@@ -13331,6 +13331,8 @@ self: super: with self; {
pyspellchecker = callPackage ../development/python-modules/pyspellchecker { };
+ pyspelling = callPackage ../development/python-modules/pyspelling { };
+
pyspf = callPackage ../development/python-modules/pyspf { };
pyspice = callPackage ../development/python-modules/pyspice { };
@@ -16180,6 +16182,10 @@ self: super: with self; {
sphinx-pytest = callPackage ../development/python-modules/sphinx-pytest { };
+ sphinx-reredirects = callPackage ../development/python-modules/sphinx-reredirects { };
+
+ sphinx-remove-toctrees = callPackage ../development/python-modules/sphinx-remove-toctrees { };
+
sphinx-rtd-dark-mode = callPackage ../development/python-modules/sphinx-rtd-dark-mode { };
sphinx-rtd-theme = callPackage ../development/python-modules/sphinx-rtd-theme { };