Merge master into staging-next
This commit is contained in:
@@ -543,14 +543,7 @@ in
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
path =
|
||||
optionals (!config.services.resolved.enable) [ pkgs.openresolv ]
|
||||
# useful for `netbird debug` system info gathering
|
||||
++ optionals config.networking.nftables.enable [ pkgs.nftables ]
|
||||
++ optionals (!config.networking.nftables.enable) [
|
||||
pkgs.iptables
|
||||
pkgs.ipset
|
||||
];
|
||||
path = optionals (!config.services.resolved.enable) [ pkgs.openresolv ];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${getExe client.wrapper} service run";
|
||||
@@ -574,6 +567,38 @@ in
|
||||
}
|
||||
);
|
||||
}
|
||||
# netbird debug bundle related configurations
|
||||
{
|
||||
systemd.services = toClientAttrs (
|
||||
client:
|
||||
nameValuePair client.service.name {
|
||||
/*
|
||||
lets NetBird daemon know which systemd service to gather logs for
|
||||
see https://github.com/netbirdio/netbird/blob/2c87fa623654c5eef76bc0226062290201eef13a/client/internal/debug/debug_linux.go#L50-L51
|
||||
*/
|
||||
environment.SYSTEMD_UNIT = client.service.name;
|
||||
|
||||
path =
|
||||
optionals config.networking.nftables.enable [ pkgs.nftables ]
|
||||
++ optionals (!config.networking.nftables.enable) [
|
||||
pkgs.iptables
|
||||
pkgs.ipset
|
||||
];
|
||||
}
|
||||
);
|
||||
users.users = toHardenedClientAttrs (
|
||||
client:
|
||||
nameValuePair client.user.name {
|
||||
extraGroups = [
|
||||
/*
|
||||
allows debug bundles to gather systemd logs for `netbird*.service`
|
||||
this is not ideal for hardening as it grants access to the whole journal, not just own logs
|
||||
*/
|
||||
"systemd-journal"
|
||||
];
|
||||
}
|
||||
);
|
||||
}
|
||||
# Hardening section
|
||||
(mkIf (hardenedClients != { }) {
|
||||
users.groups = toHardenedClientAttrs (client: nameValuePair client.user.group { });
|
||||
|
||||
@@ -24,8 +24,8 @@ let
|
||||
sha256Hash = "sha256-S8KK/EGev0v03fVywIkD6Ym3LrciGKXJVorzyZ1ljdQ=";
|
||||
};
|
||||
latestVersion = {
|
||||
version = "2025.1.4.5"; # "Android Studio Narwhal 4 Feature Drop | 2025.1.4 Canary 5"
|
||||
sha256Hash = "sha256-gfhlcvqMDZPOmKgfp4XNrq9rucN1ZnY6WuBZYHYspGg=";
|
||||
version = "2025.2.1.3"; # "Android Studio Otter | 2025.2.1 Canary 3"
|
||||
sha256Hash = "sha256-McgPREXfErJ6vcHPKlAC4EVf61QedMV6J643LM5N7Wg=";
|
||||
};
|
||||
in
|
||||
{
|
||||
|
||||
@@ -6975,6 +6975,19 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
kiwi-nvim = buildVimPlugin {
|
||||
pname = "kiwi.nvim";
|
||||
version = "2025-07-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "serenevoid";
|
||||
repo = "kiwi.nvim";
|
||||
rev = "61e86fc29365e32b44c2914a2b10c90d04a3b22e";
|
||||
sha256 = "1knma0bjpvakiki9iwkhqxqsdzyx3dgyvhds9v3h0bsjyj15nj7x";
|
||||
};
|
||||
meta.homepage = "https://github.com/serenevoid/kiwi.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
kmonad-vim = buildVimPlugin {
|
||||
pname = "kmonad-vim";
|
||||
version = "2022-03-20";
|
||||
|
||||
@@ -535,6 +535,7 @@ https://github.com/webhooked/kanso.nvim/,HEAD,
|
||||
https://github.com/imsnif/kdl.vim/,HEAD,
|
||||
https://github.com/anuvyklack/keymap-layer.nvim/,HEAD,
|
||||
https://github.com/mikesmithgh/kitty-scrollback.nvim/,HEAD,
|
||||
https://github.com/serenevoid/kiwi.nvim/,HEAD,
|
||||
https://github.com/kmonad/kmonad-vim/,,
|
||||
https://github.com/frabjous/knap/,HEAD,
|
||||
https://github.com/b3nj5m1n/kommentary/,,
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-code";
|
||||
publisher = "anthropic";
|
||||
version = "2.0.0";
|
||||
hash = "sha256-vd3ZT8iwmbUCeaHgiDGLzWehOj4j/hMinHiXQytwVz4=";
|
||||
version = "2.0.5";
|
||||
hash = "sha256-3+VrFM1aB26AfF8vkrFJXOfg07EGkwNa+nh1vvy6MFw=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1546,6 +1546,8 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
elijah-potter.harper = callPackage ./elijah-potter.harper { };
|
||||
|
||||
elixir-lsp.vscode-elixir-ls = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "elixir-ls";
|
||||
@@ -3881,8 +3883,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "redhat";
|
||||
name = "vscode-yaml";
|
||||
version = "1.18.0";
|
||||
hash = "sha256-UtxDplORUWqmiW6I8n4ZhK7HAQdSDG4dw7M/cbjkmZY=";
|
||||
version = "1.19.0";
|
||||
hash = "sha256-Nc/lkcZh5kp71eygkUCJQT7iNT+9Jg+ud1hgaXdV0Ls=";
|
||||
};
|
||||
meta = {
|
||||
description = "YAML Language Support by Red Hat, with built-in Kubernetes syntax support";
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
vscode-utils,
|
||||
vscode-extension-update-script,
|
||||
jq,
|
||||
harper,
|
||||
moreutils,
|
||||
...
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "harper";
|
||||
publisher = "elijah-potter";
|
||||
version = harper.version;
|
||||
hash = "sha256-m9PN1BZf6rLrNnX8meX2TjGx8zGLl0GgnHEgQirh9Oc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
moreutils
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration.properties."harper.path".default = "${harper}/bin/harper-ls"' package.json | sponge package.json
|
||||
'';
|
||||
passthru.updateScript = vscode-extension-update-script { };
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/Automattic/harper/releases/tag/v${harper.version}";
|
||||
description = "The grammar checker for developers as a Visual Studio Code extension";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=elijah-potter.harper";
|
||||
homepage = "https://github.com/automattic/harper";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ MasterEvarior ];
|
||||
};
|
||||
}
|
||||
@@ -13,13 +13,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "ppsspp";
|
||||
version = "0-unstable-2025-09-10";
|
||||
version = "0-unstable-2025-09-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrydgard";
|
||||
repo = "ppsspp";
|
||||
rev = "a240cb24070700fbf73a1522338ebd60011a0daf";
|
||||
hash = "sha256-A4tqLVmW6Y4boQRf80N0upFS+s6P+TQRXB/i8rg/I4g=";
|
||||
rev = "2f4b1adc98d36a4d3fdd0a413d65a7a0b306ed4c";
|
||||
hash = "sha256-9azuw2uCwc1cpqnrqCBGp4uS2AHOc2gBJIaOTSullvs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
-33
@@ -1,33 +0,0 @@
|
||||
From 0de0a90f8fe5e1e48fa4ec7aa7c825ef88770f9d Mon Sep 17 00:00:00 2001
|
||||
From: Ryan Foster <RytoEX@gmail.com>
|
||||
Date: Mon, 9 Sep 2019 23:55:02 -0400
|
||||
Subject: [PATCH] Enable file access and universal access for file URLs
|
||||
|
||||
When loading a local file, instead of disabling CEF's web security,
|
||||
enable file access and universal access for file URLs. This should allow
|
||||
local files to make CORS requests without completely disabling CEF's
|
||||
security model.
|
||||
---
|
||||
obs-browser-source.cpp | 9 ++++++---
|
||||
1 file changed, 6 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/obs-browser-source.cpp b/obs-browser-source.cpp
|
||||
index 09b3017..1094340 100644
|
||||
--- a/plugins/obs-browser/obs-browser-source.cpp
|
||||
+++ b/plugins/obs-browser/obs-browser-source.cpp
|
||||
@@ -239,9 +239,12 @@ bool BrowserSource::CreateBrowser()
|
||||
|
||||
#if ENABLE_LOCAL_FILE_URL_SCHEME && CHROME_VERSION_BUILD < 4430
|
||||
if (is_local) {
|
||||
- /* Disable web security for file:// URLs to allow
|
||||
- * local content access to remote APIs */
|
||||
- cefBrowserSettings.web_security = STATE_DISABLED;
|
||||
+ /* Enable file access and universal access from file://
|
||||
+ * URLs to allow local content access to remote APIs */
|
||||
+ cefBrowserSettings.file_access_from_file_urls =
|
||||
+ STATE_ENABLED;
|
||||
+ cefBrowserSettings.universal_access_from_file_urls =
|
||||
+ STATE_ENABLED;
|
||||
}
|
||||
#endif
|
||||
auto browser = CefBrowserHost::CreateBrowserSync(
|
||||
@@ -59,6 +59,7 @@
|
||||
libdatachannel,
|
||||
libvpl,
|
||||
qrcodegencpp,
|
||||
simde,
|
||||
nix-update-script,
|
||||
extra-cmake-modules,
|
||||
}:
|
||||
@@ -82,21 +83,19 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "obs-studio";
|
||||
version = "31.1.2";
|
||||
version = "32.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "obsproject";
|
||||
repo = "obs-studio";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-QZoIyjliVruDPZj8hzTABaDn+nCTVs5qQCdBLtSOKvI=";
|
||||
hash = "sha256-99VAVV3hEMDI2R30OrX/in/9KtesUxMGOPg6yT5e4oM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
patches = [
|
||||
# Lets obs-browser build against CEF 90.1.0+
|
||||
./Enable-file-access-and-universal-access-for-file-URL.patch
|
||||
./fix-nix-plugin-path.patch
|
||||
];
|
||||
|
||||
@@ -156,6 +155,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ optional browserSupport cef
|
||||
++ optional withFdk fdk_aac;
|
||||
|
||||
propagatedBuildInputs = [ simde ];
|
||||
|
||||
# Copied from the obs-linuxbrowser
|
||||
postUnpack = lib.optionalString browserSupport ''
|
||||
ln -s ${cef} cef
|
||||
|
||||
@@ -60,8 +60,6 @@
|
||||
|
||||
obs-mute-filter = callPackage ./obs-mute-filter.nix { };
|
||||
|
||||
obs-ndi = qt6Packages.callPackage ./obs-ndi { };
|
||||
|
||||
obs-noise = callPackage ./obs-noise.nix { };
|
||||
|
||||
obs-pipewire-audio-capture = callPackage ./obs-pipewire-audio-capture.nix { };
|
||||
@@ -96,8 +94,6 @@
|
||||
|
||||
obs-tuna = qt6Packages.callPackage ./obs-tuna { };
|
||||
|
||||
obs-urlsource = qt6Packages.callPackage ./obs-urlsource.nix { };
|
||||
|
||||
obs-vaapi = callPackage ./obs-vaapi { };
|
||||
|
||||
obs-vertical-canvas = qt6Packages.callPackage ./obs-vertical-canvas.nix { };
|
||||
|
||||
@@ -6,23 +6,22 @@
|
||||
pkg-config,
|
||||
ninja,
|
||||
obs-studio,
|
||||
libuiohook,
|
||||
qtbase,
|
||||
xorg,
|
||||
libxkbcommon,
|
||||
libxkbfile,
|
||||
SDL2,
|
||||
sdl3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "obs-input-overlay";
|
||||
version = "5.0.6";
|
||||
version = "5.1.0-unstable-2025-09-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "univrsal";
|
||||
repo = "input-overlay";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ju4u7hhx+hTuq7Oh0DBPV8RRM8zqyyvYV74KymU0+2c=";
|
||||
rev = "4d62e7d0c55f8ff62c3a0e7b1a8f3092086b23b7";
|
||||
hash = "sha256-cUULaOoV4fffEvsHkcG3lnFCIHSvnv3LHg+SDuuVLao=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -34,9 +33,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
obs-studio
|
||||
libuiohook
|
||||
qtbase
|
||||
SDL2
|
||||
sdl3
|
||||
xorg.libX11
|
||||
xorg.libXau
|
||||
xorg.libXdmcp
|
||||
@@ -57,6 +55,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sed -i '/set(CMAKE_CXX_FLAGS "-march=native")/d' 'source/CMakeLists.txt'
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
# Remove broken uiohook development files
|
||||
rm -r $out/lib/cmake $out/lib/pkgconfig
|
||||
'';
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,62 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
obs-studio,
|
||||
cmake,
|
||||
qtbase,
|
||||
ndi,
|
||||
curl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-ndi";
|
||||
version = "4.14.1";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qtbase
|
||||
];
|
||||
buildInputs = [
|
||||
obs-studio
|
||||
qtbase
|
||||
ndi
|
||||
curl
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Palakis";
|
||||
repo = "obs-ndi";
|
||||
rev = version;
|
||||
sha256 = "sha256-ex/fZmZpFM6GTKNBQClzSf6Ns0Yts5+0PAmf5mIQCwc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./hardcode-ndi-path.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Add path (variable added in hardcode-ndi-path.patch
|
||||
sed -i -e s,@NDI@,${ndi},g src/plugin-main.cpp
|
||||
|
||||
# Replace bundled NDI SDK with the upstream version
|
||||
# (This fixes soname issues)
|
||||
rm -rf lib/ndi
|
||||
ln -s ${ndi}/include lib/ndi
|
||||
'';
|
||||
|
||||
cmakeFlags = [ "-DENABLE_QT=ON" ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Network A/V plugin for OBS Studio";
|
||||
homepage = "https://github.com/Palakis/obs-ndi";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ jshcmpbll ];
|
||||
platforms = platforms.linux;
|
||||
hydraPlatforms = ndi.meta.hydraPlatforms;
|
||||
};
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
diff --git a/src/plugin-main.cpp b/src/plugin-main.cpp
|
||||
index 0d94add..617af73 100644
|
||||
--- a/src/plugin-main.cpp
|
||||
+++ b/src/plugin-main.cpp
|
||||
@@ -244,10 +244,7 @@ const NDIlib_v4 *load_ndilib()
|
||||
if (!path.isEmpty()) {
|
||||
locations << path;
|
||||
}
|
||||
-#if defined(__linux__) || defined(__APPLE__)
|
||||
- locations << "/usr/lib";
|
||||
- locations << "/usr/local/lib";
|
||||
-#endif
|
||||
+ locations << "@NDI@/lib";
|
||||
for (auto location : locations) {
|
||||
path = QDir::cleanPath(
|
||||
QDir(location).absoluteFilePath(NDILIB_LIBRARY_NAME));
|
||||
@@ -1,95 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
curl,
|
||||
git,
|
||||
obs-studio,
|
||||
pugixml,
|
||||
qtbase,
|
||||
writeScript,
|
||||
}:
|
||||
|
||||
let
|
||||
websocketpp = fetchFromGitHub {
|
||||
owner = "zaphoyd";
|
||||
repo = "websocketpp";
|
||||
rev = "0.8.2";
|
||||
sha256 = "sha256-9fIwouthv2GcmBe/UPvV7Xn9P2o0Kmn2hCI4jCh0hPM=";
|
||||
};
|
||||
|
||||
lexbor = fetchFromGitHub {
|
||||
owner = "lexbor";
|
||||
repo = "lexbor";
|
||||
rev = "v2.3.0";
|
||||
sha256 = "sha256-s5fZWBhXC0fuHIUk1YX19bHagahOtSLlKQugyHCIlgI=";
|
||||
};
|
||||
|
||||
asio = fetchFromGitHub {
|
||||
owner = "chriskohlhoff";
|
||||
repo = "asio";
|
||||
rev = "asio-1-28-0";
|
||||
sha256 = "sha256-dkiUdR8FgDnnqdptaJjE4rvNlgpC5HZl6SQQ5Di2C2s=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-urlsource";
|
||||
version = "0.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "locaal-ai";
|
||||
repo = "obs-urlsource";
|
||||
rev = version;
|
||||
sha256 = "sha256-ZWwD8jJkL1rAUeanD4iChcgpnJaC5pPo36Ot36XOSx8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
git
|
||||
];
|
||||
buildInputs = [
|
||||
curl
|
||||
obs-studio
|
||||
pugixml
|
||||
qtbase
|
||||
];
|
||||
dontWrapQtApps = true;
|
||||
|
||||
# Update websocketpp and lexabor configurations to use pre-fetched sources
|
||||
postPatch = ''
|
||||
sed -i 's|URL .*|SOURCE_DIR "${websocketpp}"\n DOWNLOAD_COMMAND ""|' cmake/FetchWebsocketpp.cmake
|
||||
sed -i \
|
||||
-e 's|GIT_REPOSITORY .*|SOURCE_DIR "${lexbor}"|' \
|
||||
-e 's|GIT_TAG .*|DOWNLOAD_COMMAND ""\n UPDATE_COMMAND ""|' \
|
||||
cmake/BuildLexbor.cmake
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
rm -rf $out/lib/cmake
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-I${websocketpp}"
|
||||
"-I${asio}/asio/include"
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# Prevent deprecation warnings from failing the build
|
||||
(lib.cmakeOptionType "string" "CMAKE_CXX_FLAGS" "-Wno-error=deprecated-declarations")
|
||||
(lib.cmakeBool "ENABLE_QT" true)
|
||||
(lib.cmakeBool "USE_SYSTEM_CURL" true)
|
||||
(lib.cmakeBool "USE_SYSTEM_PUGIXML" true)
|
||||
(lib.cmakeBool "CMAKE_COMPILE_WARNING_AS_ERROR" false)
|
||||
"-Wno-dev"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "OBS plugin to fetch data from a URL or file, connect to an API or AI service, parse responses and display text, image or audio on scene";
|
||||
homepage = "https://github.com/locaal-ai/obs-urlsource";
|
||||
maintainers = with maintainers; [ flexiondotorg ];
|
||||
license = licenses.gpl2Only;
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
@@ -20,6 +20,13 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-Bg1n1yV4JzNFEXFNayNa1exsSZhmRJ0RLHDjLWmqGZE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace \
|
||||
src/source.hpp src/source.cpp src/source_generic.cpp \
|
||||
src/source_avx2.cpp src/source_avx.cpp \
|
||||
--replace circlebuf deque
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "b4";
|
||||
version = "0.14.2";
|
||||
version = "0.14.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-T4NbblrjDv9gBLslwV/Y9Pbs0RBVluhtsYcf730YET0=";
|
||||
hash = "sha256-MaSSe437tcl+38lWnNo7Zze7/YQwiB6MxIoLCIztYUc=";
|
||||
};
|
||||
|
||||
# tests make dns requests and fails
|
||||
|
||||
@@ -22,16 +22,16 @@ let
|
||||
in
|
||||
buildNpmPackage' rec {
|
||||
pname = "balena-cli";
|
||||
version = "22.4.6";
|
||||
version = "22.4.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "balena-io";
|
||||
repo = "balena-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/EV4xixcJBNDWqvNp9uv4ZjlPcm6j/d7u4qYlALtixQ=";
|
||||
hash = "sha256-Q3/2Uv7Lke7lBzcEPPgq5FWzWvBNdADvkXL4BBaHX9o=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-ZunJp1wY8iFhEvGKPJDPcnKO/eGGVT2NduK1kjjZ2k0=";
|
||||
npmDepsHash = "sha256-7LVgD8uQEK1FQuWUsD7zgQrh0HB51XEkbp/TU7m1K3w=";
|
||||
|
||||
postPatch = ''
|
||||
ln -s npm-shrinkwrap.json package-lock.json
|
||||
|
||||
@@ -0,0 +1,158 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
faketty,
|
||||
fetchFromGitHub,
|
||||
fetchYarnDeps,
|
||||
fixup-yarn-lock,
|
||||
go,
|
||||
makeWrapper,
|
||||
nodejs,
|
||||
nix-update-script,
|
||||
patchelf,
|
||||
removeReferencesTo,
|
||||
testers,
|
||||
yarn,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cdktf-cli";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "terraform-cdk";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-iqy8j1bqwjSRBOj8kjFtAq9dLiv6dDbJsiFGQUhGW7k=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/yarn.lock";
|
||||
hash = "sha256-qGjzy/+u8Ui9aHK0sX3MfYbkj5Cqab4RlhOgrwbEmGs=";
|
||||
};
|
||||
|
||||
hcl2json-go-modules =
|
||||
(buildGoModule {
|
||||
pname = "cdktf-hcl2json-go-modules";
|
||||
inherit (finalAttrs) version src;
|
||||
modRoot = "packages/@cdktf/hcl2json";
|
||||
vendorHash = "sha256-OiKPq0CHkOxJaFzgsaNJ02tasvHtHWylmaPRPayJob4=";
|
||||
proxyVendor = true;
|
||||
doCheck = false;
|
||||
env.GOWORK = "off";
|
||||
}).goModules;
|
||||
|
||||
hcltools-go-modules =
|
||||
(buildGoModule {
|
||||
pname = "cdktf-hcltools-go-modules";
|
||||
inherit (finalAttrs) version src;
|
||||
modRoot = "packages/@cdktf/hcl-tools";
|
||||
vendorHash = "sha256-orGxkYEQVtTKvXb7/FD/CLwqSINgBQFTF5arbR0xAvE=";
|
||||
proxyVendor = true;
|
||||
doCheck = false;
|
||||
env.GOWORK = "off";
|
||||
}).goModules;
|
||||
|
||||
strictDeps = true;
|
||||
disallowedReferences = [ go ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
faketty
|
||||
fixup-yarn-lock
|
||||
go
|
||||
makeWrapper
|
||||
nodejs
|
||||
patchelf
|
||||
removeReferencesTo
|
||||
yarn
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# wasm_exec has moved to lib in newer versions of Go
|
||||
substituteInPlace packages/@cdktf/hcl-tools/prebuild.sh \
|
||||
--replace-fail "misc/wasm/wasm_exec.js" "lib/wasm/wasm_exec.js"
|
||||
substituteInPlace packages/@cdktf/hcl2json/prebuild.sh \
|
||||
--replace-fail "misc/wasm/wasm_exec.js" "lib/wasm/wasm_exec.js"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
export GOCACHE=$TMPDIR/go-cache
|
||||
export GOPATH=$TMPDIR/go
|
||||
export GOPROXY=file://${finalAttrs.hcltools-go-modules},file://${finalAttrs.hcl2json-go-modules}
|
||||
export GOSUMDB=off
|
||||
|
||||
# Stop the build from trying to write checkpoints to /var/empty/
|
||||
export CHECKPOINT_DISABLE=1
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
export HOME=$(mktemp -d)
|
||||
yarn config --offline set yarn-offline-mirror $offlineCache
|
||||
fixup-yarn-lock yarn.lock
|
||||
yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install
|
||||
patchShebangs node_modules packages
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
faketty yarn --offline build
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
# Skip tests that require terraform (unfree)
|
||||
yarn --offline workspace cdktf-cli test -- \
|
||||
--testPathIgnorePatterns \
|
||||
"src/test/cmds/(convert|init).test.ts"
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
yarn --offline --production install
|
||||
|
||||
mkdir -p "$out/lib/node_modules/cdktf-cli"
|
||||
cp -rL node_modules packages/cdktf-cli/bundle packages/cdktf-cli/package.json "$out/lib/node_modules/cdktf-cli/"
|
||||
|
||||
makeWrapper "${lib.getExe nodejs}" "$out/bin/cdktf" \
|
||||
--add-flags "$out/lib/node_modules/cdktf-cli/bundle/bin/cdktf.js"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Go isn't needed at runtime, so remove these to decrease the closure size
|
||||
remove-references-to -t ${go} \
|
||||
"$out/lib/node_modules/cdktf-cli/node_modules/@cdktf/hcl-tools/main.wasm" \
|
||||
"$out/lib/node_modules/cdktf-cli/node_modules/@cdktf/hcl2json/main.wasm"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "CDK for Terraform CLI";
|
||||
homepage = "https://github.com/hashicorp/terraform-cdk";
|
||||
changelog = "https://github.com/hashicorp/terraform-cdk/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mpl20;
|
||||
mainProgram = "cdktf";
|
||||
maintainers = with lib.maintainers; [ deejayem ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -7,11 +7,11 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "claude-code";
|
||||
version = "2.0.1";
|
||||
version = "2.0.5";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-LUbDPFa0lY74MBU4hvmYVntt6hVZy6UUZFN0iB4Eno8=";
|
||||
hash = "sha256-ZAolpT/NW48NpIoY2jUzbBlcHmyNcw+G1GhZ40qtJoY=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-DehkeMZvzn+hvcCDzJfd4p9oYc1GSZm8gu8vKS4Uncw=";
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cosign";
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = "cosign";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-0Wl/+tSYGkp/UNByyQ396gxUSQ4lmC51v3t28gDwNnE=";
|
||||
hash = "sha256-JQxVO7wZFyRovst3qb0EErDyIIhPNsIpBq/iQVf6djY=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional (stdenv.hostPlatform.isLinux && pivKeySupport) (lib.getDev pcsclite);
|
||||
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
vendorHash = "sha256-1axjX8s1z6awjKLNYffOmLgltFZkbMFBBeFFigYWB9I=";
|
||||
vendorHash = "sha256-7qVJMQI5htqMavrxFP2lQfQ/7b27bRWnNYg2cHmTZYE=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/cosign"
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "cosmic-ext-applet-caffeine";
|
||||
version = "2025-09-29";
|
||||
version = "0-unstable-2025-09-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tropicbliss";
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "cosmic-ext-applet-external-monitor-brightness";
|
||||
version = "0.0.1-unstable-2025-08-05";
|
||||
version = "0.0.1-unstable-2025-09-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cosmic-utils";
|
||||
repo = "cosmic-ext-applet-external-monitor-brightness";
|
||||
rev = "23104965bd9ab1988b040a60f3f1e5d64038e7ce";
|
||||
hash = "sha256-+Hu9bLEbue9bXaGfKa3InhdFI6qsBxccyQY8qzBYFPk=";
|
||||
rev = "1f648171fcc1b187ca6603b78c650ea0f33daa79";
|
||||
hash = "sha256-QXQqHtXYoq2cg2DKL8DHZz2T+MsnCtI5mRJP036UC2U=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ou7iukl1pHMfcJNemwLdZYYxugbJJQ53XpCYowUTj90=";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grpc-client-cli";
|
||||
version = "1.22.5";
|
||||
version = "1.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vadimi";
|
||||
repo = "grpc-client-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-e6EqjaPTYC6HSgBqg8F+5tNt7C2/N1mniWxgv6t6y/w=";
|
||||
sha256 = "sha256-hi0F3cuN2QMAkzrgk19SuyxEOs2cwDeeBS4NYr38Hzo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BFjJpoAgbG16+26+m3cWxLTg5XCm/2b2vJiEzlbxqxQ=";
|
||||
vendorHash = "sha256-/lIDY6xjSs5Uk5nw2dExyPQPXNHTJuQR+K8/7PB1kik=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generic gRPC command line client";
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "h2o";
|
||||
version = "2.3.0-rolling-2025-09-20";
|
||||
version = "2.3.0-rolling-2025-09-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "h2o";
|
||||
repo = "h2o";
|
||||
rev = "c3930f0fd75cc1f232b9298592d88b35b648e999";
|
||||
hash = "sha256-pSWEPXhXTe+El1OwcJFzqHosqrCkKxVs38TeiI/3kRI=";
|
||||
rev = "74012bb501f14e61e5ecc1e9860bd66ba6789e0d";
|
||||
hash = "sha256-zEibiI3BdhaTty5vZ3PPXTbHIRLsE2iUiwI6hRZfy8A=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "inputplumber";
|
||||
version = "0.64.0";
|
||||
version = "0.66.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ShadowBlip";
|
||||
repo = "InputPlumber";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Ai2mozqw8n+L6Yv04OLyiADmXBT4k573qzazePsmfP4=";
|
||||
hash = "sha256-9aCCRjXJZcjfRrZJldaVKbk6FYTYv73XEvUeCeCPmfk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-oiEBOFDiOKPFsqZcW98hi1xiKEbo2YNXv5Cw1jCg5vw=";
|
||||
cargoHash = "sha256-JBfAsLN9GhvzVi/lQumqdWwujLI4rXLowiUOoApnWUg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -237,6 +237,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
maintainers = with maintainers; [
|
||||
fugi
|
||||
];
|
||||
inherit (electron.meta) platforms;
|
||||
platforms = electron.meta.platforms ++ lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "lint-staged";
|
||||
version = "16.2.0";
|
||||
version = "16.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okonet";
|
||||
repo = "lint-staged";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-liStGx9Tjcwv1csgPepzT0bDSew8AlpywT+YT38B/Fk=";
|
||||
hash = "sha256-kfirpw0wSOvq4C+O9gQpG4caqPCjRV47rAylKWmrfy4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-5ZVyYzSw5lJZdTVHyR9C4mZa+Nx9yoTmpPRkMsf/b5w=";
|
||||
npmDepsHash = "sha256-TW90pvkKEs5s2nvjkNyf5xQFmM6UueMSm8Ov03I3Nls=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
||||
@@ -14,19 +14,19 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.138.2";
|
||||
version = "1.139.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "element-hq";
|
||||
repo = "synapse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hnF0RPVH+5OBUZnaYCleTNLJYl9a+nf2PzJnLaJ5kzI=";
|
||||
hash = "sha256-L9oTTdGF//srC3sDrI8aNMjc9lOkof+J2VLFy091HBo=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-aUZUg8+1UlDzsxJN87Bk/DjD5WFcvHGVBRf1rIXKOZ4=";
|
||||
hash = "sha256-PUwSg//1xAMyv0HOMt4YFR680fQ+7YAcSJ0vmlPyCzQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -31,7 +31,7 @@ assert gpgmeSupport -> sslSupport;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mutt";
|
||||
version = "2.2.14";
|
||||
version = "2.2.15";
|
||||
outputs = [
|
||||
"out"
|
||||
"doc"
|
||||
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-0WL7bUkeOvQ9b2L5Sbfmh7sMfCWE2lLJmpk1SiXeFO8=";
|
||||
hash = "sha256-pRaGEE5CA/TCo7F2UnvjuV0I6AjpT9LcrbfDBWa/iU0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mympd";
|
||||
version = "22.0.4";
|
||||
version = "22.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jcorporation";
|
||||
repo = "myMPD";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-sVZj79NUrymwi8L8akqyGGKnm4OAKr3Qf/K5U2iqm5E=";
|
||||
sha256 = "sha256-/PJdyrdJnVm6qYW7O6l2qsv5QlRa37FGZPTGGv4RIgs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,32 +6,50 @@
|
||||
makeWrapper,
|
||||
dpkg,
|
||||
electron,
|
||||
_7zz,
|
||||
}:
|
||||
let
|
||||
mainProgram = "proton-mail";
|
||||
version = "1.9.1";
|
||||
|
||||
linuxHash = "sha256-P2i/uX++F1JUgwSUyndYazjLSCK1mP+XSGICPUoo1VE=";
|
||||
darwinHash = "sha256-U+I0ttToDiLLjEaKlvdb7HhE4dMrLryc251GXBVsQEM=";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "protonmail-desktop";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://proton.me/download/mail/linux/${version}/ProtonMail-desktop-beta.deb";
|
||||
hash = "sha256-P2i/uX++F1JUgwSUyndYazjLSCK1mP+XSGICPUoo1VE=";
|
||||
};
|
||||
src =
|
||||
{
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://proton.me/download/mail/linux/${version}/ProtonMail-desktop-beta.deb";
|
||||
hash = linuxHash;
|
||||
};
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://proton.me/download/mail/macos/${version}/ProtonMail-desktop.dmg";
|
||||
hash = darwinHash;
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://proton.me/download/mail/macos/${version}/ProtonMail-desktop.dmg";
|
||||
hash = darwinHash;
|
||||
};
|
||||
}
|
||||
."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
makeWrapper
|
||||
asar
|
||||
];
|
||||
nativeBuildInputs =
|
||||
lib.optionals stdenv.hostPlatform.isLinux [
|
||||
dpkg
|
||||
makeWrapper
|
||||
asar
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
_7zz
|
||||
];
|
||||
|
||||
# Rebuild the ASAR archive, hardcoding the resourcesPath
|
||||
preInstall = ''
|
||||
preInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
asar extract usr/lib/proton-mail/resources/app.asar tmp
|
||||
rm usr/lib/proton-mail/resources/app.asar
|
||||
substituteInPlace tmp/.webpack/main/index.js \
|
||||
@@ -42,11 +60,17 @@ stdenv.mkDerivation {
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
mkdir -p $out/share/proton-mail
|
||||
cp -r usr/share/ $out/
|
||||
cp -r usr/lib/proton-mail/resources/* $out/share/proton-mail/
|
||||
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
cp -r "Proton Mail.app" $out/Applications/
|
||||
''
|
||||
+ ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -72,7 +96,8 @@ stdenv.mkDerivation {
|
||||
];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
];
|
||||
]
|
||||
++ lib.platforms.darwin;
|
||||
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||
|
||||
inherit mainProgram;
|
||||
|
||||
@@ -1,11 +1,19 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p common-updater-scripts jq
|
||||
#!nix-shell -i bash -p coreutils jq
|
||||
|
||||
# shellcheck disable=SC1008
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
latestVersion=$(curl https://proton.me/download/mail/linux/version.json | jq -r 'first(.Releases[])|.Version')
|
||||
downloadUrl="https://proton.me/download/mail/linux/${latestVersion}/ProtonMail-desktop-beta.deb"
|
||||
latestSha=$(nix store prefetch-file "$downloadUrl" --json | jq -r '.hash')
|
||||
update-source-version "protonmail-desktop" "$latestVersion" "$latestSha" --ignore-same-version --file=./pkgs/by-name/pr/protonmail-desktop/package.nix
|
||||
linuxDownloadUrl="https://proton.me/download/mail/linux/${latestVersion}/ProtonMail-desktop-beta.deb"
|
||||
darwinDownloadUrl="https://proton.me/download/mail/macos/${latestVersion}/ProtonMail-desktop.dmg"
|
||||
|
||||
latestLinuxSha=$(nix store prefetch-file "$linuxDownloadUrl" --json | jq -r '.hash')
|
||||
latestDarwinSha=$(nix store prefetch-file "$darwinDownloadUrl" --json | jq -r '.hash')
|
||||
|
||||
sed -i "s|version = \".*\";|version = \"${latestVersion}\";|" ./package.nix
|
||||
sed -i "s|linuxHash = \"sha256-[^\"]*\";|linuxHash = \"${latestLinuxSha}\";|" ./package.nix
|
||||
sed -i "s|darwinHash = \"sha256-[^\"]*\";|darwinHash = \"${latestDarwinSha}\";|" ./package.nix
|
||||
|
||||
@@ -18,11 +18,11 @@
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qownnotes";
|
||||
appname = "QOwnNotes";
|
||||
version = "25.9.3";
|
||||
version = "25.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-B5xKZaayYNClf02O8KHXfqrDX7obS61dPAW999xn9Eo=";
|
||||
hash = "sha256-hBRVho+BsxGSc+8XGur0AX7iZ/li9p5mM5N87vh92KA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,12 +9,12 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "quisk";
|
||||
version = "4.2.43";
|
||||
version = "4.2.44";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-z5O7Oz6Wa0Orr1RgKVoBzlyfdlpLKi96NHNjffLkJ80=";
|
||||
hash = "sha256-OSGrLbCS255e/btagD7RCVpLpyIX1jveeJnzIwyegH4=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -0,0 +1,84 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
pkg-config,
|
||||
libusb1,
|
||||
libnfc,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "zaparoo";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ZaparooProject";
|
||||
repo = "zaparoo-core";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-U/MNK8K7XAEuIa06mjJdUJRKHUFWqH7BFhAgJCbdj/s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UTMYZ8la4VsxIVjcRg8l1yGy52CRjv/6WZQgHJ+oFdE=";
|
||||
|
||||
webUIVersion = "1.8.0";
|
||||
webUI = fetchurl {
|
||||
url = "https://github.com/ZaparooProject/zaparoo-app/releases/download/v${finalAttrs.webUIVersion}/zaparoo_app-web-${finalAttrs.webUIVersion}.tar.gz";
|
||||
hash = "sha256-77QyMFbx73vaKIRDCnhdqDXBb8MfQSsCWghe3XEL0tk=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/linux" ];
|
||||
|
||||
tags = [
|
||||
"netgo"
|
||||
"osusergo"
|
||||
"sqlite_omit_load_extension"
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-X github.com/ZaparooProject/zaparoo-core/pkg/config.AppVersion=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
env.CGO_ENABLED = 1;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libusb1
|
||||
libnfc
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
mkdir -p pkg/assets/_app/dist
|
||||
tar xf ${finalAttrs.webUI} -C pkg/assets/_app/dist/
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/linux $out/bin/zaparoo
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
versionCheckProgramArg = "--version";
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Launch games and cores on your MiSTer, emulators and handhelds using NFC tags or cards";
|
||||
homepage = "https://zaparoo.org/";
|
||||
changelog = "https://github.com/ZaparooProject/zaparoo-core/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ liberodark ];
|
||||
mainProgram = "zaparoo";
|
||||
};
|
||||
})
|
||||
@@ -19,6 +19,11 @@
|
||||
let
|
||||
packages = computeRequiredOctavePackages extraLibs;
|
||||
|
||||
# glibcLocalesUtf8 is null on darwin
|
||||
localeArchiveArgs = lib.optionalString (glibcLocalesUtf8 != null) ''
|
||||
--set LOCALE_ARCHIVE "${glibcLocalesUtf8}/lib/locale/locale-archive"
|
||||
'';
|
||||
|
||||
in
|
||||
buildEnv {
|
||||
name = "${octave.name}-env";
|
||||
@@ -47,7 +52,7 @@ buildEnv {
|
||||
if [ -x $prg ]; then
|
||||
makeWrapper "${octave}/bin/$prg" "$out/bin/$prg" \
|
||||
--set OCTAVE_SITE_INITFILE "$out/share/octave/site/m/startup/octaverc" \
|
||||
--set LOCALE_ARCHIVE "${glibcLocalesUtf8}/lib/locale/locale-archive"
|
||||
${localeArchiveArgs}
|
||||
fi
|
||||
done
|
||||
cd $out
|
||||
@@ -87,9 +92,9 @@ buildEnv {
|
||||
''
|
||||
+ postBuild;
|
||||
|
||||
inherit (octave) meta;
|
||||
inherit (octave) meta version;
|
||||
|
||||
passthru = octave.passthru // {
|
||||
passthru = (removeAttrs octave.passthru [ "tests" ]) // {
|
||||
interpreter = "$out/bin/octave";
|
||||
inherit octave;
|
||||
env = stdenv.mkDerivation {
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
ncurses,
|
||||
perl,
|
||||
flex,
|
||||
testers,
|
||||
texinfo,
|
||||
qhull,
|
||||
libsndfile,
|
||||
@@ -97,12 +98,12 @@ let
|
||||
allPkgs = pkgs;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "10.2.0";
|
||||
version = "10.3.0";
|
||||
pname = "octave";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/octave/octave-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-B/ttkznS81BzXJFnG+jodNFgAYzGtoj579nVWNI39p8=";
|
||||
sha256 = "sha256-L8s43AYuRA8eBsBpu8qEDtRtzI+YPkc+FVj8w4OE7ms=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -226,6 +227,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
withPackages = import ./with-packages.nix { inherit buildEnv octavePackages; };
|
||||
pkgs = octavePackages;
|
||||
interpreter = "${finalAttrs.finalPackage}/bin/octave";
|
||||
tests = {
|
||||
wrapper = testers.testVersion {
|
||||
package = finalAttrs.finalPackage.withPackages (ps: [ ps.doctest ]);
|
||||
command = "octave --version";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -68,6 +68,7 @@ mapAliases {
|
||||
inherit (pkgs) carbon-now-cli; # added 2023-08-17
|
||||
inherit (pkgs) carto; # added 2023-08-17
|
||||
castnow = pkgs.castnow; # added 2023-07-30
|
||||
inherit (pkgs) cdktf-cli; # added 2025-10-02
|
||||
inherit (pkgs) clean-css-cli; # added 2023-08-18
|
||||
inherit (pkgs) clubhouse-cli; # added 2023-08-18
|
||||
inherit (pkgs) coc-clangd; # added 2024-06-29
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
"@webassemblyjs/wast-refmt-1.11.1" = "wast-refmt";
|
||||
aws-cdk = "cdk";
|
||||
cdk8s-cli = "cdk8s";
|
||||
cdktf-cli = "cdktf";
|
||||
clipboard-cli = "clipboard";
|
||||
conventional-changelog-cli = "conventional-changelog";
|
||||
cpy-cli = "cpy";
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
, "browserify"
|
||||
, "browser-sync"
|
||||
, "cdk8s-cli"
|
||||
, "cdktf-cli"
|
||||
, "clipboard-cli"
|
||||
, "coc-cmake"
|
||||
, "coc-emmet"
|
||||
|
||||
-865
@@ -45331,871 +45331,6 @@ in
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
cdktf-cli = nodeEnv.buildNodePackage {
|
||||
name = "cdktf-cli";
|
||||
packageName = "cdktf-cli";
|
||||
version = "0.20.11";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.20.11.tgz";
|
||||
sha512 = "kqyTemob5ocfKmpEkz+nSo2ULKHz1/j1dj3i6+7Evlcl1SHYBoOCXIJBYIggOPXj93cvEN0fzoaHE6Q8xCUAEg==";
|
||||
};
|
||||
dependencies = [
|
||||
(
|
||||
sources."@alcalzone/ansi-tokenize-0.1.3"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."ansi-styles-6.2.1"
|
||||
sources."is-fullwidth-code-point-4.0.0"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."@babel/code-frame-7.26.2"
|
||||
sources."@babel/generator-7.26.3"
|
||||
sources."@babel/helper-string-parser-7.25.9"
|
||||
sources."@babel/helper-validator-identifier-7.25.9"
|
||||
(
|
||||
sources."@babel/parser-7.26.10"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."@babel/types-7.26.10"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."@babel/template-7.25.9"
|
||||
sources."@babel/types-7.26.3"
|
||||
(
|
||||
sources."@cdktf/cli-core-0.20.11"
|
||||
// {
|
||||
dependencies = [
|
||||
(
|
||||
sources."ansi-escapes-4.3.2"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."type-fest-0.21.3"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."auto-bind-4.0.0"
|
||||
sources."cli-boxes-2.2.1"
|
||||
sources."cli-cursor-3.1.0"
|
||||
sources."cli-truncate-2.1.0"
|
||||
sources."code-excerpt-3.0.0"
|
||||
sources."convert-to-spaces-1.0.2"
|
||||
sources."indent-string-4.0.0"
|
||||
sources."ink-3.2.0"
|
||||
sources."patch-console-1.0.0"
|
||||
sources."react-17.0.2"
|
||||
sources."react-reconciler-0.26.2"
|
||||
sources."restore-cursor-3.1.0"
|
||||
sources."scheduler-0.20.2"
|
||||
sources."semver-7.6.3"
|
||||
sources."slice-ansi-3.0.0"
|
||||
sources."type-fest-0.12.0"
|
||||
sources."utf-8-validate-5.0.10"
|
||||
sources."uuid-8.3.2"
|
||||
sources."widest-line-3.1.0"
|
||||
sources."wrap-ansi-6.2.0"
|
||||
sources."ws-7.5.10"
|
||||
];
|
||||
}
|
||||
)
|
||||
(
|
||||
sources."@cdktf/commons-0.20.11"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."fs-extra-11.2.0"
|
||||
sources."jsonfile-6.1.0"
|
||||
sources."universalify-2.0.1"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."@cdktf/hcl-tools-0.20.11"
|
||||
(
|
||||
sources."@cdktf/hcl2cdk-0.20.11"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."brace-expansion-2.0.1"
|
||||
sources."glob-10.4.5"
|
||||
sources."minimatch-9.0.5"
|
||||
];
|
||||
}
|
||||
)
|
||||
(
|
||||
sources."@cdktf/hcl2json-0.20.11"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."fs-extra-11.2.0"
|
||||
sources."jsonfile-6.1.0"
|
||||
sources."universalify-2.0.1"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."@cdktf/node-pty-prebuilt-multiarch-0.10.1-pre.11"
|
||||
(
|
||||
sources."@cdktf/provider-generator-0.20.11"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."brace-expansion-2.0.1"
|
||||
sources."glob-10.4.5"
|
||||
sources."minimatch-9.0.5"
|
||||
];
|
||||
}
|
||||
)
|
||||
(
|
||||
sources."@cdktf/provider-schema-0.20.11"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."fs-extra-11.2.0"
|
||||
sources."jsonfile-6.1.0"
|
||||
sources."universalify-2.0.1"
|
||||
];
|
||||
}
|
||||
)
|
||||
(
|
||||
sources."@inquirer/checkbox-1.5.2"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."@inquirer/core-6.0.0"
|
||||
sources."@types/mute-stream-0.0.4"
|
||||
sources."@types/node-20.17.24"
|
||||
sources."ansi-escapes-4.3.2"
|
||||
sources."signal-exit-4.1.0"
|
||||
sources."type-fest-0.21.3"
|
||||
sources."undici-types-6.19.8"
|
||||
sources."wrap-ansi-6.2.0"
|
||||
];
|
||||
}
|
||||
)
|
||||
(
|
||||
sources."@inquirer/confirm-2.0.17"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."@inquirer/core-6.0.0"
|
||||
sources."@types/mute-stream-0.0.4"
|
||||
sources."@types/node-20.17.24"
|
||||
sources."ansi-escapes-4.3.2"
|
||||
sources."signal-exit-4.1.0"
|
||||
sources."type-fest-0.21.3"
|
||||
sources."undici-types-6.19.8"
|
||||
sources."wrap-ansi-6.2.0"
|
||||
];
|
||||
}
|
||||
)
|
||||
(
|
||||
sources."@inquirer/core-2.3.1"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."@types/node-20.17.24"
|
||||
sources."ansi-escapes-4.3.2"
|
||||
sources."type-fest-0.21.3"
|
||||
sources."undici-types-6.19.8"
|
||||
sources."wrap-ansi-6.2.0"
|
||||
];
|
||||
}
|
||||
)
|
||||
(
|
||||
sources."@inquirer/editor-1.2.15"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."@inquirer/core-6.0.0"
|
||||
sources."@types/mute-stream-0.0.4"
|
||||
sources."@types/node-20.17.24"
|
||||
sources."ansi-escapes-4.3.2"
|
||||
sources."signal-exit-4.1.0"
|
||||
sources."type-fest-0.21.3"
|
||||
sources."undici-types-6.19.8"
|
||||
sources."wrap-ansi-6.2.0"
|
||||
];
|
||||
}
|
||||
)
|
||||
(
|
||||
sources."@inquirer/expand-1.1.16"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."@inquirer/core-6.0.0"
|
||||
sources."@types/mute-stream-0.0.4"
|
||||
sources."@types/node-20.17.24"
|
||||
sources."ansi-escapes-4.3.2"
|
||||
sources."signal-exit-4.1.0"
|
||||
sources."type-fest-0.21.3"
|
||||
sources."undici-types-6.19.8"
|
||||
sources."wrap-ansi-6.2.0"
|
||||
];
|
||||
}
|
||||
)
|
||||
(
|
||||
sources."@inquirer/input-1.2.16"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."@inquirer/core-6.0.0"
|
||||
sources."@types/mute-stream-0.0.4"
|
||||
sources."@types/node-20.17.24"
|
||||
sources."ansi-escapes-4.3.2"
|
||||
sources."signal-exit-4.1.0"
|
||||
sources."type-fest-0.21.3"
|
||||
sources."undici-types-6.19.8"
|
||||
sources."wrap-ansi-6.2.0"
|
||||
];
|
||||
}
|
||||
)
|
||||
(
|
||||
sources."@inquirer/password-1.1.16"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."@inquirer/core-6.0.0"
|
||||
sources."@types/mute-stream-0.0.4"
|
||||
sources."@types/node-20.17.24"
|
||||
sources."ansi-escapes-4.3.2"
|
||||
sources."signal-exit-4.1.0"
|
||||
sources."type-fest-0.21.3"
|
||||
sources."undici-types-6.19.8"
|
||||
sources."wrap-ansi-6.2.0"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."@inquirer/prompts-2.3.1"
|
||||
(
|
||||
sources."@inquirer/rawlist-1.2.16"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."@inquirer/core-6.0.0"
|
||||
sources."@types/mute-stream-0.0.4"
|
||||
sources."@types/node-20.17.24"
|
||||
sources."ansi-escapes-4.3.2"
|
||||
sources."signal-exit-4.1.0"
|
||||
sources."type-fest-0.21.3"
|
||||
sources."undici-types-6.19.8"
|
||||
sources."wrap-ansi-6.2.0"
|
||||
];
|
||||
}
|
||||
)
|
||||
(
|
||||
sources."@inquirer/select-1.3.3"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."@inquirer/core-6.0.0"
|
||||
sources."@types/mute-stream-0.0.4"
|
||||
sources."@types/node-20.17.24"
|
||||
sources."ansi-escapes-4.3.2"
|
||||
sources."signal-exit-4.1.0"
|
||||
sources."type-fest-0.21.3"
|
||||
sources."undici-types-6.19.8"
|
||||
sources."wrap-ansi-6.2.0"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."@inquirer/type-1.5.5"
|
||||
(
|
||||
sources."@isaacs/cliui-8.0.2"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."ansi-regex-6.1.0"
|
||||
sources."ansi-styles-6.2.1"
|
||||
sources."emoji-regex-9.2.2"
|
||||
sources."string-width-5.1.2"
|
||||
sources."strip-ansi-7.1.0"
|
||||
sources."wrap-ansi-8.1.0"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."@jridgewell/gen-mapping-0.3.8"
|
||||
sources."@jridgewell/resolve-uri-3.1.2"
|
||||
sources."@jridgewell/set-array-1.2.1"
|
||||
sources."@jridgewell/sourcemap-codec-1.5.0"
|
||||
sources."@jridgewell/trace-mapping-0.3.25"
|
||||
sources."@jsii/check-node-1.102.0"
|
||||
sources."@jsii/spec-1.109.0"
|
||||
sources."@nodelib/fs.scandir-2.1.5"
|
||||
sources."@nodelib/fs.stat-2.0.5"
|
||||
sources."@nodelib/fs.walk-1.2.8"
|
||||
sources."@sentry-internal/tracing-7.120.1"
|
||||
sources."@sentry/core-7.120.1"
|
||||
sources."@sentry/integrations-7.120.1"
|
||||
sources."@sentry/node-7.120.1"
|
||||
sources."@sentry/types-7.120.1"
|
||||
sources."@sentry/utils-7.120.1"
|
||||
sources."@types/mute-stream-0.0.1"
|
||||
sources."@types/node-18.19.67"
|
||||
sources."@types/react-19.0.10"
|
||||
sources."@types/wrap-ansi-3.0.0"
|
||||
sources."@types/yauzl-2.10.3"
|
||||
sources."@types/yoga-layout-1.9.2"
|
||||
sources."@xmldom/xmldom-0.8.10"
|
||||
sources."address-1.2.2"
|
||||
sources."agent-base-6.0.2"
|
||||
sources."ajv-8.17.1"
|
||||
sources."ansi-escapes-7.0.0"
|
||||
sources."ansi-regex-5.0.1"
|
||||
sources."ansi-styles-4.3.0"
|
||||
sources."anymatch-3.1.3"
|
||||
sources."archiver-5.3.2"
|
||||
(
|
||||
sources."archiver-utils-2.1.0"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."isarray-1.0.0"
|
||||
sources."readable-stream-2.3.8"
|
||||
sources."safe-buffer-5.1.2"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."arr-rotate-1.0.0"
|
||||
sources."array-buffer-byte-length-1.0.2"
|
||||
sources."astral-regex-2.0.0"
|
||||
sources."async-3.2.6"
|
||||
sources."auto-bind-5.0.1"
|
||||
sources."available-typed-arrays-1.0.7"
|
||||
sources."balanced-match-1.0.2"
|
||||
sources."base64-js-1.5.1"
|
||||
sources."binary-extensions-2.3.0"
|
||||
sources."bl-4.1.0"
|
||||
sources."brace-expansion-1.1.11"
|
||||
sources."braces-3.0.3"
|
||||
sources."buffer-5.7.1"
|
||||
sources."buffer-crc32-0.2.13"
|
||||
sources."bufferutil-4.0.9"
|
||||
sources."call-bind-1.0.8"
|
||||
sources."call-bind-apply-helpers-1.0.2"
|
||||
sources."call-bound-1.0.4"
|
||||
sources."camelcase-6.3.0"
|
||||
sources."case-1.6.3"
|
||||
sources."cdktf-0.20.11"
|
||||
sources."chalk-4.1.2"
|
||||
sources."chardet-0.7.0"
|
||||
sources."chokidar-3.6.0"
|
||||
sources."chownr-1.1.4"
|
||||
sources."ci-info-3.9.0"
|
||||
sources."cli-boxes-3.0.0"
|
||||
sources."cli-cursor-4.0.0"
|
||||
sources."cli-spinners-2.9.2"
|
||||
(
|
||||
sources."cli-truncate-4.0.0"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."ansi-regex-6.1.0"
|
||||
sources."ansi-styles-6.2.1"
|
||||
sources."emoji-regex-10.4.0"
|
||||
sources."is-fullwidth-code-point-4.0.0"
|
||||
sources."slice-ansi-5.0.0"
|
||||
sources."string-width-7.2.0"
|
||||
sources."strip-ansi-7.1.0"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."cli-width-4.1.0"
|
||||
sources."cliui-8.0.1"
|
||||
sources."clone-2.1.2"
|
||||
sources."code-excerpt-4.0.0"
|
||||
(
|
||||
sources."codemaker-1.102.0"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."fs-extra-10.1.0"
|
||||
sources."jsonfile-6.1.0"
|
||||
sources."universalify-2.0.1"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."color-convert-2.0.1"
|
||||
sources."color-name-1.1.4"
|
||||
sources."commonmark-0.31.2"
|
||||
sources."compress-commons-4.1.2"
|
||||
sources."concat-map-0.0.1"
|
||||
sources."constructs-10.3.0"
|
||||
sources."convert-to-spaces-2.0.1"
|
||||
sources."core-util-is-1.0.3"
|
||||
sources."crc-32-1.2.2"
|
||||
sources."crc32-stream-4.0.3"
|
||||
sources."cross-fetch-3.1.8"
|
||||
sources."cross-spawn-7.0.6"
|
||||
sources."csstype-3.1.3"
|
||||
sources."date-format-4.0.14"
|
||||
sources."debug-4.4.0"
|
||||
sources."decamelize-5.0.1"
|
||||
sources."decompress-response-6.0.0"
|
||||
sources."deep-equal-2.2.3"
|
||||
sources."deep-extend-0.6.0"
|
||||
sources."deepmerge-4.3.1"
|
||||
sources."define-data-property-1.1.4"
|
||||
sources."define-properties-1.2.1"
|
||||
sources."detect-indent-5.0.0"
|
||||
sources."detect-libc-2.0.3"
|
||||
sources."detect-newline-2.1.0"
|
||||
sources."detect-port-1.6.1"
|
||||
(
|
||||
sources."downlevel-dts-0.11.0"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."typescript-5.9.0-dev.20250314"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."dunder-proto-1.0.1"
|
||||
sources."eastasianwidth-0.2.0"
|
||||
sources."emoji-regex-8.0.0"
|
||||
sources."encoding-0.1.13"
|
||||
sources."end-of-stream-1.4.4"
|
||||
sources."entities-3.0.1"
|
||||
sources."environment-1.1.0"
|
||||
sources."es-define-property-1.0.1"
|
||||
sources."es-errors-1.3.0"
|
||||
sources."es-get-iterator-1.1.3"
|
||||
sources."es-object-atoms-1.1.1"
|
||||
sources."es-toolkit-1.33.0"
|
||||
sources."escalade-3.2.0"
|
||||
sources."escape-string-regexp-2.0.0"
|
||||
sources."events-3.3.0"
|
||||
sources."execa-5.1.1"
|
||||
sources."expand-template-2.0.3"
|
||||
(
|
||||
sources."external-editor-3.1.0"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."iconv-lite-0.4.24"
|
||||
];
|
||||
}
|
||||
)
|
||||
(
|
||||
sources."extract-zip-2.0.1"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."get-stream-5.2.0"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."fast-deep-equal-3.1.3"
|
||||
sources."fast-glob-3.3.3"
|
||||
sources."fast-uri-3.0.6"
|
||||
sources."fastq-1.19.1"
|
||||
sources."fd-slicer-1.1.0"
|
||||
(
|
||||
sources."figures-3.2.0"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."escape-string-regexp-1.0.5"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."fill-range-7.1.1"
|
||||
sources."find-up-3.0.0"
|
||||
sources."flatted-3.3.3"
|
||||
sources."follow-redirects-1.15.9"
|
||||
sources."for-each-0.3.5"
|
||||
(
|
||||
sources."foreground-child-3.3.1"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."signal-exit-4.1.0"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."fs-constants-1.0.0"
|
||||
sources."fs-extra-8.1.0"
|
||||
sources."fs.realpath-1.0.0"
|
||||
sources."function-bind-1.1.2"
|
||||
sources."functions-have-names-1.2.3"
|
||||
sources."get-caller-file-2.0.5"
|
||||
sources."get-east-asian-width-1.3.0"
|
||||
sources."get-intrinsic-1.3.0"
|
||||
sources."get-proto-1.0.1"
|
||||
sources."get-stream-6.0.1"
|
||||
sources."github-from-package-0.0.0"
|
||||
(
|
||||
sources."glob-7.2.3"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."minimatch-3.1.2"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."glob-parent-5.1.2"
|
||||
sources."gopd-1.2.0"
|
||||
sources."graceful-fs-4.2.11"
|
||||
sources."graphology-0.25.4"
|
||||
sources."graphology-types-0.24.7"
|
||||
sources."has-bigints-1.1.0"
|
||||
sources."has-flag-4.0.0"
|
||||
sources."has-property-descriptors-1.0.2"
|
||||
sources."has-symbols-1.1.0"
|
||||
sources."has-tostringtag-1.0.2"
|
||||
sources."hasown-2.0.2"
|
||||
sources."https-proxy-agent-5.0.1"
|
||||
sources."human-signals-2.1.0"
|
||||
sources."iconv-lite-0.6.3"
|
||||
sources."ieee754-1.2.1"
|
||||
sources."immediate-3.0.6"
|
||||
sources."indent-string-5.0.0"
|
||||
sources."inflight-1.0.6"
|
||||
sources."inherits-2.0.4"
|
||||
sources."ini-1.3.8"
|
||||
(
|
||||
sources."ink-5.2.0"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."ansi-regex-6.1.0"
|
||||
sources."ansi-styles-6.2.1"
|
||||
sources."chalk-5.4.1"
|
||||
sources."emoji-regex-10.4.0"
|
||||
sources."string-width-7.2.0"
|
||||
sources."strip-ansi-7.1.0"
|
||||
sources."wrap-ansi-9.0.0"
|
||||
];
|
||||
}
|
||||
)
|
||||
(
|
||||
sources."ink-select-input-4.2.2"
|
||||
// {
|
||||
dependencies = [
|
||||
(
|
||||
sources."ansi-escapes-4.3.2"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."type-fest-0.21.3"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."auto-bind-4.0.0"
|
||||
sources."cli-boxes-2.2.1"
|
||||
sources."cli-cursor-3.1.0"
|
||||
sources."cli-truncate-2.1.0"
|
||||
sources."code-excerpt-3.0.0"
|
||||
sources."convert-to-spaces-1.0.2"
|
||||
sources."indent-string-4.0.0"
|
||||
sources."ink-3.2.0"
|
||||
sources."patch-console-1.0.0"
|
||||
sources."react-17.0.2"
|
||||
sources."react-reconciler-0.26.2"
|
||||
sources."restore-cursor-3.1.0"
|
||||
sources."scheduler-0.20.2"
|
||||
sources."slice-ansi-3.0.0"
|
||||
sources."type-fest-0.12.0"
|
||||
sources."utf-8-validate-5.0.10"
|
||||
sources."widest-line-3.1.0"
|
||||
sources."wrap-ansi-6.2.0"
|
||||
sources."ws-7.5.10"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."ink-spinner-4.0.3"
|
||||
sources."ink-table-3.1.0"
|
||||
sources."ink-testing-library-2.1.0"
|
||||
sources."ink-use-stdout-dimensions-1.0.5"
|
||||
sources."internal-slot-1.1.0"
|
||||
sources."interpret-1.4.0"
|
||||
sources."is-arguments-1.2.0"
|
||||
sources."is-array-buffer-3.0.5"
|
||||
sources."is-bigint-1.1.0"
|
||||
sources."is-binary-path-2.1.0"
|
||||
sources."is-boolean-object-1.2.2"
|
||||
sources."is-callable-1.2.7"
|
||||
(
|
||||
sources."is-ci-2.0.0"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."ci-info-2.0.0"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."is-core-module-2.16.1"
|
||||
sources."is-date-object-1.1.0"
|
||||
sources."is-docker-2.2.1"
|
||||
sources."is-extglob-2.1.1"
|
||||
sources."is-fullwidth-code-point-3.0.0"
|
||||
sources."is-glob-4.0.3"
|
||||
sources."is-in-ci-1.0.0"
|
||||
sources."is-map-2.0.3"
|
||||
sources."is-number-7.0.0"
|
||||
sources."is-number-object-1.1.1"
|
||||
sources."is-regex-1.2.1"
|
||||
sources."is-set-2.0.3"
|
||||
sources."is-shared-array-buffer-1.0.4"
|
||||
sources."is-stream-2.0.1"
|
||||
sources."is-string-1.1.1"
|
||||
sources."is-symbol-1.1.1"
|
||||
sources."is-weakmap-2.0.2"
|
||||
sources."is-weakset-2.0.4"
|
||||
sources."is-wsl-2.2.0"
|
||||
sources."isarray-2.0.5"
|
||||
sources."isexe-2.0.0"
|
||||
sources."jackspeak-3.4.3"
|
||||
sources."js-tokens-4.0.0"
|
||||
sources."jsesc-3.1.0"
|
||||
sources."jsii-5.4.31"
|
||||
(
|
||||
sources."jsii-pacmak-1.102.0"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."cliui-7.0.4"
|
||||
sources."escape-string-regexp-4.0.0"
|
||||
sources."fs-extra-10.1.0"
|
||||
sources."jsonfile-6.1.0"
|
||||
sources."universalify-2.0.1"
|
||||
sources."yargs-16.2.0"
|
||||
sources."yargs-parser-20.2.9"
|
||||
];
|
||||
}
|
||||
)
|
||||
(
|
||||
sources."jsii-reflect-1.109.0"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."@jsii/check-node-1.109.0"
|
||||
sources."cliui-7.0.4"
|
||||
sources."fs-extra-10.1.0"
|
||||
sources."jsonfile-6.1.0"
|
||||
sources."universalify-2.0.1"
|
||||
sources."yargs-16.2.0"
|
||||
sources."yargs-parser-20.2.9"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."jsii-rosetta-5.4.30"
|
||||
sources."json-schema-traverse-1.0.0"
|
||||
sources."jsonfile-4.0.0"
|
||||
(
|
||||
sources."lazystream-1.0.1"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."isarray-1.0.0"
|
||||
sources."readable-stream-2.3.8"
|
||||
sources."safe-buffer-5.1.2"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."lie-3.1.1"
|
||||
sources."localforage-1.10.0"
|
||||
sources."locate-path-3.0.0"
|
||||
sources."lodash-4.17.21"
|
||||
sources."lodash.defaults-4.2.0"
|
||||
sources."lodash.difference-4.5.0"
|
||||
sources."lodash.flatten-4.4.0"
|
||||
sources."lodash.isequal-4.5.0"
|
||||
sources."lodash.isplainobject-4.0.6"
|
||||
sources."lodash.union-4.6.0"
|
||||
sources."log4js-6.9.1"
|
||||
sources."loose-envify-1.4.0"
|
||||
sources."lru-cache-10.4.3"
|
||||
sources."math-intrinsics-1.1.0"
|
||||
sources."mdurl-1.0.1"
|
||||
sources."merge-stream-2.0.0"
|
||||
sources."merge2-1.4.1"
|
||||
sources."micromatch-4.0.8"
|
||||
sources."mimic-fn-2.1.0"
|
||||
sources."mimic-response-3.1.0"
|
||||
(
|
||||
sources."minimatch-5.1.6"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."brace-expansion-2.0.1"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."minimist-1.2.8"
|
||||
sources."minipass-7.1.2"
|
||||
sources."mkdirp-classic-0.5.3"
|
||||
sources."ms-2.1.3"
|
||||
sources."mute-stream-1.0.0"
|
||||
sources."nan-2.22.2"
|
||||
sources."napi-build-utils-2.0.0"
|
||||
sources."node-abi-3.74.0"
|
||||
sources."node-fetch-2.7.0"
|
||||
sources."node-gyp-build-4.8.4"
|
||||
sources."normalize-path-3.0.0"
|
||||
sources."npm-run-path-4.0.1"
|
||||
sources."object-assign-4.1.1"
|
||||
sources."object-hash-2.2.0"
|
||||
sources."object-inspect-1.13.4"
|
||||
sources."object-is-1.1.6"
|
||||
sources."object-keys-1.1.1"
|
||||
sources."object.assign-4.1.7"
|
||||
sources."obliterator-2.0.5"
|
||||
sources."once-1.4.0"
|
||||
sources."onetime-5.1.2"
|
||||
sources."oo-ascii-tree-1.109.0"
|
||||
sources."open-7.4.2"
|
||||
sources."os-tmpdir-1.0.2"
|
||||
sources."p-limit-2.3.0"
|
||||
sources."p-locate-3.0.0"
|
||||
sources."p-try-2.2.0"
|
||||
sources."package-json-from-dist-1.0.1"
|
||||
sources."parse-gitignore-1.0.1"
|
||||
sources."patch-console-2.0.0"
|
||||
sources."path-exists-3.0.0"
|
||||
sources."path-is-absolute-1.0.1"
|
||||
sources."path-key-3.1.1"
|
||||
sources."path-parse-1.0.7"
|
||||
sources."path-scurry-1.11.1"
|
||||
sources."pend-1.2.0"
|
||||
sources."picocolors-1.1.1"
|
||||
sources."picomatch-2.3.1"
|
||||
sources."pidtree-0.6.0"
|
||||
sources."pidusage-3.0.2"
|
||||
sources."pkg-up-3.1.0"
|
||||
sources."possible-typed-array-names-1.1.0"
|
||||
sources."prebuild-install-7.1.3"
|
||||
sources."prettier-2.8.8"
|
||||
sources."process-nextick-args-2.0.1"
|
||||
sources."pump-3.0.2"
|
||||
sources."queue-microtask-1.2.3"
|
||||
sources."rc-1.2.8"
|
||||
sources."react-19.0.0"
|
||||
(
|
||||
sources."react-devtools-core-4.28.5"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."utf-8-validate-5.0.10"
|
||||
sources."ws-7.5.10"
|
||||
];
|
||||
}
|
||||
)
|
||||
(
|
||||
sources."react-reconciler-0.29.2"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."react-18.3.1"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."readable-stream-3.6.2"
|
||||
sources."readdir-glob-1.1.3"
|
||||
sources."readdirp-3.6.0"
|
||||
sources."rechoir-0.6.2"
|
||||
sources."regexp.prototype.flags-1.5.4"
|
||||
sources."require-directory-2.1.1"
|
||||
sources."require-from-string-2.0.2"
|
||||
sources."reserved-words-0.1.2"
|
||||
sources."resolve-1.22.10"
|
||||
sources."restore-cursor-4.0.0"
|
||||
sources."reusify-1.1.0"
|
||||
sources."rfdc-1.4.1"
|
||||
sources."run-async-3.0.0"
|
||||
sources."run-parallel-1.2.0"
|
||||
sources."safe-buffer-5.2.1"
|
||||
sources."safe-regex-test-1.1.0"
|
||||
sources."safer-buffer-2.1.2"
|
||||
sources."sax-1.4.1"
|
||||
sources."scheduler-0.23.2"
|
||||
sources."semver-7.7.1"
|
||||
(
|
||||
sources."semver-intersect-1.5.0"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."semver-6.3.1"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."set-function-length-1.2.2"
|
||||
sources."set-function-name-2.0.2"
|
||||
sources."shebang-command-2.0.0"
|
||||
sources."shebang-regex-3.0.0"
|
||||
sources."shell-quote-1.8.2"
|
||||
sources."shelljs-0.8.5"
|
||||
sources."side-channel-1.1.0"
|
||||
sources."side-channel-list-1.0.0"
|
||||
sources."side-channel-map-1.0.1"
|
||||
sources."side-channel-weakmap-1.0.2"
|
||||
sources."signal-exit-3.0.7"
|
||||
sources."simple-concat-1.0.1"
|
||||
sources."simple-get-4.0.1"
|
||||
(
|
||||
sources."slice-ansi-7.1.0"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."ansi-styles-6.2.1"
|
||||
sources."is-fullwidth-code-point-5.0.0"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."sort-json-2.0.1"
|
||||
sources."spdx-license-list-6.9.0"
|
||||
sources."sscaff-1.2.274"
|
||||
sources."stack-utils-2.0.6"
|
||||
sources."stop-iteration-iterator-1.1.0"
|
||||
sources."stream-buffers-3.0.3"
|
||||
sources."stream-chain-2.2.5"
|
||||
sources."stream-json-1.9.1"
|
||||
sources."streamroller-3.1.5"
|
||||
sources."string-width-4.2.3"
|
||||
sources."string-width-cjs-4.2.3"
|
||||
(
|
||||
sources."string_decoder-1.1.1"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."safe-buffer-5.1.2"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."strip-ansi-6.0.1"
|
||||
sources."strip-ansi-cjs-6.0.1"
|
||||
sources."strip-final-newline-2.0.0"
|
||||
sources."strip-json-comments-2.0.1"
|
||||
sources."supports-color-7.2.0"
|
||||
sources."supports-preserve-symlinks-flag-1.0.0"
|
||||
sources."tar-fs-2.1.2"
|
||||
sources."tar-stream-2.2.0"
|
||||
sources."tmp-0.0.33"
|
||||
sources."to-regex-range-5.0.1"
|
||||
sources."tr46-0.0.3"
|
||||
sources."tunnel-agent-0.6.0"
|
||||
sources."type-fest-4.37.0"
|
||||
sources."typescript-5.4.5"
|
||||
sources."undici-types-5.26.5"
|
||||
sources."universalify-0.1.2"
|
||||
sources."utf-8-validate-6.0.5"
|
||||
sources."util-deprecate-1.0.2"
|
||||
sources."uuid-9.0.1"
|
||||
sources."validator-13.12.0"
|
||||
sources."webidl-conversions-3.0.1"
|
||||
sources."whatwg-url-5.0.0"
|
||||
sources."which-2.0.2"
|
||||
sources."which-boxed-primitive-1.1.1"
|
||||
sources."which-collection-1.0.2"
|
||||
sources."which-typed-array-1.1.19"
|
||||
(
|
||||
sources."widest-line-5.0.0"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."ansi-regex-6.1.0"
|
||||
sources."emoji-regex-10.4.0"
|
||||
sources."string-width-7.2.0"
|
||||
sources."strip-ansi-7.1.0"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."workerpool-6.5.1"
|
||||
sources."wrap-ansi-7.0.0"
|
||||
sources."wrap-ansi-cjs-7.0.0"
|
||||
sources."wrappy-1.0.2"
|
||||
sources."ws-8.18.1"
|
||||
sources."xml-js-1.6.11"
|
||||
sources."xmlbuilder-15.1.1"
|
||||
sources."xstate-4.38.3"
|
||||
sources."y18n-5.0.8"
|
||||
sources."yargs-17.7.2"
|
||||
sources."yargs-parser-21.1.1"
|
||||
sources."yauzl-2.10.0"
|
||||
sources."yoga-layout-3.2.1"
|
||||
sources."yoga-layout-prebuilt-1.10.0"
|
||||
(
|
||||
sources."zip-stream-4.1.1"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."archiver-utils-3.0.4"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."zod-3.23.8"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "CDK for Terraform CLI";
|
||||
homepage = "https://github.com/hashicorp/terraform-cdk#readme";
|
||||
license = "MPL-2.0";
|
||||
};
|
||||
production = true;
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
clipboard-cli = nodeEnv.buildNodePackage {
|
||||
name = "clipboard-cli";
|
||||
packageName = "clipboard-cli";
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncer";
|
||||
version = "0.0.8";
|
||||
version = "0.0.9";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastapi";
|
||||
repo = "asyncer";
|
||||
tag = version;
|
||||
hash = "sha256-SbByOiTYzp+G+SvsDqXOQBAG6nigtBXiQmfGgfKRqvM=";
|
||||
hash = "sha256-1M5MGaxfEfJMCfAoGorNGbRBZdvLue5lHu8DuR96mLo=";
|
||||
};
|
||||
|
||||
build-system = [ pdm-backend ];
|
||||
|
||||
@@ -9,32 +9,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lxml-html-clean";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fedora-python";
|
||||
repo = "lxml_html_clean";
|
||||
tag = version;
|
||||
hash = "sha256-KGUFRbcaeDcX2jyoyyZMZsVTbN+h8uy+ugcritkZe38=";
|
||||
hash = "sha256-pMZgECts7QqddI76EHnEDhQ0IoR/yioQXTqcg1npCOA=";
|
||||
};
|
||||
|
||||
# Disable failing snapshot tests (AssertionError)
|
||||
# https://github.com/fedora-python/lxml_html_clean/issues/24
|
||||
# As this derivation must use unittestCheckHook, we cannot use disabledTests
|
||||
postPatch = ''
|
||||
substituteInPlace tests/test_clean.py \
|
||||
--replace-fail \
|
||||
"test_host_whitelist_valid" \
|
||||
"DISABLED_test_host_whitelist_valid" \
|
||||
--replace-fail \
|
||||
"test_host_whitelist_invalid" \
|
||||
"DISABLED_test_host_whitelist_invalid" \
|
||||
--replace-fail \
|
||||
"test_host_whitelist_sneaky_userinfo" \
|
||||
"DISABLED_test_host_whitelist_sneaky_userinfo"
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ lxml ];
|
||||
|
||||
@@ -34,13 +34,13 @@
|
||||
|
||||
let
|
||||
pname = "psycopg";
|
||||
version = "3.2.9";
|
||||
version = "3.2.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "psycopg";
|
||||
repo = "psycopg";
|
||||
tag = version;
|
||||
hash = "sha256-mMhfULdvqphwdEqynLNq+7XCNmqmf+zi1SGumC/6qAc=";
|
||||
hash = "sha256-ZvqhvjDhrZ7uKi9fE/UYRaJblmfXXH6pYoUZ5u7cOu0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -68,9 +68,6 @@ let
|
||||
# move into source root after patching
|
||||
postPatch = ''
|
||||
cd psycopg_c
|
||||
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "Cython >= 3.0.0, < 3.1.0" "Cython"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,23 +6,20 @@
|
||||
hatch-vcs,
|
||||
hatchling,
|
||||
httpx,
|
||||
importlib-metadata,
|
||||
pytest-random-order,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylast";
|
||||
version = "5.5.0";
|
||||
version = "6.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pylast";
|
||||
repo = "pylast";
|
||||
tag = version;
|
||||
hash = "sha256-mPdFG3wqdAyluD37cy2q6oO/x9NgXpOb57s4nU05EzQ=";
|
||||
hash = "sha256-mwPiHTLFvaCFPZGqi0+T223Ickbm5JP2MJj4gqaj/qo=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -30,9 +27,10 @@ buildPythonPackage rec {
|
||||
hatchling
|
||||
];
|
||||
|
||||
dependencies = [ httpx ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
|
||||
dependencies = [ httpx ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-random-order
|
||||
pytestCheckHook
|
||||
flaky
|
||||
];
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tree-sitter-javascript";
|
||||
version = "0.23.1";
|
||||
version = "0.25.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-javascript";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-apgWWYD0XOvH5c3BY7kAF7UYtwPJaEvJzC5aWvJ9YQ8=";
|
||||
hash = "sha256-2Jj/SUG+k8lHlGSuPZvHjJojvQFgDiZHZzH8xLu7suE=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -31,11 +31,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qtcreator";
|
||||
version = "17.0.1";
|
||||
version = "17.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://qt/official_releases/${finalAttrs.pname}/${lib.versions.majorMinor finalAttrs.version}/${finalAttrs.version}/qt-creator-opensource-src-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-9WcYCEdnBzkami7bmWPqSmtrkMeMvnTs4aygxrQuUYQ=";
|
||||
hash = "sha256-sOEY+fuJvnF2KLP5JRwpX6bfQfqLfYEhbi6tg1XlWhM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
Reference in New Issue
Block a user