Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -1488,12 +1488,6 @@
|
||||
name = "Anas Elgarhy";
|
||||
keys = [ { fingerprint = "E10B D192 9231 08C7 3C35 7EC3 83E0 3DC6 F383 4086"; } ];
|
||||
};
|
||||
AnatolyPopov = {
|
||||
email = "aipopov@live.ru";
|
||||
github = "AnatolyPopov";
|
||||
githubId = 2312534;
|
||||
name = "Anatolii Popov";
|
||||
};
|
||||
andehen = {
|
||||
email = "git@andehen.net";
|
||||
github = "andehen";
|
||||
@@ -12899,12 +12893,6 @@
|
||||
githubId = 20658981;
|
||||
name = "Jarosław Wygoda";
|
||||
};
|
||||
jyp = {
|
||||
email = "jeanphilippe.bernardy@gmail.com";
|
||||
github = "jyp";
|
||||
githubId = 27747;
|
||||
name = "Jean-Philippe Bernardy";
|
||||
};
|
||||
jzellner = {
|
||||
email = "jeffz@eml.cc";
|
||||
github = "sofuture";
|
||||
@@ -18842,11 +18830,6 @@
|
||||
githubId = 9091609;
|
||||
name = "Omar Jatoi";
|
||||
};
|
||||
omasanori = {
|
||||
github = "omasanori";
|
||||
githubId = 167209;
|
||||
name = "Masanori Ogino";
|
||||
};
|
||||
omgbebebe = {
|
||||
email = "omgbebebe@gmail.com";
|
||||
github = "omgbebebe";
|
||||
@@ -19342,6 +19325,12 @@
|
||||
githubId = 821972;
|
||||
name = "Parth Mehrotra";
|
||||
};
|
||||
pascalj = {
|
||||
email = "nix@pascalj.de";
|
||||
github = "pascalj";
|
||||
githubId = 330168;
|
||||
name = "Pascal Jungblut";
|
||||
};
|
||||
paschoal = {
|
||||
email = "paschoal@gmail.com";
|
||||
github = "paschoal";
|
||||
|
||||
@@ -1144,7 +1144,6 @@ with lib.maintainers;
|
||||
sage = {
|
||||
members = [
|
||||
timokau
|
||||
omasanori
|
||||
raskin
|
||||
collares
|
||||
];
|
||||
|
||||
@@ -50,11 +50,7 @@ in
|
||||
services.usbguard = {
|
||||
enable = lib.mkEnableOption "USBGuard daemon";
|
||||
|
||||
package = lib.mkPackageOption pkgs "usbguard" {
|
||||
extraDescription = ''
|
||||
If you do not need the Qt GUI, use `pkgs.usbguard-nox` to save disk space.
|
||||
'';
|
||||
};
|
||||
package = lib.mkPackageOption pkgs "usbguard" { };
|
||||
|
||||
ruleFile = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
|
||||
@@ -166,6 +166,13 @@ in
|
||||
type = lib.types.str;
|
||||
description = "S3 access key.";
|
||||
};
|
||||
accelerateUrl = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
default = null;
|
||||
description = ''
|
||||
URL for AWS S3 [transfer acceleration](https://docs.aws.amazon.com/AmazonS3/latest/userguide/transfer-acceleration.html).
|
||||
'';
|
||||
};
|
||||
secretKeyFile = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
description = "File path that contains the S3 secret key.";
|
||||
@@ -682,6 +689,10 @@ in
|
||||
AWS_S3_ACL = cfg.storage.acl;
|
||||
})
|
||||
|
||||
(lib.mkIf (cfg.storage.storageType == "s3" && cfg.storage.accelerateUrl != null) {
|
||||
AWS_S3_ACCELERATE_URL = cfg.storage.accelerateUrl;
|
||||
})
|
||||
|
||||
(lib.mkIf (cfg.slackAuthentication != null) {
|
||||
SLACK_CLIENT_ID = cfg.slackAuthentication.clientId;
|
||||
})
|
||||
|
||||
@@ -30,8 +30,7 @@
|
||||
enable = true;
|
||||
settings.server.HTTP_PORT = 3000;
|
||||
};
|
||||
# Uncomment the next line to lint service scripts (Note: breaks VM startup; see #373166)
|
||||
#systemd.enableStrictShellChecks = true;
|
||||
systemd.enableStrictShellChecks = true;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
|
||||
@@ -36,7 +36,6 @@
|
||||
lzo,
|
||||
lz4,
|
||||
mariadb-embedded,
|
||||
pcre,
|
||||
snappy,
|
||||
taglib,
|
||||
taglib_extras,
|
||||
@@ -93,7 +92,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
lz4
|
||||
lzo
|
||||
mariadb-embedded
|
||||
pcre
|
||||
snappy
|
||||
taglib
|
||||
taglib_extras
|
||||
|
||||
+46
@@ -0,0 +1,46 @@
|
||||
{
|
||||
# Basic
|
||||
lib,
|
||||
melpaBuild,
|
||||
fetchFromGitHub,
|
||||
# Updater
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
melpaBuild {
|
||||
|
||||
pname = "eaf-pyqterminal";
|
||||
version = "0-unstable-2025-05-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mumu-lhl";
|
||||
repo = "eaf-pyqterminal";
|
||||
rev = "db947f136660adc4c3883b332f4465af82e4c9da";
|
||||
hash = "sha256-0BH29XvBzJPgJBFSKHiKSLo/dpj5rixg7+u+LDpB5+U=";
|
||||
};
|
||||
|
||||
files = ''
|
||||
("*.el"
|
||||
"*.py")
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = unstableGitUpdater { };
|
||||
eafPythonDeps =
|
||||
ps: with ps; [
|
||||
pyte
|
||||
psutil
|
||||
];
|
||||
eafOtherDeps = [ ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Terminal written in PyQt6 for the EAF";
|
||||
homepage = "https://github.com/mumu-lhl/eaf-pyqterminal";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
thattemperature
|
||||
];
|
||||
};
|
||||
|
||||
}
|
||||
@@ -73,7 +73,7 @@
|
||||
"meta": {
|
||||
"isOpenSource": true,
|
||||
"description": "Free Java, Kotlin, Groovy and Scala IDE from jetbrains",
|
||||
"maintainers": [ "edwtjo", "gytis-ivaskevicius", "steinybot", "AnatolyPopov", "tymscar" ],
|
||||
"maintainers": [ "edwtjo", "gytis-ivaskevicius", "steinybot", "tymscar" ],
|
||||
"longDescription": "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ.",
|
||||
"homepage": "https://www.jetbrains.com/idea/"
|
||||
}
|
||||
@@ -85,7 +85,7 @@
|
||||
"meta": {
|
||||
"isOpenSource": false,
|
||||
"description": "Paid-for Java, Kotlin, Groovy and Scala IDE from jetbrains",
|
||||
"maintainers": [ "edwtjo", "gytis-ivaskevicius", "steinybot", "AnatolyPopov", "tymscar" ],
|
||||
"maintainers": [ "edwtjo", "gytis-ivaskevicius", "steinybot", "tymscar" ],
|
||||
"longDescription": "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ.",
|
||||
"homepage": "https://www.jetbrains.com/idea/"
|
||||
}
|
||||
|
||||
@@ -2430,8 +2430,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "Ionide-fsharp";
|
||||
publisher = "Ionide";
|
||||
version = "7.26.5";
|
||||
hash = "sha256-h652UK81MxEhwyJKlWLnueQmhpl2pHByvhPrfH+4WXk=";
|
||||
version = "7.26.6";
|
||||
hash = "sha256-oLzOkb0C93HlUcBKOKMa3u/jsRY6n8fnapRg5Jiyass=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog";
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "ethersync";
|
||||
name = "ethersync";
|
||||
version = "0.2.1";
|
||||
hash = "sha256-/oRpoYMWSpkAEM89KlJnSJ7TWwcGloYHXh80Ml+vz+M=";
|
||||
version = "0.4.0";
|
||||
hash = "sha256-/09be/1KZVIDUr+YieeD7xc8PXdchRo3Kt1GqD3Pt6M=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -67,6 +67,8 @@
|
||||
webrtcSupport = true;
|
||||
enableOfficialBranding = false;
|
||||
geolocationSupport = true;
|
||||
# https://github.com/NixOS/nixpkgs/issues/418473
|
||||
ltoSupport = false;
|
||||
}
|
||||
).overrideAttrs
|
||||
(prev: {
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "helm-diff";
|
||||
version = "3.12.3";
|
||||
version = "3.12.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "databus23";
|
||||
repo = "helm-diff";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zYeZwR8hDNYVJGdYjQNrQmyD5AwGcgyO7LzC5bd10k0=";
|
||||
hash = "sha256-w57EhXjaOEZaQV4FcvzjV4rMUVIwLlUJ3XlD+SLcLa8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rz5RZiKGM1AdDm4R2IPOYn///fKKmo96u2LROShFPJM=";
|
||||
vendorHash = "sha256-FSyWFJSQBCRpHNrQTPz392H0dE37w1JcwJmoL0dg9fE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -534,11 +534,11 @@
|
||||
"vendorHash": "sha256-n6UUSCQt3mJESEfqVHX4sfr1XqOXu+u7Qejjps6RmBs="
|
||||
},
|
||||
"google-beta": {
|
||||
"hash": "sha256-O+rAH2VzDEr+uwyAAg74oS/HeytPLOm+1LTC7aswhIA=",
|
||||
"hash": "sha256-HWtH/F4Bf86jzb27jSSpE7h77CH9FpGTF5tpGSxuX+g=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-google-beta",
|
||||
"rev": "v6.45.0",
|
||||
"rev": "v6.46.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-QQI1BfUgDRYwlqOC2+e/EMcDsEbZV8cAUnscnW8xVLk="
|
||||
},
|
||||
@@ -723,13 +723,13 @@
|
||||
"vendorHash": "sha256-5cqj1O57snU+NoVqmWc/KIGnowQNMww+rJxYfIPvHWU="
|
||||
},
|
||||
"keycloak": {
|
||||
"hash": "sha256-IgSc6GhXpyH1LCElGALMmEE7MACTvwOzLLQgWl5qEcc=",
|
||||
"hash": "sha256-59+rVoS49w6aGFqpvcgoiYAFebsQLjXbPrhvZHMYV3s=",
|
||||
"homepage": "https://registry.terraform.io/providers/keycloak/keycloak",
|
||||
"owner": "keycloak",
|
||||
"repo": "terraform-provider-keycloak",
|
||||
"rev": "v5.3.0",
|
||||
"rev": "v5.4.0",
|
||||
"spdx": "Apache-2.0",
|
||||
"vendorHash": "sha256-n78cEI1JKtPKZmNnAHykt9oRixZUjddpAIWD3ct3e1c="
|
||||
"vendorHash": "sha256-pnOwYupql5EWoA0l72RENXeAQELaFHlDorJLQKJUz+c="
|
||||
},
|
||||
"kubectl": {
|
||||
"hash": "sha256-UQ/xvhs7II+EGH5bKdrVC47hp5dhLqQZeqSBz06ho1s=",
|
||||
@@ -768,13 +768,13 @@
|
||||
"vendorHash": "sha256-fP6brpY/wRI1Yjgapzi+FfOci65gxWeOZulXbGdilrE="
|
||||
},
|
||||
"linode": {
|
||||
"hash": "sha256-rpF/R2wYYwMp+p57NUXFuEw9UpjJUoGFqTbnuGi3j7E=",
|
||||
"hash": "sha256-zqMknrd8W49RijEVn1TlsV3PT1KGmtdAZUE+Gj8AI5g=",
|
||||
"homepage": "https://registry.terraform.io/providers/linode/linode",
|
||||
"owner": "linode",
|
||||
"repo": "terraform-provider-linode",
|
||||
"rev": "v3.1.0",
|
||||
"rev": "v3.1.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-n+CNvbY02Z9mYSrnm3qfP6hLXqD+If00mM7m0Aq8608="
|
||||
"vendorHash": "sha256-ormU5oDUFb0FQK2L6NDGD/GRy4XXuoFTnq6VKSDVtSw="
|
||||
},
|
||||
"linuxbox": {
|
||||
"hash": "sha256-svQRz1/PdVLpHoxOam1sfRTwHqgqs4ohJQs3IPMMAM4=",
|
||||
@@ -876,13 +876,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"newrelic": {
|
||||
"hash": "sha256-6IA7p+VCGvMmIVTPswOorToeYRE1eDszVMFPPZdZ4y0=",
|
||||
"hash": "sha256-ymxR4LOgsMg8evg4nBjzJZ5rKi/ql4TLlYb9i9gzKK4=",
|
||||
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
|
||||
"owner": "newrelic",
|
||||
"repo": "terraform-provider-newrelic",
|
||||
"rev": "v3.64.0",
|
||||
"rev": "v3.65.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-ZWtk6FuELMEyUr7YpkCfsTae3eJqoEpit8/vJgoN/gU="
|
||||
"vendorHash": "sha256-+ogtadT0zekeaynXQCwDBrD+bBnKUsyzLGPQyLsCSR8="
|
||||
},
|
||||
"nexus": {
|
||||
"hash": "sha256-Lm5CZ+eBDUNIL2KuK/iKc5dTif7P+E9II714vwvYuyU=",
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
buildKodiAddon rec {
|
||||
pname = "formula1";
|
||||
namespace = "plugin.video.formula1";
|
||||
version = "2.0.5";
|
||||
version = "2.0.6";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip";
|
||||
sha256 = "sha256-zOEf1CXywEqUpBhan03xjVQ3Rjp3h08X2OgQ4GAjwJQ=";
|
||||
sha256 = "sha256-oo5mS99fwMjMi8lUdiGNMOghVLd4dLr4SkoDzObufV4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cri-o";
|
||||
version = "1.33.2";
|
||||
version = "1.33.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cri-o";
|
||||
repo = "cri-o";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QHWE0BVsGFk1UOo51wZUl24bisS9GzCeWkE7yM3dYec=";
|
||||
hash = "sha256-nDBXXsvzoaJwbeLAXwCdJcxSZjo9Y7CcPBpkNTN2ey0=";
|
||||
};
|
||||
vendorHash = null;
|
||||
|
||||
|
||||
@@ -49,7 +49,6 @@
|
||||
open-watcom-bin,
|
||||
makeself,
|
||||
perl,
|
||||
vulkan-loader,
|
||||
javaBindings ? true,
|
||||
jdk, # Almost doesn't affect closure size
|
||||
pythonBindings ? false,
|
||||
@@ -163,11 +162,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libtpms
|
||||
python3
|
||||
xz
|
||||
libGL
|
||||
]
|
||||
++ optional javaBindings jdk
|
||||
++ optional pythonBindings python3 # Python is needed even when not building bindings
|
||||
++ optional pulseSupport libpulseaudio
|
||||
++ optionals headless [ libGL ]
|
||||
++ optionals (!headless) [
|
||||
qtbase
|
||||
qttools
|
||||
@@ -213,6 +212,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
grep 'libasound\.so\.2' src include -rI --files-with-match | xargs sed -i -e '
|
||||
s@"libasound\.so\.2"@"${alsa-lib.out}/lib/libasound.so.2"@g'
|
||||
|
||||
substituteInPlace src/VBox/Devices/Graphics/DevVGA-SVGA3d-glLdr.cpp \
|
||||
--replace-fail \"libGL.so.1\" \"${libGL.out}/lib/libGL.so.1\"
|
||||
|
||||
# this works in conjunction with fix-graphics-driver-loading.patch
|
||||
substituteInPlace src/VBox/Devices/Graphics/DevVGA-SVGA3d-dx-dx11.cpp \
|
||||
--replace-fail \"VBoxDxVk\" \"$out/libexec/virtualbox/VBoxDxVk.so\"
|
||||
|
||||
export USER=nix
|
||||
set +x
|
||||
'';
|
||||
@@ -260,6 +266,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./qt-dependency-paths.patch
|
||||
# https://github.com/NixOS/nixpkgs/issues/123851
|
||||
./fix-audio-driver-loading.patch
|
||||
./fix-graphics-driver-loading.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@@ -394,8 +401,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# If hardening is disabled, wrap the VirtualBoxVM binary instead of patching
|
||||
# the source code (see postPatch).
|
||||
+ optionalString (!headless && !enableHardening) ''
|
||||
wrapQtApp $out/libexec/virtualbox/VirtualBoxVM \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ vulkan-loader ]}"
|
||||
wrapQtApp $out/libexec/virtualbox/VirtualBoxVM
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-dx-dx11.cpp b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-dx-dx11.cpp
|
||||
index 1a43382..c376d6e 100644
|
||||
--- a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-dx-dx11.cpp
|
||||
+++ b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-dx-dx11.cpp
|
||||
@@ -3376,7 +3376,7 @@ static DECLCALLBACK(int) vmsvga3dBackInit(PPDMDEVINS pDevIns, PVGASTATE pThis, P
|
||||
AssertReturn(pBackend, VERR_NO_MEMORY);
|
||||
pThisCC->svga.p3dState->pBackend = pBackend;
|
||||
|
||||
- rc = RTLdrLoadSystem(VBOX_D3D11_LIBRARY_NAME, /* fNoUnload = */ true, &pBackend->hD3D11);
|
||||
+ rc = RTLdrLoad(VBOX_D3D11_LIBRARY_NAME, &pBackend->hD3D11);
|
||||
AssertRC(rc);
|
||||
if (RT_SUCCESS(rc))
|
||||
{
|
||||
@@ -5,10 +5,13 @@
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "ablog";
|
||||
let
|
||||
version = "0.11.12";
|
||||
format = "pyproject";
|
||||
in
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "ablog";
|
||||
inherit version;
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sunpy";
|
||||
@@ -20,10 +23,9 @@ python3Packages.buildPythonApplication rec {
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
wheel
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3Packages; [ wheel ];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
docutils
|
||||
feedgen
|
||||
@@ -40,14 +42,17 @@ python3Packages.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
pytestFlags = [
|
||||
"-Wignore::sphinx.deprecation.RemovedInSphinx90Warning"
|
||||
"--rootdir=src/ablog"
|
||||
"-Wignore::sphinx.deprecation.RemovedInSphinx90Warning" # Ignore ImportError
|
||||
];
|
||||
|
||||
# assert "post 1" not in html
|
||||
# AssertionError
|
||||
disabledTests = [ "test_not_safe_for_parallel_read" ];
|
||||
disabledTests = [
|
||||
# upstream investigation is still ongoing
|
||||
# https://github.com/sunpy/ablog/issues/302
|
||||
"test_not_safe_for_parallel_read"
|
||||
# need sphinx old version
|
||||
"test_feed"
|
||||
];
|
||||
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
|
||||
|
||||
+10
-18
@@ -1,20 +1,12 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildPythonApplication,
|
||||
fuse,
|
||||
appdirs,
|
||||
colorama,
|
||||
python-dateutil,
|
||||
requests,
|
||||
requests-toolbelt,
|
||||
fusepy,
|
||||
sqlalchemy,
|
||||
setuptools,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "acd_cli";
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "acd-cli";
|
||||
version = "0.3.2";
|
||||
format = "setuptools";
|
||||
|
||||
@@ -22,12 +14,12 @@ buildPythonApplication rec {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yadayada";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0a0fr632l24a3jmgla3b1vcm50ayfa9hdbp677ch1chwj5dq4zfp";
|
||||
repo = "acd_cli";
|
||||
tag = version;
|
||||
hash = "sha256-132CW5EcsgDZOeauBpNyXoFS2Q5rKPqqHIoIKobJDig=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = with python3Packages; [
|
||||
appdirs
|
||||
colorama
|
||||
python-dateutil
|
||||
@@ -50,10 +42,10 @@ buildPythonApplication rec {
|
||||
lnOverBin acd_cli.py acdcli
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Command line interface and FUSE filesystem for Amazon Cloud Drive";
|
||||
homepage = "https://github.com/yadayada/acd_cli";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ edwtjo ];
|
||||
};
|
||||
}
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "aliyun-cli";
|
||||
version = "3.0.291";
|
||||
version = "3.0.292";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aliyun";
|
||||
repo = "aliyun-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-/nrspG9pB8pOnkTpnY3/4872sfe1Wg14MnKftEz4YX0=";
|
||||
hash = "sha256-/bw4ukQRQ7rJLa+Muy7KjgyBh7ffFGSJ/q5Wnd/y7FY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"url": "https://web.archive.org/web/20250603123530/https://nav.gov.hu/pfile/programFile?path=%252Fnyomtatvanyok%252Fletoltesek%252Fnyomtatvanykitolto_programok%252Fnyomtatvany_apeh%252Fkeretprogramok%252FAbevJava",
|
||||
"sha256": "0f25ppjq98kcib6d5c0qrwx9pcakj6g2cgsxh9x7cl149c0fy8d5",
|
||||
"version": "3.43.0"
|
||||
"url": "https://web.archive.org/web/20250801205917/https://nav.gov.hu/pfile/programFile?path=%252Fnyomtatvanyok%252Fletoltesek%252Fnyomtatvanykitolto_programok%252Fnyomtatvany_apeh%252Fkeretprogramok%252FAbevJava",
|
||||
"sha256": "0b0b197ifqwsnnw375gvnhdsvmgqwmw5fkfcfw0wmh0f6xjdapam",
|
||||
"version": "3.44.0"
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "apkg";
|
||||
version = "0.5.0";
|
||||
version = "0.6.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "packaging";
|
||||
repo = "apkg";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-VQNUzbWIDo/cbCdtx8JxN5UUMBW3mQ2B42In4b3AA+A=";
|
||||
hash = "sha256-rFcHgNaZBTKO0tU7O8fz2eOD731sLHWxhh0x5mMo9uw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
@@ -35,7 +35,9 @@ python3Packages.buildPythonApplication rec {
|
||||
toml # config files
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3Packages; [ hatchling ];
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
setuptools # required for build
|
||||
];
|
||||
|
||||
makeWrapperArgs = [
|
||||
# deps for `srcpkg` operation for other distros; could be optional
|
||||
@@ -52,7 +54,6 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
pytest
|
||||
dunamai
|
||||
];
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
@@ -22,16 +22,16 @@ let
|
||||
in
|
||||
buildNpmPackage' rec {
|
||||
pname = "balena-cli";
|
||||
version = "22.1.4";
|
||||
version = "22.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "balena-io";
|
||||
repo = "balena-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tf9VQN2eI+YXTeQBwIXlxCL3mRi1JcYS+n5wA/L1mQY=";
|
||||
hash = "sha256-5ltVQHye4miXA7W201n4XakP1eVyfFWzzaP+I7iKwOg=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-Nqpj04OdTynAtDLcXHJLa+eFzC/juwws6a67Ds/eIZQ=";
|
||||
npmDepsHash = "sha256-oYwysy/gBJZ3akTjkdZEaX3KfdBmoaXEPbdXZNs8Ds8=";
|
||||
|
||||
postPatch = ''
|
||||
ln -s npm-shrinkwrap.json package-lock.json
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "basalt";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "erikjuhani";
|
||||
repo = "basalt";
|
||||
tag = "basalt/v${finalAttrs.version}";
|
||||
hash = "sha256-r34MlNSLZAHqNWlFMGNxT6zTSX+IKKQmJ4klEB4kjek=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-TpbJ1HCBocgLAXGb5dBbZNMlOYXR9IGBRtfShgwlMIo=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "TUI Application to manage Obsidian notes directly from the terminal";
|
||||
homepage = "https://github.com/erikjuhani/basalt";
|
||||
changelog = "https://github.com/erikjuhani/basalt/blob/${finalAttrs.src.tag}/basalt/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ faukah ];
|
||||
mainProgram = "basalt";
|
||||
};
|
||||
})
|
||||
@@ -6,7 +6,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "bash-preexec";
|
||||
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation {
|
||||
owner = "rcaloras";
|
||||
repo = "bash-preexec";
|
||||
rev = version;
|
||||
sha256 = "sha256-+FU5n7EkY78X5nUiW3WN9+6Bf6oiPjsG2MSRCleooFs=";
|
||||
sha256 = "sha256-4DzbeIiUX7iXy2CeSvRC2X+XnjVk+/UiMbM/dLHx7zU=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ bats ];
|
||||
|
||||
@@ -19,13 +19,13 @@ in
|
||||
llvmPackages.stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
pname = "c3c${optionalString debug "-debug"}";
|
||||
version = "0.7.3";
|
||||
version = "0.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "c3lang";
|
||||
repo = "c3c";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MOnYWlGcxLX+agChuk0BPq8BWsVvNP2QYqaGk24lb5Q=";
|
||||
hash = "sha256-LIwav9ZvNRn4tGh+MGEhimSIKROU3H+R1pc3oyGDb18=";
|
||||
};
|
||||
|
||||
cmakeBuildType = if debug then "Debug" else "Release";
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-deb";
|
||||
version = "3.3.0";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kornelski";
|
||||
repo = "cargo-deb";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8jYcE6rqh/YwY8CVypxCeQfFhI7jBxrRngWhC3KbXag=";
|
||||
hash = "sha256-0phdZMeiZU916t9osgv1I0+tZpQbq5m1MR+wwWgsbIo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-R/LyTkxWqHjDE7MOPBao8GeSS3n7KrVWrCqGUz0SM9s=";
|
||||
cargoHash = "sha256-fi4GY+TE+fRdnTl61SxASk7esSa5BlT1bGRt5g0oGlk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cnquery";
|
||||
version = "11.64.0";
|
||||
version = "11.65.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnquery";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-olfkzuAgXjlxDQCaLqnu6V9tenFjBBYvIzxuo2phtns=";
|
||||
hash = "sha256-M2bx4wgVM79iXhtZDFvcOfifwbLCTQ0knTI3FAOzj3M=";
|
||||
};
|
||||
|
||||
subPackages = [ "apps/cnquery" ];
|
||||
|
||||
@@ -16,20 +16,20 @@ let
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://downloads.cursor.com/production/faa03b17cce93e8a80b7d62d57f5eda6bb6ab9fa/linux/x64/Cursor-1.2.2-x86_64.AppImage";
|
||||
hash = "sha256-mQr1QMw4wP+kHvE9RWPkCKtHObbr0jpyOxNw3LfTPfc=";
|
||||
url = "https://downloads.cursor.com/production/a1fa6fc7d2c2f520293aad84aaa38d091dee6fef/linux/x64/Cursor-1.3.8-x86_64.AppImage";
|
||||
hash = "sha256-qR1Wu3H0JUCKIoUP/QFC1YyYiRaQ9PVN7ZT9TjHwn1k=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://downloads.cursor.com/production/faa03b17cce93e8a80b7d62d57f5eda6bb6ab9fa/linux/arm64/Cursor-1.2.2-aarch64.AppImage";
|
||||
hash = "sha256-EGvm/VW+NDTmOB1o2j3dpq4ckWbroFWEbF9Pezr8SZQ=";
|
||||
url = "https://downloads.cursor.com/production/a1fa6fc7d2c2f520293aad84aaa38d091dee6fef/linux/arm64/Cursor-1.3.8-aarch64.AppImage";
|
||||
hash = "sha256-UrUstEFP8W8Y9WUCR5kt3434bKCBBK/NaSu2UK8+gII=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://downloads.cursor.com/production/faa03b17cce93e8a80b7d62d57f5eda6bb6ab9fa/darwin/x64/Cursor-darwin-x64.dmg";
|
||||
hash = "sha256-IDJklB8wMfrPpc2SO02iVBBE9d7fLN7JotVpPyCQkyE=";
|
||||
url = "https://downloads.cursor.com/production/a1fa6fc7d2c2f520293aad84aaa38d091dee6fef/darwin/x64/Cursor-darwin-x64.dmg";
|
||||
hash = "sha256-FGjqbOdr1HSjVlDYP/+vp4bVQoqdJww3U4t59QLg1kk=";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://downloads.cursor.com/production/faa03b17cce93e8a80b7d62d57f5eda6bb6ab9fa/darwin/arm64/Cursor-darwin-arm64.dmg";
|
||||
hash = "sha256-GxiNf58Kf5/l01eBhXRWMLMxAnj1txDQwSe5ei6nTgg=";
|
||||
url = "https://downloads.cursor.com/production/a1fa6fc7d2c2f520293aad84aaa38d091dee6fef/darwin/arm64/Cursor-darwin-arm64.dmg";
|
||||
hash = "sha256-tsVPS48APst7kbEh7cjhJ2zYKcKBDdjH+NXMpAe4Ixs=";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -39,12 +39,12 @@ in
|
||||
inherit useVSCodeRipgrep;
|
||||
commandLineArgs = finalCommandLineArgs;
|
||||
|
||||
version = "1.2.2";
|
||||
version = "1.3.8";
|
||||
pname = "cursor";
|
||||
|
||||
# You can find the current VSCode version in the About dialog:
|
||||
# workbench.action.showAboutDialog (Help: About)
|
||||
vscodeVersion = "1.96.2";
|
||||
vscodeVersion = "1.99.3";
|
||||
|
||||
executableName = "cursor";
|
||||
longName = "Cursor";
|
||||
@@ -98,13 +98,6 @@ in
|
||||
nativeBuildInputs =
|
||||
(oldAttrs.nativeBuildInputs or [ ]) ++ lib.optionals hostPlatform.isDarwin [ undmg ];
|
||||
|
||||
preInstall =
|
||||
(oldAttrs.preInstall or "")
|
||||
+ lib.optionalString hostPlatform.isLinux ''
|
||||
mkdir -p bin
|
||||
ln -s ../cursor bin/cursor
|
||||
'';
|
||||
|
||||
passthru = (oldAttrs.passthru or { }) // {
|
||||
inherit sources;
|
||||
};
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "conmon-rs";
|
||||
version = "0.6.6";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "conmon-rs";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1kGAUAmiPI9zE8LE7G2r0Gy0YM+BUy2MxY7IQOu2ZDQ=";
|
||||
hash = "sha256-NydA6IiIGX2Pc/49bstEGeA/X+zRIVNGbxhDfPwrWgM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
|
||||
];
|
||||
doCheck = false;
|
||||
|
||||
cargoVendorDir = ".cargo-vendor";
|
||||
cargoHash = "sha256-qP4AIPST1s6fiGq6FM2aXpEfkm4G/cOSYJyhtqF2k1E=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "OCI container runtime monitor written in Rust";
|
||||
|
||||
+629
-272
File diff suppressed because it is too large
Load Diff
@@ -7,20 +7,21 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "corestore";
|
||||
version = "7.1.0";
|
||||
version = "7.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "holepunchto";
|
||||
repo = "corestore";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lbbjYWJah1A2/ySBTI2Mg78dRjLyt/TJ5rhqBPxWOps=";
|
||||
hash = "sha256-wuf7bPxHuzic2B4HCH7emM1+jc7gw+l5Sm/LCYnpvs4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-3WfcomAOE+u/ZIn5M+sP/GkxArXx5IRFzf0IG4ykaiU=";
|
||||
npmDepsHash = "sha256-hQYvQeTwlIWImdNhgpnJjDC24Fx4G0eST7tptWV1Xgw=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
# ERROR: Missing package-lock.json from src
|
||||
# Upstream doesn't want to maintain a lockfile in their repo: https://github.com/holepunchto/corestore/issues/119
|
||||
# Copy vendored package-lock.json to src via postPatch
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} ./package-lock.json
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "croc";
|
||||
version = "10.2.2";
|
||||
version = "10.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schollz";
|
||||
repo = "croc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tRWkokgs2SZglkgzK+UxwzbTk99GcPgDBcgJkMURNJ8=";
|
||||
hash = "sha256-PuU60Ybiz/6ajJ67lntyq3e3ZPuxNKmM5iCPTRkldrs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-oyLjCORfx3Pf8T1EQqM9XBrmQyMSDHy2X2axh1L79PQ=";
|
||||
vendorHash = "sha256-bFn2C5py2STLz8YBlnyK2XDBlgoBnXujeBizN9cDTI0=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
writableTmpDirAsHomeHook,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "crush";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "crush";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SjrkQFSjJrPNynARE92uKA53hkstIUBSvQbqcYSsnaM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aI3MSaQYUOLJxBxwCoVg13HpxK46q6ZITrw1osx5tiE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=github.com/charmbracelet/crush/internal/version.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
# rename TestMain to prevent it from running, as it panics in the sandbox.
|
||||
postPatch = ''
|
||||
sed -i 's/func TestMain/func DisabledTestMain/' internal/llm/provider/openai_test.go
|
||||
'';
|
||||
|
||||
checkFlags =
|
||||
let
|
||||
# these tests fail in the sandbox
|
||||
skippedTests = [
|
||||
"TestOpenAIClientStreamChoices"
|
||||
"TestGrepWithIgnoreFiles"
|
||||
"TestSearchImplementations"
|
||||
];
|
||||
in
|
||||
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeCheckInputs = [ writableTmpDirAsHomeHook ];
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Glamourous AI coding agent for your favourite terminal";
|
||||
homepage = "https://github.com/charmbracelet/crush";
|
||||
license = lib.licenses.fsl11Mit;
|
||||
maintainers = with lib.maintainers; [ x123 ];
|
||||
mainProgram = "crush";
|
||||
};
|
||||
})
|
||||
@@ -40,14 +40,14 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "edgetx";
|
||||
version = "2.11.0-rc3";
|
||||
version = "2.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EdgeTX";
|
||||
repo = "edgetx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-ipiGkc+R7/itmnRRrlrc4iXn+fLWm4OKc227NfevFhI=";
|
||||
hash = "sha256-F3T1lX0FSSUIQxSlqLQHj7JrfF+20Ndv63zDA0sRzFQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -32,6 +32,8 @@
|
||||
"el18"
|
||||
"pl18"
|
||||
"pl18ev"
|
||||
"pl18u"
|
||||
"st16"
|
||||
"x10"
|
||||
"x10express"
|
||||
"x12s"
|
||||
|
||||
@@ -34,14 +34,14 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "esphome";
|
||||
version = "2025.7.3";
|
||||
version = "2025.7.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esphome";
|
||||
repo = "esphome";
|
||||
tag = version;
|
||||
hash = "sha256-njhcH/C55i1Xkclt2bp+z9OXhR7gsewWUgW3bn/1yig=";
|
||||
hash = "sha256-zN3QkyGqz6/v8k76857nYEpErR0SijH0RetNxQttifI=";
|
||||
};
|
||||
|
||||
build-system = with python.pkgs; [
|
||||
|
||||
@@ -13,13 +13,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "etherpad-lite";
|
||||
version = "2.3.2";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ether";
|
||||
repo = "etherpad-lite";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7PnqMLd6Mh/l3W1kjkb3aVeHrJXyIzU9/Xzm/VHBh38=";
|
||||
hash = "sha256-D5YukbPnf2qN9NimALHfhCJAgNPsTZxoVV4KuPmnSdc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-n7LolizpKng7zzccytYoCwJ7uGQbMagsgYPDuq0mdxU=";
|
||||
hash = "sha256-/o2WaB63lcWbbe8nCwMSYhGr9zra7QPL1Er78vW8Kjw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "olm";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fosrl";
|
||||
repo = "olm";
|
||||
tag = version;
|
||||
hash = "sha256-a0gkEo5EuJpHpZ5fKAPBXSTRvZaQo6KOJu4Abi1EztU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Ms8tLFKIa8GqmyFI7o+sQEpsZghNPIpq8BRCoY89Org=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Tunneling client for Pangolin";
|
||||
homepage = "https://github.com/fosrl/olm";
|
||||
changelog = "https://github.com/fosrl/olm/releases/tag/${src.tag}";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
jackr
|
||||
sigmasquadron
|
||||
];
|
||||
mainProgram = "olm";
|
||||
};
|
||||
}
|
||||
@@ -42,7 +42,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "freefilesync";
|
||||
version = "14.3";
|
||||
version = "14.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip";
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
rm -f $out
|
||||
tryDownload "$url"
|
||||
'';
|
||||
hash = "sha256-F8oIoG+SaHwhT7aA+iYp9/eWyGf6CiDIGm6Y2px0wlI=";
|
||||
hash = "sha256-Jx/Q/RsCTy06kJfJeatqrEoTMz7wLZvPQ3bzFClvKWc=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
@@ -73,12 +73,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
})
|
||||
];
|
||||
|
||||
# https://freefilesync.org/forum/viewtopic.php?t=12163
|
||||
postPatch = ''
|
||||
substituteInPlace zen/socket.h zen/sys_error.h \
|
||||
--replace-fail "#undef G_GNUC_UNUSED" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
pkg-config
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh-poi";
|
||||
version = "0.14.0";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "seachicken";
|
||||
repo = "gh-poi";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bbmNzxGRg7nKfB8xu90ZkKrhWwY24G6h8TW07f9IpTY=";
|
||||
hash = "sha256-HwFmSeDPpX1zbJh+0laekphmpnAsEdFBhgoLfT7CCYY=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@@ -23,7 +23,7 @@ buildGoModule rec {
|
||||
vendorHash = "sha256-ciOJpVqSPJJLX/sqrztqB3YSoMUrEnn52gGddE80rV0=";
|
||||
|
||||
# Skip checks because some of test suites require fixture.
|
||||
# See: https://github.com/seachicken/gh-poi/blob/v0.14.0/.github/workflows/contract-test.yml#L28-L29
|
||||
# See: https://github.com/seachicken/gh-poi/blob/v0.14.1/.github/workflows/contract-test.yml#L28-L29
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "go-task";
|
||||
version = "3.44.0";
|
||||
version = "3.44.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-task";
|
||||
repo = "task";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-hZi1BSVv3Z+OzJyNvruyDbxYjTgfERnssWZaK0HGQmc=";
|
||||
hash = "sha256-KqVGVC3jg6UihB8O6g7SpcE5pc11IQ0HcXSRD2E2Tfo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8OLWIAikKqmj3tXRO7Ro3VFItKDrhVh6n8pHbBM9Nrc=";
|
||||
vendorHash = "sha256-IvuXL3FS/69NYxkZZHsnOl27DXpZnuOIkhivdMsG45Q=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
lib,
|
||||
}:
|
||||
let
|
||||
version = "0.16.6";
|
||||
version = "0.16.7";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "heimdall-proxy";
|
||||
@@ -15,10 +15,10 @@ buildGoModule {
|
||||
owner = "dadrus";
|
||||
repo = "heimdall";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-IWK8iNhNw0deaj2OYlArmqBftDmSlGtVzXbu0KwB8O8=";
|
||||
hash = "sha256-YFqaCXx/x2LfdqaJZFTGkK/k7qIRWKXA1t/KZeWLDGw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OG7AqHS3UXBDvIT+F8USIc33MVE/i8eHVjYOY9ZWzIw=";
|
||||
vendorHash = "sha256-E/tdRS96rPWZHwtG22TFB1p7CUaFsya7nI8cAEuYvJo=";
|
||||
|
||||
tags = [ "sqlite" ];
|
||||
|
||||
|
||||
@@ -37,7 +37,6 @@ rustPlatform.buildRustPackage rec {
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
aaqaishtyaq
|
||||
omasanori
|
||||
];
|
||||
mainProgram = "iay";
|
||||
};
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "inputplumber";
|
||||
version = "0.60.7";
|
||||
version = "0.60.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ShadowBlip";
|
||||
repo = "InputPlumber";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-3o5Y6fbshC3oTerf8M+yuo01BbQAilkT7TdrlwO6YBs=";
|
||||
hash = "sha256-k3SkjLjtCRionDwi2S/pZ40ShKgbsbQhBuLAs3Kd458=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Tk3NCcturMHIs9hdGqwC87kqnhg/PvriCNSkYcq9+aM=";
|
||||
cargoHash = "sha256-i9mFQ12z3YE6Kb89Tt27reG1Y3rUmzTkAlT4Zd8rgXg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jsonschema-cli";
|
||||
version = "0.30.0";
|
||||
version = "0.32.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-AjBVvEixkP7khm3/0U81E/G7tCKoqnfNG05gpgYlqNE=";
|
||||
hash = "sha256-ZcavZSHf2eT65f7HbtZmD2mYUtrXEL/l1opXCvdn1O0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3hZAEjJrJ5vw6kXwY+xTv/mO0lx/KNmXA2lULJkX9aE=";
|
||||
cargoHash = "sha256-ivD1dvz2xxNei77Dq6myE4zivWD8LZoEqq8E7QhgP9s=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
||||
@@ -72,7 +72,7 @@ stdenv.mkDerivation {
|
||||
mainProgram = "kmscon";
|
||||
homepage = "https://www.freedesktop.org/wiki/Software/kmscon/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ omasanori ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kubectl-ai";
|
||||
version = "0.0.18";
|
||||
version = "0.0.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = "kubectl-ai";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xxqR6jBK5RACyYGyOmIt2CY99ggWz0ygO9lmT2c0REc=";
|
||||
hash = "sha256-iyyaQBulncPNJXm7ir/aOjJxJvd0Q178weneiwQbGcU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-AuvBO7ucP/tWcag5NonDreXynxLm001Mu+Z1oIG8axw=";
|
||||
vendorHash = "sha256-a84HesnInU7JZZTx0Rm1Qgsmo7SJC0kMnckgmUk0Vow=";
|
||||
|
||||
# Build the main command
|
||||
subPackages = [ "cmd" ];
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubeshark";
|
||||
version = "52.7.8";
|
||||
version = "52.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubeshark";
|
||||
repo = "kubeshark";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bGfqJ+XXflO2FcYRDkdDrDchpuIF2VBsVQkApd+2YoU=";
|
||||
hash = "sha256-p7kTawHggRR1fdd8nAPRCGuvVgRKZ6n8U22D/731xJ8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kzyQW4bVE7oMOlHVG7LKG1AMTRYa5GLiiEhdarIhMSo=";
|
||||
vendorHash = "sha256-4s1gxJo2w5BibZ9CJP7Jl9Z8Zzo8WpBokBnRN+zp8b4=";
|
||||
|
||||
ldflags =
|
||||
let
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kubevpn";
|
||||
version = "2.8.1";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KubeNetworks";
|
||||
repo = "kubevpn";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+TyaujgbeQXApxmjYvLnmhBZZUeIZMidzS7mL+Ach3o=";
|
||||
hash = "sha256-vPmN1g3LNTYoFZNaUJWJbP+N+RG0973GLekQOsr+4bU=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -29,13 +29,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "labwc";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "labwc";
|
||||
repo = "labwc";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-7PgRbOSxU7v49dcTuke7V/Xa42baw79iMvfnCOYx4qU=";
|
||||
hash = "sha256-8SKSITFwbagJhuTXVHpPmQoaooktIXc1CeO9ZOUuh1w=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
libsForQt5,
|
||||
testers,
|
||||
|
||||
enableGui ? true,
|
||||
enableGui ? false,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -63,7 +63,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mainProgram = "lgogdownloader";
|
||||
homepage = "https://github.com/Sude-/lgogdownloader";
|
||||
license = lib.licenses.wtfpl;
|
||||
# qtbase requires a sandbox profile with read access to /usr/share/icu.
|
||||
# To prevent build failures in CI, we disable Darwin support when the GUI is enabled.
|
||||
platforms = lib.platforms.linux ++ lib.optionals (!enableGui) lib.platforms.darwin;
|
||||
maintainers = with lib.maintainers; [ _0x4A6F ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
libtool,
|
||||
libxml2,
|
||||
@@ -19,9 +19,11 @@ stdenv.mkDerivation rec {
|
||||
version = "4.2.0";
|
||||
pname = "libdigidocpp";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz";
|
||||
hash = "sha256-d3AqTTVi3lzzu9Tw7p+KilNa0Q7cJBGwb6VoNNLeskE=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-eid";
|
||||
repo = "libdigidocpp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-o/2hF82uRaBDp7I9urn8R6r9YQMkp241M1v92qD66NM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -47,17 +49,21 @@ stdenv.mkDerivation rec {
|
||||
"bin"
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeFeature "PKCS11_MODULE" "${lib.getLib opensc}/lib/opensc-pkcs11.so")
|
||||
];
|
||||
|
||||
# This wants to link to ${CMAKE_DL_LIBS} (ltdl), and there doesn't seem to be
|
||||
# a way to tell CMake where this should be pulled from.
|
||||
# A cleaner fix would probably be to patch cmake to use
|
||||
# `-L${libtool.lib}/lib -ltdl` for `CMAKE_DL_LIBS`, but that's a world rebuild.
|
||||
env.NIX_LDFLAGS = "-L${libtool.lib}/lib";
|
||||
|
||||
# libdigidocpp.so's `PKCS11Signer::PKCS11Signer()` dlopen()s "opensc-pkcs11.so"
|
||||
# itself, so add OpenSC to its DT_RUNPATH after the fixupPhase shrinked it.
|
||||
# https://github.com/open-eid/cmake/pull/35 might be an alternative.
|
||||
# Prevent cmake from creating a file that sets INTERFACE_INCLUDE_DIRECTORIES to the wrong location,
|
||||
# causing downstream build failures.
|
||||
postFixup = ''
|
||||
patchelf --add-rpath ${opensc}/lib/pkcs11 $lib/lib/libdigidocpp.so
|
||||
sed '/^ INTERFACE_INCLUDE_DIRECTORIES/s|"[^"]*/include"|"${placeholder "dev"}/include"|' \
|
||||
-i "$dev"/lib/cmake/libdigidocpp/libdigidocpp-config.cmake
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libiec61850";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mz-automation";
|
||||
repo = "libiec61850";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-KFUqeDe90wrqMueD8AYgB1scl6OZkKW2z+oV9wREF3k=";
|
||||
hash = "sha256-9UPXuZkAxr3SSjPN3VZRr6Hsz0GyDVJLUZEM+zZruik=";
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
@@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# there’s a lot of escaping, but I’m not sure how to improve that
|
||||
cat > $out/bin/liquibase <<EOF
|
||||
#!/usr/bin/env bash
|
||||
export LIQUIBASE_ANALYTICS_ENABLED="\''${LIQUIBASE_ANALYTICS_ENABLED:-false}"
|
||||
# taken from the executable script in the source
|
||||
CP=""
|
||||
${addJars "$out/internal/lib"}
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "mcp-nixos";
|
||||
version = "1.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "utensils";
|
||||
repo = "mcp-nixos";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-NwP+zM1VGLOzIm+mLZVK9/9ImFwuiWhRJ9QK3hGpQsY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch mocks nix channel listing network calls in tests
|
||||
./tests-mock-nix-channels.patch
|
||||
];
|
||||
|
||||
build-system = [ python3Packages.hatchling ];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
beautifulsoup4
|
||||
mcp
|
||||
requests
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
anthropic
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
python-dotenv
|
||||
];
|
||||
|
||||
disabledTestMarks = [
|
||||
# Require network access
|
||||
"integration"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Require network access
|
||||
"tests/test_nixhub_evals.py"
|
||||
"tests/test_mcp_behavior_evals.py"
|
||||
"tests/test_option_info_improvements.py"
|
||||
# Requires configured channels
|
||||
"tests/test_dynamic_channels.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "mcp_nixos" ];
|
||||
|
||||
meta = {
|
||||
description = "MCP server for NixOS";
|
||||
homepage = "https://github.com/utensils/mcp-nixos";
|
||||
changelog = "https://github.com/utensils/mcp-nixos/releases/tag/${src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.amadejkastelic ];
|
||||
mainProgram = "mcp-nixos";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
diff --git a/tests/conftest.py b/tests/conftest.py
|
||||
index 0a11295..1172182 100644
|
||||
--- a/tests/conftest.py
|
||||
+++ b/tests/conftest.py
|
||||
@@ -3,6 +3,30 @@
|
||||
import pytest # pylint: disable=unused-import
|
||||
|
||||
|
||||
+@pytest.fixture(autouse=True)
|
||||
+def mock_get_channels(monkeypatch):
|
||||
+ """Mock get_channels function to return fixed channels for all tests."""
|
||||
+ def mock_channels():
|
||||
+ return {
|
||||
+ "unstable": "latest-43-nixos-unstable",
|
||||
+ "25.05": "latest-43-nixos-25.05",
|
||||
+ "25.11": "latest-43-nixos-25.11",
|
||||
+ "24.11": "latest-43-nixos-24.11",
|
||||
+ "stable": "latest-43-nixos-25.05",
|
||||
+ "beta": "latest-43-nixos-25.05"
|
||||
+ }
|
||||
+
|
||||
+ # Patch the function in the server module
|
||||
+ monkeypatch.setattr('mcp_nixos.server.get_channels', mock_channels)
|
||||
+
|
||||
+ # Also patch any imported references in test modules
|
||||
+ monkeypatch.setattr('tests.test_channel_handling.get_channels', mock_channels)
|
||||
+ monkeypatch.setattr('tests.test_dynamic_channels.get_channels', mock_channels, raising=False)
|
||||
+ monkeypatch.setattr('tests.test_mcp_behavior_comprehensive.get_channels', mock_channels, raising=False)
|
||||
+ monkeypatch.setattr('tests.test_real_world_scenarios.get_channels', mock_channels, raising=False)
|
||||
+ monkeypatch.setattr('tests.test_server_comprehensive.get_channels', mock_channels, raising=False)
|
||||
+
|
||||
+
|
||||
def pytest_addoption(parser):
|
||||
"""Add test filtering options."""
|
||||
parser.addoption("--unit", action="store_true", help="Run unit tests only")
|
||||
@@ -0,0 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mdwatch";
|
||||
version = "0.1.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "santoshxshrestha";
|
||||
repo = "mdwatch";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-v+QsSPknUAFk+GC8D0wtA8VTcCWeb8DX6inL6WNl8gQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4Xvi5DxlqxfwnIa00Dr7tRzYa8/52BH/SODiNenlFDg=";
|
||||
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
meta = {
|
||||
description = "Simple CLI tool to live-preview Markdown files in your browser";
|
||||
homepage = "https://github.com/santoshxshrestha/mdwatch";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ x123 ];
|
||||
mainProgram = "mdwatch";
|
||||
};
|
||||
})
|
||||
@@ -8,11 +8,11 @@
|
||||
}:
|
||||
|
||||
let
|
||||
suitesparseVersion = "7.8.3";
|
||||
suitesparseVersion = "7.11.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "mongoose";
|
||||
version = "3.3.4";
|
||||
version = "3.3.5";
|
||||
|
||||
outputs = [
|
||||
"bin"
|
||||
@@ -23,8 +23,8 @@ stdenv.mkDerivation {
|
||||
src = fetchFromGitHub {
|
||||
owner = "DrTimothyAldenDavis";
|
||||
repo = "SuiteSparse";
|
||||
rev = "v${suitesparseVersion}";
|
||||
hash = "sha256-ai3Xne1ByP2hcM9L236pUyVsVohW6k0BX0DRXPq/jhw=";
|
||||
tag = "v${suitesparseVersion}";
|
||||
hash = "sha256-8CnN2P/W15GpK0nCNoRQongOrzcz5E8l9SgKksqLxd0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mozillavpn";
|
||||
version = "2.29.0";
|
||||
version = "2.30.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla-mobile";
|
||||
repo = "mozilla-vpn-client";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-Oh3qV5/fQNLjv3qnhRrgRV0d+homlGmEpTSeou3lZfE=";
|
||||
hash = "sha256-dwVgwEs1prEXOYuYlO1m5lJD5AKolW0Stj2HOZC+Y+o=";
|
||||
};
|
||||
patches = [ ];
|
||||
|
||||
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src patches;
|
||||
hash = "sha256-Flsa93Nko/sHr9z+YW7xDFMVLOzJE4oJFAl841gpPpw=";
|
||||
hash = "sha256-dap2t7nINWaTTahiPUFVkgAlkDuVt0w0mz13ycqwLcI=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -90,6 +90,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--replace-fail '${"$"}{SYSTEMD_UNIT_DIR}' "$out/lib/systemd/system"
|
||||
|
||||
ln -s '${finalAttrs.netfilter.goModules}' linux/netfilter/vendor
|
||||
|
||||
patchShebangs scripts/utils/xlifftool.py
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mympd";
|
||||
version = "22.0.2";
|
||||
version = "22.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jcorporation";
|
||||
repo = "myMPD";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-wvv4EeV0hLrQ9BhWAyoMnR8tjU67OwahcR+xo10lWE8=";
|
||||
sha256 = "sha256-dQroukc25q81sMIbXsmGjaOT3FoRZwoZ6QkCBZ3plX4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nats-server";
|
||||
version = "2.11.6";
|
||||
version = "2.11.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nats-io";
|
||||
repo = "nats-server";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-E1gEH4wiGvPE8v2wUkojNIBKUCwmchqo+Hi3hsweCBk=";
|
||||
hash = "sha256-S+IRHTJVpRcKgrBOuBI4fAMDmV0m/RkFu0Yjs7I9caE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-b2L1Ef/vqS+OpZTaBbJ/saHWCFjq0jmLrvs4ujgk4ro=";
|
||||
vendorHash = "sha256-VXwyGqPlROKK3K0Bu74L/xJjqAT5+JInAmXNmlVXsWQ=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -16,14 +16,14 @@ let
|
||||
in
|
||||
py.pkgs.buildPythonApplication rec {
|
||||
pname = "netbox";
|
||||
version = "4.3.3";
|
||||
version = "4.3.5";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbox-community";
|
||||
repo = "netbox";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-KmnTDTb3k8WtDN7sWjKOriG9i5dHY7BHXty6zPDqPqA=";
|
||||
hash = "sha256-EbbYHtdXcyg12FVuSBx4CAOD0TZ8PHBDQ4nv2mzTZIw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "nu_scripts";
|
||||
version = "0-unstable-2025-07-24";
|
||||
version = "0-unstable-2025-07-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nushell";
|
||||
repo = "nu_scripts";
|
||||
rev = "bd128cf5257bf3f6c3453cbb4fd431d01d3467db";
|
||||
hash = "sha256-8sJc7oF0m/hi/Uqm1X6ciIYAk5zW8hm0byX2RVZS6V8=";
|
||||
rev = "365b8839bad8c7d77c2361f2fc0d8b27bf14df92";
|
||||
hash = "sha256-YasyvTR9DCZpHFNNrBxBR1MshLvJO8DUDXmYptVzzXk=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -5,7 +5,7 @@ GEM
|
||||
logger (~> 1.5)
|
||||
iniparse (1.5.0)
|
||||
logger (1.7.0)
|
||||
overcommit (0.67.1)
|
||||
overcommit (0.68.0)
|
||||
childprocess (>= 0.6.3, < 6)
|
||||
iniparse (~> 1.4)
|
||||
rexml (>= 3.3.9)
|
||||
@@ -18,4 +18,4 @@ DEPENDENCIES
|
||||
overcommit
|
||||
|
||||
BUNDLED WITH
|
||||
2.6.6
|
||||
2.6.9
|
||||
|
||||
@@ -40,10 +40,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1i81n0h8h2mb81kjfvqj493flx7rb809z5w8sbjfd7szsqnq86n7";
|
||||
sha256 = "1l68phk7kixncc13db5yqgkryf69gc3h63vj7l5f2970i1ix5g5z";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.67.1";
|
||||
version = "0.68.0";
|
||||
};
|
||||
rexml = {
|
||||
groups = [ "default" ];
|
||||
|
||||
@@ -24,7 +24,7 @@ bundlerApp rec {
|
||||
package = overcommit;
|
||||
version = (import ./gemset.nix).overcommit.version;
|
||||
};
|
||||
updateScript = bundlerUpdateScript pname;
|
||||
updateScript = bundlerUpdateScript "overcommit";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
@@ -32,7 +32,7 @@ bundlerApp rec {
|
||||
homepage = "https://github.com/sds/overcommit";
|
||||
changelog = "https://github.com/sds/overcommit/blob/main/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
mainProgram = pname;
|
||||
mainProgram = "overcommit";
|
||||
maintainers = with maintainers; [
|
||||
Br1ght0ne
|
||||
anthonyroussel
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
nix-update "${UPDATE_NIX_ATTR_PATH}" --version=unstable
|
||||
nix-update "${UPDATE_NIX_ATTR_PATH}"
|
||||
|
||||
src="$(nix-build -A "${UPDATE_NIX_ATTR_PATH}".src --no-out-link)"
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pluto";
|
||||
version = "5.22.1";
|
||||
version = "5.22.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FairwindsOps";
|
||||
repo = "pluto";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mq18PUyVFhi3ePju6EvYg4VowwAHJwhvpI67BX8BqRY=";
|
||||
hash = "sha256-hjYWxeTa0i6Gv+dFUH8AO9740pOZ27hP4Tb44EfXubg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-59mRVfQ2rduTvIJE1l/j3K+PY3OEMfNpjjYg3hqNUhs=";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "rancher";
|
||||
version = "2.11.3";
|
||||
version = "2.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rancher";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-MprXgoshJwbRrWhQRNCOzR9u/Kbkowrkpn0dedWhoRk=";
|
||||
hash = "sha256-K0uMo/sRol2F02iV7b9NcmZcQGZ9iSEIdbZgT+Ea+/c=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@@ -23,7 +23,7 @@ buildGoModule rec {
|
||||
"-static"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-41Axi0vNGa+N+wzMbV8HeIuvVEpf5ErO/6KezqEEDhA=";
|
||||
vendorHash = "sha256-l+mrardcka7ETcriFZHTxU+LTXwwQoED9yIar0S2gHA=";
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/cli $out/bin/rancher
|
||||
|
||||
@@ -7,17 +7,17 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "reaction";
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "framagit.org";
|
||||
owner = "ppom";
|
||||
repo = "reaction";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-F/vewPUqBXq5HsD2aWPEpvTlt4MAPmaGadZMR568HFQ=";
|
||||
hash = "sha256-lcd0yY8o5eGa1bP5WsA9K/K7gtjRVorS/Rm0bno0AOY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-YvTeZJqVMRr0Iw8jynWigQPs1Y+gMao4zQnNdQxhGlM=";
|
||||
cargoHash = "sha256-ZRTgzVz8ia763cMBx9U1NIy9W6gDUVhwNr6wDqU1Ulo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "readest";
|
||||
version = "0.9.67";
|
||||
version = "0.9.69";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "readest";
|
||||
repo = "readest";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gcysscFxNg5OOPhO9i3Flo6/ajBJ3lVEfHDlw0632Yg=";
|
||||
hash = "sha256-dbGGxkv3Fcabu7nsEEgYVstgoMfUEVnucmawKWgCVUw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -40,12 +40,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-VOqFo06HV+XFjzR3l3klmR8vLXrG6KgD8UF9mQVf9uA=";
|
||||
hash = "sha256-0wcmtCMTVmJU8yxpdi2decnFmKdbCl2grNlZ/FyKx8I=";
|
||||
};
|
||||
|
||||
pnpmRoot = "../..";
|
||||
|
||||
cargoHash = "sha256-Pf5jxPZY2NZXvWFzBhISrprJ8GpF5olwnlGabcWKf1U=";
|
||||
cargoHash = "sha256-rt5QeKK7SChvz3Wi+Y2YY1fWak5xs2p3muJgPxcYUrs=";
|
||||
|
||||
cargoRoot = "../..";
|
||||
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "rqlite";
|
||||
version = "8.41.0";
|
||||
version = "8.43.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rqlite";
|
||||
repo = "rqlite";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3jzQ6Kby/v/cBxc1+ejm5PdmhZVVWvBrDEeuf7hqVKw=";
|
||||
hash = "sha256-+liwTJP4JEVQCMHegg4Ewk4K+MEjbwZ8wo3aoRZo+S0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8Oejfec9QAYRkFGyEB9R/msiwzV+pgDFS+UNfvvTie4=";
|
||||
vendorHash = "sha256-81Ueq2/aH0KNEuaNjpMVP1MIX68jY33G+v2oDzNvvo8=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/rqlite"
|
||||
|
||||
Generated
-1007
File diff suppressed because it is too large
Load Diff
@@ -1,129 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildDotnetModule,
|
||||
dotnetCorePackages,
|
||||
fetchzip,
|
||||
libX11,
|
||||
libgdiplus,
|
||||
ffmpeg,
|
||||
openal,
|
||||
libsoundio,
|
||||
sndio,
|
||||
pulseaudio,
|
||||
vulkan-loader,
|
||||
glew,
|
||||
libGL,
|
||||
libICE,
|
||||
libSM,
|
||||
libXcursor,
|
||||
libXext,
|
||||
libXi,
|
||||
libXrandr,
|
||||
udev,
|
||||
SDL2,
|
||||
SDL2_mixer,
|
||||
}:
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "ryujinx";
|
||||
version = "1.1.1401"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://archive.org/download/ryujinx-5dbba-07e-33e-83c-9047dcbb-701c-9655edbbe-89086.tar/Ryujinx-5dbba07e33e83c9047dcbb701c9655edbbe89086.tar.gz";
|
||||
hash = "sha256-UeJ3KE5e5H9crqroAxjmxYTf/Z4cbj41a6/1HW2nLcA=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = false;
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx-bin;
|
||||
dotnet-runtime = dotnetCorePackages.runtime_8_0;
|
||||
|
||||
nugetDeps = ./deps.json;
|
||||
|
||||
runtimeDeps = [
|
||||
libX11
|
||||
libgdiplus
|
||||
SDL2_mixer
|
||||
openal
|
||||
libsoundio
|
||||
sndio
|
||||
pulseaudio
|
||||
vulkan-loader
|
||||
ffmpeg
|
||||
udev
|
||||
|
||||
# Avalonia UI
|
||||
glew
|
||||
libICE
|
||||
libSM
|
||||
libXcursor
|
||||
libXext
|
||||
libXi
|
||||
libXrandr
|
||||
|
||||
# Headless executable
|
||||
libGL
|
||||
SDL2
|
||||
];
|
||||
|
||||
projectFile = "Ryujinx.sln";
|
||||
testProjectFile = "src/Ryujinx.Tests/Ryujinx.Tests.csproj";
|
||||
doCheck = true;
|
||||
|
||||
dotnetFlags = [
|
||||
"/p:ExtraDefineConstants=DISABLE_UPDATER%2CFORCE_EXTERNAL_BASE_DIR"
|
||||
];
|
||||
|
||||
executables = [
|
||||
"Ryujinx.Headless.SDL2"
|
||||
"Ryujinx"
|
||||
];
|
||||
|
||||
makeWrapperArgs = [
|
||||
# Without this Ryujinx fails to start on wayland. See https://github.com/Ryujinx/Ryujinx/issues/2714
|
||||
"--set SDL_VIDEODRIVER x11"
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
# workaround for https://github.com/Ryujinx/Ryujinx/issues/2349
|
||||
mkdir -p $out/lib/sndio-6
|
||||
ln -s ${sndio}/lib/libsndio.so $out/lib/sndio-6/libsndio.so.6
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
mkdir -p $out/share/{applications,icons/hicolor/scalable/apps,mime/packages}
|
||||
pushd ${src}/distribution/linux
|
||||
|
||||
install -D ./Ryujinx.desktop $out/share/applications/Ryujinx.desktop
|
||||
install -D ./Ryujinx.sh $out/bin/Ryujinx.sh
|
||||
install -D ./mime/Ryujinx.xml $out/share/mime/packages/Ryujinx.xml
|
||||
install -D ../misc/Logo.svg $out/share/icons/hicolor/scalable/apps/Ryujinx.svg
|
||||
|
||||
ln -s $out/bin/Ryujinx $out/bin/ryujinx
|
||||
|
||||
popd
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://ryujinx.org/";
|
||||
changelog = "https://github.com/Ryujinx/Ryujinx/wiki/Changelog";
|
||||
description = "Experimental Nintendo Switch Emulator written in C#";
|
||||
longDescription = ''
|
||||
Ryujinx is an open-source Nintendo Switch emulator, created by gdkchan,
|
||||
written in C#. This emulator aims at providing excellent accuracy and
|
||||
performance, a user-friendly interface and consistent builds. It was
|
||||
written from scratch and development on the project began in September
|
||||
2017.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
jk
|
||||
artemist
|
||||
];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
mainProgram = "Ryujinx";
|
||||
};
|
||||
}
|
||||
@@ -47,6 +47,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
propagatedBuildInputs =
|
||||
with python3.pkgs;
|
||||
[
|
||||
cryptography
|
||||
distro
|
||||
jinja2
|
||||
jmespath
|
||||
|
||||
@@ -40,8 +40,9 @@ buildNpmPackage (finalAttrs: {
|
||||
|
||||
substituteInPlace .electron-builder.config.mjs \
|
||||
--replace-fail 'AppImage' 'dir'
|
||||
|
||||
# Workaround for https://github.com/electron/electron/issues/31121
|
||||
''
|
||||
# Workaround for https://github.com/electron/electron/issues/31121
|
||||
+ lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
substituteInPlace src/background/window/path.ts \
|
||||
--replace-fail 'process.resourcesPath' "'$out/share/lib/shogihome/resources'"
|
||||
'';
|
||||
@@ -71,12 +72,15 @@ buildNpmPackage (finalAttrs: {
|
||||
rm electron-dist/libvulkan.so.1
|
||||
cp '${lib.getLib vulkan-loader}/lib/libvulkan.so.1' electron-dist
|
||||
''
|
||||
# Explicitly set identity to null to avoid signing on arm64 macs with newer electron-builder.
|
||||
# See: https://github.com/electron-userland/electron-builder/pull/9007
|
||||
+ ''
|
||||
npm run electron:pack
|
||||
|
||||
./node_modules/.bin/electron-builder \
|
||||
--dir \
|
||||
--config .electron-builder.config.mjs \
|
||||
-c.mac.identity=null \
|
||||
-c.electronDist=electron-dist \
|
||||
-c.electronVersion=${electron.version}
|
||||
|
||||
|
||||
@@ -24,23 +24,23 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "libsignal-node";
|
||||
version = "0.76.0";
|
||||
version = "0.76.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalapp";
|
||||
repo = "libsignal";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8V+q28hv7LDsS3SdH27PVHtnAneB55xYqFkhRapkcOI=";
|
||||
hash = "sha256-7UXOCgjZYOOMMnBk1pvORJVTClQo9vbhSteKBE5RHw8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-z8PbpE+kID+kOmlimuvxTrzoWpbWTKpP6HHnhZDATWM=";
|
||||
cargoHash = "sha256-beeR/tISks99+o/kdqaq96nznwoiNduyB/BBVvNTEn0=";
|
||||
|
||||
npmRoot = "node";
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-npm-deps";
|
||||
inherit (finalAttrs) version src;
|
||||
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
|
||||
hash = "sha256-/DL3sQeeZO4l16/rx7BrWEUGUIAdHft+gO3oJ1WQJUE=";
|
||||
hash = "sha256-nbGeT0Fyu9T/3EFoIDaAESIl9JOIOq2jC53GWU1Ofeo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -52,13 +52,13 @@ let
|
||||
'';
|
||||
});
|
||||
|
||||
version = "7.62.0";
|
||||
version = "7.64.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalapp";
|
||||
repo = "Signal-Desktop";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-79Mh5jx7cSr8AVL/oqjuTWQ+DHmyXL19rKlbyNMySt0=";
|
||||
hash = "sha256-jBSL9g7+lgyG4luKP84MaWfS+dniBzp3lRimgKtWrI8=";
|
||||
};
|
||||
|
||||
sticker-creator = stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -122,15 +122,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
fetcherVersion = 1;
|
||||
hash =
|
||||
if withAppleEmojis then
|
||||
"sha256-r+MktwnhmZOUc1NMumrfkTpmUUHUXKB10XKSkxg3GYU="
|
||||
"sha256-xAmIfTv270g6FoNPCauPBT2H3XTgK6MOjIIwRk0U9PY="
|
||||
else
|
||||
"sha256-raCVDqhtTTsdIn1vjbKW+ULrBefD8+kgJkKHls90KNs=";
|
||||
"sha256-Wmqu+tkoT13PEQ6QA2KczLtgbxgCWwZ6pNuE1klWLCk=";
|
||||
};
|
||||
|
||||
env = {
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
SIGNAL_ENV = "production";
|
||||
SOURCE_DATE_EPOCH = 1752702364;
|
||||
SOURCE_DATE_EPOCH = 1753917014;
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20250729";
|
||||
version = "20250801";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = "signalbackup-tools";
|
||||
tag = version;
|
||||
hash = "sha256-IHQrtS75c6fAJeRD4fDc9m1Za95h1kvAZ3B7XFwDxdA=";
|
||||
hash = "sha256-1iQi7DHHmKttibvO6naDExkp+Yk5iNY6ekG+QZE4nqI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "snazy";
|
||||
version = "0.57.2";
|
||||
version = "0.57.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chmouel";
|
||||
repo = "snazy";
|
||||
rev = version;
|
||||
hash = "sha256-oGj/k7StIuk+T40Dm1SzAIf8QhHTIhkcDUPyK/CAfDI=";
|
||||
hash = "sha256-ACEIqMonc4AD84uTkHQZc2+vXjlXhKNLZqNxWm8RnBw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wNdaicys3sGQ00CsPldvyEtgkamywaHohL599FNr6/M=";
|
||||
cargoHash = "sha256-1o6/17H2D8gKpT2EefVfMD2Bp4/R9Xtg+/Eil32GzcM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "sqldef";
|
||||
version = "2.0.6";
|
||||
version = "2.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sqldef";
|
||||
repo = "sqldef";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vlUrg/mCviFwlNT47o/5wUfl1oFFd6s8Q/Xdpn048Sk=";
|
||||
hash = "sha256-E/C2BBys5I5mC+tWgHhMNVH2ftvkzUqlrG3vJ3D7Lzg=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
@@ -64,7 +64,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
|
||||
ROCKSDB_LIB_DIR = "${rocksdb}/lib";
|
||||
};
|
||||
}
|
||||
//
|
||||
lib.optionalAttrs
|
||||
(stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isArmv7))
|
||||
{
|
||||
JEMALLOC_SYS_WITH_LG_PAGE = 16;
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/etc/stalwart
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "swaylock";
|
||||
version = "1.8.2";
|
||||
version = "1.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "swaywm";
|
||||
repo = "swaylock";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-VZxUyASWyg+UMTTYeuyRIO+++ZKL0nAqjNS6nJ756yk=";
|
||||
hash = "sha256-5JAA8mCY3vOsauvRK2zquBrzA2ROakEfahzp4a6j/Ac=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "syrics";
|
||||
version = "0.1.2.2";
|
||||
version = "0.1.2.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "akashrchandran";
|
||||
repo = "syrics";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Ck7pTUgOdib0WqPnvTU6NHKWhMYsIZBY0rzUtFi0q/A=";
|
||||
hash = "sha256-uOk/9PzQgLXAy8eSp739fArq1/C7ZqdY9GoOJ3LObJ8=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
pkg-config,
|
||||
libxcb,
|
||||
dbus,
|
||||
bash,
|
||||
procps,
|
||||
nano,
|
||||
watch,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (attrs: {
|
||||
pname = "tattoy";
|
||||
version = "0.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tattoy-org";
|
||||
repo = "tattoy";
|
||||
tag = "tattoy-v${attrs.version}";
|
||||
hash = "sha256-44rXygZVbwwC/jOB69iHydsjYr/WeVU4Eky3BPqJzyc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DJyml8J9XXKD2t1dQz+OrVDFcq6PLMoDlhiLo86D3CM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dbus
|
||||
libxcb
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
bash
|
||||
nano
|
||||
procps
|
||||
watch
|
||||
];
|
||||
|
||||
checkFlags = [
|
||||
# e2e tests currently fail
|
||||
# see https://github.com/tattoy-org/tattoy/pull/104/files for discussion
|
||||
# re-enable after PR merged
|
||||
"--skip e2e"
|
||||
"--skip gpu"
|
||||
];
|
||||
|
||||
useNextest = true;
|
||||
|
||||
meta = {
|
||||
description = "Text-based compositor for modern terminals";
|
||||
homepage = "https://github.com/tattoy-org/tattoy";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
DieracDelta
|
||||
];
|
||||
mainProgram = "tattoy";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tbls";
|
||||
version = "1.86.1";
|
||||
version = "1.87.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k1LoW";
|
||||
repo = "tbls";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-v7tZTg2tTL21YLCrdk6O8rw1/czsq7JTcpMpBHwrnyk=";
|
||||
hash = "sha256-u7zb0ohZlXlnJlgsXEp7ttNtAB4ZF3NXe3lPGpClp5M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9IvnIFOlLdqmntisNomO5K6PU8gw7CSuEb46zG5ox2A=";
|
||||
vendorHash = "sha256-6v3ypD+YWvCST5rM6YHUBGeQ5F1lwb2GKPcq/3XJeiY=";
|
||||
|
||||
excludedPackages = [ "scripts/jsonschema" ];
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "terragrunt";
|
||||
version = "0.83.2";
|
||||
version = "0.84.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = "terragrunt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-UkBwAhxvxZZT4594UzSmtHmnhxD0qIsy3alGM7I44IU=";
|
||||
hash = "sha256-5GgMiWh9ZvVbZu/WMrggQMl7dq6A5p36sEDSkPWGCTM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,103 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
squashfsTools,
|
||||
autoPatchelfHook,
|
||||
copyDesktopItems,
|
||||
alsa-lib,
|
||||
nss,
|
||||
libdrm,
|
||||
libgbm,
|
||||
libGL,
|
||||
libxkbcommon,
|
||||
pcsclite,
|
||||
makeDesktopItem,
|
||||
makeWrapper,
|
||||
wrapGAppsHook3,
|
||||
udev,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tk-safe";
|
||||
version = "25.8.1";
|
||||
|
||||
# To update, check https://search.apps.ubuntu.com/api/v1/package/tk-safe and copy the anon_download_url and version.
|
||||
src = fetchurl {
|
||||
url = "https://api.snapcraft.io/api/v1/snaps/download/rLNeIGEaag0TKFQLO0TxF3ARXg3rcTNx_18.snap";
|
||||
hash = "sha256-OrDbxLcmbL/yTANCMHcJsdGE+LK8rondGQvj+YBqS0E=";
|
||||
};
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "tk-safe";
|
||||
icon = "tk-safe";
|
||||
exec = "tk-safe";
|
||||
desktopName = "TK-Safe";
|
||||
comment = meta.description;
|
||||
genericName = "Eletronic medical record (ePA)";
|
||||
categories = [ "Utility" ];
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
copyDesktopItems
|
||||
makeWrapper
|
||||
squashfsTools
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
|
||||
unsquashfs $src
|
||||
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
sourceRoot = "squashfs-root";
|
||||
|
||||
postPatch = ''
|
||||
rm -rf lib usr
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
nss
|
||||
libdrm
|
||||
libgbm
|
||||
libxkbcommon
|
||||
udev
|
||||
pcsclite
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{bin,opt/tk-safe}
|
||||
mv * $out/opt/tk-safe
|
||||
ln -s $out/opt/tk-safe/app/tk-safe $out/bin/tk-safe
|
||||
|
||||
mkdir -p $out/share/icons/hicolor/1024x1024/apps
|
||||
ln -s $out/opt/tk-safe/meta/gui/icon.png $out/share/icons/hicolor/1024x1024/apps/tk-safe.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram $out/opt/tk-safe/app/tk-safe \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Electronic medical record (ePA) by Techniker Krankenkasse (TK)";
|
||||
homepage = "https://snapcraft.io/tk-safe";
|
||||
license = lib.licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
# Vendored copy of Electron.
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with lib.maintainers; [ felschr ];
|
||||
mainProgram = "tk-safe";
|
||||
};
|
||||
}
|
||||
@@ -8,38 +8,38 @@
|
||||
"fetchurlAttrSet": {
|
||||
"docker-credential-up": {
|
||||
"aarch64-darwin": {
|
||||
"hash": "sha256-KHM5j1yzwBTCgP8L98Tg4bdcH3Bi47ZqMew8TdOmHfs=",
|
||||
"url": "https://cli.upbound.io/main/v0.39.0-384.g0a0c8634/bundle/docker-credential-up/darwin_arm64.tar.gz"
|
||||
"hash": "sha256-IF0/05xL5X4FFsaFTNvl8Q3Z2JaoBd4CV1HagtE3RG0=",
|
||||
"url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.26.ge82e8330/bundle/docker-credential-up/darwin_arm64.tar.gz"
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"hash": "sha256-QcGPdlXnLR8X//6+ViYLnB64H4V8DD5JRbFvFTdRiSA=",
|
||||
"url": "https://cli.upbound.io/main/v0.39.0-384.g0a0c8634/bundle/docker-credential-up/linux_arm64.tar.gz"
|
||||
"hash": "sha256-jioxVXVh39LUsMm2txqYk56azoJIxsvLK5NkZcD+SvY=",
|
||||
"url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.26.ge82e8330/bundle/docker-credential-up/linux_arm64.tar.gz"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"hash": "sha256-XTJmt1jMXTCfY6DAda0prKsGgj8FbQ1WdF7bzxIpvrE=",
|
||||
"url": "https://cli.upbound.io/main/v0.39.0-384.g0a0c8634/bundle/docker-credential-up/darwin_amd64.tar.gz"
|
||||
"hash": "sha256-C0jZRZCHdciNXsC7vrjPeeZaq8RIA4+noaF+JpMISiw=",
|
||||
"url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.26.ge82e8330/bundle/docker-credential-up/darwin_amd64.tar.gz"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"hash": "sha256-6rBbIsOuxx29cEaRC4IKjAnkAPyy5s/r2UOYQ5lf6YA=",
|
||||
"url": "https://cli.upbound.io/main/v0.39.0-384.g0a0c8634/bundle/docker-credential-up/linux_amd64.tar.gz"
|
||||
"hash": "sha256-CVM9eo8KuyXskPIduO/Wvk+Uq5wyKKqQcYthUqsgCBA=",
|
||||
"url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.26.ge82e8330/bundle/docker-credential-up/linux_amd64.tar.gz"
|
||||
}
|
||||
},
|
||||
"up": {
|
||||
"aarch64-darwin": {
|
||||
"hash": "sha256-AWOEJIVpU0NEWHStuOj39VpnYwKiSfgbGLeKjKYBEVY=",
|
||||
"url": "https://cli.upbound.io/main/v0.39.0-384.g0a0c8634/bundle/up/darwin_arm64.tar.gz"
|
||||
"hash": "sha256-Wx7cFeKVZAj5pfzvyR1NM9rMLeqHeyKegcrzTn3zVp4=",
|
||||
"url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.26.ge82e8330/bundle/up/darwin_arm64.tar.gz"
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"hash": "sha256-1ybfK901CbwHK0MiZYEIYJSY6hPnxqgNOVI47BaOMLM=",
|
||||
"url": "https://cli.upbound.io/main/v0.39.0-384.g0a0c8634/bundle/up/linux_arm64.tar.gz"
|
||||
"hash": "sha256-pbpcsVz9BROF2ajJsLOBFB4xQXAGwcs3hsOqvnf2yw0=",
|
||||
"url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.26.ge82e8330/bundle/up/linux_arm64.tar.gz"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"hash": "sha256-aw75IToOlqq7xTia6o8Zs2GXBzKdnatwyeETvvT8iCI=",
|
||||
"url": "https://cli.upbound.io/main/v0.39.0-384.g0a0c8634/bundle/up/darwin_amd64.tar.gz"
|
||||
"hash": "sha256-eQ1z23yfrLREvN+tylz2LwU+YbJgf0bRQioT4zR7dRw=",
|
||||
"url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.26.ge82e8330/bundle/up/darwin_amd64.tar.gz"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"hash": "sha256-6jc3jxy2qRabew6P/Xf5bElcuMXHsPg0zED80ubFUAk=",
|
||||
"url": "https://cli.upbound.io/main/v0.39.0-384.g0a0c8634/bundle/up/linux_amd64.tar.gz"
|
||||
"hash": "sha256-lrgR3XifNXIMtcefFTLkDUq8Lu6jSeyta53tFByP2mM=",
|
||||
"url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.26.ge82e8330/bundle/up/linux_amd64.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -49,5 +49,5 @@
|
||||
"x86_64-darwin",
|
||||
"x86_64-linux"
|
||||
],
|
||||
"version": "0.39.0-384.g0a0c8634"
|
||||
"version": "0.41.0-0.rc.0.26.ge82e8330"
|
||||
}
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "updatecli";
|
||||
version = "0.103.0";
|
||||
version = "0.105.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "updatecli";
|
||||
repo = "updatecli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OgIwGo+oOVneaJ7REgMJ79KPdUXVpcw7kCVLQeBw1/Q=";
|
||||
hash = "sha256-VE5sU3R9dVi97fyc+bafZUz/9v6iPfw3MRsjCm8ifuo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3aIw64uv/NgB8/tpysmnSAMbussENhLge70QQ4A86cY=";
|
||||
vendorHash = "sha256-HdeFXQGisz0q/ZZv1UMo9ig9zBzH6Uyap8c1vl4zl5w=";
|
||||
|
||||
# tests require network access
|
||||
doCheck = false;
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "usql";
|
||||
version = "0.19.21";
|
||||
version = "0.19.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xo";
|
||||
repo = "usql";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Ix1+uq5TpYp6JyT2KML8Ts/ElPeQCKz9qAW9DqQahbE=";
|
||||
hash = "sha256-k6zXXtttW6AXLK/DoRqYOz39kqwamOE/xfT6TOa22jc=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -25,7 +25,7 @@ buildGoModule rec {
|
||||
icu
|
||||
];
|
||||
|
||||
vendorHash = "sha256-YXpmzIPs6gvEspC9JrGHw4Yzs8wdtBTsGU9kTOT6c+0=";
|
||||
vendorHash = "sha256-RdIf/1Vu37y+xoF2I8XJYqgeOxGHG+hLe3JOMbVLofw=";
|
||||
proxyVendor = true;
|
||||
|
||||
# Exclude drivers from the bad group
|
||||
@@ -44,7 +44,6 @@ buildGoModule rec {
|
||||
"sqlite_json1"
|
||||
"sqlite_math_functions"
|
||||
"sqlite_stat4"
|
||||
"sqlite_userauth"
|
||||
"sqlite_vtable"
|
||||
"no_adodb"
|
||||
];
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "vulkan-hdr-layer-kwin6";
|
||||
version = "0-unstable-2025-05-22";
|
||||
version = "0-unstable-2025-07-31";
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
||||
@@ -40,8 +40,8 @@ stdenv.mkDerivation {
|
||||
src = fetchFromGitHub {
|
||||
owner = "Zamundaaa";
|
||||
repo = "VK_hdr_layer";
|
||||
rev = "1384036ea24a9bc38a5c684dac5122d5e3431ae6";
|
||||
hash = "sha256-xm0S1vLE8MAov8gf6rN5ZKZAe6NMKfHDlUlmNd332qw=";
|
||||
rev = "303e0c69e1d33acd95158d92b1fc652fb5b85399";
|
||||
hash = "sha256-NsC44Ifl/fAHvFqP7NLrVZ71Y+x5mBEkv+r43HN5yn4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -10,17 +10,17 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "werf";
|
||||
version = "2.42.0";
|
||||
version = "2.45.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HZT8MYPnSe6BQtGNiCCB/MfAsj1HQz9oXyZlKgBzbBg=";
|
||||
hash = "sha256-tTWhGaKEYrZAQnIkuRcTMLlYooexhRIc0rJ4wzqJCWM=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-IlXE1mNSc/CFN5lSXvXonGQanyDS+XH8Wa3FCLM/gXc=";
|
||||
vendorHash = "sha256-5OSt0oMFb0MjJDXTFJKtaintOhnCShBOHfjllWbwb6Y=";
|
||||
|
||||
subPackages = [ "cmd/werf" ];
|
||||
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.6.3";
|
||||
version = "5.6.4";
|
||||
pname = "whois";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rfc1036";
|
||||
repo = "whois";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YJAd6s1kq2IJcR7qf7ljntLb5HgsaTH0wsoPKIMxHdg=";
|
||||
hash = "sha256-9c67LrpJu3cW/j1hfNhatB4nkCxMTCfHpszawGtU7ko=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wolfssl-${variant}";
|
||||
version = "5.7.6";
|
||||
version = "5.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wolfSSL";
|
||||
repo = "wolfssl";
|
||||
tag = "v${finalAttrs.version}-stable";
|
||||
hash = "sha256-q3V2cxk7dBRJoE8EpfWxkYmXPfDzoMwrX1JLazrHOuA=";
|
||||
hash = "sha256-rWBfpI6tdpKvQA/XdazBvU5hzyai5PtKRBpM4iplZDU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -91,7 +91,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
util-linux
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
# FAILURES:
|
||||
# 497: test_wolfSSL_EVP_PBE_scrypt
|
||||
doCheck = !stdenv.hostPlatform.isLoongArch64;
|
||||
|
||||
nativeCheckInputs = [
|
||||
openssl
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "xan";
|
||||
version = "0.51.0";
|
||||
version = "0.52.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "medialab";
|
||||
repo = "xan";
|
||||
tag = version;
|
||||
hash = "sha256-wfA8yyIFzwYkd/nuSOFv6Z7aDhBZiYzs2E/Pxouqicw=";
|
||||
hash = "sha256-Enjtp/35rhSsndLFaQw8sGsO43mOes3Se8ElbdcSv0E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-8FJTiZuLRvHdDAYf3M0tWfT7BtCVuBlnIzmUMgBo8aA=";
|
||||
cargoHash = "sha256-m3aiX34W6GHgnT6kkb1CsLXyVH5FnxSOh5etCCJJsAs=";
|
||||
|
||||
# FIXME: tests fail and I do not have the time to investigate. Temporarily disable
|
||||
# tests so that we can manually run and test the package for packaging purposes.
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
testers,
|
||||
yamlfmt,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
@@ -14,7 +13,12 @@ buildGoModule (finalAttrs: {
|
||||
owner = "google";
|
||||
repo = "yamlfmt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-EYOtxb2Xq4bQpWbITmPieVMqJz3/2chgNirZEjiyjAY=";
|
||||
hash = "sha256-WSw4WhWNyvkCwRCQYFAKhtkvOSSCrSlX3+i6cMHRtOQ=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C "$out" rev-parse --short HEAD > "$out/.git_head"
|
||||
rm -rf "$out/.git"
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Cy1eBvKkQ90twxjRL2bHTk1qNFLQ22uFrOgHKmnoUIQ=";
|
||||
@@ -23,16 +27,21 @@ buildGoModule (finalAttrs: {
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=main.version=${finalAttrs.version}"
|
||||
"-X=main.commit=${finalAttrs.src.rev}"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
ldflags+=" -X=main.commit=$(<.git_head)"
|
||||
'';
|
||||
|
||||
# Test failure in vendored yaml package, see:
|
||||
# https://github.com/google/yamlfmt/issues/256
|
||||
checkFlags = [ "-run=!S/TestNodeRoundtrip" ];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = yamlfmt;
|
||||
};
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
doInstallCheck = true;
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
meta = {
|
||||
description = "Extensible command line tool or library to format yaml files";
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
stdenv,
|
||||
openssl,
|
||||
pkg-config,
|
||||
minizip,
|
||||
zlib,
|
||||
versionCheckHook,
|
||||
}:
|
||||
let
|
||||
platformName = if stdenv.hostPlatform.isLinux then "linux" else "macos";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zsign";
|
||||
version = "0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zhlynn";
|
||||
repo = "zsign";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CAG9ewROyIGN5VOZbs0X1W88HdZ3H1sxaRJ7JpDbw3o=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/build/${platformName}";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
openssl
|
||||
minizip
|
||||
zlib
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"BINDIR=bin/"
|
||||
"CXX=${stdenv.cc.targetPrefix}c++"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin/
|
||||
cp bin/zsign $out/bin/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
meta = {
|
||||
description = "Cross-platform codesign alternative for iOS 12+";
|
||||
homepage = "https://github.com/zhlynn/zsign";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ pascalj ];
|
||||
mainProgram = "zsign";
|
||||
platforms = with lib.platforms; darwin ++ linux;
|
||||
};
|
||||
})
|
||||
@@ -4,8 +4,8 @@ let
|
||||
base = callPackage ./generic.nix (
|
||||
_args
|
||||
// {
|
||||
version = "8.3.23";
|
||||
hash = "sha256-BUiPe5Z9kKUJMvBnTcNW4beV9SLwKYtc4ktoDeIzwtQ=";
|
||||
version = "8.3.24";
|
||||
hash = "sha256-5OEtpJB0aSRiTJFAa2CzGWfk173qu6uejLU1SITumWQ=";
|
||||
}
|
||||
);
|
||||
in
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user