commit bf8cde15eee43c9576ebc8ded247e4783736098f · pyrox.dev/nixpkgs

+8 -4

doc/languages-frameworks/rust.section.md

···

       605
       605
        
       directory.  In such cases, the `cargoRoot` attribute can be used to

     

       606
       606
        
       specify the crate's directory relative to `sourceRoot`. In the

     

       607
       607
        
       following example, the crate is in `src/rust`, as specified in the

     

       608
       608
       -
       `cargoRoot` attribute. Note that we also need to specify the correct

     

       609
       609
       -
       path for `fetchCargoVendor`.

     

       608
       608
       +
       `cargoRoot` attribute. Note that we also need to pass in `cargoRoot`

     

       609
       609
       +
       to `fetchCargoVendor`.

     

       610
       610
        
       

     

       611
       611
        
       ```nix

     

       612
       612
        
       {

     
···

       627
       627
        
         };

     

       628
       628
        
       

     

       629
       629
        
         cargoDeps = rustPlatform.fetchCargoVendor {

     

       630
       630
       -
           inherit pname version src;

     

       631
       631
       -
           sourceRoot = "${pname}-${version}/${cargoRoot}";

     

       630
       630
       +
           inherit

     

       631
       631
       +
             pname

     

       632
       632
       +
             version

     

       633
       633
       +
             src

     

       634
       634
       +
             cargoRoot

     

       635
       635
       +
             ;

     

       632
       636
        
           hash = "sha256-ctUt8maCjnGddKPf+Ii++wKsAXA1h+JM6zKQNXXwJqQ=";

     

       633
       637
        
         };

     

       634
       638

+1 -5

pkgs/applications/misc/openbangla-keyboard/default.nix

···

       62
       62
        
           ];

     

       63
       63
        
       

     

       64
       64
        
         cargoDeps = rustPlatform.fetchCargoVendor {

     

       65
       65
       -
           inherit src;

     

       66
       66
       -
           postPatch = ''

     

       67
       67
       -
             cp ${./Cargo.lock} Cargo.lock

     

       68
       68
       -
           '';

     

       69
       69
       -
           sourceRoot = "${src.name}/${cargoRoot}";

     

       65
       65
       +
           inherit src cargoRoot postPatch;

     

       70
       66
        
           hash = "sha256-qZMTZi7eqEp5kSmVx7qdS7eDKOzSv9fMjWT0h/MGyeY=";

     

       71
       67
        
         };

     

       72
       68

+1 -2

pkgs/applications/science/electronics/librepcb/default.nix

···

       42
       42
        
         buildInputs = [ qtbase ];

     

       43
       43
        
       

     

       44
       44
        
         cargoDeps = rustPlatform.fetchCargoVendor {

     

       45
       45
       -
           inherit src;

     

       46
       46
       -
           sourceRoot = "source/${cargoRoot}";

     

       45
       45
       +
           inherit src cargoRoot;

     

       47
       46
        
           hash = "sha256-1td3WjxbDq2lX7c0trpYRhO82ChNAG/ZABBRsekYtq4=";

     

       48
       47
        
         };

     

       49
       48

+1 -3

pkgs/by-name/cc/ccextractor/package.nix

···

       49
       49
        
         cargoRoot = "src/rust";

     

       50
       50
        
       

     

       51
       51
        
         cargoDeps = rustPlatform.fetchCargoVendor {

     

       52
       52
       -
           inherit (finalAttrs) src;

     

       53
       53
       -
           sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}";

     

       52
       52
       +
           inherit (finalAttrs) src cargoRoot;

     

       54
       53
        
           patches = [ ./use-rsmpeg-0.15.patch ];

     

       55
       55
       -
           patchFlags = [ "-p3" ];

     

       56
       54
        
           hash = "sha256-7v3gQghByUDWZLJRRGa/7X2ivUumirq6BbexNQcCXCk=";

     

       57
       55
        
         };

     

       58
       56

+1 -2

pkgs/by-name/op/opengamepadui/package.nix

···

       35
       35
        
         };

     

       36
       36
        
       

     

       37
       37
        
         cargoDeps = rustPlatform.fetchCargoVendor {

     

       38
       38
       -
           inherit (finalAttrs) src;

     

       39
       39
       -
           sourceRoot = "source/${finalAttrs.cargoRoot}";

     

       38
       38
       +
           inherit (finalAttrs) src cargoRoot;

     

       40
       39
        
           hash = "sha256-T79G2bShJuFRfaCqG3IDHqW0s68yAdGyv58kdDYg6kg=";

     

       41
       40
        
         };

     

       42
       41
        
         cargoRoot = "extensions";

+1 -2

pkgs/by-name/su/surrealist/package.nix

···

       60
       60
        
         };

     

       61
       61
        
       

     

       62
       62
        
         cargoDeps = rustPlatform.fetchCargoVendor {

     

       63
       63
       -
           inherit (finalAttrs) src;

     

       64
       64
       -
           sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}";

     

       63
       63
       +
           inherit (finalAttrs) src cargoRoot;

     

       65
       64
        
           hash = "sha256-Su9ZOPIskV5poeS8pgtri+sZANBpdgnuCsQqE4WKFdA=";

     

       66
       65
        
         };

     

       67
       66

+6 -2

pkgs/by-name/we/wealthfolio/package.nix

···

       36
       36
        
         buildAndTestSubdir = finalAttrs.cargoRoot;

     

       37
       37
        
       

     

       38
       38
        
         cargoDeps = rustPlatform.fetchCargoVendor {

     

       39
       39
       -
           inherit (finalAttrs) pname version src;

     

       40
       40
       -
           sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}";

     

       39
       39
       +
           inherit (finalAttrs)

     

       40
       40
       +
             pname

     

       41
       41
       +
             version

     

       42
       42
       +
             src

     

       43
       43
       +
             cargoRoot

     

       44
       44
       +
             ;

     

       41
       45
        
           hash = "sha256-MmdvEutdkX98DgX1aVuxs4gabuMX5aM8yC4eqgvd8Q4=";

     

       42
       46
        
         };

     

       43
       47

+1 -2

pkgs/development/interpreters/ruby/default.nix

···

       216
       216
        
                 cargoDeps =

     

       217
       217
        
                   if yjitSupport then

     

       218
       218
        
                     rustPlatform.fetchCargoVendor {

     

       219
       219
       -
                       inherit (finalAttrs) src;

     

       220
       220
       -
                       sourceRoot = "${finalAttrs.pname}-${version}/${finalAttrs.cargoRoot}";

     

       219
       219
       +
                       inherit (finalAttrs) src cargoRoot;

     

       221
       220
        
                       hash =

     

       222
       221
        
                         assert cargoHash != null;

     

       223
       222
        
                         cargoHash;

+6 -2

pkgs/development/python-modules/bcrypt/default.nix

···

       33
       33
        
       

     

       34
       34
        
         cargoRoot = "src/_bcrypt";

     

       35
       35
        
         cargoDeps = rustPlatform.fetchCargoVendor {

     

       36
       36
       -
           inherit pname version src;

     

       37
       37
       -
           sourceRoot = "${pname}-${version}/${cargoRoot}";

     

       36
       36
       +
           inherit

     

       37
       37
       +
             pname

     

       38
       38
       +
             version

     

       39
       39
       +
             src

     

       40
       40
       +
             cargoRoot

     

       41
       41
       +
             ;

     

       38
       42
        
           hash = "sha256-HgHvfMBspPsSYhllnKBg5XZB6zxFIqJj+4//xKG8HwA=";

     

       39
       43
        
         };

     

       40
       44

+2 -1

pkgs/development/python-modules/biliass/default.nix

···

       28
       28
        
             pname

     

       29
       29
        
             version

     

       30
       30
        
             src

     

       31
       31
       +
             sourceRoot

     

       32
       32
       +
             cargoRoot

     

       31
       33
        
             ;

     

       32
       32
       -
           sourceRoot = "${sourceRoot}/${cargoRoot}";

     

       33
       34
        
           hash = "sha256-tkHl6z0En+od//fCGJXK/p8Dz5KDOXltHrXhxHmHL6U=";

     

       34
       35
        
         };

     

       35
       36

+6 -2

pkgs/development/python-modules/libcst/default.nix

···

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         cargoDeps = rustPlatform.fetchCargoVendor {

     

       36
       36
       -
           inherit pname version src;

     

       37
       37
       -
           sourceRoot = "${src.name}/${cargoRoot}";

     

       36
       36
       +
           inherit

     

       37
       37
       +
             pname

     

       38
       38
       +
             version

     

       39
       39
       +
             src

     

       40
       40
       +
             cargoRoot

     

       41
       41
       +
             ;

     

       38
       42
        
           hash = "sha256-K8hug7JeLPIvrqgVaONKfixu8XRvn+pnqS0fHV+nTqg=";

     

       39
       43
        
         };

     

       40
       44

+6 -2

pkgs/development/python-modules/temporalio/default.nix

···

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         cargoDeps = rustPlatform.fetchCargoVendor {

     

       36
       36
       -
           inherit pname version src;

     

       37
       37
       -
           sourceRoot = "${src.name}/${cargoRoot}";

     

       36
       36
       +
           inherit

     

       37
       37
       +
             pname

     

       38
       38
       +
             version

     

       39
       39
       +
             src

     

       40
       40
       +
             cargoRoot

     

       41
       41
       +
             ;

     

       38
       42
        
           hash = "sha256-9hP+zN6jcRmRhPmcZ4Zgp61IeS7gDPfsOvweAxKHnHM=";

     

       39
       43
        
         };

     

       40
       44

+1 -2

pkgs/kde/gear/akonadi-search/default.nix

···

       14
       14
        
         cargoRoot = "agent/rs/htmlparser";

     

       15
       15
        
       

     

       16
       16
        
         cargoDeps = rustPlatform.fetchCargoVendor {

     

       17
       17
       -
           inherit pname version;

     

       17
       17
       +
           inherit pname version cargoRoot;

     

       18
       18
        
           src = sources.${pname};

     

       19
       19
       -
           sourceRoot = "${pname}-${version}/${cargoRoot}";

     

       20
       19
        
           hash = "sha256-hdm4LfQcs4TTfBLzlZYJ0uzqfLxMXuYQExLGJg81W2U=";

     

       21
       20
        
         };

     

       22
       21

+1 -2

pkgs/kde/gear/kdepim-addons/default.nix

···

       17
       17
        
         cargoRoot = "plugins/webengineurlinterceptor/adblock";

     

       18
       18
        
       

     

       19
       19
        
         cargoDeps = rustPlatform.fetchCargoVendor {

     

       20
       20
       -
           inherit pname version;

     

       20
       20
       +
           inherit pname version cargoRoot;

     

       21
       21
        
           src = sources.${pname};

     

       22
       22
       -
           sourceRoot = "${pname}-${version}/${cargoRoot}";

     

       23
       22
        
           hash = "sha256-66FqoD3JoPbtg6zc32uaPYaTo4zHxywiN8wPI2jtcjc=";

     

       24
       23
        
         };

     

       25
       24

+6 -2

pkgs/tools/filesystems/ceph/default.nix

···

       243
       243
        
                 };

     

       244
       244
        
                 cargoRoot = "src/_bcrypt";

     

       245
       245
        
                 cargoDeps = rustPlatform.fetchCargoVendor {

     

       246
       246
       -
                   inherit pname version src;

     

       247
       247
       -
                   sourceRoot = "${pname}-${version}/${cargoRoot}";

     

       246
       246
       +
                   inherit

     

       247
       247
       +
                     pname

     

       248
       248
       +
                     version

     

       249
       249
       +
                     src

     

       250
       250
       +
                     cargoRoot

     

       251
       251
       +
                     ;

     

       248
       252
        
                   hash = "sha256-8PyCgh/rUO8uynzGdgylAsb5k55dP9fCnf40UOTCR/M=";

     

       249
       253
        
                 };

     

       250
       254
        
               });

+6 -2

pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix

···

       42
       42
        
         };

     

       43
       43
        
       

     

       44
       44
        
         cargoDeps = rustPlatform.fetchCargoVendor {

     

       45
       45
       -
           inherit pname version src;

     

       46
       46
       -
           sourceRoot = "${pname}-${version}/${cargoRoot}";

     

       45
       45
       +
           inherit

     

       46
       46
       +
             pname

     

       47
       47
       +
             version

     

       48
       48
       +
             src

     

       49
       49
       +
             cargoRoot

     

       50
       50
       +
             ;

     

       47
       51
        
           hash = "sha256-pZHu3Oo9DWRAtldU0UvrH1FIg0bEvyfizPUhj9IBL58=";

     

       48
       52
        
         };

     

       49
       53