knobkraft-orm: 2.7.2 -> 2.10.0

doc/release-notes/rl-2611.section.md

@@ -45,6 +45,10 @@
 
 - `databricks-cli` has been updated from `0.290.2` to `1.x.x`, the first major release. OAuth tokens for interactive logins (`auth_type = databricks-cli`) are now stored in the OS-native secure store by default (Secret Service on Linux) instead of `~/.databricks/token-cache.json`; cached tokens from older versions are not migrated, so run `databricks auth login` once per profile after upgrading. To keep the previous file-backed storage, set `DATABRICKS_AUTH_STORAGE=plaintext` or add `auth_storage = plaintext` under `[__settings__]` in `~/.databrickscfg`. Additionally, the `vector_search_endpoints` DABs resource renamed `min_qps` to `target_qps` (and the `vector-search-endpoints` command renamed `--min-qps` to `--target-qps`). See the [upstream changelog](https://github.com/databricks/cli/blob/main/CHANGELOG.md) for details.
 
+- `knobkraft-orm` has been updated from 2.7.2 to 2.10.0. Orm automatically backs up the database before attempting the schema migration introduced in 2.8.0.
+  For affected Roland JV/JD-Xi/XV synthesizers, use **Edit > Reindex patches...** after restarting Orm and before importing more patches. Duplicate sounds may merge, and recordings named by old fingerprints are not automatically renamed.
+  See the [upstream migration instructions](https://github.com/christofmuc/KnobKraft-orm/blob/2.10.0/docs/roland-fingerprints.md).
+
 - Gradle 7 has been removed because it is end-of-life. Please [upgrade to a newer version of Gradle](https://docs.gradle.org/current/userguide/upgrading_version_7.html).
 
 - `hurl` has been updated to `8.x.x` which has some breaking changes. See [upstream changelog](https://github.com/Orange-OpenSource/hurl/releases/tag/8.0.0) for details.

pkgs/by-name/kn/knobkraft-orm/package.nix

@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
+  makeWrapper,
   pkg-config,
 
   gtk3,
@@ -38,18 +39,19 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "KnobKraft-orm";
 
-  version = "2.7.2";
+  version = "2.10.0";
 
   src = fetchFromGitHub {
     owner = "christofmuc";
     repo = "knobkraft-orm";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-1mPeiey0hbJmg5k9R06wnDIGDDxbOfRixQ0zoFa4zYA=";
+    hash = "sha256-5d1sYoNBLspBc8b8dwNS1H7dTSFiMBPHE7Ti1MV3Sv0=";
   };
 
   nativeBuildInputs = [
     cmake
+    makeWrapper
     pkg-config
   ];
 
@@ -84,19 +86,35 @@ stdenv.mkDerivation (finalAttrs: {
     libwebp
   ];
 
-  # Issue has been raised and should be resolved with next release.
-  # CMakeLists.txt needs three more lines to properly build.
+  # Archive toolchain workaround and version injection for sources without Git metadata.
+  # Upstream discussion: https://github.com/christofmuc/KnobKraft-orm/pull/486
   patches = [ ./temporary.patch ];
 
+  postPatch = ''
+    # Keep bundled adaptations and their support modules out of bin.
+    substituteInPlace adaptations/CMakeLists.txt \
+      --replace-fail 'DESTINATION bin' 'DESTINATION share/knobkraft-orm/adaptations'
+    # Update Python imports, discovery, built-in names and adaptation export.
+    substituteInPlace adaptations/GenericAdaptation.cpp \
+      --replace-fail 'getChildFile("adaptations")' 'getChildFile("../share/knobkraft-orm/adaptations")'
+  '';
+
   cmakeFlags = [
-    (lib.cmakeFeature "CMAKE_INTERPROCEDURAL_OP" "off")
+    (lib.cmakeFeature "CMAKE_INTERPROCEDURAL_OPTIMIZATION" "OFF")
+    (lib.cmakeFeature "KNOBKRAFT_EXTERNAL_VERSION" finalAttrs.version)
     (lib.cmakeFeature "PYTHON_VERSION_TO_EMBED" "${python312.pythonVersion}")
   ];
 
   makeFlags = [
     "package"
   ];
 
+  postInstall = ''
+    # Embedded Python must find its own standard-library extension modules.
+    wrapProgram "$out/bin/KnobKraftOrm" \
+      --set PYTHONHOME "${python312}"
+  '';
+
   meta = {
     homepage = "https://github.com/christofmuc/KnobKraft-orm";
     description = "Modern FOSS MIDI Sysex Librarian";

pkgs/by-name/kn/knobkraft-orm/temporary.patch

@@ -34,7 +34,7 @@ index 1c7186e..39cebd0 100644
 -
 -# Start project
 -project(KnobKraftOrm VERSION ${PROJECT_VERSION})
-+project(KnobKraftOrm VERSION 2.7.1)
++project(KnobKraftOrm VERSION ${KNOBKRAFT_EXTERNAL_VERSION})
 
  # Now you can use PROJECT_DEV_TAG in your CMake scripts or in your code to handle the "-dev" part.
  # For example, you could add a preprocessor definition that your code could use: