Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot] 2026-07-01 00:47:54 +00:00 committed by GitHub
commit 782207ca52
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
229 changed files with 1334 additions and 1061 deletions

View file

@ -26232,6 +26232,12 @@
githubId = 115308;
name = "Richard Marko";
};
sorooris = {
email = "nixpkgs@pm.me";
github = "sorooris";
githubId = 10185314;
name = "Seb Soroori";
};
sorpaas = {
email = "hi@that.world";
github = "sorpaas";

View file

@ -79,6 +79,7 @@ in
# USB support, especially for booting from USB CD-ROM
# drives.
"uas"
"xhci-pci-renesas"
# SD cards.
"sdhci_pci"
@ -158,9 +159,6 @@ in
"pinctrl-axp209"
"mp8859"
# USB drivers
"xhci-pci-renesas"
# Reset controllers
"reset-raspberrypi" # Triggers USB chip firmware load.

View file

@ -275,7 +275,7 @@ in
"${cfg.package}/bin/sanoid"
"--cron"
"--configdir"
(pkgs.writeTextDir "sanoid.conf" configFile)
"/etc/sanoid"
]
++ cfg.extraArgs
);
@ -290,6 +290,8 @@ in
after = [ "zfs.target" ];
startAt = cfg.interval;
};
environment.etc."sanoid/sanoid.conf".text = configFile;
};
meta.maintainers = with lib.maintainers; [ lopsided98 ];

View file

