commit 43d66715e541e95df15dd1d78acf89b22ec9a89a · pyrox.dev/nixpkgs

+4 -3

nixos/modules/services/web-apps/nextcloud.nix

···

       391
       391
        
                 inherit (pkgs.nextcloud31Packages.apps) mail calendar contacts;

     

       392
       392
        
                 phonetrack = pkgs.fetchNextcloudApp {

     

       393
       393
        
                   name = "phonetrack";

     

       394
       394
       -
                   sha256 = "0qf366vbahyl27p9mshfma1as4nvql6w75zy2zk5xwwbp343vsbc";

     

       395
       395
       -
                   url = "https://gitlab.com/eneiluj/phonetrack-oc/-/wikis/uploads/931aaaf8dca24bf31a7e169a83c17235/phonetrack-0.6.9.tar.gz";

     

       396
       396
       -
                   version = "0.6.9";

     

       394
       394
       +
                   license = "agpl3Plus";

     

       395
       395
       +
                   sha512 = "f67902d1b48def9a244383a39d7bec95bb4215054963a9751f99dae9bd2f2740c02d2ef97b3b76d69a36fa95f8a9374dd049440b195f4dad2f0c4bca645de228";

     

       396
       396
       +
                   url = "https://github.com/julien-nc/phonetrack/releases/download/v0.8.2/phonetrack-0.8.2.tar.gz";

     

       397
       397
       +
                   version = "0.8.2";

     

       397
       398
        
                 };

     

       398
       399
        
               }

     

       399
       400
        
             '';

+28 -27

pkgs/build-support/fetchnextcloudapp/default.nix

···

       6
       6
        
         ...

     

       7
       7
        
       }:

     

       8
       8
        
       {

     

       9
       9
       +
         name ?

     

       10
       10
       +
           if appName == null || appVersion == null then null else "nextcloud-app-${appName}-${appVersion}",

     

       9
       11
        
         url,

     

       10
       12
        
         hash ? "",

     

       11
       13
        
         sha256 ? "",

     

       14
       14
       +
         sha512 ? "",

     

       12
       15
        
         appName ? null,

     

       13
       16
        
         appVersion ? null,

     

       14
       17
        
         license,

     

       15
       18
        
         patches ? [ ],

     

       16
       19
        
         description ? null,

     

       20
       20
       +
         longDescription ? description,

     

       17
       21
        
         homepage ? null,

     

       18
       22
        
         maintainers ? [ ],

     

       19
       23
        
         teams ? [ ],

     

       20
       24
        
         unpack ? false, # whether to use fetchzip rather than fetchurl

     

       21
       25
        
       }:

     

       22
       22
       -
       applyPatches (

     

       23
       23
       -
         {

     

       24
       24
       -
           inherit patches;

     

       25
       25
       -
           src = (if unpack then fetchzip else fetchurl) {

     

       26
       26
       -
             inherit url hash sha256;

     

       27
       27
       -
             meta = {

     

       28
       28
       -
               license = lib.licenses.${license};

     

       29
       29
       -
               longDescription = description;

     

       30
       30
       -
               inherit homepage maintainers teams;

     

       31
       31
       -
             }

     

       32
       32
       -
             // lib.optionalAttrs (description != null) {

     

       33
       33
       -
               longDescription = description;

     

       34
       34
       -
             }

     

       35
       35
       -
             // lib.optionalAttrs (homepage != null) {

     

       36
       36
       -
               inherit homepage;

     

       37
       37
       -
             };

     

       26
       26
       +
       applyPatches {

     

       27
       27
       +
         ${if name == null then null else "name"} = name;

     

       28
       28
       +
         inherit patches;

     

       29
       29
       +
       

     

       30
       30
       +
         src = (if unpack then fetchzip else fetchurl) {

     

       31
       31
       +
           inherit url;

     

       32
       32
       +
           ${if hash == "" then null else "hash"} = hash;

     

       33
       33
       +
           ${if sha256 == "" then null else "sha256"} = sha256;

     

       34
       34
       +
           ${if sha512 == "" then null else "sha512"} = sha512;

     

       35
       35
       +
       

     

       36
       36
       +
           meta = {

     

       37
       37
       +
             license = lib.licenses.${license};

     

       38
       38
       +
             ${if description == null then null else "description"} = description;

     

       39
       39
       +
             ${if longDescription == null then null else "longDescription"} = longDescription;

     

       40
       40
       +
             ${if homepage == null then null else "homepage"} = homepage;

     

       41
       41
       +
             inherit maintainers teams;

     

       38
       42
        
           };

     

       39
       39
       -
           prePatch = ''

     

       40
       40
       -
             if [ ! -f ./appinfo/info.xml ]; then

     

       41
       41
       -
               echo "appinfo/info.xml doesn't exist in $out, aborting!"

     

       42
       42
       -
               exit 1

     

       43
       43
       -
             fi

     

       44
       44
       -
           '';

     

       45
       45
       -
         }

     

       46
       46
       -
         // lib.optionalAttrs (appName != null && appVersion != null) {

     

       47
       47
       -
           name = "nextcloud-app-${appName}-${appVersion}";

     

       48
       48
       -
         }

     

       49
       49
       -
       )

     

       43
       43
       +
         };

     

       44
       44
       +
         prePatch = ''

     

       45
       45
       +
           if [ ! -f ./appinfo/info.xml ]; then

     

       46
       46
       +
             echo "appinfo/info.xml doesn't exist in $out, aborting!"

     

       47
       47
       +
             exit 1

     

       48
       48
       +
           fi

     

       49
       49
       +
         '';

     

       50
       50
       +
       }

