Merge pull request #331366 from techknowlogick/bump-gitbutler
gitbutler: 0.12.7 -> 0.12.16
This commit is contained in:
commit
4b2abd87ac
2454
pkgs/by-name/gi/gitbutler/Cargo.lock
generated
2454
pkgs/by-name/gi/gitbutler/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -20,16 +20,17 @@
|
||||
openssl,
|
||||
webkitgtk,
|
||||
nix-update-script,
|
||||
cacert,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gitbutler";
|
||||
version = "0.12.7";
|
||||
version = "0.12.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gitbutlerapp";
|
||||
repo = "gitbutler";
|
||||
rev = "release/${version}";
|
||||
hash = "sha256-TNaWLcdPECK1y04aYW4bFk7YKlW+z5kny4uyG0TA5ps=";
|
||||
hash = "sha256-L4PVaNb3blpLIcyA7XLc71qwUPUADclxvbOkq1Jc1no=";
|
||||
};
|
||||
|
||||
# deactivate the upstream updater in tauri configuration
|
||||
@ -43,13 +44,13 @@ rustPlatform.buildRustPackage rec {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"tauri-plugin-context-menu-0.7.1" = "sha256-vKfq20hrFLmfoXO94D8HwAE3UdGcuqVZf3+tOBhLqj0=";
|
||||
"tauri-plugin-log-0.0.0" = "sha256-Mf2/cnKotd751ZcSHfiSLNe2nxBfo4dMBdoCwQhe7yI=";
|
||||
"tauri-plugin-log-0.0.0" = "sha256-gde2RS5NFA0Xap/Xb7XOeVQ/5t2Nw+j+HOwfeJmSNMU=";
|
||||
};
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit pname version src;
|
||||
hash = "sha256-HKsb+96YklgPoqc7bA6fMuRQzWFGmKSBOcF5I0BO3oQ=";
|
||||
hash = "sha256-r2PkNDvOofginL5Y0K+7Qhnsev2zle1q9qraG/ub7Wo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -61,6 +62,7 @@ rustPlatform.buildRustPackage rec {
|
||||
pkg-config
|
||||
pnpm_9.configHook
|
||||
wrapGAppsHook3
|
||||
cacert
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
@ -84,6 +86,9 @@ rustPlatform.buildRustPackage rec {
|
||||
# `pnpm`'s `fetchDeps` and `configHook` uses a specific version of pnpm, not upstream's
|
||||
COREPACK_ENABLE_STRICT = 0;
|
||||
|
||||
# disable turbo telemetry
|
||||
TURBO_TELEMETRY_DEBUG = 1;
|
||||
|
||||
# we depend on nightly features
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
@ -118,11 +123,18 @@ rustPlatform.buildRustPackage rec {
|
||||
);
|
||||
}
|
||||
);
|
||||
|
||||
# Needed to get openssl-sys to use pkgconfig.
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
pushd packages/ui
|
||||
pnpm package
|
||||
popd
|
||||
|
||||
cargo tauri build --bundles "$tauriBundle"
|
||||
|
||||
runHook postBuild
|
||||
@ -171,7 +183,10 @@ rustPlatform.buildRustPackage rec {
|
||||
changelog = "https://github.com/gitbutlerapp/gitbutler/releases/tag/release/${version}";
|
||||
mainProgram = "git-butler";
|
||||
license = lib.licenses.fsl11Mit;
|
||||
maintainers = with lib.maintainers; [ getchoo ];
|
||||
maintainers = with lib.maintainers; [
|
||||
getchoo
|
||||
techknowlogick
|
||||
];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user