@ -1174,8 +1174,8 @@ let
mktplcRef = {
publisher = "DanielSanMedium";
name = "dscodegpt";
version = "3.23.0";
hash = "sha256-bbyFdb/hGPV93RJecdx6uozJIOaKitBBhwlI04s50NU=";
version = "3.23.1";
hash = "sha256-B97cImVKnholhZV0ZBru/gpeVSaTHOFfQywwmjk+kq8=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog";
@ -2015,8 +2015,8 @@ let
mktplcRef = {
name = "gitlab-workflow";
publisher = "gitlab";
version = "6.83.2";
hash = "sha256-IsiK3A+aVlYKnTSkgeTz4ZZc1rXiYCKDXPVrJsnSFRk=";
version = "6.84.2";
hash = "sha256-UBoZ6DxT5d7zeTycgmuLomzoVcB7iAnflfxAup6QslI=";
};
meta = {
description = "GitLab extension for Visual Studio Code";
@ -4556,8 +4556,8 @@ let
mktplcRef = {
name = "svelte-vscode";
publisher = "svelte";
version = "110.2.0";
hash = "sha256-5WCaYhWA6soB2AALFY/5Z7Y8IBAj5/4XSR/I4jHhth8=";
version = "110.2.1";
hash = "sha256-NcidslqM4AVrobOaxW1EBpMoBCTn2Bej86phIVU2psc=";
};
meta = {
changelog = "https://github.com/sveltejs/language-tools/releases";
@ -5498,8 +5498,8 @@ let
mktplcRef = {
name = "markdown-editor";
publisher = "zaaack";
version = "0.1.15";
hash = "sha256-wNGIps0Y/p5X/lutOh1gTPWXh0zpdTm5fFiccba6Pww=";
version = "0.1.16";
hash = "sha256-rBpC3YIG4M4QDPg/zViinDGXk3U6GvJfiwVUe5NW2vU=";
};
meta = {
description = "Visual Studio Code extension for WYSIWYG markdown editing";

View file

@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "smsplus";
version = "0-unstable-2026-04-20";
version = "0-unstable-2026-06-25";
src = fetchFromGitHub {
owner = "libretro";
repo = "smsplus-gx";
rev = "6dc7119f6f8d7f6437320405ee3b0de5f227913f";
hash = "sha256-kWq4yzYl0ZTnnhLfhtgPyf2CRequ6yn2DLp3Yc7EBbA=";
rev = "8a63f82d3c3bbf7215a31f86a4aaa13fb68a579f";
hash = "sha256-yNaNkvRzpli4NMqFvlQ/6US7zw8xXiYWw6R0ev6ubLA=";
};
meta = {

View file

@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "snes9x2002";
version = "0-unstable-2026-04-20";
version = "0-unstable-2026-06-25";
src = fetchFromGitHub {
owner = "libretro";
repo = "snes9x2002";
rev = "39e0d8c6daf4b1b1302eeecfee8309570aeb6a82";
hash = "sha256-mOtCZEuXKWQEupWfFfr3Ji6m15zZuOIJ/ieKtrFGsWI=";
rev = "5bd8bd6d449be8a2ef7909e1aeb2bd8c9c0da8cb";
hash = "sha256-iqhmSJzWqr5HgtY9q+kBb/xB6njvG3M2SePXdRszqqc=";
};
makefile = "Makefile";

View file

@ -5,13 +5,13 @@
}:
mkLibretroCore rec {
core = "snes9x2010";
version = "0-unstable-2026-06-15";
version = "0-unstable-2026-06-29";
src = fetchFromGitHub {
owner = "libretro";
repo = "snes9x2010";
rev = "2f6beca3ada61bdb4dabf7afe8cb9293a699224a";
hash = "sha256-iM1xR4g3Bhv2XTj+CNA/KY3grjacrPfjpf/jfJkwYbs=";
rev = "8b34285807d4825a5ab34b67f0c9d0a780a955c8";
hash = "sha256-VF9ScwineHNAd7Poj6/U5KEL6uUMhXLmR8nJS9vDSXk=";
};
makeFlags = [ "GIT_VERSION=${builtins.substring 0 7 src.rev}" ];

View file

@ -73,13 +73,13 @@
"vendorHash": "sha256-FHBpTYSmVivoqz+Eaa/r5y1f/saIx4l6mjOtZhxZVRw="
},
"auth0_auth0": {
"hash": "sha256-QNVACeebepZMCYMn284KUulqnYMU5Mt/e65o+dSRTxg=",
"hash": "sha256-nMaiXsPAavHVi4xq+jPWdF9GVW+b0HoXiEc2QUNPQTE=",
"homepage": "https://registry.terraform.io/providers/auth0/auth0",
"owner": "auth0",
"repo": "terraform-provider-auth0",
"rev": "v1.50.0",
"rev": "v1.51.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-wW3dAmDl1qhWlCcTlujdEGB0GFQsgD0YmrGENYhg/qY="
"vendorHash": "sha256-MRtERveRjEZfaVyUz527NUKoFDM4dINJZ71U9MFEmIM="
},
"aviatrixsystems_aviatrix": {
"hash": "sha256-46djOfAj/5kfeoKLQHbeKefzdGbmlBATR+uN/IaAn8I=",
@ -164,11 +164,11 @@
"vendorHash": "sha256-7XgTkzYBfkpF8Dd4YsgpB+YIfkANsg/60b3AyO8Y8FA="
},
"ciscodevnet_aci": {
"hash": "sha256-Z3qat3S7dv5kGpc82RxAwlgp3hfscFbkokVsgGnBRHY=",
"hash": "sha256-8QnmISiZGRbW60mN9I6UYWDo6f2HUIFersVs/pDUD3o=",
"homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci",
"owner": "CiscoDevNet",
"repo": "terraform-provider-aci",
"rev": "v2.19.0",
"rev": "v2.20.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -481,13 +481,13 @@
"vendorHash": "sha256-v1r/hTVHJeaTsxHU/oDhRQeaWtfND7NplMAj+wFPe6A="
},
"grafana_grafana": {
"hash": "sha256-TyO5Owo8LFQVQmsAD40/L0VaAY1+X3h4pSPbJIE97mY=",
"hash": "sha256-O7q3zkBbugikTgP9c4yMvcoxs/0NjuZmv+RmqeoKa0k=",
"homepage": "https://registry.terraform.io/providers/grafana/grafana",
"owner": "grafana",
"repo": "terraform-provider-grafana",
"rev": "v4.38.0",
"rev": "v4.39.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Fnn5/UiSQtvv/XykeXhbR4GuSrGBy/j03vzyBI2LnGg="
"vendorHash": "sha256-qwb8mLQBXS7MYbWAhZAmAKI2Zwnd5BzYheDX9k/Y0gY="
},
"gridscale_gridscale": {
"hash": "sha256-FAKvQ/MEod5Ck0PG4ffQ+gQp6zZ0JDRXPOrOiDpWMls=",
@ -517,11 +517,11 @@
"vendorHash": "sha256-COWHnLR6aRwcGJVo6IFvqQLwAYxFpqUGQbZVvEo/b/I="
},
"hashicorp_awscc": {
"hash": "sha256-ZQaBYZTsF68IjbRYa3Z7VRqKfaHCvOtMkJHsybJn+ec=",
"hash": "sha256-IRDNbQh3OouVUKranI962+3f5REeIC5Vtv8dw06z9UE=",
"homepage": "https://registry.terraform.io/providers/hashicorp/awscc",
"owner": "hashicorp",
"repo": "terraform-provider-awscc",
"rev": "v1.89.0",
"rev": "v1.90.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-9FzpBgb3BzIVhx8kqhyDJw/liH6X8jUhFmwtbic4uVw="
},
@ -1040,13 +1040,13 @@
"vendorHash": "sha256-ofzbDmivXgH1i1Gjhpyp0bk3FDs5SnxwoRuNAWyMqyI="
},
"opentelekomcloud_opentelekomcloud": {
"hash": "sha256-HrqJQso8wWF7+WiQUNtR522lCpz5pYZIq2Q3RZkakU0=",
"hash": "sha256-aXFdUlaraWRgII24Xw4YvutXOzwLRJWeBw86KqvpDl8=",
"homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
"owner": "opentelekomcloud",
"repo": "terraform-provider-opentelekomcloud",
"rev": "v1.36.69",
"rev": "v1.36.70",
"spdx": "MPL-2.0",
"vendorHash": "sha256-4Kndye/lGV0IjSyaOpJsj6pP0Hznf20LFQvEwY3+ajE="
"vendorHash": "sha256-deBcSjCP+MGgM9Imf+C4Kh/emlUohmmjb3D6sYjCxeA="
},
"opsgenie_opsgenie": {
"hash": "sha256-Y67kcg/ovvZc22l1CBz0Mqu7DAIit5F0jQNfQrl2EGI=",

View file

@ -48,10 +48,10 @@ let
six
zope-interface
dbus-python
pycairo
librsvg
]
++ optionals withGUI [
pycairo
librsvg
gtk3
gobject-introspection
pygobject3

View file

@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "siddhantgoel";
repo = "beancount-ing-diba";
repo = "beancount-ing";
rev = "v${version}";
sha256 = "sha256-zjwajl+0ix4wnW0bf4MAuO9Lr9F8sBv87TIL5Ghmlxg=";
};
@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec {
];
meta = {
homepage = "https://github.com/siddhantgoel/beancount-ing-diba";
homepage = "https://github.com/siddhantgoel/beancount-ing";
description = "Beancount Importers for ING-DiBa (Germany) CSV Exports";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ matthiasbeyer ];

View file

@ -27,8 +27,8 @@ stdenv.mkDerivation {
version = "2.0";
src = fetchFromGitHub {
owner = "gapophustu";
repo = "4D-Minesweeper";
owner = "Alzager";
repo = "4D-Minesweeper-Archived";
rev = "db176d8aa5981a597bbae6a1a74aeebf0f376df4";
hash = "sha256-A5QKqCo9TTdzmK13WRSAfkrkeUqHc4yQCzy4ZZ9uX2M=";
};
@ -80,7 +80,7 @@ stdenv.mkDerivation {
dontStrip = true;
meta = {
homepage = "https://github.com/gapophustu/4D-Minesweeper";
homepage = "https://github.com/Alzager/4D-Minesweeper-Archived";
description = "4D Minesweeper game written in Godot";
license = lib.licenses.mpl20;
platforms = lib.platforms.linux;

View file

@ -9,7 +9,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
version = "1.1.1";
src = fetchFromGitHub {
owner = "DomesticMoth";
owner = "asciimoth";
repo = "aaa";
tag = "v${finalAttrs.version}";
sha256 = "sha256-gIOlPjZOcmVLi9oOn4gBv6F+3Eq6t5b/3fKzoFqxclw=";
@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
meta = {
description = "Terminal viewer for 3a format";
homepage = "https://github.com/DomesticMoth/aaa";
homepage = "https://github.com/asciimoth/aaa";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ asciimoth ];
mainProgram = "aaa";

View file

@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "1.0.2";
src = fetchFromGitHub {
owner = "ampas";
owner = "aces-aswf";
repo = "aces_container";
tag = "v${finalAttrs.version}";
hash = "sha256-luMqXqlJ6UzoawEDmbK38lm3GHosaZm/mFJntBF54Y4=";
@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Reference Implementation of SMPTE ST2065-4";
homepage = "https://github.com/ampas/aces_container";
homepage = "https://github.com/aces-aswf/aces_container";
license = lib.licenses.ampas;
maintainers = with lib.maintainers; [ paperdigits ];
mainProgram = "aces-container";

View file

@ -34,7 +34,7 @@ stdenv.mkDerivation {
inherit version;
src = fetchFromGitHub {
owner = "real-logic";
owner = "aeron-io";
repo = "aeron";
tag = version;
hash = "sha256-sROEZVOfScrlqMLbfrPtw3LQCQ5TfMcrLiP6j/Z9rSM=";

View file

@ -9,7 +9,7 @@
let
appName = "AeroSpace.app";
version = "0.20.3-Beta";
version = "0.21.0-Beta";
in
stdenv.mkDerivation {
pname = "aerospace";
@ -18,7 +18,7 @@ stdenv.mkDerivation {
src = fetchzip {
url = "https://github.com/nikitabobko/AeroSpace/releases/download/v${version}/AeroSpace-v${version}.zip";
sha256 = "sha256-wrBcslp1W/lOmudMcW+SREL9LZY+wTwidh6Hot5ShGE=";
sha256 = "sha256-z55eInxpFr+ZjyG2lottTZE9VyD0YVEZfZnjZ32w/c8=";
};
nativeBuildInputs = [ installShellFiles ];

View file

@ -19,7 +19,7 @@ multiStdenv.mkDerivation (finalAttrs: {
version = "1.3.3";
src = fetchFromGitHub {
owner = "phantom-code";
owner = "psycha0s";
repo = "airwave";
tag = finalAttrs.version;
hash = "sha256-mvT0b0auKiu1T8cbR9RoBT94hKSnXDamqkIQPnUqVq0=";
@ -55,7 +55,7 @@ multiStdenv.mkDerivation (finalAttrs: {
# shrinking.
dontPatchELF = true;
# Cf. https://github.com/phantom-code/airwave/issues/57
# Cf. https://github.com/psycha0s/airwave/issues/57
hardeningDisable = [ "format" ];
cmakeFlags = [ "-DVSTSDK_PATH=${vst2-sdk}" ];
@ -78,7 +78,7 @@ multiStdenv.mkDerivation (finalAttrs: {
protocol to correctly embed the plugin editor into the host
window.
'';
homepage = "https://github.com/phantom-code/airwave";
homepage = "https://github.com/psycha0s/airwave";
license = lib.licenses.mit;
platforms = [ "x86_64-linux" ];
maintainers = with lib.maintainers; [ michalrus ];

View file

@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "aliyun-cli";
version = "3.3.23";
version = "3.4.2";
src = fetchFromGitHub {
owner = "aliyun";
repo = "aliyun-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-0AsrdD9ans1CmyJVK9tcAKGLeptpxdNAtOUuSv4i4zU=";
hash = "sha256-x43yePNf1HVw9R7PqpAb7J2XYCEn90W81nx/zgfNQBg=";
fetchSubmodules = true;
};

View file

@ -13,7 +13,7 @@ buildGoModule (finalAttrs: {
buildInputs = [ libpostalWithData ];
src = fetchFromGitHub {
owner = "OWASP";
owner = "owasp-amass";
repo = "Amass";
tag = "v${finalAttrs.version}";
hash = "sha256-d4zy64W5cIseOVAaekN5Q4I5WuLz+M/cP7FXQ3CQ+mk=";
@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
vendorHash = "sha256-3MpE61ixMps4IRIZkqjzG225zk4fsERkssoNoItUXbQ=";
# https://github.com/OWASP/Amass/issues/640
# https://github.com/owasp-amass/amass/issues/640
doCheck = false;
meta = {
@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
target networks.
'';
homepage = "https://owasp.org/www-project-amass/";
changelog = "https://github.com/OWASP/Amass/releases/tag/v${finalAttrs.version}";
changelog = "https://github.com/owasp-amass/amass/releases/tag/v${finalAttrs.version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
kalbasit

View file

@ -9,7 +9,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
version = "1.0.2";
src = fetchFromGitHub {
owner = "solana-foundation";
owner = "otter-sec";
repo = "anchor";
tag = "v${finalAttrs.version}";
hash = "sha256-J8q+oNT6x36LlTO/szlkxIcT5oFJ3y8b3YyqwBjDYX8=";
@ -32,8 +32,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
meta = {
description = "Solana Sealevel Framework";
homepage = "https://github.com/solana-foundation/anchor";
changelog = "https://github.com/solana-foundation/anchor/blob/${finalAttrs.src.tag}/CHANGELOG.md";
homepage = "https://github.com/otter-sec/anchor";
changelog = "https://github.com/otter-sec/anchor/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
Denommus

View file

@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
version = "0.4.0";
src = fetchFromGitHub {
owner = "Acizza";
owner = "jonathanlmc";
repo = "anup";
tag = version;
hash = "sha256-4pXF4p4K8+YihVB9NdgT6bOidmQEgWXUbcbvgXJ0IDA=";
@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
];
meta = {
homepage = "https://github.com/Acizza/anup";
homepage = "https://github.com/jonathanlmc/anup";
description = "Anime tracker for AniList featuring a TUI";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ natto1784 ];

View file

@ -1,27 +1,25 @@
{
lib,
buildPythonApplication,
python3Packages,
fetchPypi,
requests,
setuptools,
}:
buildPythonApplication rec {
python3Packages.buildPythonApplication (finalAttrs: {
pname = "apc-temp-fetch";
version = "0.0.2";
pyproject = true;
src = fetchPypi {
pname = "APC-Temp-fetch";
inherit version;
inherit (finalAttrs) version;
hash = "sha256-lXGj/xrOkdMMYvuyVVSCojjQlzISFUT14VTn//iOARo=";
};
build-system = [
build-system = with python3Packages; [
setuptools
];
dependencies = [
dependencies = with python3Packages; [
requests
];
@ -35,4 +33,4 @@ buildPythonApplication rec {
license = lib.licenses.asl20;
maintainers = [ ];
};
}
})

View file

@ -10,7 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
src = fetchFromGitHub {
owner = "suyulin";
repo = "apftool-rs";
repo = "afptool-rs";
tag = "v${finalAttrs.version}";
hash = "sha256-bcXZIY0CDyWE3vh04IU3kXRxi/uUm5TD8ifA0jq47rc=";
};
@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
meta = {
description = "About Tools for Rockchip image unpack tool";
mainProgram = "apftool-rs";
homepage = "https://github.com/suyulin/apftool-rs";
homepage = "https://github.com/suyulin/afptool-rs";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ colemickens ];
platforms = lib.platforms.linux;

View file

@ -99,11 +99,11 @@ let
in
stdenv.mkDerivation rec {
pname = "appgate-sdp";
version = "6.4.2";
version = "6.5.4";
src = fetchurl {
url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb";
sha256 = "sha256-xFpBC6X95C01wUfzJ3a0kMz898k6BItkpJLcUmfd7oY=";
sha256 = "sha256-tVHGAP90C4Jxz+Ur1hmlCmQ2tOtaSuIvAUQAqu6BKRw=";
};
# just patch interpreter

View file

@ -14,7 +14,7 @@ stdenv.mkDerivation {
version = "0-unstable-2016-01-18";
src = fetchFromGitHub {
owner = "stsundermann";
owner = "sundermann";
repo = "appindicator-sharp";
rev = "5a79cde93da6d68a4b1373f1ce5796c3c5fe1b37";
sha256 = "sha256:1i0vqbp05l29f5v9ygp7flm4s05pcnn5ivl578mxmhb51s7ncw6l";
@ -36,7 +36,7 @@ stdenv.mkDerivation {
meta = {
description = "Bindings for appindicator using gobject-introspection";
homepage = "https://github.com/stsundermann/appindicator-sharp";
homepage = "https://github.com/sundermann/appindicator-sharp";
license = lib.licenses.lgpl3Only;
maintainers = with lib.maintainers; [ kevincox ];
};

View file

@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "AprilRobotics";
repo = "AprilTags";
repo = "apriltag";
tag = "v${finalAttrs.version}";
hash = "sha256-pBUjRKfP884+bNgV5B4b8TiuhyZ9p/jIluxs+idv/28=";
};

View file

@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "1.26.6";
src = fetchFromGitHub {
owner = "artpixls";
owner = "artraweditor";
repo = "ART";
tag = finalAttrs.version;
hash = "sha256-m5KQUY7loLKH7X2cDw5n7biH1GJTVONTbguILdjNWrI=";

View file

@ -13,7 +13,7 @@ buildGoModule (finalAttrs: {
version = "2.17.2";
src = fetchFromGitHub {
repo = "advanced-ssh-config";
repo = "assh";
owner = "moul";
tag = "v${finalAttrs.version}";
hash = "sha256-/w4RluA7py6d75S04czNsgHpmR5rmAUZx8OnZfu9oNg=";

View file

@ -11,13 +11,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ast-grep";
version = "0.43.0";
version = "0.44.0";
src = fetchFromGitHub {
owner = "ast-grep";
repo = "ast-grep";
tag = finalAttrs.version;
hash = "sha256-qQkG04aGaw3U/FFP1omlsoAKfNsVKafgJlVzAxvHkcA=";
hash = "sha256-KTVyG2z2Vx4mLmkiwou4X04Z6qzpQxmwRCtcmG4euVA=";
};
# error: linker `aarch64-linux-gnu-gcc` not found
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
rm .cargo/config.toml
'';
cargoHash = "sha256-YL76pCvCco9u8nAGIuiEciQrgUgaPx1s8hHyu2x3KmI=";
cargoHash = "sha256-slFovLzLaK6DlTF/LKI74PUWXi9xkpy9hC9WWGmypcM=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "4.3";
src = fetchFromGitHub {
owner = "jvm-profiling-tools";
owner = "async-profiler";
repo = "async-profiler";
tag = "v${finalAttrs.version}";
hash = "sha256-wysOjirCfxm0SmwDW7GS+S73lAT8/0g4avu7T5+qy2Q=";
@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Low overhead sampling profiler for Java that does not suffer from Safepoint bias problem";
homepage = "https://github.com/jvm-profiling-tools/async-profiler";
homepage = "https://github.com/async-profiler/async-profiler";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ mschuwalow ];
platforms = lib.platforms.all;

View file

@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
pyproject = true;
src = fetchFromGitHub {
owner = "audiusGmbH";
owner = "audius";
repo = "audiness";
tag = finalAttrs.version;
hash = "sha256-zru37eNQyY9AcbALge1qlINuxzVKq3RTNypm5Pyhkz8=";

View file

@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "Governikus";
repo = "AusweisApp2";
repo = "AusweisApp";
rev = finalAttrs.version;
hash = "sha256-pr41KbejZCOvfXH2uHO5MA/VklSNU38EL6AgznvGqeY=";
};
@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Official authentication app for German ID card and residence permit";
downloadPage = "https://github.com/Governikus/AusweisApp2/releases";
downloadPage = "https://github.com/Governikus/AusweisApp/releases";
homepage = "https://www.ausweisapp.bund.de/open-source-software";
license = lib.licenses.eupl12;
mainProgram = "AusweisApp";

View file

@ -24,7 +24,7 @@ stdenv.mkDerivation {
version = "1.3-unstable-2024-11-03";
src = fetchFromGitHub {
owner = "misterdanb";
owner = "heyjuvi";
repo = "avizo";
rev = "5efaa22968b2cc1a3c15a304cac3f22ec2727b17";
sha256 = "sha256-KYQPHVxjvqKt4d7BabplnrXP30FuBQ6jQ1NxzR5U7qI=";
@ -56,7 +56,7 @@ stdenv.mkDerivation {
meta = {
description = "Neat notification daemon for Wayland";
homepage = "https://github.com/misterdanb/avizo";
homepage = "https://github.com/heyjuvi/avizo";
license = lib.licenses.gpl3;
platforms = lib.platforms.linux;
maintainers = [

View file

@ -4,24 +4,28 @@
fetchFromGitHub,
openssl,
pkg-config,
libxkbcommon,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "awatcher";
version = "0.3.1";
version = "0.3.3";
src = fetchFromGitHub {
owner = "2e3s";
repo = "awatcher";
rev = "v${finalAttrs.version}";
hash = "sha256-bxFc6oM+evIQTjrsWmb7dXOUlSjurjc4CzHpxB+667c=";
hash = "sha256-wxnbyWkfRFN+aWa7rrSIv5PdNHNU/D/w7y/VIwzxxaI=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
buildInputs = [
openssl
libxkbcommon
];
doCheck = false;
cargoHash = "sha256-pUqwg7jblSWRLPcsUDqkir/asSM8zY0jrvrre4OIeZc=";
cargoHash = "sha256-/dI0gaTRElAQnZNRo2sKMUc33fphubcG/fXOflPHXWs=";
meta = {
description = "Activity and idle watchers";

View file

@ -4,10 +4,12 @@
cmakeMinimal,
fetchFromGitHub,
ninja,
rust-bindgen,
testers,
aws-lc,
nix-update-script,
useSharedLibraries ? !stdenv.hostPlatform.isStatic,
withRustBindings ? true,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "aws-lc";
@ -29,10 +31,14 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmakeMinimal
ninja
]
++ lib.optionals withRustBindings [
rust-bindgen
];
cmakeFlags = [
(lib.cmakeBool "BUILD_SHARED_LIBS" useSharedLibraries)
(lib.cmakeBool "GENERATE_RUST_BINDINGS" withRustBindings)
"-GNinja"
"-DDISABLE_GO=ON"
"-DDISABLE_PERL=ON"
@ -50,6 +56,9 @@ stdenv.mkDerivation (finalAttrs: {
postInstall = ''
moveToOutput lib/crypto/cmake "$dev"
moveToOutput lib/ssl/cmake "$dev"
''
+ lib.optionalString withRustBindings ''
moveToOutput share/rust "$dev"
'';
env.NIX_CFLAGS_COMPILE = toString (

View file

@ -11,7 +11,7 @@ buildGoModule (finalAttrs: {
version = "1.2.0";
src = fetchFromGitHub {
owner = "Fullscreen";
owner = "stefansundin";
repo = "aws-rotate-key";
rev = "v${finalAttrs.version}";
sha256 = "sha256-fYpgHHOw0k/8WLGhq+uVOvoF4Wff6wzTXuN8r4D+TmU=";
@ -31,7 +31,7 @@ buildGoModule (finalAttrs: {
meta = {
description = "Easily rotate your AWS key";
homepage = "https://github.com/Fullscreen/aws-rotate-key";
homepage = "https://github.com/stefansundin/aws-rotate-key";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.mbode ];
mainProgram = "aws-rotate-key";

View file

@ -26,7 +26,7 @@ stdenv.mkDerivation {
version = "0-unstable-2025-01-22";
src = fetchFromGitHub {
owner = "bash-my-aws";
owner = "mbailey";
repo = "bash-my-aws";
rev = "d338b43cc215719c1853ec500c946db6b9caaa11";
sha256 = "sha256-PR52T6XCrakQsBOJXf0PaYpYE5oMcIz5UDA4I9B7C38=";

View file

@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "2.0.1";
src = fetchFromGitHub {
owner = "artist4xlibre";
owner = "artist4artixlinux";
repo = "batticonplus";
tag = "v${finalAttrs.version}";
hash = "sha256-H9ZoiQ5zWMIoWWol2a6f9Z8g4o9DIHYdF+/nEsBfuzc=";
@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Lightweight battery status icon for the system tray and notifier (based on cbatticon)";
mainProgram = "batticonplus";
homepage = "https://github.com/artist4xlibre/batticonplus";
homepage = "https://github.com/artist4artixlinux/batticonplus";
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ yechielw ];

View file

@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation rec {
version = "1.1.2";
src = fetchFromGitHub {
owner = "Silicasandwhich";
owner = "silica-dev";
repo = "Bibata_Cursor_Translucent";
rev = "v${version}";
sha256 = "sha256-RroynJfdFpu+Wl9iw9NrAc9wNZsSxWI+heJXUTwEe7s=";
@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec {
meta = {
description = "Translucent Varient of the Material Based Cursor";
homepage = "https://github.com/Silicasandwhich/Bibata_Cursor_Translucent";
homepage = "https://github.com/silica-dev/Bibata_Cursor_Translucent";
license = lib.licenses.gpl3;
platforms = lib.platforms.linux;
maintainers = [ ];

View file

@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
version = "0.6.0";
src = fetchFromGitHub {
owner = "biscuit-auth";
owner = "eclipse-biscuit";
repo = "biscuit-cli";
tag = finalAttrs.version;
sha256 = "sha256-s4Y4MhM79Z+4VxB03+56OqRQJaSHj2VQEJcL6CsT+2k=";

View file

@ -1,49 +0,0 @@
{
lib,
python3,
fetchPypi,
}:
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "bkyml";
version = "1.4.3";
pyproject = true;
src = fetchPypi {
inherit (finalAttrs) pname version;
sha256 = "01kpx35572mp4xl2fjyvfk39jfgfjcyzymbifk76891kaqkjb7r9";
};
# The pyscaffold is not a runtime dependency but just a python project bootstrapping tool. Thus,
# instead of implement this package in nix we remove a dependency on it and fix up the version
# of the package, that has been affected by the pyscaffold package dependency removal.
postPatch = ''
substituteInPlace setup.py \
--replace-fail "['pyscaffold>=3.0a0,<3.1a0'] + " "" \
--replace-fail "use_pyscaffold=True" ""
substituteInPlace src/bkyml/__init__.py \
--replace-fail "from pkg_resources" "# from pkg_resources" \
--replace-fail "get_distribution(dist_name).version" '"${finalAttrs.version}"'
'';
build-system = with python3.pkgs; [
setuptools
];
dependencies = with python3.pkgs; [
ruamel-yaml
];
# Don't run tests because they are broken when run within
# buildPythonApplication for reasons I don't quite understand.
doCheck = false;
pythonImportsCheck = [ "bkyml" ];
meta = {
homepage = "https://github.com/joscha/bkyml";
description = "CLI tool to generate a pipeline.yaml file for Buildkite on the fly";
license = lib.licenses.mit;
maintainers = [ ];
};
})

View file

@ -13,7 +13,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: {
version = "0.9.0";
src = fetchFromGitHub {
owner = "Netflix";
owner = "jfernandez";
repo = "bpftop";
tag = "v${finalAttrs.version}";
hash = "sha256-QukcBq80tASPSHRg1yRouYiZqvca+ipp6RGzXqP2CwA=";
@ -35,7 +35,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: {
meta = {
description = "Dynamic real-time view of running eBPF programs";
homepage = "https://github.com/Netflix/bpftop";
homepage = "https://github.com/jfernandez/bpftop";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
_0x4A6F

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation {
version = "0-unstable-2025-09-18";
src = fetchFromGitHub {
owner = "boolector";
owner = "hwmcc";
repo = "btor2tools";
rev = "d33c73ff1d173f1bfac8ba6b1c6d68ba62c55f8e";
sha256 = "sha256-RVjZ5HM2yQ3eAICFuzwvNeQDXzWzzSiCCslIWMJi6U8=";
@ -54,7 +54,7 @@ stdenv.mkDerivation {
meta = {
description = "Generic parser and tool package for the BTOR2 format";
homepage = "https://github.com/Boolector/btor2tools";
homepage = "https://github.com/hwmcc/btor2tools";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ thoughtpolice ];

View file

@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
version = "1.44.0";
src = fetchFromGitHub {
owner = "containers";
owner = "podman-container-tools";
repo = "buildah";
tag = "v${finalAttrs.version}";
hash = "sha256-/Rv5la54ikmP4qVT19tg0sv0kM+xpQO6w9XU1PpGFk4=";
@ -80,7 +80,7 @@ buildGoModule (finalAttrs: {
description = "Tool which facilitates building OCI images";
mainProgram = "buildah";
homepage = "https://buildah.io/";
changelog = "https://github.com/containers/buildah/releases/tag/v${finalAttrs.version}";
changelog = "https://github.com/podman-container-tools/buildah/releases/tag/v${finalAttrs.version}";
license = lib.licenses.asl20;
teams = [ lib.teams.podman ];
};

View file

@ -14,13 +14,13 @@
}:
buildGoModule (finalAttrs: {
pname = "buildkite-agent";
version = "3.128.0";
version = "3.129.0";
src = fetchFromGitHub {
owner = "buildkite";
repo = "agent";
tag = "v${finalAttrs.version}";
hash = "sha256-fBiIp9EyzIfoW4IbUZkePuBDyZRRWLGRClL57nio22E=";
hash = "sha256-k1q/7KRaIv5SE7CYFAzV8JB+czmX/bvwBp8JY9t77tI=";
};
vendorHash = "sha256-lRh5cAbg2yr+nvIaSRg3tG0tLvl7aDjyIoIjS1BvXNM=";

View file

@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
src = fetchFromGitHub {
owner = "bitwarden";
repo = "sdk";
repo = "sdk-sm";
tag = "bws-v${finalAttrs.version}";
hash = "sha256-cdiTdgNvUDN0/KzMDEiHo+GIYkUaWEZTAnWahBrMZ4I=";
};

View file

@ -11,7 +11,7 @@ buildGoModule (finalAttrs: {
src = fetchFromGitHub {
owner = "c2FmZQ";
repo = "c2FmZQ";
repo = "photos";
rev = "v${finalAttrs.version}";
hash = "sha256-qIJnrMqsaa7GcsJpyWHhi6nea72XCQy5BaGWBtQKzFo=";
};
@ -34,7 +34,7 @@ buildGoModule (finalAttrs: {
meta = {
description = "Securely encrypt, store, and share files, including but not limited to pictures and videos";
homepage = "https://github.com/c2FmZQ/c2FmZQ";
homepage = "https://github.com/c2FmZQ/photos";
license = lib.licenses.gpl3Only;
mainProgram = "c2FmZQ-server";
maintainers = with lib.maintainers; [ hmenke ];

View file

@ -12,7 +12,7 @@ buildGoModule (finalAttrs: {
src = fetchFromGitHub {
owner = "docker";
repo = "cagent";
repo = "docker-agent";
tag = "v${finalAttrs.version}";
hash = "sha256-jcJxzdtU0Zzov7EKvJCxgbrfwMcI4k7OgHVrb5S4fs8=";
};
@ -44,9 +44,9 @@ buildGoModule (finalAttrs: {
orchestrates AI agents with specialized capabilities and tools,
and the interactions between agents.
'';
homepage = "https://github.com/docker/cagent";
changelog = "https://github.com/docker/cagent/releases/tag/v${finalAttrs.version}";
downloadPage = "https://github.com/docker/cagent/releases";
homepage = "https://github.com/docker/docker-agent";
changelog = "https://github.com/docker/docker-agent/releases/tag/v${finalAttrs.version}";
downloadPage = "https://github.com/docker/docker-agent/releases";
license = lib.licenses.asl20;
mainProgram = "cagent";
maintainers = with lib.maintainers; [ MH0386 ];

View file

@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "0.2.0-alpha";
src = fetchFromGitHub {
owner = "CobbCoding1";
owner = "Cano-Projects";
repo = "Cano";
tag = "v${finalAttrs.version}";
hash = "sha256-OaWj0AKw3+sEhcAbIjgOLfxwCKRG6O1k+zSp0GnnFn8=";
@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Text Editor Written In C Using ncurses";
homepage = "https://github.com/CobbCoding1/Cano";
homepage = "https://github.com/Cano-Projects/Cano";
license = lib.licenses.asl20;
mainProgram = "Cano";
maintainers = with lib.maintainers; [ sigmanificient ];

View file

@ -62,10 +62,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
description = "Bisects rustc, either nightlies or CI artifacts";
mainProgram = "cargo-bisect-rustc";
homepage = "https://github.com/rust-lang/cargo-bisect-rustc";
license = with lib.licenses; [
asl20
mit
];
license =
with lib.licenses;
OR [
asl20
mit
];
maintainers = with lib.maintainers; [ sandarukasa ];
};
})

View file

@ -10,7 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
version = "0.0.10";
src = fetchFromGitHub {
owner = "alopatindev";
owner = "cargo-limit";
repo = "cargo-limit";
tag = finalAttrs.version;
sha256 = "sha256-joWDB9fhCsYVZFZdr+Gfm4JaRlm5kj+CHp34Sx5iQYk=";
@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
meta = {
description = "Cargo subcommand \"limit\": reduces the noise of compiler messages";
homepage = "https://github.com/alopatindev/cargo-limit";
homepage = "https://github.com/cargo-limit/cargo-limit";
license = with lib.licenses; [
asl20 # or
mit

View file

@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
version = "0.3.0";
src = fetchFromGitHub {
owner = "danielzfranklin";
owner = "dzfranklin";
repo = "cargo-rr";
rev = "v${finalAttrs.version}";
sha256 = "sha256-t8pRqeOdaRVG0titQhxezT2aDjljSs//MnRTTsJ73Yo=";
@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
meta = {
description = "Cargo subcommand \"rr\": a light wrapper around rr, the time-travelling debugger";
mainProgram = "cargo-rr";
homepage = "https://github.com/danielzfranklin/cargo-rr";
homepage = "https://github.com/dzfranklin/cargo-rr";
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [
otavio

View file

@ -15,8 +15,8 @@ stdenv.mkDerivation (finalAttrs: {
version = "2.17.1";
src = fetchFromGitHub {
owner = "datastax";
repo = "cpp-driver";
owner = "apache";
repo = "cassandra-cpp-driver";
tag = finalAttrs.version;
sha256 = "sha256-GuvmKHJknudyn7ahrn/8+kKUA4NW5UjCfkYoX3aTE+Q=";
};

View file

@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "11.10.0";
src = fetchFromGitHub {
owner = "CycloneDX";
owner = "cdxgen";
repo = "cdxgen";
tag = "v${finalAttrs.version}";
hash = "sha256-RmgR6OfNrZUYFyn36zTHERIHlzszaFqTX8b4Rf2TF/U=";
@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Creates CycloneDX Software Bill-of-Materials (SBOM) for your projects from source and container images";
mainProgram = "cdxgen";
homepage = "https://github.com/CycloneDX/cdxgen";
homepage = "https://github.com/cdxgen/cdxgen";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
quincepie

View file

@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "0.6.6";
src = fetchFromGitHub {
owner = "willeccles";
owner = "sophec";
repo = "cfm";
rev = "v${finalAttrs.version}";
sha256 = "sha256-uXL0RO9P+NYSZ0xCv91KzjHOJJI500YUT8IJkFS86pE=";
@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
];
meta = {
homepage = "https://github.com/willeccles/cfm";
homepage = "https://github.com/sophec/cfm";
description = "Simple and fast TUI file manager with no dependencies";
license = lib.licenses.mpl20;
maintainers = [ ];

View file

@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cgreen";
version = "1.6.4";
version = "1.6.5";
src = fetchFromGitHub {
owner = "cgreen-devs";
repo = "cgreen";
rev = finalAttrs.version;
sha256 = "sha256-W4MdB3acZcxavjRupJa4eXAv9g4QgYXFAQWOLoHrQZ8=";
sha256 = "sha256-/D06k4c6xu9bL8z/DGnOLvgzOstTeR9PxW/J6a42rZs=";
};
postPatch = ''

View file

@ -10,7 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
version = "0.7.0";
src = fetchFromGitHub {
owner = "antifuchs";
owner = "boinkor-net";
repo = "chars";
rev = "v${finalAttrs.version}";
sha256 = "sha256-mBtwdPzIc6RgEFTyReStFlhS4UhhRWjBTKT6gD3tzpQ=";
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
meta = {
description = "Commandline tool to display information about unicode characters";
mainProgram = "chars";
homepage = "https://github.com/antifuchs/chars";
homepage = "https://github.com/boinkor-net/chars";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ bbigras ];
};

View file

@ -11,7 +11,7 @@
buildNpmPackage rec {
pname = "clever-tools";
version = "4.10.0";
version = "4.11.0";
nodejs = nodejs_22;
@ -19,10 +19,10 @@ buildNpmPackage rec {
owner = "CleverCloud";
repo = "clever-tools";
rev = version;
hash = "sha256-EgGjlZ6Awg7SEC3ljPqii3wpq2SlXN/gARUJBSFcX0k=";
hash = "sha256-ma1EZL5xuUw8BrECFamSR1I8XJk8PERW7YJSj8JTp4w=";
};
npmDepsHash = "sha256-1v9c1525J7aS89PDdl6hWbYdn/DIM3G1BxFbpxu/F7E=";
npmDepsHash = "sha256-9TPH+jRcM161MhabA9m0GcgAzc+yO1a1zh8vQHjZt7g=";
nativeBuildInputs = [
installShellFiles

View file

@ -11,14 +11,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "clickable";
version = "8.8.0";
version = "8.9.0";
pyproject = true;
src = fetchFromGitLab {
owner = "clickable";
repo = "clickable";
rev = "v${finalAttrs.version}";
hash = "sha256-EEICNL5ydrtep+Lbo9ryKW3+vcJwQxPeXY/C4bZaAnI=";
hash = "sha256-hrtAx/RKBlVf8cguPAGd55/m0D6YLu678f+aqeIzRos=";
};
__structuredAttrs = true;

View file

@ -0,0 +1,18 @@
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index eb29252..a62c0de 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -8,7 +8,10 @@
add_subdirectory(Interpreter)
add_subdirectory(MetaProcessor)
-if(CLING_INCLUDE_TESTS)
- add_subdirectory(UserInterface)
-endif()
+# The UserInterface library (clingUserInterface) is linked unconditionally by the
+# cling driver, so it must always be built. Upstream cling 1.3 mistakenly gates it
+# behind CLING_INCLUDE_TESTS: the previous EXISTS check on the bundled textinput
+# sources was dropped when those were removed in favor of LLVM's LineEditor, but the
+# subdirectory must still be added. See lib/UserInterface and tools/driver.
+add_subdirectory(UserInterface)
add_subdirectory(Utils)

View file

@ -1,54 +0,0 @@
From cd4d1d8c4963620a6a84834948845df81fbbd70b Mon Sep 17 00:00:00 2001
From: Jonas Hahnfeld <jonas.hahnfeld@cern.ch>
Date: Tue, 17 Dec 2024 14:54:18 +0100
Subject: [PATCH] Use single Parser for LookupHelper
It is the only construction of a temporary parser, and it seems not
necessary (anymore).
---
include/cling/Interpreter/LookupHelper.h | 2 +-
lib/Interpreter/Interpreter.cpp | 11 ++++-------
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/include/cling/Interpreter/LookupHelper.h b/include/cling/Interpreter/LookupHelper.h
index 6e6e281470..cd79b2a65c 100644
--- a/include/cling/Interpreter/LookupHelper.h
+++ b/include/cling/Interpreter/LookupHelper.h
@@ -56,7 +56,7 @@ namespace cling {
WithDiagnostics
};
private:
- std::unique_ptr<clang::Parser> m_Parser;
+ clang::Parser* m_Parser;
Interpreter* m_Interpreter; // we do not own.
std::array<const clang::Type*, kNumCachedStrings> m_StringTy = {{}};
/// A map containing the hash of the lookup buffer. This allows us to avoid
diff --git a/lib/Interpreter/Interpreter.cpp b/lib/Interpreter/Interpreter.cpp
index 13c8409cc5..f04695439b 100644
--- a/lib/Interpreter/Interpreter.cpp
+++ b/lib/Interpreter/Interpreter.cpp
@@ -265,13 +265,6 @@ namespace cling {
}
Sema& SemaRef = getSema();
- Preprocessor& PP = SemaRef.getPreprocessor();
-
- m_LookupHelper.reset(new LookupHelper(new Parser(PP, SemaRef,
- /*SkipFunctionBodies*/false,
- /*isTemp*/true), this));
- if (!m_LookupHelper)
- return;
if (!isInSyntaxOnlyMode() && !m_Opts.CompilerOpts.CUDADevice) {
m_Executor.reset(new IncrementalExecutor(SemaRef.Diags, *getCI(),
@@ -317,6 +310,10 @@ namespace cling {
return;
}
+ m_LookupHelper.reset(new LookupHelper(m_IncrParser->getParser(), this));
+ if (!m_LookupHelper)
+ return;
+
// When not using C++ modules, we now have a PCH and we can safely setup
// our callbacks without fearing that they get overwritten by clang code.
// The modules setup is handled above.

View file

@ -5,19 +5,18 @@
git,
lib,
libffi,
llvmPackages_18,
llvmPackages_20,
makeWrapper,
ncurses,
python3,
zlib,
# *NOT* from LLVM 18!
# The compiler used to compile Cling may affect the runtime include and lib
# directories it expects to be run with. Cling builds against (a fork of) Clang,
# so we prefer to use Clang as the compiler as well for consistency.
# It would be cleanest to use LLVM 9's clang, but it errors. So, we use a later
# version of Clang to compile, but we check out the Cling fork of Clang 9 to
# build Cling against.
# The compiler used to *compile* Cling, independent of the LLVM/Clang that
# Cling is built against (the root-project/llvm-project fork checked out below)
# and of llvmPackages_20 (used only for the runtime wrapper flags). The compiler
# can affect the runtime include and lib directories Cling expects, and since
# Cling builds against a fork of Clang we use Clang as the compiler too for
# consistency.
clangStdenv,
# For runtime C++ standard library
@ -34,13 +33,13 @@
let
stdenv = clangStdenv;
version = "1.2";
version = "1.3";
clingSrc = fetchFromGitHub {
owner = "root-project";
repo = "cling";
rev = "v${version}";
sha256 = "sha256-ay9FXANJmB/+AdnCR4WOKHuPm6P88wLqoOgiKJwJ8JM=";
sha256 = "sha256-/qCHd9KfPW4dMjktaSdnJG+VDD1lLSI4ZFllTcxWsmc=";
};
unwrapped = stdenv.mkDerivation {
@ -50,18 +49,18 @@ let
src = fetchFromGitHub {
owner = "root-project";
repo = "llvm-project";
rev = "cling-llvm18-20250721-01";
sha256 = "sha256-JGteapyujU5w81DsfPQfTq76cYHgk5PbAFbdYfYIDo4=";
rev = "cling-llvm20-20260119-01";
sha256 = "sha256-fv7nrpZ5Dhbf+nW0ED0pkc8NDBXeaBs9MV2TW6o7FGU=";
};
preConfigure = ''
cp -r ${clingSrc} cling-source
# Patch a bug in version 1.2 by backporting a fix. See
# https://github.com/root-project/cling/issues/556
# cling 1.3 only builds the clingUserInterface library (which the cling
# driver always links) when CLING_INCLUDE_TESTS is on. Always build it.
chmod -R u+w cling-source
pushd cling-source
patch -p1 < ${./fix-new-parser.patch}
patch -p1 < ${./always-build-user-interface.patch}
popd
cd llvm
@ -106,8 +105,6 @@ let
cp -r ../../cling-source/tools/Jupyter/kernel $out/share/Jupyter
'';
buildTargets = [ "cling" ];
dontStrip = debug;
meta = {
@ -139,18 +136,18 @@ let
"-nostdinc++"
"-resource-dir"
"${llvmPackages_18.llvm.lib}/lib"
"${llvmPackages_20.llvm.lib}/lib"
"-isystem"
"${lib.getLib unwrapped}/lib/clang/18/include"
"${lib.getLib unwrapped}/lib/clang/20/include"
]
++ lib.optionals useLLVMLibcxx [
"-I"
"${lib.getDev llvmPackages_18.libcxx}/include/c++/v1"
"${lib.getDev llvmPackages_20.libcxx}/include/c++/v1"
"-L"
"${llvmPackages_18.libcxx}/lib"
"${llvmPackages_20.libcxx}/lib"
"-l"
"${llvmPackages_18.libcxx}/lib/libc++${stdenv.hostPlatform.extensions.sharedLibrary}"
"${llvmPackages_20.libcxx}/lib/libc++${stdenv.hostPlatform.extensions.sharedLibrary}"
]
++ lib.optionals (!useLLVMLibcxx) [
"-I"

View file

@ -9,16 +9,16 @@
buildGoModule (finalAttrs: {
pname = "cog";
version = "0.1.13";
version = "0.1.22";
src = fetchFromGitHub {
owner = "grafana";
repo = "cog";
tag = "v${finalAttrs.version}";
hash = "sha256-e8PxH09d3n4nDhJzJ/y4KwTZ5UhKgwNupy31Z9VGi7A=";
hash = "sha256-hYXTZlV8128cKchF2vMkr4QJxYI+yJA75LtuTmMpR5U=";
};
vendorHash = "sha256-0ywSn4JghAfg9KZptpLYp+h1hZju2SmLeOXG5DKPa98=";
vendorHash = "sha256-5y6spoRzl4yJ5GpiHHvGHJIdEFnsUdpIiuoWmym5GJY=";
subPackages = [ "cmd/cli" ];

View file

@ -9,13 +9,13 @@
}:
rustPlatform.buildRustPackage {
pname = "cosmic-ext-applet-sysinfo";
version = "0-unstable-2026-06-05";
version = "0-unstable-2026-06-25";
src = fetchFromGitHub {
owner = "cosmic-utils";
repo = "cosmic-ext-applet-sysinfo";
rev = "681dfcf86009a84ae76573726d227f949930225b";
hash = "sha256-HZZxyAzAwEgGWjPUU6MUhO/yShx423FTpvpImhdjGpk=";
rev = "34ed2a114ec327431e576dc8060e767d15d3571f";
hash = "sha256-9BF51WrASOSyBTmAenk02cR0fab2S7qU8KMfkgZGZDE=";
};
cargoHash = "sha256-KVnvyiF2rXb9gio3o+dE9w/zZ5gcad1uEbWHMBC3yDc=";

View file

@ -11,16 +11,16 @@
buildGoModule (finalAttrs: {
pname = "croc";
version = "10.4.4";
version = "10.4.5";
src = fetchFromGitHub {
owner = "schollz";
repo = "croc";
rev = "v${finalAttrs.version}";
hash = "sha256-Kwli0wgicebRlJE+c4McH6a7I2udRppJtKBopJ/eiFc=";
hash = "sha256-EbOjLR9xQMY2D+roK/Fv1so5FZwZ2RmNetLxq0WIw2g=";
};
vendorHash = "sha256-jXv8M4MnaTVitLmQ4X+pyIihxcVGlEP4IEwZT1LPKIA=";
vendorHash = "sha256-SVljsV7xxVVQsn1ii4ShnFVFQDAFSZJe14HJ/6TQi7c=";
subPackages = [ "." ];

View file

@ -11,16 +11,16 @@
buildGo126Module (finalAttrs: {
pname = "crush";
version = "0.80.0";
version = "0.81.0";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = "crush";
tag = "v${finalAttrs.version}";
hash = "sha256-joSzU5+gufb9cEsIOVVSnEO9+Xoy1g+gqzvmpbkIky8=";
hash = "sha256-FOvkCQxDW1dipzIzgQz2uvHIv6bm/TVV1WwhrvmBDWg=";
};
vendorHash = "sha256-cA39djwy7NOBeJELvrPSW2mRcyDEhsghPOzzQ9O180c=";
vendorHash = "sha256-4gHvyEqiFhEvZ90lJbXeI/1fMMo6L19P/PD5Eu5YUmI=";
ldflags = [
"-s"

View file

@ -4,14 +4,17 @@
fetchurl,
autoreconfHook,
which,
ocamlPackages,
ocaml-ng,
}:
stdenv.mkDerivation rec {
let
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
in
stdenv.mkDerivation (finalAttrs: {
pname = "cubicle";
version = "1.2.0";
src = fetchurl {
url = "https://github.com/cubicle-model-checker/cubicle/archive/refs/tags/${version}.tar.gz";
url = "https://github.com/cubicle-model-checker/cubicle/archive/refs/tags/${finalAttrs.version}.tar.gz";
hash = "sha256-/EtbXpyXqRm0jGcMfGLAEwdr92061edjFys1V7/w6/Y=";
};
@ -45,4 +48,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ dwarfmaster ];
};
}
})

View file

@ -11,8 +11,8 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "CuraEngine";
rev = finalAttrs.version;
sha256 = "sha256-8V21TRSqCN+hkTlz51d5A5oK5JOwEtx+ROt8cfJBL/0=";
tag = finalAttrs.version;
hash = "sha256-8V21TRSqCN+hkTlz51d5A5oK5JOwEtx+ROt8cfJBL/0=";
};
postPatch = ''

View file

@ -7,16 +7,16 @@
buildGoModule (finalAttrs: {
pname = "dapr-cli";
version = "1.17.1";
version = "1.18.0";
src = fetchFromGitHub {
owner = "dapr";
repo = "cli";
rev = "v${finalAttrs.version}";
hash = "sha256-XsRMVuXkHRARQ2UhG317QH0Ub4SOG8mesa7PnesXpvc=";
hash = "sha256-2zi8r4LIguWPrsvpvz+sYF4sXqBVmWJtzHLm5nRHFCU=";
};
vendorHash = "sha256-WwYpoKyiNbeoXnOaRy94vSoG4Ya1a7DYNriZoZuBRF8=";
vendorHash = "sha256-P7zrfUcb/Hxo7QbIQfq9JSf2d7meZShQ++GG8HkEoLE=";
proxyVendor = true;

View file

@ -17,16 +17,16 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "dashy-ui";
version = "4.3.3";
version = "4.3.11";
src = fetchFromGitHub {
owner = "lissy93";
repo = "dashy";
tag = finalAttrs.version;
hash = "sha256-3uzitxmaFKWrB8NOEFs2eEOqqYDW9R8pH1VAMEutBKU=";
hash = "sha256-BAzeS484udZ4Llgyx1pruKsgPOpI3i3XMTWy5cf2I1Q=";
};
yarnOfflineCache = fetchYarnDeps {
yarnLock = finalAttrs.src + "/yarn.lock";
hash = "sha256-5yYaOZk/SiR5vvM860JQkH3/TjVOFMnqwRlxxziKMr8=";
hash = "sha256-PCJxn3qXOZBHVJifa6xTYu1quW6zelt162fIgyH9g8g=";
};
passthru = {

View file

@ -7,6 +7,7 @@
autoreconfHook,
stdenv,
lib,
buildPackages,
fetchzip,
flex,
bison,
@ -54,7 +55,20 @@
withLua ? false,
lua5_3,
}:
let
# The `nativeBuildInputs` version of `mysql_config` emits headers and libraries for
# the build platform, not the host platform; `pkg-config` emits the correct versions.
fake_mysql_config = buildPackages.writeShellScriptBin "mysql_config" ''
if [ "$1" == "--include" ]; then
"$PKG_CONFIG" --cflags mysqlclient
elif [ "$1" == "--libs" ]; then
"$PKG_CONFIG" --libs mysqlclient
else
echo "fake_mysql_config: unsupported option: $1" >&2
exit 1
fi
'';
in
stdenv.mkDerivation (finalAttrs: {
pname = "dovecot";
inherit version;
@ -66,7 +80,8 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config
]
++ lib.optionals (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]
++ lib.optionals (stdenv.hostPlatform.isDarwin) [ autoreconfHook ];
++ lib.optionals (stdenv.hostPlatform.isDarwin) [ autoreconfHook ]
++ lib.optional (withMySQL && lib.versionOlder version "2.4") fake_mysql_config;
buildInputs = [
openssl

View file

@ -1,5 +1,5 @@
diff --git a/src/external_libs.cmake b/src/external_libs.cmake
index 62e6e879..8934777f 100644
index 5a98540..1c5ab6d 100644
--- a/src/external_libs.cmake
+++ b/src/external_libs.cmake
@@ -1,7 +1,6 @@
@ -11,11 +11,13 @@ index 62e6e879..8934777f 100644
CONFIGURE_COMMAND echo
BUILD_IN_SOURCE 1
BUILD_COMMAND ${DFLY_TOOLS_MAKE} all
@@ -19,18 +18,16 @@ endif()
@@ -19,20 +18,16 @@ endif()
add_third_party(
dconv
- URL https://github.com/google/double-conversion/archive/refs/tags/v3.3.0.tar.gz
- GIT_REPOSITORY https://github.com/google/double-conversion
- # URL https://github.com/google/double-conversion/archive/refs/tags/v3.3.1.tar.gz
- GIT_TAG 0604b4c
- PATCH_COMMAND ${SED_REPL} "/static const std::ctype/d"
- <SOURCE_DIR>/double-conversion/string-to-double.cc
- COMMAND ${SED_REPL} "/std::use_facet</d" <SOURCE_DIR>/double-conversion/string-to-double.cc
@ -35,12 +37,12 @@ index 62e6e879..8934777f 100644
CONFIGURE_COMMAND <SOURCE_DIR>/configure --disable-avx2 --prefix=${THIRD_PARTY_LIB_DIR}/reflex
CXX=${CMAKE_CXX_COMPILER} CC=${CMAKE_C_COMPILER}
)
@@ -41,16 +38,14 @@ set(REFLEX "${THIRD_PARTY_LIB_DIR}/reflex/bin/reflex")
@@ -41,16 +36,14 @@ set(REFLEX "${THIRD_PARTY_LIB_DIR}/reflex/bin/reflex")
add_third_party(
jsoncons
- GIT_REPOSITORY https://github.com/dragonflydb/jsoncons
- GIT_TAG Dragonfly.178
- GIT_TAG Dragonfly1.5.0
- GIT_SHALLOW 1
+ DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/jsoncons/. <SOURCE_DIR>
CMAKE_PASS_FLAGS "-DJSONCONS_BUILD_TESTS=OFF -DJSONCONS_HAS_POLYMORPHIC_ALLOCATOR=ON"
@ -54,7 +56,7 @@ index 62e6e879..8934777f 100644
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND echo skip
@@ -65,7 +60,7 @@ set(MIMALLOC_C_FLAGS "-O3 -g -DMI_STAT=1 -DNDEBUG")
@@ -65,7 +58,7 @@ set(MIMALLOC_C_FLAGS "-O3 -g -DMI_STAT=1 -DNDEBUG")
file(MAKE_DIRECTORY ${MIMALLOC_INCLUDE_DIR})
ExternalProject_Add(mimalloc2_project
@ -63,7 +65,7 @@ index 62e6e879..8934777f 100644
DOWNLOAD_DIR ${THIRD_PARTY_DIR}/mimalloc2
SOURCE_DIR ${THIRD_PARTY_DIR}/mimalloc2
# INSTALL_DIR ${MIMALLOC_ROOT_DIR}
@@ -118,21 +113,21 @@ set_target_properties(TRDP::mimalloc2 PROPERTIES IMPORTED_LOCATION ${MIMALLOC_RO
@@ -119,23 +112,21 @@ set_target_properties(TRDP::mimalloc2 PROPERTIES IMPORTED_LOCATION ${MIMALLOC_RO
add_third_party(
croncpp
@ -78,17 +80,28 @@ index 62e6e879..8934777f 100644
- URL https://github.com/uni-algo/uni-algo/archive/refs/tags/v1.0.0.tar.gz
+ DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/uni-algo/. <SOURCE_DIR>
CMAKE_PASS_FLAGS "-DCMAKE_CXX_STANDARD:STRING=17"
CMAKE_PASS_FLAGS "-DCMAKE_CXX_STANDARD:STRING=20"
)
add_third_party(
hnswlib
- URL https://github.com/nmslib/hnswlib/archive/refs/tags/v0.7.0.tar.gz
- GIT_REPOSITORY https://github.com/dragonflydb/hnswlib.git
- # HEAD of dragonfly branch
- GIT_TAG d07dd1da2bf48b85d2f03b8396193ad7120f75c2
+ DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/hnswlib/. <SOURCE_DIR>
BUILD_COMMAND echo SKIP
INSTALL_COMMAND cp -R <SOURCE_DIR>/hnswlib ${THIRD_PARTY_LIB_DIR}/hnswlib/include/
@@ -142,21 +137,20 @@ endif()
@@ -145,7 +136,7 @@ if (WITH_SEARCH)
# No autoconf/cmake/install in upstream Makefile; manual install copy.
add_third_party(
stemmer
- URL https://github.com/snowballstem/snowball/archive/refs/tags/v3.0.1.tar.gz
+ DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/stemmer/. <SOURCE_DIR>
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND echo skip
BUILD_COMMAND ${DFLY_TOOLS_MAKE} -j4 CFLAGS=-O3\ -fPIC libstemmer.a
@@ -159,21 +150,20 @@ endif()
add_third_party(
fast_float

View file

@ -1,35 +1,52 @@
diff --git a/helio/cmake/third_party.cmake b/helio/cmake/third_party.cmake
index 810a8fa..8b11922 100644
index 6cad93a..409e45f 100644
--- a/helio/cmake/third_party.cmake
+++ b/helio/cmake/third_party.cmake
@@ -151,7 +151,7 @@ endfunction()
@@ -189,24 +189,9 @@ function(download_and_validate url file out_status)
set(${out_status} "${st}" PARENT_SCOPE)
endfunction()
-if(NOT EXISTS "${GTEST_TARBALL}")
- download_and_validate("${GTEST_RELEASE_URL}" "${GTEST_TARBALL}" st1)
- list(GET st1 0 rc1)
- if(NOT rc1 EQUAL 0)
- file(REMOVE "${GTEST_TARBALL}")
- message(STATUS "Primary download failed: ${st1}. Trying archive URL...")
- download_and_validate("${GTEST_ARCHIVE_URL}" "${GTEST_TARBALL}" st2)
- list(GET st2 0 rc2)
- if(NOT rc2 EQUAL 0)
- file(REMOVE "${GTEST_TARBALL}")
- message(FATAL_ERROR "Failed to download googletest.\nRelease: ${st1}\nArchive: ${st2}")
- endif()
- endif()
-endif()
-
FetchContent_Declare(
gtest
- URL https://github.com/google/googletest/archive/v1.15.2.tar.gz
- URL "${GTEST_TARBALL}"
+ DOWNLOAD_COMMAND true
)
FetchContent_GetProperties(gtest)
@@ -162,7 +162,7 @@ endif ()
@@ -217,7 +202,7 @@ endif ()
FetchContent_Declare(
benchmark
- URL https://github.com/google/benchmark/archive/v1.9.1.tar.gz
- URL https://github.com/google/benchmark/archive/v1.9.5.tar.gz
+ DOWNLOAD_COMMAND true
)
FetchContent_GetProperties(benchmark)
@@ -181,7 +181,7 @@ endif ()
@@ -236,7 +221,7 @@ endif ()
FetchContent_Declare(
abseil_cpp
- URL https://github.com/abseil/abseil-cpp/releases/download/20250512.1/abseil-cpp-20250512.1.tar.gz
+ DOWNLOAD_COMMAND true
PATCH_COMMAND patch -p1 < "${CMAKE_CURRENT_LIST_DIR}/../patches/abseil-20250512.1.patch"
COMMAND patch -p1 < "${CMAKE_CURRENT_LIST_DIR}/../patches/abseil-gcc-undefined-sanitizer-compilation-fix.patch"
)
@@ -204,11 +204,7 @@ if (LEGACY_GLOG)
@@ -263,11 +248,7 @@ if (LEGACY_GLOG)
FetchContent_Declare(
glog
@ -42,36 +59,16 @@ index 810a8fa..8b11922 100644
)
FetchContent_GetProperties(glog)
@@ -278,7 +274,7 @@ if (WITH_GPERF)
@@ -337,7 +318,7 @@ if (WITH_GPERF)
add_third_party(
gperf
- URL https://github.com/gperftools/gperftools/archive/gperftools-2.16.tar.gz
- URL https://github.com/gperftools/gperftools/archive/gperftools-2.18.1.tar.gz
+ DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/gperf/. <SOURCE_DIR>
# GIT_SHALLOW TRUE
# Remove building the unneeded programs (they fail on macos)
@@ -312,9 +308,7 @@ set(MIMALLOC_INCLUDE_DIR ${THIRD_PARTY_LIB_DIR}/mimalloc/include)
set (MIMALLOC_PATCH_COMMAND patch -p1 -d ${THIRD_PARTY_DIR}/mimalloc/ -i ${CMAKE_CURRENT_LIST_DIR}/../patches/mimalloc-v2.1.6.patch)
add_third_party(mimalloc
- #GIT_REPOSITORY https://github.com/microsoft/mimalloc.git
- #GIT_TAG 0f6d8293c74796fa913e4b5eb4361f1e4734f7c6
- URL https://github.com/microsoft/mimalloc/archive/refs/tags/v2.1.6.tar.gz
+ DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/mimalloc216/. <SOURCE_DIR>
PATCH_COMMAND "${MIMALLOC_PATCH_COMMAND}"
# -DCMAKE_BUILD_TYPE=Release
# Add -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-O0 to debug
@@ -328,7 +322,7 @@ add_third_party(mimalloc
)
add_third_party(jemalloc
- URL https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2
+ DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/jemalloc/. <SOURCE_DIR>
PATCH_COMMAND ./autogen.sh
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${THIRD_PARTY_LIB_DIR}/jemalloc --with-jemalloc-prefix=je_ --disable-libdl
)
@@ -336,7 +330,7 @@ add_third_party(jemalloc
@@ -367,7 +348,7 @@ endif()
add_third_party(
xxhash
@ -80,16 +77,16 @@ index 810a8fa..8b11922 100644
# A bug in xxhash 0.8.1 that searches for a file that doesn't exist
PATCH_COMMAND touch <SOURCE_DIR>/xxhsum.1
@@ -347,7 +341,7 @@ add_third_party(
@@ -378,7 +359,7 @@ add_third_party(
add_third_party(
uring
- URL https://github.com/axboe/liburing/archive/refs/tags/liburing-2.8.tar.gz
- URL https://github.com/axboe/liburing/archive/refs/tags/liburing-2.13.tar.gz
+ DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/uring/. <SOURCE_DIR>
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${THIRD_PARTY_LIB_DIR}/uring
BUILD_COMMAND make -C src
@@ -356,7 +350,7 @@ add_third_party(
@@ -387,12 +368,12 @@ add_third_party(
add_third_party(
pugixml
@ -98,28 +95,35 @@ index 810a8fa..8b11922 100644
)
if (WITH_AWS)
@@ -364,9 +358,7 @@ if (WITH_AWS)
set (AWS_PATCH_COMMAND patch -p1 -d ${THIRD_PARTY_DIR}/aws/ -i ${CMAKE_CURRENT_LIST_DIR}/../patches/aws-sdk-cpp-1.11.717.patch)
- set(AWS_CMAKE_PASS_FLAGS "-DBUILD_ONLY=s3 -DNO_HTTP_CLIENT=ON -DENABLE_TESTING=OFF -DENABLE_CURL_LOGGING=OFF -DAUTORUN_UNIT_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DAWS_SDK_WARNINGS_ARE_ERRORS=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POLICY_VERSION_MINIMUM=3.5")
+ set(AWS_CMAKE_PASS_FLAGS "-DBUILD_ONLY=s3 -DNO_HTTP_CLIENT=ON -DENABLE_TESTING=OFF -DENABLE_CURL_LOGGING=OFF -DAUTORUN_UNIT_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DAWS_SDK_WARNINGS_ARE_ERRORS=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DENFORCE_SUBMODULE_VERSIONS=OFF")
if (OPENSSL_CRYPTO_LIBRARY AND OPENSSL_INCLUDE_DIR)
string(APPEND AWS_CMAKE_PASS_FLAGS " -Dcrypto_LIBRARY=${OPENSSL_CRYPTO_LIBRARY} -Dcrypto_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR}")
@@ -410,10 +391,7 @@ if (WITH_AWS)
add_third_party(
aws
- GIT_REPOSITORY https://github.com/aws/aws-sdk-cpp.git
- GIT_TAG 3e51fa016655eeb6b6610bdf8fe7cf33ebbf3e00
- GIT_TAG 1.11.717
- GIT_SHALLOW TRUE
- GIT_CONFIG submodule.recurse=1 submodule.fetchJobs=10
+ DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/aws-sdk-cpp/. <SOURCE_DIR>
PATCH_COMMAND "${AWS_PATCH_COMMAND}"
CMAKE_PASS_FLAGS "-DBUILD_ONLY=s3 -DNO_HTTP_CLIENT=ON -DENABLE_TESTING=OFF -DAUTORUN_UNIT_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POLICY_VERSION_MINIMUM=3.5"
CMAKE_PASS_FLAGS "${AWS_CMAKE_PASS_FLAGS}"
LIB libaws-cpp-sdk-s3.a libaws-cpp-sdk-core.a libaws-crt-cpp.a libaws-c-mqtt.a libaws-c-event-stream.a libaws-c-s3.a libaws-c-auth.a libaws-c-http.a libaws-c-io.a libs2n.a libaws-c-compression.a libaws-c-cal.a libaws-c-sdkutils.a libaws-checksums.a libaws-c-common.a
@@ -376,8 +368,7 @@ endif()
if (WITH_GCP)
add_third_party(
rapidjson
- GIT_REPOSITORY https://github.com/Tencent/rapidjson.git
- GIT_TAG ab1842a
+ DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/rapidjson/. <SOURCE_DIR>
CMAKE_PASS_FLAGS "-DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF \
-DRAPIDJSON_BUILD_DOC=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.5"
LIB "none"
@@ -386,24 +377,23 @@ endif()
@@ -422,8 +400,7 @@ endif()
add_third_party(
rapidjson
- GIT_REPOSITORY https://github.com/Tencent/rapidjson.git
- GIT_TAG ab1842a
+ DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/rapidjson/. <SOURCE_DIR>
CMAKE_PASS_FLAGS "-DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF \
-DRAPIDJSON_BUILD_DOC=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.5"
LIB "none"
@@ -431,14 +408,14 @@ add_third_party(
add_third_party(
cares
@ -134,11 +138,9 @@ index 810a8fa..8b11922 100644
- URL https://github.com/facebook/zstd/releases/download/v1.5.7/zstd-1.5.7.tar.zst
+ DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/zstd/. <SOURCE_DIR>
SOURCE_SUBDIR "build/cmake"
-
+
# for debug pass : "CFLAGS=-fPIC -O0 -ggdb"
CMAKE_PASS_FLAGS "-DZSTD_BUILD_SHARED=OFF -DZSTD_BUILD_PROGRAMS=OFF -DZSTD_BUILD_TESTS=OFF"
)
@@ -447,8 +424,7 @@ add_third_party(
add_third_party(
expected

View file

@ -4,7 +4,6 @@
stdenv,
# Dependencies
abseil-cpp,
c-ares,
croncpp,
double-conversion,
@ -15,8 +14,6 @@
gperftools,
gtest,
hdrhistogram_c,
hnswlib,
jemalloc,
liburing,
lz4,
pcre2,
@ -36,6 +33,7 @@
cmake,
gcc-unwrapped,
ninja,
perl,
# Runtime dependencies
boost,
@ -57,21 +55,31 @@
let
pname = "dragonflydb";
version = "1.34.2";
version = "1.39.0";
src = fetchFromGitHub {
owner = "dragonflydb";
repo = "dragonfly";
tag = "v${version}";
hash = "sha256-n70IB32tZDe665hVLrKC0BSSJutmYhtPJvfNa48xaqA=";
hash = "sha256-vLuuf3fVdVzcd06bafGiLtION6IwTnspiIJmZF9tUGg=";
fetchSubmodules = true;
};
aws-sdk-cpp-1-11-162 = fetchFromGitHub {
# dragonfly's helio applies patches written against this exact abseil
# release (see helio/patches/abseil-20250512.1.patch), so it's pinned here
# rather than taken from nixpkgs' abseil-cpp, which tracks a newer version.
abseil-cpp-20250512 = fetchFromGitHub {
owner = "abseil";
repo = "abseil-cpp";
tag = "20250512.1";
hash = "sha256-eB7OqTO9Vwts9nYQ/Mdq0Ds4T1KgmmpYdzU09VPWOhk=";
};
aws-sdk-cpp-1-11-717 = fetchFromGitHub {
owner = "aws";
repo = "aws-sdk-cpp";
tag = "1.11.162";
hash = "sha256-NxVE7H8BOetpbBkB2PTVBoHSXYm6cTp41F1LJmhtBbs=";
tag = "1.11.717";
hash = "sha256-stDZg9dvKljnbZZUHEn1KmlgDdvW6BK7H7RtGk/nyEI=";
fetchSubmodules = true;
};
@ -85,8 +93,17 @@ let
jsoncons-dragonfly = fetchFromGitHub {
owner = "dragonflydb";
repo = "jsoncons";
rev = "Dragonfly.178";
hash = "sha256-cxM95DFFo5z+eImgZzJw+ykaeSDtBF+hw5qo6gnL53s=";
rev = "Dragonfly1.5.0";
hash = "sha256-9W9GJpzKuqolXoz5iYiE1EbVWr7HiFqpMgZO1BQdi0s=";
};
# dragonfly's search module uses a fork of hnswlib with custom changes, so
# this can't come from nixpkgs' hnswlib (nmslib upstream).
hnswlib-dragonfly = fetchFromGitHub {
owner = "dragonflydb";
repo = "hnswlib";
rev = "d07dd1da2bf48b85d2f03b8396193ad7120f75c2";
hash = "sha256-GFBjKzDauznGGfkXZqSFgbvBKxDXbx2rETqY5BnCIiw=";
};
lua-dragonfly = fetchFromGitHub {
@ -96,13 +113,6 @@ let
hash = "sha256-uLNe+hLihu4wMW/wstGnYdPa2bGPC5UiNE+VyNIYY2c=";
};
mimalloc216 = fetchFromGitHub {
owner = "microsoft";
repo = "mimalloc";
tag = "v2.1.6";
hash = "sha256-Ff3+RP+lAXCOeHJ87oG3c02rPP4WQIbg5L/CVe6gA3M=";
};
mimalloc224 = fetchFromGitHub {
owner = "microsoft";
repo = "mimalloc";
@ -110,6 +120,15 @@ let
hash = "sha256-+8xZT+mVEqlqabQc+1buVH/X6FZxvCd0rWMyjPu9i4o=";
};
# nixpkgs' libstemmer is older than the snowball release dragonfly's search
# module builds against, so the source is pinned and built in-tree here.
snowball-stemmer = fetchFromGitHub {
owner = "snowballstem";
repo = "snowball";
tag = "v3.0.1";
hash = "sha256-QPIPePddUqwpa0YMn0E7H9GZj3s2bEkJzZdXlrHeZbo=";
};
withUnwind = !stdenv.targetPlatform.isAarch64;
in
stdenv.mkDerivation {
@ -130,7 +149,7 @@ stdenv.mkDerivation {
# Copy FetchContent dependencies (in helio/cmake/third_party.cmake)
# These go to build/_deps/ where FetchContent expects them
cp -r --no-preserve=mode,ownership ${abseil-cpp.src} build/_deps/abseil_cpp-src
cp -r --no-preserve=mode,ownership ${abseil-cpp-20250512} build/_deps/abseil_cpp-src
cp -r --no-preserve=mode,ownership ${gbenchmark.src} build/_deps/benchmark-src
cp -r --no-preserve=mode,ownership ${glog-absl} build/_deps/glog-src
cp -r --no-preserve=mode,ownership ${gtest.src} build/_deps/gtest-src
@ -142,13 +161,12 @@ stdenv.mkDerivation {
cp -r --no-preserve=mode,ownership ${fast-float.src} build/deps-nixpkgs/fast_float
cp -r --no-preserve=mode,ownership ${flatbuffers_23.src} build/deps-nixpkgs/flatbuffers
cp -r --no-preserve=mode,ownership ${hdrhistogram_c.src} build/deps-nixpkgs/hdr_histogram
cp -r --no-preserve=mode,ownership ${jemalloc.src} build/deps-nixpkgs/jemalloc
cp -r --no-preserve=mode,ownership ${jsoncons-dragonfly} build/deps-nixpkgs/jsoncons
cp -r --no-preserve=mode,ownership ${liburing.src} build/deps-nixpkgs/uring
cp -r --no-preserve=mode,ownership ${lua-dragonfly} build/deps-nixpkgs/lua
cp -r --no-preserve=mode,ownership ${lz4.src} build/deps-nixpkgs/lz4
cp -r --no-preserve=mode,ownership ${mimalloc216} build/deps-nixpkgs/mimalloc216
cp -r --no-preserve=mode,ownership ${mimalloc224} build/deps-nixpkgs/mimalloc224
cp -r --no-preserve=mode,ownership ${rapidjson.src} build/deps-nixpkgs/rapidjson
cp -r --no-preserve=mode,ownership ${pugixml.src} build/deps-nixpkgs/pugixml
cp -r --no-preserve=mode,ownership ${re-flex.src} build/deps-nixpkgs/reflex
cp -r --no-preserve=mode,ownership ${xxhash.src} build/deps-nixpkgs/xxhash
@ -161,16 +179,7 @@ stdenv.mkDerivation {
${
if withAws then
''
cp -r --no-preserve=mode,ownership ${aws-sdk-cpp-1-11-162} build/deps-nixpkgs/aws-sdk-cpp
''
else
""
}
${
if withGcp then
''
cp -r --no-preserve=mode,ownership ${rapidjson.src} build/deps-nixpkgs/rapidjson
cp -r --no-preserve=mode,ownership ${aws-sdk-cpp-1-11-717} build/deps-nixpkgs/aws-sdk-cpp
''
else
""
@ -188,7 +197,8 @@ stdenv.mkDerivation {
${
if withSearch then
''
cp -r --no-preserve=mode,ownership ${hnswlib.src} build/deps-nixpkgs/hnswlib
cp -r --no-preserve=mode,ownership ${hnswlib-dragonfly} build/deps-nixpkgs/hnswlib
cp -r --no-preserve=mode,ownership ${snowball-stemmer} build/deps-nixpkgs/stemmer
cp -r --no-preserve=mode,ownership ${uni-algo.src} build/deps-nixpkgs/uni-algo
''
else
@ -200,6 +210,14 @@ stdenv.mkDerivation {
chmod u+x build/deps-nixpkgs/reflex/configure
chmod u+x build/deps-nixpkgs/uring/configure
touch build/deps-nixpkgs/xxhash/xxhsum.1
# snowball generates its C sources with perl scripts run via their shebang;
# the source copy drops their execute bit, so restore it and fix the
# /usr/bin/env shebang for the sandbox.
if [ -d build/deps-nixpkgs/stemmer ]; then
find build/deps-nixpkgs/stemmer -name '*.pl' -exec chmod +x {} +
patchShebangs build/deps-nixpkgs/stemmer
fi
'';
nativeBuildInputs = [
@ -209,6 +227,7 @@ stdenv.mkDerivation {
bison
cmake
ninja
perl
];
buildInputs = [

View file

@ -90,8 +90,8 @@ stdenv.mkDerivation (finalAttrs: {
flex
gettext
bzip2
]
++ lib.optional enableDebuginfod pkg-config;
pkg-config
];
buildInputs = [
zlib
zstd

View file

@ -52,9 +52,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
substituteInPlace $i \
--replace /usr/sbin/sendmail sendmail
done
substituteInPlace config/filter.d/dovecot.conf \
--replace dovecot.service dovecot2.service
'';
doCheck = false;

View file

@ -10,13 +10,13 @@
buildGoModule (finalAttrs: {
pname = "fan2go";
version = "0.14.0";
version = "0.15.0";
src = fetchFromGitHub {
owner = "markusressel";
repo = "fan2go";
tag = finalAttrs.version;
hash = "sha256-TveCqAxZhxXT/nk/M14/tDhFQfNs++bRMmV7bN1VB3k=";
hash = "sha256-LEPyyVlVPbGnAfRF0E7wr4fQqRNSKKSsDSKGBCISt5A=";
leaveDotGit = true;
postFetch = ''
cd $out
@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
'';
};
vendorHash = "sha256-CzwZghOBKEiRnUl3NCP1PBfW68iGIAJPDsmPUJThGog=";
vendorHash = "sha256-LydoBk7qt3Xsf13isJ/yTf6a+FExV9TSSUfD5Tu8Hqk=";
nativeBuildInputs = lib.optionals enableNVML [
autoAddDriverRunpath

View file

@ -19,14 +19,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "faugus-launcher";
version = "1.22.4";
version = "1.22.6";
pyproject = false;
src = fetchFromGitHub {
owner = "Faugus";
repo = "faugus-launcher";
tag = finalAttrs.version;
hash = "sha256-Npfoqa6A1YSNSxV3zcIQL6prlht47dVaZYpq9+Dx9LY=";
hash = "sha256-hN0DU7MFlG8+TVQ2pWRRIVIDlmmHE54Dv/PqFAwwECs=";
};
nativeBuildInputs = [
@ -54,9 +54,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
--replace-fail "/usr/bin/python3" "${python3Packages.python.interpreter}"
substituteInPlace faugus/path_manager.py \
--replace-fail "PathManager.user_data('faugus-launcher/umu-run')" "'${lib.getExe umu-launcher}'"
substituteInPlace faugus/launcher.py faugus/shortcut.py \
--replace-fail "PathManager.user_data('faugus-launcher/umu-run')" "'${lib.getExe umu-launcher}'" \
--replace-fail "/usr/lib/extensions/vulkan/lsfgvk/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so" \
--replace-fail "/usr/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so"
'';

View file

@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "files-cli";
version = "2.15.354";
version = "2.15.371";
src = fetchFromGitHub {
repo = "files-cli";
owner = "files-com";
rev = "v${finalAttrs.version}";
hash = "sha256-L1oF3KBB6q7YQvqfDq9jqY+onZrnIXECdD7RrdcYQtw=";
hash = "sha256-buIG/U51GembJuFJF5ngzSlYzMiej0e44eg7KCQrx/0=";
};
vendorHash = "sha256-RpihAKjYC6+TMrCZ4+ex6YBrXJwDrYeWp/a99NKCFQo=";
vendorHash = "sha256-qNm/3FWhzH5BfKO1oqlB0g7Ecv6tteMROWyZCis1Ngk=";
ldflags = [
"-s"

View file

@ -11,17 +11,17 @@
buildNpmPackage rec {
pname = "firebase-tools";
version = "15.22.0";
version = "15.22.3";
nodejs = nodejs_22;
src = fetchFromGitHub {
owner = "firebase";
repo = "firebase-tools";
tag = "v${version}";
hash = "sha256-5T6JTuKS/SvFUTabMGoH7okIkxwZOcxlDAEBGWZ4VyU=";
hash = "sha256-jj1cbJ/AlBDTDhIK/5J0XMn+8opZJ72o3O9JmB35RpE=";
};
npmDepsHash = "sha256-hNe46VmfSQx7XwxYWaox+FF15AagRTJk7OjP8y8j8Jo=";
npmDepsHash = "sha256-31d0VqbM7vnKyKF7GxNr4V4Z3EqfsgdeKzWbXOOIHYU=";
# No more package-lock.json in upstream src
postPatch = ''

View file

@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
pname = "fotowall";
version = "1.1.0";
version = "1.1.1";
strictDeps = true;
__structuredAttrs = true;
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
owner = "fotowall";
repo = "fotowall";
rev = "v${version}";
hash = "sha256-3zgZ9yuS7N/pqWF9CczMSjWb1afMFaNYPRgwEo/AZp8=";
hash = "sha256-0iW3S3E7g/osnwBTSh0ruBThVyI422EhlMjuA9kQWnY=";
};
nativeBuildInputs = [

View file

@ -7,17 +7,17 @@
buildGoModule (finalAttrs: {
pname = "goose";
version = "3.27.1";
version = "3.27.2";
src = fetchFromGitHub {
owner = "pressly";
repo = "goose";
rev = "v${finalAttrs.version}";
hash = "sha256-dzeB5QXjQAyJlaM6I82C4gNoj7ELA4sgkfHkXADN9+Y=";
hash = "sha256-4m/YYyQtz/Nj94vIUxChgmDsJVZqtzmp7qsSiuZVB38=";
};
proxyVendor = true;
vendorHash = "sha256-JsLpcV5SSBin6U7Kj5O0mhXNdIwyV+xdteEJBxW8zuY=";
vendorHash = "sha256-8riGHomL3wKqBOPOzgE13jWYjJT03tqz1UMWR/01pcE=";
# skipping: end-to-end tests require a docker daemon
postPatch = ''

View file

@ -14,7 +14,6 @@
wayland,
wayland-scanner,
vulkan-headers,
vulkan-loader,
pipewire,
libdrm,
libva,
@ -29,12 +28,12 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gpu-screen-recorder";
version = "5.13.8";
version = "5.13.9";
src = fetchgit {
url = "https://repo.dec05eba.com/gpu-screen-recorder";
tag = finalAttrs.version;
hash = "sha256-0uYj9NA6KqORr7ag8OOMphWWyHU27ptuOs5q0lGLGLc=";
hash = "sha256-rGjS21eY2XfcdRwmKE2hJO1+FIXAmmBJ4y2oKgSwoRM=";
};
nativeBuildInputs = [
@ -53,7 +52,6 @@ stdenv.mkDerivation (finalAttrs: {
wayland
wayland-scanner
vulkan-headers
vulkan-loader
libdrm
libva
libxdamage

View file

@ -1,36 +0,0 @@
{
"name": "@withgraphite/graphite-cli",
"version": "1.7.20",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@withgraphite/graphite-cli",
"version": "1.7.20",
"hasInstallScript": true,
"license": "None",
"dependencies": {
"semver": "^7.5.4"
},
"bin": {
"graphite": "graphite.js",
"gt": "graphite.js"
},
"engines": {
"node": ">=16"
}
},
"node_modules/semver": {
"version": "7.7.4",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
"integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
"license": "ISC",
"bin": {
"semver": "bin/semver.js"
},
"engines": {
"node": ">=10"
}
}
}
}

View file

@ -1,42 +1,26 @@
{
lib,
stdenv,
buildNpmPackage,
fetchurl,
buildFHSEnv,
git,
installShellFiles,
testers,
graphite-cli,
}:
buildNpmPackage rec {
pname = "graphite-cli";
version = "1.7.20";
src = fetchurl {
url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz";
hash = "sha256-Xzq6+fsWRPoiPxtk1zNARCkIPBu64ipAKqPVU2dnV9E=";
let
selectSystem =
attrs:
attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
suffix = selectSystem {
x86_64-linux = "linux-x64";
aarch64-linux = "linux-arm64";
x86_64-darwin = "darwin-x64";
aarch64-darwin = "darwin-arm64";
};
npmDepsHash = "sha256-6JzVDgrV5kUKES7/z+0aU+Rs6VabdKhcfru38j3Jmcw=";
postPatch = ''
ln -s ${./package-lock.json} package-lock.json
'';
nativeBuildInputs = [
git
installShellFiles
];
dontNpmBuild = true;
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd gt \
--bash <($out/bin/gt completion) \
--fish <(GT_PAGER= $out/bin/gt fish) \
--zsh <(ZSH_NAME=zsh $out/bin/gt completion)
'';
passthru.updateScript = ./update.sh;
version = "1.8.6";
meta = {
changelog = "https://graphite.dev/docs/cli-changelog";
@ -46,5 +30,96 @@ buildNpmPackage rec {
license = lib.licenses.unfree; # no license specified
mainProgram = "gt";
maintainers = with lib.maintainers; [ joshheinrichs-shopify ];
platforms = [
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
"aarch64-darwin"
];
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
};
}
passthru = {
updateScript = ./update.sh;
tests.version = testers.testVersion {
package = graphite-cli;
command = "gt --version";
};
};
shellCompletions = ''
installShellCompletion --cmd gt \
--bash <($out/bin/gt completion) \
--zsh <(ZSH_NAME=zsh $out/bin/gt completion) \
--fish <($out/bin/gt fish)
'';
unwrapped = stdenv.mkDerivation {
pname = "graphite-cli-unwrapped";
inherit version meta passthru;
strictDeps = true;
src = fetchurl {
url = "https://registry.npmjs.org/@withgraphite/graphite-cli-${suffix}/-/graphite-cli-${suffix}-${version}.tgz";
hash = selectSystem {
x86_64-linux = "sha256-YnG3iw35ZEyGbB9vGdcnj0qkvUfyLuaIEB5l09hkRck=";
aarch64-linux = "sha256-Z4yY26hXf8++TX5tJcqufsAULTn9oUL90d9tDZj5d/k=";
x86_64-darwin = "sha256-oV0tanuk2dzB62uChni9CJtSw3eFECQi3aMBc+ZV7Do=";
aarch64-darwin = "sha256-6eogi8fMOD5IgRyEdPRxdDa17WytB1JwTpKRzyyhQ2Q=";
};
};
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
git
installShellFiles
];
dontConfigure = true;
dontBuild = true;
# On Linux the binary is wrapped with buildFHSEnv; completions are
# generated there. Here we only need to skip fixup to avoid patchelf/strip.
dontFixup = stdenv.hostPlatform.isLinux;
installPhase = ''
runHook preInstall
install -Dm755 bin/gt $out/bin/gt
runHook postInstall
'';
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin shellCompletions;
};
in
# The binary is built with vercel/pkg, which appends a virtual filesystem to
# the executable at fixed byte offsets. patchelf and strip shift those offsets,
# corrupting the embedded data, so the binary must remain completely unmodified.
# On Linux we use buildFHSEnv to provide /lib64/ld-linux-*.so.* and shared
# libraries without touching the binary. On Darwin this isn't needed.
if stdenv.hostPlatform.isLinux then
(buildFHSEnv {
pname = "graphite-cli";
inherit version passthru;
targetPkgs = pkgs: [
unwrapped
pkgs.stdenv.cc.cc.lib
git
];
runScript = "gt";
extraInstallCommands = ''
ln -s $out/bin/graphite-cli $out/bin/gt
source ${installShellFiles}/nix-support/setup-hook
${shellCompletions}
'';
meta = meta // {
platforms = [
"x86_64-linux"
"aarch64-linux"
];
};
}).overrideAttrs
{ strictDeps = true; }
else
unwrapped

View file

@ -1,12 +1,10 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p gnused nix nodejs prefetch-npm-deps wget
#! nix-shell -i bash -p gnused nix nodejs
set -euo pipefail
pushd "$(dirname "${BASH_SOURCE[0]}")"
version=$(npm view @withgraphite/graphite-cli version)
tarball="graphite-cli-$version.tgz"
url="https://registry.npmjs.org/@withgraphite/graphite-cli/-/$tarball"
if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then
echo "Already up to date!"
@ -15,16 +13,22 @@ fi
sed -i 's#version = "[^"]*"#version = "'"$version"'"#' package.nix
sha256=$(nix-prefetch-url "$url")
src_hash=$(nix-hash --to-sri --type sha256 "$sha256")
sed -i 's#hash = "[^"]*"#hash = "'"$src_hash"'"#' package.nix
tmpdir=$(mktemp -d)
trap 'rm -rf "$tmpdir"' EXIT
rm -f package-lock.json package.json *.tgz
wget "$url"
tar xf "$tarball" --strip-components=1 package/package.json
npm i --package-lock-only --ignore-scripts
npm_hash=$(prefetch-npm-deps package-lock.json)
sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' package.nix
rm -f package.json *.tgz
for platform in linux-x64 linux-arm64 darwin-x64 darwin-arm64; do
(
url="https://registry.npmjs.org/@withgraphite/graphite-cli-${platform}/-/graphite-cli-${platform}-${version}.tgz"
sha256=$(nix-prefetch-url "$url")
nix-hash --to-sri --type sha256 "$sha256" > "$tmpdir/$platform"
) &
done
wait
for platform in linux-x64 linux-arm64 darwin-x64 darwin-arm64; do
hash=$(cat "$tmpdir/$platform")
# Each platform hash appears only once in the file
sed -i "/${platform}/s#\"sha256-[^\"]*\"#\"${hash}\"#" package.nix
done
popd

View file

@ -46,7 +46,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
# Note: This is not a long-term solution, setup.py is deprecated.
(fetchpatch {
url = "https://github.com/Guake/guake/commit/14abaa0c69cfab64fe3467fbbea211d830042de8.patch";
hash = "sha256-RjGRFJDTQX2meAaw3UZi/3OxAtIHbRZVpXTbcJk/scY= ";
hash = "sha256-RjGRFJDTQX2meAaw3UZi/3OxAtIHbRZVpXTbcJk/scY=";
revert = true;
})

View file

@ -10,13 +10,13 @@
buildGoModule (finalAttrs: {
pname = "harbor-cli";
version = "0.0.22";
version = "0.0.23";
src = fetchFromGitHub {
owner = "goharbor";
repo = "harbor-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-QgI5ET5mS/vZb6a4kuTZzllUWKjbawgzknWkDgGNEi0=";
hash = "sha256-lh0ZMrjzCiQvpzRddms4uEKlUdxcDdHTfkYdmQ5hc9k=";
};
vendorHash = "sha256-Iy+Kf0Kf1yuFk+shbomT0Z1zMvAbdWT4vLshAjlqvck=";

View file

@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "highlight-pointer";
version = "1.2";
version = "1.3";
src = fetchFromGitHub {
owner = "swillner";
repo = "highlight-pointer";
tag = "v${finalAttrs.version}";
hash = "sha256-Og09/RmLWtzVAMs79Z4eDuXWg4w2kZfXyX8K7CowFaU=";
hash = "sha256-yCm5YpOTPWRYAzX2TRhwUnSc3LbdxjwR5Z0glUm95Cg=";
};
buildInputs = [

View file

@ -6,10 +6,10 @@
}:
let
pname = "hydralauncher";
version = "4.0.2";
version = "4.0.3";
src = fetchurl {
url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage";
hash = "sha256-kb6tIP0xfbF23yg7aa9jmBFiApEPeKks2ZuWuEM4hGQ=";
hash = "sha256-6wWfliSMHq1ncqMpfb/NblXFI7NEuh60GsxmqIW9k14=";
};
appimageContents = appimageTools.extractType2 { inherit pname src version; };

View file

@ -0,0 +1,29 @@
{
lib,
rustPlatform,
fetchFromCodeberg,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "hyper8";
version = "1.0.1";
src = fetchFromCodeberg {
owner = "simonrepp";
repo = "hyper8";
tag = finalAttrs.version;
hash = "sha256-pvtQPL/hPgoKDLYWC/IL04db7Q/FUlgiExthu4xBQEw=";
};
__structuredAttrs = true;
cargoHash = "sha256-AQAWGmzixDFfL7wqJJXCvNSYojVtYHRP0zqdj0C8JRE=";
meta = {
homepage = "https://hyper8.org";
description = "Static site generator for video publishing.";
license = lib.licenses.gpl3;
platforms = lib.platforms.all;
mainProgram = "hyper8";
};
})

View file

@ -20,7 +20,7 @@ buildNpmPackage {
owner = "mafintosh";
repo = "hyperssh";
rev = "v5.0.3";
hash = "sha256-vjPSNcQRsqu0ee0hownEE9y8dFf9dqaL7alGRc9WjcI=2";
hash = "sha256-vjPSNcQRsqu0ee0hownEE9y8dFf9dqaL7alGRc9WjcI=";
};
patches = [

View file

@ -9,16 +9,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "iio-niri";
version = "2.2.0";
version = "2.3.1";
src = fetchFromGitHub {
owner = "Zhaith-Izaliel";
repo = "iio-niri";
tag = "v${finalAttrs.version}";
hash = "sha256-2DWNq6qZmC4hNjgu1W6LBHkcDOSwRT0/8MnbJjyPHQM=";
hash = "sha256-6kIHZuHZYDsjY0q8V99jdDkNHwNtvrq77sxGI5SLzSs=";
};
cargoHash = "sha256-f/pFWlLxQebzawDdHj3UtpT5Kq9a6fm+tAssqg8ibdo=";
cargoHash = "sha256-gXqAUvZ0FjU7SrCmw0CpNtELPwmI0fFpJpe3wrBuqsY=";
nativeBuildInputs = [
pkg-config

View file

@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
pkgsCross,
}:
stdenv.mkDerivation (finalAttrs: {
@ -18,16 +19,23 @@ stdenv.mkDerivation (finalAttrs: {
configureFlags = [ "--enable-fastsampling" ];
makeFlags = [ "AR:=$(AR)" ];
postInstall = ''
mv $out/bin/iperf $out/bin/iperf2
ln -s $out/bin/iperf2 $out/bin/iperf
'';
passthru.tests = {
cross-aarch64 = pkgsCross.aarch64-multiplatform.iperf2;
};
meta = {
homepage = "https://sourceforge.net/projects/iperf/";
description = "Tool to measure IP bandwidth using UDP or TCP";
platforms = lib.platforms.unix;
license = lib.licenses.mit;
mainProgram = "iperf2";
maintainers = with lib.maintainers; [ randomizedcoder ];
# prioritize iperf3

View file

@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
owner = "willuhn";
repo = "jameica";
tag = version;
hash = "sha256-7KpQas8ttL2DP+gFH87uLQyx4PMwVQ+FaqXpZBPWV5U=i";
hash = "sha256-7KpQas8ttL2DP+gFH87uLQyx4PMwVQ+FaqXpZBPWV5U=";
};
nativeBuildInputs = [

View file

@ -12,16 +12,16 @@
let
pname = "Jan";
version = "0.8.2";
version = "0.8.3";
darwin-src = fetchzip {
url = "https://github.com/janhq/jan/releases/download/v${version}/jan-mac-universal-${version}.zip";
hash = "sha256-DUyPMsy9POcxY5OyQu1IBAijTbUZACQB87j0CQDrw8A=";
hash = "sha256-h2v71DzXez/+wlEp8IMVBk33LlXPhNPJ1UPNLYPShoE=";
};
linux-src = fetchurl {
url = "https://github.com/janhq/jan/releases/download/v${version}/jan_${version}_amd64.AppImage";
hash = "sha256-OWg8P4g2g+LVJU+SnjajG2cqWnzl5X2fjqTGkIC3kAY=";
url = "https://github.com/janhq/jan/releases/download/v${version}/Jan_${version}_amd64.AppImage";
hash = "sha256-vEmioWQ4ic/FrtNFMKaLOcEy2BTRdouPc4PYWk90ZBI=";
};
appimageContents = appimageTools.extractType2 {
@ -29,11 +29,14 @@ let
src = linux-src;
};
passthru.updateScript = ./update.sh;
meta = {
changelog = "https://github.com/janhq/jan/releases/tag/v${version}";
description = "Jan is an open source alternative to ChatGPT that runs 100% offline on your computer";
description = "Open source alternative to ChatGPT that runs 100% offline on your computer";
homepage = "https://github.com/janhq/jan";
license = lib.licenses.asl20;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
mainProgram = "Jan";
maintainers = with lib.maintainers; [ dfjay ];
platforms =
@ -56,25 +59,20 @@ let
cudaPackages.cudatoolkit
];
inherit meta;
inherit passthru meta;
};
darwin = stdenv.mkDerivation {
inherit
pname
version
meta
;
inherit pname version;
src = darwin-src;
dontUnpack = true;
sourceRoot = "${pname}.app";
nativeBuildInputs = [
makeWrapper
];
dontUnpack = true;
installPhase = ''
runHook preInstall
@ -87,6 +85,8 @@ let
runHook postInstall
'';
inherit passthru meta;
};
in
if stdenv.hostPlatform.isDarwin then darwin else linux

24
pkgs/by-name/ja/jan/update.sh Executable file
View file

@ -0,0 +1,24 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p bash nixVersions.latest curl coreutils jq common-updater-scripts
set -euo pipefail
latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/janhq/jan/releases/latest | jq -r ".tag_name")
latestVersion="${latestTag#v}"
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; jan.version" | tr -d '"')
echo "latest version: $latestVersion"
echo "current version: $currentVersion"
if [[ "$latestVersion" == "$currentVersion" ]]; then
echo "package is up-to-date"
exit 0
fi
linuxUrl="https://github.com/janhq/jan/releases/download/v$latestVersion/Jan_${latestVersion}_amd64.AppImage"
linuxHash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$(nix-prefetch-url "$linuxUrl")")
update-source-version jan "$latestVersion" "$linuxHash" --system=x86_64-linux --ignore-same-version
darwinUrl="https://github.com/janhq/jan/releases/download/v$latestVersion/jan-mac-universal-${latestVersion}.zip"
darwinHash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$(nix-prefetch-url --unpack "$darwinUrl")")
update-source-version jan "$latestVersion" "$darwinHash" --system=aarch64-darwin --ignore-same-version

View file

@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "jffi";
version = "1.3.13";
version = "1.3.15";
src = fetchFromGitHub {
owner = "jnr";
repo = "jffi";
rev = "jffi-${finalAttrs.version}";
hash = "sha256-aBQkkZyXZkaJc4sr/jHnIRaJYP116u4Jqsr9XXzfOBA=";
hash = "sha256-CW9tB8g/xR01RB1Fl80vWVeXke1eLjHp9mSkMy6O4G4=";
};
nativeBuildInputs = [

View file

@ -5,14 +5,16 @@
installShellFiles,
}:
buildGoModule rec {
buildGoModule (finalAttrs: {
pname = "knock";
version = "0.0.2";
__structuredAttrs = true;
src = fetchFromCodeberg {
owner = "nat-418";
repo = "knock";
rev = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-K+L4F4bTERQSqISAmfyps/U5GJ2N0FdJ3RmpiUmt4uA=";
};
@ -36,4 +38,4 @@ buildGoModule rec {
changelog = "https://codeberg.org/nat-418/knock/raw/branch/trunk/CHANGELOG.md";
maintainers = with lib.maintainers; [ nat-418 ];
};
}
})

View file

@ -13,13 +13,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "krunkit";
version = "1.2.1";
version = "1.2.2";
src = fetchFromGitHub {
owner = "containers";
owner = "libkrun";
repo = "krunkit";
tag = "v${finalAttrs.version}";
hash = "sha256-T3PbSDaMqR/DLaTe1/tyMx/KseU5ENFzz1Gxd5/hRao=";
hash = "sha256-43XqNofzKi310nhxTNo/Gj5didVa/u/gV05hglecLtk=";
};
cargoDeps = rustPlatform.fetchCargoVendor {

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