Merge staging-next into staging
This commit is contained in:
@@ -135,6 +135,8 @@
|
||||
|
||||
- `n8n` has been updated to version 2. You can find the breaking changes here: https://docs.n8n.io/2-0-breaking-changes/.
|
||||
|
||||
- The default NVIDIA drivers no longer support Maxwell (GTX 1xxx) or older GPUs. Pin the nvidia package to ` config.boot.kernelPackages.nvidiaPackages.legacy_580` for continued support.
|
||||
|
||||
- `gurk-rs` has been updated from `0.6.4` to `0.8.0`. Version `0.8.0` includes breaking changes. For more information read the [release notes for 0.8.0](https://github.com/boxdot/gurk-rs/releases/tag/v0.8.0).
|
||||
|
||||
- `iroh` has been removed and split up into `iroh-dns-server` and `iroh-relay`.
|
||||
|
||||
@@ -696,7 +696,11 @@ in
|
||||
cfg.powerManagement.enable && cfg.powerManagement.kernelSuspendNotifier
|
||||
) "nvidia.NVreg_UseKernelSuspendNotifiers=1"
|
||||
++ lib.optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1"
|
||||
++ lib.optional useOpenModules "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1"
|
||||
++ lib.optional (
|
||||
useOpenModules
|
||||
&& lib.versionAtLeast nvidia_x11.version "515.43.04"
|
||||
&& lib.versionOlder nvidia_x11.version "545.23.06"
|
||||
) "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1"
|
||||
++ lib.optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2" && !ibtSupport) "ibt=off";
|
||||
|
||||
# enable finegrained power management
|
||||
|
||||
@@ -94,6 +94,7 @@ in
|
||||
);
|
||||
in
|
||||
"${pkgs.imaginary}/bin/imaginary ${utils.escapeSystemdExecArgs args}";
|
||||
Restart = "on-failure";
|
||||
ProtectProc = "invisible";
|
||||
BindReadOnlyPaths = lib.optional (cfg.settings ? mount) cfg.settings.mount;
|
||||
CapabilityBoundingSet = if cfg.port < 1024 then [ "CAP_NET_BIND_SERVICE" ] else [ "" ];
|
||||
|
||||
@@ -1093,6 +1093,19 @@ in
|
||||
all kernel interfaces.
|
||||
'';
|
||||
|
||||
icmp = mkYesNoParam no ''
|
||||
Whether to forward certain ICMP error messages even if their source IP
|
||||
doesn't match the negotiated IPsec policies.
|
||||
|
||||
ICMP error messages, such as Destination Unreachable, Time Exceeded or
|
||||
Fragmentation Needed, may be generated by a host whose IP address isn't
|
||||
included in the negotiated traffic selectors and therefore doesn't match the
|
||||
IPsec policies. If this option is enabled and the kernel supports it, such
|
||||
packets may still be forwarded. As ICMP errors contain parts of the IP
|
||||
packet that triggered them, the kernel will base its decision on a reverse
|
||||
policy lookup using that IP header.
|
||||
'';
|
||||
|
||||
start_action = mkEnumParam [ "none" "trap" "start" "trap|start" ] "none" ''
|
||||
Action to perform after loading the configuration.
|
||||
|
||||
|
||||
@@ -73,7 +73,7 @@ in
|
||||
machine.succeed("[ `nixos-version | wc -w` = 2 ]")
|
||||
|
||||
with subtest("nixos-rebuild"):
|
||||
assert "NixOS module" in machine.succeed("nixos-rebuild --help")
|
||||
assert "NixOS" in machine.succeed("nixos-rebuild --help")
|
||||
|
||||
with subtest("Sanity check for uid/gid assignment"):
|
||||
assert "4" == machine.succeed("id -u messagebus").strip()
|
||||
|
||||
@@ -122,14 +122,6 @@
|
||||
forceInstall = true;
|
||||
};
|
||||
|
||||
nixpkgs.overlays = [
|
||||
(final: prev: {
|
||||
# Set tmpdir inside nixos-rebuild-ng to test
|
||||
# "Deploy works with very long TMPDIR"
|
||||
nixos-rebuild-ng = prev.nixos-rebuild-ng.override { withTmpdir = "/tmp"; };
|
||||
})
|
||||
];
|
||||
|
||||
# this will be asserted
|
||||
networking.hostName = "${hostname}";
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -75,12 +75,12 @@
|
||||
};
|
||||
arduino = buildGrammar {
|
||||
language = "arduino";
|
||||
version = "0.0.0+rev=53eb391";
|
||||
version = "0.0.0+rev=11dd46c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter-grammars";
|
||||
repo = "tree-sitter-arduino";
|
||||
rev = "53eb391da4c6c5857f8defa2c583c46c2594f565";
|
||||
hash = "sha256-qQVUWCOZ4y9FTsIf0FI3vmYBhLYz4hcqRTo+5C2MYvc=";
|
||||
rev = "11dd46c9ae25135c473c0003a133bb06a484af0c";
|
||||
hash = "sha256-WTAqwfc6iuYPSyRxf1pqCASIh7H1ns6jiaMarNyWEeQ=";
|
||||
};
|
||||
passthru.requires = [
|
||||
"cpp"
|
||||
@@ -257,12 +257,12 @@
|
||||
};
|
||||
c3 = buildGrammar {
|
||||
language = "c3";
|
||||
version = "0.0.0+rev=24dc1da";
|
||||
version = "0.0.0+rev=78e2ae9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "c3lang";
|
||||
repo = "tree-sitter-c3";
|
||||
rev = "24dc1da56e412a59c9d3ee4ffaf55dac58cc1dd4";
|
||||
hash = "sha256-w2fhyBKWKTxCiCTCN7KbgT3auaWtnb+tKLkKAf2EWk0=";
|
||||
rev = "78e2ae9cff29ef8ca6666006abe80f1236d42996";
|
||||
hash = "sha256-IM2jmaP6ZeV7iGyPCHP71/wsFvPwel3TxyUr51qgTcc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/c3lang/tree-sitter-c3";
|
||||
};
|
||||
@@ -465,12 +465,12 @@
|
||||
};
|
||||
cue = buildGrammar {
|
||||
language = "cue";
|
||||
version = "0.0.0+rev=be0f609";
|
||||
version = "0.0.0+rev=20bb919";
|
||||
src = fetchFromGitHub {
|
||||
owner = "eonpatapon";
|
||||
repo = "tree-sitter-cue";
|
||||
rev = "be0f609c73cc2929811a9bce0ed90ca71ea87604";
|
||||
hash = "sha256-PDezYVX4JL2KUk9PsOPnJuVMhAJQ7ic7sJwziJB1NXo=";
|
||||
rev = "20bb9195dac00b64c00ee494812abf3bf76f4181";
|
||||
hash = "sha256-q41CTw7/+j+hq9ejM0yusObmAVdi1tbUKzRN59M/QVY=";
|
||||
};
|
||||
meta.homepage = "https://github.com/eonpatapon/tree-sitter-cue";
|
||||
};
|
||||
@@ -498,12 +498,12 @@
|
||||
};
|
||||
dart = buildGrammar {
|
||||
language = "dart";
|
||||
version = "0.0.0+rev=81638db";
|
||||
version = "0.0.0+rev=0fc19c3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "UserNobody14";
|
||||
repo = "tree-sitter-dart";
|
||||
rev = "81638dbbdb76a0e88ea8c31b95ec76b9625ddb84";
|
||||
hash = "sha256-JDuuatWkZSnj9sbsfutQQOKhuH2vNIaasoDp4iGxIjU=";
|
||||
rev = "0fc19c3a57b1109802af41d2b8f60d8835c5da3a";
|
||||
hash = "sha256-yK4XfjVPABFHf8MjoDge6bmapcybhdIF+49rlXFP+pw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart";
|
||||
};
|
||||
@@ -841,12 +841,12 @@
|
||||
};
|
||||
fortran = buildGrammar {
|
||||
language = "fortran";
|
||||
version = "0.0.0+rev=2880b7a";
|
||||
version = "0.0.0+rev=be30d90";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stadelmanma";
|
||||
repo = "tree-sitter-fortran";
|
||||
rev = "2880b7aab4fb7cc618de1ef3d4c6d93b2396c031";
|
||||
hash = "sha256-jXSzFAj+pOIHcfEckHxFBojW7axHI9E0If0UgH3j+Z0=";
|
||||
rev = "be30d90dc7dfa4080b9c4abed3f400c9163a88df";
|
||||
hash = "sha256-Y+HrMtswSmoFWH6YTBHfC1qQafqePOJB8tyoPRIbjQg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
|
||||
};
|
||||
@@ -863,12 +863,12 @@
|
||||
};
|
||||
fsharp = buildGrammar {
|
||||
language = "fsharp";
|
||||
version = "0.0.0+rev=2b3c4fa";
|
||||
version = "0.0.0+rev=1c2d935";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ionide";
|
||||
repo = "tree-sitter-fsharp";
|
||||
rev = "2b3c4fae185d5185b5fa1a3d3117cad35f669352";
|
||||
hash = "sha256-tntrmAqY0E+8cdB/CLem54n3WIhsjljFOFeWb+2p0X8=";
|
||||
rev = "1c2d9351d1f731c08cfdc4ed41e63126ae56e462";
|
||||
hash = "sha256-MeYYCVO+KXC2pGYebbQzaK8ZyLAjPm5kBUROCQEn9Cw=";
|
||||
};
|
||||
location = "fsharp";
|
||||
meta.homepage = "https://github.com/ionide/tree-sitter-fsharp";
|
||||
@@ -944,12 +944,12 @@
|
||||
};
|
||||
git_rebase = buildGrammar {
|
||||
language = "git_rebase";
|
||||
version = "0.0.0+rev=bff4b66";
|
||||
version = "0.0.0+rev=760ba8e";
|
||||
src = fetchFromGitHub {
|
||||
owner = "the-mikedavis";
|
||||
repo = "tree-sitter-git-rebase";
|
||||
rev = "bff4b66b44b020d918d67e2828eada1974a966aa";
|
||||
hash = "sha256-k4C7dJUkvQxIxcaoVmG2cBs/CeYzVqrip2+2mRvHtZc=";
|
||||
rev = "760ba8e34e7a68294ffb9c495e1388e030366188";
|
||||
hash = "sha256-TJ3n3HA51qJPVS40GHqGJ6qK4fE9iFfAYH866uHgdtU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-rebase";
|
||||
};
|
||||
@@ -988,12 +988,12 @@
|
||||
};
|
||||
gleam = buildGrammar {
|
||||
language = "gleam";
|
||||
version = "0.0.0+rev=6ea757f";
|
||||
version = "0.0.0+rev=0bb1b0a";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gleam-lang";
|
||||
repo = "tree-sitter-gleam";
|
||||
rev = "6ea757f7eb8d391dbf24dbb9461990757946dd5e";
|
||||
hash = "sha256-jCzv+PMwjcGrMuNFpKf1qP1ziNaSd3L0V+eukF3ZHjY=";
|
||||
rev = "0bb1b0ae1a3555180ae7b0004851da747fc230d1";
|
||||
hash = "sha256-x6DGHCCVl6w3na69gTtcsewS18VO1nTq8BE01Te/Ua4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam";
|
||||
};
|
||||
@@ -1269,12 +1269,12 @@
|
||||
};
|
||||
heex = buildGrammar {
|
||||
language = "heex";
|
||||
version = "0.0.0+rev=b5a7cb5";
|
||||
version = "0.0.0+rev=3968d6e";
|
||||
src = fetchFromGitHub {
|
||||
owner = "connorlay";
|
||||
repo = "tree-sitter-heex";
|
||||
rev = "b5a7cb5f74dc695a9ff5f04919f872ebc7a895e9";
|
||||
hash = "sha256-hSe3h05IFEKMosB2r/85JnT2kv/krU2Ebaszd+m3j8g=";
|
||||
rev = "3968d6e20b3c4cc234f339eddd6b7d118516e281";
|
||||
hash = "sha256-HHsyiUxkUqKGs3kH/dIW8b89umD7+28M0sfXIt9PuQ8=";
|
||||
};
|
||||
meta.homepage = "https://github.com/connorlay/tree-sitter-heex";
|
||||
};
|
||||
@@ -1408,12 +1408,12 @@
|
||||
};
|
||||
idl = buildGrammar {
|
||||
language = "idl";
|
||||
version = "0.0.0+rev=e07d329";
|
||||
version = "0.0.0+rev=57c4ba0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cathaysia";
|
||||
repo = "tree-sitter-idl";
|
||||
rev = "e07d32972b41cc4c02cfd49f9df2abaa3ae54303";
|
||||
hash = "sha256-W7f+laRqXmbYk0qExCXodDeOklLJNgWcE1H0MiFU8Oc=";
|
||||
rev = "57c4ba057415ebe8e184fb11716c985dc3545e5e";
|
||||
hash = "sha256-Y5HGPM2Dbqp+zLBq/SJt5ikdnJGfKujYRfjygpcpSmI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/cathaysia/tree-sitter-idl";
|
||||
};
|
||||
@@ -1603,12 +1603,12 @@
|
||||
};
|
||||
just = buildGrammar {
|
||||
language = "just";
|
||||
version = "0.0.0+rev=60df3d5";
|
||||
version = "0.0.0+rev=d9da862";
|
||||
src = fetchFromGitHub {
|
||||
owner = "IndianBoy42";
|
||||
repo = "tree-sitter-just";
|
||||
rev = "60df3d5b3fda2a22fdb3621226cafab50b763663";
|
||||
hash = "sha256-cul4U1V42l/nYcCvs2eVA09qSrPi34t0eJ/Pr/Ewfhc=";
|
||||
rev = "d9da862c156020c1a83d3c6ccdda32be6d8a5d4a";
|
||||
hash = "sha256-YV+vab/QqGHVPV1e3wjd0w1nFskJEIU4ukq/yIlojk0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/IndianBoy42/tree-sitter-just";
|
||||
};
|
||||
@@ -1669,12 +1669,12 @@
|
||||
};
|
||||
kotlin = buildGrammar {
|
||||
language = "kotlin";
|
||||
version = "0.0.0+rev=a1760ba";
|
||||
version = "0.0.0+rev=802fd92";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fwcd";
|
||||
repo = "tree-sitter-kotlin";
|
||||
rev = "a1760ba7178fe76515e7cfe7577deae2335fa57d";
|
||||
hash = "sha256-WYFTrgTB/WvTeRpL3hfU3oLYLMTXpXcX3DfZcp6FElo=";
|
||||
rev = "802fd920c153b02b9d266369a3ef061622f2bbf0";
|
||||
hash = "sha256-q7HTLFw/W1E6GXV2VMuPFKqDvJBv5OHeUK23zuTzZ0s=";
|
||||
};
|
||||
meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin";
|
||||
};
|
||||
@@ -1725,12 +1725,12 @@
|
||||
};
|
||||
ledger = buildGrammar {
|
||||
language = "ledger";
|
||||
version = "0.0.0+rev=2edce03";
|
||||
version = "0.0.0+rev=22a1ab8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cbarrete";
|
||||
repo = "tree-sitter-ledger";
|
||||
rev = "2edce0372079896c810c7b218587f2b3fbb7a086";
|
||||
hash = "sha256-1uu+Kcu1M4Z+/7LXZaoxQzo67vJJDzSDo5c8aloqcBA=";
|
||||
rev = "22a1ab8195c1f6e808679f803007756fe7638c6f";
|
||||
hash = "sha256-62xgcEavI5RKi77sbEnx9f3hA4faFeUCw0/uec8Nx3k=";
|
||||
};
|
||||
meta.homepage = "https://github.com/cbarrete/tree-sitter-ledger";
|
||||
};
|
||||
@@ -1931,12 +1931,12 @@
|
||||
};
|
||||
mlir = buildGrammar {
|
||||
language = "mlir";
|
||||
version = "0.0.0+rev=1cff1bf";
|
||||
version = "0.0.0+rev=90d41fd";
|
||||
src = fetchFromGitHub {
|
||||
owner = "artagnon";
|
||||
repo = "tree-sitter-mlir";
|
||||
rev = "1cff1bf79135f8effef87d7cee9d3b26d1970ee9";
|
||||
hash = "sha256-wjlVfSbsnJklPCdQPMYfImHVT0OeJSKjuzA1iebWNjc=";
|
||||
rev = "90d41fd327a8a6ded2fb366909ea86d8e31392ea";
|
||||
hash = "sha256-efwVQGp3FR9xtViyfF/ChGg2eBPnm6bf2inmP0nOO+g=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
|
||||
@@ -1987,12 +1987,12 @@
|
||||
};
|
||||
nim = buildGrammar {
|
||||
language = "nim";
|
||||
version = "0.0.0+rev=9b4ede2";
|
||||
version = "0.0.0+rev=3878440";
|
||||
src = fetchFromGitHub {
|
||||
owner = "alaviss";
|
||||
repo = "tree-sitter-nim";
|
||||
rev = "9b4ede21a6ca866d29263f6b66c070961bc622b4";
|
||||
hash = "sha256-3BHcQrLNcXe1RMkV7ECCMzzEukgTlARH3+DDo2M5b0w=";
|
||||
rev = "3878440d9398515ae053c6f6024986e69868bb74";
|
||||
hash = "sha256-mdAT1jTFeVP8TYi4H36sjd826KmxHQ1EZ+8gd37NGfY=";
|
||||
};
|
||||
passthru.requires = [
|
||||
"nim_format_string"
|
||||
@@ -2045,12 +2045,12 @@
|
||||
};
|
||||
nu = buildGrammar {
|
||||
language = "nu";
|
||||
version = "0.0.0+rev=f4793e3";
|
||||
version = "0.0.0+rev=696d257";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nushell";
|
||||
repo = "tree-sitter-nu";
|
||||
rev = "f4793e3809bb84e78dee260b47085d8203a58d88";
|
||||
hash = "sha256-0tQOALi8079pqy12mGG3eqsqv2FsqVvRnetp4xXKH9s=";
|
||||
rev = "696d257f6b652edb50878a783b30ad7833dec49e";
|
||||
hash = "sha256-G+XuQSqvJ9xRNq4fYiyHK9+AmCNofayPOC6JrFXpcjU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nushell/tree-sitter-nu";
|
||||
};
|
||||
@@ -2164,23 +2164,24 @@
|
||||
};
|
||||
perl = buildGrammar {
|
||||
language = "perl";
|
||||
version = "0.0.0+rev=0c24d00";
|
||||
version = "0.0.0+rev=ea9667d";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter-perl";
|
||||
repo = "tree-sitter-perl";
|
||||
rev = "0c24d001dd1921e418fb933d208a7bd7dd3f923a";
|
||||
hash = "sha256-rKu3CGHckXlQnI/bvrQDq40jRO4PAueWKNZJADjmv5A=";
|
||||
rev = "ea9667dc65a816acace002a2b1b099978785ca33";
|
||||
hash = "sha256-siyJfN5s63pPxrSpuzKltgXWeNDytc80MDXo4pz3j7Q=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl";
|
||||
};
|
||||
php = buildGrammar {
|
||||
language = "php";
|
||||
version = "0.0.0+rev=015ce83";
|
||||
version = "0.0.0+rev=3f2465c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-php";
|
||||
rev = "015ce839db5ae9ceda763bf12e071867fbe8cc89";
|
||||
hash = "sha256-fi4J7/AdV0wcpCg4gqmaE2epN51G4x4V5OHh7WtzGac=";
|
||||
rev = "3f2465c217d0a966d41e584b42d75522f2a3149e";
|
||||
hash = "sha256-RV6wHYVTOFdRYMqXdPw2Ryk3FadJJ4jcJVFjsJG8Ri0=";
|
||||
};
|
||||
location = "php";
|
||||
passthru.requires = [
|
||||
@@ -2190,12 +2191,12 @@
|
||||
};
|
||||
php_only = buildGrammar {
|
||||
language = "php_only";
|
||||
version = "0.0.0+rev=015ce83";
|
||||
version = "0.0.0+rev=3f2465c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-php";
|
||||
rev = "015ce839db5ae9ceda763bf12e071867fbe8cc89";
|
||||
hash = "sha256-fi4J7/AdV0wcpCg4gqmaE2epN51G4x4V5OHh7WtzGac=";
|
||||
rev = "3f2465c217d0a966d41e584b42d75522f2a3149e";
|
||||
hash = "sha256-RV6wHYVTOFdRYMqXdPw2Ryk3FadJJ4jcJVFjsJG8Ri0=";
|
||||
};
|
||||
location = "php_only";
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
|
||||
@@ -2246,13 +2247,14 @@
|
||||
};
|
||||
pod = buildGrammar {
|
||||
language = "pod";
|
||||
version = "0.0.0+rev=0bf8387";
|
||||
version = "0.0.0+rev=4559a97";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter-perl";
|
||||
repo = "tree-sitter-pod";
|
||||
rev = "0bf8387987c21bf2f8ed41d2575a8f22b139687f";
|
||||
hash = "sha256-yV2kVAxWxdyIJ3g2oivDc01SAQF0lc7UMT2sfv9lKzI=";
|
||||
rev = "4559a9767eb15d757dce24107b840b137f673d33";
|
||||
hash = "sha256-yTmPjiR5Gf2oAruRjQp3tiVze8UwksY6t4L8Dvuh00U=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-pod";
|
||||
};
|
||||
poe_filter = buildGrammar {
|
||||
@@ -2279,12 +2281,12 @@
|
||||
};
|
||||
powershell = buildGrammar {
|
||||
language = "powershell";
|
||||
version = "0.0.0+rev=b881dfb";
|
||||
version = "0.0.0+rev=73800ec";
|
||||
src = fetchFromGitHub {
|
||||
owner = "airbus-cert";
|
||||
repo = "tree-sitter-powershell";
|
||||
rev = "b881dfbe71a770ea37d434c80d3523091b81f6db";
|
||||
hash = "sha256-UiMEB5yosBTP1amx5F0KAwlnnmsN5iGWng9gC4NjuoA=";
|
||||
rev = "73800ecc8bddeee8f1079a5a2e0c13c3d00269bb";
|
||||
hash = "sha256-76Rjkoh+qtmr4KCbsEEhx1VrVlGfOxywHRFKNA/XYhU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/airbus-cert/tree-sitter-powershell";
|
||||
};
|
||||
@@ -2361,12 +2363,12 @@
|
||||
};
|
||||
proto = buildGrammar {
|
||||
language = "proto";
|
||||
version = "0.0.0+rev=eacb7f1";
|
||||
version = "0.0.0+rev=d65a18c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "coder3101";
|
||||
repo = "tree-sitter-proto";
|
||||
rev = "eacb7f162e35a18a0dd8ce734f7e7baf2a8398ca";
|
||||
hash = "sha256-er7YHlLWVkp56LLcMS4Sdo5zB4JokBdv14mCRl2KzhI=";
|
||||
rev = "d65a18ce7c2242801f702770114ad08056c7f8c9";
|
||||
hash = "sha256-bgrL4IK9sUB5tGoIBdNLGudbFf2OhQYdw0Ub1gM0NL0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/coder3101/tree-sitter-proto";
|
||||
};
|
||||
@@ -2508,12 +2510,12 @@
|
||||
};
|
||||
racket = buildGrammar {
|
||||
language = "racket";
|
||||
version = "0.0.0+rev=56b5780";
|
||||
version = "0.0.0+rev=54649be";
|
||||
src = fetchFromGitHub {
|
||||
owner = "6cdh";
|
||||
repo = "tree-sitter-racket";
|
||||
rev = "56b57807f86aa4ddb14892572b318edd4bc90ebe";
|
||||
hash = "sha256-YZvDzz4xcFFE/bLwT+rZb7trufNMQaCZ3o0uLrgv/E0=";
|
||||
rev = "54649be8b939341d2d5410b594ab954fe8814bd0";
|
||||
hash = "sha256-+pYy/WzjXqTBBxJRBbyFKGOdBd1WZ+AFr8oUWJWR/qU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/6cdh/tree-sitter-racket";
|
||||
};
|
||||
@@ -2728,12 +2730,12 @@
|
||||
};
|
||||
rust = buildGrammar {
|
||||
language = "rust";
|
||||
version = "0.0.0+rev=261b202";
|
||||
version = "0.0.0+rev=8a1ccae";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-rust";
|
||||
rev = "261b20226c04ef601adbdf185a800512a5f66291";
|
||||
hash = "sha256-i6OrbcHNkrsAW5cpYOI7r0F6xn94KZWB9ZJMUH+k2ds=";
|
||||
rev = "8a1ccae7aaccdc11b04dbd803453e3e9cfd9159b";
|
||||
hash = "sha256-nx7FiGQ2ybaq6YSuToQSQbH6Vj+JNWSXacuPumHGV/Q=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust";
|
||||
};
|
||||
@@ -2761,12 +2763,12 @@
|
||||
};
|
||||
scheme = buildGrammar {
|
||||
language = "scheme";
|
||||
version = "0.0.0+rev=8004e59";
|
||||
version = "0.0.0+rev=c6cb7c7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "6cdh";
|
||||
repo = "tree-sitter-scheme";
|
||||
rev = "8004e59a1d17ca670aa34d09021c8499fdefaf61";
|
||||
hash = "sha256-Y0aac+N3qD46zc+QnbCeUYKz4TUePZYqhH/NQI63OsQ=";
|
||||
rev = "c6cb7c7d7a04b3f5d999c28e2e9c0c31b2d50ece";
|
||||
hash = "sha256-aFonUd15PJkQmz5lDJthtd1rU+8OXNknHDlgqH2s+OA=";
|
||||
};
|
||||
meta.homepage = "https://github.com/6cdh/tree-sitter-scheme";
|
||||
};
|
||||
@@ -3065,12 +3067,12 @@
|
||||
};
|
||||
swift = buildGrammar {
|
||||
language = "swift";
|
||||
version = "0.0.0+rev=30e18c7";
|
||||
version = "0.0.0+rev=8abb3e8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "alex-pinkus";
|
||||
repo = "tree-sitter-swift";
|
||||
rev = "30e18c7b0210b33ffd6e8a7028e170a9dc90825b";
|
||||
hash = "sha256-223uxZ8mqY3m5774voRThth2bEa3sM5GHkKLo6ewd7k=";
|
||||
rev = "8abb3e8b33256d89127a35e87480736f74755ff9";
|
||||
hash = "sha256-JztVY5/jb532lUV0ziEIW1auDsfKy7gZNDFHvjDIPLk=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
|
||||
@@ -3464,12 +3466,12 @@
|
||||
};
|
||||
vhdl = buildGrammar {
|
||||
language = "vhdl";
|
||||
version = "0.0.0+rev=58114f3";
|
||||
version = "0.0.0+rev=c2d9be3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpt13653903";
|
||||
repo = "tree-sitter-vhdl";
|
||||
rev = "58114f35d0865e348692256bfc5ae661fc1efb0c";
|
||||
hash = "sha256-VnnBDxxirwGtPWI0YqRsC5CBEkfjP+DC+oUg97vkdos=";
|
||||
rev = "c2d9be3d5ab7fb2cae8ad5ae604cd3606a4af0f2";
|
||||
hash = "sha256-/bz7ab0XjLfHYEJDv71uLSbduInjDK06d3UQLdiiJ78=";
|
||||
};
|
||||
meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl";
|
||||
};
|
||||
|
||||
@@ -1408,6 +1408,7 @@ assertNoAdditions {
|
||||
nvimSkipModules = [
|
||||
"init"
|
||||
# _GO_NVIM_CFG
|
||||
"go.ai.init"
|
||||
"go.comment"
|
||||
"go.format"
|
||||
"go.ginkgo"
|
||||
@@ -1704,6 +1705,8 @@ assertNoAdditions {
|
||||
"lazyvim.plugins.extras.lang.python"
|
||||
"lazyvim.plugins.extras.lang.svelte"
|
||||
"lazyvim.plugins.extras.lang.typescript"
|
||||
"lazyvim.plugins.extras.lang.typescript.init"
|
||||
"lazyvim.plugins.extras.lang.typescript.vtsls"
|
||||
"lazyvim.plugins.init"
|
||||
"lazyvim.plugins.ui"
|
||||
"lazyvim.plugins.xtras"
|
||||
|
||||
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-code";
|
||||
publisher = "anthropic";
|
||||
version = "2.1.81";
|
||||
hash = "sha256-AblL1ChlZ8JKMhKVz/AAV22iyGfWQWXfLY2ntLWg/ik=";
|
||||
version = "2.1.83";
|
||||
hash = "sha256-5Qo2Pm0YWlkesdJPqWp8bsA5nE2kOT7lVhMbUvQVY0I=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -497,8 +497,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "banacorn";
|
||||
name = "agda-mode";
|
||||
version = "0.6.8";
|
||||
hash = "sha256-rMRajooaU3W2tHhM3rBsRS0i5Ppp137m9yW9eIqLPos=";
|
||||
version = "0.8.0";
|
||||
hash = "sha256-2xYC+tStBXTL4koqUOcyxQUTDTipeUMTFLbrwqA6p7Q=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/banacorn.agda-mode/changelog";
|
||||
@@ -2021,8 +2021,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "gc-excelviewer";
|
||||
publisher = "grapecity";
|
||||
version = "4.2.64";
|
||||
hash = "sha256-bHxU/u6T6r4rSfl9olBZZVI8NTttJFzJw3dgYlvavxw=";
|
||||
version = "4.2.65";
|
||||
hash = "sha256-MDGwoecU8km6a7NVQjPRqJ43592Bftd/nXj1cdBB+V8=";
|
||||
};
|
||||
meta = {
|
||||
description = "Edit Excel spreadsheets and CSV files in Visual Studio Code and VS Code for the Web";
|
||||
@@ -4207,8 +4207,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "shopify";
|
||||
name = "ruby-lsp";
|
||||
version = "0.10.0";
|
||||
hash = "sha256-RSNcyoyrkVJsFp02aMDDZn51YBKohE+gy+bgHFP45v4=";
|
||||
version = "0.10.1";
|
||||
hash = "sha256-IBOYuldJO1FjpFtpDMxo5n7XjXmN21qqrZcYy9+Ddso=";
|
||||
};
|
||||
meta = {
|
||||
description = "VS Code plugin for connecting with the Ruby LSP";
|
||||
|
||||
@@ -35,17 +35,17 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-VyjqPTyLn8eGh/XS3nn0PMqiAsrL91vDZD6Z9L2oh24=";
|
||||
x86_64-darwin = "sha256-3ACtYUblaJs8I1BHHFOSFuAODP0dziXFvd0qdJ/izZ8=";
|
||||
aarch64-linux = "sha256-wyiOvHNMuE6SbInYK9vlYVkbdxAlf9/xHa2nKWh8ecc=";
|
||||
aarch64-darwin = "sha256-0sOKWswv7M3VCralFt1BAA45JrQyAX4Fr/5imNmcaHA=";
|
||||
armv7l-linux = "sha256-hAAuYK7ZQGpAQLE9o8/GF+qHHj0OfT15IXY9cvaKBC0=";
|
||||
x86_64-linux = "sha256-p+8hlq6eB/d3oyPMirJ4ZRqY65xQyEk0jc8k2FiduuY=";
|
||||
x86_64-darwin = "sha256-GyD9Z+o8mW6GgTDtGWs66Zja32fDKUEb5EblxMuqwHY=";
|
||||
aarch64-linux = "sha256-C1HpQ/yJwkOkGcQssSwjAqhKCCdspc6Xq0pMdmpmSBc=";
|
||||
aarch64-darwin = "sha256-m9wZ+7eyuTbGkr+TjCUrSGScr1L0eatKC7N0jJacjzY=";
|
||||
armv7l-linux = "sha256-W8MjdmQLzwVqGjnrfLjM4Jj8B98fklm5I8SFsmI4URA=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.112.0";
|
||||
version = "1.113.0";
|
||||
|
||||
# The update server (update.code.visualstudio.com) expects the version path
|
||||
# segment in X.Y.Z form, so we normalize X.Y to X.Y.0 (e.g. "1.110" → "1.110.0").
|
||||
@@ -53,7 +53,7 @@ let
|
||||
downloadVersion = lib.versions.pad 3 version;
|
||||
|
||||
# This is used for VS Code - Remote SSH test
|
||||
rev = "07ff9d6178ede9a1bd12ad3399074d726ebe6e43";
|
||||
rev = "cfbea10c5ffb233ea9177d34726e6056e89913dc";
|
||||
in
|
||||
buildVscode {
|
||||
pname = "vscode" + lib.optionalString isInsiders "-insiders";
|
||||
@@ -86,7 +86,7 @@ buildVscode {
|
||||
src = fetchurl {
|
||||
name = "vscode-server-${rev}.tar.gz";
|
||||
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
|
||||
hash = "sha256-je83XIJD2Ayc4/j05BCUi/0dblVGlLQdDf+u7wfHZgA=";
|
||||
hash = "sha256-UFZJRZ2mAK0aZ58Pa2PgFOEQT7Ec7F/m1MoO5BrXaJI=";
|
||||
};
|
||||
stdenv = stdenvNoCC;
|
||||
};
|
||||
|
||||
@@ -526,11 +526,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"hashicorp_azurerm": {
|
||||
"hash": "sha256-6SzcMWDKloX8qmBW8sGKOAKVxFVegaSYSm7xSZBS3p4=",
|
||||
"hash": "sha256-evfbdwrB8Y3oRy2NXPfLXPWsFKICzHP4wrtQ6t/mbgQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v4.64.0",
|
||||
"rev": "v4.65.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
||||
@@ -123,6 +123,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# used in Linphone's CMakeLists.txt
|
||||
"-DLINPHONEAPP_VERSION=${finalAttrs.version}"
|
||||
|
||||
# Disable update check
|
||||
"-DENABLE_UPDATE_CHECK=OFF"
|
||||
];
|
||||
|
||||
# error: invalid conversion from 'int' to 'const char*'
|
||||
|
||||
@@ -73,6 +73,9 @@ let
|
||||
in
|
||||
''
|
||||
cp ${mesonPatch}/meson.build .
|
||||
|
||||
substituteInPlace ccp4/library_utils.c \
|
||||
--replace-fail " int putenv ();" " int putenv (char *);"
|
||||
'';
|
||||
};
|
||||
# This is the statically-linked, pre-built binary of mosflm. Compiling it ourselves turns out to be very difficult
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "akkoma-fe";
|
||||
version = "3.12.0-unstable-2025-12-07";
|
||||
version = "3.18.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "akkoma.dev";
|
||||
owner = "AkkomaGang";
|
||||
repo = "akkoma-fe";
|
||||
rev = "0da97ce1ea0255ddabe18537cfd78a4935237859";
|
||||
hash = "sha256-fVItooES2PNoWGP8RfRo5Ibqi6d/ZyuRXUfud2uHg5Y=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-s9rHuZsNHQLCXqqF8VJPgiTHkHHXro97mUTvLB9WKfI=";
|
||||
|
||||
# upstream repository archive fetching is broken
|
||||
forceFetchGit = true;
|
||||
@@ -45,9 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
postPatch = ''
|
||||
# Build scripts assume to be used within a Git repository checkout
|
||||
sed -E -i '/^let commitHash =/,/;$/clet commitHash = "${
|
||||
builtins.substring 0 7 finalAttrs.src.rev
|
||||
}";' \
|
||||
sed -E -i '/^let commitHash =/,/;$/clet commitHash = "${finalAttrs.src.rev}";' \
|
||||
build/webpack.prod.conf.js
|
||||
'';
|
||||
|
||||
|
||||
@@ -20,14 +20,14 @@ let
|
||||
in
|
||||
beamPackages.mixRelease rec {
|
||||
pname = "akkoma";
|
||||
version = "3.17.0";
|
||||
version = "3.18.1";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "akkoma.dev";
|
||||
owner = "AkkomaGang";
|
||||
repo = "akkoma";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RXKqeaS+cvOGQNMU/g2lbAk/V1JbkU2XXqITqv1U/wU=";
|
||||
hash = "sha256-4HIIgTNcNAMCpHyT6zBcmxXeFbMrt38Z7PtT9Onvz+U=";
|
||||
|
||||
# upstream repository archive fetching is broken
|
||||
forceFetchGit = true;
|
||||
@@ -49,7 +49,7 @@ beamPackages.mixRelease rec {
|
||||
mixFodDeps = beamPackages.fetchMixDeps {
|
||||
pname = "mix-deps-akkoma";
|
||||
inherit src version;
|
||||
hash = "sha256-DqSeMjom9UjgGjjfJomWCr7jQhXEkqVrDCvW3+pDtcQ=";
|
||||
hash = "sha256-igXEX6I+7G7tNCLjEf0VBOaii0r7jXCdF6x78LMcUv0=";
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace "$out/http_signatures/mix.exs" \
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "argocd";
|
||||
version = "3.3.2";
|
||||
version = "3.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo-cd";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-cxjBXT/YvhC8GA5Btjyqsy5FBescie9f+yfj/6wNV24=";
|
||||
hash = "sha256-U4HTnzBzgCN06XNCNpIyG8lpTJT6l+l8Pkz08muwtzo=";
|
||||
};
|
||||
|
||||
ui = stdenv.mkDerivation {
|
||||
@@ -45,7 +45,7 @@ buildGoModule (finalAttrs: {
|
||||
};
|
||||
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
vendorHash = "sha256-UYDGt7iTyDlq3lKEZAqFchO0IYV5kVlfbegWaHsA1Og=";
|
||||
vendorHash = "sha256-moXY/30Zu1HTfbEYYG61KwaH2Pj3zVOCfSzwZhOvsE8=";
|
||||
|
||||
# Set target as ./cmd per cli-local
|
||||
# https://github.com/argoproj/argo-cd/blob/master/Makefile
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "automatic-timezoned";
|
||||
version = "2.0.123";
|
||||
version = "2.0.124";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxbrunet";
|
||||
repo = "automatic-timezoned";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-Czewvy/IJluulgvfnSQDA+FKiHD/13fE5i2wz0AaVxs=";
|
||||
sha256 = "sha256-B7cfrO3Kz1xS9htjZXXLQaFvbc0g4fowParTVvXdqA8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-C5HT5u4Z7kJm550VfApr2IfMNk4Lhw8nQCNlZzqYeKk=";
|
||||
cargoHash = "sha256-YQV5e9/iTvx76ch6D/iNGgWJaa3rAr6dN8mlEXtatDs=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "beekeeper-studio";
|
||||
version = "5.6.2";
|
||||
version = "5.6.3";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -54,10 +54,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
fetchurl {
|
||||
url = "https://github.com/beekeeper-studio/beekeeper-studio/releases/download/v${finalAttrs.version}/${asset}";
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-s1Smb8du7pZjcVMnLsJ39P28erApDLnf5lqO9rO7asw=";
|
||||
aarch64-linux = "sha256-ZHFiIJ6zYYXjbEGGttvcNxnnKz+/4j8oQ1PsXAdeAUM=";
|
||||
x86_64-darwin = "sha256-NasWIn1OA4LvewLbNzyMXuPXFvbvl41tpEN1xEC6jSk=";
|
||||
aarch64-darwin = "sha256-DZUm7/3/wvyZDV3/HrK1glNo4pMWyt16z5B3FfSYdqw=";
|
||||
x86_64-linux = "sha256-h0ww43lIxqQeaf5rN5MyS9vVSRqLiW0k2Zp4riiIhEc=";
|
||||
aarch64-linux = "sha256-w6XfwenJ8B7ak9epd2vc1R8Bf5XWvpx7iPeXPICqLwI=";
|
||||
x86_64-darwin = "sha256-L9Ll7v0wc6LGeXKRz7LwR1Y7sXDDZlvgc26Q8uFr6+U=";
|
||||
aarch64-darwin = "sha256-a7+Getrr+6PDPML16Z/wzvIYUzc5WpFptAf2nLLREeM=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
rustPlatform,
|
||||
clang,
|
||||
pkg-config,
|
||||
@@ -12,24 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "below";
|
||||
version = "0.9.0";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebookincubator";
|
||||
repo = "below";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tPweJFqhZMOL+M08bDjW6HPmtuhr9IXJNP0c938O7Cg=";
|
||||
hash = "sha256-Paf3+aVsJpC8wyNqszCp3y5qQS8LEAyXvJBp9VG4uFM=";
|
||||
};
|
||||
|
||||
cargoPatches = [
|
||||
(fetchpatch {
|
||||
name = "update-Cargo.lock.patch";
|
||||
url = "https://github.com/facebookincubator/below/commit/f46f9936ac29fa23f5cb02cafe93ae724649bafc.patch";
|
||||
hash = "sha256-J+M8FIuo8ToT3+9eZi5qfwfAW98XcNRqTIJd6O8z1Ig=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoHash = "sha256-JrSSIwREHSg5YJivSdBIPjOkOtdw8qGCsa4yE7rJz/E=";
|
||||
cargoHash = "sha256-8+8mBbQSFPcjfBB7y+dgyno+EW82ojhPNxx836gCMik=";
|
||||
|
||||
prePatch = ''
|
||||
sed -i "s,ExecStart=.*/bin,ExecStart=$out/bin," etc/below.service
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bpftrace";
|
||||
version = "0.25.0";
|
||||
version = "0.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bpftrace";
|
||||
repo = "bpftrace";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-N3XrfFfcw5j9EbX0fSz8GrD2+DjBxa89+c1yUYOwmwQ=";
|
||||
hash = "sha256-nVBIS6cgCY9ZhzVrWBY6hXI0se9zAWMKnvHuJap3x3c=";
|
||||
};
|
||||
|
||||
buildInputs = with llvmPackages; [
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
version = "1.3.10";
|
||||
version = "1.3.11";
|
||||
pname = "bun";
|
||||
|
||||
src =
|
||||
@@ -81,19 +81,19 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
sources = {
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-darwin-aarch64.zip";
|
||||
hash = "sha256-ggNOh8nZtDmOphmu4u7V0qaMgVfppq4tEFLYTVM8zY0=";
|
||||
hash = "sha256-b1o0Z+2crsR5W/eM1HZQfZ+HDH1XuGyUX8szgSZ3L/w=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-linux-aarch64.zip";
|
||||
hash = "sha256-+l7LJcr6jo9ch6D4M3GdRt0K8KhseDfYBlMSEtVWNtM=";
|
||||
hash = "sha256-0TlE2hKlPsx0v2pyC9HQTEVVwDjf5CI2U1anvkdpH98=";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-darwin-x64-baseline.zip";
|
||||
hash = "sha256-+WhsTk52DbTN53oPH60F5VJki5ycv6T3/Jp+wmufMmc=";
|
||||
hash = "sha256-+2c5sIv1RVDtqnyCTNWy3KRbagav70CEQwh6YxBfb40=";
|
||||
};
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-linux-x64.zip";
|
||||
hash = "sha256-9XvAGH45Yj3nFro6OJ/aVIay175xMamAulTce3M9Lgg=";
|
||||
hash = "sha256-hhG6k1r4hvBabzh0ChUWAybBXl1dB63vlmEwtEk2B+0=";
|
||||
};
|
||||
};
|
||||
updateScript = writeShellScript "update-bun" ''
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "butler";
|
||||
version = "15.26.0";
|
||||
version = "15.26.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "itchio";
|
||||
repo = "butler";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-FaYxvqC/ZYFukh6H63A0dx/8IkSM0Awf4JDBZgvc5W4=";
|
||||
hash = "sha256-/Sdk9uYWjYtJFvc/xmrewgHlC+6cpqPoUP22xIfowj8=";
|
||||
};
|
||||
|
||||
buildInputs = [ brotli ];
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchpatch,
|
||||
fetchurl,
|
||||
cmake,
|
||||
freetype,
|
||||
@@ -17,7 +16,7 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2024.06.12.0";
|
||||
version = "2025.09.18.4";
|
||||
pname = "cernlib";
|
||||
year = lib.versions.major version;
|
||||
|
||||
@@ -26,21 +25,17 @@ stdenv.mkDerivation rec {
|
||||
"https://ftp.riken.jp/cernlib/download/${year}_source/tar/cernlib-cernlib-${version}-free.tar.gz"
|
||||
"https://cernlib.web.cern.ch/download/${year}_source/tar/cernlib-cernlib-${version}-free.tar.gz"
|
||||
];
|
||||
hash = "sha256-SEFgQjPBkmRoaMD/7yXiXO9DZNrRhqZ01kptSDQur84=";
|
||||
hash = "sha256-zhLZlR0CUtPPYr+99JpFnJ1er+L7YcoRLi5hKLERqR4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/user-attachments/files/16832928/geant321-fix-weak-alias-on-darwin.patch";
|
||||
hash = "sha256-YzaUh4rJBszGdp5s/HDQMI5qQhCGrTt9P6XCgZOFn1I=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 3.3.0 FATAL_ERROR)" \
|
||||
"cmake_minimum_required(VERSION 3.10.0 FATAL_ERROR)" \
|
||||
--replace-fail "find_program ( SED NAMES gsed" "find_program ( SED NAMES sed"
|
||||
|
||||
# termio.h is not found. Use the POSIX header
|
||||
substituteInPlace packlib/cspack/tcpaw/tcpaw.c \
|
||||
--replace-fail "#include <termio.h>" "#include <termios.h>" \
|
||||
--replace-fail "struct termio" "struct termios"
|
||||
'';
|
||||
|
||||
# gfortran warning's on iframework messes with CMake's check_fortran_compiler_flag
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "certinfo-go";
|
||||
version = "0.1.51";
|
||||
version = "0.1.55";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paepckehh";
|
||||
repo = "certinfo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8CN3mu7xLSXDQ4nTVlJSCZwDCRQyUGE3oIdJTbpWKzQ=";
|
||||
hash = "sha256-L7gX6GaNI2tqLf7diCBOXDWtP2bQJYI//ZKQ/76J+ZA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VU40TmdABNbbROl9kL0m+k2ITBiPfs5CaXB3Ntd89ig=";
|
||||
vendorHash = "sha256-SuQGgPT9ItoJPca6f8hsARwlpPwwb2avszZFBBp6LBA=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -1,46 +1,46 @@
|
||||
{
|
||||
"version": "2.1.81",
|
||||
"buildDate": "2026-03-20T21:31:30Z",
|
||||
"version": "2.1.83",
|
||||
"buildDate": "2026-03-25T05:20:36Z",
|
||||
"platforms": {
|
||||
"darwin-arm64": {
|
||||
"binary": "claude",
|
||||
"checksum": "d014162177fc18bfeb7f93d942130dd964f7424e4101f6ad569de66e6eddca03",
|
||||
"size": 193286000
|
||||
"checksum": "43246a9ff21de27c517f48af52c9d510c9e6e70bd90b115d80b9c690c515ae0d",
|
||||
"size": 199115504
|
||||
},
|
||||
"darwin-x64": {
|
||||
"binary": "claude",
|
||||
"checksum": "3c63d8173d4a86ab3985aead73c4699e42956d10c2f946179274be76ec657099",
|
||||
"size": 199366256
|
||||
"checksum": "bd16eefc5f7ba3d1b791e311f4d5b24ac3174588110a38db1c88c1b51dc88214",
|
||||
"size": 200708688
|
||||
},
|
||||
"linux-arm64": {
|
||||
"binary": "claude",
|
||||
"checksum": "ccfc3845c8d1a2ded9656a3a517694a844a1b7005b87c784a66f7a60cc58012c",
|
||||
"size": 235183215
|
||||
"checksum": "660bddb82c06a69bef8e468ffb8dd2354212bb76de122fe5d67393564b932de9",
|
||||
"size": 233704000
|
||||
},
|
||||
"linux-x64": {
|
||||
"binary": "claude",
|
||||
"checksum": "047e3f5591d6238b08dd9518729ac335b0e8df1c80fe985e5d7fbda2c18fc281",
|
||||
"size": 237954904
|
||||
"checksum": "ff79cd5d152017326f661309bbffbefc954f02a195fb232ada152d812e476e66",
|
||||
"size": 233863808
|
||||
},
|
||||
"linux-arm64-musl": {
|
||||
"binary": "claude",
|
||||
"checksum": "eab144605b0b0cc7d41325ef4dc9d553cdee853234da8bd7cd8187552b875399",
|
||||
"size": 225718687
|
||||
"checksum": "23396cad38d89cbce1fc739e2443e25a1b9bf9036964f5d2c82ae0d266f0b727",
|
||||
"size": 226822592
|
||||
},
|
||||
"linux-x64-musl": {
|
||||
"binary": "claude",
|
||||
"checksum": "480a961630459c0790e38d4860a2653fd39ae96aadc38044f669e1c2db686254",
|
||||
"size": 228552392
|
||||
"checksum": "d0c301132fa0a3447c8442fc4a92076e042c2acd849e48d93ccf1192fa03d75e",
|
||||
"size": 228489664
|
||||
},
|
||||
"win32-x64": {
|
||||
"binary": "claude.exe",
|
||||
"checksum": "6d34836bf4d62f4bd5221fb69899ed5b2edc380d35fb0f23218c62fae94e28b9",
|
||||
"size": 242411680
|
||||
"checksum": "24cd40c12e7d62faef9d1aead2d27bb8e9f45fb3445eaded05010bbf72e637d5",
|
||||
"size": 243462304
|
||||
},
|
||||
"win32-arm64": {
|
||||
"binary": "claude.exe",
|
||||
"checksum": "18352be0d91c690b0fe2ed6841e4908c266c06eb7000555118e91966b67b9ea5",
|
||||
"size": 238605472
|
||||
"checksum": "8c6692a1e83b9baafbe405b11c62003dec03aa606623e59483bac772ab0f4730",
|
||||
"size": 239616160
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.1.81",
|
||||
"version": "2.1.83",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.1.81",
|
||||
"version": "2.1.83",
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
"claude": "cli.js"
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "claude-code";
|
||||
version = "2.1.81";
|
||||
version = "2.1.83";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-WT+fj9H/5hlr/U8MygiIdE2QZ32kRz6wTjYEABtmBPU=";
|
||||
hash = "sha256-tRrJ1UuolwI9d7ZOvBml0xJ9yZ3u57vGBfvF69artI8=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-x8Y1vODjATE6F6r0GhK427J0h2Et7bsqKoDcWaNO+IM=";
|
||||
npmDepsHash = "sha256-ll47m1mgOur+cbx8MkNRttSUCXyKKG5ZlceH1lhC5Y0=";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dasel";
|
||||
version = "3.3.1";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TomWright";
|
||||
repo = "dasel";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-h6AIu1Yavqezpl6yeMwdZ168SV7Rz19Mr7GtNeyDzpk=";
|
||||
hash = "sha256-+TSjwxlh1uvN5Dpe2FeNi/x4QkQ87EcHhoRDcFyHMFw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-hHxEE0xNSP4wnT5B13BAxUPpdIWs8v7KF1MuISfaYBE=";
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fabric-ai";
|
||||
version = "1.4.437";
|
||||
version = "1.4.441";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielmiessler";
|
||||
repo = "fabric";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VqCMswvMUBqfIcVphjMtgr5BrrDOmshTRSCGnZKMbBg=";
|
||||
hash = "sha256-hbK4AOqK9IkvKPrQWCQd5K1IWcfXiP0fVPEMtstJSsI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aE2b6Pe3v+2kT7nSHrmW3Vd/0ky6SQMag6ndsWuYSqs=";
|
||||
vendorHash = "sha256-Ay+ndVlyHwA93QdzMRsQfpp38MAzQgXX5pif6ElbO4M=";
|
||||
|
||||
# Fabric introduced plugin tests that fail in the nix build sandbox.
|
||||
doCheck = false;
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "fcitx5-pinyin-minecraft";
|
||||
version = "0.1.20250315";
|
||||
version = "0.1.20260325";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/oldherl/fcitx5-pinyin-minecraft/releases/download/${finalAttrs.version}/minecraft-cn.dict";
|
||||
hash = "sha256-7BKNsxlIxEch4cTEcp4jFnIdyv7ifbtJ8HCIMX5G2U8=";
|
||||
hash = "sha256-FjBqxj7VzzbZZCUIJHTBGoVZRDNvX/qQMPn0uaQHgDU=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
--- a/src/3rdParty/OndselSolver/OndselSolver.pc.in
|
||||
+++ b/src/3rdParty/OndselSolver/OndselSolver.pc.in
|
||||
@@ -3,2 +3,2 @@
|
||||
-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
|
||||
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
|
||||
+libdir=@CMAKE_INSTALL_LIBDIR@
|
||||
+includedir=@CMAKE_INSTALL_INCLUDEDIR@
|
||||
@@ -1,26 +0,0 @@
|
||||
diff --git a/src/Gui/PreferencePages/DlgSettingsEditor.cpp b/src/Gui/PreferencePages/DlgSettingsEditor.cpp
|
||||
index 0dda987..01568f1 100755
|
||||
--- a/src/Gui/PreferencePages/DlgSettingsEditor.cpp
|
||||
+++ b/src/Gui/PreferencePages/DlgSettingsEditor.cpp
|
||||
@@ -288,7 +288,9 @@ void DlgSettingsEditor::loadSettings()
|
||||
QStringList fixedFamilyNames;
|
||||
for (const auto& name : familyNames) {
|
||||
if (QFontDatabase().isFixedPitch(name)) {
|
||||
- if (name.compare(QLatin1String("8514oem"), Qt::CaseInsensitive) != 0) {
|
||||
+ if (name.compare(QLatin1String("8514oem"), Qt::CaseInsensitive) != 0
|
||||
+ && name.compare(QLatin1String("cursor.pcf"), Qt::CaseInsensitive) != 0)
|
||||
+ {
|
||||
fixedFamilyNames.append(name);
|
||||
}
|
||||
}
|
||||
@@ -298,7 +300,9 @@ void DlgSettingsEditor::loadSettings()
|
||||
QStringList fixedFamilyNames;
|
||||
for (const auto& name : familyNames) {
|
||||
if (QFontDatabase::isFixedPitch(name)) {
|
||||
- if (name.compare(QLatin1String("8514oem"), Qt::CaseInsensitive) != 0) {
|
||||
+ if (name.compare(QLatin1String("8514oem"), Qt::CaseInsensitive) != 0
|
||||
+ && name.compare(QLatin1String("cursor.pcf"), Qt::CaseInsensitive) != 0)
|
||||
+ {
|
||||
fixedFamilyNames.append(name);
|
||||
}
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/cMake/FreeCAD_Helpers/SetupBoost.cmake b/cMake/FreeCAD_Helpers/SetupBoost.cmake
|
||||
index 0bb1343..1a389bf 100644
|
||||
--- a/cMake/FreeCAD_Helpers/SetupBoost.cmake
|
||||
+++ b/cMake/FreeCAD_Helpers/SetupBoost.cmake
|
||||
@@ -3,7 +3,7 @@ macro(SetupBoost)
|
||||
|
||||
set(_boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS})
|
||||
|
||||
- set (BOOST_COMPONENTS filesystem program_options regex system thread date_time)
|
||||
+ set (BOOST_COMPONENTS filesystem program_options regex thread date_time)
|
||||
find_package(Boost ${BOOST_MIN_VERSION}
|
||||
COMPONENTS ${BOOST_COMPONENTS} REQUIRED)
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
doxygen,
|
||||
eigen,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
fmt,
|
||||
gts,
|
||||
hdf5,
|
||||
@@ -15,6 +14,7 @@
|
||||
libspnav,
|
||||
libxmu,
|
||||
medfile,
|
||||
mpi,
|
||||
ninja,
|
||||
ode,
|
||||
opencascade-occt,
|
||||
@@ -55,13 +55,13 @@ in
|
||||
freecad-utils.makeCustomizable (
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "freecad";
|
||||
version = "1.0.2";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeCAD";
|
||||
repo = "FreeCAD";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-J//O/ABMFa3TFYwR0wc8d1UTA5iSFnEP2thOjuCN+uE=";
|
||||
hash = "sha256-knyc4Ts9dd12i0SsVDeoCs37jrMxekc07KBf3wJvNgk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -84,6 +84,7 @@ freecad-utils.makeCustomizable (
|
||||
libxmu
|
||||
libspnav
|
||||
medfile
|
||||
mpi
|
||||
ode
|
||||
xercesc
|
||||
yaml-cpp
|
||||
@@ -98,32 +99,11 @@ freecad-utils.makeCustomizable (
|
||||
]
|
||||
++ pythonDeps;
|
||||
|
||||
patches = [
|
||||
./0001-NIXOS-don-t-ignore-PYTHONPATH.patch
|
||||
./0002-FreeCad-OndselSolver-pkgconfig.patch
|
||||
|
||||
# https://github.com/FreeCAD/FreeCAD/pull/21710
|
||||
./0003-FreeCad-fix-font-load-crash.patch
|
||||
|
||||
# Fix build for boost 1.89 or later, remove once FreeCad 1.1 is released
|
||||
# based on https://github.com/FreeCAD/FreeCAD/commit/0f6d00d2a547df0f5c2ba5ef0f79044a49b0a2d
|
||||
./0004-FreeCad-fix-boost-189-build.patch
|
||||
|
||||
(fetchpatch {
|
||||
url = "https://github.com/FreeCAD/FreeCAD/commit/8e04c0a3dd9435df0c2dec813b17d02f7b723b19.patch?full_index=1";
|
||||
hash = "sha256-H6WbJFTY5/IqEdoi5N+7D4A6pVAmZR4D+SqDglwS18c=";
|
||||
})
|
||||
# Inform Coin to use EGL when on Wayland
|
||||
# https://github.com/FreeCAD/FreeCAD/pull/21917
|
||||
(fetchpatch {
|
||||
url = "https://github.com/FreeCAD/FreeCAD/commit/60aa5ff3730d77037ffad0c77ba96b99ef0c7df3.patch?full_index=1";
|
||||
hash = "sha256-K6PWQ1U+/fsjDuir7MiAKq71CAIHar3nKkO6TKYl32k=";
|
||||
})
|
||||
];
|
||||
patches = [ ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/Mod/Fem/femmesh/gmshtools.py \
|
||||
--replace-fail 'self.gmsh_bin = "gmsh"' 'self.gmsh_bin = "${lib.getExe gmsh}"'
|
||||
--replace-fail 'self.gmsh_bin = ""' 'self.gmsh_bin = "${lib.getExe gmsh}"'
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -80,13 +80,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "frr";
|
||||
version = "10.5.2";
|
||||
version = "10.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FRRouting";
|
||||
repo = "frr";
|
||||
rev = "frr-${finalAttrs.version}";
|
||||
hash = "sha256-/SO4KELX5NQzbkeoO6QIY6NMUI30ABTRqcAztIAv6/Y=";
|
||||
hash = "sha256-nVXoRApW8EZtP1HiGJ5JBJaoQXVISfPK2k+xmCtdVH0=";
|
||||
};
|
||||
|
||||
# Without the std explicitly set, we may run into abseil-cpp
|
||||
|
||||
@@ -2,11 +2,10 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromCodeberg,
|
||||
fetchpatch,
|
||||
makeWrapper,
|
||||
bash,
|
||||
|
||||
git,
|
||||
gitMinimal,
|
||||
nix-prefetch-git,
|
||||
rWrapper,
|
||||
rPackages,
|
||||
@@ -16,26 +15,15 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "git-unroll";
|
||||
version = "0-unstable-2025-08-14";
|
||||
version = "0-unstable-2026-03-25";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "gm6k";
|
||||
repo = "git-unroll";
|
||||
rev = "a66aad56af0440e1d6e807518af298264861b2c7";
|
||||
hash = "sha256-Mpc2p+W8PqQ6Os9AJJJwvL00a4cjFKBUTBG5bF+IzL4=";
|
||||
rev = "62fc6ff3fcb62b6972182d64b4f3710c2188c082";
|
||||
hash = "sha256-We3nbdZIxk27T2VXoKiwRTrBAZ2qoANpDpUXq+MgvbY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Discovered when bumping pytorch to 2.10.0
|
||||
# See https://github.com/NixOS/nixpkgs/pull/484881#issuecomment-3814200207
|
||||
# https://codeberg.org/gm6k/git-unroll/pulls/2
|
||||
(fetchpatch {
|
||||
name = "fix-name-decollision-for-multi-parent-submodules";
|
||||
url = "https://codeberg.org/glepage/git-unroll/commit/3a16e138a6c4bc9d8226f025fb53e281c80fc1ef.patch";
|
||||
hash = "sha256-mHDqpDh6aiQRDgfxeZs/ufa5Af0lDFDRGpSlmD1+kEo=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace unroll \
|
||||
--replace-fail "#! /usr/bin/env nix-shell" "#!/usr/bin/env bash" \
|
||||
@@ -60,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
wrapProgram $out/bin/unroll \
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
git
|
||||
gitMinimal
|
||||
nix-prefetch-git
|
||||
(rWrapper.override {
|
||||
packages = with rPackages; [
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
buildGo126Module (finalAttrs: {
|
||||
pname = "golangci-lint";
|
||||
version = "2.11.3";
|
||||
version = "2.11.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golangci";
|
||||
repo = "golangci-lint";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VD46VOSBzVeeJ86FYLEPTsy23MUQapDPPYiO3/Ki8Mw=";
|
||||
hash = "sha256-B19aLvfNRY9TOYw/71f2vpNUuSIz8OI4dL0ijGezsas=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-k/lsDC6thW3B1zcn+OXjSmwmiW8pm0HM+g/z+N3AQek=";
|
||||
vendorHash = "sha256-xuoj4+U4tB5gpABKq4Dbp2cxnljxdYoBbO8A7DqPM5E=";
|
||||
|
||||
subPackages = [ "cmd/golangci-lint" ];
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "golds";
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go101";
|
||||
repo = "golds";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6jtBwET3JSSh2DQq9MtLn2YokfK9ODYtYrcfI0W8m5I=";
|
||||
hash = "sha256-s4vzQ+ntty1XLe65sEBxxN+Amp162k40LmJ7AT2/26U=";
|
||||
};
|
||||
|
||||
# nixpkgs is not using the go distpack archive and missing a VERSION file in the source
|
||||
@@ -22,7 +22,7 @@ buildGoModule (finalAttrs: {
|
||||
# https://github.com/NixOS/nixpkgs/pull/358316#discussion_r1855322027
|
||||
patches = [ ./info_module-gover.patch ];
|
||||
|
||||
vendorHash = "sha256-CL9CdLGeMTxXazJUr2+syQYJZXafX6ARzmEOHn7l14I=";
|
||||
vendorHash = "sha256-qG6QeoIC6O+DzDTaKqtBIGaoG1jeyvNmcYFi/BVkPX0=";
|
||||
|
||||
ldflags = [ "-s" ];
|
||||
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "harlequin";
|
||||
version = "2.5.1";
|
||||
version = "2.5.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tconbeer";
|
||||
repo = "harlequin";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-hy72GgugzNRXqxlN0MAWrjfSUY1FZv2O5aa2494hInY=";
|
||||
hash = "sha256-ea8fR+tsur/tIQwfUS88HvjCADv8VgEjHD7JnR44Twk=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -3,12 +3,8 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
pkg-config,
|
||||
makeWrapper,
|
||||
udev,
|
||||
systemd,
|
||||
btrfs-progs,
|
||||
cloud-utils,
|
||||
cryptsetup,
|
||||
e2fsprogs,
|
||||
util-linux,
|
||||
@@ -19,38 +15,28 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "hot-resize";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "liberodark";
|
||||
repo = "hot-resize";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-sfiXy0PPIYSJub8dohzpUJMJ2ul/fglth7qd8paJKEo=";
|
||||
hash = "sha256-8UA5Wv96PUerBRTwTwkSAv1iw6lt9nd4MXGdKUmxoz4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-mVCL4tLY+JqJDn8+0PTtStd+rD2VzQoAEtlikIe1K9Q=";
|
||||
cargoHash = "sha256-uGMd9xZRYbCJyHkUZXvUnN3M5N1FTaROfoww+oODAHE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
udev
|
||||
systemd.dev
|
||||
];
|
||||
|
||||
env.PKG_CONFIG_PATH = "${systemd.dev}/lib/pkgconfig";
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/hot-resize \
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
btrfs-progs
|
||||
cloud-utils
|
||||
cryptsetup
|
||||
e2fsprogs
|
||||
udev
|
||||
util-linux
|
||||
xfsprogs
|
||||
]
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "hugo";
|
||||
version = "0.158.0";
|
||||
version = "0.159.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = "hugo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7/zrJdoJVDVHt/2qKPkfrxjxMMpB2F2i0fCXZLkd7gw=";
|
||||
hash = "sha256-R+XUgATk6KHaQ+hTIbFSHEzC0VIzaVLna0mMGDRZILw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-StGdZ1FP6906jFbqoYQgrbEOx1YPCsqE+01ITQgtaEU=";
|
||||
vendorHash = "sha256-qAZ+EnU1Yaom8QHjaMoAJSaN7HslNpwifmBMlgnmmAE=";
|
||||
|
||||
checkFlags =
|
||||
let
|
||||
@@ -87,6 +87,7 @@ buildGoModule (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
Frostman
|
||||
savtrip
|
||||
miniharinn
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,38 +1,26 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
nodejs_22,
|
||||
cacert,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "inshellisense";
|
||||
version = "0.0.1-rc.21";
|
||||
version = "0.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "inshellisense";
|
||||
tag = version;
|
||||
hash = "sha256-zERwrvioPwGm/351kYuK9S3uOrrzs/6OFPRdNSSr7Tc=";
|
||||
hash = "sha256-X+M4uqWdk5gQvjhqc3tVDOgeI12FpBvsfx8+pO7CHcA=";
|
||||
};
|
||||
|
||||
# Building against nodejs-24 is not yet supported by upstream.
|
||||
# https://github.com/microsoft/inshellisense/issues/369
|
||||
nodejs = nodejs_22;
|
||||
|
||||
npmDepsHash = "sha256-iD5SvkVbrHh0Hx44y6VtNerwBA8K7vSe/yfvhgndMEw=";
|
||||
|
||||
# Needed for dependency `@homebridge/node-pty-prebuilt-multiarch`
|
||||
# On Darwin systems the build fails with,
|
||||
#
|
||||
# npm ERR! ../src/unix/pty.cc:413:13: error: use of undeclared identifier 'openpty'
|
||||
# npm ERR! int ret = openpty(&master, &slave, nullptr, NULL, static_cast<winsi ze*>(&winp));
|
||||
#
|
||||
# when `node-gyp` tries to build the dep. The below allows `npm` to download the prebuilt binary.
|
||||
makeCacheWritable = stdenv.hostPlatform.isDarwin;
|
||||
nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin cacert;
|
||||
npmDepsHash = "sha256-670oGCuZhDLKe48hFL+gLMjmHM5YLGEawonG8PZTXpU=";
|
||||
|
||||
meta = {
|
||||
description = "IDE style command line auto complete";
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kubectx";
|
||||
version = "0.10.0";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ahmetb";
|
||||
repo = "kubectx";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-LgZz/fRpIf/D3WmRic/P8O+wOrgKbDyAyBWzdOxXjKQ=";
|
||||
hash = "sha256-rbfdqksNqWv2evrCl+2jMft2wBo7iWJoLvCABl1MUgk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BbGXJM1RMn7dgd8aaaGxRkqgs398rwpONWUcCcWNZow=";
|
||||
vendorHash = "sha256-6bzTLnT69IdLwgbz/zZhjQYm8WpimJlItutW6fvwACs=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -34,6 +34,9 @@ buildGoModule (finalAttrs: {
|
||||
description = "Fast way to switch between clusters and namespaces in kubectl";
|
||||
license = lib.licenses.asl20;
|
||||
homepage = "https://github.com/ahmetb/kubectx";
|
||||
maintainers = with lib.maintainers; [ jlesquembre ];
|
||||
maintainers = with lib.maintainers; [
|
||||
jlesquembre
|
||||
miniharinn
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libzim";
|
||||
version = "9.5.0";
|
||||
version = "9.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openzim";
|
||||
repo = "libzim";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-YeskvTtwibKQxMY4c6yEHW+EmXUq4AXpd5XLxKfsmXg=";
|
||||
hash = "sha256-8U8e2XFEz8qTPkvX3NesT+qYB1IW6s6ZytlbCFnZ8WQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "littlefs-fuse";
|
||||
version = "2.7.14";
|
||||
version = "2.7.15";
|
||||
src = fetchFromGitHub {
|
||||
owner = "littlefs-project";
|
||||
repo = "littlefs-fuse";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-TWvBEoH4YvK4Jdg+QAMyskBUYhCWnmdtEoVXwoKJqIo=";
|
||||
hash = "sha256-01jVoKxctHy53A/dCTNeteoQD21f6TYkEFLob2wfGoM=";
|
||||
};
|
||||
buildInputs = [ fuse ];
|
||||
installPhase = ''
|
||||
|
||||
@@ -18,21 +18,21 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "matrix-authentication-service";
|
||||
version = "1.13.0";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "element-hq";
|
||||
repo = "matrix-authentication-service";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fG38JMOQY988b6l7lPSf5rCu52ZdgcOd3edxB5TJR2E=";
|
||||
hash = "sha256-/13RYd5p46eM2rX5y9bPzHB63zCeZ2NbLDqTnk3+Vn8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-AOWtPElfn3T88LxgcWpLTLOIzoGhMPZBCjeWp61T7Fo=";
|
||||
cargoHash = "sha256-eNmD/O7t2YykGlVqovBxi/DKPQ2W2mxxCOaMBzqhTZo=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
|
||||
src = "${finalAttrs.src}/${finalAttrs.npmRoot}";
|
||||
hash = "sha256-aneS64awfjhkUpkVWNmzVPb5kshrONVvUnom7rxdU1k=";
|
||||
hash = "sha256-lWFJEjTVHMkmFnfjjIDtE/T3nw4qF3IJhUayfFVLPQo=";
|
||||
};
|
||||
|
||||
npmRoot = "frontend";
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mollysocket";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mollyim";
|
||||
repo = "mollysocket";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-AmbhTjf1KhDc6Y0yrXKzL6gPMJ9Wx8e8HqdbBHr7/cY=";
|
||||
hash = "sha256-QtyFIN04t4XuZfgTja14YAJmYqfZNDh1Dygv2QlXyxY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/WUcaGrIQvPXrcOvSpEGR6mCiey1ULWcLpXzcpvEh7E=";
|
||||
cargoHash = "sha256-CBRVFWr3FUy+aRT/xU9nbu8bvf0565jGkvSO1E8+1UI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "12.52";
|
||||
version = "12.60";
|
||||
pname = "monkeys-audio";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
|
||||
hash = "sha256-dUEnmTETQ6tBCIxp+GgTIOZJHTtvDmUFRcqxljh0OeY=";
|
||||
hash = "sha256-vlxXAyo0dMwkyr7SE/JWgUr0ANDhWCm4zg2i/p+GlSc=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "nix-your-shell";
|
||||
version = "1.4.9";
|
||||
version = "1.4.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MercuryTechnologies";
|
||||
repo = "nix-your-shell";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mpgVlM3mFbjugEcWyhayEwSQvgj64jlAiy/RLgSTlyw=";
|
||||
hash = "sha256-u94lxsvJrvpKitDDVCoolqHyZMfnQTGtyBwlCegv7Ro=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ReK85FRyl+4Epr11XsIiPUR3wFl6/HJ5MmYDX9Impes=";
|
||||
cargoHash = "sha256-SyWD5TJbCxrFtAV2W4XcO1Rnfp3Ygab66UDBFDuSzJk=";
|
||||
|
||||
passthru = {
|
||||
generate-config =
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
# runtime deps
|
||||
bluez,
|
||||
brightnessctl,
|
||||
cava,
|
||||
cliphist,
|
||||
ddcutil,
|
||||
wlsunset,
|
||||
@@ -33,7 +32,6 @@
|
||||
|
||||
bluetoothSupport ? true,
|
||||
brightnessctlSupport ? true,
|
||||
cavaSupport ? true,
|
||||
cliphistSupport ? true,
|
||||
ddcutilSupport ? true,
|
||||
wlsunsetSupport ? true,
|
||||
@@ -51,7 +49,6 @@ let
|
||||
]
|
||||
++ lib.optional bluetoothSupport bluez
|
||||
++ lib.optional brightnessctlSupport brightnessctl
|
||||
++ lib.optional cavaSupport cava
|
||||
++ lib.optional cliphistSupport cliphist
|
||||
++ lib.optional ddcutilSupport ddcutil
|
||||
++ lib.optional wlsunsetSupport wlsunset
|
||||
@@ -71,13 +68,13 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "noctalia-shell";
|
||||
version = "4.6.7";
|
||||
version = "4.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "noctalia-dev";
|
||||
repo = "noctalia-shell";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6fuxf185uga/AaeFgN6VUygGE8bUEkzZSA1UQ1FFes4=";
|
||||
hash = "sha256-h5jMVGjgrfVPufMG3AMj/HGfU/EqU/4WEK7HCKhMN2E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nsc";
|
||||
version = "2.12.0";
|
||||
version = "2.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nats-io";
|
||||
repo = "nsc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ct2InMPpqbtFeKtarWXGuPiXS2OD78w2sX0BoFiCl0c=";
|
||||
hash = "sha256-PTwdZ33GcqHmqpPu29S4MESjGiHHiIUnVOxufmXJX+U=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@@ -24,7 +24,7 @@ buildGoModule rec {
|
||||
"-X main.builtBy=nixpkgs"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-0tJHK999AjtKYUB0gC5SlQPqit6UTyGsbb6vC7KdQQc=";
|
||||
vendorHash = "sha256-fjMQMHwkAzUecyM7iqcMFwD93Trkfa0cQhCOPczXlXk=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -47,7 +47,7 @@ buildGoModule rec {
|
||||
# the test strips table formatting from the command output in a naive way
|
||||
# that removes all the table characters, including '-'.
|
||||
# The nix build directory looks something like:
|
||||
# /private/tmp/nix-build-nsc-2.12.0.drv-0/nsc_test2000598938/keys
|
||||
# /private/tmp/nix-build-nsc-2.12.1.drv-0/nsc_test2000598938/keys
|
||||
# Then the `-` are removed from the path unintentionally and the test fails.
|
||||
# This should be fixed upstream to avoid mangling the path when
|
||||
# removing the table decorations from the command output.
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "okteto";
|
||||
version = "3.16.0";
|
||||
version = "3.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okteto";
|
||||
repo = "okteto";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-wAtZPn8Ew525c9q0aaUuoGt8+clBeojfSPQtVRV77/k=";
|
||||
hash = "sha256-GtQZXq2D6P6opNB7W8Z/YcF+5arADcUQ6AvfpsOfObE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-++VV4quQnzgJ7NThzyqxEeCZAxFJcNwNIrRT0GyPF/Q=";
|
||||
vendorHash = "sha256-/0/Y6hYX1GG7bQgCGICSVEjIcnySctk4j0j39JYFHMw=";
|
||||
|
||||
postPatch = ''
|
||||
# Disable some tests that need file system & network access.
|
||||
@@ -32,6 +32,7 @@ buildGoModule (finalAttrs: {
|
||||
excludedPackages = [
|
||||
"integration"
|
||||
"samples"
|
||||
"tools"
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
buildGoModule,
|
||||
installShellFiles,
|
||||
versionCheckHook,
|
||||
@@ -15,16 +14,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "openbao";
|
||||
version = "2.5.1";
|
||||
version = "2.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openbao";
|
||||
repo = "openbao";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-pVFsyNg9ccSFAdHb/fjeVoMBh1nKcjwcFfVBBqFalIo=";
|
||||
hash = "sha256-fqsCQf9wFlzMWC4XV1BclWlYG649VhhZBKlGrdsbqKc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8F8HCbpk8st1o/64Y442lzzFXBnCs+mEYREYcj/s5KI=";
|
||||
vendorHash = "sha256-0L+0U4tM7/ObNjXcSZcvIw7Y/RwYs2iRsLA2zSYmexU=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
@@ -39,15 +38,6 @@ buildGoModule (finalAttrs: {
|
||||
"-X github.com/openbao/openbao/version.buildDate=1970-01-01T00:00:00Z"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Fixes interactive CLI usage that needs stty https://github.com/openbao/openbao/pull/2535
|
||||
(fetchpatch2 {
|
||||
name = "pr2535-fix-interactive-cli.patch";
|
||||
url = "https://github.com/openbao/openbao/commit/e3fec111e3f6fd543c79c08f46d2256cd93f78e7.patch?full_index=1";
|
||||
hash = "sha256-ixpWKfVT1dPAjF7RKS2tBpAr1YAqNkvf4/L7Be/C8Es=";
|
||||
})
|
||||
];
|
||||
|
||||
postConfigure = lib.optionalString withUi ''
|
||||
cp -r --no-preserve=mode ${finalAttrs.passthru.ui} http/web_ui
|
||||
'';
|
||||
|
||||
@@ -1,27 +1,35 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
pkg-config,
|
||||
cargo-tauri,
|
||||
bun,
|
||||
nodejs,
|
||||
cargo,
|
||||
rustc,
|
||||
jq,
|
||||
wrapGAppsHook4,
|
||||
makeWrapper,
|
||||
cargo-tauri,
|
||||
dbus,
|
||||
glib,
|
||||
gtk3,
|
||||
libsoup_3,
|
||||
librsvg,
|
||||
libappindicator-gtk3,
|
||||
glib-networking,
|
||||
openssl,
|
||||
webkitgtk_4_1,
|
||||
gst_all_1,
|
||||
gtk3,
|
||||
jq,
|
||||
lib,
|
||||
libappindicator-gtk3,
|
||||
librsvg,
|
||||
libsoup_3,
|
||||
makeBinaryWrapper,
|
||||
nodejs,
|
||||
opencode,
|
||||
openssl,
|
||||
pkg-config,
|
||||
rustPlatform,
|
||||
rustc,
|
||||
stdenvNoCC,
|
||||
webkitgtk_4_1,
|
||||
wrapGAppsHook4,
|
||||
}:
|
||||
|
||||
let
|
||||
gtk = gtk3;
|
||||
libappindicator-gtk = libappindicator-gtk3;
|
||||
libsoup = libsoup_3;
|
||||
webkitgtk = webkitgtk_4_1;
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "opencode-desktop";
|
||||
inherit (opencode)
|
||||
@@ -43,23 +51,28 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
cargo
|
||||
rustc
|
||||
jq
|
||||
makeWrapper
|
||||
makeBinaryWrapper
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook4 ];
|
||||
++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ wrapGAppsHook4 ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [
|
||||
dbus
|
||||
glib
|
||||
gtk3
|
||||
libsoup_3
|
||||
librsvg
|
||||
libappindicator-gtk3
|
||||
glib-networking
|
||||
openssl
|
||||
webkitgtk_4_1
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
buildInputs = (
|
||||
lib.optionals stdenvNoCC.isLinux [
|
||||
dbus
|
||||
glib
|
||||
glib-networking
|
||||
gtk
|
||||
libappindicator-gtk
|
||||
librsvg
|
||||
libsoup
|
||||
openssl
|
||||
webkitgtk
|
||||
]
|
||||
++ (with gst_all_1; [
|
||||
gst-plugins-bad # fakevideosink
|
||||
gst-plugins-base # appsink and autoaudiosink
|
||||
gst-plugins-good # autoaudiosink
|
||||
])
|
||||
);
|
||||
|
||||
tauriBuildFlags = [
|
||||
"--config"
|
||||
@@ -72,26 +85,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
preBuild = ''
|
||||
cp -a ${finalAttrs.node_modules}/{node_modules,packages} .
|
||||
chmod -R u+w node_modules packages
|
||||
patchShebangs node_modules
|
||||
patchShebangs packages/desktop/node_modules
|
||||
|
||||
mkdir -p packages/desktop/src-tauri/sidecars
|
||||
cp ${opencode}/bin/opencode packages/desktop/src-tauri/sidecars/opencode-cli-${stdenv.hostPlatform.rust.rustcTarget}
|
||||
patchShebangs node_modules packages/desktop/node_modules
|
||||
install -D ${lib.getExe opencode} \
|
||||
packages/desktop/src-tauri/sidecars/opencode-cli-${stdenvNoCC.hostPlatform.rust.rustcTarget}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "AI coding agent desktop client";
|
||||
homepage = "https://opencode.ai";
|
||||
inherit (opencode.meta) platforms;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
xiaoxiangmoe
|
||||
];
|
||||
mainProgram = "OpenCode";
|
||||
platforms = [
|
||||
"aarch64-linux"
|
||||
"x86_64-linux"
|
||||
"aarch64-darwin"
|
||||
"x86_64-darwin"
|
||||
];
|
||||
maintainers = with lib.maintainers; [ xiaoxiangmoe ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "proton-pass-cli";
|
||||
version = "1.6.1";
|
||||
version = "1.8.0";
|
||||
|
||||
src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system};
|
||||
|
||||
@@ -46,19 +46,19 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sources = {
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-aarch64";
|
||||
hash = "sha256-xEqD5ET6bi1mr9RscWJ4V2uBRNrjzd08fBet9OCm28I=";
|
||||
hash = "sha256-6kFY7cLN/xCez4aeprV4HllPxxTECiV2jI475izsrI8=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-aarch64";
|
||||
hash = "sha256-vmily9b6ukkdRDbnKHRyssn3bvRFhdzxDyYPqIMESs8=";
|
||||
hash = "sha256-t3AyOLF0mXh9eCxBOh3e8WPBPowv9pWZ2WQTCTl+StA=";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-x86_64";
|
||||
hash = "sha256-zKBrZYLJpYKF5x2I3pNMtETWtVH9Mqy77or7aBG3sAg=";
|
||||
hash = "sha256-f8P0Pv4DUJPlcF4qPmqlLEHFfRYkLrxmPIgakUFYZlk=";
|
||||
};
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-x86_64";
|
||||
hash = "sha256-u/S6AVt9N9GUzYSBZJAxqzxNXFTLNttffqLAW3yNKL8=";
|
||||
hash = "sha256-M7zWxVYHHjM86/l3K+0AR8QceiydP0n0sXj9rSctaeI=";
|
||||
};
|
||||
};
|
||||
updateScript = writeShellScript "update-proton-pass-cli" ''
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "qobuz-player";
|
||||
version = "0.7.4";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SofusA";
|
||||
repo = "qobuz-player";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1y4VvrxcUOCqOOcMgBuf7VsZ4CZTpF/3TQiVyZPZpcE=";
|
||||
hash = "sha256-qAGaosIsS7IodzIJL/7kd5MNC/CW2fY7iYD6CrYSdmw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uOQflE3dYNOrpcg1W23MN7t8CW+3h4Z3Vp00LxBP0pk=";
|
||||
cargoHash = "sha256-428sWFx+DYyf8RrsY6hzytGmtmO7lmIJIoS2TfnGoh4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "rain";
|
||||
version = "1.24.2";
|
||||
version = "1.24.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws-cloudformation";
|
||||
repo = "rain";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-xCozToZJRJvebS9H5NH6rHQprgTM3cy0cssJNh9AQmI=";
|
||||
sha256 = "sha256-bLFElIc4bptxnKfboBU9r1jf1K9EV8f4iPQ7+7gEj4U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Egh7NzjHHgQATezlqFOk6FjUwhvtM0MJqCUJTDeHZG0=";
|
||||
vendorHash = "sha256-uFDgNoQxEQHENWj+zks0KNjb4inBx3KunJOqe78pGR8=";
|
||||
|
||||
subPackages = [ "cmd/rain" ];
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
pkgsStatic,
|
||||
byacc,
|
||||
ed,
|
||||
@@ -44,6 +45,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"man"
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/rakitzis/rc/commit/2bab312ea11cb77d2654a731357842971c0b5d18.patch";
|
||||
hash = "sha256-LpnrsvJH/0CRS0bCgoZT2Dkac6AZH8DZIPU4MQ5MP0I=";
|
||||
})
|
||||
];
|
||||
|
||||
# TODO: think on a less ugly fixup
|
||||
postPatch = ''
|
||||
ed -v -s Makefile << EOS
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
poppler,
|
||||
python3,
|
||||
rustPlatform,
|
||||
rustc,
|
||||
@@ -25,20 +24,20 @@
|
||||
wrapGAppsHook4,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rnote";
|
||||
version = "0.13.1";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flxzt";
|
||||
repo = "rnote";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-EMxA5QqmIae/d3nUpwKjgURo0nOyaNbma8poB5mcQW0=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-bNe9PW7hkSmdU6HTDwD7bMbHZFs8fRDrIEC9f6xjliI=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-fr1bDTzTKx7TLBqw94CyaB0/Jo2x1BzZcM6dcen1PHc=";
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-15TOc+X0E/uGVUfgIOM6pEIp2LZUmDrM7BRzdbLarbc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -71,7 +70,6 @@ stdenv.mkDerivation rec {
|
||||
gtk4
|
||||
libadwaita
|
||||
libxml2
|
||||
poppler
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
alsa-lib
|
||||
@@ -88,7 +86,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/flxzt/rnote";
|
||||
changelog = "https://github.com/flxzt/rnote/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/flxzt/rnote/releases/tag/${finalAttrs.src.tag}";
|
||||
description = "Simple drawing application to create handwritten notes";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
@@ -98,4 +96,4 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rocksdb";
|
||||
version = "10.9.1";
|
||||
version = "10.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "rocksdb";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-AdYt97tcZdj4Kyq0mGl+JreOybKn04tSVvdyaFQWuy4=";
|
||||
hash = "sha256-gszW+YY8ZZ7cRVCIXuahGopqqswNRnagZLUYYmRxzGY=";
|
||||
};
|
||||
|
||||
patches = lib.optional (
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rsshub";
|
||||
version = "0-unstable-2026-03-16";
|
||||
version = "0-unstable-2026-03-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DIYgod";
|
||||
repo = "RSSHub";
|
||||
rev = "85b5444d07ed23e1e7e57511ed65d028bcab71eb";
|
||||
hash = "sha256-CMcKIXqchbBzE8ENehPDt/F4BErTsYHCnWJObImTkLc=";
|
||||
rev = "df6b73d8663c0ba4c11bae89a61cf0b87c8c52a5";
|
||||
hash = "sha256-6YasIbThh5S7UH7WFVEdl++96hL3BEmxdp/QAAzIm18=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-wjCPiw+DMcqP6qEc0V9sA1vM5uZbz+sNyMGbGwjt9JY=";
|
||||
hash = "sha256-uzPDx48dWAguQ3PolTWz0HDtnO6qBVlKpJRn+ub7mM0=";
|
||||
pnpm = pnpm_10;
|
||||
};
|
||||
|
||||
|
||||
@@ -12,18 +12,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rtk";
|
||||
version = "0.31.0";
|
||||
version = "0.33.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rtk-ai";
|
||||
repo = "rtk";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-p4OX3SSDGKlHVLIWhgKpcme449wOHbfWbc3mxlCkaMI=";
|
||||
hash = "sha256-QkAtxSpMyjbscQgSUWks0aIkWaAYXgY6c9qM3sdPN+0=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
cargoHash = "sha256-37YHhccgPNUrlFh35CoQv2H+Y4e41ax0ZoIvrIC0o6I=";
|
||||
cargoHash = "sha256-Fz3P43sRl2DnzZtQrNzWk9XivGDiuNyt9+PBdkhLBkQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "seadrive-fuse";
|
||||
version = "3.0.18";
|
||||
version = "3.0.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "haiwen";
|
||||
repo = "seadrive-fuse";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-oMi297ORIKdJhuYOvazJ+oSVCwRAqvjy0pc+lyBq5oQ=";
|
||||
hash = "sha256-SAosWgcqxK99leKGYJ7F8zuraOiBz49/AJjTQ/PeEwQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,23 +14,23 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "libsignal-node";
|
||||
version = "0.88.2";
|
||||
version = "0.89.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalapp";
|
||||
repo = "libsignal";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-hHBxHvAaJ3clCjFwKbyavO1ixe9k8DLdEa5+2AWy+Kk=";
|
||||
hash = "sha256-eYeRlyKtTxPT1tpmuEsFrXNnp1F+l/PJcxpUDblCL60=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wV9gKdxOcgW1M/cEbRhre9ReDBX+TgQbxVBw1cVZwGY=";
|
||||
cargoHash = "sha256-7kLqrU/yD0aeeULpuh8EgZvmKo1c3Wuwe+9vEm8sFT8=";
|
||||
|
||||
npmRoot = "node";
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-npm-deps";
|
||||
inherit (finalAttrs) version src;
|
||||
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
|
||||
hash = "sha256-lAS45lXz8gAI96Nge1RdF4zPuOz/Z/8L1EMgob1lUZU=";
|
||||
hash = "sha256-SZJIj5uBB6EZEACC44IpGvDTQuQIDgqmLGkgRbtUwOc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -55,13 +55,13 @@ let
|
||||
'';
|
||||
});
|
||||
|
||||
version = "8.3.0";
|
||||
version = "8.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalapp";
|
||||
repo = "Signal-Desktop";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-udwV9xmNI2FYqE5i2aP6NQWaXUVLWMV1NODBRhkAkRo=";
|
||||
hash = "sha256-QUBeScKGlDQAZ4F08DD/DuxeT0Hut3MmuswsjGsy+Q0=";
|
||||
};
|
||||
|
||||
sticker-creator = stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -163,15 +163,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
fetcherVersion = 3;
|
||||
hash =
|
||||
if withAppleEmojis then
|
||||
"sha256-A43ZOqLffaMiVvVlX0s7bsdz8qM1LiQuJ0Ka8x5B3OQ="
|
||||
"sha256-QaYUL5/JcXqd564CFAR+4EMMG38h8a1dpls054iWDzU="
|
||||
else
|
||||
"sha256-O5k7k2WbsSI1BEzrAkrtQX9ZMxP6oekllA+5wF0FCHQ=";
|
||||
"sha256-NEUKdRT0aVznkXTZOJJ8TCUhidhTAiDdBxoukKvt4qs=";
|
||||
};
|
||||
|
||||
env = {
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
SIGNAL_ENV = "production";
|
||||
SOURCE_DATE_EPOCH = 1773926124;
|
||||
SOURCE_DATE_EPOCH = 1774459818;
|
||||
}
|
||||
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
# Disable code signing during local macOS builds.
|
||||
|
||||
@@ -19,16 +19,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ringrtc";
|
||||
version = "2.65.3";
|
||||
version = "2.67.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalapp";
|
||||
repo = "ringrtc";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rdCEwaGlWXj4H4uz+NJYgmvJXdHjDMGQMY22gUIosh0=";
|
||||
hash = "sha256-jwLJVq3lkb7HtVigji/1ZKnyaIxyCj+fWCsKe9CjCCM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-FnjratJF6MDmZibSt8+5ysjPuOlbau2fI6uWDLCuyPg=";
|
||||
cargoHash = "sha256-X/y2923IBF+ajTyjM4SX9FvkAFiyCYSGnVRYHGKgHko=";
|
||||
|
||||
preConfigure = ''
|
||||
# Check for matching webrtc version
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "node-sqlcipher";
|
||||
version = "2.4.4";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalapp";
|
||||
repo = "node-sqlcipher";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-70kObW6jYzaquMrj20VMTQg/rDWqIu8o2/m7S3mUZB8=";
|
||||
hash = "sha256-lkSQXiplkY5sBpHsAhW4odWe+MCalAo100EL7h4VKbg=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"src": {
|
||||
"args": {
|
||||
"hash": "sha256-1XnmNuqUVx+jpwFO1zj7TGb97IhGHQcBE6/WIjWgpK8=",
|
||||
"hash": "sha256-Q5o9fezL7E2J6rn3YxHTtrImCkMTFQL6H+T12d1QOik=",
|
||||
"owner": "signalapp",
|
||||
"repo": "webrtc",
|
||||
"tag": "7444g"
|
||||
"tag": "7444h"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "zed";
|
||||
version = "0.35.0";
|
||||
version = "0.36.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "authzed";
|
||||
repo = "zed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DeqfzI5+UPsR358QnummTp/cYCr2bIotB2tB/NYYd1M=";
|
||||
hash = "sha256-n5qHfjckTNNry8L2lJV8RBjTnAknwZGPg9E0R/1VLdQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-LnmY5GikIHgOBi0hWO5B5FyBymKSZZQMK5VnDj5Ge84=";
|
||||
vendorHash = "sha256-eNC8sGjVjL+QRnqXBFzdyfTxd3IZdj6JodGmDDV4nUA=";
|
||||
|
||||
ldflags = [ "-X 'github.com/jzelinskie/cobrautil/v2.Version=${finalAttrs.src.tag}'" ];
|
||||
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/response.rs b/src/response.rs
|
||||
index 25da3d3..92d6203 100644
|
||||
--- a/src/response.rs
|
||||
+++ b/src/response.rs
|
||||
@@ -42,7 +42,7 @@ pub(crate) fn response_body(
|
||||
let modified = meta
|
||||
.modified()
|
||||
.ok()
|
||||
- .filter(|&t| t != std::time::UNIX_EPOCH)
|
||||
+ .filter(|&t| t > (std::time::UNIX_EPOCH + std::time::Duration::from_secs(1)))
|
||||
.map(LastModified::from);
|
||||
|
||||
match conditionals.check(modified) {
|
||||
@@ -18,9 +18,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
cargoHash = "sha256-rNrGlgUvPezX7RnKhprRjl9DiJ/Crt4phmxnfY9tNXA=";
|
||||
|
||||
# Some tests rely on timestamps newer than 18 Nov 1974 00:00:00
|
||||
preCheck = ''
|
||||
find docker/public -exec touch -m {} \;
|
||||
# static-web-server already has special handling for files with modification
|
||||
# time = unix epoch, but the nix store is unix epoch + 1 second.
|
||||
patches = [ ./include-unix-time-plus-one.diff ];
|
||||
|
||||
# Some tests which implicitly relied on the above behavior now break. Force
|
||||
# an mtime update to fix.
|
||||
postUnpack = ''
|
||||
find . -exec touch -m {} +
|
||||
'';
|
||||
|
||||
# Need to copy in the systemd units for systemd.packages to discover them
|
||||
|
||||
@@ -122,13 +122,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "strongswan";
|
||||
version = "6.0.4"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading!
|
||||
version = "6.0.5"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading!
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "strongswan";
|
||||
repo = "strongswan";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-KRfEH7puwn+PgQvOrkTEowPnGzCtXdsUqg7wBNMypkQ=";
|
||||
hash = "sha256-AB0PNy5UIPb5Pwois9APhyQxDPd55mnwYdhpkKpV+uM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -192,7 +192,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
description = "OpenSource IPsec-based VPN solution";
|
||||
homepage = "https://www.strongswan.org/";
|
||||
changelog = "https://github.com/strongswan/strongswan/blob/${finalAttrs.src.rev}/ChangeLog";
|
||||
changelog = "https://github.com/strongswan/strongswan/blob/${finalAttrs.src.rev}/NEWS";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ nickcao ];
|
||||
mainProgram = "swanctl";
|
||||
|
||||
@@ -16,14 +16,14 @@ let
|
||||
in
|
||||
pythonPackages.buildPythonApplication (finalAttrs: {
|
||||
pname = "tclint";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nmoroze";
|
||||
repo = "tclint";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GkWQlOmPh/IpkdcNKkaHJoVDD2r5wCSFeMZA96dxiXM=";
|
||||
hash = "sha256-HEmNdDq8xeGHCLJRvGGa13KaX7iLyyNkv3nYcJsZjrw=";
|
||||
};
|
||||
|
||||
build-system = with pythonPackages; [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "terraform-ls";
|
||||
version = "0.38.5";
|
||||
version = "0.38.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "terraform-ls";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-sMYOdd7+fut6Rko4jcaITfT7YdXoRzWsfWsOBvKoBhY=";
|
||||
hash = "sha256-pIZoTAWl6J2z/BHxrpyVjhyA54v9vM8r1Q1eCmBvUZs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qN09XAkk8cvzsXxr0v7ttlChhqMWBTawQ6PQlpxJWK4=";
|
||||
vendorHash = "sha256-MMmL/1yHMzNZSXmMVGawrhIi4fIluBgozWFMuiFEoBs=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "tkey-ssh-agent";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tillitis";
|
||||
repo = "tkey-ssh-agent";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-VwhWIQ+ZTwYD3NwxCImrtK49+i31Cc7xBjx5Cxvm+PA=";
|
||||
hash = "sha256-ndS9eNxhZTCxaxEF/J3FzIA8xtlVdbm9q9W1I9lC8+k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/lSC2+TjG2Ps9t8BbcgXIFWeFykszJM3hr2DqSrnkO8=";
|
||||
vendorHash = "sha256-+JTGgiCLvJsju3gbqbid6TZCfSgjPySfeaEtiyuTlWM=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/tkey-ssh-agent"
|
||||
|
||||
@@ -15,12 +15,12 @@
|
||||
|
||||
let
|
||||
executableName = "vikunja-desktop";
|
||||
version = "2.2.0";
|
||||
version = "2.2.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-vikunja";
|
||||
repo = "vikunja";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QmFuPKbhPX+pgUPmeUglmg2OvqBRpeeA9Xz0l1tscfM=";
|
||||
hash = "sha256-+Tqo9z+QXzcYNWZl+DoHaClkMokTa6a2S1FlazZBDyI=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
@@ -14,12 +14,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.2.0";
|
||||
version = "2.2.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-vikunja";
|
||||
repo = "vikunja";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QmFuPKbhPX+pgUPmeUglmg2OvqBRpeeA9Xz0l1tscfM=";
|
||||
hash = "sha256-+Tqo9z+QXzcYNWZl+DoHaClkMokTa6a2S1FlazZBDyI=";
|
||||
};
|
||||
|
||||
frontend = stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -37,7 +37,7 @@ let
|
||||
;
|
||||
pnpm = pnpm_10_29_2;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-5eTw3W5cmdD8dEfZyJ+2cUBMbkPhF1S5gJMEojJYV2w=";
|
||||
hash = "sha256-M1bAP9FRrMQ9TggQaXx3+PCZMTPvIxF9QVO0gKr1Irg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "virtnbdbackup";
|
||||
version = "2.45";
|
||||
version = "2.46";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abbbi";
|
||||
repo = "virtnbdbackup";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lX0zXNSwSOeNZSL+6UScxKK5zg3kQ91zRDA+wDSiu6Q=";
|
||||
hash = "sha256-4UETKb0GSsX1etbj69bcI+hFzd7q4qFVyd6JE+KoCwk=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -11,19 +11,19 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vue-language-server";
|
||||
version = "3.2.5";
|
||||
version = "3.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vuejs";
|
||||
repo = "language-tools";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-WvxZz3Rtv1AWWVJjPiUaddoyBQXUsnucg/QXCKtNXbk=";
|
||||
hash = "sha256-Igy7Tc2rWbLX7jeuQm8MYbgeKfPYA1a92E8B11CrUyo=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-rc0oq+dujIhCa+axSj5RjXsHKzh5BCpNAJ6w1vnCtt8=";
|
||||
hash = "sha256-unlZBLcDGP6laU2smtOP+hVrvp8HDPBqEk3MmmhO8sE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "vuls";
|
||||
version = "0.37.0";
|
||||
version = "0.38.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "future-architect";
|
||||
repo = "vuls";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BkFFFo0+5f2OmxlleUaqsoX8gesytXGHuSwLTnTJnV0=";
|
||||
hash = "sha256-DY2woiaA6RisbOmHMoIr3sLn2kEccru58LGtST/iY3E=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fyuY0GbdZpBw7nbPIZqLakRwOCHQLaEeuihtkIGOzzU=";
|
||||
vendorHash = "sha256-s2N6MCcqMfwjW095iwOv8hHcrB6NC6XSkrtdSGWq8bE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
pkg-config,
|
||||
}:
|
||||
let
|
||||
version = "1.24.56";
|
||||
version = "1.24.62";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "websurfx";
|
||||
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
|
||||
owner = "neon-mmd";
|
||||
repo = "websurfx";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Efv8eykAPy2nR0cK92q3nSCIykwimaDIwZYy1M93kUE=";
|
||||
hash = "sha256-5IjjKXFFfvjtlQuxbVk3QK4t1nlx95Y5HgYv2yVpMEA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage {
|
||||
openssl
|
||||
];
|
||||
|
||||
cargoHash = "sha256-Nb2DV1zf3EMdVaU397y5wNZksNzUdf3YvtoNrgUQB+w=";
|
||||
cargoHash = "sha256-U4+oAdiXy86Gk0sitxIKDmUo4Mx/zdHWNv09FyqDuTU=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/handler.rs \
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "wl-crosshair";
|
||||
version = "0.1.0-unstable-2024-05-09";
|
||||
version = "0.1.0-unstable-2025-11-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lelgenio";
|
||||
repo = "wl-crosshair";
|
||||
rev = "39b716cf410a1b45006f50f32f8d63de5c43aedb";
|
||||
hash = "sha256-q5key9BWJjJQqECrhflso9ZTzULBeScvromo0S4fjqE=";
|
||||
rev = "233b6db7b39c80a92ac116c4ef4d88de4b49cbce";
|
||||
hash = "sha256-KfieW/NePLvh/5sEpoPW2jkaETSAeEFZsz8580YwbBE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-34K8Vjb7MrB8WGGLase+GnN2bUDuAnvU6VWRV1k+ZYM=";
|
||||
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage {
|
||||
meta = {
|
||||
description = "Crosshair overlay for wlroots compositor";
|
||||
homepage = "https://github.com/lelgenio/wl-crosshair";
|
||||
license = lib.licenses.unfree; # didn't found a license
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "wl-crosshair";
|
||||
maintainers = with lib.maintainers; [ Guanran928 ];
|
||||
platforms = lib.platforms.linux;
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "xnldorker";
|
||||
version = "4.2";
|
||||
version = "4.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xnl-h4ck3r";
|
||||
repo = "xnldorker";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-g5o2H5FqP+ytu5eqmGUyn0lD9NQcCJ4+xQCmTk0Qxrg=";
|
||||
hash = "sha256-YOYBEoYZBZfGtnJKku88XMj56JSN/EP9jLvqNXNqNJs=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [ setuptools ];
|
||||
|
||||
@@ -108,7 +108,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zed-editor";
|
||||
version = "0.228.0";
|
||||
version = "0.229.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -121,7 +121,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-oQ3cW4cFBkyrO4elTXB3Etek6ilL0XkB45z/tuPwTJs=";
|
||||
hash = "sha256-ZO4HzzzTb5rlBbzVCpE14DEzLkE3a7v2IKdyzlCTpaA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -147,7 +147,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
rm -r $out/git/*/candle-book/
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-K4lxI11fEuLYBWy6Z+o0MmtJFJYawwS4UUq0Jgue2hE=";
|
||||
cargoHash = "sha256-Q7sjd5u1jPIK6WogCByaXAVU7D6jcev1oRmfQ7y39i4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -67,7 +67,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 3.4 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" \
|
||||
--replace-warn 'pkg_get_variable(EMILUA_PLUGINSDIR emilua pluginsdir)' 'set(EMILUA_PLUGINSDIR "${"$"}{CMAKE_INSTALL_PREFIX}/${emilua.sitePackages}")'
|
||||
substituteInPlace td/CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
|
||||
substituteInPlace td/td/generate/tl-parser/CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 3.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -7,10 +7,10 @@
|
||||
}:
|
||||
clojure.overrideAttrs (previousAttrs: {
|
||||
pname = "babashka-clojure-tools";
|
||||
version = "1.12.4.1582";
|
||||
version = "1.12.4.1597";
|
||||
|
||||
src = fetchurl {
|
||||
url = previousAttrs.src.url;
|
||||
hash = "sha256-/Vhk8ivy7DAxH5zjyvPTF5ngTWU7ZX7NtPCDb+ly/yE=";
|
||||
hash = "sha256-DgEvXVExaexDTLoonh/fVS5nHjgekL6BlFYLM9X6wkM=";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
buildGraalvmNativeImage (finalAttrs: {
|
||||
pname = "babashka-unwrapped";
|
||||
version = "1.12.214";
|
||||
version = "1.12.217";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/babashka/babashka/releases/download/v${finalAttrs.version}/babashka-${finalAttrs.version}-standalone.jar";
|
||||
sha256 = "sha256-Z1LdHKxF9xCb7iqe4YRtJSqZdkdiP0xudcgQjOkna08=";
|
||||
sha256 = "sha256-5Nnzx2chre+h0SnM5spwiR9r4gjlyfc2FbgYa0spM34=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
@@ -106,6 +106,7 @@ buildGraalvmNativeImage (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
bandresen
|
||||
bhougland
|
||||
deejayem
|
||||
DerGuteMoritz
|
||||
jlesquembre
|
||||
];
|
||||
|
||||
@@ -1,24 +1,31 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
cython,
|
||||
datamodeldict,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
cython,
|
||||
numpy,
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
datamodeldict,
|
||||
matplotlib,
|
||||
numericalunits,
|
||||
numpy,
|
||||
pandas,
|
||||
phonopy,
|
||||
potentials,
|
||||
pytestCheckHook,
|
||||
requests,
|
||||
scipy,
|
||||
setuptools,
|
||||
toolz,
|
||||
xmltodict,
|
||||
|
||||
# tests
|
||||
phonopy,
|
||||
pytestCheckHook,
|
||||
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "atomman";
|
||||
version = "1.5.2";
|
||||
pyproject = true;
|
||||
@@ -26,14 +33,14 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "usnistgov";
|
||||
repo = "atomman";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-UmvMYVM1YmLvSaVLzWHdxYpRU+Z3z65cy7mfmDZfDG0=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
numpy
|
||||
cython
|
||||
numpy
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
@@ -65,16 +72,17 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_unique_shifts_prototype" # needs network access to download database files
|
||||
# needs network access to download database files
|
||||
"test_unique_shifts_prototype"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "atomman" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/usnistgov/atomman/blob/${src.rev}/UPDATES.rst";
|
||||
changelog = "https://github.com/usnistgov/atomman/blob/${finalAttrs.src.tag}/UPDATES.rst";
|
||||
description = "Atomistic Manipulation Toolkit";
|
||||
homepage = "https://github.com/usnistgov/atomman/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "celery-types";
|
||||
version = "0.24.0";
|
||||
version = "0.26.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "celery_types";
|
||||
inherit version;
|
||||
hash = "sha256-yT+80LBKnpwvVdVUCspKoepMwGqHDAyN7lBi/dWWY/4=";
|
||||
hash = "sha256-+jGBNv2tg/g/FTHe7Nn+Zktd///ynzwx6RIKRrjjkI8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
hatchling,
|
||||
hatch-vcs,
|
||||
colorcet,
|
||||
hypothesis,
|
||||
multipledispatch,
|
||||
numba,
|
||||
numpy,
|
||||
@@ -23,14 +24,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "datashader";
|
||||
version = "0.18.2";
|
||||
version = "0.19.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "holoviz";
|
||||
repo = "datashader";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ad1L0QyqLtMafFr+ZK1dItlFuPQZ0Caa96RgkLsqNkA=";
|
||||
hash = "sha256-Pc2mORxJA2JKioIzuBYU/LjUkij6ecqQh6tN/8z9ttI=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -57,6 +58,7 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
pytest-xdist
|
||||
writableTmpDirAsHomeHook
|
||||
hypothesis
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-ninja";
|
||||
version = "1.5.3";
|
||||
version = "1.6.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vitalik";
|
||||
repo = "django-ninja";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-TmdwxOy+YwzEp/LrRb7/AqUahlmEodZdmswvfqtD5PY=";
|
||||
hash = "sha256-nnGIhNGnK7q0nbw7EYJP+xCeS1uiuTrhQxf49dA+Sc8=";
|
||||
};
|
||||
|
||||
build-system = [ flit-core ];
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
{
|
||||
asgiref,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
setuptools,
|
||||
django,
|
||||
django-allauth,
|
||||
crispy-bootstrap5,
|
||||
django-environ,
|
||||
django-extensions,
|
||||
django-ipware,
|
||||
django-ninja,
|
||||
django-redis,
|
||||
djangorestframework,
|
||||
structlog,
|
||||
celery,
|
||||
factory-boy,
|
||||
pytest-asyncio,
|
||||
pytest-django,
|
||||
pytest-mock,
|
||||
redisTestHook,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "django-structlog";
|
||||
version = "10.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jrobichaud";
|
||||
repo = "django-structlog";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-BNZ+nk2NK5x2YsTDZjH5BVizXAyLZhKp8zRvkWi068k=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
asgiref
|
||||
django
|
||||
structlog
|
||||
django-ipware
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
celery = [ celery ];
|
||||
commands = [ django-extensions ];
|
||||
};
|
||||
|
||||
preCheck = ''
|
||||
export DJANGO_SETTINGS_MODULE=config.settings.test_demo_app
|
||||
'';
|
||||
|
||||
enabledTestPaths = [ "django_structlog_demo_project" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"django_structlog"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
redisTestHook
|
||||
factory-boy
|
||||
pytest-asyncio
|
||||
pytest-django
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
django-allauth
|
||||
crispy-bootstrap5
|
||||
django-environ
|
||||
django-ninja
|
||||
django-redis
|
||||
djangorestframework
|
||||
]
|
||||
++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = {
|
||||
description = "Structured Logging for Django";
|
||||
homepage = "https://github.com/jrobichaud/django-structlog";
|
||||
changelog = "https://github.com/jrobichaud/django-structlog/blob/${finalAttrs.src.tag}/docs/changelog.rst";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ kurogeek ];
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,57 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
buildPythonPackage,
|
||||
setuptools-scm,
|
||||
lib,
|
||||
django,
|
||||
pytestCheckHook,
|
||||
pytest-django,
|
||||
}:
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "django-user-sessions";
|
||||
version = "3.0.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jazzband";
|
||||
repo = "django-user-sessions";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-vHLeEmlVil1iJi+YkxL5c04Vq/b5b43tjC2ZcjH4/Ys=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
dependencies = [
|
||||
django
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-django
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export DJANGO_SETTINGS_MODULE=tests.settings
|
||||
'';
|
||||
|
||||
disabledTestPaths = [
|
||||
# AssertionError: UserWarning not triggered
|
||||
"tests/test_admin.py::AdminTest::test_expired"
|
||||
"tests/test_admin.py::AdminTest::test_list"
|
||||
"tests/test_admin.py::AdminTest::test_mine"
|
||||
"tests/test_admin.py::AdminTest::test_search"
|
||||
"tests/test_admin.py::AdminTest::test_unexpired"
|
||||
"tests/test_template_filters.py::LocationTemplateFilterTest::test_no_location"
|
||||
"tests/test_views.py::ViewsTest::test_delete_all_other"
|
||||
"tests/test_views.py::ViewsTest::test_delete_some_other"
|
||||
"tests/test_views.py::ViewsTest::test_list"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Extend Django sessions with a foreign key back to the user, allowing enumerating all user's sessions";
|
||||
homepage = "https://github.com/jazzband/django-user-sessions";
|
||||
changelog = "https://github.com/jazzband/django-user-sessions/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ kurogeek ];
|
||||
};
|
||||
})
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "djangorestframework-stubs";
|
||||
version = "3.16.7";
|
||||
version = "3.16.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "typeddjango";
|
||||
repo = "djangorestframework-stubs";
|
||||
tag = version;
|
||||
hash = "sha256-reOx6b1isu6wtC8cM8KI1HEr5wfJUNIeQd2YaZjIRnQ=";
|
||||
hash = "sha256-I7+XMUB87+bIyQMQZUm5hUTsJ+2wA3F6qyjJQeWeQdo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "google-cloud-network-connectivity";
|
||||
version = "2.13.0";
|
||||
version = "2.14.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) version;
|
||||
pname = "google_cloud_network_connectivity";
|
||||
hash = "sha256-Fad8oso2ulaA6Nqna7AlBe9whycHzDLyFKK9wqylfzA=";
|
||||
hash = "sha256-+82I/ZGM4p/yHKXBm2ddKTIGEo5SigXrry9LpaZ1RKc=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "iamdata";
|
||||
version = "0.1.202603241";
|
||||
version = "0.1.202603251";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-copilot";
|
||||
repo = "iam-data-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-bARMqv2K8j+RruodsC4HUxjvu0T1JiWcAmblycLcE/w=";
|
||||
hash = "sha256-co6eQx2gI5UBH8cx4xgH//Qtf3m0HmCkPYdNpk2h/qE=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ibm-cloud-sdk-core";
|
||||
version = "3.24.3";
|
||||
version = "3.24.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IBM";
|
||||
repo = "python-sdk-core";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-S4GKOJ7H0a4zWaqzXR3yT5xRSLuRCDm9uR7G3A9QR9c=";
|
||||
hash = "sha256-j16E4IDGuabxhHqI/b1yLLv5EdkWYsIJQ2CQzUodFsU=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "requests" ];
|
||||
|
||||
@@ -29,14 +29,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "intake";
|
||||
version = "2.0.8";
|
||||
version = "2.0.9";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intake";
|
||||
repo = "intake";
|
||||
tag = version;
|
||||
hash = "sha256-Mjf4CKLFrIti9pFP6HTt1D/iYw0WMowLIfMdfM7Db+E=";
|
||||
hash = "sha256-DiALGrJP4vLWygzZprjYCFM+TYtMS7NVM3+MTyjzcs0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user