From 70ef897c8364bfdf5a69368e427d4e0217ff7e53 Mon Sep 17 00:00:00 2001 From: Dan Xin Date: Sun, 14 Jun 2026 14:10:16 +0800 Subject: [PATCH] pijul: 1.0.0-beta.11 -> 1.0.0-beta.14 Signed-off-by: Dan Xin (cherry picked from commit b4cf3a59449aa3f0fde388c73fe57fac2af21b6b) --- .../fix-rand-0.9-sanakirja-imports.patch | 19 ------------------- pkgs/by-name/pi/pijul/package.nix | 11 ++++++----- 2 files changed, 6 insertions(+), 24 deletions(-) delete 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 deleted file mode 100644 index 17f34d5d3f43..000000000000 --- a/pkgs/by-name/pi/pijul/fix-rand-0.9-sanakirja-imports.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 7252cb7eec97..6cec25019d44 100644 --- a/pkgs/by-name/pi/pijul/package.nix +++ b/pkgs/by-name/pi/pijul/package.nix @@ -14,18 +14,19 @@ }: rustPlatform.buildRustPackage (finalAttrs: { + __structuredAttrs = true; + pname = "pijul"; - version = "1.0.0-beta.11"; + version = "1.0.0-beta.14"; src = fetchCrate { inherit (finalAttrs) version pname; - hash = "sha256-+rMMqo2LBYlCFQJv8WFCSEJgDUbMi8DnVDKXIWm3tIk="; + hash = "sha256-Ex8fCIcif2lmZ3ytLARwgGzEeq6GB2NDvwd96niDKbQ="; }; - cargoHash = "sha256-IhArTiReUdj49bA+XseQpOiszK801xX5LdLj8vXD8rs="; - - patches = [ ./fix-rand-0.9-sanakirja-imports.patch ]; + cargoHash = "sha256-yPzDzfD+QdhAXdyvzDV1z9HDe1mwF9cRCsliejr8H88="; + # Tests require a TTY, which the Nix sandbox does not provide. doCheck = false; nativeBuildInputs = [ installShellFiles