nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-19 07:01:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

pijul: 1.0.0-beta.11 -> 1.0.0-beta.14

Browse Source 
Signed-off-by: Dan Xin <davinci42.cn@gmail.com>
(cherry picked from commit b4cf3a5944)
This commit is contained in:
Dan Xin
2026-06-14 14:10:16 +08:00
committed by github-actions[bot]
parent e18a34406c
commit 70ef897c83
2 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/by-name/pi/pijul/fix-rand-0.9-sanakirja-imports.patch
View File

@@ -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();

11
pkgs/by-name/pi/pijul/package.nix
View File

@@ -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