Merge master into staging-nixos
This commit is contained in:
@@ -24644,6 +24644,7 @@
|
||||
name = "Greg Pfeil";
|
||||
};
|
||||
sempiternal-aurora = {
|
||||
email = "myrialsarvay@gmail.com";
|
||||
github = "sempiternal-aurora";
|
||||
githubId = 78790545;
|
||||
name = "Myria Sarvay";
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
|
||||
buildPythonApplication,
|
||||
colorama,
|
||||
@@ -59,6 +60,8 @@ buildPythonApplication {
|
||||
socat
|
||||
util-linux
|
||||
vde2
|
||||
]
|
||||
++ lib.optionals stdenv.isLinux [
|
||||
vhost-device-vsock
|
||||
]
|
||||
++ lib.optionals enableNspawn [
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
hostPkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
@@ -75,9 +75,9 @@ in
|
||||
) (lib.attrValues config.nodes ++ lib.attrValues config.containers)
|
||||
);
|
||||
global_timeout = config.globalTimeout;
|
||||
test_script = pkgs.writeText "test-script" config.testScriptString;
|
||||
test_script = hostPkgs.writeText "test-script" config.testScriptString;
|
||||
enable_ssh_backdoor = config.sshBackdoor.enable;
|
||||
};
|
||||
driverConfigurationFile = pkgs.writers.writeJSON "driverConfiguration.json" config.driverConfiguration;
|
||||
driverConfigurationFile = hostPkgs.writers.writeJSON "driverConfiguration.json" config.driverConfiguration;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,6 +9,8 @@ let
|
||||
|
||||
inherit (config) sshBackdoor;
|
||||
|
||||
inherit (hostPkgs.stdenv.hostPlatform) isLinux;
|
||||
|
||||
# Reifies and correctly wraps the python test driver for
|
||||
# the respective qemu version and with or without ocr support
|
||||
testDriver = config.pythonTestDriverPackage.override {
|
||||
@@ -251,7 +253,7 @@ in
|
||||
# depending on whether debugging is enabled.
|
||||
#
|
||||
# If needed, this can still be turned off.
|
||||
virtualisation.qemu.enableSharedMemory = lib.mkDefault true;
|
||||
virtualisation.qemu.enableSharedMemory = lib.mkDefault isLinux;
|
||||
|
||||
assertions = [
|
||||
{
|
||||
|
||||
@@ -112,6 +112,8 @@ in
|
||||
systemd.services.thelounge = {
|
||||
description = "The Lounge web IRC client";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network-online.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
preStart = "ln -sf ${pkgs.writeText "config.js" configJsData} ${dataDir}/config.js";
|
||||
environment.THELOUNGE_PACKAGES = mkIf (cfg.plugins != [ ]) "${plugins}";
|
||||
serviceConfig = {
|
||||
|
||||
@@ -25,50 +25,28 @@ let
|
||||
text = cfg.extraConfig;
|
||||
};
|
||||
|
||||
baseLoginOptions = "-p -- \\u";
|
||||
baseLoginOptions = "-p";
|
||||
|
||||
agettyCmd =
|
||||
loginCmd =
|
||||
enableAutologin:
|
||||
"${lib.getExe' pkgs.util-linux "agetty"} ${
|
||||
lib.escapeShellArgs (
|
||||
[
|
||||
"--login-program"
|
||||
(toString gettyCfg.loginProgram)
|
||||
"--login-options"
|
||||
# these options are passed as a single parameter
|
||||
"${lib.optionalString enableAutologin "-f "}${baseLoginOptions}"
|
||||
]
|
||||
++ lib.optionals enableAutologin [
|
||||
"--autologin"
|
||||
gettyCfg.autologinUser
|
||||
]
|
||||
++ gettyCfg.extraArgs
|
||||
++ [
|
||||
"--8bits"
|
||||
"--noclear"
|
||||
"--"
|
||||
"-"
|
||||
]
|
||||
)
|
||||
} $TERM";
|
||||
"${gettyCfg.loginProgram} ${baseLoginOptions}${lib.optionalString enableAutologin " -f -- ${gettyCfg.autologinUser}"}";
|
||||
|
||||
loginScript = pkgs.writers.writeDash "kmscon-login" ''
|
||||
kms_tty=
|
||||
active_tty_file=/sys/class/tty/tty0/active
|
||||
if [ -f "$active_tty_file" ]; then
|
||||
read -r kms_tty < "$active_tty_file"
|
||||
fi
|
||||
loginScript = pkgs.writers.writeDash "kmscon-login" (
|
||||
lib.optionalString (gettyCfg.autologinUser != null && gettyCfg.autologinOnce) ''
|
||||
kms_tty=
|
||||
active_tty_file=/sys/class/tty/tty0/active
|
||||
if [ -f "$active_tty_file" ]; then
|
||||
read -r kms_tty < "$active_tty_file"
|
||||
fi
|
||||
|
||||
${lib.optionalString (gettyCfg.autologinUser != null && gettyCfg.autologinOnce) ''
|
||||
autologged="/run/kmscon.autologged"
|
||||
if [ "$kms_tty" = tty1 ] && [ ! -f "$autologged" ]; then
|
||||
touch "$autologged"
|
||||
exec ${agettyCmd true}
|
||||
exec ${loginCmd true}
|
||||
fi
|
||||
''}
|
||||
|
||||
exec ${agettyCmd (gettyCfg.autologinUser != null && !gettyCfg.autologinOnce)}
|
||||
'';
|
||||
''
|
||||
+ "exec ${loginCmd (gettyCfg.autologinUser != null && !gettyCfg.autologinOnce)}"
|
||||
);
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
@@ -182,32 +160,28 @@ in
|
||||
|
||||
systemd.suppressedSystemUnits = [ "getty@.service" ];
|
||||
|
||||
services.kmscon.extraConfig =
|
||||
let
|
||||
xkb = optionals cfg.useXkbConfig (
|
||||
lib.mapAttrsToList (n: v: "xkb-${n}=${v}") (
|
||||
lib.filterAttrs (
|
||||
n: v:
|
||||
builtins.elem n [
|
||||
"layout"
|
||||
"model"
|
||||
"options"
|
||||
"variant"
|
||||
]
|
||||
&& v != ""
|
||||
) config.services.xserver.xkb
|
||||
)
|
||||
);
|
||||
render = optionals cfg.hwRender [
|
||||
"drm"
|
||||
"hwaccel"
|
||||
];
|
||||
fonts =
|
||||
optional (cfg.fonts != null)
|
||||
"font-name=${lib.concatMapStringsSep ", " (f: f.name) cfg.fonts}";
|
||||
term = optional (cfg.term != null) "term=${cfg.term}";
|
||||
in
|
||||
lib.concatLines (xkb ++ render ++ fonts ++ term);
|
||||
services.kmscon.extraConfig = lib.concatLines (
|
||||
optionals cfg.useXkbConfig (
|
||||
lib.mapAttrsToList (n: v: "xkb-${n}=${v}") (
|
||||
lib.filterAttrs (
|
||||
n: v:
|
||||
builtins.elem n [
|
||||
"layout"
|
||||
"model"
|
||||
"options"
|
||||
"variant"
|
||||
]
|
||||
&& v != ""
|
||||
) config.services.xserver.xkb
|
||||
)
|
||||
)
|
||||
++ optionals cfg.hwRender [
|
||||
"drm"
|
||||
"hwaccel"
|
||||
]
|
||||
++ optional (cfg.fonts != null) "font-name=${lib.concatMapStringsSep ", " (f: f.name) cfg.fonts}"
|
||||
++ optional (cfg.term != null) "term=${cfg.term}"
|
||||
);
|
||||
|
||||
hardware.graphics.enable = mkIf cfg.hwRender true;
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
enableOCR = true;
|
||||
|
||||
testScript = ''
|
||||
machine.start()
|
||||
machine.wait_for_unit("default.target")
|
||||
|
||||
with subtest("ensure we can open a tty"):
|
||||
machine.wait_for_text("alice@machine")
|
||||
|
||||
@@ -111,6 +111,11 @@ in
|
||||
rev = "emacs-30.2";
|
||||
hash = "sha256-W2eZ+cNQhi/fMeRkwOqSKU7Vzvp43WUOpiwaLLNEXtg=";
|
||||
patches = fetchpatch: [
|
||||
(fetchpatch {
|
||||
name = "fix-off-by-one-mistake-80851-CVE-2026-6861.patch";
|
||||
url = "https://cgit.git.savannah.gnu.org/cgit/emacs.git/patch/?id=8f535370b9efbc91673b20c6987a5cae4f6dc562";
|
||||
hash = "sha256-ny44eIi8DUa9pQhVGzhGz4H6FXU4+ki86SITLXhkwpw=";
|
||||
})
|
||||
(builtins.path {
|
||||
name = "inhibit-lexical-cookie-warning-67916.patch";
|
||||
path = ./inhibit-lexical-cookie-warning-67916-30.patch;
|
||||
@@ -127,5 +132,12 @@ in
|
||||
variant = "macport";
|
||||
rev = "emacs-mac-30.2";
|
||||
hash = "sha256-i/W2Xa6Vk1+T1fs6fa4wJVMLLB6BK8QAPcdmPrU8NwM=";
|
||||
patches = fetchpatch: [
|
||||
(fetchpatch {
|
||||
name = "fix-off-by-one-mistake-80851-CVE-2026-6861.patch";
|
||||
url = "https://cgit.git.savannah.gnu.org/cgit/emacs.git/patch/?id=8f535370b9efbc91673b20c6987a5cae4f6dc562";
|
||||
hash = "sha256-ny44eIi8DUa9pQhVGzhGz4H6FXU4+ki86SITLXhkwpw=";
|
||||
})
|
||||
];
|
||||
});
|
||||
}
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mednafen-psx" + lib.optionalString withHw "-hw";
|
||||
version = "0-unstable-2026-04-10";
|
||||
version = "0-unstable-2026-04-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "beetle-psx-libretro";
|
||||
rev = "4fdfd541e5dce6f08883883dd27289545825e0b4";
|
||||
hash = "sha256-DtZIi9BRrskfHFLt/UqfZBJp96QmgqGgroxyF7UTRLU=";
|
||||
rev = "48f2ceb50392a9c142f10312ba4461e60c6b91ff";
|
||||
hash = "sha256-lrrmGAnBNXU871GGDhQfRSVrYv/jebaUKtyMeyWm7GY=";
|
||||
};
|
||||
|
||||
extraBuildInputs = lib.optionals withHw [
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "freeintv";
|
||||
version = "0-unstable-2026-03-31";
|
||||
version = "0-unstable-2026-04-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "freeintv";
|
||||
rev = "9b66d2b3c3406659b2fdfaade7a80f3e62772815";
|
||||
hash = "sha256-rJatbYyrS9vkGT8+jty80rPkcGGCV9enW5L40NeFwlE=";
|
||||
rev = "428915baf2bfc032fc03e645f4f8f9c6c3144979";
|
||||
hash = "sha256-S8sGHS56fQaSuoUllupYdieSLFzsUE3tmM7DUssA+NY=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -86,6 +86,8 @@ let
|
||||
targetRunFlags ? [ ],
|
||||
}:
|
||||
lib.optionalString (targets != [ ]) ''
|
||||
concatTo bazelFlagsArray bazelFlags
|
||||
|
||||
# See footnote called [USER and BAZEL_USE_CPP_ONLY_TOOLCHAIN variables]
|
||||
BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \
|
||||
USER=homeless-shelter \
|
||||
@@ -99,7 +101,7 @@ let
|
||||
"''${host_copts[@]}" \
|
||||
"''${linkopts[@]}" \
|
||||
"''${host_linkopts[@]}" \
|
||||
$bazelFlags \
|
||||
"''${bazelFlagsArray[@]}" \
|
||||
${lib.strings.concatStringsSep " " additionalFlags} \
|
||||
${lib.strings.concatStringsSep " " targets} \
|
||||
${
|
||||
@@ -239,13 +241,24 @@ stdenv.mkDerivation (
|
||||
);
|
||||
|
||||
dontFixup = true;
|
||||
allowedRequisites = [ ];
|
||||
|
||||
inherit (lib.fetchers.normalizeHash { hashTypes = [ "sha256" ]; } fetchAttrs)
|
||||
outputHash
|
||||
outputHashAlgo
|
||||
;
|
||||
}
|
||||
// (
|
||||
if fFetchAttrs.__structuredAttrs or false then
|
||||
{
|
||||
# With __structuredAttrs = true, the build always fails with “output $out is not allowed to refer to the following paths: $out”.
|
||||
# This appears to be the same issue as in 283bca9648fc1afb01d3e4c3b5919251429da907.
|
||||
outputChecks.out.allowedRequisites = [ "out" ];
|
||||
}
|
||||
else
|
||||
{
|
||||
allowedRequisites = [ ];
|
||||
}
|
||||
)
|
||||
);
|
||||
|
||||
nativeBuildInputs = fBuildAttrs.nativeBuildInputs or [ ] ++ [
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "agate";
|
||||
version = "3.3.21";
|
||||
version = "3.3.22";
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -22,10 +22,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "mbrubeck";
|
||||
repo = "agate";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-eOeLbc7jlJ4OHY+Gce7JR4VaBsP+pBG3uiB7wsgtSyk=";
|
||||
hash = "sha256-TDBCIioVeuQz4Dj7Pf5VG+tLLokGjhgv5e6z1spr3vk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fDgsoI/SkDzHcQHQYJNguy7el7vLqpt5r05YoBR7FzY=";
|
||||
cargoHash = "sha256-dNbtNQlbUZuZNcyydkRtzC0/Md1HrM3SDbA33exafiI=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
@@ -73,6 +73,9 @@ buildBazelPackage rec {
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
meta = {
|
||||
description = "Bazel/Build Analysis and Navigation Tool";
|
||||
homepage = "http://bant.build/";
|
||||
|
||||
@@ -34,7 +34,7 @@ buildGoModule.override
|
||||
meta = {
|
||||
description = "BigQuery emulator server implemented in Go";
|
||||
homepage = "https://github.com/goccy/bigquery-emulator";
|
||||
changelog = "https://github.com/goccy/pname/releases/tag/v${finalAttrs.version}";
|
||||
changelog = "https://github.com/goccy/bigquery-emulator/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ tarantoj ];
|
||||
mainProgram = "bigquery-emulator";
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "buf";
|
||||
version = "1.68.2";
|
||||
version = "1.68.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bufbuild";
|
||||
repo = "buf";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-h09Q8/K8SX3B13NZlU8VJLHmkpaUhL0UKG0gwIhnUHg=";
|
||||
hash = "sha256-qxTRUYt2JKBE5WvfXlMsdXMJtrD9MLnMjy6+3PMkpvo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3WasjCKLf8P5szPa2Rdb0qWqgPAP67x0AZA1pF5qCUU=";
|
||||
vendorHash = "sha256-aQ4yWdHUmb0LaJ33T2vuVDS1UhYmBUYcwkbnkN7DOqQ=";
|
||||
|
||||
patches = [
|
||||
# Skip a test that requires networking to be available to work.
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "chirp";
|
||||
version = "0.4.0-unstable-2026-04-14";
|
||||
version = "0.4.0-unstable-2026-04-18";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kk7ds";
|
||||
repo = "chirp";
|
||||
rev = "f5d57bd5784b85f9a37e316064d508bad5a70d2b";
|
||||
hash = "sha256-YFGp0uu7coCmDWaI9MKxNo4x6IfQXQMQ85F/z9qTBI8=";
|
||||
rev = "e7347e6a66ef8f9edb50e3e534510c2d3ae6b329";
|
||||
hash = "sha256-TK+lwoEoETcpVe0Xfevg3GUKPQlSKXof+gfmAs6R27Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cliamp";
|
||||
version = "1.35.0";
|
||||
version = "1.37.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bjarneo";
|
||||
repo = "cliamp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8Att+SEJd2MdAgQ8SM49S4c4fM7t0/f/kHl6a+DbO2U=";
|
||||
hash = "sha256-dwpRsdAJuUOR5EKtuwJb6s+gOVWSpn9Kme50PPPELlU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-sS0tjZoZ81Jwn/KJnJD01fTA4z0HxEYYM89Ta398MP0=";
|
||||
vendorHash = "sha256-raj7FKKC9xLrbYQR+l4AH3X2RPQKzLvghKK+FvFXryU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dexter";
|
||||
version = "0.5.3";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "remoteoss";
|
||||
repo = "dexter";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8JjxR7Q+4OgBSIgODxIEU/0mC+bPp9Nz7uCAjfn4HiY=";
|
||||
hash = "sha256-BmWzrbC9ka8L1/mrPOXJqnoi1YVXxRcg6tSkb8tI88Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1mJ4HdDCsZl/g8F+L+NrW2ACuiHe2aSheJO/1XfKAb4=";
|
||||
|
||||
@@ -26,11 +26,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dnsdist";
|
||||
version = "2.0.3";
|
||||
version = "2.0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.powerdns.com/releases/dnsdist-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-oiklC4GcQNVRc6+nIC7x7yprco+Fx1Bol6Hxymq1cUk=";
|
||||
hash = "sha256-I8Z9usIeVWTflbZ4merP7sfXwZQRiqv5jODnY8zVx64=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) cargoRoot src;
|
||||
hash = "sha256-OU24ahqFc4DivCpO451rsHV8rofyHv+LnLgkVsFPMG4=";
|
||||
hash = "sha256-0CfOkjMe3p7xg62jlS3ASZRlr+/nqIJLRyRT+jcDiHQ=";
|
||||
};
|
||||
|
||||
cargoRoot = "dnsdist-rust-lib/rust";
|
||||
|
||||
@@ -3,27 +3,26 @@
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
testers,
|
||||
dotenvx,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "dotenvx";
|
||||
version = "1.61.1";
|
||||
version = "1.61.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dotenvx";
|
||||
repo = "dotenvx";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ZNGHtscG3JSxHyKfn6d39SamPwkOXkb3xPNgyeo9JmU=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yyAlEgIbPQocPnZvDbmK2MIYpglESkQGMYE7PmJDdEM=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-csxBcYg0iT0iPsRloLwicVqe2Fg+TprG1eZkg6gHSWs=";
|
||||
npmDepsHash = "sha256-YQ3b7Fm33Mfp2l2LQ/+iYal+iBTZn5v7lUyZ2geY46A=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion {
|
||||
package = dotenvx;
|
||||
package = finalAttrs.finalPackage;
|
||||
# access to the home directory
|
||||
command = "HOME=$TMPDIR dotenvx --version";
|
||||
};
|
||||
@@ -32,7 +31,7 @@ buildNpmPackage rec {
|
||||
meta = {
|
||||
description = "Better dotenv–from the creator of `dotenv`";
|
||||
homepage = "https://github.com/dotenvx/dotenvx";
|
||||
changelog = "https://github.com/dotenvx/dotenvx/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/dotenvx/dotenvx/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [
|
||||
natsukium
|
||||
@@ -40,4 +39,4 @@ buildNpmPackage rec {
|
||||
];
|
||||
mainProgram = "dotenvx";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "eigenwallet";
|
||||
version = "4.2.4";
|
||||
version = "4.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/eigenwallet_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-2AZJ8YSRxnlWtEkG8X9Zxt+xC/2YkTGg3kDorDjQYxY=";
|
||||
hash = "sha256-iwnDAF3iWol7wOc8HWVi/E8hgf0EcVE7RcUtm11JpOs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -55,13 +55,13 @@ in
|
||||
freecad-utils.makeCustomizable (
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "freecad";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeCAD";
|
||||
repo = "FreeCAD";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-knyc4Ts9dd12i0SsVDeoCs37jrMxekc07KBf3wJvNgk=";
|
||||
hash = "sha256-7/VEbs8YDM1Xwc819ab6av5fgRSIbbB6LeCM0V08vRU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ghciwatch";
|
||||
version = "1.2.0";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MercuryTechnologies";
|
||||
repo = "ghciwatch";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-JN2FnYHORvlqhsQF5Widm7G7Jyk8/iLCnQ+lLsklX1k=";
|
||||
hash = "sha256-3S9nw2wvl/ORwPGfWknqhsooH3XkF87OyiGFVLK/YqA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-RdoGS5VTesLaPiNeSEDrwP7ZuYWiz9uewlCntn7CqYc=";
|
||||
cargoHash = "sha256-3vv6WPbxvZdcAr/ynzbmh6xHAPFB2Z/1TS7fMrq0EHE=";
|
||||
|
||||
# integration tests are not run but the macros need this variable to be set
|
||||
env.GHC_VERSIONS = "";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoLatestModule (finalAttrs: {
|
||||
pname = "govulncheck";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "vuln";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-15DTxzlK7mkUt7KCwsV5+E5dPopCwFylI0fmVB0LDEo=";
|
||||
hash = "sha256-Xe2H0vF4CNDm1Xw7OD6m5NkqWrFtK/AXzZjqJ5SeoV8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -24,7 +24,7 @@ buildGoLatestModule (finalAttrs: {
|
||||
})
|
||||
];
|
||||
|
||||
vendorHash = "sha256-+hJtGG9GGDb3D9Cgm7hreySjOlXXsc7HxHcoS2Cxfbs=";
|
||||
vendorHash = "sha256-yGaD/jAfT0/YV2ZE8H5++p6CM5qgm+oRtlhgOojX6Zo=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/govulncheck"
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchzip,
|
||||
symlinkJoin,
|
||||
installFonts,
|
||||
families ? [ ],
|
||||
}:
|
||||
let
|
||||
@@ -18,22 +20,28 @@ stdenvNoCC.mkDerivation {
|
||||
pname = "ibm-plex";
|
||||
inherit version;
|
||||
|
||||
srcs = map (
|
||||
family:
|
||||
fetchzip {
|
||||
url = "https://github.com/IBM/plex/releases/download/%40ibm%2Fplex-${family}%40${version}/ibm-plex-${family}.zip";
|
||||
hash = availableFamilies.${family};
|
||||
}
|
||||
) selectedFamilies;
|
||||
src = symlinkJoin {
|
||||
name = "ibm-plex-src";
|
||||
paths = map (
|
||||
family:
|
||||
fetchzip {
|
||||
url = "https://github.com/IBM/plex/releases/download/%40ibm%2Fplex-${family}%40${version}/ibm-plex-${family}.zip";
|
||||
hash = availableFamilies.${family};
|
||||
}
|
||||
) selectedFamilies;
|
||||
postBuild = ''
|
||||
find "$out" \( -name hinted -or -name unhinted -or -name split \) -exec rm -fr {} +
|
||||
'';
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
sourceRoot = ".";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
find $srcs -type f -name '*.otf' -exec install -Dm644 {} -t $out/share/fonts/opentype \;
|
||||
runHook postInstall
|
||||
'';
|
||||
nativeBuildInputs = [ installFonts ];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"webfont"
|
||||
];
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
@@ -44,6 +52,7 @@ stdenvNoCC.mkDerivation {
|
||||
license = lib.licenses.ofl;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [
|
||||
ners
|
||||
romildo
|
||||
ryanccn
|
||||
];
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
}:
|
||||
|
||||
buildGo126Module (finalAttrs: {
|
||||
version = "3.1.671";
|
||||
version = "3.1.672";
|
||||
pname = "ipsw";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blacktop";
|
||||
repo = "ipsw";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Grh0WeeslpebG+ryacUPXD3OPIbJtA1zDejothKmdxQ=";
|
||||
hash = "sha256-wzxhTWd3aVB3RQLWajhKXlwgVvn/PgoL1+ovYO/IleA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-J4S5VsGZEeDdiNNl0LlqIPG53Vg0xKuW1wsmrULetgQ=";
|
||||
vendorHash = "sha256-cyHfH/Ljz4wuMdKkSfySSK5kPRwq9M1+C/5CG5VwHoE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -29,13 +29,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kmscon";
|
||||
version = "9.3.3";
|
||||
version = "9.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kmscon";
|
||||
repo = "kmscon";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-U9jDlZb5aBzQ7IErtLsajxcN1W5/8/eNwhGIuz7aUCw=";
|
||||
hash = "sha256-S6a/m2gfYOsacq4uq3d05WZPH1C8RQowmZM7f6On4ic=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
let
|
||||
pname = "ledger-live-desktop";
|
||||
version = "4.0.0";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
|
||||
hash = "sha256-aM6hHOJ3ZlBEoTDfHxb37WqqyCfHJRaeqg14w/jQLvg=";
|
||||
hash = "sha256-gJ/5/bCNBkNmKgsIxoOvkbE1FLY9KX6TFVOQe/wAVGM=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "legcord";
|
||||
version = "1.2.2";
|
||||
version = "1.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Legcord";
|
||||
repo = "Legcord";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-i4Pw1jvkRYCQg1+9eZVi30Qblpttz9V+k//zehBZGDM=";
|
||||
hash = "sha256-nai8lcimEts/E3bwUyQufLYIHhUK83IH431PUQFtQJI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10_29_2;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-MgUOOr188t+t/4sTXVpbr+xYT/1qf7/B0ZG0w+QkVxc=";
|
||||
hash = "sha256-ME74yxVwH4W9gE0XbtwDhR8g9QulN2eeOB1eekaHmG8=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libphonenumber";
|
||||
version = "9.0.28";
|
||||
version = "9.0.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "libphonenumber";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Mi+FpM8viPUWgzT8tp3zc9e5fsI9xhlsdsYYlaVRTNk=";
|
||||
hash = "sha256-VhVPLDD7KHRxD7adOyYGxVxfI3n77QCk5pLPtN8YfPQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -36,7 +36,7 @@ let
|
||||
|
||||
pname = "librewolf-bin-unwrapped";
|
||||
|
||||
version = "149.0.2-2";
|
||||
version = "150.0-1";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@@ -46,8 +46,8 @@ stdenv.mkDerivation {
|
||||
url = "https://codeberg.org/api/packages/librewolf/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz";
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-BzgSMeAHE3t3P5L/Xj0xjJcfsFk3UIYlrJvQGoahpM0=";
|
||||
aarch64-linux = "sha256-49ODecTb/NeTa8iwB8f4XzGqPfFTJPvEgRJz8gsoGNs=";
|
||||
x86_64-linux = "sha256-9ul5VsRdJtWBSdOt3dNsR/GawU5xEjPxhQgNjf+wE38=";
|
||||
aarch64-linux = "sha256-rJzs0dge2lIp16zdClAv8pmlU+KkenPX+Y/cOum/aAQ=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or throwSystem;
|
||||
};
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libtsm";
|
||||
version = "4.4.3";
|
||||
version = "4.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kmscon";
|
||||
repo = "libtsm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-AKwS088lP3dByKh3dQRW76+L6ouD8EmVms2qWIC5IiE=";
|
||||
hash = "sha256-5Lv/Hb0FGWARk3Wv3IuAbtCDII7qOMmcZSmKTkgTEsc=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "minilibx";
|
||||
version = "0-unstable-2021-10-30";
|
||||
version = "0-unstable-2026-04-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "42Paris";
|
||||
repo = "minilibx-linux";
|
||||
rev = "7dc53a411a7d4ae286c60c6229bd1e395b0efb82";
|
||||
hash = "sha256-aRYMpaPC7dC6EHmmXugvwcQnaizRCQZKFcQX0K2MLM4=";
|
||||
rev = "a0ce07ba22460ee66e62b6c56d60b33946aeb13d";
|
||||
hash = "sha256-LyFCmuGXAAv7O9jrmfeIVeYoi7d1Mdw6e8u2Z0/yO4s=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -97,7 +97,7 @@ let
|
||||
++ lib.optionals mediaSupport [ ffmpeg_7 ]
|
||||
);
|
||||
|
||||
version = "15.0.9";
|
||||
version = "15.0.10";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
@@ -109,7 +109,7 @@ let
|
||||
"https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-GkLCztflyfRFZiZg+bZjUFvK9i+jbagyzB7SgbjKlpQ=";
|
||||
hash = "sha256-1XUWPS7GZ+V9iHRGuNGpFxCP0IKPdMIUt3rLLsD4yQ8=";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -291,7 +291,7 @@ stdenv.mkDerivation rec {
|
||||
inherit sources;
|
||||
updateScript = callPackage ./update.nix {
|
||||
inherit pname version meta;
|
||||
baseUrl = "https://cdn.mullvad.net/browser/";
|
||||
baseUrl = "https://dist.torproject.org/mullvadbrowser/";
|
||||
name = "mullvad-browser";
|
||||
};
|
||||
};
|
||||
@@ -305,6 +305,7 @@ stdenv.mkDerivation rec {
|
||||
felschr
|
||||
panicgh
|
||||
sigmasquadron
|
||||
whispersofthedawn
|
||||
];
|
||||
# MPL2.0+, GPL+, &c. While it's not entirely clear whether
|
||||
# the compound is "libre" in a strict sense (some components place certain
|
||||
|
||||
@@ -105,7 +105,7 @@ stdenv.mkDerivation (
|
||||
in
|
||||
{
|
||||
pname = "neovim-unwrapped";
|
||||
version = "0.12.1";
|
||||
version = "0.12.2";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -113,7 +113,7 @@ stdenv.mkDerivation (
|
||||
owner = "neovim";
|
||||
repo = "neovim";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-cbFM5TKGmhEDsdhMvGzMyn0Js0MJwdMwXDkzQcdw/TM=";
|
||||
hash = "sha256-V+jZiNv0SvG/GOOUPzmBkOQGrnrN3UW2BY2n9NxP2Eg=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -21,17 +21,17 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pdns-recursor";
|
||||
version = "5.4.0";
|
||||
version = "5.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-L2nvdYatyAW8T1A+FaNPDG3Pu/2rfZWf8TLY4s2/JQo=";
|
||||
hash = "sha256-k/I+6T+w06n9SIFyZWMezkdYuAAa9ybDWO46+2ZFtjo=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src;
|
||||
sourceRoot = "pdns-recursor-${finalAttrs.version}/rec-rust-lib/rust";
|
||||
hash = "sha256-OBC6x1yL+kVpiBittZVvwMSCAsSyS0U9853x3TBGGkc=";
|
||||
hash = "sha256-PxnLv1VbZgyQl83Bcvxyf7REsbTKI1MBV4RllHcyJyc=";
|
||||
};
|
||||
|
||||
cargoRoot = "rec-rust-lib/rust";
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rumdl";
|
||||
version = "0.1.72";
|
||||
version = "0.1.80";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rvben";
|
||||
repo = "rumdl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/dMGfXNh/294fA4q/zn2fOAou3HC+BoTOYvQ18oYvI0=";
|
||||
hash = "sha256-Xa5mk62VUdsZVipD1gwTK9kR5GSXEyxu02t6zcMff0E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ZfvH4KS2UXvhkfkY6pReXBPiZ3enRqLu32ScG6VZZfM=";
|
||||
cargoHash = "sha256-zxj60PE3CpNnF/h3nTHX4yKh2QfR8TLZkl1Purc058k=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--bin=rumdl"
|
||||
|
||||
@@ -15,18 +15,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rustls-ffi";
|
||||
version = "0.15.2";
|
||||
version = "0.15.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rustls";
|
||||
repo = "rustls-ffi";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-OrseS6PxAGhO+mdlRrjQAZ5L5GbNekeVg+IW5VyL928=";
|
||||
hash = "sha256-ayD9A9ZiQX3pkRJ4T+EyDsNroGuTdR2xEXcfz6D3MY8=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-eNY6mpEFFJEdaJyHY8RHOerg/cDa3QbPjsNj3iZNqJ0=";
|
||||
hash = "sha256-5FJb6cuQMT2NWQvbxip+medxcEUtSnZaKu8QR2YFKzc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sdl3-shadercross";
|
||||
version = "0-unstable-2026-03-01";
|
||||
version = "0-unstable-2026-04-11";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -24,8 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "libsdl-org";
|
||||
repo = "SDL_shadercross";
|
||||
rev = "3a314481ede01f5d966f0e834019942e34c02b82";
|
||||
hash = "sha256-ngJymfBU9YzVEHmNpAlkHQ3Q3UDN6OCq/2kuZIHQjcw=";
|
||||
rev = "f5c01f451e835f6b38e151e064a32999a0985563";
|
||||
hash = "sha256-DvgMnE0QedInYRdcZQuVOlasri79kVl0ACGvNC1cq8o=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@@ -42,7 +42,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
|
||||
(lib.cmakeBool "SDLSHADERCROSS_SHARED" (!stdenv.hostPlatform.isStatic))
|
||||
(lib.cmakeBool "SDLSHADERCROSS_STATIC" stdenv.hostPlatform.isStatic)
|
||||
(lib.cmakeBool "SDLSHADERCROSS_INSTALL" true)
|
||||
(lib.cmakeBool "SDLSHADERCROSS_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
];
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "spruce";
|
||||
version = "1.31.1";
|
||||
version = "1.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "geofffranks";
|
||||
repo = "spruce";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-wLxPHaCU0fciSIdK26dV4XOnJsp5EKKEXzgspWC1GvA=";
|
||||
hash = "sha256-KTitSKzXa2HudgByLl5P1cWBr0BxxuOO1GRKI26galE=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "steam-devices-udev-rules";
|
||||
version = "1.0.0.61-unstable-2026-04-14";
|
||||
version = "1.0.0.61-unstable-2026-04-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValveSoftware";
|
||||
repo = "steam-devices";
|
||||
rev = "7dde9ecb3c386363ecd9bd0a3b77e4756d200704";
|
||||
hash = "sha256-44ZO2etUxnldRCuNp6KpLArPrfAOuVPoXW1fl+KbHXA=";
|
||||
rev = "39e7bd00f7a322e5165fd8f416b31d23daf6d385";
|
||||
hash = "sha256-QjFyzSwqwzPz06Wcj7in91tlhaxgw0DydLgsjC+i6Lo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,20 +6,18 @@
|
||||
textlint-rule-stop-words,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "textlint-rule-stop-words";
|
||||
version = "5.0.0";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sapegin";
|
||||
repo = "textlint-rule-stop-words";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-e9jTbDULOs0DwtT9UZp7k5+RR5Ab/x/sizIvs1MrmZs=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-QN3IptBxX/GTaySWQt43k6UDCKiG4Lp8MowHZ9EPRVQ=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-t9PPHFIiY4vw0ocw6nMuaeYuYWxbc1Pzo0R6bqIsHeI=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
npmDepsHash = "sha256-UEiSMHZ8tvq/CoRA/wuV7bEZ6Njj3+cjoz139JH46Ks=";
|
||||
|
||||
passthru.tests = textlint.testPackages {
|
||||
rule = textlint-rule-stop-words;
|
||||
@@ -29,8 +27,8 @@ buildNpmPackage rec {
|
||||
meta = {
|
||||
description = "Textlint rule to find filler words, buzzwords and clichés";
|
||||
homepage = "https://github.com/sapegin/textlint-rule-stop-words";
|
||||
changelog = "https://github.com/sapegin/textlint-rule-stop-words/releases/tag/v${version}";
|
||||
changelog = "https://github.com/sapegin/textlint-rule-stop-words/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ natsukium ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,20 +6,18 @@
|
||||
textlint-rule-terminology,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "textlint-rule-terminology";
|
||||
version = "5.0.0";
|
||||
version = "5.2.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sapegin";
|
||||
repo = "textlint-rule-terminology";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-/NuKZSugizP4b2LFNqPrTvoXNE4D1sytU2B7T40ZASQ=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XtyPOK2nrtlUQO6cx+ozVj27jvezCAKQ/+E0UDriCQw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-FQr7E6ZSJxj/ide+3JJwc27x15L1bAIAlPnMl8hdQ8w=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
npmDepsHash = "sha256-ZUM+zNl9kgEu0KHIVmnLDZ+1PJPE2e2wP6Hofe/9zPQ=";
|
||||
|
||||
passthru.tests = textlint.testPackages {
|
||||
rule = textlint-rule-terminology;
|
||||
@@ -29,8 +27,8 @@ buildNpmPackage rec {
|
||||
meta = {
|
||||
description = "Textlint rule to check correct terms spelling";
|
||||
homepage = "https://github.com/sapegin/textlint-rule-terminology";
|
||||
changelog = "https://github.com/sapegin/textlint-rule-terminology/releases/tag/v${version}";
|
||||
changelog = "https://github.com/sapegin/textlint-rule-terminology/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ natsukium ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGo125Module (finalAttrs: {
|
||||
pname = "tidb";
|
||||
version = "8.5.5";
|
||||
version = "8.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pingcap";
|
||||
repo = "tidb";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wrCdclS9qpc0mq5QZ6u5/APZyOTWvCJNCPCzM385MBM=";
|
||||
hash = "sha256-sQ5hialileLC/ZpXoy5zfSnLZAL1I4aiiQf+y5LPIK8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7g8U0gbG46AC4h1SyOTKKuNc5eVRqJsimzshj4O5FYw=";
|
||||
vendorHash = "sha256-YJ47tC1pp+hDMIiKyzROypk+zX76r+c5O9qD2OkVmgw=";
|
||||
|
||||
ldflags = [
|
||||
"-X github.com/pingcap/tidb/pkg/parser/mysql.TiDBReleaseVersion=${finalAttrs.version}"
|
||||
|
||||
@@ -102,7 +102,7 @@ let
|
||||
++ lib.optionals mediaSupport [ ffmpeg_7 ]
|
||||
);
|
||||
|
||||
version = "15.0.9";
|
||||
version = "15.0.10";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
@@ -112,7 +112,7 @@ let
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-s7Ubr0OjXpBg7nRuBPhnFwHY86bnZRPUnlsNBI/2Ng0=";
|
||||
hash = "sha256-PlGjkyO2MoLWo7eAgoNMfd52dM7v9VKyfCxXbj3qqu4=";
|
||||
};
|
||||
|
||||
i686-linux = fetchurl {
|
||||
@@ -122,7 +122,7 @@ let
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-FebSPdfJjxoW0iUBspt5AMugM5SWK7Wm7pP5zGU+icU=";
|
||||
hash = "sha256-rangtzd7oee+2b7zdmKYJD8al4G3FYo+bdq8JgBn5oE=";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -354,6 +354,7 @@ stdenv.mkDerivation rec {
|
||||
felschr
|
||||
hax404
|
||||
panicgh
|
||||
whispersofthedawn
|
||||
];
|
||||
# MPL2.0+, GPL+, &c. While it's not entirely clear whether
|
||||
# the compound is "libre" in a strict sense (some components place certain
|
||||
|
||||
@@ -75,8 +75,8 @@ buildGoModule (finalAttrs: {
|
||||
attack vectors and can be used as a framework for automated governance.
|
||||
'';
|
||||
mainProgram = "witness";
|
||||
homepage = "https://github.com/testifysec/witness";
|
||||
changelog = "https://github.com/testifysec/witness/releases/tag/${finalAttrs.src.tag}";
|
||||
homepage = "https://github.com/in-toto/witness";
|
||||
changelog = "https://github.com/in-toto/witness/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
fkautz
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "woodpecker-plugin-git";
|
||||
version = "2.8.1";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "woodpecker-ci";
|
||||
repo = "plugin-git";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-MhtqRWmZCjtb2QOwlbnlZUPHDNunjgWlhHCtM9pvYMM=";
|
||||
hash = "sha256-Ib4Jdo8KT1DUncWi2oCJRBeEwqCNi98D9eXHrhYVo64=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-hOktS+CQQ6TaHt96DaAcZXhqJGGleD/RdjdUfgv7oxw=";
|
||||
vendorHash = "sha256-IPqtAwre3Fs6TvWdmuDkvD/abzZwtE5OKEGEkCtdCI8=";
|
||||
|
||||
env.CGO_ENABLED = "0";
|
||||
|
||||
|
||||
@@ -56,6 +56,7 @@ lib.makeScope newScope (self: {
|
||||
"agpl" = lib.licenses.agpl3Only;
|
||||
"artistic" = lib.licenses.artistic2;
|
||||
"bsd" = lib.licenses.bsd3;
|
||||
"bsd-0-clause" = lib.licenses.bsd0;
|
||||
"bsd-1-clause" = lib.licenses.bsd1;
|
||||
"bsd-2-clause" = lib.licenses.bsd2;
|
||||
"bsd-3" = lib.licenses.bsd3;
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
{
|
||||
buildDunePackage,
|
||||
atd,
|
||||
re,
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "atd-jsonlike";
|
||||
inherit (atd) src version;
|
||||
|
||||
minimalOCamlVersion = "4.12";
|
||||
|
||||
propagatedBuildInputs = [ re ];
|
||||
|
||||
meta = (removeAttrs atd.meta [ "mainProgram" ]) // {
|
||||
description = "Generic JSON-like AST for use with ATD code generators";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
{
|
||||
buildDunePackage,
|
||||
atd-jsonlike,
|
||||
yamlx,
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "atd-yamlx";
|
||||
inherit (atd-jsonlike) version src;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
atd-jsonlike
|
||||
yamlx
|
||||
];
|
||||
|
||||
meta = atd-jsonlike.meta // {
|
||||
description = "YAML-to-jsonlike bridge for use with ATD code generators";
|
||||
};
|
||||
}
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "atdgen-codec-runtime";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ahrefs/atd/releases/download/${finalAttrs.version}/atd-${finalAttrs.version}.tbz";
|
||||
hash = "sha256-NRT+TcTniGQLPpqf7DtbEG5vYJtZ0oUicB3hvS6pCfE=";
|
||||
hash = "sha256-c7J+xg77vqYPMRy8oJwQS1U3vocz9HcnqfXth41uBGw=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,12 +1,17 @@
|
||||
{
|
||||
lib,
|
||||
buildDunePackage,
|
||||
ocaml,
|
||||
alcotest,
|
||||
atd,
|
||||
atd-jsonlike,
|
||||
atd-yamlx,
|
||||
atdgen-codec-runtime,
|
||||
atdgen-runtime,
|
||||
atdml,
|
||||
biniou,
|
||||
re,
|
||||
python3,
|
||||
yamlx,
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
@@ -20,15 +25,18 @@ buildDunePackage {
|
||||
|
||||
propagatedBuildInputs = [ atdgen-runtime ];
|
||||
|
||||
doCheck = true;
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.14";
|
||||
nativeCheckInputs = [
|
||||
atd
|
||||
atdml
|
||||
biniou
|
||||
(python3.withPackages (ps: [ ps.jsonschema ]))
|
||||
];
|
||||
checkInputs = [
|
||||
alcotest
|
||||
atdgen-codec-runtime
|
||||
yamlx
|
||||
atd-jsonlike
|
||||
atd-yamlx
|
||||
];
|
||||
|
||||
meta = (removeAttrs atd.meta [ "mainProgram" ]) // {
|
||||
|
||||
@@ -9,6 +9,8 @@ buildDunePackage {
|
||||
pname = "atdml";
|
||||
inherit (atd) version src;
|
||||
|
||||
minimalOCamlVersion = "4.10";
|
||||
|
||||
buildInputs = [ cmdliner ];
|
||||
|
||||
propagatedBuildInputs = [ atd ];
|
||||
|
||||
@@ -1,85 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
appdirs,
|
||||
buildPythonPackage,
|
||||
cachelib,
|
||||
colorama,
|
||||
cssselect,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
keep,
|
||||
lxml,
|
||||
pygments,
|
||||
pyquery,
|
||||
requests,
|
||||
rich,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "howdoi";
|
||||
version = "2.0.20";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gleitz";
|
||||
repo = "howdoi";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-u0k+h7Sp2t/JUnfPqRzDpEA+vNXB7CpyZ/SRvk+B9t0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Bad test case fix: comparing hardcoded string to internet search result
|
||||
# PR merged: https://github.com/gleitz/howdoi/pull/497
|
||||
# Please remove on the next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gleitz/howdoi/commit/7d24e9e1c87811a6e66d60f504381383cf1ac3fd.patch";
|
||||
hash = "sha256-AFQMnMEijaExqiimbNaVeIRmZJ4Yj0nGUOEjfsvBLh8=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
appdirs
|
||||
cachelib
|
||||
colorama
|
||||
cssselect
|
||||
keep
|
||||
lxml
|
||||
pygments
|
||||
pyquery
|
||||
requests
|
||||
rich
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
"test_colorize"
|
||||
# Tests are flaky, OSError: [Errno 24] Too many open files happens
|
||||
"test_answer_links_using_l_option"
|
||||
"test_answers_bing"
|
||||
"test_answers"
|
||||
"test_json_output"
|
||||
"test_missing_pre_or_code_query"
|
||||
"test_multiple_answers"
|
||||
"test_position"
|
||||
"test_unicode_answer"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "howdoi" ];
|
||||
|
||||
meta = {
|
||||
description = "Instant coding answers via the command line";
|
||||
homepage = "https://github.com/gleitz/howdoi";
|
||||
changelog = "https://github.com/gleitz/howdoi/blob/v${version}/CHANGES.txt";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
@@ -1,58 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
libcst,
|
||||
mypy-extensions,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "monkeytype";
|
||||
version = "23.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Instagram";
|
||||
repo = "MonkeyType";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-DQ/3go53+0PQkhZcL2dX8MI/z4Iq7kTYd5EbacMNxT4=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
libcst
|
||||
mypy-extensions
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"monkeytype"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Disable broken tests
|
||||
"test_excludes_site_packages"
|
||||
"test_callee_throws_recovers"
|
||||
"test_nested_callee_throws_recovers"
|
||||
"test_caller_handles_callee_exception"
|
||||
"test_generator_trace"
|
||||
"test_return_none"
|
||||
"test_access_property"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Python library that generates static type annotations by collecting runtime types";
|
||||
homepage = "https://github.com/Instagram/MonkeyType/";
|
||||
changelog = "https://github.com/Instagram/MonkeyType/blob/${src.rev}/CHANGES.rst";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
@@ -43,14 +43,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "optuna";
|
||||
version = "4.7.0";
|
||||
version = "4.8.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "optuna";
|
||||
repo = "optuna";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SbEmJ4V4pyxMUx3GPMqBUDLq4AslwichbZNmNwmNm0o=";
|
||||
hash = "sha256-DgmNIq4LksG3YRQLSbshMzGGRW/qAxMccs/oCRxI5tc=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vfblib";
|
||||
version = "0.10.6";
|
||||
version = "0.11.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LucasFonts";
|
||||
repo = "vfbLib";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-kPPRLs+i181stjoTjgi9XfxsQhx+VKGCggyfhy8o6Nw=";
|
||||
hash = "sha256-AXZKJgZADE0J4WHB6pn/b6K3Jwawyq6j0tRt6HyRkpk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "victron-mqtt";
|
||||
version = "2026.4.9";
|
||||
version = "2026.4.17";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tomer-w";
|
||||
repo = "victron_mqtt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Lq3I5xZCu3UrllW0cHLo7wlKnDOl73TDRN97gThvP1M=";
|
||||
hash = "sha256-7aLgA5TW4VAFlR2I2rWtsDIkOXUJUJY6Z0WXhifuJ0k=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -70,6 +70,10 @@ let
|
||||
|
||||
atd = callPackage ../development/ocaml-modules/atd { };
|
||||
|
||||
atd-jsonlike = callPackage ../development/ocaml-modules/atd/jsonlike.nix { };
|
||||
|
||||
atd-yamlx = callPackage ../development/ocaml-modules/atd/yamlx.nix { };
|
||||
|
||||
atdgen = callPackage ../development/ocaml-modules/atdgen { };
|
||||
|
||||
atdgen-codec-runtime = callPackage ../development/ocaml-modules/atdgen/codec-runtime.nix { };
|
||||
|
||||
@@ -256,6 +256,7 @@ mapAliases {
|
||||
hologram = throw "'hologram' has been removed as it was unmaintained upstream"; # Added 2026-03-22
|
||||
homeassistant-bring-api = throw "'homeassistant-bring-api' has been renamed to/replaced by 'bring-api'"; # Converted to throw 2025-10-29
|
||||
homepluscontrol = throw "'homepluscontrol' has been removed as it was unmaintained upstream"; # Added 2026-03-22
|
||||
howdoi = throw "'howdoi' has been removed as it was unmaintained upstream"; # Added 2026-04-19
|
||||
HTSeq = throw "'HTSeq' has been renamed to/replaced by 'htseq'"; # Converted to throw 2025-10-29
|
||||
IMAPClient = throw "'IMAPClient' has been renamed to/replaced by 'imapclient'"; # Converted to throw 2025-10-29
|
||||
inlinestyler = throw "inlinestyler has been removed because it is no longer maintained"; # added 2025-08-09
|
||||
@@ -338,6 +339,7 @@ mapAliases {
|
||||
mne-python = throw "'mne-python' has been renamed to/replaced by 'mne'"; # Converted to throw 2025-10-29
|
||||
modeled = "'modeled' has been removed because it is unmaintained"; # Added 2026-01-19
|
||||
monarchmoney = throw "'monarchmoney' has been renamed to/replaced by 'monarchmoneycommunity'"; # Added 2026-03-05
|
||||
monkeytype = throw "'monkeytype' has been removed as it was unmaintained upstream"; # Added 2026-04-19
|
||||
moretools = "'moretools' has been removed because it is unmaintained"; # Added 2026-01-19
|
||||
mpris-server = throw "mpris-server was removed because it is unused"; # added 2025-10-31
|
||||
msldap-bad = throw "'msldap-bad' has been renamed to/replaced by 'badldap'"; # added 2025-11-06
|
||||
|
||||
@@ -7154,8 +7154,6 @@ self: super: with self; {
|
||||
|
||||
housekeeping = callPackage ../development/python-modules/housekeeping { };
|
||||
|
||||
howdoi = callPackage ../development/python-modules/howdoi { };
|
||||
|
||||
hpack = callPackage ../development/python-modules/hpack { };
|
||||
|
||||
hpccm = callPackage ../development/python-modules/hpccm { };
|
||||
@@ -10198,8 +10196,6 @@ self: super: with self; {
|
||||
|
||||
monkeyhex = callPackage ../development/python-modules/monkeyhex { };
|
||||
|
||||
monkeytype = callPackage ../development/python-modules/monkeytype { };
|
||||
|
||||
monosat = callPackage pkgs.monosat.python { };
|
||||
|
||||
monotonic = callPackage ../development/python-modules/monotonic { };
|
||||
|
||||
Reference in New Issue
Block a user