Skip to content

Commit

Permalink
Merge pull request #279158 from konradmalik/rtx
Browse files Browse the repository at this point in the history
mise: 2023.12.35 -> 2024.1.11 rebrand from rtx
  • Loading branch information
wegank authored Jan 14, 2024
2 parents 3ea621c + d744e65 commit 3763c9f
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,32 @@
, direnv
, Security
, SystemConfiguration
, rtx
, mise
, testers
}:

rustPlatform.buildRustPackage rec {
pname = "rtx";
version = "2023.12.35";
pname = "mise";
version = "2024.1.11";

src = fetchFromGitHub {
owner = "jdx";
repo = "rtx";
repo = "mise";
rev = "v${version}";
hash = "sha256-vzMjC6qIPhZm80hzYQRpF3j+s85B0nwTcgSGRATQEIg=";
hash = "sha256-ELC+IpcWMHBDIGPAg8v1LJUUIXEmzJzCeJt2TkqXs7s=";
};

cargoHash = "sha256-LvW5xGVggzuXlFPhbrc93Dht3S9zaQyx9Nm+Mx/Mjh0=";
cargoHash = "sha256-hZ8B3CVaTpIt3GudN/TWxI/xox724Prk8Uc8wA3Wd6Q=";

nativeBuildInputs = [ installShellFiles pkg-config ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];

postPatch = ''
patchShebangs --build ./test/data/plugins/**/bin/* ./src/fake_asdf.rs ./src/cli/reshim.rs
patchShebangs --build \
./test/data/plugins/**/bin/* \
./src/fake_asdf.rs \
./src/cli/reshim.rs \
./test/cwd/.mise/tasks/filetask
substituteInPlace ./src/env_diff.rs \
--replace '"bash"' '"${bash}/bin/bash"'
Expand All @@ -51,25 +55,25 @@ rustPlatform.buildRustPackage rec {
dontUseCargoParallelTests = true;

postInstall = ''
installManPage ./man/man1/rtx.1
installManPage ./man/man1/mise.1
installShellCompletion \
--bash ./completions/rtx.bash \
--fish ./completions/rtx.fish \
--zsh ./completions/_rtx
--bash ./completions/mise.bash \
--fish ./completions/mise.fish \
--zsh ./completions/_mise
'';

passthru = {
updateScript = nix-update-script { };
tests.version = testers.testVersion { package = rtx; };
tests.version = testers.testVersion { package = mise; };
};

meta = {
homepage = "https://github.com/jdx/rtx";
description = "Polyglot runtime manager (asdf rust clone)";
changelog = "https://github.com/jdx/rtx/releases/tag/v${version}";
homepage = "https://mise.jdx.dev";
description = "The front-end to your dev env";
changelog = "https://github.com/jdx/mise/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ konradmalik ];
mainProgram = "rtx";
mainProgram = "mise";
};
}
1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -911,6 +911,7 @@ mapAliases ({
rr-unstable = rr; # Added 2022-09-17
rtl8723bs-firmware = throw "rtl8723bs-firmware was added in mainline kernel version 4.12"; # Added 2023-07-03
rtsp-simple-server = throw "rtsp-simple-server is rebranded as mediamtx, including default config path update"; # Added 2023-04-11
rtx = mise; # Added 2024-01-05
runCommandNoCC = runCommand;
runCommandNoCCLocal = runCommandLocal;
rustc-wasm32 = rustc; # Added 2023-12-01
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18216,7 +18216,7 @@ with pkgs;

asdf-vm = callPackage ../tools/misc/asdf-vm { };

rtx = callPackage ../tools/misc/rtx {
mise = callPackage ../tools/misc/mise {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};

Expand Down

0 comments on commit 3763c9f

Please sign in to comment.