Merge master into staging-next

doc/languages-frameworks/maven.section.md

@@ -49,6 +49,90 @@ This package calls `maven.buildMavenPackage` to do its work. The primary differe
 After setting `maven.buildMavenPackage`, we then do standard Java `.jar` installation by saving the `.jar` to `$out/share/java` and then making a wrapper which allows executing that file; see [](#sec-language-java) for additional generic information about packaging Java applications.
 :::
 
+### Overriding Maven package attributes {#maven-overriding-package-attributes}
+
+```
+overrideMavenAttrs :: (AttrSet -> Derivation) | ((AttrSet -> Attrset) -> Derivation) -> Derivation
+```
+
+The output of `buildMavenPackage` has an `overrideMavenAttrs` attribute, which is a function that takes either
+- any subset of the attributes that can be passed to `buildMavenPackage`
+
+  or
+- a function that takes the argument passed to the previous invocation of `buildMavenPackage` (conventionally called `old`) and returns an attribute set that can be passed to `buildMavenPackage`
+
+and returns a derivation that builds a Maven package based on the old and new arguments merged.
+
+This is similar to [](#sec-pkg-overrideAttrs), but notably does not allow accessing the final value of the argument to `buildMavenPackage`.
+
+:::{.example}
+### `overrideMavenAttrs` Example
+
+Use `overrideMavenAttrs` to build `jd-cli` version 1.2.0 and disable some flaky test:
+
+```nix
+jd-cli.overrideMavenAttrs (old: rec {
+  version = "1.2.0";
+  src = fetchFromGitHub {
+    owner = old.src.owner;
+    repo = old.src.repo;
+    rev = "${old.pname}-${version}";
+    # old source hash of 1.2.0 version
+    hash = "sha256-US7j6tQ6mh1libeHnQdFxPGoxHzbZHqehWSgCYynKx8=";
+  };
+
+  # tests can be disabled by prefixing it with `!`
+  # see Maven documentation for more details:
+  # https://maven.apache.org/surefire/maven-surefire-plugin/examples/single-test.html#Multiple_Formats_in_One
+  mvnParameters = lib.escapeShellArgs [
+    "-Dsurefire.failIfNoSpecifiedTests=false"
+    "-Dtest=!JavaDecompilerTest#basicTest,!JavaDecompilerTest#patternMatchingTest"
+  ];
+
+  # old mvnHash of 1.2.0 maven dependencies
+  mvnHash = "sha256-N9XC1pg6Y4sUiBWIQUf16QSXCuiAPpXEHGlgApviF4I=";
+});
+```
+:::
+
+### Offline build {#maven-offline-build}
+
+By default, `buildMavenPackage` does the following:
+
+1. Run `mvn package -Dmaven.repo.local=$out/.m2 ${mvnParameters}` in the
+   `fetchedMavenDeps` [fixed-output derivation](https://nixos.org/manual/nix/stable/glossary.html#gloss-fixed-output-derivation).
+2. Run `mvn package -o -nsu "-Dmaven.repo.local=$mvnDeps/.m2"
+   ${mvnParameters}` again in the main derivation.
+
+As a result, tests are run twice.
+This also means that a failing test will trigger a new attempt to realise the fixed-output derivation, which in turn downloads all dependencies again.
+For bigger Maven projects, this might lead to a long feedback cycle.
+
+Use `buildOffline = true` to change the behaviour of `buildMavenPackage to the following:
+1. Run `mvn de.qaware.maven:go-offline-maven-plugin:1.2.8:resolve-dependencies
+   -Dmaven.repo.local=$out/.m2 ${mvnDepsParameters}` in the fixed-output derivation.
+2. Run `mvn package -o -nsu "-Dmaven.repo.local=$mvnDeps/.m2"
+   ${mvnParameters}` in the main derivation.
+
+As a result, all dependencies are downloaded in step 1 and the tests are executed in step 2.
+A failing test only triggers a rebuild of step 2 as it can reuse the dependencies of step 1 because they have not changed.
+
+::: {.warning}
+Test dependencies are not downloaded in step 1 and are therefore missing in
+step 2 which will most probably fail the build. The `go-offline` plugin cannot
+handle these so-called [dynamic dependencies](https://github.com/qaware/go-offline-maven-plugin?tab=readme-ov-file#dynamic-dependencies).
+In that case you must add these dynamic dependencies manually with:
+```nix
+maven.buildMavenPackage rec {
+  manualMvnArtifacts = [
+    # add dynamic test dependencies here
+    "org.apache.maven.surefire:surefire-junit-platform:3.1.2"
+    "org.junit.platform:junit-platform-launcher:1.10.0"
+  ];
+};
+```
+:::
+
 ### Stable Maven plugins {#stable-maven-plugins}
 
 Maven defines default versions for its core plugins, e.g. `maven-compiler-plugin`. If your project does not override these versions, an upgrade of Maven will change the version of the used plugins, and therefore the derivation and hash.

doc/redirects.json

@@ -3190,6 +3190,12 @@
   "maven-buildmavenpackage": [
     "index.html#maven-buildmavenpackage"
   ],
+  "maven-overriding-package-attributes": [
+    "index.html#maven-overriding-package-attributes"
+  ],
+  "maven-offline-build": [
+    "index.html#maven-offline-build"
+  ],
   "stable-maven-plugins": [
     "index.html#stable-maven-plugins"
   ],

pkgs/applications/editors/jetbrains/bin/versions.json

@@ -11,10 +11,10 @@
     "clion": {
       "update-channel": "CLion RELEASE",
       "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
-      "version": "2024.2.3",
-      "sha256": "0afb6e32fe1ceb77ddd07ca7fa7d01a0a5e73a0df42ec58183f9c1a06b84446e",
-      "url": "https://download.jetbrains.com/cpp/CLion-2024.2.3.tar.gz",
-      "build_number": "242.23726.125"
+      "version": "2024.3",
+      "sha256": "e66ee52c365552fe40d035f5b205ab8c28a9a02ed4af5f787b78a0048bcf7f81",
+      "url": "https://download.jetbrains.com/cpp/CLion-2024.3.tar.gz",
+      "build_number": "243.21565.238"
     },
     "datagrip": {
       "update-channel": "DataGrip RELEASE",
@@ -150,10 +150,10 @@
     "clion": {
       "update-channel": "CLion RELEASE",
       "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz",
-      "version": "2024.2.3",
-      "sha256": "be3e6f0d490517c8f6e7c7ac248ab8e8823bf19c8102e7695725f80df6c11d63",
-      "url": "https://download.jetbrains.com/cpp/CLion-2024.2.3-aarch64.tar.gz",
-      "build_number": "242.23726.125"
+      "version": "2024.3",
+      "sha256": "526147203ce3f9ec25e264f33fca042fda59a728237a165983c47c0c06356f6e",
+      "url": "https://download.jetbrains.com/cpp/CLion-2024.3-aarch64.tar.gz",
+      "build_number": "243.21565.238"
     },
     "datagrip": {
       "update-channel": "DataGrip RELEASE",
@@ -289,10 +289,10 @@
     "clion": {
       "update-channel": "CLion RELEASE",
       "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
-      "version": "2024.2.3",
-      "sha256": "0dfc4d50268e58bb6b3c42c270ea8cca638a8733a5e2e010447cc74d585895e8",
-      "url": "https://download.jetbrains.com/cpp/CLion-2024.2.3.dmg",
-      "build_number": "242.23726.125"
+      "version": "2024.3",
+      "sha256": "e3d82ad3303cb4f373efce378f7f289afd3b35d3315d03ac53dc27302c87aa6f",
+      "url": "https://download.jetbrains.com/cpp/CLion-2024.3.dmg",
+      "build_number": "243.21565.238"
     },
     "datagrip": {
       "update-channel": "DataGrip RELEASE",
@@ -428,10 +428,10 @@
     "clion": {
       "update-channel": "CLion RELEASE",
       "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
-      "version": "2024.2.3",
-      "sha256": "998d629381e6f596b8e0cf5289fe8ca7cfd3221fc73b6c8548d768889b14196f",
-      "url": "https://download.jetbrains.com/cpp/CLion-2024.2.3-aarch64.dmg",
-      "build_number": "242.23726.125"
+      "version": "2024.3",
+      "sha256": "2f4ad6ea4ffb0862f85780cd960b46925ea6c9e5f97e9fa290f3007652103825",
+      "url": "https://download.jetbrains.com/cpp/CLion-2024.3-aarch64.dmg",
+      "build_number": "243.21565.238"
     },
     "datagrip": {
       "update-channel": "DataGrip RELEASE",

pkgs/applications/editors/jetbrains/default.nix

@@ -15,6 +15,7 @@ in
 , python3
 , lldb
 , dotnet-sdk_7
+, dotnet-sdk_8
 , maven
 , openssl
 , expat
@@ -126,7 +127,7 @@ rec {
 
         for dir in plugins/clion-radler/DotFiles/linux-*; do
           rm -rf $dir/dotnet
-          ln -s ${dotnet-sdk_7} $dir/dotnet
+          ln -s ${dotnet-sdk_8.unwrapped}/share/dotnet $dir/dotnet
         done
       )
     '';

pkgs/applications/editors/jetbrains/plugins/plugins.json

@@ -18,16 +18,16 @@
       ],
       "builds": {
         "241.19072.1155": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
-        "242.23726.125": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
-        "242.23726.162": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
-        "243.21565.180": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
-        "243.21565.191": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
-        "243.21565.193": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
-        "243.21565.197": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
-        "243.21565.199": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
-        "243.21565.202": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
-        "243.21565.204": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
-        "243.21565.208": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip"
+        "242.23726.162": "https://plugins.jetbrains.com/files/164/635855/IdeaVIM-2.17.0.zip",
+        "243.21565.180": "https://plugins.jetbrains.com/files/164/635855/IdeaVIM-2.17.0.zip",
+        "243.21565.191": "https://plugins.jetbrains.com/files/164/635855/IdeaVIM-2.17.0.zip",
+        "243.21565.193": "https://plugins.jetbrains.com/files/164/635855/IdeaVIM-2.17.0.zip",
+        "243.21565.197": "https://plugins.jetbrains.com/files/164/635855/IdeaVIM-2.17.0.zip",
+        "243.21565.199": "https://plugins.jetbrains.com/files/164/635855/IdeaVIM-2.17.0.zip",
+        "243.21565.202": "https://plugins.jetbrains.com/files/164/635855/IdeaVIM-2.17.0.zip",
+        "243.21565.204": "https://plugins.jetbrains.com/files/164/635855/IdeaVIM-2.17.0.zip",
+        "243.21565.208": "https://plugins.jetbrains.com/files/164/635855/IdeaVIM-2.17.0.zip",
+        "243.21565.238": "https://plugins.jetbrains.com/files/164/635855/IdeaVIM-2.17.0.zip"
       },
       "name": "ideavim"
     },
@@ -68,7 +68,6 @@
       ],
       "builds": {
         "241.19072.1155": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
-        "242.23726.125": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
         "242.23726.162": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
         "243.21565.180": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
         "243.21565.191": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
@@ -77,7 +76,8 @@
         "243.21565.199": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
         "243.21565.202": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
         "243.21565.204": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
-        "243.21565.208": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip"
+        "243.21565.208": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
+        "243.21565.238": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip"
       },
       "name": "string-manipulation"
     },
@@ -99,7 +99,6 @@
       ],
       "builds": {
         "241.19072.1155": null,
-        "242.23726.125": null,
         "242.23726.162": null,
         "243.21565.180": null,
         "243.21565.191": null,
@@ -108,7 +107,8 @@
         "243.21565.199": null,
         "243.21565.202": null,
         "243.21565.204": null,
-        "243.21565.208": null
+        "243.21565.208": null,
+        "243.21565.238": null
       },
       "name": "kotlin"
     },
@@ -130,7 +130,6 @@
       ],
       "builds": {
         "241.19072.1155": null,
-        "242.23726.125": "https://plugins.jetbrains.com/files/6981/623497/ini-242.23726.110.zip",
         "242.23726.162": "https://plugins.jetbrains.com/files/6981/623497/ini-242.23726.110.zip",
         "243.21565.180": "https://plugins.jetbrains.com/files/6981/633889/ini-243.21565.208.zip",
         "243.21565.191": "https://plugins.jetbrains.com/files/6981/633889/ini-243.21565.208.zip",
@@ -139,7 +138,8 @@
         "243.21565.199": "https://plugins.jetbrains.com/files/6981/633889/ini-243.21565.208.zip",
         "243.21565.202": "https://plugins.jetbrains.com/files/6981/633889/ini-243.21565.208.zip",
         "243.21565.204": "https://plugins.jetbrains.com/files/6981/633889/ini-243.21565.208.zip",
-        "243.21565.208": "https://plugins.jetbrains.com/files/6981/633889/ini-243.21565.208.zip"
+        "243.21565.208": "https://plugins.jetbrains.com/files/6981/633889/ini-243.21565.208.zip",
+        "243.21565.238": "https://plugins.jetbrains.com/files/6981/633889/ini-243.21565.208.zip"
       },
       "name": "ini"
     },
@@ -161,7 +161,6 @@
       ],
       "builds": {
         "241.19072.1155": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
-        "242.23726.125": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
         "242.23726.162": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
         "243.21565.180": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
         "243.21565.191": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
@@ -170,7 +169,8 @@
         "243.21565.199": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
         "243.21565.202": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
         "243.21565.204": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
-        "243.21565.208": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip"
+        "243.21565.208": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
+        "243.21565.238": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip"
       },
       "name": "acejump"
     },
@@ -209,14 +209,14 @@
         "webstorm"
       ],
       "builds": {
-        "242.23726.125": "https://plugins.jetbrains.com/files/7322/622853/python-ce-242.23726.103.zip",
         "242.23726.162": "https://plugins.jetbrains.com/files/7322/622853/python-ce-242.23726.103.zip",
         "243.21565.180": "https://plugins.jetbrains.com/files/7322/634169/python-ce-243.21565.211.zip",
         "243.21565.191": "https://plugins.jetbrains.com/files/7322/634169/python-ce-243.21565.211.zip",
         "243.21565.193": "https://plugins.jetbrains.com/files/7322/634169/python-ce-243.21565.211.zip",
         "243.21565.199": "https://plugins.jetbrains.com/files/7322/634169/python-ce-243.21565.211.zip",
         "243.21565.204": "https://plugins.jetbrains.com/files/7322/634169/python-ce-243.21565.211.zip",
-        "243.21565.208": "https://plugins.jetbrains.com/files/7322/634169/python-ce-243.21565.211.zip"
+        "243.21565.208": "https://plugins.jetbrains.com/files/7322/634169/python-ce-243.21565.211.zip",
+        "243.21565.238": "https://plugins.jetbrains.com/files/7322/634169/python-ce-243.21565.211.zip"
       },
       "name": "python-community-edition"
     },
@@ -238,7 +238,6 @@
       ],
       "builds": {
         "241.19072.1155": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip",
-        "242.23726.125": "https://plugins.jetbrains.com/files/7391/634204/asciidoctor-intellij-plugin-0.43.3.zip",
         "242.23726.162": "https://plugins.jetbrains.com/files/7391/634204/asciidoctor-intellij-plugin-0.43.3.zip",
         "243.21565.180": "https://plugins.jetbrains.com/files/7391/634204/asciidoctor-intellij-plugin-0.43.3.zip",
         "243.21565.191": "https://plugins.jetbrains.com/files/7391/634204/asciidoctor-intellij-plugin-0.43.3.zip",
@@ -247,7 +246,8 @@
         "243.21565.199": "https://plugins.jetbrains.com/files/7391/634204/asciidoctor-intellij-plugin-0.43.3.zip",
         "243.21565.202": "https://plugins.jetbrains.com/files/7391/634204/asciidoctor-intellij-plugin-0.43.3.zip",
         "243.21565.204": "https://plugins.jetbrains.com/files/7391/634204/asciidoctor-intellij-plugin-0.43.3.zip",
-        "243.21565.208": "https://plugins.jetbrains.com/files/7391/634204/asciidoctor-intellij-plugin-0.43.3.zip"
+        "243.21565.208": "https://plugins.jetbrains.com/files/7391/634204/asciidoctor-intellij-plugin-0.43.3.zip",
+        "243.21565.238": "https://plugins.jetbrains.com/files/7391/634204/asciidoctor-intellij-plugin-0.43.3.zip"
       },
       "name": "asciidoc"
     },
@@ -268,7 +268,6 @@
       ],
       "builds": {
         "241.19072.1155": null,
-        "242.23726.125": null,
         "243.21565.180": null,
         "243.21565.191": null,
         "243.21565.193": null,
@@ -276,7 +275,8 @@
         "243.21565.199": null,
         "243.21565.202": null,
         "243.21565.204": null,
-        "243.21565.208": null
+        "243.21565.208": null,
+        "243.21565.238": null
       },
       "name": "-deprecated-rust"
     },
@@ -297,7 +297,6 @@
       ],
       "builds": {
         "241.19072.1155": null,
-        "242.23726.125": null,
         "243.21565.180": null,
         "243.21565.191": null,
         "243.21565.193": null,
@@ -305,7 +304,8 @@
         "243.21565.199": null,
         "243.21565.202": null,
         "243.21565.204": null,
-        "243.21565.208": null
+        "243.21565.208": null,
+        "243.21565.238": null
       },
       "name": "-deprecated-rust-beta"
     },
@@ -344,7 +344,6 @@
       ],
       "builds": {
         "241.19072.1155": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
-        "242.23726.125": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
         "242.23726.162": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
         "243.21565.180": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
         "243.21565.191": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
@@ -353,7 +352,8 @@
         "243.21565.199": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
         "243.21565.202": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
         "243.21565.204": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
-        "243.21565.208": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip"
+        "243.21565.208": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
+        "243.21565.238": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip"
       },
       "name": "nixidea"
     },
@@ -386,7 +386,6 @@
       ],
       "builds": {
         "241.19072.1155": "https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip",
-        "242.23726.125": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
         "242.23726.162": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
         "243.21565.180": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
         "243.21565.191": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
@@ -395,7 +394,8 @@
         "243.21565.199": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
         "243.21565.202": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
         "243.21565.204": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
-        "243.21565.208": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip"
+        "243.21565.208": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
+        "243.21565.238": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip"
       },
       "name": "csv-editor"
     },
@@ -417,7 +417,6 @@
       ],
       "builds": {
         "241.19072.1155": "https://plugins.jetbrains.com/files/11349/634264/aws-toolkit-jetbrains-standalone-3.40-241.zip",
-        "242.23726.125": "https://plugins.jetbrains.com/files/11349/634268/aws-toolkit-jetbrains-standalone-3.40-242.zip",
         "242.23726.162": "https://plugins.jetbrains.com/files/11349/634268/aws-toolkit-jetbrains-standalone-3.40-242.zip",
         "243.21565.180": "https://plugins.jetbrains.com/files/11349/634266/aws-toolkit-jetbrains-standalone-3.40-243.zip",
         "243.21565.191": "https://plugins.jetbrains.com/files/11349/634266/aws-toolkit-jetbrains-standalone-3.40-243.zip",
@@ -426,7 +425,8 @@
         "243.21565.199": "https://plugins.jetbrains.com/files/11349/634266/aws-toolkit-jetbrains-standalone-3.40-243.zip",
         "243.21565.202": "https://plugins.jetbrains.com/files/11349/634266/aws-toolkit-jetbrains-standalone-3.40-243.zip",
         "243.21565.204": "https://plugins.jetbrains.com/files/11349/634266/aws-toolkit-jetbrains-standalone-3.40-243.zip",
-        "243.21565.208": "https://plugins.jetbrains.com/files/11349/634266/aws-toolkit-jetbrains-standalone-3.40-243.zip"
+        "243.21565.208": "https://plugins.jetbrains.com/files/11349/634266/aws-toolkit-jetbrains-standalone-3.40-243.zip",
+        "243.21565.238": "https://plugins.jetbrains.com/files/11349/634266/aws-toolkit-jetbrains-standalone-3.40-243.zip"
       },
       "name": "aws-toolkit"
     },
@@ -448,7 +448,6 @@
       ],
       "builds": {
         "241.19072.1155": null,
-        "242.23726.125": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
         "242.23726.162": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
         "243.21565.180": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
         "243.21565.191": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
@@ -457,7 +456,8 @@
         "243.21565.199": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
         "243.21565.202": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
         "243.21565.204": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
-        "243.21565.208": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip"
+        "243.21565.208": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
+        "243.21565.238": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip"
       },
       "name": "vscode-keymap"
     },
@@ -479,7 +479,6 @@
       ],
       "builds": {
         "241.19072.1155": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip",
-        "242.23726.125": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
         "242.23726.162": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
         "243.21565.180": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
         "243.21565.191": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
@@ -488,7 +487,8 @@
         "243.21565.199": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
         "243.21565.202": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
         "243.21565.204": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
-        "243.21565.208": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip"
+        "243.21565.208": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
+        "243.21565.238": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip"
       },
       "name": "eclipse-keymap"
     },
@@ -510,7 +510,6 @@
       ],
       "builds": {
         "241.19072.1155": null,
-        "242.23726.125": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
         "242.23726.162": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
         "243.21565.180": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
         "243.21565.191": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
@@ -519,7 +518,8 @@
         "243.21565.199": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
         "243.21565.202": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
         "243.21565.204": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
-        "243.21565.208": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip"
+        "243.21565.208": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
+        "243.21565.238": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip"
       },
       "name": "visual-studio-keymap"
     },
@@ -541,7 +541,6 @@
       ],
       "builds": {
         "241.19072.1155": null,
-        "242.23726.125": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip",
         "242.23726.162": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip",
         "243.21565.180": "https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip",
         "243.21565.191": "https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip",
@@ -550,7 +549,8 @@
         "243.21565.199": "https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip",
         "243.21565.202": "https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip",
         "243.21565.204": "https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip",
-        "243.21565.208": "https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip"
+        "243.21565.208": "https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip",
+        "243.21565.238": "https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip"
       },
       "name": "protocol-buffers"
     },
@@ -572,7 +572,6 @@
       ],
       "builds": {
         "241.19072.1155": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "242.23726.125": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
         "242.23726.162": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
         "243.21565.180": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
         "243.21565.191": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
@@ -581,7 +580,8 @@
         "243.21565.199": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
         "243.21565.202": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
         "243.21565.204": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "243.21565.208": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
+        "243.21565.208": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "243.21565.238": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
       },
       "name": "darcula-pitch-black"
     },
@@ -603,7 +603,6 @@
       ],
       "builds": {
         "241.19072.1155": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip",
-        "242.23726.125": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip",
         "242.23726.162": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip",
         "243.21565.180": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip",
         "243.21565.191": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip",
@@ -612,7 +611,8 @@
         "243.21565.199": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip",
         "243.21565.202": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip",
         "243.21565.204": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip",
-        "243.21565.208": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip"
+        "243.21565.208": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip",
+        "243.21565.238": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip"
       },
       "name": "github-copilot"
     },
@@ -634,7 +634,6 @@
       ],
       "builds": {
         "241.19072.1155": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "242.23726.125": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
         "242.23726.162": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
         "243.21565.180": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
         "243.21565.191": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
@@ -643,7 +642,8 @@
         "243.21565.199": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
         "243.21565.202": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
         "243.21565.204": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "243.21565.208": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
+        "243.21565.208": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "243.21565.238": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
       },
       "name": "netbeans-6-5-keymap"
     },
@@ -665,7 +665,6 @@
       ],
       "builds": {
         "241.19072.1155": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
-        "242.23726.125": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
         "242.23726.162": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
         "243.21565.180": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
         "243.21565.191": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
@@ -674,7 +673,8 @@
         "243.21565.199": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
         "243.21565.202": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
         "243.21565.204": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
-        "243.21565.208": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip"
+        "243.21565.208": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
+        "243.21565.238": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip"
       },
       "name": "mermaid"
     },
@@ -685,9 +685,9 @@
         "rust-rover"
       ],
       "builds": {
-        "242.23726.125": "https://plugins.jetbrains.com/files/22407/629692/intellij-rust-242.23726.162.zip",
         "242.23726.162": "https://plugins.jetbrains.com/files/22407/629692/intellij-rust-242.23726.162.zip",
-        "243.21565.193": "https://plugins.jetbrains.com/files/22407/630513/intellij-rust-243.21565.136.zip"
+        "243.21565.193": "https://plugins.jetbrains.com/files/22407/630513/intellij-rust-243.21565.136.zip",
+        "243.21565.238": "https://plugins.jetbrains.com/files/22407/630513/intellij-rust-243.21565.136.zip"
       },
       "name": "rust"
     }
@@ -710,6 +710,7 @@
     "https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip": "sha256-cv6JTujoD5g90ngXTtnj5x31wjbIZlKZ6Zn0H+vHCTk=",
     "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=",
     "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip": "sha256-uMIrYoZE16X/K96HuDJx8QMh6wUbi4+qSw+HJAq7ukI=",
+    "https://plugins.jetbrains.com/files/164/635855/IdeaVIM-2.17.0.zip": "sha256-ESbvyp66+X2Ko+bol3mk8aLIf8xjG7Qa0vz8k/zYl4A=",
     "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip": "sha256-ljVGVi/i36EnLxzK7IVGiKVF8EyQTeNVCVKBtGlYNmg=",
     "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=",
     "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip": "sha256-DUiIQYIzYoXmgtBakSLtMB+xxJMaR70Jgg9erySa3wQ=",

pkgs/applications/editors/vim/plugins/aliases.nix

@@ -69,6 +69,7 @@ mapAliases (with prev; {
   eighties            = vim-eighties;
   extradite           = vim-extradite;
   fugitive            = vim-fugitive;
+  floating-nvim       = throw "floating.nvim has been removed: abandoned by upstream. Use popup-nvim or nui-nvim"; # Added 2024-11-26
   ghc-mod-vim         = ghcmod-vim;
   ghcmod              = ghcmod-vim;
   goyo                = goyo-vim;

pkgs/applications/editors/vim/plugins/generated.nix

@@ -4103,18 +4103,6 @@ final: prev:
     meta.homepage = "https://github.com/liangxianzhe/floating-input.nvim/";
   };
 
-  floating-nvim = buildVimPlugin {
-    pname = "floating.nvim";
-    version = "2021-07-19";
-    src = fetchFromGitHub {
-      owner = "fhill2";
-      repo = "floating.nvim";
-      rev = "11e75c2a201b9d73f03bd3c2db1fc94021c231eb";
-      sha256 = "172ak3macqmkz4jvic1xcnfpp6wafq33afyvcx4za170qh30sydj";
-    };
-    meta.homepage = "https://github.com/fhill2/floating.nvim/";
-  };
-
   floobits-neovim = buildVimPlugin {
     pname = "floobits-neovim";
     version = "2021-10-18";

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -340,7 +340,6 @@ https://github.com/felipeagc/fleet-theme-nvim/,,
 https://github.com/ggandor/flit.nvim/,HEAD,
 https://github.com/ncm2/float-preview.nvim/,,
 https://github.com/liangxianzhe/floating-input.nvim/,HEAD,
-https://github.com/fhill2/floating.nvim/,,
 https://github.com/floobits/floobits-neovim/,,
 https://github.com/nvim-flutter/flutter-tools.nvim/,HEAD,
 https://github.com/nvim-focus/focus.nvim/,HEAD,

pkgs/applications/networking/instant-messengers/discord/default.nix

@@ -9,54 +9,54 @@ let
   versions =
     if stdenv.hostPlatform.isLinux then
       {
-        stable = "0.0.74";
-        ptb = "0.0.115";
-        canary = "0.0.518";
-        development = "0.0.45";
+        stable = "0.0.76";
+        ptb = "0.0.118";
+        canary = "0.0.527";
+        development = "0.0.50";
       }
     else
       {
-        stable = "0.0.325";
-        ptb = "0.0.145";
-        canary = "0.0.627";
-        development = "0.0.64";
+        stable = "0.0.327";
+        ptb = "0.0.148";
+        canary = "0.0.639";
+        development = "0.0.65";
       };
   version = versions.${branch};
   srcs = rec {
     x86_64-linux = {
       stable = fetchurl {
         url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
-        hash = "sha256-yf2gLvDgzF13cgpKFiiCHGYVR+p7jZOAR37L1F6MZvc=";
+        hash = "sha256-z5byV56bbXQK0o6QH9cmeqdjg9/4vbRohmE4YgKGNUw=";
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
-        hash = "sha256-N8h6z5z9txCha8P/d0ekSsYufPXswFa+5Pra3/p8Bng=";
+        hash = "sha256-msheT6PXTkIq7EwowYwL7g0kgOdLBZHeI5w2kijJUtw=";
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-        hash = "sha256-yjyYU15f6rIWYhTL8qXlIO8XN1ClK2QuFujM1DEHH+I=";
+        hash = "sha256-pe1CRsXMxXw+j4pBUT/63ZSBe7Mm0g+Tbyn1dAnxp7o=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
-        hash = "sha256-N5vlw6p+kvb2nYuIUF3YJyKgi072Uo1q1UEddIh/d9c=";
+        hash = "sha256-Ygwneo9GY1iVKBl3y6jSj81sexUsSY2J7i/DKxmJJyA=";
       };
     };
     x86_64-darwin = {
       stable = fetchurl {
         url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg";
-        hash = "sha256-e5e9hSDDr88W18fQBxXASOTIfrhcsfjS+E9V2GgoZ38=";
+        hash = "sha256-5XzjJv2IebVMVml/e+VTVKrlbHTCj+t0lYsq1CwvLi0=";
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
-        hash = "sha256-11eIKV3DCmsbyqwQcisWDaLJoGK3f+apO6Q+UA9g1/M=";
+        hash = "sha256-YW6wgiplt+ue59i5+2Ap5tVAEhO1xgeP8jVOffkSWj4=";
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
-        hash = "sha256-aLvTEtfFvKHWTFvz2Q8Qy8K7Z7Ic9YLKJ4nDD+PG0Ec=";
+        hash = "sha256-C+2Cr8D2ZqfdRp0m996p8HvOjkPzN82ywgbx2KMBqAE=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
-        hash = "sha256-2yiTjpx+OEkxLHy8M3cSqdMD+UHm8B5/KHCp7KvSlc0=";
+        hash = "sha256-IckTw2wKTwGMGvQAOYG85yU1w9E6PdWA1G0f2BaXJ1Q=";
       };
     };
     aarch64-darwin = x86_64-darwin;

pkgs/applications/networking/misc/zammad/default.nix

@@ -2,7 +2,6 @@
 , lib
 , nixosTests
 , fetchFromGitHub
-, fetchYarnDeps
 , applyPatches
 , bundlerEnv
 , defaultGemConfig
@@ -14,8 +13,7 @@
 , jq
 , moreutils
 , nodejs
-, yarn
-, yarn2nix-moretea
+, pnpm
 , cacert
 , redis
 , dataDir ? "/var/lib/zammad"
@@ -23,7 +21,7 @@
 
 let
   pname = "zammad";
-  version = "6.3.1";
+  version = "6.4.0";
 
   src = applyPatches {
     src = fetchFromGitHub (lib.importJSON ./source.json);
@@ -79,25 +77,6 @@ let
     };
   };
 
-  yarnEnv = yarn2nix-moretea.mkYarnPackage {
-    pname = "${pname}-node-modules";
-    inherit version src;
-    packageJSON = ./package.json;
-
-    offlineCache = fetchYarnDeps {
-      yarnLock = "${src}/yarn.lock";
-      hash = "sha256-3DuTirYd6lAQd5PRbdOa/6QaMknIqNMTVnxEESF0N/c=";
-    };
-
-    packageResolutions.minimatch = "9.0.3";
-
-    yarnPreBuild = ''
-      mkdir -p deps/Zammad
-      cp -r ${src}/.eslint-plugin-zammad deps/Zammad/.eslint-plugin-zammad
-      chmod -R +w deps/Zammad/.eslint-plugin-zammad
-    '';
-  };
-
 in
 stdenv.mkDerivation {
   inherit pname version src;
@@ -106,23 +85,26 @@ stdenv.mkDerivation {
     rubyEnv
     rubyEnv.wrappedRuby
     rubyEnv.bundler
-    yarn
-    nodejs
-    procps
-    cacert
   ];
 
   nativeBuildInputs = [
     redis
     postgresql
+    pnpm.configHook
+    nodejs
+    procps
+    cacert
   ];
 
-  RAILS_ENV = "production";
+  env.RAILS_ENV = "production";
+
+  pnpmDeps = pnpm.fetchDeps {
+    inherit pname src;
+
+    hash = "sha256-bdm1nkJnXE7oZZhG2uBnk3fYhITaMROHGKPbf0G3bFs=";
+  };
 
   buildPhase = ''
-    node_modules=${yarnEnv}/libexec/Zammad/node_modules
-    ${yarn2nix-moretea.linkNodeModulesHook}
-
     mkdir redis-work
     pushd redis-work
     redis-server &
@@ -153,7 +135,7 @@ stdenv.mkDerivation {
   '';
 
   passthru = {
-    inherit rubyEnv yarnEnv;
+    inherit rubyEnv;
     updateScript = [ "${callPackage ./update.nix {}}/bin/update.sh" pname (toString ./.) ];
     tests = { inherit (nixosTests) zammad; };
   };

pkgs/applications/networking/misc/zammad/package.json

@@ -1,161 +0,0 @@
-{
-  "private": true,
-  "scripts": {
-    "generate-graphql-api": "RAILS_ENV=development bundle exec rails generate zammad:graphql_introspection > app/graphql/graphql_introspection.json && npx graphql-codegen -c .graphql_code_generator.js",
-    "generate-setting-types": "RAILS_ENV=development bundle exec rails generate zammad:setting_types",
-    "dev": "RAILS_ENV=development forego start -f Procfile.dev",
-    "dev:https": "VITE_RUBY_HOST=0.0.0.0 VITE_RUBY_HTTPS=true RAILS_ENV=development forego start -f Procfile.dev-https",
-    "i18n": "rails generate zammad:translation_catalog",
-    "lint": "vue-tsc --noEmit && eslint --cache --cache-location ./tmp/eslintcache.js  --cache-strategy content -c .eslintrc.js --ext .js,.ts,.vue app/frontend/ .eslint-plugin-zammad/",
-    "lint:fix": "yarn lint -- --fix",
-    "lint:css": "stylelint **/*.{css,vue,scss}",
-    "lint:css:fix": "stylelint **/*.{css,vue,scss} --fix",
-    "test": "VTL_SKIP_AUTO_CLEANUP=true TZ=utc vitest",
-    "test:ct": "CY_OPEN=true yarn --cwd ./.cypress cypress open --component --project ../ --config-file .cypress/cypress.config.mjs",
-    "test:ci:ct": "CI=true yarn --cwd ./.cypress cypress run --component --project ../ --config-file .cypress/cypress.config.mjs --browser electron",
-    "cypress:snapshots": "sh .cypress/visual-regression/snapshots.sh",
-    "cypress:install": "yarn --cwd ./.cypress install"
-  },
-  "engines": {
-    "node": ">=18.12.0"
-  },
-  "packageManager": "yarn@1.22.22",
-  "devDependencies": {
-    "@faker-js/faker": "^8.4.1",
-    "@graphql-codegen/cli": "^5.0.2",
-    "@graphql-codegen/introspection": "^4.0.3",
-    "@graphql-codegen/near-operation-file-preset": "^3.0.0",
-    "@graphql-codegen/typescript": "^4.0.6",
-    "@graphql-codegen/typescript-operations": "^4.2.0",
-    "@graphql-codegen/typescript-vue-apollo": "^4.1.1",
-    "@pinia/testing": "^0.1.3",
-    "@testing-library/jest-dom": "^6.4.2",
-    "@testing-library/user-event": "^14.5.2",
-    "@testing-library/vue": "^8.0.3",
-    "@types/lodash-es": "^4.17.12",
-    "@types/rails__actioncable": "^6.1.10",
-    "@types/sinonjs__fake-timers": "^8.1.5",
-    "@types/ua-parser-js": "^0.7.39",
-    "@types/uuid": "^9.0.8",
-    "@typescript-eslint/eslint-plugin": "^7.3.1",
-    "@typescript-eslint/parser": "^7.3.1",
-    "@vitejs/plugin-vue": "^5.0.4",
-    "@vue/eslint-config-prettier": "^9.0.0",
-    "@vue/eslint-config-typescript": "^13.0.0",
-    "@vue/test-utils": "^2.4.5",
-    "autoprefixer": "^10.4.18",
-    "eslint": "^8.57.0",
-    "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-import-resolver-alias": "^1.1.2",
-    "eslint-import-resolver-typescript": "^3.6.1",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-prettier-vue": "^5.0.0",
-    "eslint-plugin-security": "^2.1.1",
-    "eslint-plugin-sonarjs": "^0.24.0",
-    "eslint-plugin-vue": "^9.23.0",
-    "eslint-plugin-zammad": "file:.eslint-plugin-zammad",
-    "jsdom": "^24.0.0",
-    "minimatch": "^9.0.3",
-    "mock-apollo-client": "^1.2.1",
-    "postcss": "^8.4.36",
-    "postcss-html": "^1.6.0",
-    "prettier": "3.2.5",
-    "prettier-plugin-tailwindcss": "^0.5.12",
-    "regenerator-runtime": "^0.14.1",
-    "sass": "^1.72.0",
-    "stylelint": "^16.2.1",
-    "stylelint-config-prettier": "^9.0.5",
-    "stylelint-config-recommended-vue": "^1.5.0",
-    "stylelint-config-standard": "^36.0.0",
-    "stylelint-config-standard-scss": "^13.0.0",
-    "stylelint-prettier": "^5.0.0",
-    "stylelint-scss": "^6.2.1",
-    "svg-baker": "^1.7.0",
-    "svgo": "^3.2.0",
-    "tailwindcss": "^3.4.1",
-    "tailwindcss-unimportant": "^2.1.1",
-    "timezone-mock": "^1.3.6",
-    "type-fest": "^4.12.0",
-    "typescript": "^5.4.2",
-    "vite": "^5.2.6",
-    "vite-plugin-pwa": "^0.19.7",
-    "vite-plugin-ruby": "^5.0.0",
-    "vitest": "^1.4.0",
-    "vitest-axe": "^0.1.0",
-    "vue-tsc": "^2.0.6"
-  },
-  "dependencies": {
-    "@apollo/client": "^3.9.9",
-    "@formkit/core": "^1.6.0",
-    "@formkit/dev": "^1.6.0",
-    "@formkit/i18n": "^1.6.0",
-    "@formkit/inputs": "^1.6.0",
-    "@formkit/rules": "^1.6.0",
-    "@formkit/tailwindcss": "^1.6.0",
-    "@formkit/themes": "^1.6.0",
-    "@formkit/utils": "^1.6.0",
-    "@formkit/validation": "^1.6.0",
-    "@formkit/vue": "^1.6.0",
-    "@github/webauthn-json": "^2.1.1",
-    "@rails/actioncable": "^7.0.8",
-    "@sinonjs/fake-timers": "^11.2.2",
-    "@tiptap/core": "^2.2.4",
-    "@tiptap/extension-blockquote": "^2.2.4",
-    "@tiptap/extension-character-count": "^2.2.4",
-    "@tiptap/extension-hard-break": "^2.2.4",
-    "@tiptap/extension-image": "^2.2.4",
-    "@tiptap/extension-link": "^2.2.4",
-    "@tiptap/extension-list-item": "^2.2.4",
-    "@tiptap/extension-mention": "^2.2.4",
-    "@tiptap/extension-ordered-list": "^2.2.4",
-    "@tiptap/extension-paragraph": "^2.2.4",
-    "@tiptap/extension-strike": "^2.2.4",
-    "@tiptap/extension-underline": "^2.2.4",
-    "@tiptap/pm": "^2.2.4",
-    "@tiptap/starter-kit": "^2.2.4",
-    "@tiptap/suggestion": "^2.2.4",
-    "@tiptap/vue-3": "^2.2.4",
-    "@vue/apollo-composable": "^4.0.2",
-    "@vueuse/core": "^10.9.0",
-    "@vueuse/router": "^10.9.0",
-    "@vueuse/shared": "^10.9.0",
-    "async-mutex": "^0.5.0",
-    "daisyui": "^4.7.3",
-    "flatpickr": "^4.6.13",
-    "graphql": "^16.8.1",
-    "graphql-ruby-client": "^1.13.3",
-    "graphql-tag": "^2.12.6",
-    "linkify-string": "^4.1.3",
-    "linkifyjs": "^4.1.3",
-    "lodash-es": "^4.17.21",
-    "loglevel": "^1.9.1",
-    "mitt": "^3.0.1",
-    "pinia": "^2.1.7",
-    "tippy.js": "^6.3.7",
-    "tiptap-text-direction": "^0.3.1",
-    "ua-parser-js": "^1.0.37",
-    "uuid": "^9.0.1",
-    "vue": "^3.4.21",
-    "vue-advanced-cropper": "^2.8.8",
-    "vue-easy-lightbox": "1.19.0",
-    "vue-router": "^4.3.0",
-    "vue3-draggable-resizable": "^1.6.5",
-    "vuedraggable": "^4.1.0",
-    "workbox-core": "^7.0.0",
-    "workbox-precaching": "^7.0.0",
-    "workbox-window": "^7.0.0"
-  },
-  "resolutions": {
-    "loader-utils": "^3.2.1",
-    "postcss": "^8.4.36",
-    "stylelint-config-recommended": "^14.0.0",
-    "prosemirror-model": "1.19.4",
-    "prosemirror-state": "1.4.3",
-    "prosemirror-transform": "1.8.0",
-    "prosemirror-view": "1.33.3"
-  },
-  "name": "Zammad",
-  "version": "6.3.1"
-}

pkgs/applications/networking/misc/zammad/source.json

@@ -1,8 +1,8 @@
 {
   "owner": "zammad",
   "repo": "zammad",
-  "rev": "27f4405b9af46d74c01f07efae2309bba2066af1",
-  "hash": "sha256-p9TZ7Pxnav9RcQWfHPKWOo+ZJ1RQ58ZAMzzMhaITEb0=",
+  "rev": "1f09f838a2c9e484bb4f47e1abeeca3d763d4e7d",
+  "hash": "sha256-1N0tTYOUDtA/ZTOB5SqjwZKzLctgK8k76z847TFH1WQ=",
   "fetchSubmodules": true
 }
 

pkgs/applications/networking/misc/zammad/update.sh

@@ -55,9 +55,6 @@ pushd $SOURCE_DIR
 echo ":: Creating gemset.nix"
 bundix --lockfile=./Gemfile.lock  --gemfile=./Gemfile --gemset=$TARGET_DIR/gemset.nix
 
-# needed to avoid import from derivation
-jq --arg VERSION "$VERSION" '. += {name: "Zammad", version: $VERSION}' package.json > $TARGET_DIR/package.json
-
 popd
 popd
 popd

pkgs/applications/science/math/qalculate-qt/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qalculate-qt";
-  version = "5.3.0";
+  version = "5.4.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-qt";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-uzcqkx9UiQvv/KFwsOGzIWbdIco8woKIGjjFz2avwe8=";
+    hash = "sha256-Tpb/ZN5p3JfPug9NpBHguOi6Okek+g87orD4ISkV+ac=";
   };
 
   nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ];

pkgs/build-support/rust/build-rust-package/default.nix

@@ -71,7 +71,7 @@ let
     if cargoVendorDir != null then null
     else if cargoDeps != null then cargoDeps
     else if cargoLock != null then importCargoLock cargoLock
-    else if useFetchCargoVendor then (fetchCargoVendor {
+    else if useFetchCargoVendor then fetchCargoVendor ({
       inherit src srcs sourceRoot preUnpack unpackPhase postUnpack;
       name = cargoDepsName;
       patches = cargoPatches;

pkgs/by-name/ab/above/package.nix

@@ -0,0 +1,41 @@
+{
+  lib,
+  python3,
+  fetchFromGitHub,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "above";
+  version = "2.7";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "casterbyte";
+    repo = "Above";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-tOSAci9aIALNCL3nLui96EdvqjNxnnuj2/dMdWLY9yI=";
+  };
+
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [
+    colorama
+    scapy
+  ];
+
+  postFixup = ''
+    mv $out/bin/above.py $out/bin/$pname
+  '';
+
+  # Project has no tests
+  doCheck = false;
+
+  meta = {
+    description = "Invisible network protocol sniffer";
+    homepage = "https://github.com/casterbyte/Above";
+    changelog = "https://github.com/casterbyte/Above/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "above";
+  };
+}

pkgs/by-name/ab/abuild/package.nix

@@ -1,29 +1,30 @@
-{ lib
-, stdenv
-, fetchFromGitLab
-, gitUpdater
-, makeWrapper
-, pkg-config
-, file
-, scdoc
-, openssl
-, zlib
-, busybox
-, apk-tools
-, perl
-, findutils
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  gitUpdater,
+  makeWrapper,
+  pkg-config,
+  file,
+  scdoc,
+  openssl,
+  zlib,
+  busybox,
+  apk-tools,
+  perl,
+  findutils,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "abuild";
-  version = "3.13.0";
+  version = "3.14.1";
 
   src = fetchFromGitLab {
     domain = "gitlab.alpinelinux.org";
     owner = "alpine";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-xVxgcBchGfeVo1cgP9iVsWjZ6SHVN6R8zWaE1k3DcXQ=";
+    repo = "abuild";
+    rev = finalAttrs.version;
+    hash = "sha256-gNmje4USaklwmsVGs4NMFoharEk2syCmDdQ/SCSMKsI=";
   };
 
   buildInputs = [
@@ -31,13 +32,15 @@ stdenv.mkDerivation rec {
     zlib
     busybox
     # for $out/bin/apkbuild-cpan and $out/bin/apkbuild-pypi
-    (perl.withPackages (ps: with ps; [
-      LWP
-      JSON
-      ModuleBuildTiny
-      LWPProtocolHttps
-      IPCSystemSimple
-    ]))
+    (perl.withPackages (
+      ps: with ps; [
+        LWP
+        JSON
+        ModuleBuildTiny
+        LWPProtocolHttps
+        IPCSystemSimple
+      ]
+    ))
   ];
 
   nativeBuildInputs = [
@@ -82,12 +85,11 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     description = "Alpine Linux build tools";
     homepage = "https://gitlab.alpinelinux.org/alpine/abuild";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ onny ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ onny ];
+    platforms = lib.platforms.unix;
   };
-
-}
+})

pkgs/by-name/al/aliae/package.nix

@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "aliae";
-  version = "0.22.2";
+  version = "0.23.0";
 
   src = fetchFromGitHub {
     owner = "jandedobbeleer";
     repo = "aliae";
     rev = "refs/tags/v${version}";
-    hash = "sha256-IpOfTCMbnNUW8flyb7p98QEwveNb8wClyBuv7fAKm8Y=";
+    hash = "sha256-eJvtO5VL8miafrLQELSQB6/G2wUzTSdmeYW3j/AB3PU=";
   };
 
-  vendorHash = "sha256-aUKF/r0OFN0gZXCKHFYKyQa806NFP5lQAONFZlMP4vE=";
+  vendorHash = "sha256-bZG73TKU1vB0Ll/n+VndGZq+cpZRLvGdSAuJNiQwZ94=";
 
   sourceRoot = "${src.name}/src";
 

pkgs/by-name/bu/burpsuite/package.nix

@@ -9,20 +9,20 @@
 }:
 
 let
-  version = "2024.8.5";
+  version = "2024.10.1";
 
   product =
     if proEdition then
       {
         productName = "pro";
         productDesktop = "Burp Suite Professional Edition";
-        hash = "sha256-bG1+U16qRNnHHhjloUIMxBH7/zKRo0b3tEX1ebsClL4=";
+        hash = "sha256-r/j7nATyd8GbfoLNby5x1/5BVeRv5B/8Ri1fPUwaCoQ=";
       }
     else
       {
         productName = "community";
         productDesktop = "Burp Suite Community Edition";
-        hash = "sha256-rUDG2L/MC6vX58If7rLHKd73hyV2lSdO1ZZu9tDaznM=";
+        hash = "sha256-uvX1LTe2slPINrn+ywY3nyu/K+FTczvsW/FnP0z43Q8=";
       };
 
   src = fetchurl {

pkgs/by-name/co/cobang/package.nix

@@ -1,28 +1,17 @@
-{ lib
-, buildPythonApplication
-, fetchFromGitHub
-, brotlicffi
-, gst-python
-, kiss-headers
-, logbook
-, pillow
-, pygobject3
-, python-zbar
-, requests
-, single-version
-, gobject-introspection
-, gst-plugins-good
-, gtk3
-, libhandy
-, librsvg
-, networkmanager
-, setuptools
-, python
-, pytestCheckHook
-, wrapGAppsHook3
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  gst_all_1,
+  gobject-introspection,
+  gtk3,
+  libhandy,
+  librsvg,
+  networkmanager,
+  wrapGAppsHook3,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "cobang";
   version = "0.14.1";
   pyproject = true;
@@ -40,22 +29,22 @@ buildPythonApplication rec {
     sed -i '$ a\packages = ["cobang"]' pyproject.toml
   '';
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with python3Packages; [
     # Needed to recognize gobject namespaces
     gobject-introspection
     wrapGAppsHook3
     setuptools
   ];
 
-  buildInputs = [
+  buildInputs = with python3Packages; [
     # Requires v4l2src
-    gst-plugins-good
+    (gst_all_1.gst-plugins-good.override { gtkSupport = true; })
     # For gobject namespaces
     libhandy
     networkmanager
   ];
 
-  propagatedBuildInputs = [
+  dependencies = with python3Packages; [
     brotlicffi
     kiss-headers
     logbook
@@ -69,21 +58,25 @@ buildPythonApplication rec {
     gst-python
   ];
 
-  nativeCheckInputs = [
+  nativeCheckInputs = with python3Packages; [
     pytestCheckHook
   ];
 
+  pythonRelaxDeps = [
+    "Pillow"
+  ];
+
   # Wrapping this manually for SVG recognition
   dontWrapGApps = true;
 
   postInstall = ''
     # Needed by the application
-    cp -R data $out/${python.sitePackages}/
+    cp -R data $out/${python3Packages.python.sitePackages}/
 
     # Icons and applications
-    install -Dm 644 $out/${python.sitePackages}/data/vn.hoabinh.quan.CoBang.svg -t $out/share/pixmaps/
-    install -Dm 644 $out/${python.sitePackages}/data/vn.hoabinh.quan.CoBang.desktop.in -t $out/share/applications/
-    mv $out/${python.sitePackages}/data/vn.hoabinh.quan.CoBang.desktop{.in,}
+    install -Dm 644 $out/${python3Packages.python.sitePackages}/data/vn.hoabinh.quan.CoBang.svg -t $out/share/pixmaps/
+    install -Dm 644 $out/${python3Packages.python.sitePackages}/data/vn.hoabinh.quan.CoBang.desktop.in -t $out/share/applications/
+    mv $out/${python3Packages.python.sitePackages}/data/vn.hoabinh.quan.CoBang.desktop{.in,}
   '';
 
   preFixup = ''
@@ -93,11 +86,14 @@ buildPythonApplication rec {
       --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "QR code scanner desktop app for Linux";
     homepage = "https://github.com/hongquan/CoBang";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ aleksana dvaerum ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
+      aleksana
+      dvaerum
+    ];
     mainProgram = "cobang";
     platforms = lib.platforms.linux;
   };

pkgs/by-name/co/codux/package.nix

@@ -5,11 +5,11 @@
 
 let
   pname = "codux";
-  version = "15.35.2";
+  version = "15.37.3";
 
   src = fetchurl {
     url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage";
-    hash = "sha256-hRfChiVrO+uMPHwPZxN4XYYodXcRbOWZnWKfobBTAXE=";
+    hash = "sha256-SY2UmagOKdqbeWd6a/cUO9t3l8qjUy755YrhOBu8oi0=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname version src; };

pkgs/by-name/ge/genzai/package.nix

@@ -0,0 +1,37 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "genzai";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "umair9747";
+    repo = "Genzai";
+    rev = "refs/tags/${version}";
+    hash = "sha256-OTkHPzZcPOYZRzEKrJekrgKE/XfGUDL85RjznmrVZb8=";
+  };
+
+  vendorHash = null;
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  postFixup = ''
+    install -vD *.json -t $out/share
+  '';
+
+  meta = {
+    description = "Toolkit to help identify IoT related dashboards and scan them for default passwords and vulnerabilities";
+    homepage = "https://github.com/umair9747/Genzai";
+    changelog = "https://github.com/umair9747/Genzai/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "genzai";
+  };
+}

pkgs/by-name/gj/gjs/package.nix

@@ -147,6 +147,7 @@ in stdenv.mkDerivation (finalAttrs: {
     description = "JavaScript bindings for GNOME";
     homepage = "https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Home.md";
     license = licenses.lgpl2Plus;
+    mainProgram = "gjs";
     maintainers = teams.gnome.members;
     platforms = platforms.unix;
   };

pkgs/by-name/gn/gnome-maps/package.nix

@@ -25,6 +25,7 @@
   libadwaita,
   geocode-glib_2,
   tzdata,
+  writeText,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -68,6 +69,13 @@ stdenv.mkDerivation (finalAttrs: {
     libsoup_3
   ];
 
+  mesonFlags = [
+    "--cross-file=${writeText "crossfile.ini" ''
+      [binaries]
+      gjs = '${lib.getExe gjs}'
+    ''}"
+  ];
+
   preCheck = ''
     # “time.js” included by “timeTest” and “translationsTest” depends on “org.gnome.desktop.interface” schema.
     export XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:$XDG_DATA_DIRS"

pkgs/by-name/go/gopass-jsonapi/package.nix

@@ -0,0 +1,60 @@
+{
+  lib,
+  stdenv,
+  makeWrapper,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+  gopass,
+  apple-sdk_14,
+}:
+
+buildGoModule rec {
+  pname = "gopass-jsonapi";
+  version = "1.15.15";
+
+  src = fetchFromGitHub {
+    owner = "gopasspw";
+    repo = "gopass-jsonapi";
+    rev = "v${version}";
+    hash = "sha256-nayg7NTJH6bAPiguyuN37JivfWkpOUX/xI/+PHDi3UI=";
+  };
+
+  vendorHash = "sha256-khX1CdzN+5T8q2hA3NyCxtz7uw9uDd9u61q3UslTtqs=";
+
+  subPackages = [ "." ];
+
+  nativeBuildInputs = [
+    installShellFiles
+    makeWrapper
+  ];
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+    # For ScreenCaptureKit.h, see https://github.com/NixOS/nixpkgs/pull/358760#discussion_r1858327365
+    apple-sdk_14
+  ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.version=${version}"
+    "-X main.commit=${src.rev}"
+  ];
+
+  postFixup = ''
+    wrapProgram $out/bin/gopass-jsonapi \
+      --prefix PATH : "${gopass.wrapperPath}"
+  '';
+
+  meta = {
+    description = "Enables communication with gopass via JSON messages";
+    homepage = "https://github.com/gopasspw/gopass-jsonapi";
+    changelog = "https://github.com/gopasspw/gopass-jsonapi/blob/v${version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      maxhbr
+      doronbehar
+    ];
+    mainProgram = "gopass-jsonapi";
+  };
+}

pkgs/by-name/ja/jasmin-compiler/package.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jasmin-compiler";
-  version = "2024.07.1";
+  version = "2024.07.2";
 
   src = fetchurl {
     url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2";
-    hash = "sha256-at6jWm/Dv/duKmBBCIFkKborMxsQEpqEDO6NrJgzhz8=";
+    hash = "sha256-I8z5/Ggj5GSyvD7b9YYMh3My4vXAYVcP53BCFwCNxwQ=";
   };
 
   sourceRoot = "jasmin-compiler-v${version}/compiler";

pkgs/by-name/li/libqalculate/package.nix

@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libqalculate";
-  version = "5.3.0";
+  version = "5.4.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "libqalculate";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-YNw6oFjrbYifIlAF2fz+htT1PIk9oEn7nBrnIZIR7DE=";
+    hash = "sha256-IatxsbSKoLwG6yXCFtejUTl48gIis76rLeULc2+aktk=";
   };
 
   outputs = [ "out" "dev" "doc" ];

pkgs/by-name/ma/maven/package.nix

@@ -6,7 +6,6 @@
   makeWrapper,
   stdenvNoCC,
 }:
-
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "maven";
   version = "3.9.9";
@@ -34,14 +33,31 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  passthru = {
-    buildMaven = callPackage ./build-maven.nix {
-      maven = finalAttrs.finalPackage;
+  passthru =
+    let
+      makeOverridableMavenPackage =
+        mavenRecipe: mavenArgs:
+        let
+          drv = mavenRecipe mavenArgs;
+          overrideWith =
+            newArgs: mavenArgs // (if lib.isFunction newArgs then newArgs mavenArgs else newArgs);
+        in
+        drv
+        // {
+          overrideMavenAttrs = newArgs: makeOverridableMavenPackage mavenRecipe (overrideWith newArgs);
+        };
+    in
+    {
+      buildMaven = callPackage ./build-maven.nix {
+        maven = finalAttrs.finalPackage;
+      };
+
+      buildMavenPackage = makeOverridableMavenPackage (
+        callPackage ./build-maven-package.nix {
+          maven = finalAttrs.finalPackage;
+        }
+      );
     };
-    buildMavenPackage = callPackage ./build-maven-package.nix {
-      maven = finalAttrs.finalPackage;
-    };
-  };
 
   meta = {
     homepage = "https://maven.apache.org/";
@@ -54,7 +70,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.asl20;
     mainProgram = "mvn";
-    maintainers = [ ] ++ lib.teams.java.members;
+    maintainers = with lib.maintainers; [ tricktron ] ++ lib.teams.java.members;
     inherit (jdk_headless.meta) platforms;
   };
 })

pkgs/by-name/ol/ollama/package.nix

@@ -41,17 +41,17 @@ assert builtins.elem acceleration [
 let
   pname = "ollama";
   # don't forget to invalidate all hashes each update
-  version = "0.4.4";
+  version = "0.4.5";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     rev = "v${version}";
-    hash = "sha256-yyUm9kETNQiJjpGeVLPe67G2CrEKYNcrPFixqqq+rH4=";
+    hash = "sha256-4E3eqqJQEQYWVPFVZjnYSiXe4ZWUA0ifCRoHt7s0SL0=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-1+Eb81QQcVANQQ5u1c6is8dLVGYqrXKuFnF2MBkEHms=";
+  vendorHash = "sha256-xz9v91Im6xTLPzmYoVecdF7XiPKBZk3qou1SGokgPXQ=";
 
   validateFallback = lib.warnIf (config.rocmSupport && config.cudaSupport) (lib.concatStrings [
     "both `nixpkgs.config.rocmSupport` and `nixpkgs.config.cudaSupport` are enabled, "

pkgs/by-name/op/open-webui/package.nix

@@ -7,19 +7,19 @@
 }:
 let
   pname = "open-webui";
-  version = "0.4.5";
+  version = "0.4.6";
 
   src = fetchFromGitHub {
     owner = "open-webui";
     repo = "open-webui";
     rev = "refs/tags/v${version}";
-    hash = "sha256-XbH6tAmwIZzCasuL6e0Su56ZAlSBBZsq3iBytOthEZM=";
+    hash = "sha256-Zzytv2OLy3RENNWzRjjDh7xnJyX+H9/dh1Xj2HIsn6I=";
   };
 
   frontend = buildNpmPackage {
     inherit pname version src;
 
-    npmDepsHash = "sha256-bEmShvxHzDHiliA3IGN5A6Xf3cKf1PhULTueioDT7js=";
+    npmDepsHash = "sha256-36GdyqKcqhOYi1kRwXe0YTOtwbVUcEvLPPYy/A0IgE0=";
 
     # Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
     # Until this is solved, running python packages from the browser will not work.

pkgs/by-name/qa/qalculate-gtk/package.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qalculate-gtk";
-  version = "5.3.0";
+  version = "5.4.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-gtk";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-0+c6zInEorUH3Fd4qRJD1pXeAGsK6EY53qQAu3ctGKg=";
+    hash = "sha256-YZfjZxuYnpmIh9dKk1ggLgwww6gCP9F0MnY8BBOWiB0=";
   };
 
   hardeningDisable = [ "format" ];

pkgs/by-name/st/stract/package.nix

@@ -0,0 +1,36 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  pkg-config,
+  openssl,
+  curl,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "stract";
+  version = "0-unstable-2024-09-14";
+
+  src = fetchFromGitHub {
+    owner = "StractOrg";
+    repo = "stract";
+    rev = "21d28ea86d9ff19ccb4c25b1bdde67e5ec302d79";
+    hash = "sha256-7Uvo5+saxwTMQjfDliyOYC6j6LbpMf/FiONfX38xepI=";
+  };
+
+  cargoHash = "sha256-7Skbeeev/xBAhlcyOsYpDJB9LnZpT66D0Fu1I/jIBso=";
+
+  cargoDepsName = "stract";
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [
+    openssl
+    curl
+  ];
+
+  meta = {
+    description = "Open source web search engine hosted at stract.com targeted towards tinkerers and developers.";
+    homepage = "https://github.com/StractOrg/stract";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ ailsa-sun ];
+  };
+}

pkgs/by-name/ta/tartufo/package.nix

@@ -16,7 +16,10 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-s7gqGvOnie7lGlpW3wfd8igWfowxwg9mftRjiHnvedc=";
   };
 
-  pythonRelaxDeps = [ "tomlkit" ];
+  pythonRelaxDeps = [
+    "cached-property"
+    "tomlkit"
+  ];
 
   build-system = with python3.pkgs; [ poetry-core ];
 

pkgs/by-name/to/toot/package.nix

@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "toot";
-  version = "0.45.0";
+  version = "0.47.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ihabunek";
     repo = "toot";
     rev = "refs/tags/${version}";
-    hash = "sha256-xBpqB81LSOq+eGVwEL6fAxBR8UXCduf5syzCdwydW4Q=";
+    hash = "sha256-TG98e/3X+bcNsx8ZR0Nv0VWlR/cJ7tzz46K7tYyoKsM=";
   };
 
   nativeCheckInputs = with python3Packages; [ pytest ];
@@ -48,6 +48,7 @@ python3Packages.buildPythonApplication rec {
     description = "Mastodon CLI interface";
     mainProgram = "toot";
     homepage = "https://github.com/ihabunek/toot";
+    changelog = "https://github.com/ihabunek/toot/blob/refs/tags/${version}/CHANGELOG.md";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
       matthiasbeyer

pkgs/development/compilers/ocaml/generic.nix

@@ -6,7 +6,7 @@ let
   safeX11 = stdenv: !(stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isMips || stdenv.hostPlatform.isStatic);
 in
 
-{ lib, stdenv, fetchurl, ncurses, buildEnv, libunwind, fetchpatch
+{ lib, stdenv, fetchurl, ncurses, binutils, buildEnv, libunwind, fetchpatch
 , libX11, xorgproto, useX11 ? safeX11 stdenv && lib.versionOlder version "4.09"
 , aflSupport ? false
 , flambdaSupport ? false
@@ -111,6 +111,7 @@ stdenv.mkDerivation (args // {
     else ["nixpkgs_world"];
   buildInputs = optional (lib.versionOlder version "4.07") ncurses
     ++ optionals useX11 [ libX11 xorgproto ];
+  depsBuildBuild = [ binutils ];
   propagatedBuildInputs = optional spaceTimeSupport libunwind;
   installTargets = [ "install" ] ++ optional useNativeCompilers "installopt";
   preConfigure = optionalString (lib.versionOlder version "4.04") ''

pkgs/development/python-modules/cached-property/default.nix

@@ -2,38 +2,31 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
-  pytestCheckHook,
   freezegun,
+  pytestCheckHook,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "cached-property";
-  version = "1.5.2";
-  format = "setuptools";
+  version = "2.0.1";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "pydanny";
-    repo = pname;
+    repo = "cached-property";
     rev = "refs/tags/${version}";
-    hash = "sha256-DGI8FaEjFd2bDeBDKcA0zDCE+5I6meapVNZgycE1gzs=";
+    hash = "sha256-sOThFJs18DR9aBgIpqkORU4iRmhCVKehyM3DLYUt/Wc=";
   };
 
-  patches = [
-    # Don't use asyncio.coroutine if it's not available, https://github.com/pydanny/cached-property/pull/267
-    (fetchpatch {
-      name = "asyncio-coroutine.patch";
-      url = "https://github.com/pydanny/cached-property/commit/297031687679762849dedeaf24aa3a19116f095b.patch";
-      hash = "sha256-qolrUdaX7db4hE125Lt9ICmPNYsD/uBmQrdO4q5NG3c=";
-    })
-  ];
+  build-system = [ setuptools ];
 
-  checkInputs = [
-    pytestCheckHook
+  nativeCheckInputs = [
     freezegun
+    pytestCheckHook
   ];
 
   disabledTests = [

pkgs/development/python-modules/ecoaliface/default.nix

@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "ecoaliface";
-  version = "0.5.0";
+  version = "0.7.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f17b3452cfd31bb8c3509d59b846889c81db5fb85082c061c32703162cbe9083";
+    sha256 = "sha256-Z1O+Lkq1sIpjkz0N4g4FCUzTw51V4fYxlUVg+2sZ/ac=";
   };
 
   propagatedBuildInputs = [ requests ];

pkgs/development/python-modules/flatten-json/default.nix

@@ -0,0 +1,40 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  pythonOlder,
+  setuptools,
+  six,
+}:
+
+buildPythonPackage rec {
+  pname = "flatten-json";
+  version = "0.1.13";
+  pyproject = true;
+
+  disabled = pythonOlder "3.10";
+
+  src = fetchFromGitHub {
+    owner = "amirziai";
+    repo = "flatten";
+    rev = "v${version}";
+    hash = "sha256-ViOLbfJtFWkDQ5cGNYerTk2BqVg5f5B3hZ96t0uvhpk=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ six ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "flatten_json" ];
+
+  meta = {
+    description = "Flatten JSON in Python";
+    homepage = "https://github.com/amirziai/flatten";
+    changelog = "https://github.com/amirziai/flatten/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}

pkgs/development/python-modules/jsonformatter/default.nix

@@ -1,29 +1,33 @@
 {
   lib,
-  fetchFromGitHub,
   buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "jsonformatter";
-  version = "0.3.2";
-  format = "setuptools";
+  version = "0.3.4";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "MyColorfulDays";
-    repo = pname;
+    repo = "jsonformatter";
     rev = "refs/tags/v${version}";
-    hash = "sha256-oK419J/MIxRT+1j/5Yklj1F+4d3wuMXR8IVqJAMKPNw=";
+    hash = "sha256-A+lsSBrm/64w7yMabmuAbRCLwUUdulGH3jB/DbYJ2QY=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "jsonformatter" ];
 
   meta = with lib; {
-    description = "jsonformatter is a formatter for python output json log, e.g. output LogStash needed log";
+    description = "Formatter to output JSON log, e.g. output LogStash needed log";
     homepage = "https://github.com/MyColorfulDays/jsonformatter";
+    changelog = "https://github.com/MyColorfulDays/jsonformatter/releases/tag/v${version}";
     license = licenses.bsd2;
     maintainers = with maintainers; [ gador ];
   };

pkgs/development/python-modules/ml-collections/default.nix

@@ -2,58 +2,53 @@
   absl-py,
   buildPythonPackage,
   contextlib2,
-  fetchPypi,
+  fetchFromGitHub,
   fetchurl,
   lib,
   pyyaml,
+  six,
+  setuptools,
+  flit-core,
+  pytestCheckHook,
+  pytest-xdist,
 }:
 
-let
-  requirements = fetchurl {
-    url = "https://raw.githubusercontent.com/google/ml_collections/7f749a281c69f9d0b339c05ecb94b80d95029f25/requirements.txt";
-    sha256 = "1xb351hiscj4zmajfkql3swpacdp6lmz8iwdvwwdx2zqw9a62zps";
-  };
-  requirements-test = fetchurl {
-    url = "https://raw.githubusercontent.com/google/ml_collections/7f749a281c69f9d0b339c05ecb94b80d95029f25/requirements-test.txt";
-    sha256 = "0r457k2nrg5jkf093r0x29yf8xwy6l7jxi6al0fh7mmnfrhr9cb1";
-  };
-in
 buildPythonPackage rec {
   pname = "ml-collections";
-  version = "0.1.1";
-  format = "setuptools";
+  version = "1.0.0";
+  pyproject = true;
+  build-system = [ flit-core ];
 
-  # ml-collections does not have any git release tags. See https://github.com/google/ml_collections/issues/8.
-  src = fetchPypi {
-    inherit version;
-    pname = "ml_collections";
-    hash = "sha256-P+/McuxDOqHl0yMHo+R0u7Z/QFvoFOpSohZr/J2+aMw=";
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "ml_collections";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-QUhwkfffjA6gKd6lTmEgnnoUeJOu82mfFPBta9/iebg=";
   };
 
-  # The pypi source archive does not include requirements.txt or
-  # requirements-test.txt. See https://github.com/google/ml_collections/issues/7.
-  postPatch = ''
-    cp ${requirements} requirements.txt
-    cp ${requirements-test} requirements-test.txt
-  '';
-
-  propagatedBuildInputs = [
+  dependencies = [
+    six
     absl-py
     contextlib2
     pyyaml
   ];
 
-  # The official test suite uses bazel. With pytestCheckHook there are name
-  # conflicts between files and tests have assumptions that are broken by the
-  # nix-build environment, eg. re module names and __file__ attributes.
-  doCheck = false;
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-xdist
+  ];
+
+  pytestFlagsArray = [
+    "ml_collections/"
+    "--ignore=ml_collections/config_dict/examples/examples_test.py" # From github workflows
+  ];
 
   pythonImportsCheck = [ "ml_collections" ];
 
-  meta = with lib; {
+  meta = {
     description = "ML Collections is a library of Python collections designed for ML usecases";
     homepage = "https://github.com/google/ml_collections";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ samuela ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ samuela ];
   };
 }

pkgs/development/python-modules/msgraph-sdk/default.nix

@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "msgraph-sdk";
-  version = "1.12.0";
+  version = "1.13.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "microsoftgraph";
     repo = "msgraph-sdk-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-RB5DxcddMmByWZ4XA/SaIVVxPXdqSRCUbTeWIR5YW2g=";
+    hash = "sha256-1f7Uj38IjI1wdWWzdAaOvoDtddukUhtH8xFKOYPzBdM=";
   };
 
   build-system = [ flit-core ];

pkgs/development/python-modules/nsapi/default.nix

@@ -2,28 +2,28 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  future,
   pythonOlder,
   pytz,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "nsapi";
-  version = "3.0.5";
-  format = "setuptools";
-  disabled = pythonOlder "3.7";
+  version = "3.1.2";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "aquatix";
     repo = "ns-api";
-    rev = "v${version}";
-    sha256 = "0i1zkvi4mrhkh1gxzpa54mq8mb76s9nf3jxxhpqia56nkq8f8krb";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-H8qxqzcGZ52W/HbTuKdnfnaYdZFaxzuUhrniS1zsL2w=";
   };
 
-  propagatedBuildInputs = [
-    future
-    pytz
-  ];
+  build-system = [ setuptools ];
+
+  dependencies = [ pytz ];
 
   # Project has no tests
   doCheck = false;
@@ -33,7 +33,8 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python module to query routes of the Dutch railways";
     homepage = "https://github.com/aquatix/ns-api/";
-    license = with licenses; [ mit ];
+    changelog = "https://github.com/aquatix/ns-api/releases/tag/v${version}";
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
 }

pkgs/development/python-modules/plotnine/default.nix

@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "plotnine";
-  version = "0.14.2";
+  version = "0.14.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "has2k1";
     repo = "plotnine";
     rev = "refs/tags/v${version}";
-    hash = "sha256-hO6HxzzCCFfZVvqCaFf7JfWYFFfU9umFgNM1+Z1HBuQ=";
+    hash = "sha256-hGgPW40PEkOV1Z7gaqHtbx1ybdtEFYyz8fYUBMZchmU=";
   };
 
   postPatch = ''

pkgs/development/python-modules/podman/default.nix

@@ -15,16 +15,16 @@
 
 buildPythonPackage rec {
   pname = "podman";
-  version = "5.2.0";
+  version = "5.3.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "podman-py";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2NsF00jaW2wl99sTxTQ5xJkqNOYh9RaecmBMcWP3TI8=";
+    hash = "sha256-YER+qTC5+eF3PWtDBPq2WNOm5RzqXy30+1JdPzwyfrk=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/tinygrad/default.nix

@@ -15,9 +15,8 @@
   # build-system
   setuptools,
 
-  # dependencies
+  # optional-dependencies
   llvmlite,
-  numpy,
   triton,
   unicorn,
 
@@ -29,6 +28,7 @@
   hypothesis,
   librosa,
   networkx,
+  numpy,
   onnx,
   pillow,
   pytest-xdist,
@@ -45,14 +45,14 @@
 
 buildPythonPackage rec {
   pname = "tinygrad";
-  version = "0.9.2";
+  version = "0.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tinygrad";
     repo = "tinygrad";
     rev = "refs/tags/v${version}";
-    hash = "sha256-fCKtJhZtqq6yjc6m41uvikzM9GArUlB8Q7jN/Np8+SM=";
+    hash = "sha256-IIyTb3jDUSEP2IXK6DLsI15E5N34Utt7xv86aTHpXf8=";
   };
 
   patches = [
@@ -68,15 +68,15 @@ buildPythonPackage rec {
   ];
 
   postPatch =
-    ''
-      substituteInPlace tinygrad/runtime/autogen/opencl.py \
-        --replace-fail "ctypes.util.find_library('OpenCL')" "'${ocl-icd}/lib/libOpenCL.so'"
-    ''
     # Patch `clang` directly in the source file
-    + ''
+    ''
       substituteInPlace tinygrad/runtime/ops_clang.py \
         --replace-fail "'clang'" "'${lib.getExe clang}'"
     ''
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
+      substituteInPlace tinygrad/runtime/autogen/opencl.py \
+        --replace-fail "ctypes.util.find_library('OpenCL')" "'${ocl-icd}/lib/libOpenCL.so'"
+    ''
     # `cuda_fp16.h` and co. are needed at runtime to compile kernels
     + lib.optionalString cudaSupport ''
       substituteInPlace tinygrad/runtime/support/compiler_cuda.py \
@@ -95,15 +95,6 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies =
-    [
-      numpy
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # pyobjc-framework-libdispatch
-      # pyobjc-framework-metal
-    ];
-
   optional-dependencies = {
     llvm = [ llvmlite ];
     arm = [ unicorn ];
@@ -126,6 +117,7 @@ buildPythonPackage rec {
     hypothesis
     librosa
     networkx
+    numpy
     onnx
     pillow
     pytest-xdist
@@ -144,9 +136,9 @@ buildPythonPackage rec {
 
   disabledTests =
     [
-      # flaky: https://github.com/tinygrad/tinygrad/issues/6542
-      # TODO: re-enable when https://github.com/tinygrad/tinygrad/pull/6560 gets merged
-      "test_broadcastdot"
+      # Fixed in https://github.com/tinygrad/tinygrad/pull/7792
+      # TODO: re-enable at next release
+      "test_kernel_cache_in_action"
 
       # Require internet access
       "test_benchmark_openpilot_model"
@@ -181,8 +173,12 @@ buildPythonPackage rec {
       "test_transcribe_long_no_batch"
       "test_vgg7"
     ]
-    # Fail on aarch64-linux with AssertionError
     ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
+      # Fixed in https://github.com/tinygrad/tinygrad/pull/7796
+      # TODO: re-enable at next release
+      "test_interpolate_bilinear"
+
+      # Fail with AssertionError
       "test_casts_from"
       "test_casts_to"
       "test_int8"
@@ -209,7 +205,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/tinygrad/tinygrad/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ GaetanLepage ];
-    # Requires unpackaged pyobjc-framework-libdispatch and pyobjc-framework-metal
-    broken = stdenv.hostPlatform.isDarwin;
+    # Tests segfault on darwin
+    badPlatforms = [ lib.systems.inspect.patterns.isDarwin ];
   };
 }

pkgs/development/tools/analysis/rizin/cutter.nix

@@ -1,5 +1,6 @@
 { lib
 , fetchFromGitHub
+, fetchpatch
 , stdenv
 # for passthru.plugins
 , pkgs
@@ -32,6 +33,14 @@ let cutter = stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
+  patches = [
+    # https://github.com/rizinorg/cutter/issues/3384
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/rz-cutter/-/raw/f736a5709c0b4711760f8242fa77eeaf178c0302/pyside-6.8.patch";
+      hash = "sha256-k1Bn6tCNkbE9r5QLfJTBg1zZZU9R7fG1tyfPgSJyQgg=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config

pkgs/development/tools/continuous-integration/woodpecker/common.nix

@@ -1,7 +1,7 @@
 { lib, fetchzip }:
 let
-  version = "2.7.1";
-  srcHash = "sha256-x9eCBxrujIJ0kwN5jyn7FKu7uyN+pIBCVDLckhiUzmM=";
+  version = "2.7.3";
+  srcHash = "sha256-ut5F2KZlWkJeAiLv2z9WmSoUoXxbzCXCgmZiwtX0f+U=";
   # The tarball contains vendored dependencies
   vendorHash = null;
 in

pkgs/games/heroic/fhsenv.nix

@@ -6,7 +6,8 @@
 }:
 
 buildFHSEnv {
-  name = "heroic";
+  pname = "heroic";
+  inherit (heroic-unwrapped) version;
 
   runScript = "heroic";
 

pkgs/tools/misc/jsonwatch/default.nix

@@ -1,26 +1,21 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, rustPlatform
-, Security
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "jsonwatch";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "dbohdan";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-TGW04P8t0mAXza7I7qp6QRXA/MDE3m1dlRC7bMf2dSk=";
+    repo = "jsonwatch";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-WzQ793dLb8OujNpEq7UXIgJM+lz0WZEVlbKmwM58klU=";
   };
 
-  cargoHash = "sha256-Gjb7v3kz11iOml3Ykxhy43KNxzaprgMbb5DpPNChLTc=";
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    Security
-  ];
+  cargoHash = "sha256-76Vvs3OaxYDZE39d9h3T8HhYQfHhY5D17PgQxcPrMyc=";
 
   meta = with lib; {
     description = "Like watch -d but for JSON";
@@ -34,8 +29,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/dbohdan/jsonwatch";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
-    # never built on aarch64-darwin since first introduction in nixpkgs
-    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
     mainProgram = "jsonwatch";
   };
 }

pkgs/tools/security/gopass/jsonapi.nix

@@ -1,43 +0,0 @@
-{ lib
-, makeWrapper
-, buildGoModule
-, fetchFromGitHub
-, installShellFiles
-, gopass
-}:
-
-buildGoModule rec {
-  pname = "gopass-jsonapi";
-  version = "1.15.14";
-
-  src = fetchFromGitHub {
-    owner = "gopasspw";
-    repo = "gopass-jsonapi";
-    rev = "v${version}";
-    hash = "sha256-DbfmjgIUqgWVYyPqkcaeE5JKzqElNbrGnx62Fd8v7Hg=";
-  };
-
-  vendorHash = "sha256-Aahu0afi6bPnvz/NSZznbp0y9vMJWDj1Bq7tWGRmm7g=";
-
-  subPackages = [ "." ];
-
-  nativeBuildInputs = [ installShellFiles makeWrapper ];
-
-  ldflags = [
-    "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}"
-  ];
-
-  postFixup = ''
-    wrapProgram $out/bin/gopass-jsonapi \
-      --prefix PATH : "${gopass.wrapperPath}"
-  '';
-
-  meta = with lib; {
-    description = "Enables communication with gopass via JSON messages";
-    homepage = "https://github.com/gopasspw/gopass-jsonapi";
-    changelog = "https://github.com/gopasspw/gopass-jsonapi/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ maxhbr ];
-    mainProgram = "gopass-jsonapi";
-  };
-}

pkgs/top-level/all-packages.nix

@@ -1901,8 +1901,6 @@ with pkgs;
 
   gopass-hibp = callPackage ../tools/security/gopass/hibp.nix { };
 
-  gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { };
-
   git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { };
 
   gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { };
@@ -3039,10 +3037,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
-  cobang = python311Packages.callPackage ../applications/misc/cobang {
-    gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
-  };
-
   cocoapods = callPackage ../development/tools/cocoapods { };
 
   cocoapods-beta = lowPrio (callPackage ../development/tools/cocoapods { beta = true; });
@@ -3958,9 +3952,7 @@ with pkgs;
 
   json-schema-for-humans = with python3Packages; toPythonApplication json-schema-for-humans;
 
-  jsonwatch = callPackage ../tools/misc/jsonwatch {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  jsonwatch = callPackage ../tools/misc/jsonwatch { };
 
   jupyter = callPackage ../applications/editors/jupyter { };
 

pkgs/top-level/python-packages.nix

@@ -4717,6 +4717,8 @@ self: super: with self; {
 
   flatten-dict = callPackage ../development/python-modules/flatten-dict { };
 
+  flatten-json = callPackage ../development/python-modules/flatten-json { };
+
   flax = callPackage ../development/python-modules/flax { };
 
   flaxlib = callPackage ../development/python-modules/flaxlib { };