Merge master into staging-nixos
This commit is contained in:
@@ -476,12 +476,6 @@
|
||||
githubId = 908758;
|
||||
name = "Abigail Bunyan";
|
||||
};
|
||||
aborsu = {
|
||||
email = "a.borsu@gmail.com";
|
||||
github = "aborsu";
|
||||
githubId = 5033617;
|
||||
name = "Augustin Borsu";
|
||||
};
|
||||
aboseley = {
|
||||
email = "adam.boseley@gmail.com";
|
||||
github = "aboseley";
|
||||
@@ -23975,12 +23969,6 @@
|
||||
email = "hey@sandydoo.me";
|
||||
matrix = "@sandydoo:matrix.org";
|
||||
};
|
||||
santosh = {
|
||||
email = "santoshxshrestha@gmail.com";
|
||||
name = "Santosh Shrestha";
|
||||
github = "santoshxshrestha";
|
||||
githubId = 182977126;
|
||||
};
|
||||
sarahec = {
|
||||
email = "seclark@nextquestion.net";
|
||||
github = "sarahec";
|
||||
@@ -26243,12 +26231,6 @@
|
||||
githubId = 12595971;
|
||||
name = "Guillaume Girol";
|
||||
};
|
||||
synthetica = {
|
||||
email = "nix@hilhorst.be";
|
||||
github = "Synthetica9";
|
||||
githubId = 7075751;
|
||||
name = "Patrick Hilhorst";
|
||||
};
|
||||
sysedwinistrator = {
|
||||
email = "edwin.mowen@gmail.com";
|
||||
github = "sysedwinistrator";
|
||||
@@ -28456,6 +28438,12 @@
|
||||
githubId = 7235381;
|
||||
name = "Ondřej Kvapil";
|
||||
};
|
||||
vimlinuz = {
|
||||
email = "vimlinuz@gmail.com";
|
||||
name = "Santosh Shrestha";
|
||||
github = "vimlinuz";
|
||||
githubId = 182977126;
|
||||
};
|
||||
vincentbernat = {
|
||||
email = "vincent@bernat.ch";
|
||||
github = "vincentbernat";
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
#! /bin/sh
|
||||
|
||||
# give absolute path of release.nix as argument
|
||||
hydra_eval_jobs \
|
||||
--argstr system x86_64-linux \
|
||||
--argstr system i686-linux \
|
||||
--argstr system x86_64-darwin \
|
||||
--argstr system i686-cygwin \
|
||||
--argstr system x86_64-cygwin \
|
||||
--argstr system i686-freebsd \
|
||||
--arg officialRelease false \
|
||||
--arg nixpkgs "{ outPath = builtins.storePath ./. ; rev = 1234; }" \
|
||||
$@
|
||||
@@ -295,7 +295,6 @@ with lib.maintainers;
|
||||
|
||||
gcc = {
|
||||
members = [
|
||||
synthetica
|
||||
vcunat
|
||||
ericson2314
|
||||
];
|
||||
|
||||
@@ -31,7 +31,6 @@ let
|
||||
in
|
||||
{
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
aborsu
|
||||
b-m-f
|
||||
];
|
||||
|
||||
|
||||
@@ -29,8 +29,8 @@ let
|
||||
in
|
||||
{
|
||||
name = "pulseaudio${lib.optionalString fullVersion "Full"}${lib.optionalString systemWide "-systemWide"}";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ synthetica ] ++ pkgs.pulseaudio.meta.maintainers;
|
||||
meta = {
|
||||
maintainers = pkgs.pulseaudio.meta.maintainers;
|
||||
};
|
||||
|
||||
nodes.machine =
|
||||
|
||||
@@ -2,9 +2,7 @@
|
||||
{
|
||||
name = "sway";
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [
|
||||
synthetica
|
||||
];
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
# testScriptWithTypes:49: error: Cannot call function of unknown type
|
||||
|
||||
@@ -41,7 +41,6 @@ let
|
||||
nodes."${name}" = machine;
|
||||
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
synthetica
|
||||
turion
|
||||
];
|
||||
|
||||
|
||||
@@ -93,7 +93,7 @@ in
|
||||
meta = {
|
||||
description = "Wrapper to create jupyter notebook kernel definitions";
|
||||
homepage = "https://jupyter.org/";
|
||||
maintainers = with lib.maintainers; [ aborsu ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -116,7 +116,6 @@ buildVscode {
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [
|
||||
eadwu
|
||||
synthetica
|
||||
bobby285271
|
||||
johnrtitor
|
||||
jefflabonte
|
||||
|
||||
@@ -81,7 +81,6 @@ buildVscode rec {
|
||||
license = lib.licenses.mit;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with lib.maintainers; [
|
||||
synthetica
|
||||
bobby285271
|
||||
];
|
||||
mainProgram = "codium";
|
||||
|
||||
@@ -842,13 +842,13 @@
|
||||
"vendorHash": "sha256-BxMhu2gcRuOlYWgx5ZOUBGdfB28+87SG1T/KAPDyei8="
|
||||
},
|
||||
"linode_linode": {
|
||||
"hash": "sha256-trwD5gL/zVa82URY3zxKYN3UM2ZjvQAXBS0O6bfTVNU=",
|
||||
"hash": "sha256-i2zAB/3cDOex7j2WciKlRlYfOyhkixEHYbTkoCG1u9s=",
|
||||
"homepage": "https://registry.terraform.io/providers/linode/linode",
|
||||
"owner": "linode",
|
||||
"repo": "terraform-provider-linode",
|
||||
"rev": "v3.9.0",
|
||||
"rev": "v3.10.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-jytzC7dzoadOXIMv6eSHS1KP0KmgybWKzYJibPTcsoU="
|
||||
"vendorHash": "sha256-HzBj7TSjiv/Ov10KOt5V4oQaKK7CKjBjxpSrhmOl1lQ="
|
||||
},
|
||||
"loafoe_htpasswd": {
|
||||
"hash": "sha256-1o2kgeTFxegzOgGXWP4OYZ3uC3WbAkCXPqScMvVpHr0=",
|
||||
|
||||
@@ -29,7 +29,7 @@ python3Packages.buildPythonApplication {
|
||||
meta = {
|
||||
description = "XMonad-like workspace switching for i3 and sway";
|
||||
mainProgram = "i3-wk-switch";
|
||||
maintainers = with lib.maintainers; [ synthetica ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://travisf.net/i3-wk-switcher";
|
||||
|
||||
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
|
||||
mainProgram = "wmfocus";
|
||||
homepage = "https://github.com/svenstaro/wmfocus";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ synthetica ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -81,7 +81,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# See: https://github.com/NixOS/nixpkgs/issues/279226
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [
|
||||
synthetica
|
||||
eljamm
|
||||
];
|
||||
mainProgram = "albert";
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "algia";
|
||||
version = "0.0.106";
|
||||
version = "0.0.107";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattn";
|
||||
repo = "algia";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8hsSt/QUyIEYpI4L8/uksuwLedjfilGHZ5xc9jUK1uo=";
|
||||
hash = "sha256-23h2sVwOhKXnpYBq1jZbbC275dzc6HnqUpB/1wbrpw4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JTTWVs0KwceiLy6tpyd48zORiXLc18zwgG1c+ceivKU=";
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
--- a/app/shared/ui-settings/src/commonMain/kotlin/ui/update/UpdateChecker.kt
|
||||
+++ b/app/shared/ui-settings/src/commonMain/kotlin/ui/update/UpdateChecker.kt
|
||||
@@ -40,25 +40,7 @@
|
||||
expectSuccess = true
|
||||
}.use { client ->
|
||||
withExceptionCollector {
|
||||
- return kotlin.runCatching {
|
||||
- client.getVersionFromAniServer("https://danmaku-global.myani.org/", currentVersion, releaseClass)
|
||||
- .also {
|
||||
- logger.info { "Got latest version from global server: ${it?.name}" }
|
||||
- }
|
||||
- }.recoverCatching { exception ->
|
||||
- collect(exception)
|
||||
- client.getVersionFromAniServer("https://danmaku-cn.myani.org/", currentVersion, releaseClass).also {
|
||||
- logger.info { "Got latest version from CN server: ${it?.name}" }
|
||||
- }
|
||||
- }.onFailure { exception ->
|
||||
- collect(exception)
|
||||
- if (exception is CancellationException || exception is IOException) {
|
||||
- throwLast()
|
||||
- }
|
||||
- val finalException = getLast()!!
|
||||
- logger.error(finalException) { "Failed to get latest version" }
|
||||
- throw finalException
|
||||
- }.getOrThrow()// should not throw, because of `onFailure`
|
||||
+ return null
|
||||
}
|
||||
}
|
||||
}
|
||||
Generated
+78
-92
@@ -53,10 +53,6 @@
|
||||
"module": "sha256-KsL3EG4S8mNCW0pN/ICYlEf7iVZ1/pAthnWap0/RK30=",
|
||||
"pom": "sha256-/leyKEF/TXxneQPcYftKfPmT1gNJneJtjYET5HfMTxs="
|
||||
},
|
||||
"androidx/annotation#annotation-iosarm64/1.7.0": {
|
||||
"module": "sha256-AC0rtA4C7N7Y533F1nTe4s5f538pUxgcl+vVDSRlAY0=",
|
||||
"pom": "sha256-ehf34KZP5hR8zaxQyF0Qo7AY/PHd/ip3e6YAA8pa3FY="
|
||||
},
|
||||
"androidx/annotation#annotation-iosarm64/1.9.0": {
|
||||
"module": "sha256-6DJvdch3vV6HpxGXejlvW+xtpU1QTP3BBdQH6tTdXtc=",
|
||||
"pom": "sha256-r5RTiIOEj6z73kf5Xg2fNWerA2l/Nc6e7NnkS/y4JQc="
|
||||
@@ -65,10 +61,6 @@
|
||||
"module": "sha256-gWifMc5Ndyzq5Nm4EKEPjSJlSrdSk/9EbJwgEfi6MjE=",
|
||||
"pom": "sha256-JTmoAKO24c6Fefs5T7n0Yi81sDPGYvSj9Zc9+O+IilI="
|
||||
},
|
||||
"androidx/annotation#annotation-iossimulatorarm64/1.7.0": {
|
||||
"module": "sha256-OikdRa70npj492Pcc+iJJnOSmeiUyqGrKZhWZp7hjRI=",
|
||||
"pom": "sha256-5+KpIB5thn7QIZaNGTjoBHdboYieIemh6IMcSL4iOYk="
|
||||
},
|
||||
"androidx/annotation#annotation-iossimulatorarm64/1.9.0": {
|
||||
"module": "sha256-b8ECz4xqGmk7qL083JGilvz/Ag6SMrz+MAS1VRXMhpI=",
|
||||
"pom": "sha256-8G4LBU16fBWN4e++C66OrN0vy1Oak7n/ZOmYOAuoVHo="
|
||||
@@ -81,11 +73,6 @@
|
||||
"module": "sha256-P1qPqhneZn5j3KlzD/jvDkeOS6+1/uuCWOXAhiRtyQw=",
|
||||
"pom": "sha256-K+ZlunzbBGtBtAnHmj3gxtnhJVJCwIf2uUssdJO+CPQ="
|
||||
},
|
||||
"androidx/annotation#annotation-jvm/1.7.0": {
|
||||
"jar": "sha256-42uOS4OTpK3HTj1KsirVo2OW8M6i5AtXNOrhSTff0iQ=",
|
||||
"module": "sha256-B85gw3erlOR8jJAlibl3YDAGT9Gn5NWgGjjXAONeXbQ=",
|
||||
"pom": "sha256-LT/MEucHiGmSA5JmI39FEUDKqPlMHmLn/E1gLeNFsNc="
|
||||
},
|
||||
"androidx/annotation#annotation-jvm/1.8.1": {
|
||||
"module": "sha256-yVnjsM3HXBXv4BYF+laqefAz45I44VBji4+r3mqhIaA=",
|
||||
"pom": "sha256-1JIDczqm+uBGw6PeTnlu7TR1lXVUhqZCc5iYRHWXULQ="
|
||||
@@ -502,10 +489,6 @@
|
||||
"module": "sha256-EPd9GdGF6KLN1LDa+ymy2hgM61G1PuwstFu40CeVSpg=",
|
||||
"pom": "sha256-4itFFcGCYOqcksHaHQsJqkb+gnCr1mg4oveFn/JzJds="
|
||||
},
|
||||
"androidx/compose/runtime#runtime-saveable/1.8.2": {
|
||||
"module": "sha256-bvgfp/FklhULLb9r4gHEEt7T80PKH5Xt5EIYdR7WbHI=",
|
||||
"pom": "sha256-zkIRKN1Z/3cq3hv5T61DdKbcxe64Az4xQPawbvbZlCw="
|
||||
},
|
||||
"androidx/compose/runtime#runtime-saveable/1.9.0": {
|
||||
"module": "sha256-dWS0MU7dgdDxwPp2MH9HPDl7Y0hWIdPO4KKRiwUvJS4=",
|
||||
"pom": "sha256-hqVscAR77b6wjyPOhtoJ3LR38J+MUjnvp5CV4uzgYLM="
|
||||
@@ -3005,10 +2988,18 @@
|
||||
"module": "sha256-/Pqut7oYe99qycvB0HNJiWSbCn/8bfteU5TBcJYfaLI=",
|
||||
"pom": "sha256-sid4YljDlKaO0ntiFyaB+JdOQoJHeTBU0XxAxlDEEfI="
|
||||
},
|
||||
"co/touchlab#stately-strict-iosarm64/2.0.6": {
|
||||
"module": "sha256-qOtTajAaiWcZulLhdrLMOxgzg3PlRL85DjGApJNMAVg=",
|
||||
"pom": "sha256-oY8yBrVtGjDoAR2dMt0GaPATdyKBGvmyiLd0NE/Z5ZU="
|
||||
},
|
||||
"co/touchlab#stately-strict-iosarm64/2.1.0": {
|
||||
"module": "sha256-8UOjj43DzTJcUh82aMb3UuxN99vKlf/A4kJWhNubHN4=",
|
||||
"pom": "sha256-80CheYAdvDwZ0/xiJNOnySnM+3NmfP2EujE5jtZDafY="
|
||||
},
|
||||
"co/touchlab#stately-strict-iossimulatorarm64/2.0.6": {
|
||||
"module": "sha256-uXuBPQgr1k5sLpnPY7KcFPKQaLaEw5jDf+pPy0OOeFg=",
|
||||
"pom": "sha256-pvmqkz0ylUVaeLu1XRfqVFIYBybxlIr72XjkPJgFin4="
|
||||
},
|
||||
"co/touchlab#stately-strict-iossimulatorarm64/2.1.0": {
|
||||
"module": "sha256-HvYz59tOHPEu88DkMv3YAiaIBbb+M+0PSE1by2jplTw=",
|
||||
"pom": "sha256-VhGaJG2F4fwijbx4TjMj7ld6FdxnVnykeHqKgbMbon4="
|
||||
@@ -5515,10 +5506,6 @@
|
||||
"module": "sha256-RWBz1hMzkqxpnWLPsN64wCvaKATJ0DowDPUiSpH/LIg=",
|
||||
"pom": "sha256-7woPdZv6dxVHNjyRKaa2PTUFds7PW4OZFTkQIcZoOgA="
|
||||
},
|
||||
"org/jetbrains/compose/runtime#runtime-saveable-uikitarm64/1.8.2": {
|
||||
"module": "sha256-O942iQhum9QIocX9wOQx+NVAaLPAlHHSI1AoWonTdmw=",
|
||||
"pom": "sha256-fPWcnAL/lQ0yt1nF7TCzyp/bAHRX1v0fywMEw2e/E6g="
|
||||
},
|
||||
"org/jetbrains/compose/runtime#runtime-saveable-uikitarm64/1.9.0": {
|
||||
"module": "sha256-uNVM3vXgpbeDXLM4iBM0iSz7qz+SN3/lmBeiXXU+kbg=",
|
||||
"pom": "sha256-HanDoPdPzxJ0SRyrHm7PfZ2C2iZnYCPoCQCldo+0uHs="
|
||||
@@ -5531,10 +5518,6 @@
|
||||
"module": "sha256-OgEVWV6hCpJxUIVrUuPNsS4zRtVDcAd/+HKII0t043Q=",
|
||||
"pom": "sha256-idSq3GUxiPxdCKVpbmH8HGq/IkpFNZUZ1MSNZDWG5n4="
|
||||
},
|
||||
"org/jetbrains/compose/runtime#runtime-saveable-uikitsimarm64/1.8.2": {
|
||||
"module": "sha256-hkmLu/22k8LUHFfk9wYTdE+1oDbT08zxzBB8zV1KwGY=",
|
||||
"pom": "sha256-wqhTeOdhVYu27PHODBBZBkAcH97ai3FDQmThhayWKQU="
|
||||
},
|
||||
"org/jetbrains/compose/runtime#runtime-saveable-uikitsimarm64/1.9.0": {
|
||||
"module": "sha256-NgHdc32iO0hYHHvq25xG7bNLyR0HITAb2J5heheFy30=",
|
||||
"pom": "sha256-mq9FKhMxH2vHDvqCZJma6dTV6EAOHJhoPDGDAgLM33M="
|
||||
@@ -6203,6 +6186,9 @@
|
||||
"jar": "sha256-z5XszGzHhN/0ed7guINPNYS5MpLMXZGXLoL117nhPjs=",
|
||||
"pom": "sha256-vklJB+DhnHi7ghFUr6F3bVrXoFi0qzAJD3Q1Sw4TON4="
|
||||
},
|
||||
"org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.0": {
|
||||
"pom": "sha256-K7bHVRuXx7oCn5hmWC56oZ1jq/1M1T2j/AxGLzq1/CY="
|
||||
},
|
||||
"org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": {
|
||||
"jar": "sha256-PbdSowB08G7mxXmEqm8n2kT00rvH9UQmUfaYjxyyt9c=",
|
||||
"pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg="
|
||||
@@ -6885,95 +6871,95 @@
|
||||
"module": "sha256-s+NvC4F8sW43udNc2Sf7pqQYPTpy6WYcDaEZtGe1U5Y=",
|
||||
"pom": "sha256-EN0WnADat5JXw6z/58I2vqwkgfngp2xT620S9Mp1q2c="
|
||||
},
|
||||
"org/openani/mediamp#catalog/0.0.29": {
|
||||
"module": "sha256-s6r4l6CUxAxXNrk0x4papHn7CT9Agn+VGhA5gde45/8=",
|
||||
"pom": "sha256-E5GiqnTrK4imwFM7QBmAAhhxDKijBAIi/mwyH3FUuk4="
|
||||
"org/openani/mediamp#catalog/0.0.30": {
|
||||
"module": "sha256-2OPa47tUPbb2VrTHEOwV8lGquOHf0NP7ic+M1D2GCHM=",
|
||||
"pom": "sha256-A2o2vXqHPKNgWU1tVkeQMvwwjDfb6Z1u116yd1RJch0="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-api-android-debug/0.0.29": {
|
||||
"module": "sha256-jU1JEH7gsdNZqGDewGzwxm9RVbT/0cL0T4SsT1m/v/w=",
|
||||
"pom": "sha256-ZRgAVnFvMsp3tirT+pxdzLl/UgaKwWLiJwix9zmo5hU="
|
||||
"org/openani/mediamp#mediamp-api-android-debug/0.0.30": {
|
||||
"module": "sha256-i05AWijPx24uS1h09c4mswpBwJKRgd9ey3mQPOXudsM=",
|
||||
"pom": "sha256-WbTPILNxF14itRm7/VcMlWTusP8MJdaIzt0UduzodAs="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-api-android/0.0.29": {
|
||||
"module": "sha256-A7Kf2AqX+9bds8WYtQnt7oRkoLXjXnk/3RnMiLcSCkw=",
|
||||
"pom": "sha256-pyflDsXfp2uPi32gudBjcjjVfPjbwz2cV7Wnvclz7ME="
|
||||
"org/openani/mediamp#mediamp-api-android/0.0.30": {
|
||||
"module": "sha256-1R6MW6Hod8WqccN3hSjQL61q/SOAUgXOmUutKvB1ZAk=",
|
||||
"pom": "sha256-VmpuVDAwn3sa5SVacHYYIV6/AMD8cHA9ccJbzsSHLg8="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-api-desktop/0.0.29": {
|
||||
"jar": "sha256-k4Qsb20oECKLw2ZQ+QH7rCuKl9W3kM9nfJRWF0cTAlE=",
|
||||
"module": "sha256-InxhvamLA6cAcu7JPORsd+NoK+eeTjlmg+kXHgUL8J8=",
|
||||
"pom": "sha256-4yVSYeA9sIcF7x0W9IOSNEtURY10iC9gvsC00JZ6GmU="
|
||||
"org/openani/mediamp#mediamp-api-desktop/0.0.30": {
|
||||
"jar": "sha256-cjmXO7AT1WxxAnqjAVqm1W5rGWBzgQg72/FMDH4cBgk=",
|
||||
"module": "sha256-qk9kYkERTe27Ae63/HtReT9rpYtxIQM6oV00VI15Jok=",
|
||||
"pom": "sha256-4y32EbVgTpToWtNFgVIEtIBrwzsLkQefMg+ml/0thRw="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-api-iosarm64/0.0.29": {
|
||||
"module": "sha256-pi4zPVts8iYT+Id6q3xRa5R9W9LQrCdYL3pKlLqVjV4=",
|
||||
"pom": "sha256-FEuhDtbkSE07U1E8Q87TIB/v4YLFpLrOqZnpPchKilQ="
|
||||
"org/openani/mediamp#mediamp-api-iosarm64/0.0.30": {
|
||||
"module": "sha256-DWqiR1l7S++nrZxcFXJrLtw3XIjqj3kqwR2vd4m6fZw=",
|
||||
"pom": "sha256-4bG2sVVe3LlKtenq/gUmWh3N2+l5FSh8EgYMYDoXyUk="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-api-iossimulatorarm64/0.0.29": {
|
||||
"module": "sha256-vX2BCljeCqNtJiV7jXlH8iQJDFiX5J7EaaCnaK9u1GQ=",
|
||||
"pom": "sha256-a+yj2/YHppcgKiQ/pK5lEM5ndC2GoLxN/RfHloDC6nU="
|
||||
"org/openani/mediamp#mediamp-api-iossimulatorarm64/0.0.30": {
|
||||
"module": "sha256-PMH1SJn/7HHzFVq+PIIrYtfLHCy1wqTJwRdsDuD11+U=",
|
||||
"pom": "sha256-kwJMwkxnwD+Chp9ip+Cmgy/Fq39mcuUbTbeD4xyEpzE="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-api/0.0.29": {
|
||||
"module": "sha256-5BiLU2hqMh9twBjyMkZymeltSP5Lvhqm+Ebram4FJxk=",
|
||||
"pom": "sha256-bxPAiiGEC3XucMnl+KwnQfP1Q96RlQBpHw459rTU9os="
|
||||
"org/openani/mediamp#mediamp-api/0.0.30": {
|
||||
"module": "sha256-qpHZ8PUMNf0qUY7pImlp0BeOiLXccgCPfNR+jzXnTGo=",
|
||||
"pom": "sha256-7mmAoDq1Js3QGlIlBpHvUN1WD1vWY6Vv3zjAejs3PTU="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-avkit-iosarm64/0.0.29": {
|
||||
"module": "sha256-69NJ47GtvieicRl2jQwncgKUOdAg04krEMUkFanTD9E=",
|
||||
"pom": "sha256-2ulgh0zZuf2Y3VB8HPEoeOoly57ZiuphZCxLt+O03PU="
|
||||
"org/openani/mediamp#mediamp-avkit-iosarm64/0.0.30": {
|
||||
"module": "sha256-zBn6Tz4aGOYy0nMEBFLKtp5mRFzgcHjovmTSLKPKetU=",
|
||||
"pom": "sha256-OSqAIdGS1juME6tgpo3PYaf6F9gYq86ze155k8SUNfc="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-avkit-iossimulatorarm64/0.0.29": {
|
||||
"module": "sha256-NqOkI5Z9iakDOzLu9J/VdLA8s4k+RpyMHRUtpCsGQrw=",
|
||||
"pom": "sha256-IPEcwTRk7xoDOwRIjOXcQ/xWneSRyfavPFoRQkKeYak="
|
||||
"org/openani/mediamp#mediamp-avkit-iossimulatorarm64/0.0.30": {
|
||||
"module": "sha256-GkPl9oCYipnLq5AvhJSXfSmEN7CXDidf1jbveejZOgY=",
|
||||
"pom": "sha256-sqk1pwBCNE3FVbYXPIvq9Wc1ZYC0t1HG8jRQiVGwKIs="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-avkit/0.0.29": {
|
||||
"module": "sha256-3mZlCh9V5OHi74ETW/Z/7ElP12/rOxgDlHtfbcSmI5U=",
|
||||
"pom": "sha256-BCn3TBi/kYcTE7qXYYJhAl+W7eXi5MPN6yodYYUi/18="
|
||||
"org/openani/mediamp#mediamp-avkit/0.0.30": {
|
||||
"module": "sha256-qPTctSZF3yZ7eWeGd3whSLpe1VqhTKvghX9gt1x9ROc=",
|
||||
"pom": "sha256-qxNi8q1t4QvUvisiKZZkS35jBER/QO/q9RQ7BDdxN3w="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-exoplayer/0.0.29": {
|
||||
"module": "sha256-q3w8QTM4lgFZCCcKSH4/O8VASBVN/SxA7Kr6WBBjIpM=",
|
||||
"pom": "sha256-aoJSOzxoqYK5oJThfGXanf6/kkRoji8PtCuBwui6vfE="
|
||||
"org/openani/mediamp#mediamp-exoplayer/0.0.30": {
|
||||
"module": "sha256-vW+B6TZGu/PE96JqZVjTg4uhcLAO9XeN55Pfvm5Oz6M=",
|
||||
"pom": "sha256-b9jem2r2BXE4BaMpCzchhh9bcKKRNPJvk2VA+50fbKM="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-internal-utils-iosarm64/0.0.29": {
|
||||
"module": "sha256-dM6tWX17zmoxefcPBq5k+cj/YVlU5AG3ItIN+G4uOZ8=",
|
||||
"pom": "sha256-UVczUfnaJ0ap5maZ7b1KNPrEZksna+QfhHVFLbAbAeg="
|
||||
"org/openani/mediamp#mediamp-internal-utils-iosarm64/0.0.30": {
|
||||
"module": "sha256-oc5QOdK5ZYxNsVD5suYvlCMbzGonBapKmz42Nf9fYHg=",
|
||||
"pom": "sha256-5TZ7j3EaRSQruC/8PTXXzLLKoq0/xedJ++30j32GkBc="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-internal-utils-iossimulatorarm64/0.0.29": {
|
||||
"module": "sha256-imh0Vg3ZZcWinZeWPcN8ShBhgot2EJ4ZZrYdHrMlu/M=",
|
||||
"pom": "sha256-q6DVnhuXEHqiLfk5X11RzePudY63ga1PhhiZg3fncWo="
|
||||
"org/openani/mediamp#mediamp-internal-utils-iossimulatorarm64/0.0.30": {
|
||||
"module": "sha256-xL+LHQEp0IgT5QbkW7hhuQtsN4fCC0fPpjh51qNwMfM=",
|
||||
"pom": "sha256-BTWno5jqBWiotMVy0BNLyKV35S5ZAFkVAg8zb0JPMrU="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-internal-utils/0.0.29": {
|
||||
"module": "sha256-sIGzzI9XNlRUYlXqou8iLMNqvgi+v6XIUYnjfA+pbeo=",
|
||||
"pom": "sha256-s5DI6wAi4qSMP8bAPz4K/gOCLLDBSwNKk6m2CKsdtIY="
|
||||
"org/openani/mediamp#mediamp-internal-utils/0.0.30": {
|
||||
"module": "sha256-Db89LZagBZhIODpzWh/yxf3ND6Ipikk1KsQr+PqbZtk=",
|
||||
"pom": "sha256-SRXlD3PGaI3qk5R0uGvd48K79iPI2W+D0QyBegkWGm8="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-source-ktxio-android-debug/0.0.29": {
|
||||
"module": "sha256-sUm1P7HhQUhOwDUR1uVAPvHfZO5xhgiWX7ePLYgKDDs=",
|
||||
"pom": "sha256-/BJ4n949a/0FK/f8vMJ4LMyWDFYvb5PDL67YYZOzrMs="
|
||||
"org/openani/mediamp#mediamp-source-ktxio-android-debug/0.0.30": {
|
||||
"module": "sha256-nixitOGFxyv6HcDGdAKM1E8g9tBA96KD0x96SGkBzT0=",
|
||||
"pom": "sha256-esmapPkeonUbs6tfhS35fbPdvtuh9hj6sPTwKesa4/o="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-source-ktxio-android/0.0.29": {
|
||||
"module": "sha256-Qc/0FDWUS04Ss5F0BcpNAS5XJ6rTqVPhkHVXzaoFiRM=",
|
||||
"pom": "sha256-tzinK8zk1fGrql2WXhwc7YgzDV6MnbnjIyT5KVzOqxw="
|
||||
"org/openani/mediamp#mediamp-source-ktxio-android/0.0.30": {
|
||||
"module": "sha256-OVhaDjRoRqpyMICPyqcNTYdjb8KjXNCDiYn4ZcgubSI=",
|
||||
"pom": "sha256-AdM6u0OvP2RRt6IkQ3lwRKpUef9R/cuDSGvsulHHR0w="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-source-ktxio-desktop/0.0.29": {
|
||||
"org/openani/mediamp#mediamp-source-ktxio-desktop/0.0.30": {
|
||||
"jar": "sha256-CmvsMdXJcrr1UcbNQVI8OyPqwxo9pLKYoa1ye5k0764=",
|
||||
"module": "sha256-3ZMls4s+OGQgPoXLFBqB7WbyE1Qn2f84XoXw0pOdtUQ=",
|
||||
"pom": "sha256-nN9HUn/RfKtPCOSNiD2URA+IBpkSwWWt0HZO8CZjtEE="
|
||||
"module": "sha256-1u3N8N8Yg9A+5OThl+tqsqyEtns5RMiC8NdY1oB1M7k=",
|
||||
"pom": "sha256-9duiRN3Hwp4p49AeyS6jLpoTjr0oTd8Akup3Yp+65As="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-source-ktxio-iosarm64/0.0.29": {
|
||||
"module": "sha256-s848sz/BVAOAd5ORpSuZ5Mngsco2qJdoVX/IVhPUU6Q=",
|
||||
"pom": "sha256-M+BJJRgYRKhY02cEqQbeqOUC4HQpkrIaoGqfpfMf1G0="
|
||||
"org/openani/mediamp#mediamp-source-ktxio-iosarm64/0.0.30": {
|
||||
"module": "sha256-AlnPAvx7IWWitGp6PpJgZoIrJ28DIoxXg5yDV/mgl2k=",
|
||||
"pom": "sha256-DcyGFMKTaYnvniNAZq1db2g0ED4XO6TdLOGa5sjJpDs="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-source-ktxio-iossimulatorarm64/0.0.29": {
|
||||
"module": "sha256-KodoKoQh4lb9t799R3O2ZhuX1fg57ULxCJ/xSL956hk=",
|
||||
"pom": "sha256-RT9U7NnYMDnVCTWKnkvU4ZHtFVGM2+PON2JdB4hPwCs="
|
||||
"org/openani/mediamp#mediamp-source-ktxio-iossimulatorarm64/0.0.30": {
|
||||
"module": "sha256-T+2KAQm+6/pB5fbNurEukrK4OlOt5o5sjQxaO/23qjM=",
|
||||
"pom": "sha256-IfCCH0sXk+TNXF0EXlafqihrONqUR49tVkwRp2f1RO4="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-source-ktxio/0.0.29": {
|
||||
"module": "sha256-As/GVZGSN4hAfby3KRxBzyMMUpuNmy24wVPlSQ4ABww=",
|
||||
"pom": "sha256-Zd+xibJweb9/tUsvBKtkQm8REPIRs9JI/q6D4uGBDag="
|
||||
"org/openani/mediamp#mediamp-source-ktxio/0.0.30": {
|
||||
"module": "sha256-cUirc+cdT2fXVcuTYofTsmRv6mDruHt2u9BBiDbzUoI=",
|
||||
"pom": "sha256-nXoS8U+BvG/r6i9jCGOLV2Ha7RbyMS6dhS6mNo2qlWA="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-vlc/0.0.29": {
|
||||
"jar": "sha256-IipT5VaRSsRsF0+DOLb4ZEAVSVIVuSVMbydWzTgjN6I=",
|
||||
"module": "sha256-3iXzV+GUgG26i6JGs+KuifxMAqw6n91hvFBnY4PhGH0=",
|
||||
"pom": "sha256-hyzw9+4O0IBKsOBpmMYXFbYOFfhxlAXtvx5Zb2I2bU4="
|
||||
"org/openani/mediamp#mediamp-vlc/0.0.30": {
|
||||
"jar": "sha256-DxMTtFdwUM76Vxs5a8EaohRI39mSLjhBtSnqPVj1IlQ=",
|
||||
"module": "sha256-qT2ALGzzOSJamxUCRPOM91abwHZ4igwJqvPhB08G32U=",
|
||||
"pom": "sha256-IaarXJ6GI1unhIJUDIN5j4RE1FVRbOCr9HYG5BIMOTo="
|
||||
},
|
||||
"org/openani/mediamp/catalog/0.0.29/catalog-0.0.29": {
|
||||
"toml": "sha256-wNPEmb14ugDo4NPEcf8lY0hRcCOGDFmsDGcHJqUSq5E="
|
||||
"org/openani/mediamp/catalog/0.0.30/catalog-0.0.30": {
|
||||
"toml": "sha256-NMqiEq/q+rgs2uiUsFJBROfMY9sSjCdpurSWrRjM2c0="
|
||||
},
|
||||
"org/ow2#ow2/1.5.1": {
|
||||
"pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
fetchpatch,
|
||||
gradle,
|
||||
autoPatchelfHook,
|
||||
jetbrains, # Requird by upstream due to JCEF dependency
|
||||
jetbrains, # Required by upstream due to JCEF dependency
|
||||
fontconfig,
|
||||
libxinerama,
|
||||
libxrandr,
|
||||
@@ -113,23 +113,20 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "animeko";
|
||||
version = "5.2.0";
|
||||
version = "5.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-ani";
|
||||
repo = "animeko";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-eP1v/o9qUk8qG+n1cJRmlgu2l06hFZLeUN/X06qAVpY=";
|
||||
hash = "sha256-mDUl1RpTIFBHdYst6R16iVljiUNOYh6mNUtOLBSuOE0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# CefLog.init(jcefConfig.cefSettings) is being comment out due to compile error
|
||||
postPatch = ''
|
||||
echo "kotlin.native.ignoreDisabledTargets=true" >> local.properties
|
||||
sed -i "s/^version.name=.*/version.name=${finalAttrs.version}/" gradle.properties
|
||||
sed -i "s/^package.version=.*/package.version=${finalAttrs.version}/" gradle.properties
|
||||
substituteInPlace app/shared/app-platform/src/desktopMain/kotlin/platform/AniCefApp.kt \
|
||||
--replace-fail 'CefLog.init(jcefConfig.cefSettings)' '//CefLog.init(jcefConfig.cefSettings)'
|
||||
'';
|
||||
|
||||
gradleBuildTask = "createReleaseDistributable";
|
||||
@@ -237,6 +234,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libxdamage
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Builtin updater will never work on NixOS, so we made a patch to disable updater
|
||||
./0001-no-update-checker.patch
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@@ -272,6 +272,10 @@
|
||||
url = "https://azcliprod.blob.core.windows.net/cli-extensions/rdbms_connect-${version}-py2.py3-none-any.whl";
|
||||
hash = "sha256-66mX1K1azQvbuApyKBwvVuiKCbLaqezCDdrv0lhvVD0=";
|
||||
description = "Support for testing connection to Azure Database for MySQL & PostgreSQL servers";
|
||||
pythonRelaxDeps = [
|
||||
"mycli"
|
||||
"pgcli"
|
||||
];
|
||||
propagatedBuildInputs =
|
||||
(with python3Packages; [
|
||||
pgcli
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cdncheck";
|
||||
version = "1.2.26";
|
||||
version = "1.2.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "cdncheck";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-q7AK2v6GsyO4kDYTqpZzexJKxft3DyxmpQ71ji3SiIA=";
|
||||
hash = "sha256-zGOtnjJaXs5BGcygwaR9kd6ZmEXU64Nu5td/8q6Hp0s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bYN119IyOkO9w+CWGwnCOXqpo4QHJV6iDuToMnTo0og=";
|
||||
|
||||
@@ -44,7 +44,7 @@ buildGoModule (finalAttrs: {
|
||||
Command to enable you to reproduce the CircleCI environment locally and
|
||||
run jobs as if they were running on the hosted CirleCI application.
|
||||
'';
|
||||
maintainers = with lib.maintainers; [ synthetica ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "circleci";
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://circleci.com/";
|
||||
|
||||
@@ -36,18 +36,18 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "coc-texlab";
|
||||
version = "0-unstable-2026-03-07";
|
||||
version = "0-unstable-2026-03-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fannheyward";
|
||||
repo = "coc-texlab";
|
||||
rev = "104bbcdd5fbed16f765eb515fa0e0648d65879fe";
|
||||
hash = "sha256-G/SI/RwT5S8xNFSP5JTZI6tFbBN6LoE38CENTDZdQqo=";
|
||||
rev = "4b0e8626f06a9396767468edd800501929483eda";
|
||||
hash = "sha256-HOZBojd6pqPPeOKeki2Fr23B5ew86ruEvPt9IAOJdMk=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-/cZaAIbQ/A87NE6FPhkyy8Junvd4MEdF7yfRKrS4vFM=";
|
||||
hash = "sha256-iAEGe0QZrt+iSkR0MbjsrwpvJz89bP4Xj+NQfsOnL5s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -40,7 +40,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
with support for rich output like plots.
|
||||
'';
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ synthetica ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "codebraid";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "contact";
|
||||
version = "1.4.17";
|
||||
version = "1.4.22";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pdxlocations";
|
||||
repo = "contact";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-EQNKljdySxujpoAaA43jHfh39K2BW5/Autt06dlijpk=";
|
||||
hash = "sha256-Kf6q5CNS+kzs+5gkKAS40+5RnsQ4FAsh8OQaH5Ii17Y=";
|
||||
};
|
||||
|
||||
dependencies = [ python3Packages.meshtastic ];
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "coroot-node-agent";
|
||||
version = "1.28.3";
|
||||
version = "1.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coroot";
|
||||
repo = "coroot-node-agent";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-1jwj6saABm1RFmqO0c5ViFTveRmlsmrNZ5D7P6HtWMc=";
|
||||
hash = "sha256-WaRPXqf7L26I46jdWEHZpYSwa7c3Ow5Ld1RcOOdZUow=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OOd3OctfklHzpMVDCnnb8HYPYqWQgBe+8HfbSm7dXzg=";
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "doctl";
|
||||
version = "1.151.0";
|
||||
version = "1.152.0";
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -42,7 +42,7 @@ buildGoModule (finalAttrs: {
|
||||
owner = "digitalocean";
|
||||
repo = "doctl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-E/WehmqEfsOJDdssIV4PQpKAEAyS+VnG17jbd0OxD8U=";
|
||||
hash = "sha256-LC7eriG9WqoCzb5bkXPWQO3kH9QXkBwRQmqxOb9yL7s=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "elan";
|
||||
version = "4.2.0";
|
||||
version = "4.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leanprover";
|
||||
repo = "elan";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-pbzZTdvjxIqzEDzE38rjeJ/lgHx8NRTD3osVP/A7nHo=";
|
||||
hash = "sha256-NSgzAYQjsf3lwYOiuJbkLJGRZ7rY2FEOjPORXNhjWuU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fuXmI/IxxYooc8C5otH5BlCHv7SsfWevw4i9tW65rno=";
|
||||
cargoHash = "sha256-JzyDVFp1lGPk1IK6CLQMBcJi5yCVD9x1iXtN0wlOF3g=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -33,7 +33,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [
|
||||
pSub
|
||||
synthetica
|
||||
];
|
||||
mainProgram = "entr";
|
||||
};
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "files-cli";
|
||||
version = "2.15.211";
|
||||
version = "2.15.220";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "files-cli";
|
||||
owner = "files-com";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-iN56+OV0xjPtj5SajVF7HkUAWv4dPxlPDhnwSo+Nb80=";
|
||||
hash = "sha256-EK9gvojot0pp3vkwzwKjr3rZI9IxPbp5Ng5tTzZawKQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FOH+S6T5luTrrKZRC1EzUvwBlWpMuW7QCYdtHlx+7EU=";
|
||||
vendorHash = "sha256-JeJ7BjRt2zofl1W5wU+FMInPZ9w1Uu9ez9JWjos14Qs=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -32,6 +32,11 @@ buildGoModule (finalAttrs: {
|
||||
--zsh <($out/bin/fx --comp zsh)
|
||||
'';
|
||||
|
||||
checkFlags = lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [
|
||||
# flaky only on x86_64 darwin, https://hydra.nixos.org/build/319903711
|
||||
"-skip=^TestSearchCaching"
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
writableTmpDirAsHomeHook
|
||||
|
||||
@@ -15,13 +15,13 @@ in
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "go-containerregistry";
|
||||
version = "0.21.2";
|
||||
version = "0.21.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "go-containerregistry";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-q4gQjXsXZoP1UDsqcQdSR6RCNuPkCjczpATVPyfIzHE=";
|
||||
sha256 = "sha256-BfKiBjfL5th1TPpw6hpno04MffLnXmOVq7BsGUCkPT0=";
|
||||
};
|
||||
vendorHash = null;
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
autoconf,
|
||||
bison,
|
||||
bzip2,
|
||||
@@ -19,24 +18,15 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "iverilog";
|
||||
version = "12.0";
|
||||
version = "13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "steveicarus";
|
||||
repo = "iverilog";
|
||||
tag = "v${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
|
||||
hash = "sha256-J9hedSmC6mFVcoDnXBtaTXigxrSCFa2AhhFd77ueo7I=";
|
||||
hash = "sha256-SfODx7K3UrDHMoKCbMFpxo4t9j9vG1oWF0RFS3dSUm4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# NOTE(jleightcap): `-Werror=format-security` warning patched shortly after release, backport the upstream fix
|
||||
(fetchpatch {
|
||||
name = "format-security";
|
||||
url = "https://github.com/steveicarus/iverilog/commit/23e51ef7a8e8e4ba42208936e0a6a25901f58c65.patch";
|
||||
hash = "sha256-fMWfBsCl2fuXe+6AR10ytb8QpC84bXlP5RSdrqsWzEk=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
bison
|
||||
@@ -84,7 +74,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
sh .github/test.sh
|
||||
# PLI1 is not enabled in the build (ENABLE_PLI1=no), so skip PLI1 VPI tests
|
||||
# which would fail at runtime with "Failed - running vvp".
|
||||
sh .github/test.sh no-pli1
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
@@ -89,7 +89,6 @@ stdenv.mkDerivation rec {
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
raskin
|
||||
synthetica
|
||||
];
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
platforms = lib.platforms.all;
|
||||
|
||||
@@ -1,28 +1,4 @@
|
||||
{
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
tree-sitter = super.tree-sitter.overrideAttrs {
|
||||
version = "0.24.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "py-tree-sitter";
|
||||
tag = "v0.24.0";
|
||||
hash = "sha256-ZDt/8suteaAjGdk71l8eej7jDkkVpVDBIZS63SA8tsU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
# keymap-drawer only requires tree-sitter-devicetree grammer, and
|
||||
# the tests fail with numereous TREE_SITTER_LANGUAGE_VERSION
|
||||
# related failures related to other grammers. Hence we disable the
|
||||
# tests altogether, hoping that in the future this python3.override
|
||||
# won't be needed at all.
|
||||
doInstallCheck = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
python.pkgs.toPythonApplication python.pkgs.keymap-drawer
|
||||
python3.pkgs.toPythonApplication python3.pkgs.keymap-drawer
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "lasuite-meet-frontend";
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "suitenumerique";
|
||||
repo = "meet";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-It/XicX3QBcaun36uksmbeEwhpCHpPM4SAfJwm6wjsQ=";
|
||||
hash = "sha256-RmMFN1hDSU6q0ZROopsIDJ2nbmvdwW29YywX7rAbgP4=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src/frontend";
|
||||
@@ -21,7 +21,7 @@ buildNpmPackage rec {
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit version src;
|
||||
sourceRoot = "source/src/frontend";
|
||||
hash = "sha256-eE8vzu6Bp1+kcM0xMUaIRJs+j9N+DhGtR4sxucmSqUM=";
|
||||
hash = "sha256-W7X5nDtQYxzFZAhei+EXx+j6THTDwz4gTR/wxfB+GI4=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -13,14 +13,14 @@ in
|
||||
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "lasuite-meet";
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "suitenumerique";
|
||||
repo = "meet";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-It/XicX3QBcaun36uksmbeEwhpCHpPM4SAfJwm6wjsQ=";
|
||||
hash = "sha256-RmMFN1hDSU6q0ZROopsIDJ2nbmvdwW29YywX7rAbgP4=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src/backend";
|
||||
@@ -48,6 +48,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
django-extensions
|
||||
django-lasuite
|
||||
django-parler
|
||||
django-pydantic-field
|
||||
django-redis
|
||||
django-storages
|
||||
django-timezone-field
|
||||
@@ -65,6 +66,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
mozilla-django-oidc
|
||||
nested-multipart-parser
|
||||
psycopg
|
||||
pydantic
|
||||
pyjwt
|
||||
pyopenssl
|
||||
python-frontmatter
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
python3,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "ledfx";
|
||||
version = "2.1.0";
|
||||
pyproject = true;
|
||||
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "LedFx";
|
||||
repo = "LedFx";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-N9EHK0GVohFCjEKsm3g4h+4XWfzZO1tzdd2z5IN1YjI=";
|
||||
};
|
||||
|
||||
@@ -72,7 +72,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
hue = with pyproject.pkgs; [ python-mbedtls ];
|
||||
hue = with python3.pkgs; [ python-mbedtls ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
@@ -83,9 +83,9 @@ python3.pkgs.buildPythonApplication rec {
|
||||
meta = {
|
||||
description = "Network based LED effect controller with support for advanced real-time audio effects";
|
||||
homepage = "https://github.com/LedFx/LedFx";
|
||||
changelog = "https://github.com/LedFx/LedFx/blob/${version}/CHANGELOG.rst";
|
||||
changelog = "https://github.com/LedFx/LedFx/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ SuperSandro2000 ];
|
||||
mainProgram = "ledfx";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -78,7 +78,7 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "8255";
|
||||
version = "8401";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -89,7 +89,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
owner = "ggml-org";
|
||||
repo = "llama.cpp";
|
||||
tag = "b${finalAttrs.version}";
|
||||
hash = "sha256-2bPFOEbBPpv2GwhMRkpJpIySh4/KLXKQ8uV7TiY3h+M=";
|
||||
hash = "sha256-7moL9T29KfMbzvW3QxnasN0U6jAh8RPD/fEs7WpSP10=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
||||
@@ -125,7 +125,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
++ [ openssl ];
|
||||
|
||||
npmRoot = "tools/server/webui";
|
||||
npmDepsHash = "sha256-5ZswgZFLeI32/xQZqCTTFbCzleDqr5AotjFg/5rNn1M=";
|
||||
npmDepsHash = "sha256-DxgUDVr+kwtW55C4b89Pl+j3u2ILmACcQOvOBjKWAKQ=";
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
|
||||
inherit (finalAttrs) src patches;
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "lxgw-wenkai-screen";
|
||||
version = "1.521";
|
||||
version = "1.522";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lxgw/LxgwWenKai-Screen/releases/download/v${finalAttrs.version}/LXGWWenKaiScreen.ttf";
|
||||
hash = "sha256-7tqMMmIOmMHJHdGXrdD0glguDTJvx+vKYnPDda9OdBk=";
|
||||
hash = "sha256-zRpvo5xOpC/Y9OKJlFeJsOUQz3AWQ1ZA+Ik82tmyIPM=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -78,7 +78,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
dywedir
|
||||
synthetica
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "mako";
|
||||
|
||||
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
version = "0.1.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "santoshxshrestha";
|
||||
owner = "vimlinuz";
|
||||
repo = "mdwatch";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-aAa9Y1aKfZVnUyNkEUM7FJKEvQsX9BUqGlTb9zhZzTk=";
|
||||
@@ -26,8 +26,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "Simple CLI tool to live-preview Markdown files in your browser";
|
||||
homepage = "https://github.com/santoshxshrestha/mdwatch";
|
||||
changelog = "https://github.com/santoshxshrestha/mdwatch/releases/tag/${finalAttrs.src.tag}";
|
||||
homepage = "https://github.com/vimlinuz/mdwatch";
|
||||
changelog = "https://github.com/vimlinuz/mdwatch/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ x123 ];
|
||||
mainProgram = "mdwatch";
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "mpls";
|
||||
version = "0.20.0";
|
||||
version = "0.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mhersson";
|
||||
repo = "mpls";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-a33XbUw6H2EKfGZnpV6L00iab6AoXqPiNTMw/OaouHs=";
|
||||
hash = "sha256-SdCWtz/BmuOBLuwQiif5YnnNctaOQpb6iHqDT6j35ZM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pi7KBA/313cG0AYWM/mUDng2M9L2tMLkonY4LI5XiW0=";
|
||||
|
||||
@@ -42,7 +42,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [
|
||||
l0b0
|
||||
synthetica
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -18,6 +18,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"sqlglot" # https://github.com/dbcli/mycli/issues/1696
|
||||
"sqlparse"
|
||||
"click"
|
||||
];
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ncpamixer";
|
||||
version = "1.3.9";
|
||||
version = "1.3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fulhax";
|
||||
repo = "ncpamixer";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-uafjAaXtn97NNmRPxeHmbAaMeHIR/nrQKsTqDX5NRGU=";
|
||||
hash = "sha256-N7GtMOcZb345tjcT5S3QOGx+n4SpDohiKPOjsgwgr6I=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nelm";
|
||||
version = "1.20.1";
|
||||
version = "1.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "nelm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-64OAyuqV8qryVNH0Mxo9FiHnVjeshG45rtiU7jumb+w=";
|
||||
hash = "sha256-zlZ2muIEL/azEwdFMxXDO2XPpunYt42Vv1JYOmlN1k4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rMSEUKHyj/R+YTm2ADNHsrdeH4SbF6XQyrkjkgPvhx8=";
|
||||
vendorHash = "sha256-7gb962ejpgy9fLL+JVA8i6NLeltfIqtZvxwtnigTGvI=";
|
||||
|
||||
subPackages = [ "cmd/nelm" ];
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation {
|
||||
version = "0-unstable-2025-09-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "santoshxshrestha";
|
||||
owner = "vimlinuz";
|
||||
repo = "NightDiamond-cursors";
|
||||
rev = "3ff3c0486430a4901b4d5cbbee87a370aa2b8ce9";
|
||||
hash = "sha256-huruHo5w7Qrte1+nIiz+P1xPNDGrv5/eByHwaSlZYwQ=";
|
||||
@@ -23,10 +23,10 @@ stdenvNoCC.mkDerivation {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/santoshxshrestha/NightDiamond-cursors";
|
||||
homepage = "https://github.com/vimlinuz/NightDiamond-cursors";
|
||||
description = "NightDiamond cursor themes";
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ santosh ];
|
||||
maintainers = with lib.maintainers; [ vimlinuz ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
dbus,
|
||||
systemdLibs,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "org-freedesktop-filemanager1-common";
|
||||
version = "0-unstable-2025-10-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "boydaihungst";
|
||||
repo = "org.freedesktop.FileManager1.common";
|
||||
rev = "7f516129ac71be409dc415421859de68c1a2ed0e";
|
||||
hash = "sha256-FCmNqz8JaP6XUaJOoWw5Lfls3ThdY+Yv2kRdk8XIRic=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dbus
|
||||
systemdLibs
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
for file in $out/share/org.freedesktop.FileManager1.common/*-wrapper.sh; do
|
||||
name=''${file##*/}
|
||||
name=''${name%-wrapper.sh}
|
||||
sed -i "s|^cmd=.*|cmd=\"$name\"|" "$file"
|
||||
done
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Using File Manager DBus Interface to open file manager and hover over file(s)/folder(s)";
|
||||
homepage = "https://github.com/boydaihungst/org.freedesktop.FileManager1.common";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ anninzy ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -5,14 +5,14 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "owocr";
|
||||
version = "1.26.3";
|
||||
version = "1.26.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AuroraWright";
|
||||
repo = "owocr";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-/eee0uOWZgjHKhN3Ie75qxXqlSH1Fm3ipDYkvyIK5LM=";
|
||||
hash = "sha256-ZISL0K16Ilmne8SZ5+L7FSxjZJd8j7tDklUOjPvw7HM=";
|
||||
};
|
||||
|
||||
# we use pystray directly to avoid making a new package
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "pingu";
|
||||
version = "0.0.6";
|
||||
version = "0.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CactiChameleon9";
|
||||
repo = "pingu";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-pXC/y+piLhSWIcJ1/+UaC3sjHPKG3XvTuHzWENsXME0=";
|
||||
sha256 = "sha256-KiJRr06N5zOq2vov+iKf5omrzxORxIUaEjM+rXfaoR0=";
|
||||
# Get values that require us to use git, then delete .git
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
@@ -22,7 +22,7 @@ buildGoModule (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8d0pKweumnJH49HSBCfEF8cwEXLGMAk2WbhS10T/Cmc=";
|
||||
vendorHash = "sha256-+2YyJo4RFJXTt7foDrEoLeCcbkRqQ+boFaKioUtcZsM=";
|
||||
ldflags = [
|
||||
"-w"
|
||||
"-s"
|
||||
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/Ferdi265/pipectl";
|
||||
license = lib.licenses.gpl3;
|
||||
description = "Simple named pipe management utility";
|
||||
maintainers = with lib.maintainers; [ synthetica ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "pipectl";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule {
|
||||
pname = "pkgsite";
|
||||
version = "0-unstable-2026-03-09";
|
||||
version = "0-unstable-2026-03-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "pkgsite";
|
||||
rev = "59cb58a646844f6fba00bfadc39b4bea96357358";
|
||||
hash = "sha256-CsKdUrgnjs11iVdfUwgiO9KTx1TCfqFljiFqiAYxoK4=";
|
||||
rev = "1b7f032dee11d6534119541bc3e03f0fcbcc4995";
|
||||
hash = "sha256-++7gtFcp5mD480LfiFmr+7O8ZA3kO9DWZpyLlXagZMI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-G/XTWobysyzONctabYDIfAQ/zaAA9w2Ky7Hn6cj9l/c=";
|
||||
vendorHash = "sha256-wbK//T/kE55Wx/Vn5Zl7VudvcEPEAqzKzlMZdcx6PIs=";
|
||||
|
||||
subPackages = [ "cmd/pkgsite" ];
|
||||
|
||||
|
||||
@@ -43,7 +43,6 @@ appimageTools.wrapType2 {
|
||||
maintainers = with lib.maintainers; [
|
||||
killercup
|
||||
redhawk
|
||||
synthetica
|
||||
];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "prose";
|
||||
version = "0.5.0";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jgdavey";
|
||||
repo = "prose";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-e3NkG05ZKpUmlxO4cJbEvCZbrp7tg9rP0jMCAzYFVCI=";
|
||||
hash = "sha256-YMRCdHDxZ3PMbRn1Ct+oQEMV1TgJa3VIMPVE2lK+tX8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6LRQ94ZtnlSCM1pRMhPGDSDEacFEUL0UiQAfoZZ3MMM=";
|
||||
cargoHash = "sha256-DT8ZlH5CG4VDzT5x5OtuRK//IguV8d+6F4vwdhZ/Rns=";
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
|
||||
|
||||
@@ -1,24 +1,24 @@
|
||||
# DO NOT EDIT! This file is generated automatically by update.sh
|
||||
{ }:
|
||||
{
|
||||
version = "3.225.1";
|
||||
version = "3.226.0";
|
||||
pulumiPkgs = {
|
||||
x86_64-linux = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.225.1-linux-x64.tar.gz";
|
||||
sha256 = "0ydbj9ck6s4yqhyarivfzaxy55rrwi73gcylpral8q0lp5jdlz33";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.226.0-linux-x64.tar.gz";
|
||||
sha256 = "1v60sszili8wxnhn1b9dp3fv0662shp6xa03l0ybnglwkz8fby3b";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.50.0-linux-amd64.tar.gz";
|
||||
sha256 = "1g92w8h0sxp4cgclmfhzjmnc4ph9p9wyk3zy2r6kyngl3qjgcxn8";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.51.0-linux-amd64.tar.gz";
|
||||
sha256 = "1f5pvflvcd9xr86ys1n46ywyakl30l2xrrwqhbhkb117gp17a9lx";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-linux-amd64.tar.gz";
|
||||
sha256 = "1c8bd6m2kk6nzbmq3csb5babmbma83cxsvqxv7z0s59b2p6jc9r5";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.96.0-linux-amd64.tar.gz";
|
||||
sha256 = "076frm1271k5ngdfyfq94qcaag4dz4079b23wadzlvaijw7r58a3";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.97.0-linux-amd64.tar.gz";
|
||||
sha256 = "0wqrvrvdn9wy2hk4n27lndrk8jp1lihyzdwapbvj4xrypy24ghs2";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.3-linux-amd64.tar.gz";
|
||||
@@ -29,16 +29,16 @@
|
||||
sha256 = "13jsxvjzhhx7zrnx93drh7sych1sh173fl5wa05hxzc18vl29g81";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.21.0-linux-amd64.tar.gz";
|
||||
sha256 = "128x7scca7lqqjbsk0rl3mlipc6mbl6q3kixrwm8vv4l0y5wp8pd";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.23.0-linux-amd64.tar.gz";
|
||||
sha256 = "0k3v1s41vv6bj798vydjx6al1rxp4bhssxi3q2h13kxs5caqbigm";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.8.1-linux-amd64.tar.gz";
|
||||
sha256 = "148hqdcg8s4ac6sf17aamdwkinfvplf6kzkw3sb3s2frgbq7k4kx";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.12.0-linux-amd64.tar.gz";
|
||||
sha256 = "08f0vgxsa7cmh2npxkwhvg5qxmdqmk8zxdr4p01bw50fvsdn87kd";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.13.0-linux-amd64.tar.gz";
|
||||
sha256 = "1k5mjkicp28qg41d0z71s5crag6dyk1gs9a1sc9xvhkvmha6f752";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.33.0-linux-amd64.tar.gz";
|
||||
@@ -61,8 +61,8 @@
|
||||
sha256 = "182pn8ra0nhm4j6gkakdl5wik75wrhdqf7jpn52gyln6ai0nywri";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.0-linux-amd64.tar.gz";
|
||||
sha256 = "1zjz0mbfjgpnjiwr4rl5bv3bfl8l8sym1azyrnckkc0gzbgdkg2d";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.1-linux-amd64.tar.gz";
|
||||
sha256 = "1l4nn0nbrv514rmgs8zz89z30fzd6jfnbqh4751malx89ach2rqy";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-amd64.tar.gz";
|
||||
@@ -73,8 +73,8 @@
|
||||
sha256 = "09x25vfq2fbxcmkcjaj0yr2xhcplyj0w2z4c0lwcl368fnk9z9zy";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.14.0-linux-amd64.tar.gz";
|
||||
sha256 = "0kdb1a88z3mrlwm24m8935ck2fgb1vc2ygp38sq8fmndfzvrikvc";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.15.0-linux-amd64.tar.gz";
|
||||
sha256 = "0x1lplrp26a4qnsf49q6x11midpgnkfp3ryg16w7cpyq18bf2xqa";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-linux-amd64.tar.gz";
|
||||
@@ -93,12 +93,12 @@
|
||||
sha256 = "19k79m8dhkiy4x4rs6dq4zkfczjsnmc0mvbh57b5l52imsv7ks7m";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.27.0-linux-amd64.tar.gz";
|
||||
sha256 = "1babmf4727g6xsp4z00qqqz6nb01wqa2w90c2g0nnx804gsy5rr0";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.28.0-linux-amd64.tar.gz";
|
||||
sha256 = "0saa0i1id3lgdlw8wi2wbwymd1vnxdzmrqqr876gk9hcs9fj7bar";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.8.0-linux-amd64.tar.gz";
|
||||
sha256 = "0mkhj79nqpgx86ilm77apvbva4d16m384mrk10v4108kplrn8vb3";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.9.0-linux-amd64.tar.gz";
|
||||
sha256 = "0gh9xxawgnmkr6rc3cn7vv9svl03cgv15bx5agvfa1amgaajixc4";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.7.0-linux-amd64.tar.gz";
|
||||
@@ -163,20 +163,20 @@
|
||||
];
|
||||
x86_64-darwin = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.225.1-darwin-x64.tar.gz";
|
||||
sha256 = "02cvhp0v5x7378mpbfpgil9xid25wd7q7svxfpi7qih8v0k5z51f";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.226.0-darwin-x64.tar.gz";
|
||||
sha256 = "0sw8yan7g7s7j8816i382j3l8mk5dkk34ppqcavdnlp5j3y331v7";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.50.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0977vw87ilwk7zka6f545291xb1n66y38fdyqiqpppj14yhkchg9";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.51.0-darwin-amd64.tar.gz";
|
||||
sha256 = "19q09p7kqygdm1j2rvxbzzivyf983pi4frkfak3n63ybkbnxsp43";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-darwin-amd64.tar.gz";
|
||||
sha256 = "08i28x0fp4pxb14klgjdqi05hyw4ilj0iz5ri53mpmviyl1mrmaq";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.96.0-darwin-amd64.tar.gz";
|
||||
sha256 = "06jril67jal879fbxq7jh4qsaslb2vmvi8grh98ad0ark8yvlj48";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.97.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0jbz6k9pv9d366q0xj39sg9zxlgl5vv0lb69hbxrm061qldkxnhf";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.3-darwin-amd64.tar.gz";
|
||||
@@ -187,16 +187,16 @@
|
||||
sha256 = "06yyr3zaj29mhvfsf4fgwip53mk28hrh73va32vkxvry6hn2hmjr";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.21.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1g4d85jqr7j66xjx92azw2hxzapj45rr9bwdin9fy6snjv1z9y52";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.23.0-darwin-amd64.tar.gz";
|
||||
sha256 = "047fvz5j988lxdzf4wnaj36zcj7sj5kwj4flvgp2dbgp0ccz51a1";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.8.1-darwin-amd64.tar.gz";
|
||||
sha256 = "1j60xxsl9vsvjipnv8yw69i3shrs4bmz74rna4pdy1g2rm9kwndf";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.12.0-darwin-amd64.tar.gz";
|
||||
sha256 = "00y0y0djndgi98vq068pzmflj6ypwqg1bm242vdajfz43afsz7z7";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.13.0-darwin-amd64.tar.gz";
|
||||
sha256 = "074zm0g5shim2178i8wyrrvnv94yyx94s591mw2n2pd0hf6gicbd";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.33.0-darwin-amd64.tar.gz";
|
||||
@@ -219,8 +219,8 @@
|
||||
sha256 = "1limkhwc7phij44z20bvikgf0sd3cd1n28av6phw02g7c2gph04l";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0mkp8aywwfzjbjhp6z2b58x136wlcbqdw338v9rfsk77ymcaz0jy";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.1-darwin-amd64.tar.gz";
|
||||
sha256 = "1vnsvd74m5ysfhygs56s928hmap4cqy7pwbcclynw4qbwvyznay5";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz";
|
||||
@@ -231,8 +231,8 @@
|
||||
sha256 = "1jyi9mp8dc5hkb493kz4mkhcn9rvz1whj42vfbml5zdnywhq346f";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.14.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1n9lallx43g745889k2zck5wzpd8bf8wypwiy5xd3v2q77kbj8lv";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.15.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1f0jnrgnw0kma86a7d1hijh41prp7c7630gnp3sff7489caxhphm";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-darwin-amd64.tar.gz";
|
||||
@@ -251,12 +251,12 @@
|
||||
sha256 = "04rmlydspvgbcgn7qd9sk0bd70axz2rmpiydfw383352bxrinlvs";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.27.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1d5ib18acs4iq85m55n4iznw3vxscass2a8l0ng9fyld95jyv7sd";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.28.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1vzdp5nqz6c24qz1l2m8hgr1xa8jn4v4x29i4gkd688bvf6266dz";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.8.0-darwin-amd64.tar.gz";
|
||||
sha256 = "18z1j0xm3crahkag1c9lr23ig9k035p71qhp8smapalxzalkx38h";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.9.0-darwin-amd64.tar.gz";
|
||||
sha256 = "100kjik7qvpxc46wckps5w3h07w0gshs5v3i1dh2fzf6inbil5ip";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.7.0-darwin-amd64.tar.gz";
|
||||
@@ -321,20 +321,20 @@
|
||||
];
|
||||
aarch64-linux = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.225.1-linux-arm64.tar.gz";
|
||||
sha256 = "0wgwfmj54hqihfisfngajcqbg6d86m1kgzdm4bcbv1b0cw1f098a";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.226.0-linux-arm64.tar.gz";
|
||||
sha256 = "0hlyw7lybph57bhvr6hmwqsnzfwdssh426blfhsbjdasrc4vapl7";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.50.0-linux-arm64.tar.gz";
|
||||
sha256 = "09bl8x2wmjnj89a01mn6and3ak8955w7p0bjy3d90a6hnpmkhmmv";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.51.0-linux-arm64.tar.gz";
|
||||
sha256 = "0vnnvb6lyv0xpc3rzc3wr658l3d8w596mpfr5jlbbqpk0hw1dslx";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-linux-arm64.tar.gz";
|
||||
sha256 = "0l3sgb5l0rjxj9msff6ywkvygn3pq96nbif3b85xssq7a0qsvh3c";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.96.0-linux-arm64.tar.gz";
|
||||
sha256 = "1v19fnkpb71jygfbw0602nayjkjvi7fjiz92crw4vqrfmpq7py0i";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.97.0-linux-arm64.tar.gz";
|
||||
sha256 = "01gyw9rw4qymljprxzjrf7jzxg576zghpb174c85k6dik02bw6bf";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.3-linux-arm64.tar.gz";
|
||||
@@ -345,16 +345,16 @@
|
||||
sha256 = "1qinsdjkiy80x8mssg5crlzz0vqgpyl3mr286048y8q0a2jifkkv";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.21.0-linux-arm64.tar.gz";
|
||||
sha256 = "1pzb7vjcgqwwgbldsg12mbi0awz7fpqxi42f6ah4rr2wk24v93k1";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.23.0-linux-arm64.tar.gz";
|
||||
sha256 = "14j50dr2b4qkaixwcgkhz7a2g7wxndsfjzcfvlbych77ia6hy1y6";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.8.1-linux-arm64.tar.gz";
|
||||
sha256 = "1kn82iz49a53ap0nhih4rwprs672lr7vik2zv7fwdw3allv7aqwl";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.12.0-linux-arm64.tar.gz";
|
||||
sha256 = "1g39lg92091v6c4ijr4z5k583kldkv9f2pr1605l1aqzdaabydc0";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.13.0-linux-arm64.tar.gz";
|
||||
sha256 = "1m7skacb49hwrvdfka2944akz80ffl8n7662224mdnjh8858agph";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.33.0-linux-arm64.tar.gz";
|
||||
@@ -377,8 +377,8 @@
|
||||
sha256 = "1y66c9mc9521gdpi6kc54ri1drg07kvdxi73rfw8kpx7sv75gvk8";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.0-linux-arm64.tar.gz";
|
||||
sha256 = "1g9b0lnzbb255w590i9hazb29lbs96x4n03g2sc3yplrfp23njb9";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.1-linux-arm64.tar.gz";
|
||||
sha256 = "18svy29yvd2p1fjhc2f9f0hr0mbvf371lcr58ym7f7xim3hx0bdq";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-arm64.tar.gz";
|
||||
@@ -389,8 +389,8 @@
|
||||
sha256 = "1a9fwnf15l3ld0a17v2p66jxqav4rawhixy6rgs5065nbrf29vys";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.14.0-linux-arm64.tar.gz";
|
||||
sha256 = "020yyi3wjzsihk5g3lfmfsbyxswyl5gvrwnafpc87hjz3r16afmd";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.15.0-linux-arm64.tar.gz";
|
||||
sha256 = "0fb3zpyf2b519ipc7jvp6x366zpympqfcg4h3ah4mkh094a61ljp";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-linux-arm64.tar.gz";
|
||||
@@ -409,12 +409,12 @@
|
||||
sha256 = "094pmichc66fnd38vfn4hb2dl3v88vqfx00smk0b19fdbrafcp5j";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.27.0-linux-arm64.tar.gz";
|
||||
sha256 = "0ralnb39m9zd7248kpz4xm7yq87paiqlx1xsw3xzk21cy67px1cm";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.28.0-linux-arm64.tar.gz";
|
||||
sha256 = "0k32hifaim24rz0ir5nljy58pdk3v9h8qb7vz97k15gq1blyq4l7";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.8.0-linux-arm64.tar.gz";
|
||||
sha256 = "1n18515hdf8d561mqz46cj0ychrm3zwnx9l1hry9mbnfl8706g3x";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.9.0-linux-arm64.tar.gz";
|
||||
sha256 = "1hc3fvsiwxnm6jqvbxq29bn1y2iq7q10vrwmkj0kz66iy5h923jh";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.7.0-linux-arm64.tar.gz";
|
||||
@@ -479,20 +479,20 @@
|
||||
];
|
||||
aarch64-darwin = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.225.1-darwin-arm64.tar.gz";
|
||||
sha256 = "0l96xnjivzwjswmz3mdnbz8xx3b0nvzj5jnr9dxrf9bf3yp31iys";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.226.0-darwin-arm64.tar.gz";
|
||||
sha256 = "162b38755w4f71ixcjza31k5hsygvf682rk51g3kiclc2gq3k7yk";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.50.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0p3qw40fc8gzf6a0fg4k3zgbd9msa83kl69ksp9wfn6hpj6z6gm4";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.51.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0icxa3m8fm5fprwi24clnq2112r4cjaz5yg898qws71vivx77720";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0hbrmmgh3pbsqcm20lz3kimxwls4s10cqssp19m344f9jwp33chq";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.96.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1b74jf9wd2ljxl6krzjgy1ap3mnmhc76rrwxna1yz6v0pa0k58d9";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.97.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0w3vlxvqnhvzcxdp39mng8cj4ij6gvfhxjnlz6ihagby6i7f370r";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.3-darwin-arm64.tar.gz";
|
||||
@@ -503,16 +503,16 @@
|
||||
sha256 = "0vgb5zvg5gpv3pfl6nz5wpzhiyy550s99qj80qs83gzlr5gl9xab";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.21.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0nkkn8j7pi961jz4y0gjknaxj3fbgffmwj4dadnwqm2ipvqalp6n";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.23.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0sqmk67ba1686dixpdkaq0v1bnplbcj2my9sc5chaa4bbbr8rmks";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.8.1-darwin-arm64.tar.gz";
|
||||
sha256 = "1z4fpmfab6wp1nn2gs5aas38n61jxqi5x6v70d0wd16y2hwh0q0p";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.12.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1zdyg1134jrvvsc07q9mvrbycjrdrz3wnjcanirp0z5bw0f54z1r";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.13.0-darwin-arm64.tar.gz";
|
||||
sha256 = "13pi43151lb3hbp0kxqmfxsmr95l6xxqrj23n66a3lnr2df5566x";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.33.0-darwin-arm64.tar.gz";
|
||||
@@ -535,8 +535,8 @@
|
||||
sha256 = "0fifd3n6z0wjr600sd4011l4fds2hhljymzl38zpjq4qfz262pqh";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.0-darwin-arm64.tar.gz";
|
||||
sha256 = "05kbm6ws0ijq1m6pjip3fsis1pn65jr4s1g1ck2hdaf6hq0p9hyh";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.1-darwin-arm64.tar.gz";
|
||||
sha256 = "1dp65liavgnakahl8kmzk5hlvg4k0nfks535sdl68f5bkyg2m2m6";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-arm64.tar.gz";
|
||||
@@ -547,8 +547,8 @@
|
||||
sha256 = "1msppdp4navjhkp7lzngmp056y6x3fqb30r6wq5a53kyvi43x0ik";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.14.0-darwin-arm64.tar.gz";
|
||||
sha256 = "13qbccic5a0kqv9013j9yx94nbvx1937i1rz5bnbv3dhwlkkxjgm";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.15.0-darwin-arm64.tar.gz";
|
||||
sha256 = "182xxaz0hsg2mg2r80hip73aqfhlnz8z96jjq0xrl74jmwn4pgzl";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-darwin-arm64.tar.gz";
|
||||
@@ -567,12 +567,12 @@
|
||||
sha256 = "150kg8brpsazpdd6laywwvbrjmzl4n3w7saf9vidiwsv01zpl90m";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.27.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0xhflraz9xk0ggqar91knh9bvzla0lll7q9ijrklcm5pfjbhf5zr";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.28.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0w7j7br44f4fdfcpqj2jairf9z65ga5i88yqkxrwliqf605i0b0a";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.8.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1pks02j8apf3fy72xl2pxanhrbybnlpmz1p7a48apm5h8rkx3vw6";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.9.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0vvgk7c35fbdldpk2snq4y400g0cz8y9p43s2lar36b9asyq011n";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.7.0-darwin-arm64.tar.gz";
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p coreutils gnugrep common-updater-scripts nix-update
|
||||
#!nix-shell -i bash -p coreutils gnugrep gnused common-updater-scripts nix-update
|
||||
|
||||
version=$(list-git-tags | grep -oP '^releases/\K\d+\.\d+\.\d+.*' | sort -rV | head -1)
|
||||
version=$(list-git-tags | grep -oP '^releases/\K\d+\.\d+\.\d+.*' \
|
||||
| sed -E 's/-(alpha|beta|rc)\./~\1./' | sort -rV | tr '~' - | head -1)
|
||||
nix-update --version="$version" radicle-node-unstable --override-filename pkgs/by-name/ra/radicle-node/unstable.nix
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "rcon-cli";
|
||||
version = "1.7.3";
|
||||
version = "1.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "itzg";
|
||||
repo = "rcon-cli";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-v9f367XTPKAocGdwwPe/dXsFK30THbqpQwuvSV/lWN4=";
|
||||
hash = "sha256-Cs2SYz6+3ziAbnoXiWdpwBg3lmIJWq06wuYy/TKoVSU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-TogEdy0rtOzywBCtJ9dw8jO25dzxygqDGFDCbCNwhz8=";
|
||||
vendorHash = "sha256-MxIofF5Jj+w7gxsO+F48ymtgB3bgSutmC5Jh3GcKCnA=";
|
||||
subPackages = [ "." ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "resvg";
|
||||
version = "0.46.0";
|
||||
version = "0.47.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RazrFalcon";
|
||||
repo = "resvg";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-kiE9Zv3PonRRq6pbRnqGz0LKlYSTFSuuqYaLDmC9I2Y=";
|
||||
hash = "sha256-BCYjVOWFpOZm7ocmfszFpaBxnd96vhf3/yGlvAVRtCw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-dqqO+CPyBaUFBZGwhwXFRr8tnZWp27sF0606tmOm7ms=";
|
||||
cargoHash = "sha256-cVOAmwX/pYA6R0HK8+RLt/IvzowAO/g1i2YM71bYFoA=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--package=resvg"
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "routedns";
|
||||
version = "0.1.140";
|
||||
version = "0.1.151";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "folbricht";
|
||||
repo = "routedns";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-byeCsm+W7H2MXAOdPFxZyALYh7C9WB/FO8Ee/y/sLV8=";
|
||||
hash = "sha256-Uv2H3AllmFFuPb/S/aS3j7afyQYBpxSkcKRKTvY0Iyk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-iUWiO8h55N+1c0EODLUxcIYEt2lT+2xyCAxa5f1ub3c=";
|
||||
vendorHash = "sha256-a4KcKb75yWv7+1vIYCypS9nnrFJ3zogXIPzUVVA7AXs=";
|
||||
|
||||
subPackages = [ "./cmd/routedns" ];
|
||||
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rsgain";
|
||||
version = "3.6";
|
||||
version = "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "complexlogic";
|
||||
repo = "rsgain";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-dqvaPLVpNnbN2W0TOphS7QU6MDh5pxFJoUDGvkat164=";
|
||||
hash = "sha256-mI/lXRmPQTSgzFvNu8cjJN86wIkWFUrJg1yFFfBu2JE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
pkg-config,
|
||||
openssl,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "snouty";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antithesishq";
|
||||
repo = "snouty";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-YLB4A5Ol+4sZF1RB28npJZ4pVF2Y2lSMBD8QoV8wZUg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-TJy9mJSXgJQMMDK6TFOXQVU8PujMjd3k2gdlW5Kf//4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
];
|
||||
|
||||
env.OPENSSL_NO_VENDOR = true;
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion \
|
||||
$releaseDir/build/snouty-*/out/snouty.{bash,fish} \
|
||||
--zsh $releaseDir/build/snouty-*/out/_snouty
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "version";
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "CLI for the Antithesis API";
|
||||
homepage = "https://github.com/antithesishq/snouty";
|
||||
changelog = "https://github.com/antithesishq/snouty/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
carlsverre
|
||||
winter
|
||||
];
|
||||
mainProgram = "snouty";
|
||||
};
|
||||
})
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "spaceship-prompt";
|
||||
version = "4.21.1";
|
||||
version = "4.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denysdovhan";
|
||||
repo = "spaceship-prompt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kuxC7MzgGtDMVcLQZA74sOaBBbEDTuGVEtpjCotGkCs=";
|
||||
sha256 = "sha256-+2Nlao4w3DoAqIMgc68iyUAXdTyPGrW9cfG1brELlyo=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sqlcipher";
|
||||
version = "4.13.0";
|
||||
version = "4.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sqlcipher";
|
||||
repo = "sqlcipher";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3Qt7nOB0iMyNXfENC3gv3F6sENU7OUTZ3n2mo0M2CSA=";
|
||||
hash = "sha256-e3iIr6wCVT+74VREreL2wHttNG8KXJSyqJtoveJSgIc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -40,7 +40,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/asg017/sqlite-vec";
|
||||
changelog = "https://github.com/asg017/sqlite-vec/releases/tag/${finalAttrs.src.rev}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.anmonteiro ];
|
||||
maintainers = with lib.maintainers; [
|
||||
anmonteiro
|
||||
sarahec
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "ssm-session-manager-plugin";
|
||||
version = "1.2.779.0";
|
||||
version = "1.2.792.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "session-manager-plugin";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-QLr/G82uinbz21z5FswSh0UKWZE4FWjKaVQFQJOYSdw=";
|
||||
hash = "sha256-bLoHxUKSH0AcqR1ow7X9XgUjoVLd7ccxqTsNoD9RjDE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -139,9 +139,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
changelog = "https://github.com/swaywm/sway/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.freebsd;
|
||||
maintainers = with lib.maintainers; [
|
||||
synthetica
|
||||
];
|
||||
maintainers = [ ];
|
||||
mainProgram = "sway";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -2,9 +2,10 @@
|
||||
lib,
|
||||
tailscale,
|
||||
buildGoModule,
|
||||
go_1_26,
|
||||
}:
|
||||
|
||||
buildGoModule {
|
||||
buildGoModule.override { go = go_1_26; } {
|
||||
pname = "tailscale-gitops-pusher";
|
||||
inherit (tailscale) version;
|
||||
|
||||
|
||||
@@ -2,10 +2,11 @@
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
go_1_26,
|
||||
tailscale,
|
||||
}:
|
||||
|
||||
buildGoModule {
|
||||
buildGoModule.override { go = go_1_26; } {
|
||||
pname = "tailscale-nginx-auth";
|
||||
inherit (tailscale) version src vendorHash;
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
stdenv,
|
||||
|
||||
buildGoModule,
|
||||
go_1_26,
|
||||
fetchFromGitHub,
|
||||
|
||||
makeWrapper,
|
||||
@@ -22,9 +23,9 @@
|
||||
tailscale-nginx-auth,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
buildGoModule.override { go = go_1_26; } (finalAttrs: {
|
||||
pname = "tailscale";
|
||||
version = "1.94.2";
|
||||
version = "1.96.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -35,10 +36,10 @@ buildGoModule (finalAttrs: {
|
||||
owner = "tailscale";
|
||||
repo = "tailscale";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qjWVB8xWVgIVUgrf27F6hwiFIE+4ERXWeHv26ugg/x4=";
|
||||
hash = "sha256-6taTRKYFxCNK7BUnNZ3lljqVS7AeYEfm46gmilf6eEk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WeMTOkERj4hvdg4yPaZ1gRgKnhRIBXX55kUVbX/k/xM=";
|
||||
vendorHash = "sha256-rhuWEEN+CtumVxOw6Dy/IRxWIrZ2x6RJb6ULYwXCQc4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
@@ -91,11 +92,6 @@ buildGoModule (finalAttrs: {
|
||||
# subPackages above limits what is built to just what we
|
||||
# want but also limits the tests
|
||||
unset subPackages
|
||||
|
||||
# several tests hang, but keeping the file for tsnet/packet_filter_test.go
|
||||
# packet_filter_test issue: https://github.com/tailscale/tailscale/issues/16051
|
||||
substituteInPlace tsnet/tsnet_test.go \
|
||||
--replace-fail 'func Test' 'func skippedTest'
|
||||
'';
|
||||
|
||||
checkFlags =
|
||||
@@ -133,9 +129,6 @@ buildGoModule (finalAttrs: {
|
||||
# not necessary and fails to match
|
||||
"TestSyncedToUpstream" # tempfork/acme
|
||||
|
||||
# flaky: https://github.com/tailscale/tailscale/issues/7030
|
||||
"TestConcurrent"
|
||||
|
||||
# flaky: https://github.com/tailscale/tailscale/issues/11762
|
||||
"TestTwoDevicePing"
|
||||
|
||||
@@ -144,7 +137,36 @@ buildGoModule (finalAttrs: {
|
||||
"TestTaildropIntegration_Fresh"
|
||||
|
||||
# context deadline exceeded
|
||||
"TestPacketFilterFromNetmap"
|
||||
"TestPacketFilterFromNetmap" # tsnet
|
||||
|
||||
# tsnet tests that need a full tailscale server and hang in the sandbox
|
||||
"TestListener_Server" # tsnet
|
||||
"TestDialBlocks" # tsnet
|
||||
"TestConn" # tsnet
|
||||
"TestLoopbackLocalAPI" # tsnet
|
||||
"TestLoopbackSOCKS5" # tsnet
|
||||
"TestTailscaleIPs" # tsnet
|
||||
"TestListenerCleanup" # tsnet
|
||||
"TestStartStopStartGetsSameIP" # tsnet
|
||||
"TestFunnel" # tsnet
|
||||
"TestFunnelClose" # tsnet
|
||||
"TestListenService" # tsnet
|
||||
"TestListenerClose" # tsnet
|
||||
"TestFallbackTCPHandler" # tsnet
|
||||
"TestCapturePcap" # tsnet
|
||||
"TestUDPConn" # tsnet
|
||||
"TestUserMetricsByteCounters" # tsnet
|
||||
"TestUserMetricsRouteGauges" # tsnet
|
||||
"TestTUN" # tsnet
|
||||
"TestTUNDNS" # tsnet
|
||||
"TestListenPacket" # tsnet
|
||||
"TestListenTCP" # tsnet
|
||||
"TestListenTCPDualStack" # tsnet
|
||||
"TestDialTCP" # tsnet
|
||||
"TestDialUDP" # tsnet
|
||||
"TestSelfDial" # tsnet
|
||||
"TestListenUnspecifiedAddr" # tsnet
|
||||
"TestListenMultipleEphemeralPorts" # tsnet
|
||||
|
||||
# flaky: https://github.com/tailscale/tailscale/issues/15348
|
||||
"TestSafeFuncHappyPath"
|
||||
@@ -155,9 +177,10 @@ buildGoModule (finalAttrs: {
|
||||
# Fails because we vendor dependencies
|
||||
"TestLicenseHeaders"
|
||||
|
||||
# Uses testing/synctest with gonotify.DirWatcher which spawns goroutines
|
||||
# that block on inotify syscalls incompatible with synctest's bubble mechanism
|
||||
# Uses testing/synctest which spawns goroutines that block on syscalls
|
||||
# incompatible with synctest's bubble mechanism
|
||||
"TestDNSTrampleRecovery"
|
||||
"TestOnPolicyChangeSkipsPreAuthConns" # ssh/tailssh
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# syscall default route interface en0 differs from netstat
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "terser";
|
||||
version = "5.44.1";
|
||||
version = "5.46.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terser";
|
||||
repo = "terser";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Z4ZdCSGqyu7jjpLgHEZCvrZj+IsqEbdcjATdy80TnC8=";
|
||||
hash = "sha256-Ob3bzaUrHfDaRy25eWmE3YEtZxhZGYp6TEMtDWbzgQs=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-Zmbh/NMriZtkYpFd5hCJo+nPrKTrqYfh3W+sZpopBHM=";
|
||||
npmDepsHash = "sha256-24z5w43ciXydl14XwC0XZ5kZX9HoXFQyWHYntQXMHy0=";
|
||||
|
||||
meta = {
|
||||
description = "JavaScript parser, mangler and compressor toolkit for ES6+";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "topicctl";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "segmentio";
|
||||
repo = "topicctl";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-i7Gu7bk7J8+kG6gWpB+8hyIQs7B3TNQmYvLyQQ0ZGtc=";
|
||||
sha256 = "sha256-huP6Irmk4eEhpfJV+h6aqvw+cpPj9StobyfZPXng2VM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aoFMYgyZnXmPg3fjwydGm85WKcT+Jez07a4JX1o3Mmo=";
|
||||
|
||||
@@ -128,7 +128,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "LLVM_INCLUDE_DOCS" (buildDocs || buildMan))
|
||||
(lib.cmakeBool "MLIR_INCLUDE_DOCS" (buildDocs || buildMan))
|
||||
(lib.cmakeBool "LLVM_BUILD_DOCS" (buildDocs || buildMan))
|
||||
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
|
||||
# Way too slow, only uses one core
|
||||
# (lib.cmakeBool "LLVM_ENABLE_DOXYGEN" (buildDocs || buildMan))
|
||||
(lib.cmakeBool "LLVM_ENABLE_SPHINX" (buildDocs || buildMan))
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vips";
|
||||
version = "8.18.0";
|
||||
version = "8.18.1";
|
||||
|
||||
outputs = [
|
||||
"bin"
|
||||
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "libvips";
|
||||
repo = "libvips";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gAFB1VkOc+OBE8IvtKo5A/v2xqb/4RwV1Q8yU12HYOA=";
|
||||
hash = "sha256-PIaoijkhMKbG8IgK11h8DLemjUR1WNSYB1yfqI4kwdQ=";
|
||||
# Remove unicode file names which leads to different checksums on HFS+
|
||||
# vs. other filesystems because of unicode normalisation.
|
||||
postFetch = ''
|
||||
|
||||
@@ -220,7 +220,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
lovesegfault
|
||||
minijackson
|
||||
rodrgz
|
||||
synthetica
|
||||
khaneliman
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
|
||||
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/Ferdi265/wl-mirror";
|
||||
description = "Simple Wayland output mirror client";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ synthetica ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -137,7 +137,6 @@ stdenv.mkDerivation {
|
||||
detegr
|
||||
shnarazk
|
||||
sternenseemann
|
||||
synthetica
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
@@ -147,7 +147,6 @@ let
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.freebsd;
|
||||
maintainers = with lib.maintainers; [
|
||||
synthetica
|
||||
wineee
|
||||
doronbehar
|
||||
];
|
||||
|
||||
@@ -24,6 +24,6 @@ buildPythonPackage rec {
|
||||
description = "Encodes and decodes data in the BespON format";
|
||||
homepage = "https://github.com/gpoore/bespon_py";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ synthetica ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -358,13 +358,13 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.42.69";
|
||||
version = "1.42.70";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-UszWRaNNK06Xr49E26/7uFSh3lJhDpUCwoS/sk5tiWI=";
|
||||
hash = "sha256-njagHAgWmQa+hGEFwU4t2JB771prBBUd/6q1r/E4lbk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -20,16 +20,16 @@
|
||||
xmldiff,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "cyclonedx-python-lib";
|
||||
version = "11.6.0";
|
||||
version = "11.7.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CycloneDX";
|
||||
repo = "cyclonedx-python-lib";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-LnXunfYUz76XIHEXhaFJymBMFln8sIH0yxCodRmKdY0=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-35JTr2he7sHOqG3Nd0UM9CZ4Q/HFv3UQsF6hxOKR/+k=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "py-serializable" ];
|
||||
@@ -54,12 +54,8 @@ buildPythonPackage rec {
|
||||
jsonschema
|
||||
lxml
|
||||
];
|
||||
json-validation = [
|
||||
jsonschema
|
||||
];
|
||||
xml-validation = [
|
||||
lxml
|
||||
];
|
||||
json-validation = [ jsonschema ];
|
||||
xml-validation = [ lxml ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
@@ -67,7 +63,7 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
xmldiff
|
||||
]
|
||||
++ lib.concatAttrValues optional-dependencies;
|
||||
++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies);
|
||||
|
||||
pythonImportsCheck = [ "cyclonedx" ];
|
||||
|
||||
@@ -93,8 +89,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python library for generating CycloneDX SBOMs";
|
||||
homepage = "https://github.com/CycloneDX/cyclonedx-python-lib";
|
||||
changelog = "https://github.com/CycloneDX/cyclonedx-python-lib/releases/tag/${src.tag}";
|
||||
license = with lib.licenses; [ asl20 ];
|
||||
changelog = "https://github.com/CycloneDX/cyclonedx-python-lib/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -22,14 +22,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "databricks-sdk";
|
||||
version = "0.96.0";
|
||||
version = "0.100.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "databricks";
|
||||
repo = "databricks-sdk-py";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-cwZrewypNltMyr2RPMeyAKJYzy+iwdnfoW/M7uecPaA=";
|
||||
hash = "sha256-NB+YgUrMsteZ1hNJKWSpeM4yW196HgkP9/00ATM/2m8=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -50,6 +50,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/browniebroke/deezer-python";
|
||||
changelog = "https://github.com/browniebroke/deezer-python/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ synthetica ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "disposable-email-domains";
|
||||
version = "0.0.168";
|
||||
version = "0.0.169";
|
||||
pyproject = true;
|
||||
|
||||
# No tags on GitHub
|
||||
src = fetchPypi {
|
||||
pname = "disposable_email_domains";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-gI8MtLJ5OKjhSdWq7M1ckRv1Bz156W5fAucGDYwBSlQ=";
|
||||
hash = "sha256-4FHvAMZEm6f9XVLJpJT/ErBXjBQhjlekpdC5Joyhp9M=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -25,14 +25,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dynaconf";
|
||||
version = "3.2.12";
|
||||
version = "3.2.13";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dynaconf";
|
||||
repo = "dynaconf";
|
||||
tag = version;
|
||||
hash = "sha256-DtZ4rJ425a7ootpWtMXbezyH215dJwW4HTzvGgAUnsc=";
|
||||
hash = "sha256-3qUGLEQ0x/WTF/M/SEts6v9w1yGYSB6LYEcxKQcbqSk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -52,6 +52,6 @@ buildPythonPackage rec {
|
||||
mainProgram = "ftfy";
|
||||
homepage = "https://github.com/LuminosoInsight/python-ftfy";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ aborsu ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -4,21 +4,23 @@
|
||||
fetchPypi,
|
||||
freezegun,
|
||||
hatchling,
|
||||
logfire,
|
||||
pydantic-settings,
|
||||
pydantic,
|
||||
pytest-vcr,
|
||||
pytestCheckHook,
|
||||
requests,
|
||||
requests-oauthlib,
|
||||
requests,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "garth";
|
||||
version = "0.6.3";
|
||||
version = "0.7.9";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-UZ1LUylEY4ZSu3QO5E3PNuHSNDIa7PCF7dfxqB6mb2k=";
|
||||
hash = "sha256-vLNoLl6Z5w7n6u//desPqtgRCqEx66T/EiLXcFDN6Z4=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "requests-oauthlib" ];
|
||||
@@ -26,7 +28,9 @@ buildPythonPackage (finalAttrs: {
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [
|
||||
logfire
|
||||
pydantic
|
||||
pydantic-settings
|
||||
requests
|
||||
requests-oauthlib
|
||||
];
|
||||
|
||||
@@ -23,14 +23,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "greynoise";
|
||||
version = "3.0.1";
|
||||
version = "3.0.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GreyNoise-Intelligence";
|
||||
repo = "pygreynoise";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-wJDO666HC3EohfR+LbG5F0Cp/eL7q4kXniWhJfc7C3s=";
|
||||
hash = "sha256-CP+Fx3Gu6pQWnX/WjJ+qq7TK9onatVHp0ghu33WU7X4=";
|
||||
};
|
||||
|
||||
patches = lib.optionals (!withRepl) [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jianpu-ly";
|
||||
version = "1.865";
|
||||
version = "1.866";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "jianpu_ly";
|
||||
hash = "sha256-fW4qoaDrOZL+oKRPWIZbvuZSOCsrWDw0QsO4r6SJB/Y=";
|
||||
hash = "sha256-nLVLRot4ECZyQ+G6o3mc4fVN9uGP/ZX2RATwaA6pGBI=";
|
||||
};
|
||||
|
||||
dependencies = [ lilypond ];
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
|
||||
keymap-drawer,
|
||||
nix-update-script,
|
||||
pcpp,
|
||||
platformdirs,
|
||||
@@ -19,11 +18,8 @@
|
||||
tree-sitter-grammars,
|
||||
versionCheckHook,
|
||||
}:
|
||||
let
|
||||
version = "0.22.1";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit version;
|
||||
buildPythonPackage (finalAttrs: {
|
||||
version = "0.23.0";
|
||||
pname = "keymap-drawer";
|
||||
pyproject = true;
|
||||
disabled = pythonOlder "3.12";
|
||||
@@ -31,8 +27,8 @@ buildPythonPackage {
|
||||
src = fetchFromGitHub {
|
||||
owner = "caksoylar";
|
||||
repo = "keymap-drawer";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-X3O5yspEdey03YQ6JsYN/DE9NUiq148u1W6LQpUQ3ns=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yrZidTATnOPacAfdk0gFIgH/3MaZqVOjmzkWNnMa01s=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
@@ -58,29 +54,19 @@ buildPythonPackage {
|
||||
|
||||
pythonImportsCheck = [ "keymap_drawer" ];
|
||||
|
||||
versionCheckProgram = "${placeholder "out"}/bin/keymap";
|
||||
|
||||
passthru.tests = callPackages ./tests {
|
||||
# Explicitly pass the correctly scoped package.
|
||||
# The top-level package will still resolve to itself, because the way
|
||||
# `toPythonApplication` interacts with scopes is weird.
|
||||
inherit keymap-drawer;
|
||||
keymap-drawer = finalAttrs.finalPackage;
|
||||
};
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Module and CLI tool to help parse and draw keyboard layouts";
|
||||
homepage = "https://github.com/caksoylar/keymap-drawer";
|
||||
changelog = "https://github.com/caksoylar/keymap-drawer/releases/tag/v${version}";
|
||||
changelog = "https://github.com/caksoylar/keymap-drawer/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
MattSturgeon
|
||||
];
|
||||
mainProgram = "keymap";
|
||||
# keymap-drawer currently requires tree-sitter 0.24.0
|
||||
# See https://github.com/caksoylar/keymap-drawer/issues/183
|
||||
# top-level package `keymap-drawer` is not broken due to this
|
||||
# incompatibility, thanks to a Python override
|
||||
broken = lib.versionAtLeast tree-sitter.version "0.25.0";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
draw_config:
|
||||
key_w: 50
|
||||
key_h: 50
|
||||
split_gap: 20
|
||||
glyphs: {}
|
||||
|
||||
parse_config:
|
||||
preprocess: true
|
||||
|
||||
@@ -1,89 +1,179 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
runCommand,
|
||||
stdenv,
|
||||
keymap-drawer,
|
||||
runCommandWith,
|
||||
testers,
|
||||
|
||||
keymap-drawer,
|
||||
libxml2,
|
||||
xmlstarlet,
|
||||
yamllint,
|
||||
yq-go,
|
||||
}:
|
||||
let
|
||||
runKeymapDrawer =
|
||||
name:
|
||||
runCommand "keymap-drawer-${name}" {
|
||||
nativeBuildInputs = [ keymap-drawer ];
|
||||
{ name, ... }@args:
|
||||
runCommandWith {
|
||||
name = "${keymap-drawer.name}-${name}";
|
||||
derivationArgs = removeAttrs args [ "name" ] // {
|
||||
nativeBuildInputs = [ keymap-drawer ] ++ args.nativeBuildInputs or [ ];
|
||||
};
|
||||
};
|
||||
|
||||
MattSturgeon-example = fetchFromGitHub {
|
||||
owner = "MattSturgeon";
|
||||
repo = "glove80-config";
|
||||
rev = "d55267dd26593037256b35a5d6ebba0f75541da5";
|
||||
hash = "sha256-MV6cNpgHBuaGvpu2aR1aBNMpwPnDqOSbGf+2ykxocP4=";
|
||||
nonConeMode = true;
|
||||
sparseCheckout = [
|
||||
"config"
|
||||
"img"
|
||||
];
|
||||
};
|
||||
|
||||
# MattSturgeon's example requires MDI icons
|
||||
mdi = fetchFromGitHub {
|
||||
owner = "Templarian";
|
||||
repo = "MaterialDesign-SVG";
|
||||
tag = "v7.4.47";
|
||||
hash = "sha256-NoSSRT1ID38MT70IZ+7h/gMVCNsjNs3A2RX6ePGwuQ0=";
|
||||
};
|
||||
in
|
||||
{
|
||||
dump-config = runKeymapDrawer "dump-config" ''
|
||||
keymap dump-config --output "$out"
|
||||
dump-config =
|
||||
runKeymapDrawer
|
||||
{
|
||||
name = "dump-config";
|
||||
nativeBuildInputs = [
|
||||
yamllint
|
||||
];
|
||||
}
|
||||
/* bash */ ''
|
||||
keymap dump-config --output "$out"
|
||||
|
||||
if [ ! -s "$out" ]; then
|
||||
>&2 echo 'Expected `dump-config` to have content.'
|
||||
exit 1
|
||||
fi
|
||||
if [ ! -s "$out" ]; then
|
||||
>&2 echo 'Expected `dump-config` to have content.'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
${lib.getExe yamllint} --strict --config-data relaxed "$out"
|
||||
'';
|
||||
yamllint --strict --config-data relaxed "$out"
|
||||
'';
|
||||
|
||||
parse-zmk = testers.testEqualContents {
|
||||
assertion = "keymap parse --zmk-keymap produces expected YAML";
|
||||
expected = "${MattSturgeon-example}/img/glove80.yaml";
|
||||
actual = runKeymapDrawer "parse" ''
|
||||
keymap \
|
||||
--config ${MattSturgeon-example}/config/keymap_drawer.yaml \
|
||||
parse --zmk-keymap ${MattSturgeon-example}/config/glove80.keymap \
|
||||
--output "$out"
|
||||
'';
|
||||
checkMetadata = stdenv.buildPlatform.isLinux;
|
||||
};
|
||||
invalid-keymap = testers.testBuildFailure (
|
||||
runKeymapDrawer
|
||||
{
|
||||
name = "invalid-keymap";
|
||||
}
|
||||
/* bash */ ''
|
||||
keymap \
|
||||
--config ${./config.yaml} \
|
||||
parse --zmk-keymap ${./invalid.keymap} \
|
||||
--output "$out"
|
||||
''
|
||||
);
|
||||
|
||||
draw = testers.testEqualContents {
|
||||
assertion = "keymap draw produces expected SVG";
|
||||
expected = "${MattSturgeon-example}/img/glove80.svg";
|
||||
actual = runKeymapDrawer "draw" ''
|
||||
${lib.optionalString stdenv.buildPlatform.isLinux ''
|
||||
export XDG_CACHE_HOME="$PWD/cache"
|
||||
glyphs="$XDG_CACHE_HOME/keymap-drawer/glyphs"
|
||||
''}
|
||||
${lib.optionalString stdenv.buildPlatform.isDarwin ''
|
||||
export HOME="$PWD/home"
|
||||
glyphs="$HOME/Library/Caches/keymap-drawer/glyphs"
|
||||
''}
|
||||
mkdir -p "$glyphs"
|
||||
parse-zmk =
|
||||
runKeymapDrawer
|
||||
{
|
||||
name = "parse";
|
||||
nativeBuildInputs = [
|
||||
yamllint
|
||||
yq-go
|
||||
];
|
||||
}
|
||||
/* bash */ ''
|
||||
keymap \
|
||||
--config ${./config.yaml} \
|
||||
parse --zmk-keymap ${./minimal.keymap} \
|
||||
--output "$out"
|
||||
|
||||
# Unpack MDI icons into the cache
|
||||
for file in ${mdi}/svg/*
|
||||
do
|
||||
ln -s "$file" "$glyphs/mdi:$(basename "$file")"
|
||||
done
|
||||
yamllint --strict --config-data relaxed "$out" || {
|
||||
>&2 echo "Malformed YAML"
|
||||
exit 1
|
||||
}
|
||||
|
||||
keymap \
|
||||
--config ${MattSturgeon-example}/config/keymap_drawer.yaml \
|
||||
draw ${MattSturgeon-example}/img/glove80.yaml \
|
||||
--output "$out"
|
||||
'';
|
||||
checkMetadata = stdenv.buildPlatform.isLinux;
|
||||
};
|
||||
layer_count=$(yq '.layers | length' "$out")
|
||||
(( layer_count == 2 )) || {
|
||||
>&2 echo "Expected 2 layers, found $layer_count"
|
||||
exit 1
|
||||
}
|
||||
|
||||
default_layer=$(yq --exit-status '.layers.default | flatten' "$out") || {
|
||||
>&2 echo "Expected default layer"
|
||||
exit 1
|
||||
}
|
||||
|
||||
fn_layer=$(yq --exit-status '.layers.fn | flatten' "$out") || {
|
||||
>&2 echo "Expected fn layer"
|
||||
exit 1
|
||||
}
|
||||
|
||||
[ "$default_layer" = '[ESC, A, B, SPACE, C, D]' ] || {
|
||||
>&2 echo "Incorrect default layer: $default_layer"
|
||||
exit 1
|
||||
}
|
||||
|
||||
[ "$fn_layer" = '[F1, F2, F3, F4, F5, F6]' ] || {
|
||||
>&2 echo "Incorrect fn layer: $fn_layer"
|
||||
exit 1
|
||||
}
|
||||
|
||||
yq --exit-status '.. | select(. == "ESC")' "$out" >/dev/null || {
|
||||
>&2 echo "Expected 'ESC' key"
|
||||
exit 1
|
||||
}
|
||||
|
||||
yq --exit-status '.. | select(. == "SPACE")' "$out" >/dev/null || {
|
||||
>&2 echo "Expected 'SPACE' key"
|
||||
exit 1
|
||||
}
|
||||
|
||||
yq --exit-status '.. | select(. == "F1")' "$out" >/dev/null || {
|
||||
>&2 echo "Expected 'F1' key"
|
||||
exit 1
|
||||
}
|
||||
'';
|
||||
|
||||
draw =
|
||||
runKeymapDrawer
|
||||
{
|
||||
name = "draw";
|
||||
nativeBuildInputs = [
|
||||
xmlstarlet
|
||||
libxml2
|
||||
];
|
||||
}
|
||||
/* bash */ ''
|
||||
keymap \
|
||||
--config ${./config.yaml} \
|
||||
draw ${./minimal.yaml} \
|
||||
--output "$out"
|
||||
|
||||
ns="http://www.w3.org/2000/svg"
|
||||
|
||||
# Basic XML validity
|
||||
xmllint --noout "$out" || {
|
||||
>&2 echo "Malformed XML"
|
||||
exit 1
|
||||
}
|
||||
|
||||
# Root element is <svg>
|
||||
xmlstarlet sel -N s="$ns" -t -v "name(/s:svg)" "$out" | grep -qx svg || {
|
||||
>&2 echo "Expected <svg> root element"
|
||||
exit 1
|
||||
}
|
||||
|
||||
# Assert two layers exist
|
||||
layer_count=$(xmlstarlet sel -N s="$ns" -t -v 'count(//s:g[contains(@class, "layer-")])' "$out")
|
||||
(( layer_count == 2 )) || {
|
||||
>&2 echo "Expected exactly 2 layers, found $layer_count"
|
||||
exit 1
|
||||
}
|
||||
|
||||
for layer in default fn; do
|
||||
# layer-id class
|
||||
xmlstarlet sel -N s="$ns" -t -v 'count(//s:g[@class="layer-'"$layer"'"])' "$out" | grep -qx 1 || {
|
||||
>&2 echo "Missing layer-$layer class"
|
||||
exit 1
|
||||
}
|
||||
|
||||
# text label
|
||||
xmlstarlet sel -N s="$ns" -t -v '//s:text[@class="label" and text()="'"$layer"':"]' "$out" | grep -q "$layer": || {
|
||||
>&2 echo "Missing $layer layer text label"
|
||||
exit 1
|
||||
}
|
||||
done
|
||||
|
||||
key_count=$(xmlstarlet sel -N s="$ns" -t -v 'count(//s:g[contains(@class, "keypos-")])' "$out")
|
||||
(( key_count == 12 )) || {
|
||||
>&2 echo "Expected 12 keys total (6 per layer), found $key_count"
|
||||
exit 1
|
||||
}
|
||||
|
||||
for key in ESC A B SPACE C D F1 F2 F3 F4 F5 F6; do
|
||||
xmlstarlet sel -N s="$ns" -t -v "//s:text[@class='key tap' and text()='$key']" "$out" | grep -q "$key" || {
|
||||
>&2 echo "Expected key '$key'"
|
||||
exit 1
|
||||
}
|
||||
done
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
/ {
|
||||
keymap {
|
||||
compatible = "zmk,keymap";
|
||||
|
||||
broken_layer {
|
||||
bindings = <
|
||||
&kp ESC &kp A
|
||||
&kp SPACE // <-- missing closing + inconsistent row
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -0,0 +1,19 @@
|
||||
/ {
|
||||
keymap {
|
||||
compatible = "zmk,keymap";
|
||||
|
||||
default_layer {
|
||||
bindings = <
|
||||
&kp ESC &kp A &kp B
|
||||
&kp SPACE &kp C &kp D
|
||||
>;
|
||||
};
|
||||
|
||||
fn_layer {
|
||||
bindings = <
|
||||
&kp F1 &kp F2 &kp F3
|
||||
&kp F4 &kp F5 &kp F6
|
||||
>;
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -0,0 +1,13 @@
|
||||
layout:
|
||||
ortho_layout:
|
||||
rows: 2
|
||||
columns: 3
|
||||
layers:
|
||||
default:
|
||||
- [ESC, A, B]
|
||||
- [SPACE, C, D]
|
||||
|
||||
fn:
|
||||
- [F1, F2, F3]
|
||||
- [F4, F5, F6]
|
||||
|
||||
@@ -2,10 +2,12 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pyusb,
|
||||
replaceVars,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
stdenv,
|
||||
tomli,
|
||||
importlib-resources,
|
||||
libusb1,
|
||||
}:
|
||||
|
||||
@@ -21,17 +23,30 @@ buildPythonPackage rec {
|
||||
hash = "sha256-4zTyaidpSlledTcEztWzRgwj43oNV7xWrhMXCE9Qz3k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(replaceVars ./hardcode-libusb1-path.patch {
|
||||
libusb1 = "${lib.getLib libusb1}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
tomli
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
importlib-resources
|
||||
libusb1
|
||||
nativeCheckInputs = [
|
||||
pyusb
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
python test.py
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Python package for simplified libusb distribution and usage with pyOCD";
|
||||
homepage = "https://github.com/pyocd/libusb-package";
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
diff --git a/setup.cfg b/setup.cfg
|
||||
index b04257d..f5c436a 100644
|
||||
--- a/setup.cfg
|
||||
+++ b/setup.cfg
|
||||
@@ -45,7 +45,6 @@ package_dir =
|
||||
=src
|
||||
zip_safe = False
|
||||
install_requires =
|
||||
- importlib_resources
|
||||
|
||||
[options.packages.find]
|
||||
where = src
|
||||
diff --git a/src/libusb_package/__init__.py b/src/libusb_package/__init__.py
|
||||
index 67e3e46..684be57 100644
|
||||
--- a/src/libusb_package/__init__.py
|
||||
+++ b/src/libusb_package/__init__.py
|
||||
@@ -21,10 +21,9 @@ import ctypes.util
|
||||
import functools
|
||||
import platform
|
||||
import sys
|
||||
+from pathlib import Path
|
||||
from typing import (Any, Optional, TYPE_CHECKING)
|
||||
|
||||
-import importlib_resources
|
||||
-
|
||||
from ._version import version as __version__
|
||||
|
||||
if TYPE_CHECKING:
|
||||
@@ -49,18 +48,7 @@ def get_library_path() -> Optional[Path]:
|
||||
The path is valid until the process exits. If the library was extracted from a zip in order to
|
||||
be accessible as a file, it will be cleaned up with the process exits.
|
||||
"""
|
||||
- lib_resource = importlib_resources.files(__name__).joinpath(_LIBRARY_NAME)
|
||||
- if lib_resource.is_file():
|
||||
- path_context = importlib_resources.as_file(lib_resource)
|
||||
- path = path_context.__enter__()
|
||||
-
|
||||
- @atexit.register
|
||||
- def cleanup():
|
||||
- path_context.__exit__(None, None, None)
|
||||
-
|
||||
- return path
|
||||
- else:
|
||||
- return None
|
||||
+ return Path('@libusb1@')
|
||||
|
||||
|
||||
def find_library(candidate: str) -> Optional[str]:
|
||||
@@ -167,7 +167,7 @@ let
|
||||
|
||||
llm = buildPythonPackage rec {
|
||||
pname = "llm";
|
||||
version = "0.28";
|
||||
version = "0.29";
|
||||
pyproject = true;
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -176,7 +176,7 @@ let
|
||||
owner = "simonw";
|
||||
repo = "llm";
|
||||
tag = version;
|
||||
hash = "sha256-PMQGyBwP6UCIz7p94atWgepbw9IwW6ym60sfP/PBrCA=";
|
||||
hash = "sha256-51WHV8ZvyUJgr+a3jFUoZ2hPlv2oiA4rrgalqZEFIfM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -33,6 +33,6 @@ buildPythonPackage rec {
|
||||
description = "Numpy data type serialization using msgpack";
|
||||
homepage = "https://github.com/lebedov/msgpack-numpy";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ aborsu ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -35,6 +35,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/explosion/murmurhash";
|
||||
changelog = "https://github.com/explosion/murmurhash/releases/tag/release-v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ aborsu ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -495,8 +495,8 @@ in
|
||||
"sha256-ha8UiyvXgKk/G98JZYIfJh3v2EKWZwgxNir6BL0+RjU=";
|
||||
|
||||
mypy-boto3-emr =
|
||||
buildMypyBoto3Package "emr" "1.42.3"
|
||||
"sha256-oh5SV2hqG7KcCgBpBeokWeYkBqYprKirv3lZxD2sCnA=";
|
||||
buildMypyBoto3Package "emr" "1.42.70"
|
||||
"sha256-xfiBuaUkQUua4XPzGRDuk4VE2yKyy2E9mOu6TuJHEWY=";
|
||||
|
||||
mypy-boto3-emr-containers =
|
||||
buildMypyBoto3Package "emr-containers" "1.42.3"
|
||||
@@ -571,8 +571,8 @@ in
|
||||
"sha256-N0kQ7Fc44SFKXhl4V+oAclPNlWhluOs53NDokiXcSNM=";
|
||||
|
||||
mypy-boto3-glue =
|
||||
buildMypyBoto3Package "glue" "1.42.68"
|
||||
"sha256-HvL13TFg9jP3iSqyxDdsOaBv7shpkMqIQURe9e+ACVA=";
|
||||
buildMypyBoto3Package "glue" "1.42.70"
|
||||
"sha256-1LdCLIL9olH9DiZFsWulOaFqc8UE9tK/+cDiCXohYFQ=";
|
||||
mypy-boto3-grafana =
|
||||
buildMypyBoto3Package "grafana" "1.42.51"
|
||||
"sha256-QHAuRJrioMD7ASgV1Wobm81Gb+Z87c78yBs9X1+Kz+E=";
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user