commit 50df425cd58d5136b0b05ad86047d405dad2203e · pyrox.dev/nixpkgs

-52

pkgs/by-name/ju/jujutsu/libgit2-1.9.0.patch

···

       1
       -
       From b4f936ac302ee835aa274e4dd186b436781d5d2f Mon Sep 17 00:00:00 2001

     

       2
       -
       From: Rui Chen <rui@chenrui.dev>

     

       3
       -
       Date: Thu, 9 Jan 2025 09:51:47 -0500

     

       4
       -
       Subject: [PATCH] chore(deps): update git2 to use libgit2 1.9

     

       5
       -
       

     

       6
       -
       Signed-off-by: Rui Chen <rui@chenrui.dev>

     

       7
       -
       ---

     

       8
       -
        Cargo.lock | 8 ++++----

     

       9
       -
        Cargo.toml | 2 +-

     

       10
       -
        2 files changed, 5 insertions(+), 5 deletions(-)

     

       11
       -
       

     

       12
       -
       diff --git a/Cargo.lock b/Cargo.lock

     

       13
       -
       index 69398f4d6d..3ec8dfdacc 100644

     

       14
       -
       --- a/Cargo.lock

     

       15
       -
       +++ b/Cargo.lock

     

       16
       -
       @@ -913,9 +913,9 @@ checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"

     

       17
       -
        

     

       18
       -
        [[package]]

     

       19
       -
        name = "git2"

     

       20
       -
       -version = "0.19.0"

     

       21
       -
       +version = "0.20.0"

     

       22
       -
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       23
       -
       -checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"

     

       24
       -
       +checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff"

     

       25
       -
        dependencies = [

     

       26
       -
         "bitflags",

     

       27
       -
         "libc",

     

       28
       -
       @@ -2109,9 +2109,9 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"

     

       29
       -
        

     

       30
       -
        [[package]]

     

       31
       -
        name = "libgit2-sys"

     

       32
       -
       -version = "0.17.0+1.8.1"

     

       33
       -
       +version = "0.18.0+1.9.0"

     

       34
       -
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       35
       -
       -checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224"

     

       36
       -
       +checksum = "e1a117465e7e1597e8febea8bb0c410f1c7fb93b1e1cddf34363f8390367ffec"

     

       37
       -
        dependencies = [

     

       38
       -
         "cc",

     

       39
       -
         "libc",

     

       40
       -
       diff --git a/Cargo.toml b/Cargo.toml

     

       41
       -
       index 0fc4393cb5..b955fd6aa1 100644

     

       42
       -
       --- a/Cargo.toml

     

       43
       -
       +++ b/Cargo.toml

     

       44
       -
       @@ -46,7 +46,7 @@ dirs = "5.0.1"

     

       45
       -
        dunce = "1.0.5"

     

       46
       -
        either = "1.13.0"

     

       47
       -
        futures = "0.3.31"

     

       48
       -
       -git2 = { version = "0.19.0", features = [

     

       49
       -
       +git2 = { version = "0.20.0", features = [

     

       50
       -
            # Do *not* disable this feature even if you'd like dynamic linking. Instead,

     

       51
       -
            # set the environment variable `LIBGIT2_NO_VENDOR=1` if dynamic linking must

     

       52
       -
            # be used (this will override the Cargo feature), and allow static linking

+3 -8

pkgs/by-name/ju/jujutsu/package.nix

···

       19
        
       }:

     

       20
        
       

     

       21
        
       let

     

       22
       -
         version = "0.27.0";

     

       23
        
       in

     

       24
        
       

     

       25
        
       rustPlatform.buildRustPackage {

     
···

       30
        
           owner = "jj-vcs";

     

       31
        
           repo = "jj";

     

       32
        
           tag = "v${version}";

     

       33
       -
           hash = "sha256-fBgJrSglH46+NHu3spk5mC51ASDHWnOoW6veKZ0R2YA=";

     

       34
        
         };

     

       35
        
       

     

       36
        
         useFetchCargoVendor = true;

     

       37
        
       

     

       38
       -
         cargoPatches = [

     

       39
       -
           # <https://github.com/jj-vcs/jj/pull/5315>

     

       40
       -
           ./libgit2-1.9.0.patch

     

       41
       -
         ];

     

       42
       -
       

     

       43
       -
         cargoHash = "sha256-35DJdAUXc2gb/EXECScwinSzzp7uaxFbUxedjqRGfj8=";

     

       44
        
       

     

       45
        
         nativeBuildInputs = [

     

       46
        
           installShellFiles

···

       19
        
       }:

     

       20
        
       

     

       21
        
       let

     

       22
       +
         version = "0.28.1";

     

       23
        
       in

     

       24
        
       

     

       25
        
       rustPlatform.buildRustPackage {

     
···

       30
        
           owner = "jj-vcs";

     

       31
        
           repo = "jj";

     

       32
        
           tag = "v${version}";

     

       33
       +
           hash = "sha256-LDMHMFg9fjEMi8I2Fc3TEyWMctqJurAbckubCgkkZiM=";

     

       34
        
         };

     

       35
        
       

     

       36
        
         useFetchCargoVendor = true;

     

       37
        
       

     

       38
       +
         cargoHash = "sha256-y/GQSzI7bVPieuAmQKdZY1qticmmRYibBtgXSEJ7dU4=";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       39
        
       

     

       40
        
         nativeBuildInputs = [

     

       41
        
           installShellFiles