diff --git a/default.nix b/default.nix index 31f870ba9..872917f30 100644 --- a/default.nix +++ b/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, direnv, openssl }: +{ pkgs, lib, stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, direnv, openssl, git }: rustPlatform.buildRustPackage { pname = "mise"; @@ -22,17 +22,17 @@ rustPlatform.buildRustPackage { ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; prePatch = '' - substituteInPlace ./test/data/plugins/**/bin/* \ - --replace '#!/usr/bin/env bash' '#!${bash}/bin/bash' - substituteInPlace ./src/fake_asdf.rs ./src/cli/reshim.rs \ - --replace '#!/bin/sh' '#!${bash}/bin/sh' + substituteInPlace ./src/test.rs ./test/data/plugins/**/bin/* \ + --replace '/usr/bin/env bash' '${bash}/bin/bash' + substituteInPlace ./src/fake_asdf.rs ./src/cli/generate/git_pre_commit.rs ./src/cli/generate/snapshots/*.snap \ + --replace '/bin/sh' '${bash}/bin/sh' substituteInPlace ./src/env_diff.rs \ --replace '"bash"' '"${bash}/bin/bash"' - substituteInPlace ./test/cwd/.mise/tasks/filetask \ - --replace '#!/usr/bin/env bash' '#!${bash}/bin/bash' substituteInPlace ./src/cli/direnv/exec.rs \ --replace '"env"' '"${coreutils}/bin/env"' \ --replace 'cmd!("direnv"' 'cmd!("${direnv}/bin/direnv"' + substituteInPlace ./src/git.rs ./src/test.rs \ + --replace '"git"' '"${git}/bin/git"' ''; # Skip the test_plugin_list_urls as it uses the .git folder, which diff --git a/flake.lock b/flake.lock index f5feddac9..eece443b6 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1704161960, - "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", + "lastModified": 1718428119, + "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63143ac2c9186be6d9da6035fa22620018c85932", + "rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5", "type": "github" }, "original": {