commit d6f7e2f6f6e4068b43c4779ea968550f10544b0d · pyrox.dev/nixpkgs

+9 -2

nixos/modules/services/network-filesystems/ipfs.nix

···

       7
       7
        
       

     

       8
       8
        
         ipfsFlags = toString ([

     

       9
       9
        
           (optionalString  cfg.autoMount                   "--mount")

     

       10
       10
       -
           (optionalString  cfg.autoMigrate                 "--migrate")

     

       10
       10
       +
           #(optionalString  cfg.autoMigrate                 "--migrate")

     

       11
       11
        
           (optionalString  cfg.enableGC                    "--enable-gc")

     

       12
       12
        
           (optionalString (cfg.serviceFdlimit != null)     "--manage-fdlimit=false")

     

       13
       13
        
           (optionalString (cfg.defaultMode == "offline")   "--offline")

     
···

       36
       36
        
       

     

       37
       37
        
         baseService = recursiveUpdate commonEnv {

     

       38
       38
        
           wants = [ "ipfs-init.service" ];

     

       39
       39
       +
           # NB: migration must be performed prior to pre-start, else we get the failure message!

     

       39
       40
        
           preStart = ''

     

       40
       41
        
             ipfs repo fsck # workaround for BUG #4212 (https://github.com/ipfs/go-ipfs/issues/4214)

     

       41
       42
        
             ipfs --local config Addresses.API ${cfg.apiAddress}

     
···

       97
       98
        
               description = "systemd service that is enabled by default";

     

       98
       99
        
             };

     

       99
       100
        
       

     

       101
       101
       +
             /*

     

       100
       102
        
             autoMigrate = mkOption {

     

       101
       103
        
               type = types.bool;

     

       102
       104
        
               default = false;

     

       103
       103
       -
               description = "Whether IPFS should try to migrate the file system automatically";

     

       105
       105
       +
               description = ''

     

       106
       106
       +
                 Whether IPFS should try to migrate the file system automatically.

     

       107
       107
       +
       

     

       108
       108
       +
                 The daemon will need to be able to download a binary from https://ipfs.io to perform the migration.

     

       109
       109
       +
               '';

     

       104
       110
        
             };

     

       111
       111
       +
             */

     

       105
       112
        
       

     

       106
       113
        
             autoMount = mkOption {

     

       107
       114
        
               type = types.bool;

+27

pkgs/applications/networking/ipfs-migrator/default.nix

···

       1
       1
       +
       { stdenv, buildGoPackage, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildGoPackage rec {

     

       4
       4
       +
         name = "ipfs-migrator-${version}";

     

       5
       5
       +
         version = "6";

     

       6
       6
       +
       

     

       7
       7
       +
         goPackagePath = "github.com/ipfs/fs-repo-migrations";

     

       8
       8
       +
       

     

       9
       9
       +
         goDeps = ./deps.nix;

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchFromGitHub {

     

       12
       12
       +
           owner = "ipfs";

     

       13
       13
       +
           repo = "fs-repo-migrations";

     

       14
       14
       +
           rev = "a89e9769b9cac25ad9ca31c7e9a4445c7966d35b";

     

       15
       15
       +
           sha256 = "0x4mbkx7wlqjmkg6852hljq947v9y9k3hjd5yfj7kka1hpvxd7bn";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         patches = [ ./lru-repo-path-fix.patch ];

     

       19
       19
       +
       

     

       20
       20
       +
         meta = with stdenv.lib; {

     

       21
       21
       +
           description = "Migration tool for ipfs repositories";

     

       22
       22
       +
           homepage = https://ipfs.io/;

     

       23
       23
       +
           license = licenses.mit;

     

       24
       24
       +
           platforms = platforms.unix;

     

       25
       25
       +
           maintainers = with maintainers; [ elitak ];

     

       26
       26
       +
         };

     

       27
       27
       +
       }

+56

pkgs/applications/networking/ipfs-migrator/deps.nix

···

       1
       1
       +
       [

     

       2
       2
       +
         {

     

       3
       3
       +
           goPackagePath = "github.com/dustin/go-humanize";

     

       4
       4
       +
           fetch = {

     

       5
       5
       +
             type = "git";

     

       6
       6
       +
             url = https://github.com/dustin/go-humanize;

     

       7
       7
       +
             rev = "79e699ccd02f240a1f1fbbdcee7e64c1c12e41aa";

     

       8
       8
       +
             sha256 = "0awfqszgjw8qrdw31v74jnvj1jbp7czhd8aq59j57yyj4hy50fzj";

     

       9
       9
       +
           };

     

       10
       10
       +
         }

     

       11
       11
       +
         {

     

       12
       12
       +
           goPackagePath = "github.com/jbenet/goprocess";

     

       13
       13
       +
           fetch = {

     

       14
       14
       +
             type = "git";

     

       15
       15
       +
             url = https://github.com/jbenet/goprocess;

     

       16
       16
       +
             rev = "b497e2f366b8624394fb2e89c10ab607bebdde0b";

     

       17
       17
       +
             sha256 = "1lnvkzki7vnqn5c4m6bigk0k85haicmg27w903kwg30rdvblm82s";

     

       18
       18
       +
           };

     

       19
       19
       +
         }

     

       20
       20
       +
         {

     

       21
       21
       +
           goPackagePath = "github.com/jbenet/go-random";

     

       22
       22
       +
           fetch = {

     

       23
       23
       +
             type = "git";

     

       24
       24
       +
             url = https://github.com/jbenet/go-random;

     

       25
       25
       +
             rev = "384f606e91f542a98e779e652eed88051618f0f7";

     

       26
       26
       +
             sha256 = "0gcshzl9n3apzc0jaxqrjsc038yfrzfyhpdqgbpcnajin83l2msa";

     

       27
       27
       +
           };

     

       28
       28
       +
         }

     

       29
       29
       +
         {

     

       30
       30
       +
           goPackagePath = "github.com/jbenet/go-random-files";

     

       31
       31
       +
           fetch = {

     

       32
       32
       +
             type = "git";

     

       33
       33
       +
             url = https://github.com/jbenet/go-random-files;

     

       34
       34
       +
             rev = "737479700b40b4b50e914e963ce8d9d44603e3c8";

     

       35
       35
       +
             sha256 = "1klpdc4qkrfy31r7qh00fcz42blswzabmcnry9byd5adhszxj9bw";

     

       36
       36
       +
           };

     

       37
       37
       +
         }

     

       38
       38
       +
         {

     

       39
       39
       +
           goPackagePath = "github.com/hashicorp/golang-lru";

     

       40
       40
       +
           fetch = {

     

       41
       41
       +
             type = "git";

     

       42
       42
       +
             url = https://github.com/hashicorp/golang-lru;

     

       43
       43
       +
             rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6";

     

       44
       44
       +
             sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi";

     

       45
       45
       +
           };

     

       46
       46
       +
         }

     

       47
       47
       +
         {

     

       48
       48
       +
           goPackagePath = "golang.org/x/net";

     

       49
       49
       +
           fetch = {

     

       50
       50
       +
             type = "git";

     

       51
       51
       +
             url = "https://go.googlesource.com/net";

     

       52
       52
       +
             rev = "71a035914f99bb58fe82eac0f1289f10963d876c";

     

       53
       53
       +
             sha256 = "06m16c9vkwc8m2mcxcxa7p8mb26ikc810lgzd5m8k1r6lp3hc8wm";

     

       54
       54
       +
           };

     

       55
       55
       +
         }

     

       56
       56
       +
       ]

+13

pkgs/applications/networking/ipfs-migrator/lru-repo-path-fix.patch

···

       1
       1
       +
       diff --git a/ipfs-1-to-2/go-datastore/lru/datastore.go b/ipfs-1-to-2/go-datastore/lru/datastore.go

     

       2
       2
       +
       index 7eb18eb..cd8dcb7 100644

     

       3
       3
       +
       --- a/ipfs-1-to-2/go-datastore/lru/datastore.go

     

       4
       4
       +
       +++ b/ipfs-1-to-2/go-datastore/lru/datastore.go

     

       5
       5
       +
       @@ -3,7 +3,7 @@ package lru

     

       6
       6
       +
        import (

     

       7
       7
       +
        	"errors"

     

       8
       8
       +
        

     

       9
       9
       +
       -	lru "github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/golang-lru"

     

       10
       10
       +
       +	lru "github.com/hashicorp/golang-lru"

     

       11
       11
       +
        

     

       12
       12
       +
        	ds "github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/go-datastore"

     

       13
       13
       +
        	dsq "github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/go-datastore/query"

pkgs/top-level/all-packages.nix

···

       2699
       2699
        
         iperf = iperf3;

     

       2700
       2700
        
       

     

       2701
       2701
        
         ipfs = callPackage ../applications/networking/ipfs { };

     

       2702
       2702
       +
         ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { };

     

       2702
       2703
        
       

     

       2703
       2704
        
         ipmitool = callPackage ../tools/system/ipmitool {

     

       2704
       2705
        
           static = false;