From 916407646aefdb48f23208a7a7432427aa198188 Mon Sep 17 00:00:00 2001 From: Harinn Date: Thu, 16 Apr 2026 01:12:41 +0700 Subject: [PATCH] pijul: 1.0.0-beta.9 -> 1.0.0-beta.11 --- .../fix-rand-0.9-sanakirja-imports.patch | 19 +++++++++++++++++++ pkgs/by-name/pi/pijul/package.nix | 10 +++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 pkgs/by-name/pi/pijul/fix-rand-0.9-sanakirja-imports.patch diff --git a/pkgs/by-name/pi/pijul/fix-rand-0.9-sanakirja-imports.patch b/pkgs/by-name/pi/pijul/fix-rand-0.9-sanakirja-imports.patch new file mode 100644 index 000000000000..17f34d5d3f43 --- /dev/null +++ b/pkgs/by-name/pi/pijul/fix-rand-0.9-sanakirja-imports.patch @@ -0,0 +1,19 @@ +--- a/src/commands/git.rs ++++ b/src/commands/git.rs +@@ -1,6 +1,7 @@ + use anyhow::bail; + use clap::{Parser, ValueHint}; + use libpijul::pristine::*; ++use ::sanakirja::RootPageMut as _; + use libpijul::*; + use log::{debug, error, info, trace}; + use std::collections::{BTreeMap, BTreeSet, HashSet}; +@@ -564,7 +565,7 @@ + tmp_path.pop(); + use rand::Rng; + let s: String = rand::thread_rng() +- .sample_iter(&rand::distributions::Alphanumeric) ++ .sample_iter(&rand::distr::Alphanumeric) + .take(30) + .map(|x| x as char) + .collect(); diff --git a/pkgs/by-name/pi/pijul/package.nix b/pkgs/by-name/pi/pijul/package.nix index 9642d452aa42..389aba2be7d0 100644 --- a/pkgs/by-name/pi/pijul/package.nix +++ b/pkgs/by-name/pi/pijul/package.nix @@ -5,6 +5,7 @@ rustPlatform, installShellFiles, pkg-config, + dbus, libsodium, openssl, xxHash, @@ -14,14 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pijul"; - version = "1.0.0-beta.9"; + version = "1.0.0-beta.11"; src = fetchCrate { inherit (finalAttrs) version pname; - hash = "sha256-jy0mzgLw9iWuoWe2ictMTL3cHnjJ5kzs6TAK+pdm28g="; + hash = "sha256-+rMMqo2LBYlCFQJv8WFCSEJgDUbMi8DnVDKXIWm3tIk="; }; - cargoHash = "sha256-d2IlBtR3j6SF8AAagUQftCOqTqN70rDMlHkA9byxXyk="; + cargoHash = "sha256-IhArTiReUdj49bA+XseQpOiszK801xX5LdLj8vXD8rs="; + + patches = [ ./fix-rand-0.9-sanakirja-imports.patch ]; doCheck = false; nativeBuildInputs = [ @@ -29,6 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pkg-config ]; buildInputs = [ + dbus openssl libsodium xxHash