+22

pkgs/build-support/fetchnextcloudapp/tests.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         testers,

     

       3
       3
       +
         fetchNextcloudApp,

     

       4
       4
       +
         ...

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       {

     

       8
       8
       +
         simple-sha512 = testers.invalidateFetcherByDrvHash fetchNextcloudApp {

     

       9
       9
       +
           appName = "phonetrack";

     

       10
       10
       +
           appVersion = "0.8.2";

     

       11
       11
       +
           license = "agpl3Plus";

     

       12
       12
       +
           sha512 = "f67902d1b48def9a244383a39d7bec95bb4215054963a9751f99dae9bd2f2740c02d2ef97b3b76d69a36fa95f8a9374dd049440b195f4dad2f0c4bca645de228";

     

       13
       13
       +
           url = "https://github.com/julien-nc/phonetrack/releases/download/v0.8.2/phonetrack-0.8.2.tar.gz";

     

       14
       14
       +
         };

     

       15
       15
       +
         simple-sha256 = testers.invalidateFetcherByDrvHash fetchNextcloudApp {

     

       16
       16
       +
           appName = "phonetrack";

     

       17
       17
       +
           appVersion = "0.8.2";

     

       18
       18
       +
           license = "agpl3Plus";

     

       19
       19
       +
           sha256 = "7c4252186e0ff8e0b97fc3d30131eeadd51bd2f9cc6aa321eb0c1c541f9572c0";

     

       20
       20
       +
           url = "https://github.com/julien-nc/phonetrack/releases/download/v0.8.2/phonetrack-0.8.2.tar.gz";

     

       21
       21
       +
         };

     

       22
       22
       +
       }

+3

pkgs/test/default.nix

···

       131
       131
        
         fetchDebianPatch = recurseIntoAttrs (callPackages ../build-support/fetchdebianpatch/tests.nix { });

     

       132
       132
        
         fetchzip = recurseIntoAttrs (callPackages ../build-support/fetchzip/tests.nix { });

     

       133
       133
        
         fetchgit = recurseIntoAttrs (callPackages ../build-support/fetchgit/tests.nix { });

     

       134
       134
       +
         fetchNextcloudApp = recurseIntoAttrs (

     

       135
       135
       +
           callPackages ../build-support/fetchnextcloudapp/tests.nix { }

     

       136
       136
       +
         );

     

       134
       137
        
         fetchFromBitbucket = recurseIntoAttrs (callPackages ../build-support/fetchbitbucket/tests.nix { });

     

       135
       138
        
         fetchFirefoxAddon = recurseIntoAttrs (

     

       136
       139
        
           callPackages ../build-support/fetchfirefoxaddon/tests.nix { }