From 59b8c9b5e769547c7cecf058d4426a5a44be83be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@cachix.org>
Date: Sat, 12 Apr 2025 18:15:15 +0100
Subject: [PATCH] devenv: 1.4.1 -> 1.5

---
 pkgs/by-name/de/devenv/package.nix | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix
index d3ebaef3882a..38b949855124 100644
--- a/pkgs/by-name/de/devenv/package.nix
+++ b/pkgs/by-name/de/devenv/package.nix
@@ -6,7 +6,6 @@
   rustPlatform,
   testers,
   cachix,
-  sqlx-cli,
   nixVersions,
   openssl,
   pkg-config,
@@ -20,14 +19,14 @@ let
     src = fetchFromGitHub {
       owner = "domenkozar";
       repo = "nix";
-      rev = "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546";
-      hash = "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=";
+      rev = "f3f44b2baaf6c4c6e179de8cbb1cc6db031083cd";
+      hash = "sha256-E3j+3MoY8Y96mG1dUIiLFm2tZmNbRvSiyN7CrSKuAVg=";
     };
     doCheck = false;
     doInstallCheck = false;
   });
 
-  version = "1.4.1";
+  version = "1.5";
 in
 rustPlatform.buildRustPackage {
   pname = "devenv";
@@ -37,29 +36,18 @@ rustPlatform.buildRustPackage {
     owner = "cachix";
     repo = "devenv";
     rev = "v${version}";
-    hash = "sha256-OjdnHKQ+eWA8YvPUpl3xxyaNK91c9sMebqXgVdN8Lm4=";
+    hash = "sha256-bJlcIFcEhobOiaJsxub48fR8nIZDU4QK4FIycmDW2mk=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Z7xf1fuXi2Lx005rQwWa7ZNw8nJGz1z33KPnX/pxO3E=";
+  cargoHash = "sha256-9veQGMUEJDVXNouhpU8pAx8lJZHLyZbFSnMGMK58VVw=";
 
   buildAndTestSubdir = "devenv";
 
-  # Force sqlx to use the prepared queries
-  SQLX_OFFLINE = true;
-  # A local database to use for preparing queries
-  DATABASE_URL = "sqlite:nix-eval-cache.db";
-
-  preBuild = ''
-    cargo sqlx database setup --source devenv-eval-cache/migrations
-    cargo sqlx prepare --workspace
-  '';
-
   nativeBuildInputs = [
     installShellFiles
     makeBinaryWrapper
     pkg-config
-    sqlx-cli
   ];
 
   buildInputs = [ openssl ];