Merge master into staging-next
This commit is contained in:
@@ -24,6 +24,11 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [
|
||||
pkgs.cosmic-comp
|
||||
cfg.package
|
||||
];
|
||||
|
||||
services.greetd = {
|
||||
enable = true;
|
||||
settings = {
|
||||
@@ -50,14 +55,22 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
systemd.tmpfiles.settings.cosmic-greeter."/run/cosmic-greeter".d = {
|
||||
group = "cosmic-greeter";
|
||||
mode = "0755";
|
||||
user = "cosmic-greeter";
|
||||
};
|
||||
|
||||
# The greeter user is hardcoded in `cosmic-greeter`
|
||||
users.groups.cosmic-greeter = { };
|
||||
users.users.cosmic-greeter = {
|
||||
description = "COSMIC login greeter user";
|
||||
isSystemUser = true;
|
||||
home = "/var/lib/cosmic-greeter";
|
||||
homeMode = "0750";
|
||||
createHome = true;
|
||||
group = "cosmic-greeter";
|
||||
extraGroups = [ "video" ];
|
||||
};
|
||||
# Required for authentication
|
||||
security.pam.services.cosmic-greeter = { };
|
||||
|
||||
@@ -187,7 +187,7 @@ in
|
||||
|
||||
settings = mkOption {
|
||||
type = types.submodule {
|
||||
freeformType = types.attrsOf (
|
||||
freeformType = types.lazyAttrsOf (
|
||||
types.nullOr (
|
||||
types.oneOf [
|
||||
types.str
|
||||
|
||||
@@ -79,7 +79,7 @@
|
||||
withGTK3 ? withPgtk && !noGui,
|
||||
withGlibNetworking ? withPgtk || withGTK3 || (withX && withXwidgets),
|
||||
withGpm ? stdenv.hostPlatform.isLinux,
|
||||
# https://github.com/emacs-mirror/emacs/blob/master/etc/NEWS.27#L140-L142
|
||||
# https://github.com/emacs-mirror/emacs/blob/emacs-27.2/etc/NEWS#L118-L120
|
||||
withImageMagick ? false,
|
||||
# Emacs 30+ has native JSON support
|
||||
withJansson ? lib.versionOlder version "30",
|
||||
|
||||
@@ -3758,6 +3758,8 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
prince781.vala = callPackage ./prince781.vala { };
|
||||
|
||||
prisma.prisma = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "prisma";
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
{
|
||||
lib,
|
||||
vala-language-server,
|
||||
vscode-utils,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vala";
|
||||
publisher = "prince781";
|
||||
version = "1.1.0";
|
||||
hash = "sha256-LJJDKhwzbGznyiXeB8SYir3LOM7/quYhGae1m4X/s3M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
vala-language-server
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/prince781.vala/changelog";
|
||||
description = "Syntax highlighting and language support for the Vala / Genie languages";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=prince781.vala";
|
||||
homepage = "https://github.com/vala-lang/vala-vscode#readme";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
@@ -73,6 +73,9 @@ python3.pkgs.buildPythonApplication rec {
|
||||
lib.optionals enableQt [
|
||||
pyqt6
|
||||
];
|
||||
disabledTestPaths = lib.optionals (!enableQt) [
|
||||
"tests/test_qml_types.py"
|
||||
];
|
||||
|
||||
postPatch =
|
||||
if enableQt then
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"chromium": {
|
||||
"version": "141.0.7390.65",
|
||||
"version": "141.0.7390.76",
|
||||
"chromedriver": {
|
||||
"version": "141.0.7390.66",
|
||||
"hash_darwin": "sha256-0LLARLPwlZ3KB5xCq4Yx5S6vtnhVddJ62IdgEy0vp7o=",
|
||||
"hash_darwin_aarch64": "sha256-rLW5FOMNyFEn1Du2VN2sGfWri2erjN7SENa01vA2Vp8="
|
||||
"version": "141.0.7390.77",
|
||||
"hash_darwin": "sha256-lLzkO+PkVPZsnD00Ag/NSmpe7DbYPxHEQgsgqpvFijs=",
|
||||
"hash_darwin_aarch64": "sha256-py6zFm8HhmijU6Z3SP8FO6w/DIIMVyP51jOPpqme0YE="
|
||||
},
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
@@ -21,8 +21,8 @@
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "b2ec783d2b51a396804a4e3e33f6586be09a4e2d",
|
||||
"hash": "sha256-9jZ7411NThelyL0R5yoLXB0lOkydOI3v6K5ORhjqfF4=",
|
||||
"rev": "d6fcfbb51aac4df61d06692d4a62fd8b9aaf3c3a",
|
||||
"hash": "sha256-PefndHEz3LALHSCsw6tuNiobQVzsTrseUmf4lqnpNpM=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
|
||||
Generated
-15
@@ -289,11 +289,6 @@
|
||||
"version": "16.9.0",
|
||||
"hash": "sha256-/LclaFA/8uKIWg0Diw2kD/k0o5y2tKFA/HzzrAFQ+b4="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Build.Tasks.Git",
|
||||
"version": "1.1.1",
|
||||
"hash": "sha256-PHxHmsCty8Si5dCUQSizeHkJrHa9+j2nRsg6Sz+5Za0="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Build.Traversal",
|
||||
"version": "4.1.0",
|
||||
@@ -785,16 +780,6 @@
|
||||
"version": "3.3.18",
|
||||
"hash": "sha256-zisaNDp0uHprZmhTokn/Gsr0bBzkiC3gcEls0jGJ0ho="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.SourceLink.Common",
|
||||
"version": "1.1.1",
|
||||
"hash": "sha256-b4FaNFneDVDbvJVX1iNyhhLTrnxUfnmyypeJr47GbXY="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.SourceLink.GitHub",
|
||||
"version": "1.1.1",
|
||||
"hash": "sha256-3hc9ym5ReONp00ruCKio/Ka1gYXo/jDlUHtfK1wZPiU="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.TestPlatform.ObjectModel",
|
||||
"version": "17.10.0",
|
||||
|
||||
@@ -9,6 +9,6 @@
|
||||
}
|
||||
{
|
||||
path = "src/Browser/Avalonia.Browser/webapp";
|
||||
hash = "sha256-aHF2enlIpeBi3a7rN0nBI24eztxC4nZC+g+4sRc12b4=";
|
||||
hash = "sha256-ublhqSpTJUgb6XKdHBnjPpgw7GXs57jlWSJNgqbdR78=";
|
||||
}
|
||||
]
|
||||
|
||||
@@ -46,14 +46,14 @@ stdenvNoCC.mkDerivation (
|
||||
}
|
||||
rec {
|
||||
pname = "Avalonia";
|
||||
version = "11.3.6";
|
||||
version = "11.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AvaloniaUI";
|
||||
repo = "Avalonia";
|
||||
tag = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-ulGaYlhWxSWKLMh6Hy6gzFuDl4rmF3NDlcAL12YYtAg=";
|
||||
hash = "sha256-ZzMb8GGdEQsn4me3AewRJsBxGJ6M/dZ+mlQOYY3xaKs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
llvmPackages,
|
||||
llvmPackages_19,
|
||||
rapidjson,
|
||||
runtimeShell,
|
||||
}:
|
||||
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
llvmPackages.llvm.dev
|
||||
llvmPackages_19.llvm.dev
|
||||
];
|
||||
buildInputs = with llvmPackages; [
|
||||
buildInputs = with llvmPackages_19; [
|
||||
libclang
|
||||
llvm
|
||||
rapidjson
|
||||
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
cmakeFlagsArray+=(-DCMAKE_CXX_FLAGS="-fvisibility=hidden -fno-rtti")
|
||||
'';
|
||||
|
||||
clang = llvmPackages.clang;
|
||||
clang = llvmPackages_19.clang;
|
||||
shell = runtimeShell;
|
||||
|
||||
postFixup = ''
|
||||
|
||||
@@ -53,6 +53,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_EXAMPLES" withExamples)
|
||||
(lib.cmakeBool "BUILD_TOOLS" withTools)
|
||||
]
|
||||
++ lib.optionals (!finalAttrs.finalPackage.doCheck) [
|
||||
# special-cased to avoid a mass-rebuild: remove from `lib.optionals` as part of next update
|
||||
(lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
xkeyboard_config,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
orca,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
@@ -47,6 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
libinput
|
||||
linux-pam
|
||||
udev
|
||||
orca
|
||||
];
|
||||
|
||||
dontUseJustBuild = true;
|
||||
@@ -63,10 +65,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/greeter.rs --replace-fail '/usr/bin/env' '${lib.getExe' coreutils "env"}'
|
||||
substituteInPlace src/greeter.rs --replace-fail '/usr/bin/orca' '${lib.getExe orca}'
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
libcosmicAppWrapperArgs+=(
|
||||
--prefix PATH : ${lib.makeBinPath [ cosmic-randr ]}
|
||||
--set-default X11_BASE_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/base.xml
|
||||
--set-default X11_BASE_EXTRA_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/extra.xml
|
||||
)
|
||||
|
||||
@@ -12,20 +12,20 @@
|
||||
}:
|
||||
let
|
||||
pname = "dependabot-cli";
|
||||
version = "1.74.0";
|
||||
version = "1.76.0";
|
||||
|
||||
# `tag` is what `dependabot` uses to find the relevant docker images.
|
||||
tag = "nixpkgs-dependabot-cli-${version}";
|
||||
|
||||
# Get these hashes from
|
||||
# nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag}
|
||||
updateJobProxy.imageDigest = "sha256:05539969894efd6f5d04c9c633f330cc61a3024106b19361d6684850258e4f0f";
|
||||
updateJobProxy.hash = "sha256-qhHkL1HmCz0o3JIBAevWnTkidtoH92wE2GyzYTFhVyY=";
|
||||
updateJobProxy.imageDigest = "sha256:42b2a171891f4667d9a443cbfdc5f10a58e5b5d7f1b9eae6c12ec9815bec72fd";
|
||||
updateJobProxy.hash = "sha256-+GcGyip8cgVBZeji6Zn3oN8Mc3xZvASohbPVNUbHOgA=";
|
||||
|
||||
# Get these hashes from
|
||||
# nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag}
|
||||
updaterGitHubActions.imageDigest = "sha256:7424e2a837d3bee8c49ddabf8d0152e9d5e87eac6cf67edb684f5e9f7895cff3";
|
||||
updaterGitHubActions.hash = "sha256-75qJjwYEkpKP1Gs87odBsiLXTZhQ0KvaOpBB+YFZkJY=";
|
||||
updaterGitHubActions.imageDigest = "sha256:d26d4ce071684b63d935c550552ae0d129f845254cb1e2f8635f15c62f43319e";
|
||||
updaterGitHubActions.hash = "sha256-21E8q1+cwYlD8FL5njGhpsGRd/YkGQNS/y0howQFp6g=";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
@@ -34,10 +34,10 @@ buildGoModule {
|
||||
owner = "dependabot";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-h1qnyH9M37kWFeET31KFKNn+RnnE7FRcaKADDDtxSdw=";
|
||||
hash = "sha256-fSb2zzddwGJ1r9NhPEhE1WCndyoBK4VLOP3CmQUcjy0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Tq+mHd/5LkBkqEXvZ98SRTdA6IsCdUPril+AmPQZfdI=";
|
||||
vendorHash = "sha256-xdouoPEPPhHcXNWxMdcdxVQsgRlFXBXjyZQ7CcROA4U=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
+4
-4
@@ -505,10 +505,10 @@
|
||||
"module": "sha256-2jn02k/u133+ELmAnVyysvO0Ra6nG2nhUjKkJpiThzs=",
|
||||
"pom": "sha256-chJrr7gKEse1WFJNCRkj5pYSODxHQay34Aw1ybBUazQ="
|
||||
},
|
||||
"io/sentry#sentry/8.20.0": {
|
||||
"jar": "sha256-G5KZBtERVbA9gwY1XrEGlWL2elwljF0R0h0vnT1GMbQ=",
|
||||
"module": "sha256-b0XfKu8KxMoppcQye5sR6eCsVc1Neh3t52K5PtrLFe4=",
|
||||
"pom": "sha256-Qtrqy+K+8NqVqkWbSLhZ+7nYfbYMswEgWCmRP4VJwkA="
|
||||
"io/sentry#sentry/8.22.0": {
|
||||
"jar": "sha256-7QJzzosBRsvyeZkmkyqLWXiAlUkABQcC646p8eM6GOE=",
|
||||
"module": "sha256-5ZOJtyrsJgmO9B7sNS7xLKh945o/o3sWdyKisjW5Zr8=",
|
||||
"pom": "sha256-9wniVOh/5PhDESS1X9IEwhgiBqrl5PVCFINpVIr9HBE="
|
||||
},
|
||||
"jakarta/json/bind#jakarta.json.bind-api/2.0.0": {
|
||||
"jar": "sha256-peYGtYiLQStIkHrWiLNN/k4wroGJxvJ8wEkbjzwDYoc=",
|
||||
|
||||
@@ -21,13 +21,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ed-odyssey-materials-helper";
|
||||
version = "3.0.6";
|
||||
version = "3.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jixxed";
|
||||
repo = "ed-odyssey-materials-helper";
|
||||
tag = version;
|
||||
hash = "sha256-4VxaQF1kmBo/9M0psr7jvshy1XhS02zUSMSuWvyEcoo=";
|
||||
hash = "sha256-TcRj+TZ4shY1UAE7TseRXZZJZtL8aaD79pBL9LeoMJA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,94 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
dpkg,
|
||||
autoPatchelfHook,
|
||||
makeDesktopItem,
|
||||
makeWrapper,
|
||||
copyDesktopItems,
|
||||
alsa-lib,
|
||||
at-spi2-core,
|
||||
gtk3,
|
||||
libGL,
|
||||
libappindicator,
|
||||
libdrm,
|
||||
libgbm,
|
||||
libnotify,
|
||||
libxcb,
|
||||
nss,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "foxglove-studio";
|
||||
version = "2.37.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://get.foxglove.dev/desktop/v${finalAttrs.version}/foxglove-studio-${finalAttrs.version}-linux-amd64.deb";
|
||||
hash = "sha256-XY+RclsP8uQS5aKe1FopdItAjbQ9uWQ8uVD9pb9n42U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
copyDesktopItems
|
||||
dpkg
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
at-spi2-core
|
||||
gtk3
|
||||
libGL
|
||||
libappindicator
|
||||
libdrm
|
||||
libgbm
|
||||
libnotify
|
||||
libxcb
|
||||
nss
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/{bin,opt,share}
|
||||
|
||||
cp -r opt/Foxglove $out/opt/
|
||||
cp -r usr/share/icons $out/share/
|
||||
cp -r usr/share/mime $out/share/
|
||||
|
||||
ln -s "$out/opt/Foxglove/foxglove-studio" $out/bin/foxglove-studio
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = ''patchelf --add-needed libGL.so.1 --add-needed libEGL.so.1 $out/opt/Foxglove/foxglove-studio'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "foxglove-studio";
|
||||
desktopName = "Foxglove Studio";
|
||||
comment = "Integrated robotics visualization and debugging";
|
||||
exec = "foxglove-studio %U";
|
||||
icon = "foxglove-studio";
|
||||
categories = [ "Development" ];
|
||||
mimeTypes = [
|
||||
"application/octet-stream"
|
||||
"application/zip"
|
||||
"x-scheme-handler/foxglove"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://docs.foxglove.dev/changelog/foxglove/v${finalAttrs.version}";
|
||||
description = "Visualization and observability platform for robotics";
|
||||
downloadPage = "https://foxglove.dev/download";
|
||||
homepage = "https://foxglove.dev/";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ sascha8a ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
hydraPlatforms = [ ];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
})
|
||||
Executable
+17
@@ -0,0 +1,17 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl common-updater-scripts
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
changelog_url="https://docs.foxglove.dev/changelog/tags/foxglove"
|
||||
|
||||
# Extract the latest version from the changelog page
|
||||
version=$(
|
||||
curl -s "$changelog_url" \
|
||||
| grep 'Downloads: ' \
|
||||
| grep '<a href="https://get.foxglove.dev/desktop/v' \
|
||||
| grep -oP '[0-9]+\.[0-9]+\.[0-9]+' \
|
||||
| head -1
|
||||
)
|
||||
|
||||
update-source-version foxglove-studio "$version"
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "gemini-cli";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google-gemini";
|
||||
repo = "gemini-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-NuOlBFN1IVwXAfGQt6sIV0plOuVHS1hHKTFYMA5L1Ps=";
|
||||
hash = "sha256-M9sR8c6d5JrFnZ50Q7PgOJ5b6NCKqAOW8tZWG1jpKLc=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-k9xMjKaimgt6sw5nq0xFUBIStuKkXpGRTj4rfdRQAGw=";
|
||||
npmDepsHash = "sha256-S3vXyjQ3AkmItNXAEBJTHyEGUfdh+jxjHOcs7o7DUqc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
version = "3.5.5";
|
||||
version = "3.5.6";
|
||||
pname = "grafana-loki";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "loki";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nNmY3LrRhrTGQBtnjQ2V252cAvJp2F6D2XHCkcvFfn8=";
|
||||
hash = "sha256-Nm3DQ8LvKTFmK2Wi3rvDM+kJBq++Rm4zrajlp01SdIg=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -33,13 +33,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kew";
|
||||
version = "3.4.1";
|
||||
version = "3.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ravachol";
|
||||
repo = "kew";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WJxSE3b/VYqDtmRkQhUfGaY7A9zQxUIgy4PswpVzDmU=";
|
||||
hash = "sha256-vcH3TdZqEtkP7iN+KhlarGAORdHk16DgNI1mXlrizow=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,7 +1,16 @@
|
||||
diff --git a/greeter/CMakeLists.txt b/greeter/CMakeLists.txt
|
||||
index 57aebb0..ab50bff 100644
|
||||
index 57aebb0..11c4ca7 100644
|
||||
--- a/greeter/CMakeLists.txt
|
||||
+++ b/greeter/CMakeLists.txt
|
||||
@@ -1,6 +1,6 @@
|
||||
project (greeter)
|
||||
-cmake_minimum_required (VERSION 2.8)
|
||||
-cmake_policy (VERSION 2.8)
|
||||
+cmake_minimum_required (VERSION 3.10)
|
||||
+cmake_policy (VERSION 3.10)
|
||||
|
||||
enable_testing ()
|
||||
|
||||
@@ -9,7 +9,6 @@ list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
|
||||
set (CONF_DIR "/etc/lightdm")
|
||||
set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "lintspec";
|
||||
version = "0.9.1";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "beeb";
|
||||
repo = "lintspec";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-NYa90VQiiT3XU0w3DciPOBpEM59XyZHk+ixtj8oTgO8=";
|
||||
hash = "sha256-FCcAyOPym6e9L1yMNqdpw4m8JEeXJZhN2yJi86j/WC0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-RjAZIARClm7oHnKSOObOzAHJqOrR+eyHCmtBq4RaWi0=";
|
||||
cargoHash = "sha256-RVKoy400ZPBC18gq87DntQw73AkIqSwpMqR0dtKA0wY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
|
||||
@@ -22,13 +22,13 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "linux-firmware";
|
||||
version = "20250917";
|
||||
version = "20251011";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "kernel-firmware";
|
||||
repo = "linux-firmware";
|
||||
tag = version;
|
||||
hash = "sha256-tecFB6WYEfBK9FB7Rv8nHLdefIoaFnHrpzXBl+iSd08=";
|
||||
hash = "sha256-LFVrrVCqJORiHVnhIY0l7B4pRHI2MS0o/GbgOUDqO8s=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
||||
@@ -76,15 +76,23 @@ let
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
HOME=`pwd` ./app/build.sh
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
cp -R app/{pkg,static} $out/
|
||||
cp app/index_local.html $out/index.html
|
||||
cp -R ${staticAssets finalAttrs.src}/* $out/static
|
||||
rm $out/static/libraries.txt $out/static/fonts/fonts.txt
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
@@ -93,6 +101,7 @@ let
|
||||
|
||||
in
|
||||
rustPlatform.buildRustPackage (
|
||||
finalAttrs:
|
||||
commonDerivationAttrs
|
||||
// {
|
||||
cargoBuildFlags = [
|
||||
@@ -107,7 +116,7 @@ rustPlatform.buildRustPackage (
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/lldap \
|
||||
--set LLDAP_ASSETS_PATH ${frontend}
|
||||
--set LLDAP_ASSETS_PATH ${finalAttrs.finalPackage.frontend}
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
@@ -130,4 +139,5 @@ rustPlatform.buildRustPackage (
|
||||
mainProgram = "lldap";
|
||||
};
|
||||
}
|
||||
|
||||
)
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "lxgw-wenkai";
|
||||
version = "1.520";
|
||||
version = "1.521";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/${pname}-v${version}.tar.gz";
|
||||
hash = "sha256-8Gm8zFQ5IYauSPZ27Mc5ZLcfKO90C251IxqQlG/jlrE=";
|
||||
hash = "sha256-4GWCSMl+gdxnEPa8JPz7c+bWmxP7HaZHj+D0yUDqgVc=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mitra";
|
||||
version = "4.10.1";
|
||||
version = "4.11.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "silverpill";
|
||||
repo = "mitra";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JGiPCvfWsluWeJk14cbAVUJO69OKXG/+93FrGMRlCxU=";
|
||||
hash = "sha256-2MBcTuz46DDIHzH6Geuw+jdARHm/mxDFTPcqVEeSwWA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DmQo/DDD5b1bpBiB5JfpIDD9cQ+ColorY4kTW1Xh9lo=";
|
||||
cargoHash = "sha256-ujZsrqfZ8wpWlBCJK3+vWKe1J3QnvlyBjtU78bIqcKo=";
|
||||
|
||||
# require running database
|
||||
doCheck = false;
|
||||
|
||||
@@ -9,20 +9,21 @@
|
||||
nix-update-script,
|
||||
installShellFiles,
|
||||
buildPackages,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "moon";
|
||||
version = "1.38.5";
|
||||
version = "1.41.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moonrepo";
|
||||
repo = "moon";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jWLyg7K+ucCsrHwFNrpmWAXznSD+3TaYGfbZ2hWlnP0=";
|
||||
hash = "sha256-pBuCKwBLIDv+UANyKGKbPC9am8YYgTKLF0fY2WLpOVg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2E59P0d3SDZUgbN5V52Rr9liONiKcFUFv3dSrtFJ8NE=";
|
||||
cargoHash = "sha256-2Kv12YpYLNPHp2sK4NV3N+w3yQUL+WoYPrmkrYyyp+8=";
|
||||
|
||||
env = {
|
||||
RUSTFLAGS = "-C strip=symbols";
|
||||
@@ -33,6 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
installShellFiles
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
|
||||
|
||||
@@ -1,45 +1,67 @@
|
||||
diff --git a/nautilus_open_any_terminal/nautilus_open_any_terminal.py b/nautilus_open_any_terminal/nautilus_open_any_terminal.py
|
||||
index 05b6514..b5541dc 100644
|
||||
--- a/nautilus_open_any_terminal/nautilus_open_any_terminal.py
|
||||
+++ b/nautilus_open_any_terminal/nautilus_open_any_terminal.py
|
||||
@@ -413,9 +413,10 @@ if API_VERSION in ("3.0", "2.0"):
|
||||
"""Provide keyboard shortcuts for opening terminals in Nautilus."""
|
||||
|
||||
def __init__(self):
|
||||
diff --git i/nautilus_open_any_terminal/nautilus_open_any_terminal.py w/nautilus_open_any_terminal/nautilus_open_any_terminal.py
|
||||
index 559c923..45585d6 100644
|
||||
--- i/nautilus_open_any_terminal/nautilus_open_any_terminal.py
|
||||
+++ w/nautilus_open_any_terminal/nautilus_open_any_terminal.py
|
||||
@@ -434,9 +434,12 @@ if API_VERSION == "4.0":
|
||||
super().__init__()
|
||||
self.previous_cwd = expanduser("~")
|
||||
|
||||
- gsettings_source = Gio.SettingsSchemaSource.get_default()
|
||||
- if gsettings_source.lookup(GSETTINGS_PATH, True):
|
||||
- self._gsettings = Gio.Settings.new(GSETTINGS_PATH)
|
||||
+ gsettings_source = Gio.SettingsSchemaSource.new_from_directory("@gsettings_path@", Gio.SettingsSchemaSource.get_default(), True)
|
||||
+ gsettings_source = Gio.SettingsSchemaSource.new_from_directory(
|
||||
+ "@gsettings_path@", Gio.SettingsSchemaSource.get_default(), True
|
||||
+ )
|
||||
+ if True:
|
||||
+ _schema = gsettings_source.lookup(GSETTINGS_PATH, False)
|
||||
+ self._gsettings = Gio.Settings.new_full(_schema, None, None);
|
||||
+ self._gsettings = Gio.Settings.new_full(_schema, None, None)
|
||||
self._setup_keybindings()
|
||||
|
||||
def get_background_items(self, current_folder: FileManager.FileInfo):
|
||||
@@ -500,10 +503,12 @@ elif API_VERSION in ("3.0", "2.0"):
|
||||
"""Provide keyboard shortcuts for opening terminals in Nautilus/Caja."""
|
||||
|
||||
def __init__(self):
|
||||
- super().__init__()
|
||||
- gsettings_source = Gio.SettingsSchemaSource.get_default()
|
||||
- if gsettings_source.lookup(GSETTINGS_PATH, True):
|
||||
- self._gsettings = Gio.Settings.new(GSETTINGS_PATH)
|
||||
+ gsettings_source = Gio.SettingsSchemaSource.new_from_directory(
|
||||
+ "@gsettings_path@", Gio.SettingsSchemaSource.get_default(), True
|
||||
+ )
|
||||
+ if True:
|
||||
+ _schema = gsettings_source.lookup(GSETTINGS_PATH, False)
|
||||
+ self._gsettings = Gio.Settings.new_full(_schema, None, None)
|
||||
self._gsettings.connect("changed", self._bind_shortcut)
|
||||
self._create_accel_group()
|
||||
self._window = None
|
||||
@@ -452,9 +453,10 @@ class OpenAnyTerminalExtension(GObject.GObject, FileManager.MenuProvider):
|
||||
@@ -540,10 +545,12 @@ class OpenAnyTerminalExtension(GObject.GObject, FileManager.MenuProvider):
|
||||
"""Provide context menu items for opening terminals in Nautilus."""
|
||||
|
||||
|
||||
def __init__(self):
|
||||
- super().__init__()
|
||||
- gsettings_source = Gio.SettingsSchemaSource.get_default()
|
||||
- if gsettings_source.lookup(GSETTINGS_PATH, True):
|
||||
- self._gsettings = Gio.Settings.new(GSETTINGS_PATH)
|
||||
+ gsettings_source = Gio.SettingsSchemaSource.new_from_directory("@gsettings_path@", Gio.SettingsSchemaSource.get_default(), True)
|
||||
+ gsettings_source = Gio.SettingsSchemaSource.new_from_directory(
|
||||
+ "@gsettings_path@", Gio.SettingsSchemaSource.get_default(), True
|
||||
+ )
|
||||
+ if True:
|
||||
+ _schema = gsettings_source.lookup(GSETTINGS_PATH, False)
|
||||
+ self._gsettings = Gio.Settings.new_full(_schema, None, None);
|
||||
|
||||
+ self._gsettings = Gio.Settings.new_full(_schema, None, None)
|
||||
|
||||
def _get_terminal_name(self):
|
||||
if self._gsettings.get_boolean(GSETTINGS_USE_GENERIC_TERMINAL_NAME):
|
||||
@@ -512,8 +514,9 @@ class OpenAnyTerminalExtension(GObject.GObject, FileManager.MenuProvider):
|
||||
@@ -603,8 +610,9 @@ class OpenAnyTerminalExtension(GObject.GObject, FileManager.MenuProvider):
|
||||
)
|
||||
|
||||
|
||||
|
||||
|
||||
-source = Gio.SettingsSchemaSource.get_default()
|
||||
-if source is not None and source.lookup(GSETTINGS_PATH, True):
|
||||
- _gsettings = Gio.Settings.new(GSETTINGS_PATH)
|
||||
+source = Gio.SettingsSchemaSource.new_from_directory("@gsettings_path@", Gio.SettingsSchemaSource.get_default(), True)
|
||||
+if True:
|
||||
+ _schema = source.lookup(GSETTINGS_PATH, False)
|
||||
+ _gsettings = Gio.Settings.new_full(_schema, None, None);
|
||||
+ _gsettings = Gio.Settings.new_full(_schema, None, None)
|
||||
_gsettings.connect("changed", set_terminal_args)
|
||||
set_terminal_args()
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
pname = "nautilus-open-any-terminal";
|
||||
version = "0.6.3";
|
||||
version = "0.7.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Stunkymonkey";
|
||||
repo = "nautilus-open-any-terminal";
|
||||
tag = version;
|
||||
hash = "sha256-wL2PyEbJ94O9PY8jDBLXk0QvNpuO7Pg8yyblFBwSENA=";
|
||||
hash = "sha256-+qBgTjVJ6gMFtkbqaF9bDYgoJYpM570Vpg+DLRBaFX0=";
|
||||
};
|
||||
|
||||
patches = [ ./hardcode-gsettings.patch ];
|
||||
|
||||
@@ -17,21 +17,24 @@
|
||||
stdenv,
|
||||
gtk3,
|
||||
perl,
|
||||
shaderc,
|
||||
wrapGAppsHook3,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "oculante";
|
||||
version = "0.9.2";
|
||||
version = "0.9.2.1-unstable-2025-10-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "woelper";
|
||||
repo = "oculante";
|
||||
rev = version;
|
||||
hash = "sha256-3kDrsD24/TNcA7NkwwCHN4ez1bC5MP7g28H3jaO/M7E=";
|
||||
rev = "51b9f70b35e09850baee85971720b8d3ac49c80b";
|
||||
hash = "sha256-YTrUucO1Fq2TgnV/HHkx2fcHvBupeoMpiBSwqIvyHaQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-lksAPT1nuwN5bh3x7+EN4B8ksGtvemt4tbm6/3gqdgE=";
|
||||
cargoHash = "sha256-Bn2HxmFiqOeb3oUnUL/K0SahcFWRlY9RrbGU4orQz+Y=";
|
||||
|
||||
SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@@ -44,6 +47,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = [
|
||||
openssl
|
||||
fontconfig
|
||||
shaderc
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libGL
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 951b2b1..006b36b 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.8)
|
||||
+cmake_minimum_required(VERSION 3.10)
|
||||
project(OIS)
|
||||
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CmakeModules)
|
||||
@@ -218,7 +218,6 @@ endif()
|
||||
if(UNIX)
|
||||
|
||||
if (NOT APPLE)
|
||||
- add_dependencies(OIS X11)
|
||||
target_link_libraries(OIS X11)
|
||||
endif()
|
||||
|
||||
@@ -25,6 +25,12 @@ stdenv.mkDerivation rec {
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# CMake 4 dropped support of versions lower than 3.5,
|
||||
# versions lower than 3.10 are deprecated.
|
||||
./cmake4.patch
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Object-oriented C++ input system";
|
||||
maintainers = [ maintainers.raskin ];
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openseachest";
|
||||
version = "25.05.2";
|
||||
version = "25.05.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Seagate";
|
||||
repo = "openSeaChest";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-sZ668I38TClzTmzmRM0yQ/WG7o5AEIXFouWxmqVWyMs=";
|
||||
hash = "sha256-huhdRF2K1AEDRX6Jyz8a/OpUEKFmH+FLNr5KHM/4Sk4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pocketbase";
|
||||
version = "0.30.0";
|
||||
version = "0.30.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pocketbase";
|
||||
repo = "pocketbase";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5Qlq7ImVe+YJ4EYNpaWW8CNU9XvwupngdwqiSjNXNT0=";
|
||||
hash = "sha256-zkDXb5KY9/wdzsBris255uH8e/fq3mn4s3rcft4umuE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tS48r/4dn5tJEOtEdVDdIJHIFQHKCbLx31F542rutbM=";
|
||||
vendorHash = "sha256-ft+hs1VfCZrWceVDqO7ThRE1tiyozMFsYMclsKKdEBo=";
|
||||
|
||||
# This is the released subpackage from upstream repo
|
||||
subPackages = [ "examples/base" ];
|
||||
|
||||
@@ -25,7 +25,7 @@ buildGoModule rec {
|
||||
|
||||
checkFlags = [
|
||||
# Requires network access or fluky
|
||||
"-skip=^Test(_MainWithPlugin|_MainWithSSL|_Main|Http_health|Http_matchHandler|Http_withBasicAuth|File_Events|File_Events_BusyListener)$"
|
||||
"-skip=^Test(_MainWithPlugin|_MainWithSSL|_Main|Http_DoWithRedirects|Http_health|Http_matchHandler|Http_withBasicAuth|File_Events|File_Events_BusyListener|Service_ScheduleHealthCheck)$"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "rospo";
|
||||
version = "0.15.0";
|
||||
version = "0.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ferama";
|
||||
repo = "rospo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xfCjRAsKJxtYeY2Mx+l1tDtqAF0SKjTCJCh1gCG+Rl8=";
|
||||
hash = "sha256-UPOWpI1MohJbuAETvbWW1BZv/P4DY/QknSEY4LFa5Qo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6hCaguJP7XXdxYYS2KuBegwPaKP8rD9YI5727HZo7uA=";
|
||||
vendorHash = "sha256-KQYSsTiiFm3BwwjiUEL388FS/hnXRUCfRpnfBIUHTYM=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
let
|
||||
pname = "simplex-chat-desktop";
|
||||
version = "6.4.5";
|
||||
version = "6.4.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage";
|
||||
hash = "sha256-oaLdBJrywznVX6tUBpuZPgV8r4lAb9xRNE3JS2MTMxM=";
|
||||
hash = "sha256-Z36jWYiWP5PdiDHazXnZw9PbFC7sB2DV9c29YEjNDEc=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
||||
@@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sirikali";
|
||||
version = "1.8.3";
|
||||
version = "1.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mhogomchungu";
|
||||
repo = "sirikali";
|
||||
rev = version;
|
||||
hash = "sha256-phZvytma4PsH4RZxWDORyall2qjS9rdLzUQId5IU6qY=";
|
||||
hash = "sha256-vrhHpQzTwiU0NGcXRBt9mtr5qbwL3LEtZYoYc+IkJHw=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
let
|
||||
pname = "trilium-desktop";
|
||||
version = "0.99.0";
|
||||
version = "0.99.1";
|
||||
|
||||
triliumSource = os: arch: hash: {
|
||||
url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-${os}-${arch}.zip";
|
||||
@@ -26,10 +26,10 @@ let
|
||||
darwinSource = triliumSource "macos";
|
||||
|
||||
# exposed like this for update.sh
|
||||
x86_64-linux.hash = "sha256-ywZBKjUf0h7D3uRf3POJnaC9DtSJ3b8ucdxarHOzIg8=";
|
||||
aarch64-linux.hash = "sha256-/fXACEZqz0Z8XPPwhQgaUN/23sbBcXmGFA9R1+/Md3E=";
|
||||
x86_64-darwin.hash = "sha256-39Hwwg9l/HNfCAMwPYp/i/i6LbEoByKb5C+51jifz8U=";
|
||||
aarch64-darwin.hash = "sha256-J+1NDd1ZL6/w2ObDDLcIp/MDX6lVAHxJOaOC3BIOoqM=";
|
||||
x86_64-linux.hash = "sha256-cn1Y6wMYoVCuNNdAxesNKcZiRo2uKGV8nL6yK1KtNP8=";
|
||||
aarch64-linux.hash = "sha256-KhSSrdITpbGiIAEkdNfRAoIlhC2uUV6+8ZUaEYW7dyA=";
|
||||
x86_64-darwin.hash = "sha256-jKAZnCtNEEnvJ6p6lziOG7+uAyMuEel4dAKRXvMHo8c=";
|
||||
aarch64-darwin.hash = "sha256-1p0rUoZPunP3fRgn/EO3obdGp6l5BbsfZyKMlsgrl80=";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = linuxSource "x64" x86_64-linux.hash;
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.99.0";
|
||||
version = "0.99.1";
|
||||
|
||||
serverSource_x64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz";
|
||||
serverSource_x64.hash = "sha256-o3c8j6oi5+Oxo6dUdP6a7Czroc5JpKvdexMEE7BaPC4=";
|
||||
serverSource_x64.hash = "sha256-4DiPgWKXzVMm6JTBnJGOZrQLOIjQQvxkNvcawkzsg4M=";
|
||||
serverSource_arm64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz";
|
||||
serverSource_arm64.hash = "sha256-QFK5XYdPon3J2lp3k23KNf1dbi213JRILrqq8WT359A=";
|
||||
serverSource_arm64.hash = "sha256-dyf6t2y1RO6+NCPDAD19DocAYchkIgV+x4Shn3BNEK8=";
|
||||
|
||||
serverSource =
|
||||
if stdenv.hostPlatform.isx86_64 then
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "tutanota-desktop";
|
||||
version = "309.250918.1";
|
||||
version = "310.251008.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
|
||||
hash = "sha256-cL9Q2d7U31nhrhR6oHLwlb/HJB/GfJDeH0G6JN+fIjY=";
|
||||
hash = "sha256-HMwfSMEEP3+CWSiThiEGbCkLiKndmLyt4KIZ4fPHCxM=";
|
||||
};
|
||||
|
||||
extraPkgs = pkgs: [ pkgs.libsecret ];
|
||||
|
||||
@@ -28,14 +28,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wezterm";
|
||||
version = "0-unstable-2025-08-14";
|
||||
version = "0-unstable-2025-10-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wezterm";
|
||||
repo = "wezterm";
|
||||
rev = "bf9a2aeebacec19fd07b55234d626f006b22d369";
|
||||
rev = "db5d7437389eac5f63ad32e3b50d95b2b86065d1";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-cD0r+TchRc/A+G3HMu2PjjPm8m7Ue7GpH9F/PlfJcKE=";
|
||||
hash = "sha256-4OzgrXsSq68CP6iImhqW896X6ekv2seg4kaH3md6QLs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec {
|
||||
# https://github.com/wezterm/wezterm/blob/main/nix/flake.nix#L134
|
||||
auditable = false;
|
||||
|
||||
cargoHash = "sha256-chMbDMT8UWaiGovlzYn1UD8VFqb9UYHMDDx/A62wQsY=";
|
||||
cargoHash = "sha256-QjYxDcWTbLTmtQEK6/ujwaDwdY+4C6EIOZ8I0hYIx00=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -186,6 +186,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
(replaceVars ./0002-scripts-external-executable-calls.patch scriptDeps)
|
||||
|
||||
# patch `libxl` to search for `qemu-system-i386` properly. (Before 4.21)
|
||||
(fetchpatch {
|
||||
url = "https://github.com/xen-project/xen/commit/f6281291704aa356489f4bd927cc7348a920bd01.diff?full_index=1";
|
||||
hash = "sha256-LH+68kxH/gxdyh45kYCPxKwk+9cztLrScpC2pCNQV2M=";
|
||||
})
|
||||
|
||||
# XSA 472
|
||||
(fetchpatch {
|
||||
url = "https://xenbits.xen.org/xsa/xsa472-1.patch";
|
||||
|
||||
@@ -25,14 +25,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioesphomeapi";
|
||||
version = "41.11.0";
|
||||
version = "41.13.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esphome";
|
||||
repo = "aioesphomeapi";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-xJUQyCa4ETroi5ncbPajdfJV4Ekzz23rXRBX08J8Q54=";
|
||||
hash = "sha256-hrGAByVxnGqFk23fTvGRDJipjHglMS35WeJFM7Gk5S4=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
aiohttp,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
lib,
|
||||
pytest-aiohttp,
|
||||
pytest-asyncio_0,
|
||||
pytest-cov-stub,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
@@ -22,6 +22,14 @@ buildPythonPackage rec {
|
||||
hash = "sha256-iCjWuECUQukCtlQPjztEwawqSzd3LvvWRGXnhZem22w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "pytest-asyncio-compat.patch";
|
||||
url = "https://github.com/aio-libs/aiohttp-sse/commit/22c8041f5f737f76bdba2f2fded58abacf04c913.patch";
|
||||
hash = "sha256-CZjXgDKbm3XmS0tn3MGZMnZ84ZLt4o6v9boAYXYa6A4=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
@@ -31,8 +39,7 @@ buildPythonPackage rec {
|
||||
pythonImportsCheck = [ "aiohttp_sse" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
(pytest-aiohttp.override { pytest-asyncio = pytest-asyncio_0; })
|
||||
pytest-asyncio_0
|
||||
pytest-aiohttp
|
||||
pytest-cov-stub
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
@@ -80,6 +80,8 @@ buildPythonPackage rec {
|
||||
"test_happy_path"
|
||||
# test assumes a virtual environment
|
||||
"test_code_style"
|
||||
# AssertionError: Lists differ: ['my...
|
||||
"test_import_all_files"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "netbox-plugin-dns";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "peteeckel";
|
||||
repo = "netbox-plugin-dns";
|
||||
tag = version;
|
||||
hash = "sha256-W9idValK33+FIzp90pj1+aospTyPMxzCp4bpOpYrNls=";
|
||||
hash = "sha256-vJZP4dQdOZQNT+3xRXX2H5gl6bv2z2PvGDkkme0Rbck=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -13,19 +13,19 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qh3";
|
||||
version = "1.5.4";
|
||||
version = "1.5.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jawah";
|
||||
repo = "qh3";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-VlqkZk+7803dzwMBFpsSSQUSVu5/1jKouwuK7jNuMGU=";
|
||||
hash = "sha256-mUbKIjPFmuQB+GV7IMtUPXTKClCKWG8lAKLs1ezKYEU=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-Dgx7CSH+XyVZSVHAcr65QULsY//rxgeQe5jYQQkSjHc=";
|
||||
hash = "sha256-drTXh7WkcXpNwWNfDGf+7qlXLUIOH0ysom6pUkVSD6s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "siphashc";
|
||||
version = "2.5";
|
||||
version = "2.6";
|
||||
pyproject = true;
|
||||
build-system = [ setuptools ];
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-o7zGnOM96+C0I98iSYzua2MB8TP1okdw/m9O9I2DK00=";
|
||||
sha256 = "sha256-eBXoSfUx1hiAThgeq7fhTDnShrfVMFpnODk4dNbigoE=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
@@ -24,14 +24,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "urllib3-future";
|
||||
version = "2.14.901";
|
||||
version = "2.14.902";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jawah";
|
||||
repo = "urllib3.future";
|
||||
tag = version;
|
||||
hash = "sha256-WbOtW36UrJCliEI4TW+8+iOF8ZUJmuP0JqvsdrJkLlc=";
|
||||
hash = "sha256-DOrc5QHxwF8QokHm9Hg5IfqmODxD/bTA2UuOpgvNMx0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wassima";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jawah";
|
||||
repo = "wassima";
|
||||
tag = version;
|
||||
hash = "sha256-MUGB8x4+G+B4cknCeiCcTqKwa8Gea8QrRyM4sYbVxdA=";
|
||||
hash = "sha256-Ro0PWNJDjspEtVgA/Gj3UlqbRDCiqrk9nEqx1ljbvRI=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -12,35 +12,35 @@
|
||||
},
|
||||
"36": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "33892aeb000bd7f3f8a102f3bb3111b6fa1e2ccd92cbb5b787c79423e96d61b8",
|
||||
"aarch64-linux": "55da6f2d692445f0eff0ee898160ff4da2c2d3f1736aff77fcb12c836f19db5e",
|
||||
"armv7l-linux": "0631d0dc472c412f4c52def18adf6fddc0aefde37e0b15d0611cd4743f9e1e9b",
|
||||
"aarch64-darwin": "4b6e5402936969a2988d3151483ac9693d92b52d44121ff7539de34c277527cb",
|
||||
"aarch64-linux": "423d042d719c74b8199324fac0c551143168eb8dcb876032541f5f6970b0216a",
|
||||
"armv7l-linux": "9ad5aecb5c61f8509afb26f7c07c8a985b753da0be531a85b6982ccf572dcd74",
|
||||
"headers": "0fv8hz55xk76vksj8sagfhja0xx03ks8awi3sbmlinjb9m02hb9p",
|
||||
"x86_64-darwin": "8448b9f39e6c540b326b2abfcdfd41349482247b936a72914f9c843478b6597c",
|
||||
"x86_64-linux": "bab89894ad4336ee8f855de3bb5405ee3d872d90b2ba7b196ac24cbc7a3025b8"
|
||||
"x86_64-darwin": "a0fa047f4eb4671d5787d96f45587c7d11a9e81c953c8e3e347b6fcd51b26938",
|
||||
"x86_64-linux": "1912195a813a8e112ce51b6778919d09d2c40bd9b3d22095d97cbebb27a491ba"
|
||||
},
|
||||
"version": "36.9.2"
|
||||
"version": "36.9.4"
|
||||
},
|
||||
"37": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "82869e916e74cb763c03fefb5fcee1fc99536e597716d4f3a9c716f9c37effab",
|
||||
"aarch64-linux": "7c76a5147a9870b8bcbd859278148e1e326f98ea6a5dcb3ac2707d39bd22b2d5",
|
||||
"armv7l-linux": "0d4a49b5f462972173daf6e919664cc04cad7a7d2a96b074cb181ea07bb0cd74",
|
||||
"aarch64-darwin": "90283ffbf443f3675deaad5b5c8011e04418d87215a0788e74056d5613e6dc84",
|
||||
"aarch64-linux": "0e6a05cc3cdb2b2434b83284a33f50c448b15c85d762595770daf8eddd6d76ba",
|
||||
"armv7l-linux": "de9a357d441af534c8f6e865e766ff625dc3cf0059be18283769424f7b853e11",
|
||||
"headers": "0pxwny0ynvyqb3zqnharc4mkgj6acipqra1jjmf4hbr2a8m5fnc6",
|
||||
"x86_64-darwin": "258a104f781c50939ec6b45177a6f810da646ade15567a09cf9d14ec81b82cb2",
|
||||
"x86_64-linux": "02e644d75392a1ea8991106bc77e1db243ee1fc0c23107dc3b253ed545dd4c66"
|
||||
"x86_64-darwin": "c6840760d48163badc3f253a4a6d6c432ab582b4df304389a1123f90d8313ed4",
|
||||
"x86_64-linux": "d2bf4fe94de47fb28d45911fbbadb91acf42ee64dc96033797a80515dbec3965"
|
||||
},
|
||||
"version": "37.6.0"
|
||||
"version": "37.6.1"
|
||||
},
|
||||
"38": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "cff178e2cb9ae0d957d43009ef46d249d5594bc107d7704130bc0ce2e234bbd1",
|
||||
"aarch64-linux": "76116429b368c883f93eb98cbdb053f98d811c35943133fe3cf9b408018ebe2f",
|
||||
"armv7l-linux": "a4345bb87504b6b2bef29c0dc53b99770b203a7052fd2c5d38fd3e16177d3e68",
|
||||
"aarch64-darwin": "323d805132db09f92b9766ff5f6845ce106c22a543b0f7a4a663d5270a76db22",
|
||||
"aarch64-linux": "ab46f8f2b137ec1774d9a9b949697a84212cf8b4d13c67b32d8d41b0c03e5ca0",
|
||||
"armv7l-linux": "5b9ba133ec784f7e7d14f0ec7ab867edd31c053c5f95ec188bd77895132ed192",
|
||||
"headers": "096wv1fp5m6nlsv11hsa2jj4yr8mb8pjh16s7ip5amj0phlx5783",
|
||||
"x86_64-darwin": "232a83cb11b37f67dc0683402463ef30ac0309afb8e96f3bc1ea53e72fafa789",
|
||||
"x86_64-linux": "f0028975282a6f2946797175ac406a95096f29c5dcda98048148668dfa36eff8"
|
||||
"x86_64-darwin": "55fef7f835d471973627c511965ef090e097e07eb7a5292b3ff52a81595ea8c8",
|
||||
"x86_64-linux": "84855f9262b6b5a2cd9944795bf5c7e11b301cb53bdd586d0912e310feec0674"
|
||||
},
|
||||
"version": "38.2.0"
|
||||
"version": "38.2.2"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,35 +12,35 @@
|
||||
},
|
||||
"36": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "843592feae9fd5cd698cf5db2bcebe59654b108899fa5987a0b3cb34a0245bad",
|
||||
"aarch64-linux": "9d6c593a608d8a9eb4e6bd1e6aaa84a6c3417b3080f933100790d22661d6b10e",
|
||||
"armv7l-linux": "78070ec874d829b836cb929272c6264fff1855a1b85cc562d5d907b3f735715c",
|
||||
"aarch64-darwin": "cb8f83dc0d17d42d9e7691e27c78cc7a09aa94723b5b6989fd0dbc5f15c8aacf",
|
||||
"aarch64-linux": "1dfb29c36d2e35ed8b02153d196c002c88cf0383b2e77ca4b7f4c4f9cac04a7e",
|
||||
"armv7l-linux": "cab78070335eee86a80e0205759ed197a7cce9503118ecab91a9823774748c52",
|
||||
"headers": "0fv8hz55xk76vksj8sagfhja0xx03ks8awi3sbmlinjb9m02hb9p",
|
||||
"x86_64-darwin": "c1c4dd9cda4d9b9b31599716fc63dc71e1f1d6e300a4d4c019fe2bc02ef56557",
|
||||
"x86_64-linux": "609de7bc826d6c858ce7703d8be9abc0a14d35ab745d178893cadf1291f35fa7"
|
||||
"x86_64-darwin": "b4fefa2bf0b081cbe5c5d3a28ae3337878157702160d4181adfdcd1cb58b871e",
|
||||
"x86_64-linux": "6a41bb459459f9280eac7d8775a53ad2b3dddb2556b2f7fa9b3458041ac9ef90"
|
||||
},
|
||||
"version": "36.9.2"
|
||||
"version": "36.9.4"
|
||||
},
|
||||
"37": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "ea1b52ec0af04037b419897585ebb2e81f65ccd79dd8f331e26578d042c01a2f",
|
||||
"aarch64-linux": "5c588569bbbca2bcef0881ea877d70dafcf7955e0d19765797f60e2c4d228c8a",
|
||||
"armv7l-linux": "87a781e82f4fc530820311edc059eafe30e9cec673704c8e73ebf452c5382bc6",
|
||||
"aarch64-darwin": "9a4e31dfd00edabd2cbbf109954a022e1b078e13fd5409beb3a97b6cbca54b31",
|
||||
"aarch64-linux": "5b5ba468654a3755c9e22f9314317dca9fc8c1233c2d7ceba0fd503a9298b30b",
|
||||
"armv7l-linux": "6f9033d862f953c95f383a6e857bae4c168cfd010f28938e5633ef8825f56014",
|
||||
"headers": "0pxwny0ynvyqb3zqnharc4mkgj6acipqra1jjmf4hbr2a8m5fnc6",
|
||||
"x86_64-darwin": "667a9067a774a5ada82a44bc310a23657dc2942067732b6c2879ae0042e2faf2",
|
||||
"x86_64-linux": "e1c04c3826e506765e90d95738d1cf0ecbb3a798f2f3a7bf17d0cc03fe0be1fe"
|
||||
"x86_64-darwin": "15b8a79ea7f4b7c8c62332f259d02f866e95dc7e6e08d795c249c93bc354dc9e",
|
||||
"x86_64-linux": "4790138a0815e9bf12b4f1405a806fa6ec658b9ab834166272f9eba785970353"
|
||||
},
|
||||
"version": "37.6.0"
|
||||
"version": "37.6.1"
|
||||
},
|
||||
"38": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "97345d6f601c009ae810ee82dea77d90ff32040f95aefa7d1dbd95ab76ccebc7",
|
||||
"aarch64-linux": "a1402389fe0b9687308020bc9b58909fa0987e5af3f5368557a88f18c9576a02",
|
||||
"armv7l-linux": "7d038066c6c708517c08f06972dc688364a60b4537e1b83c3bf1db1baf290e45",
|
||||
"aarch64-darwin": "5e353ab266b42c80145ce4d39f359016bfff58f534032e565f16f3d0be7bb726",
|
||||
"aarch64-linux": "8ac413b566389f0c4daa1c94fc595248a59da6587c4db4e9e0693c4a2caf37fa",
|
||||
"armv7l-linux": "d1abf283b0af0d1c6daba8eca1668378ed29ab68d1493a370337b99652eb7466",
|
||||
"headers": "096wv1fp5m6nlsv11hsa2jj4yr8mb8pjh16s7ip5amj0phlx5783",
|
||||
"x86_64-darwin": "d116d52170eecf0b982c0019f538aa7f01646c8b32b85512ec36096d18a3ed68",
|
||||
"x86_64-linux": "0ad0238eedb81f71ade28056288b13a3c6a5223654300c423eb266ac0163765c"
|
||||
"x86_64-darwin": "964260edb04cd53b8448daa5a6392ff78d5123c56368c3f8708a431cac03c619",
|
||||
"x86_64-linux": "f6bbb6ca7b5a1033576c8634e98a2538ae4fc085e5caccc03d7c036b45f030ac"
|
||||
},
|
||||
"version": "38.2.0"
|
||||
"version": "38.2.2"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,10 +56,10 @@
|
||||
},
|
||||
"src/electron": {
|
||||
"args": {
|
||||
"hash": "sha256-iVs4TcW6ymx+vmYabOZnYbHLwHsnuTb/2iXfQYOZnho=",
|
||||
"hash": "sha256-7+WcLF6RjoN+MZyo4nVr8n/PpJHbzn12VSXsv6LfwH0=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"tag": "v36.9.2"
|
||||
"tag": "v36.9.4"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
@@ -1318,10 +1318,10 @@
|
||||
"fetcher": "fetchFromGitiles"
|
||||
}
|
||||
},
|
||||
"electron_yarn_hash": "1lqvsfr1w32n4as7g7ms49jjdfw7sl1fyvg2640cpdgjs4dd96ky",
|
||||
"electron_yarn_hash": "0hm126bl9cscs2mjb3yx2yr4b22agqp9r0c5kv25r3lvc020r9pk",
|
||||
"modules": "135",
|
||||
"node": "22.19.0",
|
||||
"version": "36.9.2"
|
||||
"version": "36.9.4"
|
||||
},
|
||||
"37": {
|
||||
"chrome": "138.0.7204.251",
|
||||
@@ -1380,10 +1380,10 @@
|
||||
},
|
||||
"src/electron": {
|
||||
"args": {
|
||||
"hash": "sha256-bmXyAQGG2oORXDALL5sV6ZLtrpZls4PzBOD0vQINcsg=",
|
||||
"hash": "sha256-7b9JFee1fNw23ufv5oEHKuP/JQFDFdfryD74n2maKRY=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"tag": "v37.6.0"
|
||||
"tag": "v37.6.1"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
@@ -2653,7 +2653,7 @@
|
||||
"electron_yarn_hash": "0hm126bl9cscs2mjb3yx2yr4b22agqp9r0c5kv25r3lvc020r9pk",
|
||||
"modules": "136",
|
||||
"node": "22.19.0",
|
||||
"version": "37.6.0"
|
||||
"version": "37.6.1"
|
||||
},
|
||||
"38": {
|
||||
"chrome": "140.0.7339.133",
|
||||
@@ -2712,10 +2712,10 @@
|
||||
},
|
||||
"src/electron": {
|
||||
"args": {
|
||||
"hash": "sha256-XlMLp3I7nQmlaqTbwwAzg4r17t4f5/C69nGDtJj/r0g=",
|
||||
"hash": "sha256-OuBvNX/Nw/9Zg+xirSEo43eIiypBkZmw9DbJe6CFA6k=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"tag": "v38.2.0"
|
||||
"tag": "v38.2.2"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
@@ -3977,6 +3977,6 @@
|
||||
"electron_yarn_hash": "1knhw3blk3bl2a8nl58ik272qj2q0cpqiih5gcsds1na3bbkbn2z",
|
||||
"modules": "139",
|
||||
"node": "22.19.0",
|
||||
"version": "38.2.0"
|
||||
"version": "38.2.2"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,14 +17,16 @@ let
|
||||
|
||||
gypPatches =
|
||||
if stdenv.buildPlatform.isDarwin then
|
||||
callPackage ./gyp-patches.nix { patch_tools = false; }
|
||||
[
|
||||
./gyp-patches-set-fallback-value-for-CLT-darwin.patch
|
||||
]
|
||||
else
|
||||
[ ];
|
||||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "24.9.0";
|
||||
sha256 = "f17bc4cb01f59098c34a288c1bb109a778867c14eeb0ebbd608d0617b1193bbf";
|
||||
version = "24.10.0";
|
||||
sha256 = "f17e36cb2cc8c34a9215ba57b55ce791b102e293432ed47ad63cbaf15f78678f";
|
||||
patches =
|
||||
(
|
||||
if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
}:
|
||||
mkKdeDerivation rec {
|
||||
pname = "ktextaddons";
|
||||
version = "1.7.1";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/ktextaddons/ktextaddons-${version}.tar.xz";
|
||||
hash = "sha256-kM8l4pjglcQLMoanFT0E+WHvTmWYMhvesA8r5+mYrn4=";
|
||||
hash = "sha256-FZxgXT0DG/gY4WTqQQFQEDxfn4fOo14peeQthsMxjJk=";
|
||||
};
|
||||
|
||||
extraBuildInputs = [
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"scx": {
|
||||
"version": "1.0.16",
|
||||
"hash": "sha256-fL8SlwIJOEme3bUTk1huv61jg/2QUWtUFaplM3DmCWI=",
|
||||
"cargoHash": "sha256-CrQclEsb/Bkoe3SI069vKWiIUepk8f1Tts1MKpgphsM="
|
||||
"version": "1.0.17",
|
||||
"hash": "sha256-UhFHT8cSrdjhSqjj4qFzn5UvfPOLPwrBh1ytL2gFhzU=",
|
||||
"cargoHash": "sha256-yQM2zx1IzGjegwLK4epsluWl8m5RSP3jB00Lpd8+TLE="
|
||||
},
|
||||
"bpftool": {
|
||||
"rev": "183e7010387d1fc9f08051426e9a9fbd5f8d409e",
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
freefont_ttf,
|
||||
wrapQtAppsHook,
|
||||
qtwayland,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -26,6 +27,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-OT6ClyZRE+pxWwm+sfzvN3CnoCIyxcAiVsi1fdzaT4M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# kernelshark: Allow building with CMake 4+
|
||||
(fetchpatch {
|
||||
url = "https://lore.kernel.org/linux-trace-devel/20251010131715.1123934-1-michal.sojka@cvut.cz/raw";
|
||||
hash = "sha256-hT+EhauFlQGjhXyq7Z9FwjS3C+0Jlz6n5BDKCXwzBCc=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "nielsfaber";
|
||||
domain = "alarmo";
|
||||
version = "1.10.11";
|
||||
version = "1.10.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nielsfaber";
|
||||
repo = "alarmo";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-OASgIudnxPtWiBLpkiOioCRhIqlr2B5E2/XGlhs16sQ=";
|
||||
hash = "sha256-fzZJrPr1CO1zUlPA+cVNX+MCeMtcvIiz4NUM7q0wbFE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -80,33 +80,34 @@ stdenv.mkDerivation {
|
||||
})
|
||||
# linux: change lookup_one_len to lookup_noperm
|
||||
(fetchpatch {
|
||||
url = "https://gerrit.openafs.org/changes/16435/revisions/d3c424dcaba6ed8415a7617f0ae3622fe84e988a/patch";
|
||||
decode = "base64 -d";
|
||||
hash = "sha256-AqLhS6A68E5M+3CyNnIgv7CB5jGC/hQ4PIqPv0zggq4=";
|
||||
url = "https://github.com/openafs/openafs/commit/a580c6388ae08b8af0fa03d866f7db5e9c87a209.patch";
|
||||
hash = "sha256-9z0+GYTkv8sbXJpJ4wV9uBWT3Ebz9AKwDKAJa3Cd1zw=";
|
||||
})
|
||||
# linux: refactor afs_linux_writepage
|
||||
(fetchpatch {
|
||||
url = "https://gerrit.openafs.org/changes/16436/revisions/1f488463969b436a882c656020d1f3b92c6df440/patch";
|
||||
decode = "base64 -d";
|
||||
hash = "sha256-Wx8Xx97Kox76sSFOdpqxjMzXFrA2IFqKptpYEsfRTac=";
|
||||
})
|
||||
# linux: convert aops->writepage to writepages
|
||||
(fetchpatch {
|
||||
url = "https://gerrit.openafs.org/changes/16437/revisions/fd33425820589ed52dc712df63ea8d4b5944de87/patch";
|
||||
decode = "base64 -d";
|
||||
hash = "sha256-B011gge+vzGeUxkGOkKoK/jZn16pvGGc8DpAzzbjV+8=";
|
||||
url = "https://github.com/openafs/openafs/commit/691e90fa1c58d9afb2e26fe6b9022329364ac048.patch";
|
||||
hash = "sha256-r+dbeJsf7DQ6E0szm5PjpYKz4Ity2tcSxgub0aG9UsU=";
|
||||
})
|
||||
# Linux: Use __readahead_folio
|
||||
(fetchpatch {
|
||||
url = "https://gerrit.openafs.org/changes/16438/revisions/8a2cbf0ba08097de4b8ab0c57fe2fddf83739b9b/patch";
|
||||
decode = "base64 -d";
|
||||
hash = "sha256-MDb7vOekq/lwBgELMq+VfuvAXiHQmd0vp04ToqIm3lI=";
|
||||
url = "https://github.com/openafs/openafs/commit/c226a7073270f6f8669581dd31ce787905cc0ded.patch";
|
||||
hash = "sha256-OXA0iF7uITUZr5fymXF62XiZhaz3WHZqcvkg2hVTuTI=";
|
||||
})
|
||||
# Linux: Rename page->index to page->__folio_index
|
||||
(fetchpatch {
|
||||
url = "https://gerrit.openafs.org/changes/16439/revisions/9a5596a25618f153be7ae7eb17f29f3b7752d863/patch";
|
||||
url = "https://github.com/openafs/openafs/commit/3e57d358defc12eb573331b2ca9940abedf93f4f.patch";
|
||||
hash = "sha256-J8d6u+7H1HW3xi1nQCEfLJihyLIaJVMvbxFAT++jdX8=";
|
||||
})
|
||||
# linux: convert aops->writepage to writepages
|
||||
(fetchpatch {
|
||||
url = "https://github.com/openafs/openafs/commit/a31b416054f7e5de2188ecfb1e59fe7223921197.patch";
|
||||
hash = "sha256-RSXganheuV8GW0/KuwQyIwac4cBMgiNWc5u5oCfr5Wc=";
|
||||
})
|
||||
# Linux: Use struct kiocb * for aops write_begin/end
|
||||
(fetchpatch {
|
||||
url = "https://gerrit.openafs.org/changes/16558/revisions/78c5beffaca71b226667ce558baf7be225093870/patch";
|
||||
decode = "base64 -d";
|
||||
hash = "sha256-OYlMcmnIkoC841E0ONNWtSCUKokyxOmd0d+AWcXwbAI=";
|
||||
hash = "sha256-Y6xPjNM0J1DpJ62stnEaB+mJsa9kq89TGMxZkIk9334=";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
@@ -37,13 +37,13 @@ let
|
||||
libtokencap = callPackage ./libtokencap.nix { inherit aflplusplus; };
|
||||
aflplusplus = stdenvNoCC.mkDerivation rec {
|
||||
pname = "aflplusplus";
|
||||
version = "4.32c";
|
||||
version = "4.34c";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AFLplusplus";
|
||||
repo = "AFLplusplus";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Fhf7dHyHd8IGXq7t1y9TwN9VN8SckLRkgfGGMvmqIqk=";
|
||||
hash = "sha256-ymHt746cuZ+jyWs0vB3R1qNgpgAu6pUVXp9/g9Km9JI=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@@ -81,7 +81,8 @@ let
|
||||
--replace-fail "CLANG_BIN" '"${clang}/bin/clang"' \
|
||||
--replace-fail '"gcc"' '"${gcc}/bin/gcc"' \
|
||||
--replace-fail '"g++"' '"${gcc}/bin/g++"' \
|
||||
--replace-fail 'getenv("AFL_PATH")' "(getenv(\"AFL_PATH\") ? getenv(\"AFL_PATH\") : \"$out/lib/afl\")"
|
||||
--replace-fail 'getenv("AFL_PATH")' "(getenv(\"AFL_PATH\") ? getenv(\"AFL_PATH\") : \"$out/lib/afl\")" \
|
||||
--replace-fail '#ifndef "${clang}/bin/clang"' '#ifndef CLANG_BIN'
|
||||
|
||||
substituteInPlace src/afl-ld-lto.c \
|
||||
--replace-fail 'LLVM_BINDIR' '"/nixpkgs-patched-does-not-exist"'
|
||||
|
||||
@@ -25,10 +25,8 @@ stdenv.mkDerivation {
|
||||
src = fetchFromGitHub {
|
||||
owner = "AFLplusplus";
|
||||
repo = "qemuafl";
|
||||
# Use a fixed qemuafl version instead of the one in https://github.com/AFLplusplus/AFLplusplus/blob/v4.31c/qemu_mode/QEMUAFL_VERSION.
|
||||
# See: https://github.com/AFLplusplus/AFLplusplus/issues/2296.
|
||||
rev = "ef1cd9a8cb1522c918faab42805216f9a4054dda";
|
||||
hash = "sha256-tbKDnDoBtFhvtE9nbi9XuHPuFuGezUFngnw4pJyKFgY=";
|
||||
rev = "0732e079ed3716ef0b81e708cd9dcd372238a07f";
|
||||
hash = "sha256-YoMHnJuyOdGcFVrY0I0Oja0qKNKdAa25RByVB5ui2do=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user