Merge staging-next into staging
This commit is contained in:
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-code";
|
||||
publisher = "anthropic";
|
||||
version = "2.0.34";
|
||||
hash = "sha256-e+pjuGY0xrg43+pDDkQ4Svb1yBx2Fv+Z8WZoJv/k6D4=";
|
||||
version = "2.0.35";
|
||||
hash = "sha256-1wN82mZk3zCGGFQ8FNwLFm1793U8GEC8p46BJiPNaUo=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-dev";
|
||||
publisher = "saoudrizwan";
|
||||
version = "3.35.0";
|
||||
hash = "sha256-fPoSrpWHfDEGLbawTVV65MAQAXWUy6WTb7ijhKaoLvc=";
|
||||
version = "3.36.1";
|
||||
hash = "sha256-8pkX3KYwLr/jIHtWVmt+cx8CionKGjgSz6yFApSHR3g=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox-beta";
|
||||
binaryName = "firefox-beta";
|
||||
version = "144.0b9";
|
||||
version = "145.0b9";
|
||||
applicationName = "Firefox Beta";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "75a177be0b462ec0e668bbfd7182341499f3eb7b5a7a067ab207ff8e8f551672d0cec3c6a918bac0b9675d8315bfb59169c1ae4110f49a017417c287106366c7";
|
||||
sha512 = "5dee0ec8bb66153d1a5905692c3e9b48e91a1d55728f9e173dfb08f9d0e781fcc8ba978a9e6a8948e56d26cb064bda7c0311260a8828752a1390fdb0e18ce769";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox-devedition";
|
||||
binaryName = "firefox-devedition";
|
||||
version = "144.0b9";
|
||||
version = "145.0b9";
|
||||
applicationName = "Firefox Developer Edition";
|
||||
requireSigning = false;
|
||||
branding = "browser/branding/aurora";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "b6b09383cfd846cd6c592f2348bd72dd790ce2565b45cbc2614b030af6302beafc9df17ecc07f4b6f369c31078719b39cc3e0a4ea08dd83c9c9180d455c37247";
|
||||
sha512 = "36000021b8f30eb5e80ce3b2e4ae05499e8b8cbdec93ba97dfb9c8f107cbe80202a13c4923491c01c8c245fc1810bb6fc82a46a06817ab7e70a47c04385b306e";
|
||||
};
|
||||
|
||||
# buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but
|
||||
|
||||
@@ -98,6 +98,7 @@ in
|
||||
# Darwin
|
||||
apple-sdk_14,
|
||||
apple-sdk_15,
|
||||
apple-sdk_26,
|
||||
cups,
|
||||
rsync, # used when preparing .app directory
|
||||
|
||||
@@ -457,6 +458,7 @@ buildStdenv.mkDerivation {
|
||||
(
|
||||
stdenv.hostPlatform.isDarwin
|
||||
&& lib.versionAtLeast version "143"
|
||||
&& lib.versionOlder version "145"
|
||||
&& lib.versionOlder apple-sdk_15.version "15.4"
|
||||
)
|
||||
''
|
||||
@@ -547,7 +549,14 @@ buildStdenv.mkDerivation {
|
||||
zip
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
(if lib.versionAtLeast version "138" then apple-sdk_15 else apple-sdk_14)
|
||||
(
|
||||
if lib.versionAtLeast version "145" then
|
||||
apple-sdk_26
|
||||
else if lib.versionAtLeast version "138" then
|
||||
apple-sdk_15
|
||||
else
|
||||
apple-sdk_14
|
||||
)
|
||||
cups
|
||||
]
|
||||
++ (lib.optionals (!stdenv.hostPlatform.isDarwin) (
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "airwindows";
|
||||
version = "0-unstable-2025-10-18";
|
||||
version = "0-unstable-2025-11-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "airwindows";
|
||||
repo = "airwindows";
|
||||
rev = "1b0b4d56623e464db038e88cb87d1703b5aa0c63";
|
||||
hash = "sha256-u83unbD3qf3OudMeOq20Iw2K3SOsKrGLekYCiVZTzF8=";
|
||||
rev = "d27f470c0796a32d8241a0be25f74a0fc63e7f8d";
|
||||
hash = "sha256-tSbGn7t4EeH5xtvjRRQQneaLP4VEf8ix+0m/v6eosXw=";
|
||||
};
|
||||
|
||||
# we patch helpers because honestly im spooked out by where those variables
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
copyDesktopItems,
|
||||
electron_36,
|
||||
electron_38,
|
||||
fetchFromGitHub,
|
||||
makeDesktopItem,
|
||||
makeWrapper,
|
||||
@@ -10,7 +10,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
electron = electron_36;
|
||||
electron = electron_38;
|
||||
version = "2025.8.2";
|
||||
in
|
||||
|
||||
|
||||
@@ -18,16 +18,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "asusctl";
|
||||
version = "6.1.16";
|
||||
version = "6.1.17";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "asus-linux";
|
||||
repo = "asusctl";
|
||||
tag = version;
|
||||
hash = "sha256-Ndwzy/2Rg5W1cF6YFjoUtgN1156VZW4Gs1DgJTrmu/w=";
|
||||
hash = "sha256-rNLQYCE7NZAel2fr5VoAMlm7QkH1KrySKdEn2+WMPo8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+j682yZx54DXh+45b9GzSD29/aYALI/y1YbmlfQd09Q=";
|
||||
cargoHash = "sha256-/vMVSGUO6Zu/8GSTq1jsXLWVP9sWsuD7fJty3NnKXf4=";
|
||||
|
||||
postPatch = ''
|
||||
files="
|
||||
|
||||
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.0.34",
|
||||
"version": "2.0.35",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.0.34",
|
||||
"version": "2.0.35",
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
"claude": "cli.js"
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "claude-code";
|
||||
version = "2.0.34";
|
||||
version = "2.0.35";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-GYykbpvkFTsj7tlsAimDrNbN9kP1+8AtfG+Boch8eSk=";
|
||||
hash = "sha256-cPy2xudIH1OVVzDlq5YAg1uFu59h6zDOvXpKaJ+fuP8=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-D0sbwZ5eCzIobFGf5LY7u3/RWQ6bYpGFDlU/ClPTA7Y=";
|
||||
npmDepsHash = "sha256-07MUZ8i6K/uLodyDM1kFnhGGkRB2uVf88CkbaAVw5jk=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cocogitto";
|
||||
version = "6.3.0";
|
||||
version = "6.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oknozor";
|
||||
repo = "cocogitto";
|
||||
tag = version;
|
||||
hash = "sha256-ij5vpIpqCYGNPNWPY47rWmMLEgBh+wtVmLRt11S14rE=";
|
||||
hash = "sha256-aAVoPPeuJN6QPcuc3oBF93dP6U+74bAoSDw93XR01Vo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wfq1W9zjC0phPUr6SaLv8Ia5aQk/+1ujOTo0241X7AY=";
|
||||
cargoHash = "sha256-yDpZHkRKsWXXHuSKnzhGrjsFLUFZEpC23tcU3FeUZK8=";
|
||||
|
||||
# Test depend on git configuration that would likely exist in a normal user environment
|
||||
# and might be failing to create the test repository it works in.
|
||||
|
||||
@@ -21,12 +21,12 @@
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "crosvm";
|
||||
version = "0-unstable-2025-10-30";
|
||||
version = "0-unstable-2025-11-05";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
|
||||
rev = "7f9512777db72a1e89ba0880af7bc5467ee461bf";
|
||||
hash = "sha256-ptx9JA/uyH05r/NvgtK4ppifOiW/zjl7Bsy7vgBYkjI=";
|
||||
rev = "cc4086ef67b347624ae2dbe3e435824e1ecedffb";
|
||||
hash = "sha256-wo0opn5oZT0jPno1lLxBkEOullERh0GB95tQSvCBSrs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
xorg,
|
||||
withQt ? true,
|
||||
qt6,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -96,13 +95,13 @@ let
|
||||
in
|
||||
llvmPackages.stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fex";
|
||||
version = "2510";
|
||||
version = "2511";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FEX-Emu";
|
||||
repo = "FEX";
|
||||
tag = "FEX-${finalAttrs.version}";
|
||||
hash = "sha256-C6Yeqo+KqA6OezxnpBAncTekOrPTgIq0vikQOmxaORA=";
|
||||
hash = "sha256-CulENHssPkCXI+oyVKwf3GN5bjxUok2+AHsoOQ+Mchc=";
|
||||
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
@@ -128,16 +127,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Backported fix of unit test build with LLVM 21.
|
||||
# TODO: drop after next release
|
||||
(fetchpatch {
|
||||
name = "unittests-thunklibs-fix-build-with-llvm-21.patch";
|
||||
url = "https://github.com/FEX-Emu/FEX/commit/5af2477d005bb0ab8b11633a678ed5f6121f81b6.patch";
|
||||
hash = "sha256-QdJaexzBSOVaKc3h2uwPbX4iysqvGBDmWH938ZeXcdE=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ThunkLibs/GuestLibs/CMakeLists.txt ThunkLibs/HostLibs/CMakeLists.txt \
|
||||
--replace-fail "/usr/include/libdrm" "${devRootFS}/include/libdrm" \
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "git-buildpackage";
|
||||
version = "0.9.38";
|
||||
version = "0.9.39";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "agx";
|
||||
repo = "git-buildpackage";
|
||||
tag = "debian/${version}";
|
||||
hash = "sha256-dZ/uJLcDPkpwIz+Y6WInJ4XlSJ5zzDY65li/xghsJTQ=";
|
||||
hash = "sha256-glj0WtlZb42wetD5sKHbWvgPOZ/lQofPYtChuk3rie0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitea,
|
||||
nix-update-script,
|
||||
|
||||
# asset compression
|
||||
brotli,
|
||||
@@ -57,6 +58,12 @@ buildGoModule (finalAttrs: {
|
||||
cp -rv examples/snippets $out/lib/go-away/
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
# the main repository does not have the releases feed enabled, so use the
|
||||
# codeberg mirror
|
||||
url = "https://codeberg.org/gone/go-away";
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://git.gammaspectra.live/git/go-away/releases/tag/${finalAttrs.src.tag}";
|
||||
description = "Self-hosted abuse detection and rule enforcement against low-effort mass AI scraping and bots";
|
||||
@@ -72,5 +79,6 @@ buildGoModule (finalAttrs: {
|
||||
homepage = "https://git.gammaspectra.live/git/go-away";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ hexa ];
|
||||
mainProgram = "go-away";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,63 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
ffmpeg,
|
||||
}:
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gphotos-sync";
|
||||
version = "3.2.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gilesknap";
|
||||
repo = "gphotos-sync";
|
||||
rev = version;
|
||||
hash = "sha256-iTqD/oUQqC7Fju8SEPkSZX7FC9tE4eRCewiJR8STmEw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./skip-network-tests.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
appdirs
|
||||
attrs
|
||||
exif
|
||||
google-auth-oauthlib
|
||||
psutil
|
||||
pyyaml
|
||||
psutil
|
||||
requests-oauthlib
|
||||
types-pyyaml
|
||||
types-requests
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ffmpeg
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export PY_IGNORE_IMPORTMISMATCH=1
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Google Photos and Albums backup with Google Photos Library API";
|
||||
mainProgram = "gphotos-sync";
|
||||
homepage = "https://github.com/gilesknap/gphotos-sync";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ dnr ];
|
||||
};
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
diff --git a/tests/test_setup.py b/tests/test_setup.py
|
||||
index 085b110..ea4a7d2 100644
|
||||
--- a/tests/test_setup.py
|
||||
+++ b/tests/test_setup.py
|
||||
@@ -45,7 +45,8 @@ class SetupDbAndCredentials:
|
||||
return self
|
||||
|
||||
def __exit__(self, exc_type=None, exc_value=None, traceback=None):
|
||||
- self.gp.google_photos_down.close()
|
||||
+ if hasattr(self.gp, 'google_photos_down'):
|
||||
+ self.gp.google_photos_down.close()
|
||||
|
||||
def test_setup(self, test_name, args=None, trash_db=False, trash_files=False):
|
||||
self.root = Path("/tmp/gpTests/{}".format(test_name))
|
||||
@@ -76,3 +77,6 @@ class SetupDbAndCredentials:
|
||||
|
||||
def test_done(self):
|
||||
self.gp.data_store.store()
|
||||
+
|
||||
+import pytest, requests
|
||||
+requests.Session.__init__ = lambda *args, **kwargs: pytest.skip("no network access")
|
||||
@@ -9,7 +9,7 @@
|
||||
python3,
|
||||
makeWrapper,
|
||||
# Electron updates frequently break Heroic, so pin same version as upstream, or newest non-EOL.
|
||||
electron_36,
|
||||
electron_37,
|
||||
vulkan-helper,
|
||||
gogdl,
|
||||
nile,
|
||||
@@ -21,7 +21,7 @@ let
|
||||
legendary = callPackage ./legendary.nix { };
|
||||
epic-integration = callPackage ./epic-integration.nix { };
|
||||
comet-gog = comet-gog_heroic;
|
||||
electron = electron_36;
|
||||
electron = electron_37;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "heroic-unwrapped";
|
||||
@@ -119,12 +119,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
inherit epic-integration legendary;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Native GOG, Epic, and Amazon Games Launcher for Linux, Windows and Mac";
|
||||
homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher";
|
||||
changelog = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases/tag/v${finalAttrs.version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ iedame ];
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ iedame ];
|
||||
# Heroic may work on nix-darwin, but it needs a dedicated maintainer for the platform.
|
||||
# It may also work on other Linux targets, but all the game stores only
|
||||
# support x86 Linux, so it would require extra hacking to run games via QEMU
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "home-manager";
|
||||
version = "0-unstable-2025-10-25";
|
||||
version = "0-unstable-2025-11-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "home-manager-source";
|
||||
owner = "nix-community";
|
||||
repo = "home-manager";
|
||||
rev = "c644cb018f9fdec55f5ac2afb4713a8c7beb757c";
|
||||
hash = "sha256-6LNSptFYhiAd0M/maJoixJw7V0Kp5BSoMRtIahcfu3M=";
|
||||
rev = "aa6936bb637e46a49cf1292486200ba41dd4bcf7";
|
||||
hash = "sha256-Y5950vzoyJ8+u4U6dlI/2VEbf3JQnIJsmRWWWcsgpRg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
let
|
||||
pname = "ledger-live-desktop";
|
||||
version = "2.131.1";
|
||||
version = "2.132.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
|
||||
hash = "sha256-O5pdrnnAfDrgP8s4A0R/mf7Mx6U2VWPNqaky+rExzgc=";
|
||||
hash = "sha256-wxOzx8Eo/AAbPor/nA3gjVC8vAfRTNjVmvxON5Ta5d0=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "limbo";
|
||||
version = "0.0.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tursodatabase";
|
||||
repo = "limbo";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-t3bIW+HuuZzj3NOw2lnTZw9qxj7lGWtR8RbZF0rVbQ4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DDUl/jojhDmSQY7iI/Dn+Lg4eNuNhj8jyakPtgg4d2k=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
"limbo"
|
||||
];
|
||||
cargoTestFlags = cargoBuildFlags;
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Interactive SQL shell for Limbo";
|
||||
homepage = "https://github.com/tursodatabase/limbo";
|
||||
changelog = "https://github.com/tursodatabase/limbo/blob/v${version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ nartsiss ];
|
||||
mainProgram = "limbo";
|
||||
};
|
||||
}
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "luau-lsp";
|
||||
version = "1.55.0";
|
||||
version = "1.56.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JohnnyMorganz";
|
||||
repo = "luau-lsp";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ZrvPZi3ss83onsinyAl1AlQmV6jFctW8agYO9ieJtno=";
|
||||
hash = "sha256-IRBVLLWycc4zkjR82jAEcTlmDgXSLbaAA7ejSIYm41U=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "lxgw-neoxihei";
|
||||
version = "1.226";
|
||||
version = "1.227";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
|
||||
hash = "sha256-rKhEnNbqQRlTepZTPM9Naau74YWRU4K22jrHYTOXKOE=";
|
||||
hash = "sha256-7EJlMgY++YrUQ9BKZLOft1isc8EHuOLVoORMLMPngTI=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mdserve";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jfernandez";
|
||||
repo = "mdserve";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-dYB49+vLcokCnJ8yH0ab+Ns/RPLzdxTN/PmkaKc+THs=";
|
||||
hash = "sha256-tycFsE/jGh5OYD5ewv12vvOhhlbYtlvANk6BhDW38hw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-KszPB5xpfLw7DA/yMl5o6yRn5lHLF+6EAXnEdhD0qFE=";
|
||||
cargoHash = "sha256-otEa6+IdKHJAT+lPptXgnP5yggTkB3uYfbGhSKTXodo=";
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
|
||||
@@ -24,13 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "onedrive";
|
||||
version = "2.5.7";
|
||||
version = "2.5.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abraunegg";
|
||||
repo = "onedrive";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IllPh4YJvoAAyXDmSNwWDHN/EUtUuUqS7TOnBpr3Yts=";
|
||||
hash = "sha256-Vrr7KR4yMH+IZ56IUTp9eAhxEtiXx+ppleUd7jSLzxc=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGo125Module (finalAttrs: {
|
||||
pname = "pocket-id";
|
||||
version = "1.14.2";
|
||||
version = "1.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pocket-id";
|
||||
repo = "pocket-id";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0x80oykzMTEsuGUBtXXdKgWJld8mrDPUssYpAznqKnc=";
|
||||
hash = "sha256-mnmBwQ79sScTPM4Gh9g0x/QTmqm1TgxaOkww+bvs1b4=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/backend";
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "radicale";
|
||||
version = "3.5.7";
|
||||
version = "3.5.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kozea";
|
||||
repo = "Radicale";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-+vYLBd4psPxL2NkH8zriRpLUGK6cWrrkJyV230LePVE=";
|
||||
hash = "sha256-kgtNk+MXanYB0RyNncfM3K/HJZlScat7RDuoclu5/i0=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "scooter";
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thomasschafer";
|
||||
repo = "scooter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Fgq1FJIvgnbBGkFrFCzjIPjyTyCxxknRGtzBGUuZfIY=";
|
||||
hash = "sha256-DgxyurJmhpTHdmLyRaZkfiPYdMYdqeQOC+ZncfW5GdQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-kPJvwZhpE8k4Kv+Jai/Fp+b/YI8F7cR8acM1sc2fkf4=";
|
||||
cargoHash = "sha256-vq2d6UX4TbPO6Uya3m8uKff7+w1+VfV4Bec4Uyx/8pQ=";
|
||||
|
||||
# Ensure that only the `scooter` package is built (excluding `xtask`)
|
||||
cargoBuildFlags = [
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "scope-tui";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alemidev";
|
||||
repo = "scope-tui";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-bVe+Yyv+DcbEC15H968OhQhcFkAm7T5J6aQlKod5ocM=";
|
||||
hash = "sha256-MU9avQt+qFIQzF7GYNNoGiyfBD7eLOMQaBH6lFhLlOY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-o5pplwNtIe2z88ZwtCHree32kv16U/ryv8PmPIqxtPQ=";
|
||||
cargoHash = "sha256-yAy3kk62HYe1/1EXGUhOg++sZua65iN3ZEmPoERcu0I=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -18,16 +18,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "shh";
|
||||
version = "2025.10.22";
|
||||
version = "2025.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "desbma";
|
||||
repo = "shh";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-OxiQOwoWytZvPVVurSckPSWcb88pyDHRdUV/87Dbb9Q=";
|
||||
hash = "sha256-oXTrKUs6J3Us2m1hFbVa+G03q3oV3pqppQ+QfPXVrFA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-KRRBqRm6/TedzjGRTcbj0q4R9xOgj0PmKEm9rY2f4PM=";
|
||||
cargoHash = "sha256-GGu/oy4bfsnJNbquDeu9bDJWY9HEWS3hwsOj3nhcUNQ=";
|
||||
|
||||
patches = [
|
||||
./fix_run_checks.patch
|
||||
|
||||
@@ -9,17 +9,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "soju";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "emersion";
|
||||
repo = "soju";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qbSTaE0qOeXVcEmOver8Tu+gwV4cP4gNzIxByLKApCU=";
|
||||
hash = "sha256-1kdaLmgikRbk/B+HGTMKnhqbTho4KmvDTuizhEE3DAw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JhoAtBw4O6lOd27dIXBNvA9EfUH5AD3ZHuGcWgU/Xv0=";
|
||||
vendorHash = "sha256-NP4njea0hcklxWFoxPQqrvyWExeRP/TOzUJcamRnx+s=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -14,13 +14,13 @@ let
|
||||
iconame = "STM32CubeMX";
|
||||
package = stdenvNoCC.mkDerivation rec {
|
||||
pname = "stm32cubemx";
|
||||
version = "6.14.0";
|
||||
version = "6.15.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${
|
||||
builtins.replaceStrings [ "." ] [ "" ] version
|
||||
}-lin.zip";
|
||||
hash = "sha256-GOvoPyfPdQV/gjveuFpZjueTZD/BYuEWSHgQKBm3o3A=";
|
||||
hash = "sha256-50P+/uvNH3NN1UN+T3RxGgR8QYBIgBDA56mAEU4BipI=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
@@ -61,16 +61,15 @@ let
|
||||
EOF
|
||||
chmod +x $out/bin/${pname}
|
||||
|
||||
icotool --extract $out/opt/STM32CubeMX/help/${iconame}.ico
|
||||
fdupes -dN . > /dev/null
|
||||
ls
|
||||
for size in 16 24 32 48 64 128 256; do
|
||||
mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps
|
||||
if [ $size -eq 256 ]; then
|
||||
mv ${iconame}_*_"$size"x"$size"x32.png \
|
||||
cp $out/opt/STM32CubeMX/help/${iconame}.png \
|
||||
$out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png
|
||||
else
|
||||
convert -resize "$size"x"$size" ${iconame}_*_256x256x32.png \
|
||||
magick $out/opt/STM32CubeMX/help/${iconame}.png -resize "$size"x"$size" \
|
||||
$out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png
|
||||
fi
|
||||
done;
|
||||
|
||||
@@ -15,15 +15,15 @@
|
||||
makeWrapper,
|
||||
zenity,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "surfer";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "surfer-project";
|
||||
repo = "surfer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mvHyljAEVi1FMkEbKsPmCNx2Cg0/Ydw3ZQCZsowEKGc=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-rNJIe6FlAQI2B3lsRYHKMIGgJ1Q5EFX7kWgml+sXxtc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
|
||||
libXi
|
||||
];
|
||||
|
||||
cargoHash = "sha256-89pkHS0YQ77PmQfT8epdu2tPRNAenYGgtoiJVuuVYiI=";
|
||||
cargoHash = "sha256-Q4SyuBNR7FnBe3h1rUo48Sxk2COdQbECiXXrGpwXhPk=";
|
||||
|
||||
# Avoid the network attempt from skia. See: https://github.com/cargo2nix/cargo2nix/issues/318
|
||||
doCheck = false;
|
||||
@@ -61,10 +61,10 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = {
|
||||
description = "Extensible and Snappy Waveform Viewer";
|
||||
homepage = "https://surfer-project.org/";
|
||||
changelog = "https://gitlab.com/surfer-project/surfer/-/releases/v${version}";
|
||||
changelog = "https://gitlab.com/surfer-project/surfer/-/releases/v${finalAttrs.version}";
|
||||
license = lib.licenses.eupl12;
|
||||
maintainers = with lib.maintainers; [ hakan-demirli ];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
mainProgram = "surfer";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "turso";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tursodatabase";
|
||||
repo = "turso";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-biElXD4d6h28Nq7LIjuL+at/y69TxnsJzvnEX8cOM9E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-G2VowcxnCRulQ4pJcpfJbH73vkG+KIteeUF1Hq8TEZg=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
"turso_cli"
|
||||
];
|
||||
cargoTestFlags = finalAttrs.cargoBuildFlags;
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
doInstallCheck = true;
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Interactive SQL shell for Turso";
|
||||
homepage = "https://github.com/tursodatabase/turso";
|
||||
changelog = "https://github.com/tursodatabase/turso/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ nartsiss ];
|
||||
mainProgram = "tursodb";
|
||||
};
|
||||
})
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typos";
|
||||
version = "1.38.1";
|
||||
version = "1.39.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crate-ci";
|
||||
repo = "typos";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-xr3k3wx9EWKm00kt1GxE31Mw5wa3N3VJJCKaUbQa4ic=";
|
||||
hash = "sha256-S4toajgpKtPfvr6hhXE59lt0HPDHK/hF5vJJtxR0lTM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2XgnCXYqBvx7LRWaPt4iXznIXIEzYBlWMXbwEVZyGA8=";
|
||||
cargoHash = "sha256-DFbWFhj7ixO1kpgJNDIrtZ+FZfc4GEyw4AnwlTCXw4w=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
Generated
+100
-55
@@ -1,4 +1,9 @@
|
||||
[
|
||||
{
|
||||
"pname": "Avalonia",
|
||||
"version": "11.0.0",
|
||||
"hash": "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia",
|
||||
"version": "11.1.3",
|
||||
@@ -6,19 +11,29 @@
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia",
|
||||
"version": "11.2.1",
|
||||
"hash": "sha256-KdjhwDKlii12v7HNI3NsYAM1qYoXKRsVN2scQJbYMTc="
|
||||
"version": "11.3.7",
|
||||
"hash": "sha256-FsBz3mwSn+JZvSACEFZGzYBdX+4rFHSFQfl9RYT7BAM="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia",
|
||||
"version": "11.3.4",
|
||||
"hash": "sha256-3ojATZlOAUEZ6Io3fUwtaJaD2h9vWMw/X/mGyZljRPU="
|
||||
"version": "11.3.8",
|
||||
"hash": "sha256-0cM3VVudDUELNE/fWehuCplPKLITjw1hbg9IGtIm20g="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Angle.Windows.Natives",
|
||||
"version": "2.1.25547.20250602",
|
||||
"hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.AvaloniaEdit",
|
||||
"version": "11.3.0",
|
||||
"hash": "sha256-avrZ9um57Y3wTslyeBAXeCQrcb7a3kODFc0SSvthHF4="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.BuildServices",
|
||||
"version": "0.0.28",
|
||||
"hash": "sha256-7NQWQl3xrBDOXhGihCkt5DIrws48KyDGon/7+gPzMDU="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.BuildServices",
|
||||
"version": "0.0.29",
|
||||
@@ -26,43 +41,43 @@
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.BuildServices",
|
||||
"version": "0.0.31",
|
||||
"hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA="
|
||||
"version": "11.3.1",
|
||||
"hash": "sha256-JYcA/DgTHRJ02/FcURqtJnXYhhdzki8DGECLkZ4zONg="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Controls.ColorPicker",
|
||||
"version": "11.3.4",
|
||||
"hash": "sha256-/RbL/Yi5d/xmPVTG2pJFZ1K44iECajkUU8MfZStKxAM="
|
||||
"version": "11.3.8",
|
||||
"hash": "sha256-cB3mYR1X8Gzu1FQfWCJpfWosnpojIQhRSxrjYz4zD6g="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Controls.DataGrid",
|
||||
"version": "11.3.4",
|
||||
"hash": "sha256-x3EtbbdgJ/WNBpltO+ztmI6JSQ2p5Ey4LDDX8FI1rXQ="
|
||||
"version": "11.3.8",
|
||||
"hash": "sha256-5rB33sqLIoDIEjlGlJFRGf1lLwvnVh8o8/16GQzu15Q="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Desktop",
|
||||
"version": "11.3.4",
|
||||
"hash": "sha256-HTLnySk+navLLYE05m4HDpHwgp3RAk1OKYAjVaUirDk="
|
||||
"version": "11.3.8",
|
||||
"hash": "sha256-X/ggsRzsN7o3O4Iw4uvjgOdlW58Xbe8Jpv4llRuFcoA="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Diagnostics",
|
||||
"version": "11.3.4",
|
||||
"hash": "sha256-85N0jIcrFNThaDhvcPU8/g84ISWILx2cXHVTPW0kJbI="
|
||||
"version": "11.3.8",
|
||||
"hash": "sha256-eOLf2Id4Olbq/nMWERarked+vg5ZnVMCxMKOXBfqAqM="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.FreeDesktop",
|
||||
"version": "11.3.4",
|
||||
"hash": "sha256-mH9d3yJbf10NqOI3PR1cCoGyyEQbnKRNDmxFN+2bS9c="
|
||||
"version": "11.3.8",
|
||||
"hash": "sha256-XJogaWo4ZNg/PvckA6D5EEuyQneYUKDePnT9snNwaHs="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Native",
|
||||
"version": "11.3.4",
|
||||
"hash": "sha256-49rMUvhG5Dsl9RqhtD0i6H9X1g5768VdrW5l8axkwNI="
|
||||
"version": "11.3.8",
|
||||
"hash": "sha256-Hm4uneEN3rQVmSp1Ai4cDSTJpixYDzYJzEkAesvwxPw="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.ReactiveUI",
|
||||
"version": "11.3.4",
|
||||
"hash": "sha256-6AZrrX1S0SSB5GzqJx4nPI/nSyvlu/iXW99mO4v1jK0="
|
||||
"pname": "Avalonia.Remote.Protocol",
|
||||
"version": "11.0.0",
|
||||
"hash": "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Remote.Protocol",
|
||||
@@ -71,33 +86,33 @@
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Remote.Protocol",
|
||||
"version": "11.2.1",
|
||||
"hash": "sha256-RlO65QbExBdjEUY66CTlHefRdTZWzZbN4ksibVXxKv4="
|
||||
"version": "11.3.7",
|
||||
"hash": "sha256-A3FubRH8Li81pYhEUGQatM0etli5lSkDf2+iPxD95gs="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Remote.Protocol",
|
||||
"version": "11.3.4",
|
||||
"hash": "sha256-kVHhVHtwl1ssEf4STciY6OV0u2zyV8nOb2mSXnPH+nk="
|
||||
"version": "11.3.8",
|
||||
"hash": "sha256-pCIcQuTTcpik4xg5x8Y/QuXaW/GmNny/5ZBVr0bhmNU="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Skia",
|
||||
"version": "11.3.4",
|
||||
"hash": "sha256-CCjlniydh91cypVmnK88UvYZH1Arjbfr7L/kNJMjyTo="
|
||||
"version": "11.3.8",
|
||||
"hash": "sha256-FeJ6tdgeGKHkv0JKPOq2eHTxaDTT0t2yJ7wavBKnr68="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Themes.Simple",
|
||||
"version": "11.3.4",
|
||||
"hash": "sha256-lvjlqHU6X9ftLOXHAp0uzPfApIfte9YyIBJ+4CAp1/s="
|
||||
"version": "11.3.8",
|
||||
"hash": "sha256-GSD4yvyDKqBSGV/rwE/EO3CTp9dG4eR4B5H0Y/u9+hE="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Win32",
|
||||
"version": "11.3.4",
|
||||
"hash": "sha256-pBc4jtBOalc29D+4XzOATDjiyuK+sMMpQfhXn2m9XJo="
|
||||
"version": "11.3.8",
|
||||
"hash": "sha256-YwzyF4YJtCzcLpGxDe6U3Tpxjcqft8mcYjUNnL2Ockg="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.X11",
|
||||
"version": "11.3.4",
|
||||
"hash": "sha256-POuDAvqpPYV6Ob0a4W6QIVL0s4/bQbRhshat9z5lvt0="
|
||||
"version": "11.3.8",
|
||||
"hash": "sha256-SlAWkiaGYc+Ynq4QcO3/xorz2EIWWyrZcHXIk7F68i0="
|
||||
},
|
||||
{
|
||||
"pname": "CliWrap",
|
||||
@@ -174,20 +189,30 @@
|
||||
"version": "5.0.0",
|
||||
"hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Win32.SystemEvents",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="
|
||||
},
|
||||
{
|
||||
"pname": "NLog",
|
||||
"version": "6.0.2",
|
||||
"hash": "sha256-sToQRwukDjUo3ytSmHXT5p4j6fTv1utHkQKeF48EWnQ="
|
||||
"version": "6.0.5",
|
||||
"hash": "sha256-aP7PsAkzjlZF6m1Tr87dX+5X0YIGov7DrTrIdsqhLUY="
|
||||
},
|
||||
{
|
||||
"pname": "QRCoder",
|
||||
"version": "1.6.0",
|
||||
"hash": "sha256-2Ev/6d7PH6K4dVYQQHlZ+ZggkCnDtrlaGygs65mDo28="
|
||||
"version": "1.7.0",
|
||||
"hash": "sha256-sssSQBTHf1cUWNQYFEEJ8PRLs486ciDsXtrwL+ozZIU="
|
||||
},
|
||||
{
|
||||
"pname": "ReactiveUI",
|
||||
"version": "20.4.1",
|
||||
"hash": "sha256-YXd4A5akZ/dMOo9IalKPoNMGlBGxk60o3u6pGB4BCXY="
|
||||
"version": "22.2.1",
|
||||
"hash": "sha256-MZNBNP2ajvfRU4OaG8JjbbaQ3xbE+FjE9RZK+TZdOCE="
|
||||
},
|
||||
{
|
||||
"pname": "ReactiveUI.Avalonia",
|
||||
"version": "11.3.8",
|
||||
"hash": "sha256-ff2qlfJKaSZNGgnbWu53c2GwJKSD/oMrhkdi8OO3duo="
|
||||
},
|
||||
{
|
||||
"pname": "ReactiveUI.Fody",
|
||||
@@ -196,13 +221,18 @@
|
||||
},
|
||||
{
|
||||
"pname": "Semi.Avalonia",
|
||||
"version": "11.2.1.9",
|
||||
"hash": "sha256-4NsQyk70xjD+V0X/0wuWhQshkadbBVs1iyRNEPmExkk="
|
||||
"version": "11.3.7",
|
||||
"hash": "sha256-iOf7KhTmHt0vqkRyloM+yueo/acHHwFQd/5UZ1r0SD8="
|
||||
},
|
||||
{
|
||||
"pname": "Semi.Avalonia.AvaloniaEdit",
|
||||
"version": "11.2.0.1",
|
||||
"hash": "sha256-W0gAoDPlStqsznFS6eLDI4GFAlIDGyQq2L+DG/WKY1I="
|
||||
},
|
||||
{
|
||||
"pname": "Semi.Avalonia.DataGrid",
|
||||
"version": "11.2.1.9",
|
||||
"hash": "sha256-6V1agOI1KcTXQN1+uab7tSZH1ZdJEQrVfxZ5ha1cvGI="
|
||||
"version": "11.3.7",
|
||||
"hash": "sha256-XD7a6YY5L24peG24GaItZq7PZEdK1RP1eS0QxFbASJU="
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp",
|
||||
@@ -246,18 +276,23 @@
|
||||
},
|
||||
{
|
||||
"pname": "Splat",
|
||||
"version": "15.3.1",
|
||||
"hash": "sha256-1MlkqywOtLr5TbQ+zAqzw0l92LK9+9h2+sJgmfV32RU="
|
||||
"version": "17.1.1",
|
||||
"hash": "sha256-BS+/7xJ990uV8WQynaWYDIJSLU1BAmsVFkU4b/axDHo="
|
||||
},
|
||||
{
|
||||
"pname": "Splat",
|
||||
"version": "15.5.3",
|
||||
"hash": "sha256-nG2Q8PYkGgasSCoK2dO1TK4drljqr+1D6K9letsOQ08="
|
||||
"pname": "Splat.Builder",
|
||||
"version": "17.1.1",
|
||||
"hash": "sha256-73qopUapBpkR39GD6WD3dPNteUjEc1kt50qcLv2fIJI="
|
||||
},
|
||||
{
|
||||
"pname": "Splat.NLog",
|
||||
"version": "15.5.3",
|
||||
"hash": "sha256-8s6PBlwaqOQfOR3NsloIufdXQELVyzrItcIUjrwec6U="
|
||||
"pname": "Splat.Core",
|
||||
"version": "17.1.1",
|
||||
"hash": "sha256-M3E75Ncugew99VJB+zwDpOydLJ+G8j4RLoTvEKKmnV0="
|
||||
},
|
||||
{
|
||||
"pname": "Splat.Logging",
|
||||
"version": "17.1.1",
|
||||
"hash": "sha256-LzuHFVeOWsdDpXhnXb7UVP0xPi3GipgjXrSOv1WqXVY="
|
||||
},
|
||||
{
|
||||
"pname": "sqlite-net-pcl",
|
||||
@@ -286,14 +321,19 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.ComponentModel.Annotations",
|
||||
"version": "5.0.0",
|
||||
"hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="
|
||||
"version": "4.5.0",
|
||||
"hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="
|
||||
},
|
||||
{
|
||||
"pname": "System.Diagnostics.EventLog",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM="
|
||||
},
|
||||
{
|
||||
"pname": "System.Drawing.Common",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="
|
||||
},
|
||||
{
|
||||
"pname": "System.IO.Pipelines",
|
||||
"version": "8.0.0",
|
||||
@@ -306,8 +346,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Reactive",
|
||||
"version": "6.0.1",
|
||||
"hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q="
|
||||
"version": "6.0.2",
|
||||
"hash": "sha256-4WwkPpfdIpbAjN5K0OSLXW6aelwvvMBgd8syCtf+qeE="
|
||||
},
|
||||
{
|
||||
"pname": "System.Reactive",
|
||||
"version": "6.1.0",
|
||||
"hash": "sha256-zACYoZmKxHo0qKY8FOVa7jIsw7dN7WjdXdRRV95qY2Y="
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.AccessControl",
|
||||
|
||||
@@ -15,19 +15,18 @@
|
||||
krb5,
|
||||
bash,
|
||||
xorg,
|
||||
xdg-utils,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "v2rayn";
|
||||
version = "7.14.4";
|
||||
version = "7.15.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "2dust";
|
||||
repo = "v2rayN";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-zfQza07GhYFEHwl4w5hqqE9JP/0yY5KIj0zRRNmAECA=";
|
||||
hash = "sha256-xTD1bdL/UUGqUxDmrguO6Oapv37clDD2b3YWCe7B+Bs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -41,13 +40,11 @@ buildDotnetModule (finalAttrs: {
|
||||
chmod +x v2rayN/ServiceLib/Sample/kill_as_sudo_linux_sh
|
||||
patchShebangs v2rayN/ServiceLib/Sample/kill_as_sudo_linux_sh
|
||||
substituteInPlace v2rayN/ServiceLib/Global.cs \
|
||||
--replace-fail "/bin/bash" "${bash}/bin/bash"
|
||||
--replace-fail "/bin/bash" "${lib.getExe bash}"
|
||||
substituteInPlace v2rayN/ServiceLib/Manager/CoreAdminManager.cs \
|
||||
--replace-fail "/bin/bash" "${bash}/bin/bash"
|
||||
--replace-fail "/bin/bash" "${lib.getExe bash}"
|
||||
substituteInPlace v2rayN/ServiceLib/Handler/AutoStartupHandler.cs \
|
||||
--replace-fail "Utils.GetExePath())" '"v2rayN")'
|
||||
substituteInPlace v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs \
|
||||
--replace-fail "nautilus" "${xdg-utils}/bin/xdg-open"
|
||||
substituteInPlace v2rayN/ServiceLib/Manager/CoreManager.cs \
|
||||
--replace-fail 'Environment.GetEnvironmentVariable(Global.LocalAppData) == "1"' "false"
|
||||
'';
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vencord";
|
||||
version = "1.13.4";
|
||||
version = "1.13.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Vendicated";
|
||||
repo = "Vencord";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-NZuZ3WRHsM94PaGfikwB0Y7RRRPe+64FAfx80kRrQ1U=";
|
||||
hash = "sha256-btbGURE3szy7qiC9W3N3+RdfnH+EUJv78m9tDZYeA1M=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-deps.patch ];
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
llvmPackages,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wamrc";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bytecodealliance";
|
||||
repo = "wasm-micro-runtime";
|
||||
tag = "WAMR-${finalAttrs.version}";
|
||||
hash = "sha256-Rhn26TRyjkR30+zyosfooOGjhvG+ztYtJVQlRfzWEFo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
llvmPackages.llvm
|
||||
];
|
||||
|
||||
cmakeFlags =
|
||||
lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinSdkVersion}"
|
||||
]
|
||||
++ [
|
||||
"-DWAMR_BUILD_WITH_CUSTOM_LLVM=ON"
|
||||
"-DLLVM_DIR=${llvmPackages.llvm.dev}/lib/cmake/llvm"
|
||||
];
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/wamr-compiler";
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=WAMR-(.*)" ]; };
|
||||
|
||||
meta = {
|
||||
description = "WebAssembly Micro Runtime AOT compiler";
|
||||
homepage = "https://github.com/bytecodealliance/wasm-micro-runtime";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "wamrc";
|
||||
maintainers = with lib.maintainers; [ bubblepipe ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -18,18 +18,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "waytrogen";
|
||||
version = "0.7.4";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nikolaizombie1";
|
||||
repo = "waytrogen";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-I7juUTIN+ZhD9w2WXSU5YMBulxcGUYDdv6eiLZ1Byyw=";
|
||||
hash = "sha256-zFRSWAVyTWvH6nxiacQbrrLRlu0Xac53XFaA6FcSf6M=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-k6n6aWEJ/8Dkbd68CJfJ7kbRTltCuQ4AtZ5dALFD3lU=";
|
||||
hash = "sha256-/QCDxno0xZ9hLq0U6FNAZX7x+Kx5xaMtT/mR/GrNavs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -43,13 +43,13 @@
|
||||
# with clangStdenv.
|
||||
clangStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "yaneuraou";
|
||||
version = "8.60";
|
||||
version = "9.01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yaneurao";
|
||||
repo = "YaneuraOu";
|
||||
tag = "v${finalAttrs.version}git";
|
||||
hash = "sha256-1awnGCGIdeMAqAd0TWgoJr5spJo2mFBWdR3iMc2i4OM=";
|
||||
hash = "sha256-uhr3jS+ttN5pF1zZpHq2xWy3sdMV19eRUhuj2uPspak=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/source";
|
||||
|
||||
@@ -101,7 +101,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zed-editor";
|
||||
version = "0.210.4";
|
||||
version = "0.211.6";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -114,7 +114,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xSADK/LAbcb47Hd66p+11GuylOFSsbNTVtJtiVOylNQ=";
|
||||
hash = "sha256-JlRsiQHDsQ80/8aM0trCrfvEAAXQtkO75CAKotP1mFs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -134,7 +134,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
rm -r $out/git/*/candle-book/
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-bVRDOhjeRwS/j0Lul7JtnvXKUldOYH4dOJhUgMhfeuQ=";
|
||||
cargoHash = "sha256-DHAERsHGDk7bjTi+nCTf75qt6+uGzHLojEzoDCFkVDc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
libXdmcp,
|
||||
libexif,
|
||||
@@ -16,7 +15,7 @@
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
gitUpdater,
|
||||
version ? "2.2.0",
|
||||
version ? "2.3.0",
|
||||
qtx11extras ? null,
|
||||
}:
|
||||
|
||||
@@ -31,21 +30,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash =
|
||||
{
|
||||
"1.4.0" = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4=";
|
||||
"2.2.0" = "sha256-xLXHwrcMJ8PObZ2qWVZTf9FREcjUi5qtcCJgNHj391Q=";
|
||||
"2.3.0" = "sha256-A0kBwLiPvHIsJWQvg6lwb5lrojU8oDDQYHuC2pTXdPc=";
|
||||
}
|
||||
."${finalAttrs.version}";
|
||||
};
|
||||
|
||||
patches = lib.optionals (finalAttrs.version == "2.2.0") [
|
||||
# fix build against Qt >= 6.10 (https://github.com/lxqt/libfm-qt/pull/1060)
|
||||
# TODO: drop when upgrading beyond version 2.2.0
|
||||
(fetchpatch {
|
||||
name = "cmake-fix-build-with-Qt-6.10.patch";
|
||||
url = "https://github.com/lxqt/libfm-qt/commit/3bcbae5831f5ce3d2f06dc370f0c2ad0026ae82a.patch";
|
||||
hash = "sha256-nTuPXlkP7AzC8R4OHfQx6/kxPsDjaw7tGzQGyiYqQSQ=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liblxqt";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "liblxqt";
|
||||
rev = version;
|
||||
hash = "sha256-04t6wssTuSKlqSuUTmcDU66NVGikWh7p2irWBngN494=";
|
||||
hash = "sha256-KAteTQRJ7xfh21tYcNoZjvLfWSiUYboasqL5D4YKARo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,14 +2,13 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
lxqt-build-tools,
|
||||
wrapQtAppsHook,
|
||||
gitUpdater,
|
||||
version ? "4.2.0",
|
||||
version ? "4.3.0",
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -23,21 +22,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash =
|
||||
{
|
||||
"3.12.0" = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU=";
|
||||
"4.2.0" = "sha256-TSyVYlWsmB/6gxJo+CjROBQaWsmYZAwkM8BwiWP+XBI=";
|
||||
"4.3.0" = "sha256-aec+NjKkaH8dI0cFVxGehdRGO2aH6BD+aix+IvD+2LI=";
|
||||
}
|
||||
."${finalAttrs.version}";
|
||||
};
|
||||
|
||||
patches = lib.optionals (finalAttrs.version == "4.2.0") [
|
||||
# fix build against Qt >= 6.10 (https://github.com/lxqt/libqtxdg/pull/313)
|
||||
# TODO: drop when upgrading beyond version 4.2.0
|
||||
(fetchpatch {
|
||||
name = "cmake-fix-build-with-Qt-6.10.patch";
|
||||
url = "https://github.com/lxqt/libqtxdg/commit/b01a024921acdfd5b0e97d5fda2933c726826e99.patch";
|
||||
hash = "sha256-njpn6pU9BHlfYfkw/jEwh8w3Wo1F8MlRU8iQB+Tz2zU=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
lxqt-build-tools
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lximage-qt";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "lximage-qt";
|
||||
rev = version;
|
||||
hash = "sha256-4j/5z+kePFXubYXAbIaWYVU+plJv1xEpHHI1IXqbQog=";
|
||||
hash = "sha256-RJKXcaZJe5gyDubdglOmzmJ9XCH0gAW4fc7OR3anCoU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxqt-about";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "lxqt-about";
|
||||
rev = version;
|
||||
hash = "sha256-StPepm6XWaK1kDAspnBJ4X1/QGqHmSj48RBobJ46Sao=";
|
||||
hash = "sha256-EP0Sd/VvLufqtn/7ZQwdI/h+BJhkGks7jTlEoEqYWgk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxqt-admin";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "lxqt-admin";
|
||||
rev = version;
|
||||
hash = "sha256-Yne4EWP/bgWXa4XNP8oyUtkOfxBRcT4iuV8CpSq2ooY=";
|
||||
hash = "sha256-FzYKmqCd61jLfbyPknsWuf7KpdF+SoAMqeSEZPOYc8w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxqt-archiver";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "lxqt-archiver";
|
||||
rev = version;
|
||||
hash = "sha256-4xGP/3ft29PFzJ3ty/9wJbv/hqcdTw9U+4xDneKHF8g=";
|
||||
hash = "sha256-57ufvirD1YYEVoFtX/JY8EnMRWZ4ouhbxNm8przg5XA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
perl,
|
||||
wrapQtAppsHook,
|
||||
gitUpdater,
|
||||
version ? "2.2.1",
|
||||
version ? "2.3.0",
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
hash =
|
||||
{
|
||||
"0.13.0" = "sha256-4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA=";
|
||||
"2.2.1" = "sha256-dewsmkma8QHgb3LzRGvfntI48bOaFFsrEDrOznaC8eg=";
|
||||
"2.3.0" = "sha256-lbDcIOrOkGU/n0bPPAlZSsdBYMlBh3afXwwTkTWQLpo=";
|
||||
}
|
||||
."${version}";
|
||||
};
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace cmake/modules/LXQtCompilerSettings.cmake \
|
||||
--replace-fail AppleClang Clang
|
||||
''
|
||||
+ lib.optionalString (lib.versionOlder version "2.2.1") ''
|
||||
+ lib.optionalString (lib.versionOlder version "2.3.0") ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
@@ -28,13 +28,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxqt-config";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "lxqt-config";
|
||||
rev = version;
|
||||
hash = "sha256-iyAqdAWcg94a65lPjq412slvSKdP3W62LTyyvYdWipA=";
|
||||
hash = "sha256-2CAQeX2X0DPmgOaAEJoCLtgjFT+Z6epc/dUCbaEIlB0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxqt-globalkeys";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "lxqt-globalkeys";
|
||||
rev = version;
|
||||
hash = "sha256-xVirPi0UD4lzOA1+Gw7SgUvFRIc1KYFUJtljNA7xAWo=";
|
||||
hash = "sha256-ahRKkWmr6BkSByE5Vm5oqkkgQQ0Hyh4Ka7PYI8Es7AY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxqt-menu-data";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "lxqt-menu-data";
|
||||
rev = version;
|
||||
hash = "sha256-kFgrR7BSl08REC9SgBvLYFhJ9H++FCDQdqQaoAm5Oyw=";
|
||||
hash = "sha256-9TYW3VA4qGlrkUzgZGkxf8RkIW2cTLkY6H8JHGDnoLg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxqt-notificationd";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "lxqt-notificationd";
|
||||
rev = version;
|
||||
hash = "sha256-pMBshwqfG/8tvpwuR3wCQ/N5IT1rXJl+nZfcSqxMjM0=";
|
||||
hash = "sha256-VmPVGqCmkTkib2T5ysov1hUY3J74GTuXdJsn5Sivreo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxqt-openssh-askpass";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "lxqt-openssh-askpass";
|
||||
rev = version;
|
||||
hash = "sha256-ktB8zlrK3ymnwoGSnWNHM6EGcwn4btdlyBQzBLQdqmY=";
|
||||
hash = "sha256-f8v9HBuL78YOauipCnMRIEydudFilpFJz+KgMlnJWGU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
pkg-config,
|
||||
alsa-lib,
|
||||
@@ -36,25 +35,15 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lxqt-panel";
|
||||
version = "2.2.2";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "lxqt-panel";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ui+HD2igPiyIOgIKPbgfO4dnfm2rFP/R6oG2pH5g5VY=";
|
||||
hash = "sha256-cwemHe092vNRDeseXkGoWAEXawNTVbSiB87owfaLeAo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build against Qt >= 6.10 (https://github.com/lxqt/lxqt-panel/pull/2306)
|
||||
# TODO: drop when upgrading beyond version 2.2.2
|
||||
(fetchpatch {
|
||||
name = "cmake-fix-build-with-Qt-6.10.patch";
|
||||
url = "https://github.com/lxqt/lxqt-panel/commit/fce8cd99a1de0e637e8539c4d8ac68832a40fa6d.patch";
|
||||
hash = "sha256-KXxV6SZqdpvZSn+zbBZ32Qs6XKfFXEej1F4qBt+MzxA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxqt-policykit";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "lxqt-policykit";
|
||||
rev = version;
|
||||
hash = "sha256-TVgrr+Qakkk0rr7qwQPQNO7p5Wx6eVW8lK2gJ/HysZY=";
|
||||
hash = "sha256-Hk8ig9x1UIKpugbJ2x16DsbCmRT0I1AnX/Y5lvP5u4Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxqt-powermanagement";
|
||||
version = "2.2.1";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "lxqt-powermanagement";
|
||||
rev = version;
|
||||
hash = "sha256-Awk/NlYd8HldmEL0G/LUgj101Y1BTQBrDJfG56Y/aX4=";
|
||||
hash = "sha256-1TA9v2zrPoHiKUy6P4enmzvxWTD+/rGjrChE5WGMt3c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
libdbusmenu-lxqt,
|
||||
libfm-qt,
|
||||
@@ -17,25 +16,15 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lxqt-qtplugin";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "lxqt-qtplugin";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-qXadz9JBk4TURAWj6ByP/lGV1u0Z6rNJ/VraBh5zY+Q=";
|
||||
hash = "sha256-3rY9VpZKnl1E3ma1ioiKECpazeymQYVuXrLXhRL407o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build against Qt >= 6.10 (https://github.com/lxqt/lxqt-qtplugin/pull/100)
|
||||
# TODO: drop when upgrading beyond version 2.2.0
|
||||
(fetchpatch {
|
||||
name = "cmake-fix-build-with-Qt-6.10.patch";
|
||||
url = "https://github.com/lxqt/lxqt-qtplugin/commit/90473945206dbf21816a00dfba27426a5b5a9e25.patch";
|
||||
hash = "sha256-cCghOJHsveR5IYisEFv3h8WreRDi0kuyj/2YBD+ATsc=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
lxqt-build-tools
|
||||
|
||||
@@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxqt-runner";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "lxqt-runner";
|
||||
rev = version;
|
||||
hash = "sha256-lvJuqwBqR/OqDsk2XdjIakxIrnOZjgWrY5DtMUV5XEM=";
|
||||
hash = "sha256-h+pZiSuCdQknsyfUb9Ve1yxVyOUqNgYhIpO7kD5z3pQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -24,13 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxqt-session";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "lxqt-session";
|
||||
rev = version;
|
||||
hash = "sha256-AwL7X8ygBkVINMCEcyImUrbwmk/T6/fwk0PEEu6iBb8=";
|
||||
hash = "sha256-5VJxRho6qdPvBFr0RkYaajvVZRwhc1emzqpII+lUyOQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxqt-sudo";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "lxqt-sudo";
|
||||
rev = version;
|
||||
hash = "sha256-H2uprArYfiX1KyoWx3RRHkLcA0z9LKGDeghD+085VC4=";
|
||||
hash = "sha256-skxPI6KEHXJReadxQinBArkCx/FjpTYDFdEpRRiqx8E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxqt-themes";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "lxqt-themes";
|
||||
rev = version;
|
||||
hash = "sha256-oarj+byRfe9xHvtw80kifA2AspXHfigbuDwvi5xqrMQ=";
|
||||
hash = "sha256-sdfLwLYE29Qh0QCU6t5pKIyW2RYx32WRNvNV46nCaXo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxqt-wayland-session";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "lxqt-wayland-session";
|
||||
rev = version;
|
||||
hash = "sha256-VjOLw6ByS0se9jy1VY4xhBSs26yvoffFVAc1v0gMyYk=";
|
||||
hash = "sha256-MmiYPclMW8Y9VMZsY8wx52S3fN3RzUVrhQAGs5qSTfI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pavucontrol-qt";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "pavucontrol-qt";
|
||||
rev = version;
|
||||
hash = "sha256-D8x3CqzttlNqQgy6k4hfjJkD/MjAG4eeCn68TQA8NSM=";
|
||||
hash = "sha256-6t7nbuC/13S+Q9mINP1WuyaDqZUKp4s9LObcbSRuJ1c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pcmanfm-qt";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "pcmanfm-qt";
|
||||
rev = version;
|
||||
hash = "sha256-mYjbOb9c7Qc3qhVYt1EHy50YOVguLnwg0NJg2zBgwOM=";
|
||||
hash = "sha256-Pv3N/JfUbLyCBpnmnEHL7i2du1q8vSKxTR1uIEsEe/U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "qlipper";
|
||||
version = "5.1.2-unstable-2025-10-29";
|
||||
version = "5.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pvanek";
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qps";
|
||||
version = "2.11.1";
|
||||
version = "2.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "qps";
|
||||
rev = version;
|
||||
hash = "sha256-uWKTcFO5CoTU5jXB9x5tQ0goEvUpMaeUlMlTG2/xvYg=";
|
||||
hash = "sha256-npTkPcjcxi/hAxUtyayEZeUnVx41iRJThKzhidC+4bQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qterminal";
|
||||
version = "2.2.1";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "qterminal";
|
||||
rev = version;
|
||||
hash = "sha256-H1UmPIZG8KiVNPW3GqgnSq39JsZeowiAVwwEKwCkWoM=";
|
||||
hash = "sha256-HwWgVcO9swywei8Z3ifoGJjZ785gdF2A/kBHm4zgzFc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
lxqt-build-tools,
|
||||
wrapQtAppsHook,
|
||||
gitUpdater,
|
||||
version ? "2.2.0",
|
||||
version ? "2.3.0",
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
hash =
|
||||
{
|
||||
"1.4.0" = "sha256-wYUOqAiBjnupX1ITbFMw7sAk42V37yDz9SrjVhE4FgU=";
|
||||
"2.2.0" = "sha256-tzgHNGB063rgFB15lHTKQplNhwJZtrRprUhMm5H62AA=";
|
||||
"2.3.0" = "sha256-l+IFXiUst9PDNuD/KGzxYCUjymhWvcpMY9CF60gIfKg=";
|
||||
}
|
||||
."${version}";
|
||||
};
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtxdg-tools";
|
||||
version = "4.2.0";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "qtxdg-tools";
|
||||
rev = version;
|
||||
hash = "sha256-hVX1UfPWa1KHMhjazSopAc1/Kk3tnUQzwtG4P7K32eE=";
|
||||
hash = "sha256-v6mIpGuZ3YFb+P9FLlgNp5xf0ceAaVnMxRG+sQLP72Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
autoPatchelfHook,
|
||||
gitUpdater,
|
||||
@@ -23,25 +22,15 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "screengrab";
|
||||
version = "3.0.0";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "screengrab";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-6cGj3Ijv4DsAdJjcHKUg5et+yYc5miIHHZOTD2D9ASk=";
|
||||
hash = "sha256-LORWv3qLgQF2feKodOg72g5DCfWZvB8vi0bw9jbr+tQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build against Qt >= 6.10 (https://github.com/lxqt/screengrab/pull/434)
|
||||
# TODO: drop when upgrading beyond version 3.0.0
|
||||
(fetchpatch {
|
||||
name = "cmake-fix-build-with-Qt-6.10.patch";
|
||||
url = "https://github.com/lxqt/screengrab/commit/1621ef5df9461cdd1dcef3faee36e9419f1ca08c.patch";
|
||||
hash = "sha256-+rpCDLnHmgy/1PME3QaN+978W+jR6PDmiZ/5hAx8Djg=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
lxqt-build-tools
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
kwindowsystem,
|
||||
libexif,
|
||||
@@ -17,25 +16,15 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xdg-desktop-portal-lxqt";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "xdg-desktop-portal-lxqt";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-y3VqDuFagKcG8O5m5qjRGtlUZXfIXV0tclvZLChhWkg=";
|
||||
hash = "sha256-DNlvqZzTzZURuHTURBUXaLvMKy2HxVpgI9JwJq6A5Sw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build against Qt >= 6.10 (https://github.com/lxqt/xdg-desktop-portal-lxqt/pull/50)
|
||||
# TODO: drop when upgrading beyond version 1.2.0
|
||||
(fetchpatch {
|
||||
name = "cmake-fix-build-with-Qt-6.10.patch";
|
||||
url = "https://github.com/lxqt/xdg-desktop-portal-lxqt/commit/15fae3c57a8e8149ef19a8c919f5728016390e3f.patch";
|
||||
hash = "sha256-oReYMEr+tBDHtnFDZahBwTtzgtL/BABZO64yob9tem4=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
wrapQtAppsHook
|
||||
|
||||
@@ -26,13 +26,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-code";
|
||||
version = "8.1.1";
|
||||
version = "8.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "code";
|
||||
rev = version;
|
||||
hash = "sha256-4IGun7MnrMRmpXD0Kxm/ND4C3pFVhjHqDeP6jUmRg7k=";
|
||||
tag = version;
|
||||
hash = "sha256-DZ6smq339VgR33jQm0OFD9CM8sQ0Rz7aHKL1EWFSyBM=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
wrapGAppsHook3,
|
||||
exo,
|
||||
gtk3,
|
||||
gtk-layer-shell,
|
||||
libX11,
|
||||
libXext,
|
||||
libXfixes,
|
||||
@@ -21,23 +22,19 @@
|
||||
wlr-protocols,
|
||||
xfce4-panel,
|
||||
xfconf,
|
||||
curl,
|
||||
zenity,
|
||||
jq,
|
||||
xclip,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xfce4-screenshooter";
|
||||
version = "1.11.2";
|
||||
version = "1.11.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.xfce.org";
|
||||
owner = "apps";
|
||||
repo = "xfce4-screenshooter";
|
||||
tag = "xfce4-screenshooter-${finalAttrs.version}";
|
||||
hash = "sha256-LELPY3SU25e3Dk9/OljWMLIbZYrDiQD1h6dMq+jRaH8=";
|
||||
hash = "sha256-VN9j5Ieg3MZwhS4mE4LMRbQ5AM9F8O2n5lx/V0Qk0Po=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@@ -59,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
exo
|
||||
gtk3
|
||||
gtk-layer-shell
|
||||
libX11
|
||||
libXext
|
||||
libXfixes
|
||||
@@ -71,21 +69,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
xfconf
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
# For Imgur upload action
|
||||
# https://gitlab.xfce.org/apps/xfce4-screenshooter/-/merge_requests/51
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
curl
|
||||
zenity
|
||||
jq
|
||||
xclip
|
||||
]
|
||||
}
|
||||
)
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "xfce4-screenshooter-"; };
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "click-odoo-contrib";
|
||||
version = "1.22";
|
||||
version = "1.23";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "click_odoo_contrib";
|
||||
inherit version;
|
||||
hash = "sha256-L0Slv0ExVsnlMH23FX06aAEYMqzQEAc4mrKb96TtjRY=";
|
||||
hash = "sha256-ep4aBJpc94qLIBaGdD0F1fkQmPA4qtG0ql3W+wbPmkE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-import-export";
|
||||
version = "4.3.12";
|
||||
version = "4.3.13";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "django-import-export";
|
||||
repo = "django-import-export";
|
||||
tag = version;
|
||||
hash = "sha256-52nlqgKWh37Qr5UvCRBEPz2WHb2BU987+Ibt9yQyFVM=";
|
||||
hash = "sha256-LE3eNHdPHFH4xVrMzQeOwRlJh4v7rmLTHdNGMQMgo6I=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "tablib" ];
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plumbum";
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "tomerfiliba";
|
||||
repo = "plumbum";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-3PAvSjZ0+BMq+/g4qNNZl27KnAm01fWFYxBBY+feNTU=";
|
||||
hash = "sha256-ca9avbBJnMecuKljIrx3mYIGA50QXmhC/LP3hM9Uvcs=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
+4
-11
@@ -10,7 +10,6 @@
|
||||
pythonOlder,
|
||||
typeguard,
|
||||
websockets,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -60,19 +59,13 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "pygls" ];
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
# Skips pre-releases
|
||||
"--version-regex"
|
||||
"^v([0-9.]+)$"
|
||||
];
|
||||
};
|
||||
passthru.skipBulkUpdate = true;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Pythonic generic implementation of the Language Server Protocol";
|
||||
homepage = "https://github.com/openlawlibrary/pygls";
|
||||
changelog = "https://github.com/openlawlibrary/pygls/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ kira-bruneau ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ kira-bruneau ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,72 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
poetry-core,
|
||||
attrs,
|
||||
cattrs,
|
||||
lsprotocol,
|
||||
websockets,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygls";
|
||||
version = "2.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openlawlibrary";
|
||||
repo = "pygls";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-dQLK18EACiN+DpWp81Vgaan0mwtifhrmH4xwkqttKvg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
cattrs
|
||||
lsprotocol
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
ws = [ websockets ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Fixes hanging tests on Darwin
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
# Darwin issue: OSError: [Errno 24] Too many open files
|
||||
ulimit -n 1024
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "pygls" ];
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
# Skips pre-releases
|
||||
"--version-regex"
|
||||
"^v([0-9.]+)$"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Pythonic generic implementation of the Language Server Protocol";
|
||||
homepage = "https://github.com/openlawlibrary/pygls";
|
||||
changelog = "https://github.com/openlawlibrary/pygls/blob/${version}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ kira-bruneau ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
catkin-pkg,
|
||||
distro,
|
||||
distutils,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
pyyaml,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rospkg";
|
||||
version = "1.6.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ros-infrastructure";
|
||||
repo = "rospkg";
|
||||
tag = version;
|
||||
hash = "sha256-6nfdY+p3P3iGuj+7Lo7ybsZ+1x104m7WzGgxr8dDDuw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
dependencies = [
|
||||
catkin-pkg
|
||||
distro
|
||||
distutils
|
||||
pyyaml
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportCheck = [ "rospkg" ];
|
||||
|
||||
meta = {
|
||||
description = "ROS package library for Python";
|
||||
homepage = "http://wiki.ros.org/rospkg";
|
||||
changelog = "https://github.com/ros-infrastructure/rospkg/blob/${version}/CHANGELOG.rst";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ guelakais ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
export ROS_OS_OVERRIDE=nixos
|
||||
@@ -20,8 +20,8 @@ lib.makeScope newScope (self: rec {
|
||||
url,
|
||||
sha256,
|
||||
source,
|
||||
synopsis ? "",
|
||||
homepage ? "",
|
||||
synopsis ? null,
|
||||
homepage ? null,
|
||||
...
|
||||
}:
|
||||
(akkuDerivation {
|
||||
@@ -35,50 +35,56 @@ lib.makeScope newScope (self: rec {
|
||||
nativeBuildInputs = map (x: akkuself.${x}) dev-dependencies;
|
||||
unpackPhase = "tar xf $src";
|
||||
|
||||
meta.homepage = homepage;
|
||||
meta.description = synopsis;
|
||||
meta.license =
|
||||
let
|
||||
stringToLicense =
|
||||
s:
|
||||
(
|
||||
lib.licenses
|
||||
// (with lib.licenses; {
|
||||
"0bsd" = bsd0;
|
||||
"agpl" = agpl3Only;
|
||||
"apache-2.0" = asl20;
|
||||
"artistic" = artistic2;
|
||||
"bsd" = bsd3;
|
||||
"bsd-1-clause" = bsd1;
|
||||
"bsd-2-clause" = bsd2;
|
||||
"bsd-3-clause" = bsd3;
|
||||
"cc0-1.0" = cc0;
|
||||
"gpl" = gpl3Only;
|
||||
"gpl-2" = gpl2Only;
|
||||
"gpl-2.0-or-later" = gpl2Plus;
|
||||
"gplv2" = gpl2Only;
|
||||
"gpl-3" = gpl3Only;
|
||||
"gpl-3.0" = gpl3Only;
|
||||
"gpl-3.0-or-later" = gpl3Plus;
|
||||
"gplv3" = gpl3Only;
|
||||
"lgpl" = lgpl3Only;
|
||||
"lgpl-2" = lgpl2Only;
|
||||
"lgpl-2.0+" = lgpl2Plus;
|
||||
"lgpl-2.1" = lgpl21Only;
|
||||
"lgpl-2.1-or-later" = lgpl21Plus;
|
||||
"lgpl-3.0-or-later" = lgpl3Plus;
|
||||
"lgpl-3" = lgpl3Only;
|
||||
"lgplv3" = lgpl3Only;
|
||||
"public-domain" = publicDomain;
|
||||
"srfi" = bsd3;
|
||||
"unicode" = ucd;
|
||||
"xerox" = xerox;
|
||||
"zlib-acknowledgement" = zlib;
|
||||
"noassertion" = free;
|
||||
})
|
||||
).${s} or s;
|
||||
in
|
||||
if builtins.isList license then map stringToLicense license else stringToLicense license;
|
||||
meta = {
|
||||
license =
|
||||
let
|
||||
stringToLicense =
|
||||
s:
|
||||
(
|
||||
lib.licenses
|
||||
// (with lib.licenses; {
|
||||
"0bsd" = bsd0;
|
||||
"agpl" = agpl3Only;
|
||||
"apache-2.0" = asl20;
|
||||
"artistic" = artistic2;
|
||||
"bsd" = bsd3;
|
||||
"bsd-1-clause" = bsd1;
|
||||
"bsd-2-clause" = bsd2;
|
||||
"bsd-3-clause" = bsd3;
|
||||
"cc0-1.0" = cc0;
|
||||
"gpl" = gpl3Only;
|
||||
"gpl-2" = gpl2Only;
|
||||
"gpl-2.0-or-later" = gpl2Plus;
|
||||
"gplv2" = gpl2Only;
|
||||
"gpl-3" = gpl3Only;
|
||||
"gpl-3.0" = gpl3Only;
|
||||
"gpl-3.0-or-later" = gpl3Plus;
|
||||
"gplv3" = gpl3Only;
|
||||
"lgpl" = lgpl3Only;
|
||||
"lgpl-2" = lgpl2Only;
|
||||
"lgpl-2.0+" = lgpl2Plus;
|
||||
"lgpl-2.1" = lgpl21Only;
|
||||
"lgpl-2.1-or-later" = lgpl21Plus;
|
||||
"lgpl-3.0-or-later" = lgpl3Plus;
|
||||
"lgpl-3" = lgpl3Only;
|
||||
"lgplv3" = lgpl3Only;
|
||||
"public-domain" = publicDomain;
|
||||
"srfi" = bsd3;
|
||||
"unicode" = ucd;
|
||||
"xerox" = xerox;
|
||||
"zlib-acknowledgement" = zlib;
|
||||
"noassertion" = free;
|
||||
})
|
||||
).${s} or s;
|
||||
in
|
||||
if builtins.isList license then map stringToLicense license else stringToLicense license;
|
||||
}
|
||||
// lib.optionalAttrs (homepage != null) {
|
||||
inherit homepage;
|
||||
}
|
||||
// lib.optionalAttrs (synopsis != null) {
|
||||
description = synopsis;
|
||||
};
|
||||
}).overrideAttrs
|
||||
({ "${pname}" = lib.id; } // overrides)."${pname}";
|
||||
deps = lib.importTOML ./deps.toml;
|
||||
|
||||
@@ -678,6 +678,7 @@ mapAliases {
|
||||
godot_4_3-export-templates = throw "'godot_4_3-export-templates' has been renamed to/replaced by 'godot_4_3-export-templates-bin'"; # Converted to throw 2025-10-27
|
||||
godot_4_4-export-templates = throw "'godot_4_4-export-templates' has been renamed to/replaced by 'godot_4_4-export-templates-bin'"; # Converted to throw 2025-10-27
|
||||
goldwarden = throw "'goldwarden' has been removed, as it no longer works with new Bitwarden versions and is abandoned upstream"; # Added 2025-09-16
|
||||
gphotos-sync = throw "'gphotos-sync' has been removed, as it was archived upstream due to API changes that ceased its functions"; # Added 2025-11-06
|
||||
gprbuild-boot = throw "'gprbuild-boot' has been renamed to/replaced by 'gnatPackages.gprbuild-boot'"; # Converted to throw 2025-10-27
|
||||
gpxsee-qt5 = throw "gpxsee-qt5 was removed, use gpxsee instead"; # added 2025-09-09
|
||||
gpxsee-qt6 = gpxsee; # added 2025-09-09
|
||||
@@ -844,6 +845,7 @@ mapAliases {
|
||||
lightly-qt = throw "'lightly-qt' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
|
||||
ligo = throw "ligo has been removed from nixpkgs for lack of maintainance"; # Added 2025-06-03
|
||||
lima-bin = warnAlias "lima-bin has been replaced by lima" lima; # Added 2025-05-13
|
||||
limbo = warnAlias "limbo has been renamed to turso" turso; # Added 2025-11-07
|
||||
lincity_ng = warnAlias "lincity_ng has been renamed to lincity-ng" lincity-ng; # Added 2025-10-09
|
||||
linphone = linphonePackages.linphone-desktop; # Added 2025-09-20
|
||||
linux-libre = throw "linux_libre has been removed due to lack of maintenance"; # Added 2025-10-01
|
||||
|
||||
@@ -13247,7 +13247,15 @@ self: super: with self; {
|
||||
|
||||
pyglossary = callPackage ../development/python-modules/pyglossary { };
|
||||
|
||||
pygls = callPackage ../development/python-modules/pygls { };
|
||||
pygls = pygls_1;
|
||||
|
||||
pygls_1 = callPackage ../development/python-modules/pygls/1.nix {
|
||||
lsprotocol = lsprotocol_2023;
|
||||
};
|
||||
|
||||
pygls_2 = callPackage ../development/python-modules/pygls/2.nix {
|
||||
lsprotocol = lsprotocol_2025;
|
||||
};
|
||||
|
||||
pygltflib = callPackage ../development/python-modules/pygltflib { };
|
||||
|
||||
@@ -16339,6 +16347,8 @@ self: super: with self; {
|
||||
|
||||
rosbags = callPackage ../development/python-modules/rosbags { };
|
||||
|
||||
rospkg = callPackage ../development/python-modules/rospkg { };
|
||||
|
||||
rotary-embedding-torch = callPackage ../development/python-modules/rotary-embedding-torch { };
|
||||
|
||||
rouge-score = callPackage ../development/python-modules/rouge-score { };
|
||||
|
||||
Reference in New Issue
Block a user