mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-30 20:00:10 +00:00
Merge staging-next into staging
This commit is contained in:
@@ -1,13 +1,9 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
options,
|
||||
pkgs,
|
||||
...
|
||||
}: # XXX migration code for freeform settings: `options` can be removed in 2025
|
||||
let
|
||||
optionsGlobal = options;
|
||||
in
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
@@ -75,7 +71,7 @@ let
|
||||
{
|
||||
freeformType = attrsOf (either scalarType (listOf scalarType));
|
||||
# Client system-options file directives are explained here:
|
||||
# https://www.ibm.com/docs/en/storage-protect/8.1.25?topic=commands-processing-options
|
||||
# https://www.ibm.com/docs/en/storage-protect/8.1.27?topic=commands-processing-options
|
||||
options.servername = mkOption {
|
||||
type = servernameType;
|
||||
default = name;
|
||||
@@ -150,27 +146,6 @@ let
|
||||
};
|
||||
config.commmethod = mkDefault "v6tcpip"; # uses v4 or v6, based on dns lookup result
|
||||
config.passwordaccess = if config.genPasswd then "generate" else "prompt";
|
||||
# XXX migration code for freeform settings, these can be removed in 2025:
|
||||
options.warnings = optionsGlobal.warnings;
|
||||
options.assertions = optionsGlobal.assertions;
|
||||
imports =
|
||||
let
|
||||
inherit (lib.modules) mkRemovedOptionModule mkRenamedOptionModule;
|
||||
in
|
||||
[
|
||||
(mkRemovedOptionModule [ "extraConfig" ]
|
||||
"Please just add options directly to the server attribute set, cf. the description of `programs.tsmClient.servers`."
|
||||
)
|
||||
(mkRemovedOptionModule [ "text" ]
|
||||
"Please just add options directly to the server attribute set, cf. the description of `programs.tsmClient.servers`."
|
||||
)
|
||||
(mkRenamedOptionModule [ "name" ] [ "servername" ])
|
||||
(mkRenamedOptionModule [ "server" ] [ "tcpserveraddress" ])
|
||||
(mkRenamedOptionModule [ "port" ] [ "tcpport" ])
|
||||
(mkRenamedOptionModule [ "node" ] [ "nodename" ])
|
||||
(mkRenamedOptionModule [ "passwdDir" ] [ "passworddir" ])
|
||||
(mkRenamedOptionModule [ "includeExclude" ] [ "inclexcl" ])
|
||||
];
|
||||
};
|
||||
|
||||
options.programs.tsmClient = {
|
||||
@@ -291,16 +266,7 @@ let
|
||||
contain duplicate names
|
||||
(note that setting names are case insensitive).
|
||||
'';
|
||||
}) cfg.servers)
|
||||
# XXX migration code for freeform settings, this can be removed in 2025:
|
||||
++ (enrichMigrationInfos "assertions" (
|
||||
addText:
|
||||
{ assertion, message }:
|
||||
{
|
||||
inherit assertion;
|
||||
message = addText message;
|
||||
}
|
||||
));
|
||||
}) cfg.servers);
|
||||
|
||||
makeDsmSysLines =
|
||||
key: value:
|
||||
@@ -340,17 +306,6 @@ let
|
||||
attrs = removeAttrs serverCfg [
|
||||
"servername"
|
||||
"genPasswd"
|
||||
# XXX migration code for freeform settings, these can be removed in 2025:
|
||||
"assertions"
|
||||
"warnings"
|
||||
"extraConfig"
|
||||
"text"
|
||||
"name"
|
||||
"server"
|
||||
"port"
|
||||
"node"
|
||||
"passwdDir"
|
||||
"includeExclude"
|
||||
];
|
||||
in
|
||||
''
|
||||
@@ -369,16 +324,6 @@ let
|
||||
${concatLines (map makeDsmSysStanza (attrValues cfg.servers))}
|
||||
'';
|
||||
|
||||
# XXX migration code for freeform settings, this can be removed in 2025:
|
||||
enrichMigrationInfos =
|
||||
what: how:
|
||||
concatLists (
|
||||
mapAttrsToList (
|
||||
name: serverCfg:
|
||||
map (how (text: "In `programs.tsmClient.servers.${name}`: ${text}")) serverCfg."${what}"
|
||||
) cfg.servers
|
||||
);
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
@@ -393,8 +338,6 @@ in
|
||||
dsmSysApi = dsmSysCli;
|
||||
};
|
||||
environment.systemPackages = [ cfg.wrappedPackage ];
|
||||
# XXX migration code for freeform settings, this can be removed in 2025:
|
||||
warnings = enrichMigrationInfos "warnings" (addText: addText);
|
||||
};
|
||||
|
||||
meta.maintainers = [ lib.maintainers.yarny ];
|
||||
|
||||
@@ -89,7 +89,7 @@ in
|
||||
environment.HOME = "/var/lib/tsm-backup";
|
||||
serviceConfig = {
|
||||
# for exit status description see
|
||||
# https://www.ibm.com/docs/en/storage-protect/8.1.25?topic=clients-client-return-codes
|
||||
# https://www.ibm.com/docs/en/storage-protect/8.1.27?topic=clients-client-return-codes
|
||||
SuccessExitStatus = "4 8";
|
||||
# The `-se` option must come after the command.
|
||||
# The `-optfile` option suppresses a `dsm.opt`-not-found warning.
|
||||
|
||||
@@ -165,7 +165,39 @@ in
|
||||
};
|
||||
|
||||
settings = lib.mkOption {
|
||||
type = settingsFormat.type;
|
||||
type = lib.types.submodule (
|
||||
{ config, ... }:
|
||||
{
|
||||
freeformType = settingsFormat.type;
|
||||
options = {
|
||||
video_transcription = {
|
||||
enabled = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Enable automatic transcription of videos.";
|
||||
};
|
||||
engine_path = lib.mkOption {
|
||||
type = with lib.types; either path str;
|
||||
default =
|
||||
if config.video_transcription.enabled then
|
||||
lib.getExe pkgs.whisper-ctranslate2
|
||||
else
|
||||
# This will be in the error message when someone enables
|
||||
# transcription manually in the web UI and tries to run a
|
||||
# transcription job.
|
||||
"Set `services.peertube.settings.video_transcription.enabled = true`.";
|
||||
defaultText = lib.literalExpression ''
|
||||
if config.services.peertube.settings.video_transcription.enabled then
|
||||
lib.getExe pkgs.whisper-ctranslate2
|
||||
else
|
||||
"Set `services.peertube.settings.video_transcription.enabled = true`."
|
||||
'';
|
||||
description = "Custom engine path for local transcription.";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
);
|
||||
example = lib.literalExpression ''
|
||||
{
|
||||
listen = {
|
||||
@@ -424,7 +456,6 @@ in
|
||||
};
|
||||
video_transcription = {
|
||||
engine = lib.mkDefault "whisper-ctranslate2";
|
||||
engine_path = lib.mkDefault (lib.getExe pkgs.whisper-ctranslate2);
|
||||
};
|
||||
}
|
||||
(lib.mkIf cfg.redis.enableUnixSocket {
|
||||
|
||||
@@ -36,22 +36,22 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-zgrNohvsmhcRQmkX7Io2/U3qbVWdcqwT7VK7Y3ENb9g=";
|
||||
x86_64-darwin = "sha256-depSpPZm6bMQv9yvLUJ6yacCwTDtcpoFu15b67oiFJY=";
|
||||
aarch64-linux = "sha256-Fo2X4VAWcyySQ+CE/bt+lJneLoEKVl6tLwPSW5LwvFY=";
|
||||
aarch64-darwin = "sha256-WdYmlopeVsFCndnTALKiQgx2O4zzkDtotR/qj7A56bY=";
|
||||
armv7l-linux = "sha256-OF4qjhgQiagpQP8p9gV63I/B8s/CSl8KlA+FoNhl3/c=";
|
||||
x86_64-linux = "sha256-rUAu69aUjLQsDT5hK8E5yWiMdVfNFqwx9aA8op1ZYj8=";
|
||||
x86_64-darwin = "sha256-BOrLjZsA9QFtcsvgsohZbCRRRqTHhn043HHIpl40kPA=";
|
||||
aarch64-linux = "sha256-DBthRZDeJF6xksMWGvXIC7vdTkQCyjt+oHUI+FbLBrU=";
|
||||
aarch64-darwin = "sha256-TWa2jMRBR0a0SOUkrnZw6Ej3cRGdZd0Gw5Obt11M45k=";
|
||||
armv7l-linux = "sha256-SYrXdEzIYG/2ih3vqCTfIo+6jTvMJe+rIOzNQXfd+es=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.102.0";
|
||||
version = "1.102.1";
|
||||
pname = "vscode" + lib.optionalString isInsiders "-insiders";
|
||||
|
||||
# This is used for VS Code - Remote SSH test
|
||||
rev = "cb0c47c0cfaad0757385834bd89d410c78a856c0";
|
||||
rev = "7adae6a56e34cb64d08899664b814cf620465925";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
|
||||
@@ -75,7 +75,7 @@ callPackage ./generic.nix rec {
|
||||
src = fetchurl {
|
||||
name = "vscode-server-${rev}.tar.gz";
|
||||
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
|
||||
hash = "sha256-Hf/pukcQf7PaHORItWO74gC54TWto+nHiKaCHzD0TmI=";
|
||||
hash = "sha256-EP5xCkCSMROB60OmDFWVWF9qHqW8pjKWPh6mSUU5E7A=";
|
||||
};
|
||||
stdenv = stdenvNoCC;
|
||||
};
|
||||
|
||||
@@ -65,14 +65,14 @@ let
|
||||
in
|
||||
py.pkgs.buildPythonApplication rec {
|
||||
pname = "awscli2";
|
||||
version = "2.27.49"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
version = "2.27.50"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-cli";
|
||||
tag = version;
|
||||
hash = "sha256-fg4UMAsylJJ0Xy8s84Qr7OdiFrzMIP9RsAH+pYDThrU=";
|
||||
hash = "sha256-ITiZ144YFhwuRcfhulLF0jxpp1OgznEE8frx4Yn4V+A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -22,16 +22,16 @@ let
|
||||
in
|
||||
buildNpmPackage' rec {
|
||||
pname = "balena-cli";
|
||||
version = "22.1.1";
|
||||
version = "22.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "balena-io";
|
||||
repo = "balena-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KEYzYIrcJdpicu4L09UVAU25fC8bWbIYJOuSpCHU3K4=";
|
||||
hash = "sha256-akrZca9bRKqEVgmTKS0n1XliVhDq2eeH1Bo5ubjpYnc=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-jErFmkOQ3ySdLLXDh0Xl2tcWlfxnL2oob+x7QDuLJ8w=";
|
||||
npmDepsHash = "sha256-Xq5pp1NNOXyCXnq1mNDaxktbjSzz3T0vOYsYZ7drUNQ=";
|
||||
|
||||
postPatch = ''
|
||||
ln -s npm-shrinkwrap.json package-lock.json
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bento";
|
||||
version = "1.8.2";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "warpstreamlabs";
|
||||
repo = "bento";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-EAEeyMWXL/OL/LGgOQxvXtwrrVXtqY05AMeU5z86tks=";
|
||||
hash = "sha256-rAm9Jn1elux02W0sbMOvQmYyg9ONuSqyStVt1ieTFBk=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-N3YkY1wfxdPnwbEXDxHi/J3Oi3qiNtDMOwvSThX6cf0=";
|
||||
vendorHash = "sha256-Dwf4q5lXO2gtvfB0Ib5LmaXg/MSNir+RzLU4rfE/mB4=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/bento"
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cdncheck";
|
||||
version = "1.1.26";
|
||||
version = "1.1.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "cdncheck";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-mqCQ8CxV9N2lml/zPX/Ksf1kKmXWhjWth3KviTcxiRA=";
|
||||
hash = "sha256-8TLsotEUnZyyeaJaAHjJT+Sk3GFztnJei3I9QHJ8raM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4=";
|
||||
|
||||
15
pkgs/by-name/ex/extractpdfmark/gettext-0.25.patch
Normal file
15
pkgs/by-name/ex/extractpdfmark/gettext-0.25.patch
Normal file
@@ -0,0 +1,15 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 2e7d562..c8dd741 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -7,6 +7,10 @@ AC_INIT([Extract PDFmark], [1.1.1], , [extractpdfmark],
|
||||
AM_INIT_AUTOMAKE([foreign])
|
||||
AC_CONFIG_SRCDIR([src/main.cc])
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
+AC_CONFIG_MACRO_DIRS([m4])
|
||||
+
|
||||
+AM_GNU_GETTEXT_VERSION([0.25])
|
||||
+AM_GNU_GETTEXT([external])
|
||||
|
||||
PACKAGE_COPYRIGHT="Copyright (C) 2016-2022 Masamichi Hosoda"
|
||||
PACKAGE_LICENSE="License: GPL3+"
|
||||
@@ -20,22 +20,28 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-pNc/SWAtQWMbB2+lIQkJdBYSZ97iJXK71mS59qQa7Hs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./gettext-0.25.patch
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ghostscript
|
||||
poppler
|
||||
texlive.combined.scheme-minimal
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
touch config.rpath
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
ghostscript
|
||||
texlive.combined.scheme-minimal
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/trueroad/extractpdfmark";
|
||||
description = "Extract page mode and named destinations as PDFmark from PDF";
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
addDriverRunpath,
|
||||
config,
|
||||
cudaPackages ? { },
|
||||
cudaPackages_12_4 ? { },
|
||||
cudaSupport ? config.cudaSupport,
|
||||
fetchurl,
|
||||
makeWrapper,
|
||||
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
|
||||
"${ocl-icd}/lib"
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
"${cudaPackages.cudatoolkit}/lib"
|
||||
"${cudaPackages_12_4.cudatoolkit}/lib"
|
||||
]
|
||||
);
|
||||
in
|
||||
|
||||
@@ -11,17 +11,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "holo-cli";
|
||||
version = "0.5.0";
|
||||
version = "0.5.0-unstable-2025-07-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "holo-routing";
|
||||
repo = "holo-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-f34M3U7pitWuH1UQa4uJ/scIOAZiUtDXijOk8wZEm+c=";
|
||||
rev = "f04c1d0dcd6d800e079f33b8431b17fa00afeeb1";
|
||||
hash = "sha256-ZJeXGT5oajynk44550W4qz+OZEx7y52Wwy+DYzrHZig=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-s2em9v4SRQdC0aCD4ZXyhNNYnVKkg9XFzxkOlEFHmL0=";
|
||||
passthru.updateScript = nix-update-script { };
|
||||
cargoHash = "sha256-bsoxWjOMzRRtFGEaaqK0/adhGpDcejCIY0Pzw1HjQ5U=";
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
|
||||
# Use rust nightly features
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "httpx";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "httpx";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-V4OTIUm7KSUSKgQczkOtIw8HlkLEMgvX53a4caQP5IU=";
|
||||
hash = "sha256-PJN7Pmor2pZauW70QDAs4U8Q5kjBrjfyWqEgkUNK+MQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lwk/ajywAJ969U5gpYQgIg8+u1xKARFH+HTk2+OgY4A=";
|
||||
vendorHash = "sha256-loxc8ddnape3d0TVvmAw76oqKJOJ6uFKNnPkPbEXEJ8=";
|
||||
|
||||
subPackages = [ "cmd/httpx" ];
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "hypercore";
|
||||
version = "11.10.0";
|
||||
version = "11.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "holepunchto";
|
||||
repo = "hypercore";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6Z6HbolPa3b4EKjUwNGw7gDAg4ijFadBDwpt3l6GUqo=";
|
||||
hash = "sha256-fv/m/AicHW3cdatpsSAvv+PBo+2J1mE8pK+IWysY7D0=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-ZJxVmQWKgHyKkuYfGIlANXFcROjI7fibg6mxIhDZowM=";
|
||||
|
||||
@@ -16,7 +16,7 @@ buildGoModule rec {
|
||||
# Kubo makes changes to its source tarball that don't match the git source.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz";
|
||||
hash = "sha256-KrNP3JMkyTo6hghLLGWerH1Oz3HsnTI5jCfqRbp6AR8=";
|
||||
hash = "sha256-JbWt6d1cX3F2lmivjszcxcyE+wKYk+Sy03xhb4E3oHw=";
|
||||
};
|
||||
|
||||
# tarball contains multiple files/directories
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
let
|
||||
pname = "ledger-live-desktop";
|
||||
version = "2.118.1";
|
||||
version = "2.120.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
|
||||
hash = "sha256-FG1vlcLUjQpXfoEczvTOyqLFuCYU/72KeAdsg/SMjLQ=";
|
||||
hash = "sha256-zr+m0ytG5wcdI6IvCklpcQVmiaTUaQb5a90lRl1+YxQ=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "nuclei-templates";
|
||||
version = "10.2.4";
|
||||
version = "10.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "nuclei-templates";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RBZjtKkUk+kOob2VBFh1rPrVuUsIBMAetUhMClOZY6s=";
|
||||
hash = "sha256-fJykVJHfuSmnSuR/Sxup8pr+KKwqQoYqLeNLoXMau4E=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
renode.overrideAttrs (
|
||||
finalAttrs: _: {
|
||||
pname = "renode-unstable";
|
||||
version = "1.15.3+20250707gita02ab2a10";
|
||||
version = "1.15.3+20250711gitb35bde0fb";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz";
|
||||
hash = "sha256-T5ptBT0xuxCRwPOR9YnCvVSgrj6aJh7YVeRgRsjJhvI=";
|
||||
hash = "sha256-jjs8e8+ipyrF96c/lKwS8S6JXyiRLy9Lf1RYsU+Tk6s=";
|
||||
};
|
||||
|
||||
passthru.updateScript =
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tailwindcss-language-server";
|
||||
version = "0.14.24";
|
||||
version = "0.14.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tailwindlabs";
|
||||
repo = "tailwindcss-intellisense";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-FlPrDoCGV7w3RBAZPP8gT/RGze9LDYQeAIVVPQA4Na4=";
|
||||
hash = "sha256-uY5hOMuDfLpPFkVoZyISexb/RVtaOK/UpN1WRQ0uDQY=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
# point to this derivations `/dsmi_dir` directory symlink.
|
||||
# Other environment variables might be necessary,
|
||||
# depending on local configuration or usage; see:
|
||||
# https://www.ibm.com/docs/en/storage-protect/8.1.25?topic=solaris-set-api-environment-variables
|
||||
# https://www.ibm.com/docs/en/storage-protect/8.1.27?topic=solaris-set-api-environment-variables
|
||||
|
||||
let
|
||||
|
||||
@@ -91,10 +91,10 @@ let
|
||||
|
||||
unwrapped = stdenv.mkDerivation (finalAttrs: {
|
||||
name = "tsm-client-${finalAttrs.version}-unwrapped";
|
||||
version = "8.1.25.0";
|
||||
version = "8.1.27.0";
|
||||
src = fetchurl {
|
||||
url = mkSrcUrl finalAttrs.version;
|
||||
hash = "sha512-OPNjSMnWJ/8Ogy9O0wG0H4cEbYiOwyCVzkWhpG00v/Vm0LDxLzPteMnMOyH8L1egIDhy7lmQYSzI/EC4WWUDDA==";
|
||||
hash = "sha512-nbQHoD7fUp4qBTgRJ6nHXF4PsZRTin7FGPi340jKc73O/9DCNb1JQG/gY+B2xzPM2g6agqWu/MX5J+Wt0nOEkA==";
|
||||
};
|
||||
inherit meta passthru;
|
||||
|
||||
|
||||
@@ -434,8 +434,8 @@ in
|
||||
};
|
||||
|
||||
ruby_3_4 = generic {
|
||||
version = rubyVersion "3" "4" "4" "";
|
||||
hash = "sha256-oFl7/fMS4BDv0e/6qNfx14MxRv3BeVDKqBWP+j3L+oU=";
|
||||
version = rubyVersion "3" "4" "5" "";
|
||||
hash = "sha256-HYjYontEL93kqgbcmehrC78LKIlj2EMxEt1frHmP1e4=";
|
||||
cargoHash = "sha256-5Tp8Kth0yO89/LIcU8K01z6DdZRr8MAA0DPKqDEjIt0=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -42,14 +42,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nicegui";
|
||||
version = "2.20.0";
|
||||
version = "2.21.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zauberzeug";
|
||||
repo = "nicegui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-XCOFRfG+EkgSKz5Z7Ds9F2Vwl1+7GH7ojxuE6ruvO3Y=";
|
||||
hash = "sha256-pQh3kFFlqfktpW5UtX7smb7qXubX5bMeM46hX8jhtTA=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "requests" ];
|
||||
|
||||
@@ -23,14 +23,14 @@
|
||||
},
|
||||
"35": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "3330a8d349689a341cf0f5f126388ce2c1678c6f8760ba6456eb92d6a6fb87c4",
|
||||
"aarch64-linux": "148ede01556ac18a24d97db60a13346115993a73da40963968da2e951260474f",
|
||||
"armv7l-linux": "fd5fda4137cf9d617c50315eb16710849419b5c60d9cc304b7b5615d8f0fa47f",
|
||||
"aarch64-darwin": "bb266a3687a82e60a97e96ef86c8e6339770d55ab18bc7db6fdf772f212b8f3a",
|
||||
"aarch64-linux": "75f83326b0a5e0c3b04a8286b5dd1c9802d0d5d74f14ae2beba309c474ab4747",
|
||||
"armv7l-linux": "84c8e6dfd311ce62cc9481d3e179ed05fc898c8edf02775ef1749e36b54042b1",
|
||||
"headers": "1w8qcgsbii6gizv31i1nkbhaipcr6r1x384wkwnxp60dk9a6cl59",
|
||||
"x86_64-darwin": "517a770abc9072b2f5335cc0af763fe2e2953fa89d9564640eb75f0eccb2794a",
|
||||
"x86_64-linux": "bddc5a6a1e496e9b87819315dcf188b9b0f7ea8f389d2f4b8326b8d7e0afe956"
|
||||
"x86_64-darwin": "63125423f0ec39dce4d116ff1b56333f24b865e179a3369eff285d42744ca16b",
|
||||
"x86_64-linux": "3aad1702f4c542b637915cdff330281b458417ab099f90c6ef0b30b4df2451d3"
|
||||
},
|
||||
"version": "35.7.1"
|
||||
"version": "35.7.2"
|
||||
},
|
||||
"36": {
|
||||
"hashes": {
|
||||
@@ -45,13 +45,13 @@
|
||||
},
|
||||
"37": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "2f381bb274fc0cb8d3a2bfeadc5dfd84b044305cdd02c7d19234e40e90ac03a9",
|
||||
"aarch64-linux": "fa2a494dd7541ef1184f20ebb56508c84f00e716ce43583cf62c4ba47d4dfcad",
|
||||
"armv7l-linux": "f50dc1e573bee739e2a22ffde1ae503b806e38a09a2ade448374e5181a4edf89",
|
||||
"headers": "18w6pjbs29aqvdiscwl55ajvpib63y4q7g7y4q7hy0nr2vvzycja",
|
||||
"x86_64-darwin": "04112012bae4566b04f636e3101d2ced4522b2c60357a83eaec7cdbda7c036d2",
|
||||
"x86_64-linux": "8f61fba601660839be53625197d836d0e8c8066a54ecc7be468093e4fb6c824b"
|
||||
"aarch64-darwin": "8c8f393de428c03062a35d945f6cf4dc2ad41a98bae5c644fb973473cd13552f",
|
||||
"aarch64-linux": "ccd19d8cbb8efc876c52345eefa884fc618f6a375f0764dc71c1b4341c6b378e",
|
||||
"armv7l-linux": "632f7babe954f4293c45414f7f72ff8d1f76c344e10d2b795a08e93a2bba62b9",
|
||||
"headers": "07n5hlb93l3v6f1x122yhnbn2x0a8cin3is7jqjfky0lacvl0bwa",
|
||||
"x86_64-darwin": "924b1a15398c296eac196e96caf6bf76a236b38e3f23f14b898d8eb902f68ddd",
|
||||
"x86_64-linux": "30bb4de4a63af55615c292aaac025f4c8422b67db7d6b4b8cfd82ee97ad939f8"
|
||||
},
|
||||
"version": "37.2.1"
|
||||
"version": "37.2.2"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,14 +23,14 @@
|
||||
},
|
||||
"35": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "2760c01ae0a292a1d20d3d2fab52120800d5734156e71671b458c6539fd24eee",
|
||||
"aarch64-linux": "038555b79c6f0fdf287cbd1943f9c8109e24c88290d6c4b2947159287129daca",
|
||||
"armv7l-linux": "1b9350313d5fdf4774a51d7b8a4149d49d3ca86e789e682794b0499b54e9ae3f",
|
||||
"aarch64-darwin": "392ec250c65a1448871369318ca15f50c1de1f2afe886fc9e23b31a6484dfaf9",
|
||||
"aarch64-linux": "7f2d0c92979972becbd437b70927c2ee3e42b4ee0dd40fa80e5bb25df2ac9969",
|
||||
"armv7l-linux": "c6a334186af0ac33c81ac8212c99eeb5f67604d0aa84adb574cdc3fc9065a355",
|
||||
"headers": "1w8qcgsbii6gizv31i1nkbhaipcr6r1x384wkwnxp60dk9a6cl59",
|
||||
"x86_64-darwin": "f9ff3b3eb747a2fa0e98e6c408a52e4272d05e477aaa3442debc587e823b385d",
|
||||
"x86_64-linux": "29d379865c8b72645b3d81585af308ebb96cca0c500191bfd042f844d01fa9b8"
|
||||
"x86_64-darwin": "d40fdfa7b7ae6e558b036b38e3fddf090b0685e5f40d7dce335a5fa350fb8fb5",
|
||||
"x86_64-linux": "c8bc2c6beba2654e7ec39e8b8e2e2375bbff411d8c501c933aed27af6c6c1f8b"
|
||||
},
|
||||
"version": "35.7.1"
|
||||
"version": "35.7.2"
|
||||
},
|
||||
"36": {
|
||||
"hashes": {
|
||||
@@ -45,13 +45,13 @@
|
||||
},
|
||||
"37": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "20a854527dac40c643faefa3bd96cc7edc633399da825ff89b67ab5b03728b42",
|
||||
"aarch64-linux": "9b9810af731ca62c75ba49339943e4b251ccba8b0890f0933dfa831333a778ff",
|
||||
"armv7l-linux": "5b36d24fe9c6b26b4734ac70f35f6fd50098175acb207fc87187be4fb38ebb4e",
|
||||
"headers": "18w6pjbs29aqvdiscwl55ajvpib63y4q7g7y4q7hy0nr2vvzycja",
|
||||
"x86_64-darwin": "8398fa0578a60eebb90436749d66d09e23bf4a0c705117bbfa455cb4a5b19746",
|
||||
"x86_64-linux": "413b3e0fb051953d97c920a480ebe364bcd668f31a5ae51c3472d4007bfe4dc5"
|
||||
"aarch64-darwin": "64e21bee8c6f203879a64c90e7b0601809ecaad0e8760d00c427e12d8959f244",
|
||||
"aarch64-linux": "4c497c05b2abf7a1323302f35df68612cab3f957be9152d939aa6defd0f4e3dc",
|
||||
"armv7l-linux": "01d05956b313457795fe1c3450558cb9bf9d68cc26720b91d89ce4554b1f3060",
|
||||
"headers": "07n5hlb93l3v6f1x122yhnbn2x0a8cin3is7jqjfky0lacvl0bwa",
|
||||
"x86_64-darwin": "2682d646495cb7d0fadde52e52c5ac64bf98677563f7f688f32169c7efee43ba",
|
||||
"x86_64-linux": "40c0bbb6a4a2630ea7e0fbcfaa24f62d06ab56991bb7cb4a508936d82f456543"
|
||||
},
|
||||
"version": "37.2.1"
|
||||
"version": "37.2.2"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -57,10 +57,10 @@
|
||||
},
|
||||
"src/electron": {
|
||||
"args": {
|
||||
"hash": "sha256-jdLAmuRf4nw/N8J7FDZwdG/+BXcoD2zVLsur+iNT4gM=",
|
||||
"hash": "sha256-8dTfWg8fn3KIwk88/Bm01To1G+6UQGjQ/4lMUQvl0Js=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"tag": "v35.7.1"
|
||||
"tag": "v35.7.2"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
@@ -1303,10 +1303,10 @@
|
||||
"fetcher": "fetchFromGitiles"
|
||||
}
|
||||
},
|
||||
"electron_yarn_hash": "1p9gs8s1zhwxvvmi9zb76k5nn1wly4yq0i12ibr0wvw5ls8bbars",
|
||||
"electron_yarn_hash": "0knjrmn5kcr72s8zz642fyy0g1f8780v15f8pb8xbhs5bwa3c4m8",
|
||||
"modules": "133",
|
||||
"node": "22.16.0",
|
||||
"version": "35.7.1"
|
||||
"version": "35.7.2"
|
||||
},
|
||||
"36": {
|
||||
"chrome": "136.0.7103.177",
|
||||
@@ -2634,7 +2634,7 @@
|
||||
"version": "36.7.1"
|
||||
},
|
||||
"37": {
|
||||
"chrome": "138.0.7204.97",
|
||||
"chrome": "138.0.7204.100",
|
||||
"chromium": {
|
||||
"deps": {
|
||||
"gn": {
|
||||
@@ -2644,15 +2644,15 @@
|
||||
"version": "2025-05-21"
|
||||
}
|
||||
},
|
||||
"version": "138.0.7204.97"
|
||||
"version": "138.0.7204.100"
|
||||
},
|
||||
"chromium_npm_hash": "sha256-8d5VTHutv51libabhxv7SqPRcHfhVmGDSOvTSv013rE=",
|
||||
"deps": {
|
||||
"src": {
|
||||
"args": {
|
||||
"hash": "sha256-jBRcCFsjel8zBJfcgrYy59SzyYphm01zscYtGo0YFhM=",
|
||||
"hash": "sha256-No95HLCZzwbnG1vSTl/e1hftLDBo6CYIb2qTPs9AobU=",
|
||||
"postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
|
||||
"tag": "138.0.7204.97",
|
||||
"tag": "138.0.7204.100",
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
@@ -2691,10 +2691,10 @@
|
||||
},
|
||||
"src/electron": {
|
||||
"args": {
|
||||
"hash": "sha256-iJiKkKLDbcXnWDi0ZHq6xHB65cm1GsU1gffCPQSNc3Q=",
|
||||
"hash": "sha256-xd96/h+3ECAN6pooHU5tcAsL7bcLHrifWreP+lRFfJk=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"tag": "v37.2.1"
|
||||
"tag": "v37.2.2"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
@@ -2988,8 +2988,8 @@
|
||||
},
|
||||
"src/third_party/devtools-frontend/src": {
|
||||
"args": {
|
||||
"hash": "sha256-7ygnGBAeiLxwbTx5s7LRs9+ZOe06tr8VFcSY5cVHnS4=",
|
||||
"rev": "f8dfe8b36e516cef8a5a169e88d16480d8abdc68",
|
||||
"hash": "sha256-XkyJFRxo3ZTBGfKdTwSIo14SLNPQAKQvY4lEX03j6LM=",
|
||||
"rev": "a6dbe06dafbad00ef4b0ea139ece1a94a5e2e6d8",
|
||||
"url": "https://chromium.googlesource.com/devtools/devtools-frontend"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
@@ -3961,9 +3961,9 @@
|
||||
"fetcher": "fetchFromGitiles"
|
||||
}
|
||||
},
|
||||
"electron_yarn_hash": "10n86jnzcq8kh0nk29ljw9wi1fgj13f07h92b009i1dryagliyrs",
|
||||
"electron_yarn_hash": "167apz9905pfmvq1i34dzcjbzmg3i8jbm27al2xs9lka0rr2qr07",
|
||||
"modules": "136",
|
||||
"node": "22.17.0",
|
||||
"version": "37.2.1"
|
||||
"version": "37.2.2"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,13 +26,13 @@ let
|
||||
|
||||
self = buildGhidraExtension (finalAttrs: {
|
||||
pname = "kaiju";
|
||||
version = "250610";
|
||||
version = "250709";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CERTCC";
|
||||
repo = "kaiju";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-qqUnWakQDOBw3sI/6iWD9140iRAsM5PUEQJSV/3/8FQ=";
|
||||
hash = "sha256-xt/h0HeFCk4s1GIr3wKegGCGIUxMPFfyKKJ9o/WId/E=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -90,6 +90,7 @@ let
|
||||
gimp3 = linux;
|
||||
gpu-screen-recorder = linux;
|
||||
gst_all_1.gst-plugins-bad = linux;
|
||||
kdePackages.kdenlive = linux;
|
||||
lightgbm = linux;
|
||||
llama-cpp = linux;
|
||||
meshlab = linux;
|
||||
@@ -97,6 +98,7 @@ let
|
||||
monado = linux; # Failed in https://github.com/NixOS/nixpkgs/pull/233581
|
||||
noisetorch = linux;
|
||||
obs-studio-plugins.obs-backgroundremoval = linux;
|
||||
octave = linux; # because depend on SuiteSparse which need rebuild when cuda enabled
|
||||
ollama = linux;
|
||||
onnxruntime = linux;
|
||||
openmvg = linux;
|
||||
|
||||
Reference in New Issue
Block a user