Unverified Commit e218a6fb authored by Fabián Heredia Montiel's avatar Fabián Heredia Montiel Committed by GitHub
Browse files

pijul: 1.0.0-beta.9 -> 1.0.0-beta.11 (#510376)

parents 633d35cc 91640764

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

0 → 100644
+19 −0
Original line number Diff line number Diff line 
--- 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();

pkgs/by-name/pi/pijul/package.nix

+7 −3
Original line number Diff line number Diff line
@@ -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