Merge c637936870 into haskell-updates

This commit is contained in:
nixpkgs-ci[bot]
2026-02-27 00:29:40 +00:00
committed by GitHub
248 changed files with 4502 additions and 1125 deletions
+4 -2
View File
@@ -58,8 +58,10 @@
/pkgs/top-level/by-name-overlay.nix @infinisil @philiptaron
/pkgs/stdenv @philiptaron @NixOS/stdenv
/pkgs/stdenv/generic @Ericson2314 @NixOS/stdenv
/pkgs/stdenv/generic/check-meta.nix @Ericson2314 @adisbladis @NixOS/stdenv
/pkgs/stdenv/generic/meta-types.nix @adisbladis @NixOS/stdenv
/pkgs/stdenv/generic/problems.nix @infinisil
/pkgs/test/problems @infinisil
/pkgs/stdenv/generic/check-meta.nix @infinisil @Ericson2314 @adisbladis @NixOS/stdenv
/pkgs/stdenv/generic/meta-types.nix @infinisil @adisbladis @NixOS/stdenv
/pkgs/stdenv/cross @Ericson2314 @NixOS/stdenv
/pkgs/build-support @philiptaron
/pkgs/build-support/cc-wrapper @Ericson2314
+3
View File
@@ -629,6 +629,9 @@
"chap-stdenv": [
"index.html#chap-stdenv"
],
"sec-problems": [
"index.html#sec-problems"
],
"sec-using-llvm": [
"index.html#sec-using-llvm"
],
+53
View File
@@ -11,6 +11,8 @@ By default, Nix will prevent installation if any of the following criteria are t
- The package has known security vulnerabilities but has not or can not be updated for some reason, and a list of issues has been entered into the package's `meta.knownVulnerabilities`.
- There are problems for packages which must be acknowledged, e.g. deprecation notices.
Each of these criteria can be altered in the Nixpkgs configuration.
:::{.note}
@@ -166,6 +168,57 @@ There are several ways to tweak how Nix handles a package which has been marked
Note that `permittedInsecurePackages` is only checked if `allowInsecurePredicate` is not specified.
## Packages with problems {#sec-problems}
A package may have several problems associated with it.
These can be either manually declared in `meta.problems`, or automatically generated from its other `meta` attributes.
Each problem has a name, a "kind", a message, and optionally a list of URLs.
Not all kinds can be manually specified in `meta.problems`, and some kinds can exist only up to once per package.
Currently, the following problem kinds are known (with more reserved to be added in the future):
- "removal": The package is planned to be removed some time in the future. Unique.
- "deprecated": The package relies on software which has reached its end of life.
- "maintainerless": Automatically generated for packages with `meta.maintainers == []`. Unique, not manually specifiable.
Each problem has a handler that deals with it, which can be one of "error", "warn" or "ignore".
"error" will disallow evaluating a package, while "warn" will simply print a message to the log.
The handler for problems can be specified using `config.problems.handlers.${packageName}.${problemName} = "${handler}";`.
There is also the possibility to specify some generic matchers, which can set a handler for more than a specific problem of a specific package.
This works through the `config.problems.matchers` option:
```nix
{
problems.matchers = [
# Fail to build any packages which are about to be removed anyway
{
kind = "removal";
handler = "error";
}
# Get warnings when using packages with no declared maintainers
{
kind = "maintainerless";
handler = "warn";
}
# You deeply care about this package and want to absolutely know when it has any problems
{
package = "hello";
handler = "error";
}
];
}
```
Matchers can match one or more of package name, problem name or problem kind.
If multiple conditions are present, all must be met to match.
If multiple matchers match a problem, then the highest severity handler will be chosen.
The current default value contains `{ kind = "removal"; handler = "warn"; }`, meaning that people will be notified about package removals in advance.
Package names for both `problems.handlers` and `problems.matchers` are taken from `lib.getName`, which looks at the `pname` first and falls back to extracting the "pname" part from the `name` attribute.
## Modify packages via `packageOverrides` {#sec-modify-via-packageOverrides}
You can define a function called `packageOverrides` in your local `~/.config/nixpkgs/config.nix` to override Nix packages. It must be a function that takes pkgs as an argument and returns a modified set of packages.
@@ -36,7 +36,7 @@ if test -z "$CABAL_DIR"; then
fi
fi
package_list="$(nix-build -A haskell.package-list)/nixos-hackage-packages.csv"
package_list="$(nix-build --arg config '{ allowAliases = false; }' -A haskell.package-list)/nixos-hackage-packages.csv"
username=$(grep "^username:" "$CABAL_DIR/config" | sed "s/^username: //")
password_command=$(grep "^password-command:" "$CABAL_DIR/config" | sed "s/^password-command: //")
curl -u "$username:$($password_command | head -n1)" --digest -H "Content-type: text/csv" -T "$package_list" https://hackage.haskell.org/distro/NixOS/packages.csv
+5 -2
View File
@@ -282,8 +282,11 @@ in
default = false;
description = ''
Whether to generate the manual page index caches at runtime using
a systemd service. Note that this is currently only supported by the
man-db module.
a systemd service.
::: {.note}
This is currently only supported by the man-db module.
:::
'';
};
+9 -2
View File
@@ -5,6 +5,9 @@
...
}:
let
cfg = config.programs.nm-applet;
in
{
meta = {
maintainers = lib.teams.freedesktop.members;
@@ -21,15 +24,19 @@
It is needed for Appindicator environments, like Enlightenment.
'';
};
package = lib.mkPackageOption pkgs "networkmanagerapplet" { };
};
config = lib.mkIf config.programs.nm-applet.enable {
config = lib.mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
systemd.user.services.nm-applet = {
description = "Network manager applet";
wantedBy = [ "graphical-session.target" ];
partOf = [ "graphical-session.target" ];
after = [ "graphical-session.target" ];
serviceConfig.ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet ${lib.optionalString config.programs.nm-applet.indicator "--indicator"}";
serviceConfig.ExecStart = "${cfg.package}/bin/nm-applet ${lib.optionalString cfg.indicator "--indicator"}";
};
services.dbus.packages = [ pkgs.gcr ];
+8 -48
View File
@@ -81,14 +81,6 @@ let
Bucket = cfg.storage.gcp.bucket;
JSONKey = cfg.storage.gcp.jsonKey;
};
Minio = {
Endpoint = cfg.storage.minio.endpoint;
Key = cfg.storage.minio.key;
Secret = cfg.storage.minio.secret;
EnableSSL = cfg.storage.minio.enableSSL;
Bucket = cfg.storage.minio.bucket;
region = cfg.storage.minio.region;
};
Mongo = {
URL = cfg.storage.mongo.url;
DefaultDBName = cfg.storage.mongo.defaultDBName;
@@ -303,7 +295,6 @@ in
"disk"
"mongo"
"gcp"
"minio"
"s3"
"azureblob"
"external"
@@ -700,44 +691,6 @@ in
};
};
minio = {
endpoint = lib.mkOption {
type = lib.types.nullOr lib.types.str;
description = "Endpoint of the minio storage backend.";
example = "minio.example.com:9001";
default = null;
};
key = lib.mkOption {
type = lib.types.nullOr lib.types.str;
description = "Access key id for the minio storage backend.";
example = "minio";
default = null;
};
secret = lib.mkOption {
type = lib.types.nullOr lib.types.str;
description = "Secret key for the minio storage backend. Warning: this is stored in plain text in the config file.";
example = "minio123";
default = null;
};
enableSSL = lib.mkOption {
type = lib.types.bool;
description = "Enable SSL for the minio storage backend.";
default = false;
};
bucket = lib.mkOption {
type = lib.types.nullOr lib.types.str;
description = "Bucket name for the minio storage backend.";
example = "gomods";
default = null;
};
region = lib.mkOption {
type = lib.types.nullOr lib.types.str;
description = "Region for the minio storage backend.";
example = "us-east-1";
default = null;
};
};
mongo = {
url = lib.mkOption {
type = lib.types.nullOr lib.types.str;
@@ -774,7 +727,6 @@ in
key = lib.mkOption {
type = lib.types.nullOr lib.types.str;
description = "Access key id for the S3 storage backend.";
example = "minio";
default = null;
};
secret = lib.mkOption {
@@ -991,4 +943,12 @@ in
};
};
imports = [
(lib.mkRemovedOptionModule [
"services"
"athens"
"storage"
"minio"
] "Support for Minio storage backend has been removed, as minio is unmaintained.")
];
}
@@ -66,7 +66,7 @@ let
rule_files = optionals (!(cfg.enableAgentMode)) (
map (promtoolCheck "check rules" "rules") (
cfg.ruleFiles
++ [
++ optionals (builtins.length cfg.rules > 0) [
(pkgs.writeText "prometheus.rules" (concatStringsSep "\n" cfg.rules))
]
)
+37 -16
View File
@@ -9,7 +9,18 @@ let
# In case it ever shows up in the VM, we could OCR for it instead
wallpaperText = "Lorem ipsum";
# tmpfiles setup to make OCRing on terminal output more reliable
# setup to make OCRing on terminal output more reliable
terminalTextColour = {
r = 91;
g = 113;
b = 102;
};
terminalTextColourString =
lib:
let
toHex = component: lib.optionalString (component < 16) "0" + lib.trivial.toHexString component;
in
"#${toHex terminalTextColour.r}${toHex terminalTextColour.g}${toHex terminalTextColour.b}";
terminalOcrTmpfilesSetup =
{
pkgs,
@@ -18,7 +29,7 @@ let
}:
let
white = "255, 255, 255";
black = "0, 0, 0";
foreground = "${toString terminalTextColour.r}, ${toString terminalTextColour.g}, ${toString terminalTextColour.b}";
colorSection = color: {
Color = color;
Bold = true;
@@ -27,9 +38,9 @@ let
terminalColors = pkgs.writeText "customized.colorscheme" (
lib.generators.toINI { } {
Background = colorSection white;
Foreground = colorSection black;
Color2 = colorSection black;
Color2Intense = colorSection black;
Foreground = colorSection foreground;
Color2 = colorSection foreground;
Color2Intense = colorSection foreground;
}
);
terminalConfig = pkgs.writeText "terminal.ubports.conf" (
@@ -75,7 +86,7 @@ let
};
};
sharedTestFunctions = ''
sharedTestFunctions = lib: ''
from collections.abc import Callable
import tempfile
import subprocess
@@ -120,6 +131,17 @@ let
)
return check_for_color_continued_presence_retry
def ensure_terminal_running() -> None:
"""
Ensure that lomiri-terminal-app has finished starting up.
"""
terminalTextColor: str = "${terminalTextColourString lib}"
with machine.nested("Waiting for the screen to have terminalTextColor {} on it:".format(terminalTextColor)):
retry(check_for_color(terminalTextColor))
with machine.nested("Ensuring terminalTextColor {} stays present on the screen:".format(terminalTextColor)):
retry(fn=check_for_color_continued_presence(terminalTextColor), timeout_seconds=5)
def ensure_lomiri_running() -> None:
"""
Ensure that Lomiri has finished starting up.
@@ -183,7 +205,6 @@ let
# Using the keybind has a chance of instantly closing the menu again? Just click the button
mouse_click(15, 15)
'';
makeIndicatorTest =
@@ -237,7 +258,7 @@ let
testScript =
{ nodes, ... }:
sharedTestFunctions
(sharedTestFunctions lib)
+ ''
start_all()
machine.wait_for_unit("multi-user.target")
@@ -330,7 +351,7 @@ in
testScript =
{ nodes, ... }:
sharedTestFunctions
(sharedTestFunctions lib)
+ ''
start_all()
machine.wait_for_unit("multi-user.target")
@@ -451,7 +472,7 @@ in
testScript =
{ nodes, ... }:
sharedTestFunctions
(sharedTestFunctions lib)
+ ''
start_all()
machine.wait_for_unit("multi-user.target")
@@ -463,7 +484,7 @@ in
# Working terminal keybind is good
with subtest("terminal keybind works"):
machine.send_key("ctrl-alt-t")
wait_for_text(r"(${user}|machine)")
ensure_terminal_running()
machine.screenshot("terminal_opens")
machine.send_key("alt-f4")
@@ -474,7 +495,7 @@ in
# Just try the terminal again, we know that it should work
machine.send_chars("Terminal\n")
wait_for_text(r"(${user}|machine)")
ensure_terminal_running()
machine.send_key("alt-f4")
# We want support for X11 apps
@@ -598,7 +619,7 @@ in
testScript =
{ nodes, ... }:
sharedTestFunctions
(sharedTestFunctions lib)
+ ''
start_all()
machine.wait_for_unit("multi-user.target")
@@ -610,7 +631,7 @@ in
# Working terminal keybind is good
with subtest("terminal keybind works"):
machine.send_key("ctrl-alt-t")
wait_for_text(r"(${user}|machine)")
ensure_terminal_running()
machine.screenshot("terminal_opens")
# for the LSS lomiri-content-hub test to work reliably, we need to kick off peer collecting
@@ -744,7 +765,7 @@ in
testScript =
{ nodes, ... }:
sharedTestFunctions
(sharedTestFunctions lib)
+ ''
start_all()
machine.wait_for_unit("multi-user.target")
@@ -773,7 +794,7 @@ in
# Lomiri in desktop mode should use the correct keymap
with subtest("lomiri session keymap works"):
machine.send_key("ctrl-alt-t")
wait_for_text(r"(${user}|machine)")
ensure_terminal_running()
machine.screenshot("terminal_opens")
machine.send_chars("touch ${pwInput}\n")
+2 -2
View File
@@ -1,6 +1,6 @@
{ lib, fetchFromGitHub }:
rec {
version = "9.1.2109";
version = "9.1.2148";
outputs = [
"out"
@@ -11,7 +11,7 @@ rec {
owner = "vim";
repo = "vim";
rev = "v${version}";
hash = "sha256-Lglu940Uf0ZOaitoI41XK4Xgk7e1UeXsfdIxOMgNQ18=";
hash = "sha256-4ZEbfpffPp6kqSQRp7NFioWGRdG+JsVf7unU0Hqn/Xk=";
};
enableParallelBuilding = true;
@@ -5422,6 +5422,19 @@ final: prev: {
meta.hydraPlatforms = [ ];
};
flow-nvim = buildVimPlugin {
pname = "flow.nvim";
version = "2.0.2-unstable-2026-02-25";
src = fetchFromGitHub {
owner = "0xstepit";
repo = "flow.nvim";
rev = "1fe4ff584b53298e41a9f8cf108f23967cc9280c";
hash = "sha256-fc3H89D2xW2GZuJiHDgRJz5zYt8FQ4Azqh0o5HGcgLw=";
};
meta.homepage = "https://github.com/0xstepit/flow.nvim/";
meta.hydraPlatforms = [ ];
};
fluent-vim = buildVimPlugin {
pname = "fluent.vim";
version = "0-unstable-2025-04-26";
@@ -1255,6 +1255,13 @@ assertNoAdditions {
dependencies = [ self.nvzone-volt ];
};
flow-nvim = super.flow-nvim.overrideAttrs {
nvimSkipModules = [
# Optional barbecue integration requires flow.setup() first.
"barbecue.theme.flow"
];
};
flutter-tools-nvim = super.flutter-tools-nvim.overrideAttrs {
# Optional dap integration
checkInputs = [ self.nvim-dap ];
@@ -415,6 +415,7 @@ https://github.com/ncm2/float-preview.nvim/,,
https://github.com/nvzone/floaterm/,HEAD,
https://github.com/liangxianzhe/floating-input.nvim/,HEAD,
https://github.com/floobits/floobits-neovim/,,
https://github.com/0xstepit/flow.nvim/,HEAD,
https://github.com/projectfluent/fluent.vim/,HEAD,
https://github.com/nvim-flutter/flutter-tools.nvim/,HEAD,
https://github.com/nvim-focus/focus.nvim/,HEAD,
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "claude-code";
publisher = "anthropic";
version = "2.1.49";
hash = "sha256-9WwA1TUM/h8kLoZV/ukh/4s3w9DnJ/cVAxypz4jlj6A=";
version = "2.1.59";
hash = "sha256-j8tZSPTHlCFVCCCUl54MqvA3eRczfu8byEEbn7KHTPY=";
};
postInstall = ''
@@ -14,13 +14,13 @@
}:
mkLibretroCore {
core = "play";
version = "0-unstable-2026-02-16";
version = "0-unstable-2026-02-23";
src = fetchFromGitHub {
owner = "jpd002";
repo = "Play-";
rev = "2a125b5d28cb2c02cbd2fdb00ce268581ffca05b";
hash = "sha256-tYB2xcIU7O6BizHSSS4CPQMbLsnlHZKqcx26WypWt1E=";
rev = "8369490f332bc09d1c8f9e707ee34e01cf13e4cb";
hash = "sha256-/cltskT4cJ8/tExSN324JVGVCOhOWrOJg+47RaGR3yE=";
fetchSubmodules = true;
};
@@ -1418,13 +1418,13 @@
"vendorHash": null
},
"vancluever_acme": {
"hash": "sha256-hviw2syXALi3B47jwfvEn61sOOZ1qvUMWJE7Ob6M36U=",
"hash": "sha256-uRIOLFIzT4hIXMtoyHk0UB5R5xGr0DELF5hd+E5Xx1k=",
"homepage": "https://registry.terraform.io/providers/vancluever/acme",
"owner": "vancluever",
"repo": "terraform-provider-acme",
"rev": "v2.44.1",
"rev": "v2.45.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-FSyJ5ZCaGbMZbDop/Pj8TKaUAeOBNz/RSfV/rkVYbD0="
"vendorHash": "sha256-S8eG43mHNyPOm2Iuww9DjU7o/x2MMSJExpmBAQ8QDGY="
},
"venafi_venafi": {
"hash": "sha256-wpAckNRqZjSDt7KpCRpLSYkn6Gm+QPzn5sIJ90wRXjI=",
@@ -1,6 +1,6 @@
{
stdenv,
lib,
stdenv,
gitUpdater,
testers,
fetchFromGitHub,
@@ -14,35 +14,40 @@
libjpeg,
libwebp,
zlib,
withGUI ? true,
qtbase ? null,
wrapQtAppsHook ? null,
withQt5 ? false,
qt5,
withQt6 ? false,
qt6,
}:
assert withGUI -> qtbase != null && wrapQtAppsHook != null;
assert !(withQt5 && withQt6);
let
qt = if withQt5 then qt5 else qt6;
withGUI = withQt5 || withQt6;
in
stdenv.mkDerivation (finalAttrs: {
pname = "alice-tools" + lib.optionalString withGUI "-qt${lib.versions.major qtbase.version}";
pname = "alice-tools" + lib.optionalString withGUI "-qt${lib.versions.major qt.qtbase.version}";
version = "0.13.0";
src = fetchFromGitHub {
owner = "nunuhara";
repo = "alice-tools";
rev = finalAttrs.version;
tag = finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-DazWnBeI5XShkIx41GFZLP3BbE0O8T9uflvKIZUXCHo=";
};
postPatch = lib.optionalString (withGUI && lib.versionAtLeast qtbase.version "6.0") ''
postPatch = lib.optionalString (withGUI && withQt6) ''
# Use Meson's Qt6 module
substituteInPlace src/meson.build \
--replace qt5 qt6
# For some reason Meson uses QMake instead of pkg-config detection method for Qt6 on Darwin, which gives wrong search paths for tools
export PATH=${qtbase.dev}/libexec:$PATH
export PATH=${qt.qtbase.dev}/libexec:$PATH
'';
mesonFlags = lib.optionals (withGUI && lib.versionAtLeast qtbase.version "6.0") [
mesonFlags = lib.optionals (withGUI && withQt6) [
# Qt6 requires at least C++17, project uses compiler's default, default too old on Darwin & aarch64-linux
"-Dcpp_std=c++17"
];
@@ -55,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
flex
]
++ lib.optionals withGUI [
wrapQtAppsHook
qt.wrapQtAppsHook
];
buildInputs = [
@@ -66,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
zlib
]
++ lib.optionals withGUI [
qtbase
qt.qtbase
];
dontWrapQtApps = true;
@@ -102,6 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ OPNA2608 ];
changelog = "https://github.com/nunuhara/alice-tools/releases/tag/${finalAttrs.src.tag}";
mainProgram = if withGUI then "galice" else "alice";
};
})
+15 -50
View File
@@ -2,7 +2,7 @@
fetchurl,
lib,
stdenv,
coreutils,
jre,
makeWrapper,
gitUpdater,
}:
@@ -11,6 +11,8 @@ stdenv.mkDerivation (finalAttrs: {
pname = "ant";
version = "1.10.15";
buildInputs = [ jre ];
nativeBuildInputs = [ makeWrapper ];
src = fetchurl {
@@ -19,60 +21,23 @@ stdenv.mkDerivation (finalAttrs: {
};
installPhase = ''
mkdir -p $out/bin $out/share/ant
mkdir -p $out/share/ant
mv * $out/share/ant/
# Get rid of the manual (35 MiB). Maybe we should put this in a
# separate output. Keep the antRun script since it's vanilla sh
# and needed for the <exec/> task (but since we set ANT_HOME to
# a weird value, we have to move antRun to a weird location).
# Get rid of the other Ant scripts since we provide our own.
mv $out/share/ant/bin/antRun $out/bin/
rm -rf $out/share/ant/{manual,bin,WHATSNEW}
mkdir $out/share/ant/bin
mv $out/bin/antRun $out/share/ant/bin/
# separate output.
rm -rf $out/share/ant/{manual,WHATSNEW}
cat >> $out/bin/ant <<EOF
#! ${stdenv.shell} -e
# Link Ant's special $ANT_HOME/bin to the standard /bin location
ln -s $out/share/ant/bin $out
ANT_HOME=$out/share/ant
# Find the JDK by looking for javac. As a fall-back, find the
# JRE by looking for java. The latter allows just the JRE to be
# used with (say) ECJ as the compiler. Finally, allow the GNU
# JVM.
if [ -z "\''${JAVA_HOME-}" ]; then
for i in javac java gij; do
if p="\$(type -p \$i)"; then
export JAVA_HOME="\$(${coreutils}/bin/dirname \$(${coreutils}/bin/dirname \$(${coreutils}/bin/readlink -f \$p)))"
break
fi
done
if [ -z "\''${JAVA_HOME-}" ]; then
echo "\$0: cannot find the JDK or JRE" >&2
exit 1
fi
fi
if [ -z \$NIX_JVM ]; then
if [ -e \$JAVA_HOME/bin/java ]; then
NIX_JVM=\$JAVA_HOME/bin/java
elif [ -e \$JAVA_HOME/bin/gij ]; then
NIX_JVM=\$JAVA_HOME/bin/gij
else
NIX_JVM=java
fi
fi
LOCALCLASSPATH="\$ANT_HOME/lib/ant-launcher.jar\''${LOCALCLASSPATH:+:}\$LOCALCLASSPATH"
exec \$NIX_JVM \$NIX_ANT_OPTS \$ANT_OPTS -classpath "\$LOCALCLASSPATH" \
-Dant.home=\$ANT_HOME -Dant.library.dir="\$ANT_LIB" \
org.apache.tools.ant.launch.Launcher \$NIX_ANT_ARGS \$ANT_ARGS \
-cp "\$CLASSPATH" "\$@"
EOF
chmod +x $out/bin/ant
# Wrap the wrappers.
for wrapper in ant runant.py runant.pl; do
wrapProgram "$out/share/ant/bin/$wrapper" \
--set-default JAVA_HOME "${jre.home}" \
--set-default ANT_HOME "$out/share/ant" \
--prefix CLASSPATH : "$out/share/ant/lib"
done
'';
passthru = {
@@ -43,16 +43,16 @@
},
"ai-examples": {
"pname": "ai-examples",
"version": "0.2.5",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/ai_examples-0.2.5-py2.py3-none-any.whl",
"hash": "sha256-utvfX8LgtKhcQSTT/JKFm1gq348w9XJ0QM6BlCFACZo=",
"version": "0.2.6",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/ai_examples-0.2.6-py2.py3-none-any.whl",
"hash": "sha256-z5G04SBrhpBQHYR8vkbD7BP2We96TTZ63XTtXo+X1pw=",
"description": "Add AI powered examples to help content"
},
"aks-preview": {
"pname": "aks-preview",
"version": "19.0.0b18",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-19.0.0b18-py2.py3-none-any.whl",
"hash": "sha256-MN2tw4w7jd7d4Ej6c1mVR8XjOHuqLBADphn0GXzyuqk=",
"version": "19.0.0b22",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-19.0.0b22-py2.py3-none-any.whl",
"hash": "sha256-/TBJnRAsSSDTGP114fkkQeJ2gzryA8LQQMY+7/G71PI=",
"description": "Provides a preview for upcoming AKS features"
},
"alb": {
@@ -111,6 +111,13 @@
"hash": "sha256-re+iMmNO+fYl5j5oTGy4vm6OHATHytv5TIaYl2k6fVg=",
"description": "Microsoft Azure Command-Line Tools ArizeAi Extension"
},
"artifact-signing": {
"pname": "artifact-signing",
"version": "1.0.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/artifact_signing-1.0.0-py3-none-any.whl",
"hash": "sha256-u9BK1SQm5p6aJBkvL+Di7S21WuYfuRtrizoDA739DH8=",
"description": "Microsoft Azure Command-Line Tools Artifact Signing Extension"
},
"astronomer": {
"pname": "astronomer",
"version": "1.0.1",
@@ -134,16 +141,16 @@
},
"automation": {
"pname": "automation",
"version": "1.0.0b1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/automation-1.0.0b1-py3-none-any.whl",
"hash": "sha256-0x/gQz+jCm4An3ub7mxBemhu2HUC3Zh7msitETODkVs=",
"version": "1.0.0b2",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/automation-1.0.0b2-py3-none-any.whl",
"hash": "sha256-sdk0uNtQX6yBiEboywNE8FAreY1pBiimah0PdmCDRYg=",
"description": "Microsoft Azure Command-Line Tools AutomationClient Extension"
},
"azure-firewall": {
"pname": "azure-firewall",
"version": "2.0.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-2.0.0-py2.py3-none-any.whl",
"hash": "sha256-tIX7vovIVGe9NsBg3N8LbwyVsxgurJKXLUtUYveaZtA=",
"version": "2.0.1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-2.0.1-py2.py3-none-any.whl",
"hash": "sha256-SLnSVacJ47P96ICUt33/6cRz+0YRY+FrkwhowtTMD68=",
"description": "Manage Azure Firewall resources"
},
"azurelargeinstance": {
@@ -162,9 +169,9 @@
},
"bastion": {
"pname": "bastion",
"version": "1.4.2",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/bastion-1.4.2-py3-none-any.whl",
"hash": "sha256-TTaKDFaydQ4lW+LfvEHbWX4WARj3Xwg/yeHmq9aNEoI=",
"version": "1.4.3",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/bastion-1.4.3-py3-none-any.whl",
"hash": "sha256-ikMk58o8e8VhZ7bzq++2RRxOv3p/eQ9eX5+eC7qyFdk=",
"description": "Microsoft Azure Command-Line Tools Bastion Extension"
},
"billing-benefits": {
@@ -176,9 +183,9 @@
},
"blueprint": {
"pname": "blueprint",
"version": "1.0.0b1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/blueprint-1.0.0b1-py3-none-any.whl",
"hash": "sha256-WVBTayQ3Asbs5Q8sE8d4q68xIJN6i0cZiNHV+8szmlQ=",
"version": "1.0.0b2",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/blueprint-1.0.0b2-py3-none-any.whl",
"hash": "sha256-KVtkhYL1+HnnJnmZt7AtZpfFvve/hcpmFw2EfzSHGLc=",
"description": "Microsoft Azure Command-Line Tools Blueprint Extension"
},
"carbon": {
@@ -288,9 +295,9 @@
},
"databricks": {
"pname": "databricks",
"version": "1.2.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/databricks-1.2.0-py3-none-any.whl",
"hash": "sha256-3Zdbp+OP7mgXQ8cSjidSba8BO8kB4Bx1pWwyFFD+7Yw=",
"version": "1.3.1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/databricks-1.3.1-py3-none-any.whl",
"hash": "sha256-D6+Sbp49vxPP/IENPPn6TSL3qhwgBZyWBB3KjSgjdCc=",
"description": "Microsoft Azure Command-Line Tools DatabricksClient Extension"
},
"datadog": {
@@ -328,6 +335,13 @@
"hash": "sha256-8agBvQw46y6/nC+04LQ6mEcK57QLvNBesqpZbWlXnJ4=",
"description": "Microsoft Azure Command-Line Tools DataShareManagementClient Extension"
},
"dell": {
"pname": "dell",
"version": "1.0.0b1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/dell-1.0.0b1-py3-none-any.whl",
"hash": "sha256-v3Ue6o9sjuG9/Nn2nPuNx9O61bWr0h8MS792bYztVFw=",
"description": "Support for managing Dell.Storage filesystem resources"
},
"dependency-map": {
"pname": "dependency-map",
"version": "1.0.0b1",
@@ -358,9 +372,9 @@
},
"devcenter": {
"pname": "devcenter",
"version": "7.0.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/devcenter-7.0.0-py3-none-any.whl",
"hash": "sha256-UQgGkRRJ3WGPKT3agMb533CKD/A1dq/66Z/4K13VuK0=",
"version": "8.0.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/devcenter-8.0.0-py3-none-any.whl",
"hash": "sha256-bdtqIfedTken/0rh+2F/MhdDtl1+mshQFXUX2/2ejpA=",
"description": "Microsoft Azure Command-Line Tools DevCenter Extension"
},
"diskpool": {
@@ -407,9 +421,9 @@
},
"edge-action": {
"pname": "edge-action",
"version": "1.0.0b2",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/edge_action-1.0.0b2-py3-none-any.whl",
"hash": "sha256-wtIkeQPRlEAEL/PXTVuPaUoQbabFKDKLc/RML+qaBGM=",
"version": "1.0.0b3",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/edge_action-1.0.0b3-py3-none-any.whl",
"hash": "sha256-rAC5OVb2crUfQR1DkQmW09Ifft55aAnYgM7s8frPzW4=",
"description": "Microsoft Azure Command-Line Tools Extension for Azure Front Door Edge Actions"
},
"edgeorder": {
@@ -463,9 +477,9 @@
},
"fleet": {
"pname": "fleet",
"version": "1.8.2",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.8.2-py3-none-any.whl",
"hash": "sha256-3YRF7R7NB8zPonNcgv4Cfs3gk55pgTAbeo1tGOH6fsA=",
"version": "1.8.3",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.8.3-py3-none-any.whl",
"hash": "sha256-KY4lXsFf1Rxhcblyfxw904dWHxdWR17L864qiIpYYOQ=",
"description": "Microsoft Azure Command-Line Tools Fleet Extension"
},
"fluid-relay": {
@@ -484,9 +498,9 @@
},
"front-door": {
"pname": "front-door",
"version": "1.4.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/front_door-1.4.0-py3-none-any.whl",
"hash": "sha256-9chF08+QQe2WYR/vvifE9AzjYV4X26TweeGf2U5zcGA=",
"version": "2.1.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/front_door-2.1.0-py3-none-any.whl",
"hash": "sha256-7aa9A+tq+qXzMuabG9McHkXpU3TRZVjQWDbmuHTTsFk=",
"description": "Manage networking Front Doors"
},
"fzf": {
@@ -533,9 +547,9 @@
},
"healthbot": {
"pname": "healthbot",
"version": "0.1.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/healthbot-0.1.0-py3-none-any.whl",
"hash": "sha256-kTT60lEVFucUpds0bWOGWvC63wWZrePxwV+soAVVhaM=",
"version": "1.0.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/healthbot-1.0.0-py3-none-any.whl",
"hash": "sha256-X6M+iVNShC9YBliy2Ynf5TVUDKo3ZTaqu1yvFn6v6Ew=",
"description": "Microsoft Azure Command-Line Tools HealthbotClient Extension"
},
"healthcareapis": {
@@ -547,9 +561,9 @@
},
"hpc-cache": {
"pname": "hpc-cache",
"version": "0.1.5",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/hpc_cache-0.1.5-py2.py3-none-any.whl",
"hash": "sha256-hSy0F6rfCtB+PFFBOFjEE79x6my0m6WCidlXL5o1BQc=",
"version": "0.1.6",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/hpc_cache-0.1.6-py2.py3-none-any.whl",
"hash": "sha256-aUNk9avjsiJnqOVNULsANeO/IXkjRV76a8u+c5O4Bso=",
"description": "Microsoft Azure Command-Line Tools StorageCache Extension"
},
"image-copy-extension": {
@@ -561,9 +575,9 @@
},
"image-gallery": {
"pname": "image-gallery",
"version": "1.0.0b1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/image_gallery-1.0.0b1-py2.py3-none-any.whl",
"hash": "sha256-WwVNZ7dYcfXELlsSNrkhKgtolYE4oNRIQJ1DoJxzIZE=",
"version": "1.0.0b2",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/image_gallery-1.0.0b2-py2.py3-none-any.whl",
"hash": "sha256-Q2lgO2YZvvwKoTi+7WDLuBbN2HuCa8DcdcC31RgNLCw=",
"description": "Support for Azure Image Gallery"
},
"import-export": {
@@ -603,11 +617,18 @@
},
"k8s-runtime": {
"pname": "k8s-runtime",
"version": "2.0.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_runtime-2.0.0-py3-none-any.whl",
"hash": "sha256-SSW6qtKarGtCPsi88PWG4IWX5YzTQ9WoyNqiKbx8mok=",
"version": "2.0.1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_runtime-2.0.1-py3-none-any.whl",
"hash": "sha256-gGI8vYgtiVgf/oQsWYp3O4mzRoDf5uzvkhevkX53dWM=",
"description": "Microsoft Azure Command-Line Tools K8sRuntime Extension"
},
"keyvault-preview": {
"pname": "keyvault-preview",
"version": "1.0.2",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/keyvault_preview-1.0.2-py3-none-any.whl",
"hash": "sha256-2O5Pzvs7z/So+CqgiLe+BOJuvClJIhQABGM4Cxsfmu0=",
"description": "Microsoft Azure Command-Line Tools Keyvault-preview Extension"
},
"kusto": {
"pname": "kusto",
"version": "0.5.0",
@@ -694,9 +715,9 @@
},
"migrate": {
"pname": "migrate",
"version": "3.0.0b2",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/migrate-3.0.0b2-py3-none-any.whl",
"hash": "sha256-UShJtaTygedXgcITDUStH3PAhxyvFBtwMutz/vYJ+s8=",
"version": "3.0.0b3",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/migrate-3.0.0b3-py3-none-any.whl",
"hash": "sha256-Yyos4j33u3xCu+xuUt53ifCF5TD2m5YRjw2j66CIah4=",
"description": "Support for Azure Migrate preview"
},
"mixed-reality": {
@@ -771,9 +792,9 @@
},
"nginx": {
"pname": "nginx",
"version": "2.0.0b9",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/nginx-2.0.0b9-py2.py3-none-any.whl",
"hash": "sha256-zJDRh3cN4Qdz4w3QOAuhs+2+C+ku/lKjP54Am3wJXTk=",
"version": "2.0.0b10",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/nginx-2.0.0b10-py2.py3-none-any.whl",
"hash": "sha256-RYvMtOEopLUbYUPt1RxECyGEyDc4aOAt2hp7Orv0DAM=",
"description": "Microsoft Azure Command-Line Tools Nginx Extension"
},
"notification-hub": {
@@ -862,9 +883,9 @@
},
"quantum": {
"pname": "quantum",
"version": "1.0.0b10",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/quantum-1.0.0b10-py3-none-any.whl",
"hash": "sha256-ihvof5C7EOMq65Ljbv2ax9Lri67AY0kSBb687dUGAv0=",
"version": "1.0.0b11",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/quantum-1.0.0b11-py3-none-any.whl",
"hash": "sha256-LcfF4Rmfr4L4R0n41g4RngDyfTeRZheZuNqGP4kI5Yk=",
"description": "Microsoft Azure Command-Line Tools Quantum Extension"
},
"qumulo": {
@@ -918,9 +939,9 @@
},
"scheduled-query": {
"pname": "scheduled-query",
"version": "1.0.0b1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/scheduled_query-1.0.0b1-py2.py3-none-any.whl",
"hash": "sha256-/V5p0EOLgInb4ZfVukxBd2rtkGlBysN0dVpMkETErwQ=",
"version": "1.0.0b2",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/scheduled_query-1.0.0b2-py2.py3-none-any.whl",
"hash": "sha256-UuY4rZntL543bBkYaAwNzCtmGVsZ5npROl0ozVizUJw=",
"description": "Microsoft Azure Command-Line Tools Scheduled_query Extension"
},
"scvmm": {
@@ -974,9 +995,9 @@
},
"stack-hci-vm": {
"pname": "stack-hci-vm",
"version": "1.11.6",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/stack_hci_vm-1.11.6-py3-none-any.whl",
"hash": "sha256-JyLErSQLS0cMKClSc9q97gdwCtfr0X2ilcP4EuE0V60=",
"version": "1.11.9",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/stack_hci_vm-1.11.9-py3-none-any.whl",
"hash": "sha256-MX5rPOARe9r9kglMz+R8EnMrZ/nxL9ICK5hzXEWXjWk=",
"description": "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension"
},
"standbypool": {
@@ -995,9 +1016,9 @@
},
"storage-actions": {
"pname": "storage-actions",
"version": "1.0.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_actions-1.0.0-py3-none-any.whl",
"hash": "sha256-OzMuN2blvmoj9GuzU1X3O2PJ0Yr8rsnFXYzypAJlF58=",
"version": "1.1.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_actions-1.1.0-py3-none-any.whl",
"hash": "sha256-Xj0KOug3QlFFUeNMtx/ygecOTZhtLsGYnlTX07dhk04=",
"description": "Microsoft Azure Command-Line Tools StorageActions Extension"
},
"storage-blob-preview": {
@@ -1016,9 +1037,9 @@
},
"storage-mover": {
"pname": "storage-mover",
"version": "1.2.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_mover-1.2.0-py3-none-any.whl",
"hash": "sha256-jIZ2WTXHeK2+DeBOfU8tKN5abXARPzDu45YP5nSNzXA=",
"version": "1.2.1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_mover-1.2.1-py3-none-any.whl",
"hash": "sha256-CWybGBqh6g8/+EsrqkFXlAZfkUMqrmKSAhq4d05WG/0=",
"description": "Microsoft Azure Command-Line Tools StorageMover Extension"
},
"storagesync": {
@@ -1107,9 +1128,9 @@
},
"vmware": {
"pname": "vmware",
"version": "8.0.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/vmware-8.0.0-py2.py3-none-any.whl",
"hash": "sha256-Y+3qoZWD1Jx+BrRsHoTZp2lwuFp/NI/l7EYTP8bebuw=",
"version": "8.1.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/vmware-8.1.0-py2.py3-none-any.whl",
"hash": "sha256-QlwHakDfpj37o5mNUbt0MyPhgRyD/aNPfn4oRO5JtWo=",
"description": "Azure VMware Solution commands"
},
"webapp": {
@@ -280,6 +280,18 @@
meta.maintainers = with lib.maintainers; [ obreitwi ];
};
redisenterprise = mkAzExtension rec {
pname = "redisenterprise";
version = "1.4.0";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/redisenterprise-${version}-py3-none-any.whl";
hash = "sha256-vMKLLC/q39SZ2MbqxmcjUiylr01D1olaLujQ1LbFqak=";
description = "Microsoft Azure Command-Line Tools RedisEnterprise Extension";
propagatedBuildInputs = with python3Packages; [
redis
pyjwt
];
};
serial-console = mkAzExtension {
pname = "serial-console";
version = "1.0.0b2";
+2 -2
View File
@@ -26,14 +26,14 @@
}:
let
version = "2.82.0";
version = "2.83.0";
src = fetchFromGitHub {
name = "azure-cli-${version}-src";
owner = "Azure";
repo = "azure-cli";
tag = "azure-cli-${version}";
hash = "sha256-C9qsgJI/+4NKiUSrOANWnGtZPlAt5SaQTtRwcqjwIkk=";
hash = "sha256-ptmqcRbjLWMZ9i+rt0amfjpVC+VuE+L3Np2gPpF7Urg=";
};
# put packages that needs to be overridden in the py package scope
+6 -10
View File
@@ -11,14 +11,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "backblaze-b2";
version = "4.5.1";
version = "4.6.0";
pyproject = true;
src = fetchFromGitHub {
owner = "Backblaze";
repo = "B2_Command_Line_Tool";
tag = "v${finalAttrs.version}";
hash = "sha256-0BF4+L47Cx7GNGeNm8nJkEfTLYb6jLxSH3WE+h9B6zA=";
hash = "sha256-/JCvCydW+oaPSs94Crfia9VFNSuHO02j6n+CFnxMKDE=";
};
patches = [ ./0001-fix-error-with-pytest-4.0.patch ];
@@ -28,25 +28,21 @@ python3Packages.buildPythonApplication (finalAttrs: {
argcomplete
];
build-system = with python3Packages; [
pdm-backend
];
build-system = with python3Packages; [ pdm-backend ];
dependencies = with python3Packages; [
argcomplete
arrow
b2sdk
phx-class-registry
docutils
platformdirs
rst2ansi
setuptools
tabulate
tqdm
platformdirs
packaging
setuptools
];
pythonRelaxDeps = [ "phx-class-registry" ];
pythonRelaxDeps = [ "docutils" ];
nativeCheckInputs = with python3Packages; [
backoff
+2 -2
View File
@@ -17,11 +17,11 @@ let
in
stdenv.mkDerivation rec {
pname = "bazarr";
version = "1.5.5";
version = "1.5.6";
src = fetchzip {
url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip";
hash = "sha256-YiR/hi+/vptjHxwBYsq/W3QdjT12+pv74AuU1ggM084=";
hash = "sha256-S3idNH9Wm9f6aNj69dERmeks1rLvUeQJYFebXa5cWQo=";
stripRoot = false;
};
+5 -5
View File
@@ -3,24 +3,24 @@
let
pname = "brave";
version = "1.87.190";
version = "1.87.191";
allArchives = {
aarch64-linux = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
hash = "sha256-ktHcMh5sPgpj6lNtW1PAcJJoFSMZKoOawdKkAH27/OI=";
hash = "sha256-mwczK2IYt+88VfSyNLwSWRxBuGS+AzMcAGE2C8Bafno=";
};
x86_64-linux = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
hash = "sha256-gQ1LSSKSVV7YOFTFHENDIQF73CyMr/nYNcxYOb/qw+w=";
hash = "sha256-p2gdKzk0YTZYciSvlpO0Q31w8/eNOE1WmhvWm0pop1I=";
};
aarch64-darwin = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
hash = "sha256-QCswcz18onnqn+xfM91hIk7ZCx9WZVR8gAu+3TnfPS4=";
hash = "sha256-ZXjEPtb6WV+izKbyaaR4MtcI0dS+tOlYQ/B8ngKt0GY=";
};
x86_64-darwin = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
hash = "sha256-zeLuQYY/ZNnxMLQKp73CB1j8FhTI0GqsarUPLz+5J0o=";
hash = "sha256-yDyzzTVlB2hHFzECe3C4Lv5RZTSqgyBOdN1HBdmI2aA=";
};
};
+2 -1
View File
@@ -44,7 +44,8 @@ stdenv.mkDerivation (finalAttrs: {
substitute ${./wrapper} $out/bin/ccls \
--replace-fail '@clang@' '${llvmPackages.clang}' \
--replace-fail '@shell@' '${runtimeShell}' \
--replace-fail '@wrapped@' "$wrapped"
--replace-fail '@wrapped@' "$wrapped" \
--replace-fail '@out@' "$out"
chmod --reference=$out/bin/$wrapped $out/bin/ccls
'';
+1 -3
View File
@@ -1,11 +1,9 @@
#! @shell@ -e
dirpath=$(CDPATH= cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
printf -v extraArgs ',\"%s\"' \
$(cat @clang@/nix-support/libc-cflags \
@clang@/nix-support/libcxx-cxxflags) \
${NIX_CFLAGS_COMPILE}
initString="--init={\"clang\":{\"extraArgs\":[${extraArgs:1}],\"resourceDir\":\"@clang@/resource-root\"}}"
exec -a "$0" "$dirpath/@wrapped@" "${initString}" "$@"
exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "$@"
+18 -18
View File
@@ -1,46 +1,46 @@
{
"version": "2.1.49",
"buildDate": "2026-02-19T22:40:53Z",
"version": "2.1.59",
"buildDate": "2026-02-25T23:40:08Z",
"platforms": {
"darwin-arm64": {
"binary": "claude",
"checksum": "2b984814350ed9a9b70506bcbc10b77da46f5b3e06a9c6932f0731d042049b98",
"size": 184907552
"checksum": "ef70dae6ed08b5538f6d157a8c8591f72c262fb8e570c94711bad3ae4ee44afa",
"size": 187104656
},
"darwin-x64": {
"binary": "claude",
"checksum": "3155c5a13e8fa9976038a4b955c3ec006aa17c2c12d8bb8a2dd3056661eeed25",
"size": 190028768
"checksum": "b3b69beae466ac1b7659bf5710ec1d5e7b20c848418cc701019462e0923ff0e0",
"size": 192258768
},
"linux-arm64": {
"binary": "claude",
"checksum": "e4e4ea8a9f8bce5f8fbaae7bac7c7a1826ea7ba68b38b9c2951e8466bca91331",
"size": 222051812
"checksum": "78b0ea5a64793149f550ad3ddcfcbc7147128a600243839f703fb5b6a2194859",
"size": 224884646
},
"linux-x64": {
"binary": "claude",
"checksum": "e7a7565665ecbccca2c6912b2ef29da2b137d260201b931c737b7dd3821c6e2f",
"size": 224937041
"checksum": "7a4a653982b07e0a8157f8d3b2c2f8e442520ab07b2fa2e692ba054dbba210c9",
"size": 227880817
},
"linux-arm64-musl": {
"binary": "claude",
"checksum": "7500953b5c47930dff10f19d086a99414dff585b8db0c2367f795241229595f0",
"size": 215218820
"checksum": "4f16635c098b8302d5eaf83fe726c3582e00d91cf56a37d18d0c91efbcac6cd9",
"size": 217281606
},
"linux-x64-musl": {
"binary": "claude",
"checksum": "e6ca49650f42cdf6ff98d9d5b6c98e3fee547c03879eba5e93377f28ca84da24",
"size": 217437097
"checksum": "3adaebe59f10524bd9d19ebb3d090c3207b67143c0f40ec1cfc544409f8ded60",
"size": 219578057
},
"win32-x64": {
"binary": "claude.exe",
"checksum": "d370342a0b9a677180dfbedfa826acb77a5b4d6c032447d0d46e69d343d38d73",
"size": 233937056
"checksum": "6dfdfa45ce01928317abb6c3774e0c533952c471002e468dd254022acd39e268",
"size": 236043424
},
"win32-arm64": {
"binary": "claude.exe",
"checksum": "9d6a70d70e5f026ae0423e42e1399e2b20ba26eea2931b259d378c8c217ae9b1",
"size": 225988768
"checksum": "aadd9629f391a76e23bab6d06f8a6fe38f01137831012c96356cac178820e960",
"size": 228253856
}
}
}
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "@anthropic-ai/claude-code",
"version": "2.1.50",
"version": "2.1.59",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@anthropic-ai/claude-code",
"version": "2.1.50",
"version": "2.1.59",
"license": "SEE LICENSE IN README.md",
"bin": {
"claude": "cli.js"
+3 -3
View File
@@ -15,14 +15,14 @@
}:
buildNpmPackage (finalAttrs: {
pname = "claude-code";
version = "2.1.50";
version = "2.1.59";
src = fetchzip {
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
hash = "sha256-pSPZzbLhFsE8zwlp+CHB5MqS1gT3CeIlkoAtswmxCZs=";
hash = "sha256-Dam9aJ0qBdqU40ACfzGQHuytW6ur0fMLm8D5fIKd1TE=";
};
npmDepsHash = "sha256-/oQxdQjMVS8r7e1DUPEjhWOLOD/hhVCx8gjEWb3ipZQ=";
npmDepsHash = "sha256-K+8xoBc3apvxQ9hCpYywqgBcfLxMWSxacgJcMH8mK7E=";
strictDeps = true;
+3 -3
View File
@@ -11,7 +11,7 @@
buildNpmPackage rec {
pname = "clever-tools";
version = "4.6.0";
version = "4.6.1";
nodejs = nodejs_22;
@@ -19,10 +19,10 @@ buildNpmPackage rec {
owner = "CleverCloud";
repo = "clever-tools";
rev = version;
hash = "sha256-0c2SBArtMUffQ7hd2fH9l5DMGm+UIWNeY/aSU0cUHzg=";
hash = "sha256-n/iDQdvAaINeIfCbvnL6OGuJ35xS6HsTtFxZ4nKiPWA=";
};
npmDepsHash = "sha256-Quzpdmu9qvJ4P77nsXzqLg3k7tQvuYtvEioDuUSU0+M=";
npmDepsHash = "sha256-muuDE5bd35IlAhq2mOCsp+5U2zf4RuaMxhvkmw8WCHc=";
nativeBuildInputs = [
installShellFiles
+2 -2
View File
@@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation rec {
pname = "cloudlog";
version = "2.8.7";
version = "2.8.8";
src = fetchFromGitHub {
owner = "magicbug";
repo = "Cloudlog";
rev = version;
hash = "sha256-/zMZbM9TvFMZTUkAN4wqutZ+YQA9sVtdXZwEGISm6NA=";
hash = "sha256-Mr5418UTU44glFSvo1abKcjHQJRMQCgHcWsh/Kabr9Y=";
};
postPatch = ''
+3 -3
View File
@@ -15,13 +15,13 @@
buildGoModule (finalAttrs: {
pname = "colima";
version = "0.9.1";
version = "0.10.1";
src = fetchFromGitHub {
owner = "abiosoft";
repo = "colima";
tag = "v${finalAttrs.version}";
hash = "sha256-oRhpABYyP4T6kfmvJ4llPXcXWrSbxU7uUfvXQhm2huc=";
hash = "sha256-WYwHqMPHRF17j7EfZzxHAMV0JPGZKLfJCn0axpuh5sc=";
# We need the git revision
leaveDotGit = true;
postFetch = ''
@@ -36,7 +36,7 @@ buildGoModule (finalAttrs: {
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
vendorHash = "sha256-ZwgzKCOEhgKK2LNRLjnWP6qHI4f6OGORvt3CREJf55I=";
vendorHash = "sha256-UAnQZyZ4EcIZz55jXUjkJDjq3s0uLPBnwUPyNcBV6aE=";
# disable flaky Test_extractZones
# https://hydra.nixos.org/build/212378003/log
+2 -2
View File
@@ -20,14 +20,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-applets";
version = "1.0.7";
version = "1.0.8";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-applets";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-ONDfvyIy7sqgMpf2IrVUjLPkXUEOiN3OGK57P/4KVZQ=";
hash = "sha256-x2FHzgbxxHJEYlCK0bi5j7WdAqAlcocLYW20y2ionBc=";
};
cargoHash = "sha256-FWpfgqPqjbzzv6yaBKx9eq+PHCCQ/TErx+TGWqmXqXA=";
@@ -11,17 +11,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-applibrary";
version = "1.0.7";
version = "1.0.8";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-applibrary";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-OxHfrtUrcVC5rdh3W56zNhNRNzYrX+VRJIiW19lAJPM=";
hash = "sha256-sHF5jNY6sAZtWPeIgYjrLlhpSzhfoU21kA0ejWRkf98=";
};
cargoHash = "sha256-apLIpb1VUuQRgOJ2mQioPyucbETzyh5wOeatMCLGrc4=";
cargoHash = "sha256-h/LjcSKnmZof4/OFyLDUFWcjn6TiTt8eRAJkj8lUC0Y=";
nativeBuildInputs = [
just
+3 -3
View File
@@ -13,14 +13,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-bg";
version = "1.0.7";
version = "1.0.8";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-bg";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-/6VYiZ02y/UAA3fZ+CHb18BZAWBnm/3HAf7IdEhaeD0=";
hash = "sha256-epwCl68NWKgGMUrwIA7ALlOLMTLxyShqfV0ARXsZxrs=";
};
postPatch = ''
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
"${cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg"
'';
cargoHash = "sha256-+NkraWjWHIMIyktAUlp3q2Ot1ib1QRsBBvfdbr5BXto=";
cargoHash = "sha256-BEQQy79s9B0GLr0w2+8N5s24Ko8ikWjRxf8DmLve8kc=";
nativeBuildInputs = [
just
+3 -3
View File
@@ -20,17 +20,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-comp";
version = "1.0.7";
version = "1.0.8";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-comp";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-AxMhcWBYN6q6IDKXXBWFi+WvSnSgF/lg5Ch9Obs+7uc=";
hash = "sha256-TGTKUF7rYZ/Koem4rPBFYHatzhhqpWe/1WmAqlY3odg=";
};
cargoHash = "sha256-hcQ6u4Aj5Av9T9uX0oDSbJG82g6E8IXcJc4Z2CfoRtg=";
cargoHash = "sha256-MI8cJzjZd2UeWBESu8xEDYQv0Oa4PRhc4pOCN0zDNO4=";
separateDebugInfo = true;
+3 -3
View File
@@ -16,17 +16,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-edit";
version = "1.0.7";
version = "1.0.8";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-edit";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-yaDFlnORaPwh/2Zb3Nh1Hr/jA1Z/kQT6Y1zic0eVvwA=";
hash = "sha256-qmzVc09VFZBS5S/C5JL0OzPnCX5jERXPE8iFycDUj/A=";
};
cargoHash = "sha256-1Q+jdr7uSQTp+3z2fgQIyH33v/Ld9MPER3/WRJ34Mdg=";
cargoHash = "sha256-VEPahTeBPMx+xoZWRFgmbLLEw8l2QXqr/Sk06gW2Mds=";
postPatch = ''
substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
+12 -3
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
rustPlatform,
just,
libcosmicAppHook,
@@ -12,17 +13,25 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-files";
version = "1.0.7";
version = "1.0.8";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-files";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-kTPPYfga0to19ZC66bGj/ROsMceG8LuELl1OkwKSirU=";
hash = "sha256-KXXNYNGun1stXXzY4OWzOVLrLXAs5g7NNaSYajavDvU=";
};
cargoHash = "sha256-tkH9BIeTukdVJhN9yUgFdUUhyfqnx3tTqwu+LAAULog=";
cargoHash = "sha256-HMHS6HrOUVnrWbyGi9wadl9++onBNNCRw4r4nohvQzI=";
patches = [
(fetchpatch {
# patch for fixing build error introduced in `epoch-1.0.7`
url = "https://github.com/pop-os/cosmic-files/commit/49e3d95e7a5e02c279f2be1f1f4dfdba2fb532dc.patch";
hash = "sha256-Ohf3K+ehFvIurPOReFDML+wfBvdxCi7Ef3eCoSLnXFM=";
})
];
nativeBuildInputs = [
just
+1 -1
View File
@@ -19,7 +19,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-greeter";
version = "1.0.7";
version = "1.0.8";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
+1 -1
View File
@@ -9,7 +9,7 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "cosmic-icons";
version = "1.0.7";
version = "1.0.8";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
+1 -1
View File
@@ -16,7 +16,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-idle";
version = "1.0.7";
version = "1.0.8";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
@@ -14,7 +14,7 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-initial-setup";
version = "1.0.7";
version = "1.0.8";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
+1 -1
View File
@@ -11,7 +11,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-launcher";
version = "1.0.7";
version = "1.0.8";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
@@ -12,7 +12,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-notifications";
version = "1.0.7";
version = "1.0.8";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
+1 -1
View File
@@ -15,7 +15,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-osd";
version = "1.0.7";
version = "1.0.8";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
+1 -1
View File
@@ -11,7 +11,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-panel";
version = "1.0.7";
version = "1.0.8";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
+3 -3
View File
@@ -18,17 +18,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-player";
version = "1.0.7";
version = "1.0.8";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-player";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-ddwYgyyAaQr+0ULdCm7ZDLBfmXi014OR/G2KauYsI10=";
hash = "sha256-t0gm/LYXwHDnEo7WEgucWt0en54LYzlN2W52GwbMpwI=";
};
cargoHash = "sha256-8w66CbGoonmJ3cb5G4G7pPjjk1OVbdZFp9smuKchvRY=";
cargoHash = "sha256-IWL6x5nHcadQYW0bwA8uavLfJFshVigtqP42M4MiNYE=";
nativeBuildInputs = [
just
+1 -1
View File
@@ -12,7 +12,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-randr";
version = "1.0.7";
version = "1.0.8";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
@@ -11,7 +11,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-screenshot";
version = "1.0.7";
version = "1.0.8";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
+2 -2
View File
@@ -12,14 +12,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-session";
version = "1.0.7";
version = "1.0.8";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-session";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-dMx7ZSl+ZDZGwAbo3tWwSH8Tg00ZVTJsXNZrBHY4Xj4=";
hash = "sha256-PJkr2etwcgzTELzsAVb2agof8tRZGEnDTKJ+1/9Q3bU=";
};
cargoHash = "sha256-wFh9AYQRZB9qK0vCrhW9Zk61Yg+VY3VPAqJRD47NbK4=";
@@ -16,14 +16,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-settings-daemon";
version = "1.0.7";
version = "1.0.8";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-settings-daemon";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-nivViFs0swS5MUH+hfpBl5sFGBZ6XPo3E0PGONVmzxo=";
hash = "sha256-np1syOfFqL6eZpnlwNb8WOXB0oqSkxIshX0JiyDlN1A=";
};
postPatch = ''
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
--replace-fail '/usr/share/themes/adw-gtk3' '${adw-gtk3}/share/themes/adw-gtk3'
'';
cargoHash = "sha256-KRV9WKOf9W0g4d2uKrAFEuDqJgr+CTpvtVLn7TIYuBw=";
cargoHash = "sha256-p0Dda0Chy8qJNIMAbSnqeC8kHDYIf4tsk7+NCd9/nDQ=";
nativeBuildInputs = [ pkg-config ];
+3 -3
View File
@@ -27,17 +27,17 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-settings";
version = "1.0.7";
version = "1.0.8";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-settings";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-IkWH8V5M8k3BB8UpnNMxM5z5uzKRatu/tbACywiqezg=";
hash = "sha256-bSguS+nrbKkxr8yGGmvRlPI9/b0uctLHKoV+y6Kc1Bw=";
};
cargoHash = "sha256-1T/Wd59AD8HVeTCeKb8BIdzw3n+nK5otevFmwn3YJRs=";
cargoHash = "sha256-fUfj/defu74AYNTG/Wv3lxGbrPmRHZYSwN5ZZ98zwKw=";
nativeBuildInputs = [
cmake
+3 -3
View File
@@ -15,17 +15,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-store";
version = "1.0.7";
version = "1.0.8";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-store";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-nFquLO/qMANbQRbOfjegZeMb2vCSKUK5/Y/U4ghuW64=";
hash = "sha256-B5WdvrK7dV8C9/M577S/gbxksA5zdmhDqkidFFAbyH0=";
};
cargoHash = "sha256-rrIIQ5bx4HMrxoUDH63qFJN7J+eyohSSewFZB5xMNjs=";
cargoHash = "sha256-5ak3jbGD4TUiJCKn4FCkOvkZK2LzZAlU0zvqp1q1BaY=";
nativeBuildInputs = [
just
+3 -3
View File
@@ -15,17 +15,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-term";
version = "1.0.7";
version = "1.0.8";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-term";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-Woko89mT0jBx1YhzO4yXyMfxAMDxPiMn1m51Cm1e7hQ=";
hash = "sha256-EN/eVQfUbJPQoU2rOYbfQBdr2cTff1VkQDp+hUEkbAE=";
};
cargoHash = "sha256-KXhjNBpTOk96+86PbDjeKtQ/VynRVV4a9SYbYGz4A6c=";
cargoHash = "sha256-ypb1hlOl1ot4pmeJK9VVuSa2YkzDqMQs0ylH3tWWpb8=";
nativeBuildInputs = [
just
@@ -7,7 +7,7 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "cosmic-wallpapers";
version = "1.0.7";
version = "1.0.8";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
@@ -14,17 +14,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-workspaces-epoch";
version = "1.0.7";
version = "1.0.8";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-workspaces-epoch";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-HrW02lM1uSiI2UBC46Jjgv7r3urVcgS3Mrvfoig/EjI=";
hash = "sha256-0BD+61gQkVHrDb8hfOa1Tiy29Hu+TZCV6r/LdFMPy+k=";
};
cargoHash = "sha256-r5Do3eRBcwjA4IysyKgkHLz8Wo1WwdEl596ZENiQbEM=";
cargoHash = "sha256-IMjDZk42rj2a9ZUFksZ9VhI5RsB0t630Iy3eKtRqY7M=";
separateDebugInfo = true;
+2 -2
View File
@@ -33,14 +33,14 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "esphome";
version = "2026.2.1";
version = "2026.2.2";
pyproject = true;
src = fetchFromGitHub {
owner = "esphome";
repo = "esphome";
tag = version;
hash = "sha256-7gCUSR2jLhCre84JggSPvNHIRzAA6ZSVGTe1pQ+D8ok=";
hash = "sha256-VfiIeuwvc7CLuR3SjHH8foS2b4bKVOw/bjOYnDnmWkw=";
};
patches = [
+3 -3
View File
@@ -22,12 +22,12 @@
stdenv.mkDerivation {
pname = "filezilla";
version = "3.69.5";
version = "3.69.6";
src = fetchsvn {
url = "https://svn.filezilla-project.org/svn/FileZilla3/trunk";
rev = "11338";
hash = "sha256-OQZFwowkmiOcIjWoHkIFwsm6nuyMGSaBSn8zwVpCMAs=";
rev = "11365";
hash = "sha256-KJI+UxKiwmZfVG0CiS3lDnjz+YNjTy7IoTcOmlGkluk=";
};
configureFlags = [
@@ -0,0 +1,13 @@
diff --git a/cMake/FreeCAD_Helpers/SetupBoost.cmake b/cMake/FreeCAD_Helpers/SetupBoost.cmake
index 0bb1343..1a389bf 100644
--- a/cMake/FreeCAD_Helpers/SetupBoost.cmake
+++ b/cMake/FreeCAD_Helpers/SetupBoost.cmake
@@ -3,7 +3,7 @@ macro(SetupBoost)
set(_boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS})
- set (BOOST_COMPONENTS filesystem program_options regex system thread date_time)
+ set (BOOST_COMPONENTS filesystem program_options regex thread date_time)
find_package(Boost ${BOOST_MIN_VERSION}
COMPONENTS ${BOOST_COMPONENTS} REQUIRED)
+5
View File
@@ -104,6 +104,11 @@ freecad-utils.makeCustomizable (
# https://github.com/FreeCAD/FreeCAD/pull/21710
./0003-FreeCad-fix-font-load-crash.patch
# Fix build for boost 1.89 or later, remove once FreeCad 1.1 is released
# based on https://github.com/FreeCAD/FreeCAD/commit/0f6d00d2a547df0f5c2ba5ef0f79044a49b0a2d
./0004-FreeCad-fix-boost-189-build.patch
(fetchpatch {
url = "https://github.com/FreeCAD/FreeCAD/commit/8e04c0a3dd9435df0c2dec813b17d02f7b723b19.patch?full_index=1";
hash = "sha256-H6WbJFTY5/IqEdoi5N+7D4A6pVAmZR4D+SqDglwS18c=";
+3 -3
View File
@@ -12,16 +12,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "fresh";
version = "0.2.5";
version = "0.2.9";
src = fetchFromGitHub {
owner = "sinelaw";
repo = "fresh";
tag = "v${finalAttrs.version}";
hash = "sha256-JbjTHMvncM5wCiPa3Tmv/HJbg7sKgmOXhmu9He6Tzhk=";
hash = "sha256-xB3ZwueGdFPcKNStet/6sLW5qiVrB0iDaeBMknrnlMI=";
};
cargoHash = "sha256-1b9v7K+EUOtHF3J3vOv1YyFxqnGZ5SbzyUBPCQ5i90U=";
cargoHash = "sha256-Ja8lLU5MR4mi4tTZwUgpLpbSBdUk2OUrX299ROTgTIg=";
nativeBuildInputs = [
gzip
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ft2-clone";
version = "2.04";
version = "2.05";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "ft2-clone";
rev = "v${finalAttrs.version}";
hash = "sha256-nLuorUpw42zuGG5hIk2Gr8lEjQ2wEWe7svx8IC+rFso=";
hash = "sha256-wMR0S8knfMncjRVDExXkfKGJlDGOjrgAh+bbe0023dw=";
};
nativeBuildInputs = [ cmake ];
+132 -47
View File
@@ -1,14 +1,14 @@
[
{
"pname": "Azure.Core",
"version": "1.47.3",
"hash": "sha256-fWyfqF1lpnap4cF3l9J0fYtZbxIqm6UFsuJgN+/hwW4="
},
{
"pname": "Azure.Core",
"version": "1.49.0",
"hash": "sha256-ZLd8vl1QNHWYMOAx/ciDUNNfMGu2DFIfw37+FwiGI/4="
},
{
"pname": "Azure.Core",
"version": "1.50.0",
"hash": "sha256-8Pjz0/2wTLK5uY7G5qrxQr4CsmrjiR8gL4g6zJymj5s="
},
{
"pname": "Azure.Identity",
"version": "1.17.0",
@@ -16,23 +16,53 @@
},
{
"pname": "Azure.Storage.Blobs",
"version": "12.26.0",
"hash": "sha256-J6774WE6xlrsmhkmE1dapkrhK6dFByYxSHLs1OQPk48="
"version": "12.27.0",
"hash": "sha256-Ag8kMe/NBfq+HSchFzm0VAAo9xVnrKHFHUjbQ4KpSh0="
},
{
"pname": "Azure.Storage.Common",
"version": "12.25.0",
"hash": "sha256-4eMv4oOumO6FFx0VMsuIr6sWtouu4f6AajebTQjhj9Q="
"version": "12.26.0",
"hash": "sha256-GPiEPi/caj5z2cMFP5TUx/Jrj/zXZmA/xqC9CEoI+qQ="
},
{
"pname": "CommandLineParser",
"version": "2.9.1",
"hash": "sha256-ApU9y1yX60daSjPk3KYDBeJ7XZByKW8hse9NRZGcjeo="
},
{
"pname": "diskann-garnet",
"version": "1.0.20",
"hash": "sha256-cH3rHJxl2IUvB9pC9recWvwx5mdrtbw2IiSZSIFgZPU="
},
{
"pname": "KeraLua",
"version": "1.4.6",
"hash": "sha256-7lXJhhQlEuRoaF18XiZYJDyhA8RIWpYWNB9kr4aARQc="
"version": "1.4.9",
"hash": "sha256-xR8Ram6RX6B2kd+KYpa6URIzOW6SGrKLU33yi1nv5UU="
},
{
"pname": "Microsoft.AspNetCore.App.Ref",
"version": "8.0.23",
"hash": "sha256-MhWoomc6BwUta7PxbnGC3Fno+GQx3aUEtg/LBDAEi38="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64",
"version": "8.0.23",
"hash": "sha256-tG2pcAzeiDBouBrMVaYrCD2M2jCXJ4wk2sNOF2KQILk="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
"version": "8.0.23",
"hash": "sha256-PGtAymoWt5+PBLjt+krej6KruhWy+D+dUE4PgVZSx88="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64",
"version": "8.0.23",
"hash": "sha256-fZQKWvYkS/fXUK8BIWD4dSOo1jltO0fDSy0TT+U3H9c="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.osx-x64",
"version": "8.0.23",
"hash": "sha256-HsEhlsBgaDkIDgVz3oPkFe3dRcYFqrHEnikKaTqqWpo="
},
{
"pname": "Microsoft.Bcl.AsyncInterfaces",
@@ -44,30 +74,40 @@
"version": "9.0.0",
"hash": "sha256-ECgyZ53XqJoRcZexQpctEq1nHFXuW4YqFSx7Elsae7U="
},
{
"pname": "Microsoft.Extensions.Configuration",
"version": "10.0.2",
"hash": "sha256-dBJAKDyp/sm+ZSMQfH0+4OH8Jnv1s20aHlWS6HNnH+c="
},
{
"pname": "Microsoft.Extensions.Configuration",
"version": "9.0.8",
"hash": "sha256-GnD1Ar/yZfCZQw2k/2jKteLG1lF/Dk7S3tgMvn+SFqc="
},
{
"pname": "Microsoft.Extensions.Configuration.Abstractions",
"version": "10.0.2",
"hash": "sha256-P+0kaDGO+xB9KxF9eWHDJ4hzi05sUGM/uMNEX5NdBTE="
},
{
"pname": "Microsoft.Extensions.Configuration.Abstractions",
"version": "9.0.8",
"hash": "sha256-hes+QZM3DQ1R/8CDOdWObk6s1oGhzFqka8Qc7Baf9PY="
},
{
"pname": "Microsoft.Extensions.Configuration.Abstractions",
"version": "9.0.9",
"hash": "sha256-Qmi+ftu17qqVVHJ+SgKvLrXCHJDrP5h4ZgTflgDWgzc="
},
{
"pname": "Microsoft.Extensions.Configuration.Binder",
"version": "9.0.9",
"hash": "sha256-p7hhHy1hGSJk6OQvaFhz4WFbtM8VkeKb3sSZTB61M0s="
"version": "10.0.2",
"hash": "sha256-resI9gIxHh2cc+258/i+TjW8xxzKf4ZBTLIcWAMEYz0="
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
"version": "9.0.8",
"hash": "sha256-fJOwbtlmP6mXGYqHRCqtb7e08h5mFza6Wmd1NbNq3ug="
"version": "10.0.2",
"hash": "sha256-/9UWQRAI2eoocnJWWf1ktnAx/1Gt65c16fc0Xqr9+CQ="
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "10.0.2",
"hash": "sha256-UF9T13V5SQxJy2msfLmyovLmitZrjJayf8gHH+uK2eg="
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
@@ -76,8 +116,13 @@
},
{
"pname": "Microsoft.Extensions.Logging",
"version": "9.0.8",
"hash": "sha256-SEVCMpVwjcQtTSs4lirb89A36MxLQwwqdDFWbr1VvP8="
"version": "10.0.2",
"hash": "sha256-9+gfQwK32JMYscW1YvyCWEzc9mRZOjCACoD9U1vVaJI="
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
"version": "10.0.2",
"hash": "sha256-ndKGzq8+2J/hvaIULwBui0L/jDyMQTAY24j+ohX5VX8="
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
@@ -109,6 +154,11 @@
"version": "9.0.8",
"hash": "sha256-8cz7l8ubkRIBd6gwDJcpJd66MYNU0LsvDH9+PU+mTJo="
},
{
"pname": "Microsoft.Extensions.Options",
"version": "10.0.2",
"hash": "sha256-12AfUEDdta/pmZUyEyqSUfOk0YoA7JOfGmIYnZQ//qk="
},
{
"pname": "Microsoft.Extensions.Options",
"version": "9.0.8",
@@ -121,13 +171,13 @@
},
{
"pname": "Microsoft.Extensions.Primitives",
"version": "9.0.8",
"hash": "sha256-K3T8krgXZmvQg87AQQrn9kiH2sDyKzRUMDyuB/ItmPc="
"version": "10.0.2",
"hash": "sha256-8Ccrjjv9cFVf9RyCc7GS/Byt8+DXdSNea0UX3A5BEdA="
},
{
"pname": "Microsoft.Extensions.Primitives",
"version": "9.0.9",
"hash": "sha256-bCd4Bj5uP4kT0hCvs0LZS8IVqEtpOIyhSiay5ijJbBA="
"version": "9.0.8",
"hash": "sha256-K3T8krgXZmvQg87AQQrn9kiH2sDyKzRUMDyuB/ItmPc="
},
{
"pname": "Microsoft.Identity.Client",
@@ -180,9 +230,49 @@
"hash": "sha256-BDdJNDquVEplPJT3fYOakg26bSNyzNyUce+7mCjtc5o="
},
{
"pname": "System.ClientModel",
"version": "1.6.1",
"hash": "sha256-OMnamkT9Nt5ZSR6xPKFmOQRUjdn0a4nP9jkD2eZxxc0="
"pname": "Microsoft.NETCore.App.Host.linux-arm64",
"version": "8.0.23",
"hash": "sha256-C7fkJ6CSrORo8ST27oN1bvApyFD/3P5G40LEJHan8dQ="
},
{
"pname": "Microsoft.NETCore.App.Host.linux-x64",
"version": "8.0.23",
"hash": "sha256-QSyUAyYwlDbFdWXKMD+Gm+2gkwjEZu+JyxpTIuIHl5w="
},
{
"pname": "Microsoft.NETCore.App.Host.osx-arm64",
"version": "8.0.23",
"hash": "sha256-7ztl28l8zPNREGKvR9IcrVDm13/Fi2xSqD8fjxE6yLM="
},
{
"pname": "Microsoft.NETCore.App.Host.osx-x64",
"version": "8.0.23",
"hash": "sha256-/eDywkBIggw2lt65yf1HFs8wSc1IgrTpEg/aKIz1y7g="
},
{
"pname": "Microsoft.NETCore.App.Ref",
"version": "8.0.23",
"hash": "sha256-Vevn8gsO4gCnGo0ns6B7i0MedAnEq3nBgnqx/E7aI44="
},
{
"pname": "Microsoft.NETCore.App.Runtime.linux-arm64",
"version": "8.0.23",
"hash": "sha256-DyEbaM692s4YBvufr3ebhFH9j2miUAisTIXT5E3fCYg="
},
{
"pname": "Microsoft.NETCore.App.Runtime.linux-x64",
"version": "8.0.23",
"hash": "sha256-s5iFeWfR2RebcBVPJcxxs2ceDdyol6ut2+g2kRCGIJs="
},
{
"pname": "Microsoft.NETCore.App.Runtime.osx-arm64",
"version": "8.0.23",
"hash": "sha256-IN/OdsXuwiuJG7gu/Gh7nVoL8rgUyMlK+LOkrHoyo+s="
},
{
"pname": "Microsoft.NETCore.App.Runtime.osx-x64",
"version": "8.0.23",
"hash": "sha256-86dZZBxKLtaQH17UBBIu1nO8CNfxT64ZBL+HRf1kd4A="
},
{
"pname": "System.ClientModel",
@@ -190,14 +280,14 @@
"hash": "sha256-R9tHPr+rDvwaS1RQUHVZHTnmAL9I79OvixuZ2Thp9rw="
},
{
"pname": "System.Diagnostics.DiagnosticSource",
"version": "6.0.1",
"hash": "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4="
"pname": "System.ClientModel",
"version": "1.8.0",
"hash": "sha256-ZWVhuw3IRk9rZXkXERhesEET2KMMzHjUH/HDI288WK8="
},
{
"pname": "System.Diagnostics.DiagnosticSource",
"version": "9.0.8",
"hash": "sha256-bVGcjEcZUVeY2jOvZeFnG+ym8ebUKOftx+gErNXeiK4="
"version": "10.0.2",
"hash": "sha256-lt0piggvxkHfKmZAOZI8M0q0W/kMld5XwYcBWH3rj1o="
},
{
"pname": "System.IdentityModel.Tokens.Jwt",
@@ -206,13 +296,13 @@
},
{
"pname": "System.IO.Hashing",
"version": "8.0.0",
"hash": "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE="
"version": "10.0.1",
"hash": "sha256-k8EHcxnLitXo0CxoDZAxFmUlJJdKZVsZJ2+9zDMYB94="
},
{
"pname": "System.IO.Pipelines",
"version": "9.0.9",
"hash": "sha256-bRMt0ib0KwKzHXgeAXZgegou5eX8lsm80Eu38bHBxBs="
"version": "10.0.2",
"hash": "sha256-Guh0w9aMQ5wNSI9ecuoH4tGOX4VFnlNgepvBTPGFgzc="
},
{
"pname": "System.Memory.Data",
@@ -224,11 +314,6 @@
"version": "9.0.9",
"hash": "sha256-wc7lhmydATxle8Wv124yFPT+bkpKpcCQL2TAPGodIAc="
},
{
"pname": "System.Runtime.CompilerServices.Unsafe",
"version": "6.0.0",
"hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
},
{
"pname": "System.Security.Cryptography.ProtectedData",
"version": "4.5.0",
@@ -236,12 +321,12 @@
},
{
"pname": "System.Text.Encodings.Web",
"version": "9.0.9",
"hash": "sha256-euYrJAKiTDCj/Rf1KVWI6IophDX828x5T9As9vAf81A="
"version": "10.0.2",
"hash": "sha256-DWbSR+d8DJtkMclrKKbS5Ghlvi6YYrrxgHGfyDJx50o="
},
{
"pname": "System.Text.Json",
"version": "9.0.9",
"hash": "sha256-I+GCgXZZUtgAta94BIBqy72HnZJ3egzNBOTxnVy2Ur8="
"version": "10.0.2",
"hash": "sha256-Gf6L3mxsdvmN8gDyoUhfZDSFWKpmn9UjJ2v/p1CDFmk="
}
]
+9 -5
View File
@@ -8,13 +8,13 @@
buildDotnetModule rec {
pname = "garnet";
version = "1.0.89";
version = "1.0.99";
src = fetchFromGitHub {
owner = "microsoft";
repo = "garnet";
tag = "v${version}";
hash = "sha256-DL87KIkC1lzqVJPAUqFp7d/MKFoWWS0Lo1/02dwkCxQ=";
hash = "sha256-TAIaIPjXuQ2euGPw/Dz2b3uxo6v0nrP/+RCGsimeeN8=";
};
projectFile = "main/GarnetServer/GarnetServer.csproj";
@@ -22,10 +22,11 @@ buildDotnetModule rec {
dotnet-sdk =
with dotnetCorePackages;
sdk_9_0
sdk_10_0
// {
inherit
(combinePackages [
sdk_10_0
sdk_9_0
sdk_8_0
])
@@ -36,7 +37,7 @@ buildDotnetModule rec {
dotnetBuildFlags = [
"-f"
"net9.0"
"net10.0"
];
dotnetInstallFlags = dotnetBuildFlags;
@@ -54,7 +55,10 @@ buildDotnetModule rec {
homepage = "https://microsoft.github.io/garnet/";
changelog = "https://github.com/microsoft/garnet/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ getchoo ];
maintainers = with lib.maintainers; [
getchoo
hythera
];
mainProgram = "GarnetServer";
};
}
+2 -2
View File
@@ -10,11 +10,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "gemini-cli-bin";
version = "0.29.5";
version = "0.30.0";
src = fetchurl {
url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini.js";
hash = "sha256-Yzqi2l41XLNMGNqeVGru0SALc1ZVa2LS4Qk2QiiSasY=";
hash = "sha256-N4pfjiaawx8kvaOFoQ53owJehD69fECJPpt5DxKVJ7k=";
};
dontUnpack = true;
+3 -3
View File
@@ -17,18 +17,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "geopard";
version = "1.6.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = "ranfdev";
repo = "geopard";
rev = "v${finalAttrs.version}";
hash = "sha256-etx8YPEFGSNyiSLpTNIXTZZiLSgAntQsM93On7dPGI0=";
hash = "sha256-wOkzylRfFJsdu9KC4TvF/qYkGf8OZVd1tRre5TbNOX4=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
hash = "sha256-FHYWpMmJvcHuAHr9fFKl1qIhJb32NJEA/0j3R6/mVgQ=";
hash = "sha256-g7pHEBrR/tdKP+kuYJ44Py7kaAx0tXcMkC4UdsfSfDQ=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "go-tools";
version = "2025.1.1";
version = "2026.1";
src = fetchFromGitHub {
owner = "dominikh";
repo = "go-tools";
rev = finalAttrs.version;
sha256 = "sha256-ekSOXaVSFdzM76tcj1hbtzhYw4fnFX3VkTnsGtJanXg=";
sha256 = "sha256-cj/pHKwp7eGuOO1zhv5bFmuPHgsFytktLQmihhdYkfY=";
};
vendorHash = "sha256-HssfBnSKdVZVgf4f0mwsGTwhiszBlE2HmDy7cvyvJ60=";
vendorHash = "sha256-Wu8+e0r0bkztLbxekbHktoKjg6c8q7ls5APSEdO8CKs=";
excludedPackages = [ "website" ];
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule (finalAttrs: {
pname = "gotify-server";
version = "2.8.0";
version = "2.9.0";
src = fetchFromGitHub {
owner = "gotify";
repo = "server";
tag = "v${finalAttrs.version}";
hash = "sha256-wLkJ7zBz89e+ECuaNDcbOzHsA9Xiuz9jrqujnd4Mdzc=";
hash = "sha256-yfF4fS8SazjzTUHIHLGAvD2tJJMJ+W678d6Rsc+2weA=";
};
vendorHash = "sha256-vcrMWCNVqDMlIgamb0fBekNrb8qMj2Cb0b7KZbqJ1yg=";
vendorHash = "sha256-oO0wnwBQPJqeJkFoAoEIKRuvbvsbp18F7jwxPCYjsxg=";
# No test
doCheck = false;
+1 -1
View File
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/yarn.lock";
hash = "sha256-nU1K43ucv2DnDcIDee6I2t8fgz86NSyNvth2znlclsM=";
hash = "sha256-MKHpdRxL12T4/JVPCUE7nQresxnRBs9kvWGvfAhMESM=";
};
nativeBuildInputs = [
+11 -1
View File
@@ -4,6 +4,7 @@
fetchurl,
SDL2,
ftgl,
autoreconfHook,
pkg-config,
libpng,
libjpeg,
@@ -31,9 +32,18 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
# remove bundled library
rm -r src/tinyxml
# Fix build with boost 1.89
rm m4/ax_boost_system.m4
substituteInPlace configure.ac \
--replace-fail "AX_BOOST_SYSTEM" ""
'';
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [
glew
SDL2
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "hedgedoc";
version = "1.10.6";
version = "1.10.7";
src = fetchFromGitHub {
owner = "hedgedoc";
repo = "hedgedoc";
tag = finalAttrs.version;
hash = "sha256-Utun/xGSYV20HJNwvV8q4iekRNE+oBx1kSo3rx5IZTQ=";
hash = "sha256-9HbvnnvC1eWoOxPE6yW2GcULgIrXDZ4B+mt7ZYz4j/Q=";
};
# Generate this file with:
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "imgpkg";
version = "0.47.0";
version = "0.47.2";
src = fetchFromGitHub {
owner = "carvel-dev";
repo = "imgpkg";
rev = "v${finalAttrs.version}";
hash = "sha256-vmEdX7Hn7pfUpiGbhrzX4dhqrLhhvH95mSaABa6cJxg=";
hash = "sha256-DjygQ6wMbWOZxRezZ/SN4WsvngrKVnvAtTO6Bu9eHkM=";
};
vendorHash = null;
@@ -6,13 +6,13 @@
}:
buildGoModule (finalAttrs: {
pname = "infrastructure-agent";
version = "1.72.4";
version = "1.72.6";
src = fetchFromGitHub {
owner = "newrelic";
repo = "infrastructure-agent";
rev = finalAttrs.version;
hash = "sha256-qhw21kOspIyAyFQYXy56NhGCSesjkPrhagXfcfyiBRQ=";
hash = "sha256-wMQL0RAhJ/pGOWUQouiod735pDR6bFVJr0SXk0p0gyQ=";
};
vendorHash = "sha256-H41FxeJLrlaL/KbcBAS1WuMfVn6d+4So3egXb6E46/o=";
+1 -1
View File
@@ -14,7 +14,7 @@ in
inherit useVSCodeRipgrep;
commandLineArgs = extraCommandLineArgs;
version = "0.10.0";
version = "0.10.32";
pname = "kiro";
# You can find the current VSCode version in the About dialog:
+6 -6
View File
@@ -1,14 +1,14 @@
{
"x86_64-linux": {
"url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.10.0/tar/kiro-ide-0.10.0-stable-linux-x64.tar.gz",
"hash": "sha256-P9s/9l+y44tZ3QRKWDqA9G4N3Z2NErp/f6SYo3ztrAQ="
"url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.10.32/tar/kiro-ide-0.10.32-stable-linux-x64.tar.gz",
"hash": "sha256-m9c5QYJnHmJBtWuVTwg2iJldDOvtVVM2g9gDVxn6JOU="
},
"x86_64-darwin": {
"url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.10.0/kiro-ide-0.10.0-stable-darwin-x64.dmg",
"hash": "sha256-fFvBOuxlaIpH7A2v6i4s8Qgly8zAJ6VEHvlkWGNZ1oo="
"url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.10.32/kiro-ide-0.10.32-stable-darwin-x64.dmg",
"hash": "sha256-h/k/yKAwguV35fNb83OnB8lXXhi5527O97Z6joP5ItQ="
},
"aarch64-darwin": {
"url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.10.0/kiro-ide-0.10.0-stable-darwin-arm64.dmg",
"hash": "sha256-gnqAj2rgF20zCl/718RvnWrIdw3kR5JSVLATsxFyzNY="
"url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.10.32/kiro-ide-0.10.32-stable-darwin-arm64.dmg",
"hash": "sha256-G45sPTlMnO2Dxd20gKcfEmw2zZ37vqk06dkxvJe/LJM="
}
}
+5 -12
View File
@@ -3,7 +3,7 @@
stdenv,
fetchFromGitHub,
fetchpatch,
requireFile,
fetchItchIo,
cmake,
pkg-config,
SDL2,
@@ -31,19 +31,12 @@ let
sha256 = "09h9r65z8bar2z89s09j6px0gdq355kjf38rmd85xb2aqwnm6xig";
};
# TODO: Replace this with fetchItchIo
assets_src = requireFile {
assets_src = fetchItchIo {
name = "koboredux-${version}-Linux.tar.bz2";
gameUrl = "https://olofson.itch.io/kobo-redux";
sha256 = "11bmicx9i11m4c3dp19jsql0zy4rjf5a28x4hd2wl8h3bf8cdgav";
message = ''
Please purchase the game on https://olofson.itch.io/kobo-redux
and download the Linux build.
Once you have downloaded the file, please use the following command
and re-run the installation:
nix-prefetch-url file://\$PWD/koboredux-${version}-Linux.tar.bz2
upload = "709961";
extraMessage = ''
Alternatively, install the "koboredux-free" package, which replaces the
proprietary assets with a placeholder theme.
'';
+2 -2
View File
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "LASzip";
repo = "LASzip";
rev = finalAttrs.version;
tag = finalAttrs.version;
hash = "sha256-v/oLU69zqDW1o1HTlay7GDh1Kbmv1rarII2Fz5HWCqg=";
};
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Turn quickly bulky LAS files into compact LAZ files without information loss";
homepage = "https://laszip.org";
changelog = "https://github.com/LASzip/LASzip/releases/tag/${finalAttrs.src.rev}";
changelog = "https://github.com/LASzip/LASzip/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.lgpl2;
maintainers = [ ];
platforms = lib.platforms.unix;
+3 -3
View File
@@ -13,12 +13,12 @@
stdenv.mkDerivation {
pname = "libfilezilla";
version = "0.52.0";
version = "0.54.1";
src = fetchsvn {
url = "https://svn.filezilla-project.org/svn/libfilezilla/trunk";
rev = "11335";
hash = "sha256-BjHqPC43UtwlYeKbgIaGU8jmWbg5UUiTN8vl1m2mZpo=";
rev = "11363";
hash = "sha256-m4CfnovtZPvwwjlyWKx/L1OkjiIlKfR7tqg+xB+nqzw=";
};
nativeBuildInputs = [
@@ -0,0 +1,37 @@
{
stdenv,
fetchYarnDeps,
yarnConfigHook,
yarnBuildHook,
nodejs,
src,
version,
meta,
}:
stdenv.mkDerivation {
pname = "listmonk-email-builder";
inherit version;
src = "${src}/frontend/email-builder";
offlineCache = fetchYarnDeps {
yarnLock = "${src}/frontend/email-builder/yarn.lock";
hash = "sha256-glt7tMfP3x0Mr/hFG1t6TfwVJ+yZ551jeZK2UPIKI8g=";
};
nativeBuildInputs = [
yarnConfigHook
yarnBuildHook
nodejs
];
installPhase = ''
runHook preInstall
mkdir -p $out
cp -R dist/* $out
runHook postInstall
'';
inherit meta;
}
+4
View File
@@ -49,6 +49,7 @@ buildGoModule (finalAttrs: {
"${finalAttrs.passthru.frontend}/altcha.umd.js:/public/static/altcha.umd.js"
"static/email-templates"
"${finalAttrs.passthru.frontend}/admin:/admin"
"${finalAttrs.passthru.email-builder}:/admin/static/email-builder"
"i18n:/i18n"
];
in
@@ -59,11 +60,14 @@ buildGoModule (finalAttrs: {
passthru = {
frontend = callPackage ./frontend.nix { inherit (finalAttrs) meta version src; };
email-builder = callPackage ./email-builder.nix { inherit (finalAttrs) meta version src; };
tests = { inherit (nixosTests) listmonk; };
updateScript = nix-update-script {
extraArgs = [
"-s"
"frontend"
"-s"
"email-builder"
];
};
};
+2
View File
@@ -2,6 +2,7 @@
autoPatchelfHook,
common-updater-scripts,
curl,
expat,
fetchurl,
ffmpeg,
lib,
@@ -51,6 +52,7 @@ stdenv.mkDerivation (
qt5.wrapQtAppsHook
];
buildInputs = [
expat
ffmpeg
openssl
qt5.qtbase
+2 -2
View File
@@ -36,14 +36,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mame";
version = "0.285";
version = "0.286";
srcVersion = builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version;
src = fetchFromGitHub {
owner = "mamedev";
repo = "mame";
rev = "mame${finalAttrs.srcVersion}";
hash = "sha256-vuGQ1VOjIAEopV4X+qP1k+bgH7lJJLZ9RtYevUxgIQg=";
hash = "sha256-NsCW8cFSaCW85iXmCro5mj3xTlKUM/nE0nBF92UZAeQ=";
};
outputs = [
+23 -8
View File
@@ -2,11 +2,11 @@
stdenv,
lib,
fetchFromGitLab,
fetchpatch,
gitUpdater,
makeFontsConf,
testers,
# https://gitlab.com/ubports/development/core/lib-cpp/net-cpp/-/issues/5
boost186,
boost,
cmake,
curl,
doxygen,
@@ -46,11 +46,26 @@ stdenv.mkDerivation (finalAttrs: {
"doc"
];
postPatch = lib.optionalString finalAttrs.finalPackage.doCheck ''
# Use wrapped python. Removing just the /usr/bin doesn't seem to work?
substituteInPlace tests/httpbin.h.in \
--replace '/usr/bin/python3' '${lib.getExe pythonEnv}'
'';
patches = [
# Remove when version > 3.2.0
(fetchpatch {
name = "0001-net-cpp-fix-compatibility-with-Boost-1.88.patch";
url = "https://gitlab.com/ubports/development/core/lib-cpp/net-cpp/-/commit/9ff8651b11eb9dc0f64147001e10a57d1546a626.patch";
hash = "sha256-IEa3nhnv0oa5WmhIDG3OMrZmmoAZFeedAzKXAKVTIQg=";
})
];
postPatch =
# https://gitlab.com/ubports/development/core/lib-cpp/net-cpp/-/merge_requests/22, too basic to bother with fetchpatch
''
substituteInPlace src/CMakeLists.txt \
--replace-fail 'find_package(Boost COMPONENTS system' 'find_package(Boost COMPONENTS'
''
+ lib.optionalString finalAttrs.finalPackage.doCheck ''
# Use wrapped python. Removing just the /usr/bin doesn't seem to work?
substituteInPlace tests/httpbin.h.in \
--replace '/usr/bin/python3' '${lib.getExe pythonEnv}'
'';
strictDeps = true;
@@ -63,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
boost186
boost
curl
];
+4 -3
View File
@@ -137,16 +137,17 @@ let
in
goBuild (finalAttrs: {
pname = "ollama";
version = "0.15.6";
version = "0.17.0";
src = fetchFromGitHub {
owner = "ollama";
repo = "ollama";
tag = "v${finalAttrs.version}";
hash = "sha256-II9ffgkMj2yx7Sek5PuAgRnUIS1Kf1UeK71+DwAgBRE=";
hash = "sha256-bBoLUcWVsYxtwjJaa1hYTzodRSIT0yoF0raGItPLjR4=";
};
vendorHash = "sha256-r7bSHOYAB5f3fRz7lKLejx6thPx0dR4UXoXu0XD7kVM=";
vendorHash = "sha256-Lc1Ktdqtv2VhJQssk8K1UOimeEjVNvDWePE9WkamCos=";
proxyVendor = true;
env =
lib.optionalAttrs enableRocm {
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "omnictl";
version = "1.4.9";
version = "1.5.7";
src = fetchFromGitHub {
owner = "siderolabs";
repo = "omni";
rev = "v${version}";
hash = "sha256-oArRGnw4/goAlcw6skw7SRBoPlWAMYHv92Wu7qtBSEQ=";
hash = "sha256-cTc4ZcFBF5RXg0JoI8W+SGVWOWOP3pbZwvvNgMnCB8Y=";
};
vendorHash = "sha256-lVUe1XQr46uzx3kfj7KmoiGFUGEb7UT16IQSI8In8RU=";
vendorHash = "sha256-KMe/gUVA0BSRD0CgEGKnCkK0KR+kDRnPBs1nNcNT7lE=";
ldflags = [
"-s"
+2 -2
View File
@@ -43,8 +43,8 @@ buildGoModule (finalAttrs: {
# Fixes interactive CLI usage that needs stty https://github.com/openbao/openbao/pull/2535
(fetchpatch2 {
name = "pr2535-fix-interactive-cli.patch";
url = "https://github.com/openbao/openbao/commit/e3fec111e3f6fd543c79c08f46d2256cd93f78e7.patch";
hash = "sha256-Q/hmJj+JbpWjDhXp+p2qjlAMSUVP279Ca7ihh/9khOQ=";
url = "https://github.com/openbao/openbao/commit/e3fec111e3f6fd543c79c08f46d2256cd93f78e7.patch?full_index=1";
hash = "sha256-ixpWKfVT1dPAjF7RKS2tBpAr1YAqNkvf4/L7Be/C8Es=";
})
];
+20 -3
View File
@@ -2,6 +2,8 @@
stdenvNoCC,
lib,
opencloud,
applyPatches,
fetchpatch,
pnpm_10,
fetchPnpmDeps,
pnpmConfigHook,
@@ -10,7 +12,18 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "opencloud-idp-web";
inherit (opencloud) version src;
inherit (opencloud) version;
src = applyPatches {
src = opencloud.src;
patches = [
# Fixes broken kopano tarball, remove in next version
(fetchpatch {
url = "https://github.com/opencloud-eu/opencloud/commit/212846f2f4e23e89ed675e5a689d87ba1de55b70.patch";
hash = "sha256-i+fkWTY4nrZ5fVGlQhhamxy9yrBL9OtDdm7CfV13oak=";
})
];
};
pnpmRoot = "services/idp";
@@ -18,8 +31,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
inherit (finalAttrs) pname version src;
pnpm = pnpm_10;
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pnpmRoot}";
fetcherVersion = 1;
hash = "sha256-NW7HK2B9h5JprK3JcIGi/OHcyoa5VTs/P0s3BZr+4FU=";
fetcherVersion = 3;
hash = "sha256-W5odz//dONpBg4eRQQoVrBMVsEQVkkP89hzMdIXxG7w=";
};
nativeBuildInputs = [
@@ -30,18 +43,22 @@ stdenvNoCC.mkDerivation (finalAttrs: {
buildPhase = ''
runHook preBuild
cd $pnpmRoot
pnpm build
mkdir -p assets/identifier/static
cp -v src/images/favicon.svg assets/identifier/static/favicon.svg
cp -v src/images/icon-lilac.svg assets/identifier/static/icon-lilac.svg
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir $out
cp -r assets $out
runHook postInstall
'';
+1 -1
View File
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
;
cargoRoot = "packages/desktop/src-tauri";
cargoHash = "sha256-6YOygSNNhAAD49ZkhWS03qGwVP2mvwItzJeyg0/ARLg=";
cargoHash = "sha256-WI48iYdxmizF1YgOQtk05dvrBEMqFjHP9s3+zBFAat0=";
buildAndTestSubdir = finalAttrs.cargoRoot;
nativeBuildInputs = [
+3 -3
View File
@@ -14,12 +14,12 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "opencode";
version = "1.2.9";
version = "1.2.13";
src = fetchFromGitHub {
owner = "anomalyco";
repo = "opencode";
tag = "v${finalAttrs.version}";
hash = "sha256-MPr+bJ3GVuVf5P/wCHxg+fk3+4Aca4EaV5NVtshAhuk=";
hash = "sha256-Svup7XCVQuIb5Ye7fb90L7dy3VcDy1gBBrqZ5ikOOC4=";
};
node_modules = stdenvNoCC.mkDerivation {
@@ -68,7 +68,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
# NOTE: Required else we get errors that our fixed-output derivation references store paths
dontFixup = true;
outputHash = "sha256-jxCPz0vSIuF/E6idil2eEH92sWuo+7bGEAhr4JrNWj0=";
outputHash = "sha256-Diu/C8b5eKUn7MRTFBcN5qgJZTp0szg0ECkgEaQZ87Y=";
outputHashAlgo = "sha256";
outputHashMode = "recursive";
};
-136
View File
@@ -1,136 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
gtk4,
libadwaita,
tdlib,
rlottie,
rustPlatform,
meson,
ninja,
pkg-config,
rustc,
cargo,
desktop-file-utils,
blueprint-compiler,
libxml2,
libshumate,
gst_all_1,
buildPackages,
}:
let
pname = "paper-plane";
version = "0.1.0-beta.5";
src = fetchFromGitHub {
owner = "paper-plane-developers";
repo = "paper-plane";
tag = "v${version}";
hash = "sha256-qcAHxNnF980BHMqLF86M06YQnEN5L/8nkyrX6HQjpBA=";
};
# Paper Plane requires a patch to the gtk4, but may be removed later
# https://github.com/paper-plane-developers/paper-plane/tree/main?tab=readme-ov-file#prerequisites
gtk4-paperplane = gtk4.overrideAttrs (prev: {
patches = (prev.patches or [ ]) ++ [ "${src}/build-aux/gtk-reversed-list.patch" ];
});
wrapPaperPlaneHook = buildPackages.wrapGAppsHook3.override {
gtk3 = gtk4-paperplane;
};
# libadwaita has gtk4 in propagatedBuildInputs so it must be overrided
# to avoid linking two libraries, while libshumate doesn't
libadwaita-paperplane = libadwaita.override {
gtk4 = gtk4-paperplane;
};
tdlib-paperplane = tdlib.overrideAttrs (prev: {
pname = "tdlib-paperplane";
version = "1.8.19";
src = fetchFromGitHub {
owner = "tdlib";
repo = "td";
rev = "2589c3fd46925f5d57e4ec79233cd1bd0f5d0c09";
hash = "sha256-mbhxuJjrV3nC8Ja7N0WWF9ByHovJLmoLLuuzoU4khjU=";
};
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail "cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
substituteInPlace td/generate/tl-parser/CMakeLists.txt \
--replace-fail "cmake_minimum_required(VERSION 3.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
'';
});
rlottie-paperplane = rlottie.overrideAttrs (prev: {
pname = "rlottie-paperplane";
version = "0-unstable-2022-09-14";
src = fetchFromGitHub {
owner = "paper-plane-developers";
repo = "rlottie";
rev = "1dd47cec7eb8e1f657f02dce9c497ae60f7cf8c5";
hash = "sha256-OIKnDikuJuRIR9Jvl1PnUA9UAV09EmgGdDTeWoVi7jk=";
};
patches = [ ];
env.NIX_CFLAGS_COMPILE = prev.env.NIX_CFLAGS_COMPILE + " -Wno-error";
});
in
stdenv.mkDerivation {
inherit pname version src;
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-QEX7w8eMV7DJFONjq23o8eCV+lliugS0pcdufFhcZrM=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
rustPlatform.cargoSetupHook
rustPlatform.bindgenHook
rustc
cargo
wrapPaperPlaneHook
desktop-file-utils
blueprint-compiler
libxml2.bin
];
buildInputs = [
libshumate
libadwaita-paperplane
tdlib-paperplane
rlottie-paperplane
gst_all_1.gstreamer
gst_all_1.gst-libav
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
];
mesonFlags = [
# The API ID and hash provided here are for use with Paper Plane only.
# Redistribution of the key in Nixpkgs has been explicitly permitted
# by Paper Plane developers. Please do not use it in other projects.
"-Dtg_api_id=22303002"
"-Dtg_api_hash=3cc0969992690f032197e6609b296599"
];
# Workaround for the gettext-sys issue
# https://github.com/Koka/gettext-rs/issues/114
env.NIX_CFLAGS_COMPILE = lib.optionalString (
stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16"
) "-Wno-error=incompatible-function-pointer-types";
meta = {
homepage = "https://github.com/paper-plane-developers/paper-plane";
description = "Chat over Telegram on a modern and elegant client";
longDescription = ''
Paper Plane is an alternative Telegram client. It uses libadwaita
for its user interface and strives to meet the design principles
of the GNOME desktop.
'';
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ aleksana ];
mainProgram = "paper-plane";
platforms = lib.platforms.unix;
};
}
@@ -2,6 +2,7 @@
stdenv,
lib,
fetchFromGitLab,
fetchpatch,
gitUpdater,
testers,
boost,
@@ -32,6 +33,15 @@ stdenv.mkDerivation (finalAttrs: {
"doc"
];
patches = [
# Remove when version > 1.0.9
(fetchpatch {
name = "0001-persistent-cache-cpp-Fix-compatibility-with-Boost-1.89.patch";
url = "https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp/-/commit/121397b58bdb2d6750a41bec0cf1676e4e9b8cf5.patch";
hash = "sha256-QKPf5E49NNZ+rzCCknJNQjcd/bEgHuh23RBM892Xz1o=";
})
];
postPatch = ''
# Wrong concatenation
substituteInPlace data/libpersistent-cache-cpp.pc.in \
+4 -4
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "polarity";
version = "latest-unstable-2026-01-29";
version = "latest-unstable-2026-02-20";
src = fetchFromGitHub {
owner = "polarity-lang";
repo = "polarity";
rev = "d83922b7bbac56c8c06265c1a23a04687caa3322";
hash = "sha256-E1EzX4RKwL72cqqHzbkAM7O5b+t896MxC5ni53uSh84=";
rev = "630a1bb3b97c7c1a13087407a50cc78316a2526e";
hash = "sha256-IuT1LJiMEOS+c4dUamCpboDNqHGDVxsjYBJ4NEmLZa4=";
};
cargoHash = "sha256-4oDFW2Ob098BVRXiDRbBwRM+vIATbximzG54BKSA9+I=";
cargoHash = "sha256-FrCOsgbb0xQH3cKnWqa2n17uDpppnSd0PyVrrCPXCYw=";
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
File diff suppressed because it is too large Load Diff
@@ -1,80 +0,0 @@
diff --git a/app/build.xml b/app/build.xml
index 37aa13d03..a495b4f7e 100644
--- a/app/build.xml
+++ b/app/build.xml
@@ -162,6 +162,7 @@
encoding="UTF-8"
includeAntRuntime="false"
classpath="../core/library/core.jar;
+ utils/library/utils.jar;
lib/ant.jar;
lib/ant-launcher.jar;
lib/flatlaf.jar;
diff --git a/app/utils/build.xml b/app/utils/build.xml
new file mode 100644
index 000000000..5a4b72e32
--- /dev/null
+++ b/app/utils/build.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<project name="Processing Utils Library" default="build">
+ <target name="compile" description="Compile sources">
+ <mkdir dir="bin" />
+ <javac source="17"
+ target="17"
+ srcdir="src" destdir="bin"
+ encoding="UTF-8"
+ includeAntRuntime="false"
+ nowarn="true">
+ </javac>
+ </target>
+
+ <target name="build" depends="compile" description="Build utils library">
+ <jar basedir="bin" destfile="library/utils.jar" />
+ </target>
+
+ <target name="clean" description="Clean the build directories">
+ <delete dir="bin" />
+ <delete file="library/utils.jar" />
+ </target>
+</project>
diff --git a/build/build.xml b/build/build.xml
index f1247b511..2f1f22128 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -191,6 +191,7 @@
<!-- also need to copy these to the bundleapp task for macos -->
<fileset dir=".." id="runtime.jars">
<include name="app/pde.jar" />
+ <include name="app/utils/library/utils.jar" />
<include name="app/lib/jna.jar" />
<include name="app/lib/jna-platform.jar" />
<include name="app/lib/ant.jar" />
@@ -294,6 +295,7 @@
<target name="subprojects-clean">
<subant buildpath="../core" target="clean"/>
+ <subant buildpath="../app/utils" target="clean"/>
<subant buildpath="../app" target="clean"/>
<subant buildpath="../java/libraries/dxf" target="clean"/>
<subant buildpath="../java/libraries/io" target="clean"/>
@@ -315,6 +317,7 @@
<target name="subprojects-build">
<subant buildpath="../core" target="build"/>
+ <subant buildpath="../app/utils" target="build"/>
<subant buildpath="../app" target="build"/>
<subant buildpath="../java/libraries/dxf" target="build"/>
<subant buildpath="../java/libraries/net" target="build"/>
diff --git a/java/build.xml b/java/build.xml
index ca2e32f4f..5aeae7ac8 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -97,6 +97,7 @@
<pathelement location="../app/lib/apple.jar" />
<pathelement location="../app/lib/jna.jar" />
<pathelement location="../app/lib/jna-platform.jar" />
+ <pathelement location="../app/utils/library/utils.jar" />
<pathelement location="mode/antlr-4.7.2-complete.jar" />
<pathelement location="mode/classpath-explorer-1.0.jar" />
@@ -0,0 +1,24 @@
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 88a0b63..a0f50bc 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -341,6 +341,7 @@ tasks.register<Copy>("includeJdk") {
from(Jvm.current().javaHome.absolutePath)
destinationDir = composeResources("jdk").get().asFile
+ dirPermissions { unix("rwx------") };
fileTree(destinationDir).files.forEach { file ->
file.setWritable(true, false)
file.setReadable(true, false)
diff --git a/java/build.gradle.kts b/java/build.gradle.kts
index fc7151189..6dd8409fa 100644
--- a/java/build.gradle.kts
+++ b/java/build.gradle.kts
@@ -80,6 +80,7 @@ legacyLibraries.forEach { library ->
include("*.properties")
include("library/**/*")
include("examples/**/*")
+ dirPermissions { unix("rwx------") };
into( javaMode("/libraries/$library"))
}
bundle.configure {
+79 -35
View File
@@ -3,19 +3,20 @@
stdenv,
fetchFromGitHub,
fetchurl,
ant,
unzip,
makeWrapper,
gradle_8,
jdk17,
jogl,
rsync,
ffmpeg,
batik,
stripJavaArchivesHook,
wrapGAppsHook3,
libGL,
}:
let
# Force use of JDK 17, see https://github.com/processing/processing4/issues/1043
gradle = gradle_8.override { java = jdk17; };
jdk = jdk17;
buildNumber = "1310";
vaqua = fetchurl {
@@ -53,12 +54,6 @@ let
url = "mirror://maven/com/google/code/gson/gson/2.9.1/gson-2.9.1.jar";
sha256 = "sha256-N4U04znm5tULFzb7Ort28cFdG+P0wTzsbVNkEuI9pgM=";
};
arch =
{
x86_64 = "amd64";
}
.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name;
in
stdenv.mkDerivation rec {
pname = "processing";
@@ -71,10 +66,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-u2wQl/VGCNJPd+k3DX2eW7gkA/RARMTSNGcoQuS/Oh8=";
};
patches = [ ./fix-ant-build.patch ];
patches = [
# Compose Multiplatform generates its createDistributable target too late, and we don't need it anyway
./skip-distributable.patch
# dirPermissions: Without this, some gradle tasks (e.g. includeJdk) fail to copy contents of read-only subfolders within the nix store
./fix-permissions.patch
];
nativeBuildInputs = [
ant
gradle
unzip
makeWrapper
stripJavaArchivesHook
@@ -83,21 +84,27 @@ stdenv.mkDerivation rec {
buildInputs = [
jdk
jogl
ant
rsync
ffmpeg
batik
];
dontWrapGApps = true;
mitmCache = gradle.fetchDeps {
inherit pname;
data = ./deps.json;
};
buildPhase = ''
gradleFlags = [ "-Dfile.encoding=utf-8" ];
gradleBuildTask = "createDistributable";
gradleUpdateTask = "createDistributable";
enableParallelUpdating = false;
# Need to run the entire createDistributable task, otherwise the buildPhase fails at the compose checkRuntime step
gradleUpdateScript = ''
runHook preBuild
runHook preGradleUpdate
echo "tarring jdk"
tar --checkpoint=10000 -czf build/linux/jdk-17.0.8-${arch}.tgz ${jdk}
mkdir -p app/lib core/library
cp ${ant.home}/lib/{ant.jar,ant-launcher.jar} app/lib/
ln -s ${jogl}/share/java/* core/library/
ln -s ${vaqua} app/lib/VAqua9.jar
ln -s ${flatlaf} app/lib/flatlaf.jar
@@ -107,13 +114,41 @@ stdenv.mkDerivation rec {
unzip -qo ${jna} -d app/lib/
mv app/lib/{jna-5.10.0/dist/jna.jar,}
mv app/lib/{jna-5.10.0/dist/jna-platform.jar,}
ln -sf ${batik}/* java/libraries/svg/library/
cp java/libraries/svg/library/share/java/batik-all-${batik.version}.jar java/libraries/svg/library/batik.jar
echo "tarring ffmpeg"
tar --checkpoint=10000 -czf build/shared/tools/MovieMaker/ffmpeg-5.0.1.gz ${ffmpeg}
cd build
ant build
cd ..
gradle createDistributable
runHook postGradleUpdate
'';
dontWrapGApps = true;
postPatch = ''
substituteInPlace app/build.gradle.kts \
--replace-fail "https://github.com/processing/processing-examples/archive/refs/heads/main.zip" "https://github.com/processing/processing-examples/archive/b10c9e9a05a0d6c20d233ca7f30d315b5047720e.zip" \
--replace-fail "https://github.com/processing/processing-website/archive/refs/heads/main.zip" "https://github.com/processing/processing-website/archive/f11676d1b7464291a23ae834f2ef6ab00baaed8e.zip"
'';
buildPhase = ''
runHook preBuild
mkdir -p app/lib core/library
ln -s ${jogl}/share/java/* core/library/
ln -s ${vaqua} app/lib/VAqua9.jar
ln -s ${flatlaf} app/lib/flatlaf.jar
ln -s ${lsp4j} java/mode/org.eclipse.lsp4j.jar
ln -s ${lsp4j-jsonrpc} java/mode/org.eclipse.lsp4j.jsonrpc.jar
ln -s ${gson} java/mode/gson.jar
unzip -qo ${jna} -d app/lib/
mv app/lib/{jna-5.10.0/dist/jna.jar,}
mv app/lib/{jna-5.10.0/dist/jna-platform.jar,}
ln -sf ${batik}/* java/libraries/svg/library/
cp java/libraries/svg/library/share/java/batik-all-${batik.version}.jar java/libraries/svg/library/batik.jar
gradle assemble
runHook postBuild
'';
@@ -121,24 +156,28 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p $out/share/
gradle createDistributable
mkdir -p $out/lib
cp -dpr app/build/compose/binaries/main/app/Processing/lib/* $out/lib/
cp -dpr app/build/compose/binaries/main/app/Processing/bin $out/unwrapped
mkdir -p $out/share/applications/
cp -dp build/linux/${pname}.desktop $out/share/applications/
cp -dpr build/linux/work $out/share/${pname}
rmdir $out/share/${pname}/java
ln -s ${jdk} $out/share/${pname}/java
rm -r $out/lib/app/resources/jdk
ln -s ${jdk}/lib/openjdk $out/lib/app/resources/jdk
makeWrapper $out/unwrapped/Processing $out/bin/Processing \
''${gappsWrapperArgs[@]} \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \
--prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp"
runHook postInstall
'';
preFixup = ''
makeWrapper $out/share/${pname}/processing $out/bin/processing \
"''${gappsWrapperArgs[@]}" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \
--prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp"
makeWrapper $out/share/${pname}/processing-java $out/bin/processing-java \
"''${gappsWrapperArgs[@]}" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \
--prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp"
postFixup = ''
ln -s $out/bin/Processing $out/bin/processing
'';
meta = {
@@ -148,7 +187,12 @@ stdenv.mkDerivation rec {
gpl2Only
lgpl21Only
];
mainProgram = "Processing";
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ evan-goode ];
sourceProvenance = with lib.sourceTypes; [
fromSource
binaryBytecode
];
};
}
@@ -0,0 +1,21 @@
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 0d3fcbd..88a0b63 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -280,16 +280,7 @@ tasks.register<Exec>("packageSnap"){
commandLine("snapcraft")
}
tasks.register<Zip>("zipDistributable"){
- dependsOn("createDistributable", "setExecutablePermissions")
group = "compose desktop"
-
- val distributable = tasks.named<AbstractJPackageTask>("createDistributable").get()
- val dir = distributable.destinationDir.get()
- val packageName = distributable.packageName.get()
-
- from(dir){ eachFile{ permissions{ unix("755") } } }
- archiveBaseName.set(packageName)
- destinationDirectory.set(dir.file("../").asFile)
}
afterEvaluate{
+1 -1
View File
@@ -75,7 +75,7 @@ lib.fix (
# radicle-httpd using a more limited sparse checkout we need to carry a
# separate hash.
src = radicle-httpd.src.override {
hash = "sha256-Zt9RiuloWmb1eL6f2Gotvy+FMTUvSokOEGOIBrBeO/E=";
hash = "sha256-8lMUPt2eVlspMlRxUjOvjtCsd/EXg0IDSVjXxMVzbe4=";
sparseCheckout = [ ];
};
+3 -3
View File
@@ -15,7 +15,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "radicle-httpd";
version = "0.23.0";
version = "0.24.0";
env.RADICLE_VERSION = finalAttrs.version;
@@ -25,12 +25,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
repo = "z4V1sjrXqjvFdnCUbxPFqd5p4DtH5";
tag = "releases/${finalAttrs.version}";
sparseCheckout = [ "radicle-httpd" ];
hash = "sha256-OpDW6qJOHN4f4smhc1vNO0DRzJW6114gQV4K1ZNicag=";
hash = "sha256-749hFe7GJz/YUmocW5MO7uKWLTo3W4wJYSXdIURcRtg=";
};
sourceRoot = "${finalAttrs.src.name}/radicle-httpd";
cargoHash = "sha256-m/2pP1mCU4SvPXU3qWOpbh3H/ykTOGgERYcP8Iu5DDs=";
cargoHash = "sha256-6uHukSsNnnk11tudFnNvNd+ZXmwGxMSYArsiaCaabWk=";
nativeBuildInputs = [
asciidoctor
+3 -3
View File
@@ -7,7 +7,7 @@
rainfrog,
}:
let
version = "0.3.16";
version = "0.3.17";
in
rustPlatform.buildRustPackage {
inherit version;
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
owner = "achristmascarl";
repo = "rainfrog";
tag = "v${version}";
hash = "sha256-Bz1YNR3/RnCZgU4rZWU6ATclkuUamYE3Umja4qXlmXk=";
hash = "sha256-26pB4A1RR2d++Bh9u6IkNrJ552y6KALTxv1NwRzQ+UE=";
};
cargoHash = "sha256-qpUUInE0XmyAXWZcqXNyNHy5SDKR+M7DG2YRNlr8rug=";
cargoHash = "sha256-AeRh4xozRZs7IK7ez63DuglE+WUm3F3Gl4ohq1W/ZSg=";
passthru = {
tests.version = testers.testVersion {

Some files were not shown because too many files have changed in this diff Show More