commit 93da65ede655736068698f9da6470ca9d1484861 · pyrox.dev/nixpkgs

+9 -9

pkgs/by-name/ci/cinny-desktop/package.nix

···

       15
       15
        
         moreutils,

     

       16
       16
        
       }:

     

       17
       17
        
       

     

       18
       18
       -
       rustPlatform.buildRustPackage rec {

     

       18
       18
       +
       rustPlatform.buildRustPackage (finalAttrs: {

     

       19
       19
        
         pname = "cinny-desktop";

     

       20
       20
        
         # We have to be using the same version as cinny-web or this isn't going to work.

     

       21
       21
       -
         version = "4.7.0";

     

       21
       21
       +
         version = "4.8.0";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchFromGitHub {

     

       24
       24
        
           owner = "cinnyapp";

     

       25
       25
        
           repo = "cinny-desktop";

     

       26
       26
       -
           tag = "v${version}";

     

       27
       27
       -
           hash = "sha256-ls0ZxXiIrjyLL0MoxOTU/RK0k323nUiQfxtlwsEL45U=";

     

       26
       26
       +
           tag = "v${finalAttrs.version}";

     

       27
       27
       +
           hash = "sha256-cixpsn0jMufd6VrBCsCH9t3bpkKdgi1i0qnkBlLgLG0=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
       -
         sourceRoot = "${src.name}/src-tauri";

     

       30
       30
       +
         sourceRoot = "${finalAttrs.src.name}/src-tauri";

     

       31
       31
        
       

     

       32
       32
        
         useFetchCargoVendor = true;

     

       33
       33
       -
         cargoHash = "sha256-NSzGB6o6BBoak2gbSOu8ucWA+R+behuTxeMnKpyA7no=";

     

       33
       33
       +
         cargoHash = "sha256-twfRuoA4z+Xgyyn7aIRy6MV1ozN2+qhSLh8i+qOTa2Q=";

     

       34
       34
        
       

     

       35
       35
        
         postPatch =

     

       36
       36
        
           let

     

       37
       37
        
             cinny' =

     

       38
       38
        
               assert lib.assertMsg (

     

       39
       39
       -
                 cinny.version == version

     

       40
       40
       -
               ) "cinny.version (${cinny.version}) != cinny-desktop.version (${version})";

     

       39
       39
       +
                 cinny.version == finalAttrs.version

     

       40
       40
       +
               ) "cinny.version (${cinny.version}) != cinny-desktop.version (${finalAttrs.version})";

     

       41
       41
        
               cinny.override {

     

       42
       42
        
                 conf = {

     

       43
       43
        
                   hashRouter.enabled = true;

     
···

       95
       95
        
           platforms = lib.platforms.linux ++ lib.platforms.darwin;

     

       96
       96
        
           mainProgram = "cinny";

     

       97
       97
        
         };

     

       98
       98
       -
       }

     

       98
       98
       +
       })

+4 -4

pkgs/by-name/ci/cinny-unwrapped/package.nix

···

       13
       13
        
       

     

       14
       14
        
       buildNpmPackage rec {

     

       15
       15
        
         pname = "cinny-unwrapped";

     

       16
       16
       -
         version = "4.7.0";

     

       16
       16
       +
         version = "4.8.0";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "cinnyapp";

     

       20
       20
        
           repo = "cinny";

     

       21
       21
       -
           rev = "v${version}";

     

       22
       22
       -
           hash = "sha256-x4cRZ0XfyvRqOWIqtsVBiIPDxC3J9SUdoReiWNUB/X8=";

     

       21
       21
       +
           tag = "v${version}";

     

       22
       22
       +
           hash = "sha256-yM+P7KXT/cspKt2l4+COoH68jCJUSs2TrfJGZHF/lYY=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
       -
         npmDepsHash = "sha256-s8dKMGwg6DL+aEq0Sk04VF1pSDpAW18Dok113xDWb8Q=";

     

       25
       25
       +
         npmDepsHash = "sha256-RWc8nSh/HuXUokU2RZnmwYUCfBxpL9Wp1Sgi2l1CN38=";

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [

     

       28
       28
        
           python3