Merge master into staging-nixos
This commit is contained in:
nixpkgs-ci[bot]
@@ -223,6 +223,7 @@ in
|
||||
${getExe cfg.package}
|
||||
'';
|
||||
Restart = "always";
|
||||
RestartSec = 1;
|
||||
EnvironmentFile = [
|
||||
cfg.environmentFile
|
||||
settingsFile
|
||||
|
||||
@@ -15,19 +15,19 @@ let
|
||||
vsix = stdenv.mkDerivation (finalAttrs: {
|
||||
name = "gitlens-${finalAttrs.version}.vsix";
|
||||
pname = "gitlens-vsix";
|
||||
version = "17.8.1";
|
||||
version = "17.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gitkraken";
|
||||
repo = "vscode-gitlens";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ma+2HusIdhQ2Xy9rKs9fzJYSZ2YKa0taqv7ZzitNEUo=";
|
||||
hash = "sha256-ISSvb8teH4CMN0rPc/Nqs67UJUCci4rcLAo+XkpAECE=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-MosT/2dmYomhRXtAeAZS2AMljiVDx+K3t5lLNii2a64=";
|
||||
hash = "sha256-lLq/HMCYDYN0DffW64O+gUaxiO4yK7GPncRkv8rLfTw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
buildKodiAddon rec {
|
||||
pname = "youtube";
|
||||
namespace = "plugin.video.youtube";
|
||||
version = "7.4.1";
|
||||
version = "7.4.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anxdpanic";
|
||||
repo = "plugin.video.youtube";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-21akvxLsooYqBVpWBUIrs6nPGKtYuqthJLgikIO3if4=";
|
||||
hash = "sha256-fut9FTs87/EXpZ2PjIvhHL4001k3+i519m9ccMR1o+I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -10,6 +10,8 @@
|
||||
|
||||
anki-quizlet-importer-extended = callPackage ./anki-quizlet-importer-extended { };
|
||||
|
||||
fsrs4anki-helper = callPackage ./fsrs4anki-helper { };
|
||||
|
||||
image-occlusion-enhanced = callPackage ./image-occlusion-enhanced { };
|
||||
|
||||
local-audio-yomichan = callPackage ./local-audio-yomichan { };
|
||||
|
||||
@@ -0,0 +1,62 @@
|
||||
{
|
||||
lib,
|
||||
anki-utils,
|
||||
fetchFromGitHub,
|
||||
unstableGitUpdater,
|
||||
python3,
|
||||
}:
|
||||
|
||||
anki-utils.buildAnkiAddon (finalAttrs: {
|
||||
pname = "fsrs4anki-helper";
|
||||
version = "24.06.3-unstable-2025-01-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-spaced-repetition";
|
||||
repo = "fsrs4anki-helper";
|
||||
rev = "8934a5d53caa68bf688e6b0964c36fb5a87970c0";
|
||||
hash = "sha256-2vDPEXfFeR7z8WMC96bSaDJ2nLN16dZicAVu1Nnq558=";
|
||||
};
|
||||
|
||||
postFixup = ''
|
||||
rmdir $out/share/anki/addons/fsrs4anki-helper/python_i18n
|
||||
ln -s \
|
||||
${python3.pkgs.python-i18n}/${python3.sitePackages} \
|
||||
$out/share/anki/addons/fsrs4anki-helper/python_i18n
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
description = "Anki add-on that supports the FSRS algorithm";
|
||||
longDescription = ''
|
||||
FSRS Helper is an Anki add-on that supports the FSRS algorithm. It has eight main features:
|
||||
|
||||
- Reschedule cards based on their entire review histories.
|
||||
- Postpone a selected number of due cards.
|
||||
- Advance a selected number of undue cards.
|
||||
- Balance the load during rescheduling (based on fuzz).
|
||||
- Less Anki on Easy Days (such as weekends) during rescheduling (based on load balance).
|
||||
- Disperse Siblings (cards with the same note) to avoid interference & reminder.
|
||||
- Flatten future due cards to a selected number of reviews per day.
|
||||
- Steps Stats quantify your short-term memory performance and recommend learning steps.
|
||||
|
||||
It can also be configured declaratively, as follows:
|
||||
|
||||
```nix
|
||||
pkgs.ankiAddons.fsrs4anki-helper.withConfig {
|
||||
config = {
|
||||
days_to_reschedule = 10;
|
||||
auto_reschedule_after_sync = true;
|
||||
display_memory_state = true;
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
For a list of all configuration options, please refer to [config.md](https://github.com/open-spaced-repetition/fsrs4anki-helper/blob/${finalAttrs.src.rev}/config.md).
|
||||
'';
|
||||
homepage = "https://github.com/open-spaced-repetition/fsrs4anki-helper";
|
||||
downloadPage = "https://ankiweb.net/shared/info/759844606";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ eljamm ];
|
||||
};
|
||||
})
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
|
||||
cmake,
|
||||
boost,
|
||||
boost186,
|
||||
eigen,
|
||||
opencv,
|
||||
onetbb,
|
||||
@@ -14,7 +14,7 @@
|
||||
let
|
||||
stdenv = clangStdenv;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cctag";
|
||||
version = "1.0.4";
|
||||
|
||||
@@ -26,18 +26,18 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "alicevision";
|
||||
repo = "CCTag";
|
||||
rev = "v${version}";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-M35KGTTmwGwXefsFWB2UKAKveUQyZBW7V8ejgOAJpXk=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
# Feel free to create a PR to add CUDA support
|
||||
"-DCCTAG_WITH_CUDA=OFF"
|
||||
(lib.cmakeBool "CCTAG_WITH_CUDA" false)
|
||||
|
||||
"-DCCTAG_ENABLE_SIMD_AVX2=${if avx2Support then "ON" else "OFF"}"
|
||||
(lib.cmakeBool "CCTAG_ENABLE_SIMD_AVX2" avx2Support)
|
||||
|
||||
"-DCCTAG_BUILD_TESTS=${if doCheck then "ON" else "OFF"}"
|
||||
"-DCCTAG_BUILD_APPS=OFF"
|
||||
(lib.cmakeBool "CCTAG_BUILD_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "CCTAG_BUILD_APPS" false)
|
||||
];
|
||||
|
||||
patches = [
|
||||
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
boost186
|
||||
eigen
|
||||
opencv.cxxdev
|
||||
];
|
||||
@@ -75,4 +75,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ tmarkus ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -23,14 +23,14 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "chameleon-cli";
|
||||
version = "2.1.0-unstable-2026-02-19";
|
||||
version = "2.1.0-unstable-2026-02-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RfidResearchGroup";
|
||||
repo = "ChameleonUltra";
|
||||
rev = "7f71201e16a84a32d3056e8dfe0f0361d70e9458";
|
||||
rev = "7846bca44bccdaff0dc77484c6c28f757a87cc65";
|
||||
rootDir = "software";
|
||||
hash = "sha256-Dr5rFFAkdQ1Wwyp221OxTtF5pLDQze6/RpVNYOAqQ6I=";
|
||||
hash = "sha256-K49HCbEGvB/+tRC/zuyuz0QJFxvR/tsdOci12XcJeow=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dos2unix";
|
||||
version = "7.5.2";
|
||||
version = "7.5.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://waterlan.home.xs4all.nl/dos2unix/dos2unix-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-JkdCRGYIRC60j5bCCvbaMDyzqSs2TnLLfiT4gjnEvzo=";
|
||||
hash = "sha256-+BGiueSgyTbGHvfBcymT0YIOXPAR9Nk4YYhcy4EByiE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "fresh";
|
||||
version = "0.2.11";
|
||||
version = "0.2.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sinelaw";
|
||||
repo = "fresh";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mx/cf7vy5x2+N6KfS8y7ub62H/+mwONLm4TKeik5T0s=";
|
||||
hash = "sha256-Vaoa+jcxlHPQy0rn67Va5ZKAegw5dXSL9Kkx/uazir4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-JcoVml5UAQm2RbMn6ZBKEcZFaedeX0rjh+RZEPC0gqU=";
|
||||
cargoHash = "sha256-6eYu1XCZL/RBlntEu6Cvynp0PudgjIPvVJ8rdKxYRtw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
gzip
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gammaray";
|
||||
version = "3.3.1";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KDAB";
|
||||
repo = finalAttrs.pname;
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CJKb7H77PjPwCGW4fqLSJw1mhSweuFYlDE/7RyVDcT0=";
|
||||
hash = "sha256-sxzYp6+x06cb67f+Mi2hc4kGhYGvIctLGJdjjyGTrjs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,20 +7,25 @@
|
||||
writableTmpDirAsHomeHook,
|
||||
nix-update-script,
|
||||
ripgrep,
|
||||
makeWrapper,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "gemini-cli-bin";
|
||||
version = "0.30.0";
|
||||
version = "0.32.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini.js";
|
||||
hash = "sha256-N4pfjiaawx8kvaOFoQ53owJehD69fECJPpt5DxKVJ7k=";
|
||||
hash = "sha256-9GpzzqY+5vvDhSsKnK1jOvx5QXWeG3y7QB2UYK/rZ28=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
nodejs
|
||||
ripgrep
|
||||
@@ -29,17 +34,22 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D "$src" "$out/bin/gemini"
|
||||
local dest="$out/lib/gemini/gemini.js"
|
||||
install -Dm644 "$src" "$dest"
|
||||
|
||||
# disable auto-update
|
||||
sed -i '/enableAutoUpdate: {/,/}/ s/default: true/default: false/' "$out/bin/gemini"
|
||||
sed -i '/enableAutoUpdate: {/,/}/ s/default: true/default: false/' "$dest"
|
||||
|
||||
# use `ripgrep` from `nixpkgs`, more dependencies but prevent downloading incompatible binary on NixOS
|
||||
# this workaround can be removed once the following upstream issue is resolved:
|
||||
# https://github.com/google-gemini/gemini-cli/issues/11438
|
||||
substituteInPlace $out/bin/gemini \
|
||||
substituteInPlace "$dest" \
|
||||
--replace-fail 'const existingPath = await resolveExistingRgPath();' 'const existingPath = "${lib.getExe ripgrep}";'
|
||||
|
||||
makeWrapper "${lib.getExe nodejs}" "$out/bin/gemini" \
|
||||
--add-flags "--no-warnings=DEP0040" \
|
||||
--add-flags "$dest"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
fetchFromGitHub,
|
||||
jq,
|
||||
pkg-config,
|
||||
makeWrapper,
|
||||
clang_20,
|
||||
libsecret,
|
||||
ripgrep,
|
||||
@@ -14,24 +15,25 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "gemini-cli";
|
||||
version = "0.30.0";
|
||||
version = "0.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google-gemini";
|
||||
repo = "gemini-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+w4w1cftPSj0gJ23Slw8Oexljmu0N/PZWH4IDjw75rs=";
|
||||
hash = "sha256-huPd4W7Jf4/dZshWElicYpcHhktE83wPs/z5jVYwynM=";
|
||||
};
|
||||
|
||||
nodejs = nodejs_22;
|
||||
|
||||
npmDepsHash = "sha256-Nkd5Q2ugRqsTqaFbCSniC3Obl++uEjVUmoa8MVT5++8=";
|
||||
npmDepsHash = "sha256-iRlwCSGigRi/ilfXi8rI68vlfkeec3vB5nZWPmTLnK8=";
|
||||
|
||||
dontPatchElf = stdenv.isDarwin;
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
pkg-config
|
||||
makeWrapper
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [ clang_20 ]; # clang_21 breaks @vscode/vsce's optionalDependencies keytar
|
||||
|
||||
@@ -70,42 +72,35 @@ buildNpmPackage (finalAttrs: {
|
||||
# Prevent npmDeps and python from getting into the closure
|
||||
disallowedReferences = [
|
||||
finalAttrs.npmDeps
|
||||
nodejs_22.python
|
||||
finalAttrs.nodejs.python
|
||||
];
|
||||
|
||||
npmBuildScript = "bundle";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/{bin,share/gemini-cli}
|
||||
|
||||
mkdir -p $out/{bin,share}
|
||||
cp -r bundle $out/share/gemini-cli
|
||||
|
||||
# We only want to keep optionalDependencies (like @lydell/node-pty) to keep the closure size small,
|
||||
# as regular dependencies are already bundled via esbuild into gemini.js.
|
||||
jq '.dependencies = {} | del(.devDependencies) | del(.workspaces)' package.json > package.json.tmp && mv package.json.tmp package.json
|
||||
npm prune --omit=dev
|
||||
rm -rf node_modules/.bin
|
||||
|
||||
# Remove python files to prevent python from getting into the closure
|
||||
find node_modules -name "*.py" -delete
|
||||
# keytar/build has gyp-mac-tool with a Python shebang that gets patched,
|
||||
# creating a python3 reference in the closure
|
||||
rm -rf node_modules/keytar/build
|
||||
find node_modules -path "*/build/*" -type f -not -name "*.node" -delete
|
||||
find node_modules -type d -empty -delete
|
||||
|
||||
cp -r node_modules $out/share/gemini-cli/
|
||||
|
||||
rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli
|
||||
rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli-core
|
||||
rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli-a2a-server
|
||||
rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli-sdk
|
||||
rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli-test-utils
|
||||
rm -f $out/share/gemini-cli/node_modules/gemini-cli-vscode-ide-companion
|
||||
cp -r packages/cli $out/share/gemini-cli/node_modules/@google/gemini-cli
|
||||
cp -r packages/core $out/share/gemini-cli/node_modules/@google/gemini-cli-core
|
||||
cp -r packages/a2a-server $out/share/gemini-cli/node_modules/@google/gemini-cli-a2a-server
|
||||
rm -f $out/share/gemini-cli/docs/CONTRIBUTING.md
|
||||
|
||||
rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli-core/dist/docs/CONTRIBUTING.md
|
||||
|
||||
ln -s $out/share/gemini-cli/node_modules/@google/gemini-cli/dist/index.js $out/bin/gemini
|
||||
chmod +x "$out/bin/gemini"
|
||||
|
||||
# Clean up any remaining references to npmDeps in node_modules metadata
|
||||
find $out/share/gemini-cli/node_modules -name "package-lock.json" -delete
|
||||
find $out/share/gemini-cli/node_modules -name ".package-lock.json" -delete
|
||||
find $out/share/gemini-cli/node_modules -name "config.gypi" -delete
|
||||
makeWrapper "${lib.getExe finalAttrs.nodejs}" "$out/bin/gemini" \
|
||||
--add-flags "--no-warnings=DEP0040" \
|
||||
--add-flags "$out/share/gemini-cli/gemini.js"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gh-ost";
|
||||
version = "1.1.7";
|
||||
version = "1.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "github";
|
||||
repo = "gh-ost";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TTc69dWasqMVwwJNo+M9seMKEWgerZ2ZR7dwDfM1gWI=";
|
||||
hash = "sha256-U92rdk/9JIMOjN1cJSdAVYgR1f7aKY0nyfBbwe7517M=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "ghostty-bin";
|
||||
version = "1.2.3";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://release.files.ghostty.org/${finalAttrs.version}/Ghostty.dmg";
|
||||
hash = "sha256-817pHxFuKAJ6ufje9FCYx1dbRLQH/4g6Lc0phcSDIGs=";
|
||||
hash = "sha256-U/6Y5wmCEYAIwDuf2/XfJlUip/22vfoY630NTNMdDMU=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
Generated
+59
-51
@@ -5,7 +5,7 @@
|
||||
fetchurl,
|
||||
fetchgit,
|
||||
runCommandLocal,
|
||||
zig_0_14,
|
||||
zig_0_15,
|
||||
name ? "zig-packages",
|
||||
}:
|
||||
let
|
||||
@@ -16,7 +16,7 @@ let
|
||||
}:
|
||||
runCommandLocal name
|
||||
{
|
||||
nativeBuildInputs = [ zig_0_14 ];
|
||||
nativeBuildInputs = [ zig_0_15 ];
|
||||
}
|
||||
''
|
||||
hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
|
||||
@@ -88,6 +88,14 @@ let
|
||||
fetcher.${proto};
|
||||
in
|
||||
linkFarm name [
|
||||
{
|
||||
name = "N-V-__8AANT61wB--nJ95Gj_ctmzAtcjloZ__hRqNw5lC1Kr";
|
||||
path = fetchZigArtifact {
|
||||
name = "bindings";
|
||||
url = "https://deps.files.ghostty.org/DearBindings_v0.17_ImGui_v1.92.5-docking.tar.gz";
|
||||
hash = "sha256-i/7FAOAJJvZ5hT7iPWfMOS08MYFzPKRwRzhlHT9wuqM=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AALw2uwF_03u4JRkZwRLc3Y9hakkYV7NKRR9-RIZJ";
|
||||
path = fetchZigArtifact {
|
||||
@@ -129,11 +137,11 @@ linkFarm name [
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "gobject-0.3.0-Skun7ET3nQAc0LzvO0NAvTiGGnmkF36cnmbeCAF6MB7Z";
|
||||
name = "gobject-0.3.0-Skun7ANLnwDvEfIpVmohcppXgOvg_I6YOJFmPIsKfXk-";
|
||||
path = fetchZigArtifact {
|
||||
name = "gobject";
|
||||
url = "https://github.com/jcollie/ghostty-gobject/releases/download/0.15.1-2025-09-04-48-1/ghostty-gobject-0.15.1-2025-09-04-48-1.tar.zst";
|
||||
hash = "sha256-h6aKUerGlX2ATVEeoN03eWaqDqvUmKdedgpxrSoHvrY=";
|
||||
url = "https://deps.files.ghostty.org/gobject-2025-11-08-23-1.tar.zst";
|
||||
hash = "sha256-2b1DBvAIHY5LhItq3+q9L6tJgi7itnnrSAHc7fXWDEg=";
|
||||
};
|
||||
}
|
||||
{
|
||||
@@ -161,19 +169,19 @@ linkFarm name [
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AAH0GaQC8a52s6vfIxg88OZgFgEW6DFxfSK4lX_l3";
|
||||
name = "N-V-__8AAEbOfQBnvcFcCX2W5z7tDaN8vaNZGamEQtNOe0UI";
|
||||
path = fetchZigArtifact {
|
||||
name = "imgui";
|
||||
url = "https://deps.files.ghostty.org/imgui-1220bc6b9daceaf7c8c60f3c3998058045ba0c5c5f48ae255ff97776d9cd8bfc6402.tar.gz";
|
||||
hash = "sha256-oF/QHgTPEat4Hig4fGIdLkIPHmBEyOJ6JeYD6pnveGA=";
|
||||
url = "https://github.com/ocornut/imgui/archive/refs/tags/v1.92.5-docking.tar.gz";
|
||||
hash = "sha256-yBbCDox18+Fa6Gc1DnmSVQLRpqhZOLsac7iSfl8x+cs=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AAIdIAwDt5PxH-cwCxEcTfw4jBV8sR6fZ_XLh-cR7";
|
||||
name = "N-V-__8AABVbAwBwDRyZONfx553tvMW8_A2OKUoLzPUSRiLF";
|
||||
path = fetchZigArtifact {
|
||||
name = "iterm2_themes";
|
||||
url = "https://github.com/mbadolato/iTerm2-Color-Schemes/releases/download/release-20260112-150707-28c8f5b/ghostty-themes.tgz";
|
||||
hash = "sha256-NIqF12KqXhIrP+LyBtg6WtkHxNUdWOyziAdq8S45RrU=";
|
||||
url = "https://deps.files.ghostty.org/ghostty-themes-release-20260216-151611-fc73ce3.tgz";
|
||||
hash = "sha256-FCALuGoMgUq2lgnVALKAs5a20uuDXt8Gdt5KeJwKqP0=";
|
||||
};
|
||||
}
|
||||
{
|
||||
@@ -193,11 +201,11 @@ linkFarm name [
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "libxev-0.0.0-86vtc2UaEwDfiTKX3iBI-s_hdzfzWQUarT3MUrmUQl-Q";
|
||||
name = "libxev-0.0.0-86vtc4IcEwCqEYxEYoN_3KXmc6A9VLcm22aVImfvecYs";
|
||||
path = fetchZigArtifact {
|
||||
name = "libxev";
|
||||
url = "https://github.com/mitchellh/libxev/archive/7f803181b158a10fec8619f793e3b4df515566cb.tar.gz";
|
||||
hash = "sha256-KaozYKEhhT/6sInef7/8O/60LDBJN+8QmdLuNY1Gkmc=";
|
||||
url = "https://deps.files.ghostty.org/libxev-34fa50878aec6e5fa8f532867001ab3c36fae23e.tar.gz";
|
||||
hash = "sha256-YAPqa5bkpRihKPkyMn15oRvTCZaxO3O66ymRY3lIfdc=";
|
||||
};
|
||||
}
|
||||
{
|
||||
@@ -265,11 +273,27 @@ linkFarm name [
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "vaxis-0.1.0-BWNV_FUICQAFZnTCL11TUvnUr1Y0_ZdqtXHhd51d76Rn";
|
||||
name = "uucode-0.1.0-ZZjBPj96QADXyt5sqwBJUnhaDYs_qBeeKijZvlRa0eqM";
|
||||
path = fetchZigArtifact {
|
||||
name = "uucode";
|
||||
url = "git+https://github.com/jacobsandlund/uucode#5f05f8f83a75caea201f12cc8ea32a2d82ea9732";
|
||||
hash = "sha256-sHPh+TQSdUGus/QTbj7KSJJkTuNTrK4VNmQDjS30Lf8=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "uucode-0.2.0-ZZjBPqZVVABQepOqZHR7vV_NcaN-wats0IB6o-Exj6m9";
|
||||
path = fetchZigArtifact {
|
||||
name = "uucode";
|
||||
url = "https://deps.files.ghostty.org/uucode-0.2.0-ZZjBPqZVVABQepOqZHR7vV_NcaN-wats0IB6o-Exj6m9.tar.gz";
|
||||
hash = "sha256-0KvuD0+L1urjwFF3fhbnxC2JZKqqAVWRxOVlcD9GX5U=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "vaxis-0.5.1-BWNV_LosCQAGmCCNOLljCIw6j6-yt53tji6n6rwJ2BhS";
|
||||
path = fetchZigArtifact {
|
||||
name = "vaxis";
|
||||
url = "git+https://github.com/rockorager/libvaxis#1f41c121e8fc153d9ce8c6eb64b2bbab68ad7d23";
|
||||
hash = "sha256-bNZ3oveT6vPChjimPJ/GGfcdivlAeJdl/xfWM+S/MHY=";
|
||||
url = "https://deps.files.ghostty.org/vaxis-7dbb9fd3122e4ffad262dd7c151d80d863b68558.tar.gz";
|
||||
hash = "sha256-LnIzK8icW1Qexua9SHaeHz+3V8QAbz0a+UC1T5sIjvY=";
|
||||
};
|
||||
}
|
||||
{
|
||||
@@ -297,67 +321,51 @@ linkFarm name [
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "z2d-0.8.1-j5P_Hq8vDwB8ZaDA54-SzESDLF2zznG_zvTHiQNJImZP";
|
||||
name = "z2d-0.10.0-j5P_Hu-6FgBsZNgwphIqh17jDnj8_yPtD8yzjO6PpHRQ";
|
||||
path = fetchZigArtifact {
|
||||
name = "z2d";
|
||||
url = "https://github.com/vancluever/z2d/archive/refs/tags/v0.8.1.tar.gz";
|
||||
hash = "sha256-0DbDKSYA1ejhVx/WbOkwTgD57PNRFcnRviqBh8xpPZ0=";
|
||||
url = "https://deps.files.ghostty.org/z2d-0.10.0-j5P_Hu-6FgBsZNgwphIqh17jDnj8_yPtD8yzjO6PpHRQ.tar.gz";
|
||||
hash = "sha256-afIdou/V7gk3/lXE0J5Ir8T7L5GgHvFnyMJ1rgRnl/c=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "zf-0.10.3-OIRy8aiIAACLrBllz0zjxaH0aOe5oNm3KtEMyCntST-9";
|
||||
name = "zf-0.10.3-OIRy8RuJAACKA3Lohoumrt85nRbHwbpMcUaLES8vxDnh";
|
||||
path = fetchZigArtifact {
|
||||
name = "zf";
|
||||
url = "https://github.com/natecraddock/zf/archive/7aacbe6d155d64d15937ca95ca6c014905eb531f.tar.gz";
|
||||
hash = "sha256-3nulNQd/4rZ4paeXJYXwAliNNyRNsIOX/q3z1JB8C7I=";
|
||||
url = "https://deps.files.ghostty.org/zf-3c52637b7e937c5ae61fd679717da3e276765b23.tar.gz";
|
||||
hash = "sha256-OwFdkorwTp4mJyvBXrTbtNmp1GnrbSkKDdrmc7d8RWg=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "zg-0.13.4-AAAAAGiZ7QLz4pvECFa_wG4O4TP4FLABHHbemH2KakWM";
|
||||
path = fetchZigArtifact {
|
||||
name = "zg";
|
||||
url = "git+https://codeberg.org/atman/zg#4a002763419a34d61dcbb1f415821b83b9bf8ddc";
|
||||
hash = "sha256-fo3l6cjkrr/godElTGnQzalBsasN7J73IDIRmw7v1gA=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AAB9YCQBaZtQjJZVndk-g_GDIK-NTZcIa63bFp9yZ";
|
||||
name = "zig_js-0.0.0-rjCAV-6GAADxFug7rDmPH-uM_XcnJ5NmuAMJCAscMjhi";
|
||||
path = fetchZigArtifact {
|
||||
name = "zig_js";
|
||||
url = "https://deps.files.ghostty.org/zig_js-12205a66d423259567764fa0fc60c82be35365c21aeb76c5a7dc99698401f4f6fefc.tar.gz";
|
||||
hash = "sha256-fyNeCVbC9UAaKJY6JhAZlT0A479M/AKYMPIWEZbDWD0=";
|
||||
url = "https://deps.files.ghostty.org/zig_js-04db83c617da1956ac5adc1cb9ba1e434c1cb6fd.tar.gz";
|
||||
hash = "sha256-TCAY5WAV05UEuAkDhq2c6Tk/ODgAhdnDI3O/flb8c6M=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "zig_objc-0.0.0-Ir_SpwsPAQBJgi9YRm2ubJMfdoysSq5gKpsIj3izQ8Zk";
|
||||
name = "zig_objc-0.0.0-Ir_Sp5gTAQCvxxR7oVIrPXxXwsfKgVP7_wqoOQrZjFeK";
|
||||
path = fetchZigArtifact {
|
||||
name = "zig_objc";
|
||||
url = "https://github.com/mitchellh/zig-objc/archive/c9e917a4e15a983b672ca779c7985d738a2d517c.tar.gz";
|
||||
hash = "sha256-o3vl7qfkSi0bKXa6JWuF92qMEGP8Af/shcip5nRo5Nw=";
|
||||
url = "https://deps.files.ghostty.org/zig_objc-f356ed02833f0f1b8e84d50bed9e807bf7cdc0ae.tar.gz";
|
||||
hash = "sha256-3YSvc3YlNW/NciyzCQnzsujXAmZ89XlxSqfqvArAjsw=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "wayland-0.4.0-dev-lQa1kjfIAQCmhhQu3xF0KH-94-TzeMXOqfnP0-Dg6Wyy";
|
||||
name = "wayland-0.5.0-dev-lQa1khrMAQDJDwYFKpdH3HizherB7sHo5dKMECfvxQHe";
|
||||
path = fetchZigArtifact {
|
||||
name = "zig_wayland";
|
||||
url = "https://codeberg.org/ifreund/zig-wayland/archive/f3c5d503e540ada8cbcb056420de240af0c094f7.tar.gz";
|
||||
hash = "sha256-E77GZ15APYbbO1WzmuJi8eG9/iQFbc2CgkNBxjCLUhk=";
|
||||
url = "https://deps.files.ghostty.org/zig_wayland-1b5c038ec10da20ed3a15b0b2a6db1c21383e8ea.tar.gz";
|
||||
hash = "sha256-TxRrc17Q1Sf1IOO/cdPpP3LD0PpYOujt06SFH3B5Ek4=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "zigimg-0.1.0-lly-O6N2EABOxke8dqyzCwhtUCAafqP35zC7wsZ4Ddxj";
|
||||
name = "zigimg-0.1.0-8_eo2vHnEwCIVW34Q14Ec-xUlzIoVg86-7FU2ypPtxms";
|
||||
path = fetchZigArtifact {
|
||||
name = "zigimg";
|
||||
url = "git+https://github.com/TUSF/zigimg#31268548fe3276c0e95f318a6c0d2ab10565b58d";
|
||||
hash = "sha256-oblfr2FIzuqq0FLo/RrzCwUX1NJJuT53EwD3nP3KwN0=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "ziglyph-0.11.2-AAAAAHPtHwB4Mbzn1KvOV7Wpjo82NYEc_v0WC8oCLrkf";
|
||||
path = fetchZigArtifact {
|
||||
name = "ziglyph";
|
||||
url = "https://deps.files.ghostty.org/ziglyph-b89d43d1e3fb01b6074bc1f7fc980324b04d26a5.tar.gz";
|
||||
hash = "sha256-cse98+Ft8QUjX+P88yyYfaxJOJGQ9M7Ymw7jFxDz89k=";
|
||||
url = "https://github.com/ivanstepanovftw/zigimg/archive/d7b7ab0ba0899643831ef042bd73289510b39906.tar.gz";
|
||||
hash = "sha256-LB7Xa6KzVRRUSwwnyWM+y6fDG+kIDjfnoBDJO1obxVM=";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
bzip2,
|
||||
callPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
fontconfig,
|
||||
freetype,
|
||||
glib,
|
||||
@@ -23,16 +22,15 @@
|
||||
removeReferencesTo,
|
||||
versionCheckHook,
|
||||
wrapGAppsHook4,
|
||||
zig_0_14,
|
||||
zig_0_15,
|
||||
|
||||
# Upstream recommends a non-default level
|
||||
# https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/PACKAGING.md#build-options
|
||||
optimizeLevel ? "ReleaseFast",
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ghostty";
|
||||
version = "1.2.3";
|
||||
version = "1.3.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -46,19 +44,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "ghostty-org";
|
||||
repo = "ghostty";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0tmLOJCrrEnVc/ZCp/e646DTddXjv249QcSwkaukL30=";
|
||||
hash = "sha256-44bF0MtsaoF0EgUI1TbGUz4NUH6psIRMCZgZJ0GtSaU=";
|
||||
};
|
||||
|
||||
# Replace the defunct iTerm2 themes dependency with a newer version
|
||||
# Remove when 1.2.4 or 1.3.0 is released
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
name = "fix-iterm2-themes-ref.patch";
|
||||
url = "https://github.com/pluiedev/ghostty/commit/dc51adc52661bbcacebe5e70b62b5041e3ee56a5.patch";
|
||||
hash = "sha256-0DrP4zN26pjeBawoi9U8y6VM/NlfhPmo27Iy5OsMj0s=";
|
||||
})
|
||||
];
|
||||
|
||||
deps = callPackage ./deps.nix {
|
||||
name = "${finalAttrs.pname}-cache-${finalAttrs.version}";
|
||||
};
|
||||
@@ -70,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pandoc
|
||||
pkg-config
|
||||
removeReferencesTo
|
||||
zig_0_14
|
||||
zig_0_15
|
||||
|
||||
# GTK frontend
|
||||
glib # Required for `glib-compile-schemas`
|
||||
@@ -99,18 +87,22 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
dontSetZigDefaultFlags = true;
|
||||
|
||||
zigBuildFlags = [
|
||||
zigCheckFlags = [
|
||||
"--system"
|
||||
"${finalAttrs.deps}"
|
||||
"-Dversion-string=${finalAttrs.version}"
|
||||
"-Dcpu=baseline"
|
||||
"-Doptimize=${optimizeLevel}"
|
||||
]
|
||||
++ lib.mapAttrsToList (name: package: "-fsys=${name} --search-prefix ${lib.getLib package}") {
|
||||
inherit glslang;
|
||||
};
|
||||
|
||||
zigCheckFlags = finalAttrs.zigBuildFlags;
|
||||
# Only specify the optimization level for the actual build.
|
||||
# Tests do not work on ReleaseFast as they rely on triggering
|
||||
# specific integrity violations within the internal data structures.
|
||||
zigBuildFlags = finalAttrs.zigCheckFlags ++ [
|
||||
"-Doptimize=${optimizeLevel}"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "google-java-format";
|
||||
version = "1.34.1";
|
||||
version = "1.35.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar";
|
||||
sha256 = "sha256-eeHLXIvWmMVywK5QTQeBYSm4/AYgT7SVUL7IO9XqCqg=";
|
||||
sha256 = "sha256-v7f56tbNMoOJvC2lOGBEO8DoBd/QjMiJv99Dsmyypug=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -82,7 +82,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "Git-compatible DVCS that is both simple and powerful";
|
||||
homepage = "https://github.com/jj-vcs/jj";
|
||||
homepage = "https://jj-vcs.dev/";
|
||||
changelog = "https://github.com/jj-vcs/jj/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "202407";
|
||||
build_nr = "1";
|
||||
version = "202507";
|
||||
build_nr = "0";
|
||||
pname = "mcrl2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.mcrl2.org/download/release/mcrl2-${version}.${build_nr}.tar.gz";
|
||||
hash = "sha256-VhP9BFSujxYMcQVu6P6k6yiH2UUhCB3P+Pj+9Ir7x6s=";
|
||||
hash = "sha256-Ur7GGXbYvVmrEUq/CTRyuVNLDHKfFrYHJibo0JvYhyM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -27,9 +27,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
|
||||
|
||||
runtimeDependencies = [
|
||||
libGL
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
wayland
|
||||
libxkbcommon
|
||||
libGL
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
@@ -46,6 +48,5 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
changelog = "https://github.com/eero-lehtinen/oklch-color-picker/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ videl ];
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -26,13 +26,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openimageio";
|
||||
version = "3.1.10.0";
|
||||
version = "3.1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AcademySoftwareFoundation";
|
||||
repo = "OpenImageIO";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xErP9zBKIBwCrw698oAaCxXCO9rqBDuz+6R+uU+9n3E=";
|
||||
hash = "sha256-7VP/XSYti8YbFQwofAXAolsHc0rEHw14oqN0359LYJg=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "oxlint";
|
||||
version = "1.50.0";
|
||||
version = "1.51.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oxc-project";
|
||||
repo = "oxc";
|
||||
tag = "oxlint_v${finalAttrs.version}";
|
||||
hash = "sha256-P7FNZlRGyIl0yf8PXgb8jhfKYtkF5e3CXGug1lFYWTE=";
|
||||
hash = "sha256-J5EChGADug+SEvhjStyS1s5kek5QNc2VrjEa5MEWTpA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ePu423+Qe3LU8Z8+8B+5hJyIoNS3F4Oo1RjKQAsWeDU=";
|
||||
cargoHash = "sha256-chNxYraN9upILXCqDQ/TrN3xiKhxKhZlN2HGrPF4qT8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
fetchpatch,
|
||||
rustPlatform,
|
||||
replaceVars,
|
||||
cargo,
|
||||
@@ -24,27 +23,22 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pika-backup";
|
||||
version = "0.7.5";
|
||||
version = "0.7.6";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "pika-backup";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-J5EsCanKEczPXw8QsNlp3mxh0MyJyJ+WulaZJ+c6hBA=";
|
||||
tag = version;
|
||||
hash = "sha256-tWTINRYCAhPV2srZWIYJeH4NAQIv/ED0bBdeKKgkC78=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-JjqtThxjMb+HDdPt50X7yXDxqouQliSlNvT14roZLYk=";
|
||||
hash = "sha256-Ut7dFhm67tcpELZzQPwyIs9/3YNHofi2VF9RxQCD7qo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://gitlab.gnome.org/World/pika-backup/-/issues/643
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/World/pika-backup/-/commit/842d93d65a342985bf6d7d8cacd5b38ea508df2e.patch";
|
||||
hash = "sha256-HtGuEi8ghiMwzBEsvo/DTfVAExgmHpd0xp5bpWRn9Fs=";
|
||||
})
|
||||
(replaceVars ./borg-path.patch {
|
||||
borg = lib.getExe borgbackup;
|
||||
})
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "playball";
|
||||
version = "3.3.0";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paaatrick";
|
||||
repo = "playball";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Kg1ooxtXwP2q9qa7uuzUtl2R8/jqG9wryaKWYnWXIjw=";
|
||||
hash = "sha256-ldxYKLRtdNKU1xORT5HxgEMiMajUY7OwnkQ+jlsOIxY=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-waaC5AcsEWMOLyXSmMbRuRS5Ozq5ERrmONQZhP05Kes=";
|
||||
npmDepsHash = "sha256-9sbTK7nV8m4uaUZy6DL/0r+JUlBoTkIpgYy7sacf130=";
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "podman-tui";
|
||||
version = "1.10.0";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman-tui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Nm0vf+/DfFMFRYrxI48EoIeQZz19LUSJC9260+Vtynk=";
|
||||
hash = "sha256-6o4ugQcVoy4HSDxxoe+5hx4C24CIDm7+am+4VRqJXl8=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
}:
|
||||
buildDartApplication rec {
|
||||
pname = "serverpod_cli";
|
||||
version = "3.3.1";
|
||||
version = "3.4.2";
|
||||
|
||||
# Fetch the whole monorepo
|
||||
src = fetchFromGitHub {
|
||||
owner = "serverpod";
|
||||
repo = "serverpod";
|
||||
tag = version;
|
||||
hash = "sha256-4vpZiqvzhcAziElfzssw4bLYTO5/dhai3C8LEpn0eAo=";
|
||||
hash = "sha256-u2YQRUMebfk2/GXll0uIgr0Lyh8DrBD7h6fo8laXgpE=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/tools/serverpod_cli";
|
||||
|
||||
@@ -4,31 +4,31 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "_fe_analyzer_shared",
|
||||
"sha256": "796d97d925add7ffcdf5595f33a2066a6e3cee97971e6dbef09b76b7880fd760",
|
||||
"sha256": "3b19a47f6ea7c2632760777c78174f47f6aec1e05f0cd611380d4593b8af1dbc",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "94.0.0"
|
||||
"version": "96.0.0"
|
||||
},
|
||||
"analyzer": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "analyzer",
|
||||
"sha256": "9c8ebb304d72c0a0c8764344627529d9503fc83d7d73e43ed727dc532f822e4b",
|
||||
"sha256": "0c516bc4ad36a1a75759e54d5047cb9d15cded4459df01aa35a0b5ec7db2c2a0",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "10.0.2"
|
||||
"version": "10.2.0"
|
||||
},
|
||||
"archive": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "archive",
|
||||
"sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
|
||||
"sha256": "a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.0.7"
|
||||
"version": "4.0.9"
|
||||
},
|
||||
"args": {
|
||||
"dependency": "direct main",
|
||||
@@ -74,11 +74,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "built_value",
|
||||
"sha256": "7931c90b84bc573fef103548e354258ae4c9d28d140e41961df6843c5d60d4d8",
|
||||
"sha256": "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "8.12.3"
|
||||
"version": "8.12.4"
|
||||
},
|
||||
"checked_yaml": {
|
||||
"dependency": "transitive",
|
||||
@@ -194,21 +194,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "dart_mappable",
|
||||
"sha256": "0e219930c9f7b9e0f14ae7c1de931c401875110fd5c67975b6b9492a6d3a531b",
|
||||
"sha256": "97526bd5e1b1739be5c7379c51d391d074b6bbd109e6e92be49028ecb1a9853c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.6.1"
|
||||
"version": "4.7.0"
|
||||
},
|
||||
"dart_style": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "dart_style",
|
||||
"sha256": "15a7db352c8fc6a4d2bc475ba901c25b39fe7157541da4c16eacce6f8be83e49",
|
||||
"sha256": "29f7ecc274a86d32920b1d9cfc7502fa87220da41ec60b55f329559d5732e2b2",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.1.5"
|
||||
"version": "3.1.7"
|
||||
},
|
||||
"ffi": {
|
||||
"dependency": "transitive",
|
||||
@@ -324,21 +324,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "json_annotation",
|
||||
"sha256": "805fa86df56383000f640384b282ce0cb8431f1a7a2396de92fb66186d8c57df",
|
||||
"sha256": "cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.10.0"
|
||||
"version": "4.11.0"
|
||||
},
|
||||
"json_rpc_2": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "json_rpc_2",
|
||||
"sha256": "3c46c2633aec07810c3d6a2eb08d575b5b4072980db08f1344e66aeb53d6e4a7",
|
||||
"sha256": "82dfd37d3b2e5030ae4729e1d7f5538cbc45eb1c73d618b9272931facac3bec1",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.0.0"
|
||||
"version": "4.1.0"
|
||||
},
|
||||
"lints": {
|
||||
"dependency": "transitive",
|
||||
@@ -374,11 +374,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "matcher",
|
||||
"sha256": "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6",
|
||||
"sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.12.18"
|
||||
"version": "0.12.19"
|
||||
},
|
||||
"meta": {
|
||||
"dependency": "direct main",
|
||||
@@ -454,11 +454,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "posix",
|
||||
"sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
|
||||
"sha256": "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.0.3"
|
||||
"version": "6.5.0"
|
||||
},
|
||||
"pub_api_client": {
|
||||
"dependency": "direct main",
|
||||
@@ -514,51 +514,51 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "serverpod_client",
|
||||
"sha256": "e936d6fa951f548cf2a16f75a526d645162c3b88437ff57550fb596835266a00",
|
||||
"sha256": "4beb3bb5d2b4d753199c663d80aaf646b07d54a25963f1ed5eee97ec04f6ccec",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.3.1"
|
||||
"version": "3.4.2"
|
||||
},
|
||||
"serverpod_lints": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "serverpod_lints",
|
||||
"sha256": "610e7c69109e412891ba2a4d2fe6cd70c0d5f01c39873471fcc2c3ca52e5c25e",
|
||||
"sha256": "2a36b136061ce3409d2c63358021794c32eb400636945157bf142e2e6eaf39f9",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.3.1"
|
||||
"version": "3.4.2"
|
||||
},
|
||||
"serverpod_serialization": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "serverpod_serialization",
|
||||
"sha256": "b1422d3e99a26e8c5fc9cf09785cb2f6c10713cb08d46b2b86dd7054e9e7decd",
|
||||
"sha256": "6643931c8147d1ed7207d6d18202399221e36f9f85b478a148fde15a4a076c1a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.3.1"
|
||||
"version": "3.4.2"
|
||||
},
|
||||
"serverpod_service_client": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "serverpod_service_client",
|
||||
"sha256": "b70fa027dfea546835864d24e3bb712394876d612bbb48e1729cb480f0393480",
|
||||
"sha256": "84b6dd7a6712ffb4ddfc01f721e3af1e5e20bc18e95d4245eb029360c0daae81",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.3.1"
|
||||
"version": "3.4.2"
|
||||
},
|
||||
"serverpod_shared": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "serverpod_shared",
|
||||
"sha256": "01a9dbf24f1e6c61d90c606cba3c40ec3582f3ef3c477fa159f4c70126d548b4",
|
||||
"sha256": "4a37fd56b84259d1eea9b5483f52d7ed044629e53d577af4e0e1e94940151503",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.3.1"
|
||||
"version": "3.4.2"
|
||||
},
|
||||
"shelf": {
|
||||
"dependency": "transitive",
|
||||
@@ -684,31 +684,31 @@
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "test",
|
||||
"sha256": "54c516bbb7cee2754d327ad4fca637f78abfc3cbcc5ace83b3eda117e42cd71a",
|
||||
"sha256": "280d6d890011ca966ad08df7e8a4ddfab0fb3aa49f96ed6de56e3521347a9ae7",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.29.0"
|
||||
"version": "1.30.0"
|
||||
},
|
||||
"test_api": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "test_api",
|
||||
"sha256": "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636",
|
||||
"sha256": "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.7.9"
|
||||
"version": "0.7.10"
|
||||
},
|
||||
"test_core": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "test_core",
|
||||
"sha256": "394f07d21f0f2255ec9e3989f21e54d3c7dc0e6e9dbce160e5a9c1a6be0e2943",
|
||||
"sha256": "0381bd1585d1a924763c308100f2138205252fb90c9d4eeaf28489ee65ccde51",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.6.15"
|
||||
"version": "0.6.16"
|
||||
},
|
||||
"test_descriptor": {
|
||||
"dependency": "direct dev",
|
||||
@@ -744,11 +744,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "uuid",
|
||||
"sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8",
|
||||
"sha256": "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.5.2"
|
||||
"version": "4.5.3"
|
||||
},
|
||||
"vm_service": {
|
||||
"dependency": "transitive",
|
||||
@@ -832,6 +832,6 @@
|
||||
}
|
||||
},
|
||||
"sdks": {
|
||||
"dart": ">=3.9.0 <4.0.0"
|
||||
"dart": ">=3.10.0 <4.0.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "swaylock";
|
||||
version = "1.8.4";
|
||||
version = "1.8.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "swaywm";
|
||||
repo = "swaylock";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-l3fu04cw2Jin2F6UcDK0kWRJLKuwXpxuImUjoLk32Fc=";
|
||||
hash = "sha256-Bu5ghPZoLdFsgGKv3YEbIEtg0BhHUKegEUxquIPBEi4=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "syft";
|
||||
version = "1.42.1";
|
||||
version = "1.42.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = "syft";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RJGDpjhOP4mToIQN6CRGb9HmWYQLWYlHAi6P9tCmQXo=";
|
||||
hash = "sha256-Ewy5I/dEH5rt6RgCJsLNx/yemcPdzqbhAKyOvUzs7Uk=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
|
||||
# hash mismatch with darwin
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-+SoFbJa0toHEJaOYYbukgrBvIhfVUmaibzYFEDt+3cQ=";
|
||||
vendorHash = "sha256-uT5dLpYeQDakfVr5r7FjbwBIwDtRfPkoBtvyrpA7GUo=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
{
|
||||
buildWasmBindgenCli,
|
||||
fetchCrate,
|
||||
rustPlatform,
|
||||
}:
|
||||
|
||||
buildWasmBindgenCli rec {
|
||||
src = fetchCrate {
|
||||
pname = "wasm-bindgen-cli";
|
||||
version = "0.2.114";
|
||||
hash = "sha256-xrCym+rFY6EUQFWyWl6OPA+LtftpUAE5pIaElAIVqW0=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
inherit (src) pname version;
|
||||
hash = "sha256-Z8+dUXPQq7S+Q7DWNr2Y9d8GMuEdSnq00quUR0wDNPM=";
|
||||
};
|
||||
}
|
||||
@@ -10,16 +10,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "waves";
|
||||
version = "0.1.41";
|
||||
version = "0.1.42";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "llehouerou";
|
||||
repo = "waves";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-F3ZJSaL8e8TO2J0k3p33zrqMwurw6xIA+AuloNp3Zw0=";
|
||||
hash = "sha256-UReEoPXVGwBpWs53Dk8iWn2el2+/9PMAJ5KW4M9FjnA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jUwA7KOHceuwSUMDzex8MHCBYvMPRkfkyk5THvXsF+M=";
|
||||
vendorHash = "sha256-mUifSJ8IalfzqQHeDpFp0jbtZDr7OWPq16st9RJVu7U=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ php.buildComposerProject2 (finalAttrs: {
|
||||
# use together with the version from this package to keep the
|
||||
# bootstrap phar file up-to-date together with the end user composer
|
||||
# package.
|
||||
passthru.pharHash = "sha256-Oz+VA6LUZZAXDkXt0pc0GX55fOpUWzltCygjysjvRkM=";
|
||||
passthru.pharHash = "sha256-yGzmA/6Da/CGGjjJOsVmyPHmmsRLJEXZt6ahfqLplyo=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/composer/composer/releases/tag/${finalAttrs.version}";
|
||||
|
||||
@@ -121,5 +121,6 @@ buildPythonPackage rec {
|
||||
antono
|
||||
relrod
|
||||
];
|
||||
mainProgram = "http";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2024,7 +2024,7 @@ mapAliases {
|
||||
warmux = throw "'warmux' has been removed as it is unmaintained and broken"; # Added 2025-11-03
|
||||
warsow = throw "'warsow' has been removed as it is unmaintained and is broken"; # Added 2025-10-09
|
||||
warsow-engine = throw "'warsow-engine' has been removed as it is unmaintained and is broken"; # Added 2025-10-09
|
||||
wasm-bindgen-cli = wasm-bindgen-cli_0_2_108;
|
||||
wasm-bindgen-cli = wasm-bindgen-cli_0_2_114;
|
||||
wasm-strip = throw "'wasm-strip' has been removed due to upstream deprecation. Use 'wabt' instead."; # Added 2025-11-06
|
||||
wavebox = throw "'wavebox' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-24
|
||||
wavm = throw "wavm has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
|
||||
|
||||
Reference in New Issue
Block a user