commit 47d81ed3473f33cfb48f2be079f50cdfac60f1e7 · pyrox.dev/nixpkgs

nixos/modules/misc/ids.nix

···

       277
       277
        
             gitlab-runner = 257;

     

       278
       278
        
             postgrey = 258;

     

       279
       279
        
             hound = 259;

     

       280
       280
       +
             leaps = 260;

     

       280
       281
        
       

     

       281
       282
        
             # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!

     

       282
       283
        
       

     
···

       524
       525
        
             gitlab-runner = 257;

     

       525
       526
        
             postgrey = 258;

     

       526
       527
        
             hound = 259;

     

       528
       528
       +
             leaps = 260;

     

       527
       529
        
       

     

       528
       530
        
             # When adding a gid, make sure it doesn't match an existing

     

       529
       531
        
             # uid. Users and groups with the same name should have equal

nixos/modules/module-list.nix

···

       251
       251
        
         ./services/misc/gitolite.nix

     

       252
       252
        
         ./services/misc/gpsd.nix

     

       253
       253
        
         ./services/misc/ihaskell.nix

     

       254
       254
       +
         ./services/misc/leaps.nix

     

       254
       255
        
         ./services/misc/mantisbt.nix

     

       255
       256
        
         ./services/misc/mathics.nix

     

       256
       257
        
         ./services/misc/matrix-synapse.nix

+62

nixos/modules/services/misc/leaps.nix

···

       1
       1
       +
       { config, pkgs, lib, ... } @ args:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         cfg = config.services.leaps;

     

       7
       7
       +
         stateDir = "/var/lib/leaps/";

     

       8
       8
       +
       in

     

       9
       9
       +
       {

     

       10
       10
       +
         options = {

     

       11
       11
       +
           services.leaps = {

     

       12
       12
       +
             enable = mkEnableOption "leaps";

     

       13
       13
       +
             port = mkOption {

     

       14
       14
       +
               type = types.int;

     

       15
       15
       +
               default = 8080;

     

       16
       16
       +
               description = "A port where leaps listens for incoming http requests";

     

       17
       17
       +
             };

     

       18
       18
       +
             address = mkOption {

     

       19
       19
       +
               default = "";

     

       20
       20
       +
               type = types.str;

     

       21
       21
       +
               example = "127.0.0.1";

     

       22
       22
       +
               description = "Hostname or IP-address to listen to. By default it will listen on all interfaces.";

     

       23
       23
       +
             };

     

       24
       24
       +
             path = mkOption {

     

       25
       25
       +
               default = "/";

     

       26
       26
       +
               type = types.path;

     

       27
       27
       +
               description = "Subdirectory used for reverse proxy setups";

     

       28
       28
       +
             };

     

       29
       29
       +
           };

     

       30
       30
       +
         };

     

       31
       31
       +
       

     

       32
       32
       +
         config = mkIf cfg.enable {

     

       33
       33
       +
           users = {

     

       34
       34
       +
             users.leaps = {

     

       35
       35
       +
               uid             = config.ids.uids.leaps;

     

       36
       36
       +
               description     = "Leaps server user";

     

       37
       37
       +
               group           = "leaps";

     

       38
       38
       +
               home            = stateDir;

     

       39
       39
       +
               createHome      = true;

     

       40
       40
       +
             };

     

       41
       41
       +
       

     

       42
       42
       +
             groups.leaps = {

     

       43
       43
       +
               gid = config.ids.gids.leaps;

     

       44
       44
       +
             };

     

       45
       45
       +
           };

     

       46
       46
       +
       

     

       47
       47
       +
           systemd.services.leaps = {

     

       48
       48
       +
             description   = "leaps service";

     

       49
       49
       +
             wantedBy      = [ "multi-user.target" ];

     

       50
       50
       +
             after         = [ "network.target" ];

     

       51
       51
       +
       

     

       52
       52
       +
             serviceConfig = {

     

       53
       53
       +
               User = "leaps";

     

       54
       54
       +
               Group = "leaps";

     

       55
       55
       +
               Restart = "on-failure";

     

       56
       56
       +
               WorkingDirectory = stateDir;

     

       57
       57
       +
               PrivateTmp = true;

     

       58
       58
       +
               ExecStart = "${pkgs.leaps.bin}/bin/leaps -path ${toString cfg.path} -address ${cfg.address}:${toString cfg.port}";

     

       59
       59
       +
             };

     

       60
       60
       +
           };

     

       61
       61
       +
         };

     

       62
       62
       +
       }

nixos/release.nix

···

       275
       275
        
         tests.networkingProxy = callTest tests/networking-proxy.nix {};

     

       276
       276
        
         tests.nfs3 = callTest tests/nfs.nix { version = 3; };

     

       277
       277
        
         tests.nfs4 = callTest tests/nfs.nix { version = 4; };

     

       278
       278
       +
         tests.leaps = callTest tests/leaps.nix { };

     

       278
       279
        
         tests.nsd = callTest tests/nsd.nix {};

     

       279
       280
        
         tests.openssh = callTest tests/openssh.nix {};

     

       280
       281
        
         #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; });

+29

nixos/tests/leaps.nix

···

       1
       1
       +
       import ./make-test.nix ({ pkgs,  ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         name = "leaps";

     

       5
       5
       +
         meta = with pkgs.stdenv.lib.maintainers; {

     

       6
       6
       +
           maintainers = [ qknight ];

     

       7
       7
       +
         };

     

       8
       8
       +
       

     

       9
       9
       +
         nodes =

     

       10
       10
       +
           { 

     

       11
       11
       +
             client = { };

     

       12
       12
       +
       

     

       13
       13
       +
             server =

     

       14
       14
       +
               { services.leaps = {

     

       15
       15
       +
                   enable = true;

     

       16
       16
       +
                   port = 6666;

     

       17
       17
       +
                   path = "/leaps/";

     

       18
       18
       +
                 };

     

       19
       19
       +
                 networking.firewall.enable = false;

     

       20
       20
       +
               };

     

       21
       21
       +
           };

     

       22
       22
       +
       

     

       23
       23
       +
         testScript =

     

       24
       24
       +
           ''

     

       25
       25
       +
             startAll;

     

       26
       26
       +
             $server->waitForOpenPort(6666);

     

       27
       27
       +
             $client->succeed("curl http://server:6666/leaps/ | grep -i 'leaps'"); 

     

       28
       28
       +
           '';

     

       29
       29
       +
       })

+9 -9

pkgs/development/tools/leaps/default.nix

···

       1
       1
       -
       { stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:

     

       1
       1
       +
       { stdenv, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }:

     

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
        
         name = "leaps-${version}";

     

       5
       5
       -
         version = "20160626-${stdenv.lib.strings.substring 0 7 rev}";

     

       6
       6
       -
         rev = "5cf7328a8c498041d2a887e89f22f138498f4621";

     

       5
       5
       +
         version = "0.5.1";

     

       7
       6
        
       

     

       8
       7
        
         goPackagePath = "github.com/jeffail/leaps";

     

       9
       8
        
       

     

       10
       10
       -
         src = fetchgit {

     

       11
       11
       -
           inherit rev;

     

       12
       12
       -
           url = "https://github.com/jeffail/leaps";

     

       13
       13
       -
           sha256 = "1qbgz48x9yi0w9yz39zsnnhx5nx2xmrns9v8hx28jah2bvag6sq7";

     

       14
       14
       -
           fetchSubmodules = false;  

     

       9
       9
       +
         src = fetchFromGitHub {

     

       10
       10
       +
           owner = "jeffail";

     

       11
       11
       +
           repo = "leaps";

     

       12
       12
       +
           sha256 = "0w63y777h5qc8fwnkrbawn3an9px0l1zz3649x0n8lhk125fvchj";

     

       13
       13
       +
           rev = "v${version}";

     

       15
       14
        
         };

     

       16
       15
        
       

     

       17
       16
        
         goDeps = ./deps.nix;

     

       17
       17
       +
         

     

       18
       18
        
         meta = {

     

       19
       19
        
           description = "A pair programming tool and library written in Golang";

     

       20
       20
        
           homepage = "https://github.com/jeffail/leaps/";

     

       21
       21
        
           license = "MIT";

     

       22
       22
        
           maintainers = with stdenv.lib.maintainers; [ qknight ];

     

       23
       23
        
           meta.platforms = stdenv.lib.platforms.linux;

     

       24
       24
       -
           broken = true;

     

       25
       24
        
         };

     

       26
       25
        
       }

     

       26
       26
       +

+87 -4

pkgs/development/tools/leaps/deps.nix

···

       1
       1
        
       [

     

       2
       2
        
         {

     

       3
       3
       -
           goPackagePath = "golang.org/x/net";

     

       3
       3
       +
           goPackagePath  = "github.com/amir/raidman";

     

       4
       4
        
           fetch = {

     

       5
       5
        
             type = "git";

     

       6
       6
       -
             url = "https://go.googlesource.com/net";

     

       7
       7
       -
             rev = "07b51741c1d6423d4a6abab1c49940ec09cb1aaf";

     

       8
       8
       -
             sha256 = "12lvdj0k2gww4hw5f79qb9yswqpy4i3bgv1likmf3mllgdxfm20w";

     

       6
       6
       +
             url = "https://github.com/amir/raidman";

     

       7
       7
       +
             rev =  "91c20f3f475cab75bb40ad7951d9bbdde357ade7";

     

       8
       8
       +
             sha256 = "0pkqy5hzjkk04wj1ljq8jsyla358ilxi4lkmvkk73b3dh2wcqvpp";

     

       9
       9
       +
           };

     

       10
       10
       +
         }

     

       11
       11
       +
         {

     

       12
       12
       +
           goPackagePath = "github.com/elazarl/go-bindata-assetfs";

     

       13
       13
       +
           fetch = {

     

       14
       14
       +
             type = "git";

     

       15
       15
       +
             url = "https://github.com/elazarl/go-bindata-assetfs";

     

       16
       16
       +
             rev = "57eb5e1fc594ad4b0b1dbea7b286d299e0cb43c2";

     

       17
       17
       +
             sha256 = "1za29pa15y2xsa1lza97jlkax9qj93ks4a2j58xzmay6rczfkb9i";

     

       18
       18
       +
           };

     

       19
       19
       +
         }

     

       20
       20
       +
         {

     

       21
       21
       +
          goPackagePath =  "github.com/garyburd/redigo";

     

       22
       22
       +
           fetch =  {

     

       23
       23
       +
             type =  "git";

     

       24
       24
       +
              url =  "https://github.com/garyburd/redigo";

     

       25
       25
       +
              rev =  "8873b2f1995f59d4bcdd2b0dc9858e2cb9bf0c13";

     

       26
       26
       +
              sha256 =  "1lzhb99pcwwf5ddcs0bw00fwf9m1d0k7b92fqz2a01jlij4pm5l2";

     

       27
       27
       +
           };

     

       28
       28
       +
         }

     

       29
       29
       +
         {

     

       30
       30
       +
          goPackagePath =  "github.com/go-sql-driver/mysql";

     

       31
       31
       +
           fetch =  {

     

       32
       32
       +
             type =  "git";

     

       33
       33
       +
              url =  "https://github.com/go-sql-driver/mysql";

     

       34
       34
       +
              rev =  "7ebe0a500653eeb1859664bed5e48dec1e164e73";

     

       35
       35
       +
              sha256 =  "1gyan3lyn2j00di9haq7zm3zcwckn922iigx3fvml6s2bsp6ljas";

     

       36
       36
       +
           };

     

       37
       37
       +
         }

     

       38
       38
       +
         {

     

       39
       39
       +
          goPackagePath =  "github.com/golang/protobuf";

     

       40
       40
       +
           fetch =  {

     

       41
       41
       +
             type =  "git";

     

       42
       42
       +
              url =  "https://github.com/golang/protobuf";

     

       43
       43
       +
              rev =  "bf531ff1a004f24ee53329dfd5ce0b41bfdc17df";

     

       44
       44
       +
              sha256 =  "10lnvmq28jp2wk1xc32mdk4745lal2bmdvbjirckb9wlv07zzzf0";

     

       45
       45
       +
           };

     

       46
       46
       +
         }

     

       47
       47
       +
         {

     

       48
       48
       +
          goPackagePath =  "github.com/jeffail/gabs";

     

       49
       49
       +
           fetch =  {

     

       50
       50
       +
             type =  "git";

     

       51
       51
       +
              url =  "https://github.com/jeffail/gabs";

     

       52
       52
       +
              rev =  "ee1575a53249b51d636e62464ca43a13030afdb5";

     

       53
       53
       +
              sha256 =  "0svv57193n8m86r7v7n0y9lny0p6nzr7xvz98va87h00mg146351";

     

       54
       54
       +
           };

     

       55
       55
       +
         }

     

       56
       56
       +
         {

     

       57
       57
       +
          goPackagePath =  "github.com/jeffail/util";

     

       58
       58
       +
           fetch =  {

     

       59
       59
       +
             type =  "git";

     

       60
       60
       +
              url =  "https://github.com/jeffail/util";

     

       61
       61
       +
              rev =  "48ada8ff9fcae546b5986f066720daa9033ad523";

     

       62
       62
       +
              sha256 =  "0k8zz7gdv4hb691fdyb5mhlixppcq8x4ny84fanflypnv258a3i0";

     

       63
       63
       +
           };

     

       64
       64
       +
         }

     

       65
       65
       +
         {

     

       66
       66
       +
          goPackagePath =  "github.com/lib/pq";

     

       67
       67
       +
           fetch =  {

     

       68
       68
       +
             type =  "git";

     

       69
       69
       +
              url =  "https://github.com/lib/pq";

     

       70
       70
       +
              rev =  "3cd0097429be7d611bb644ef85b42bfb102ceea4";

     

       71
       71
       +
              sha256 =  "1q7qfzyfgjk6rvid548r43fi4jhvsh4dhfvfjbp2pz4xqsvpsm7a";

     

       72
       72
       +
           };

     

       73
       73
       +
         }

     

       74
       74
       +
         {

     

       75
       75
       +
          goPackagePath =  "github.com/satori/go.uuid";

     

       76
       76
       +
           fetch =  {

     

       77
       77
       +
             type =  "git";

     

       78
       78
       +
              url =  "https://github.com/satori/go.uuid";

     

       79
       79
       +
              rev =  "f9ab0dce87d815821e221626b772e3475a0d2749";

     

       80
       80
       +
              sha256 =  "0z18j6zxq9kw4lgcpmhh3k7jrb9gy1lx252xz5qhs4ywi9w77xwi";

     

       81
       81
       +
           };

     

       82
       82
       +
         }

     

       83
       83
       +
       

     

       84
       84
       +
         {

     

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

     

       86
       86
       +
           fetch =  {

     

       87
       87
       +
             type =  "git";

     

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

     

       89
       89
       +
              rev =  "07b51741c1d6423d4a6abab1c49940ec09cb1aaf";

     

       90
       90
       +
              sha256 =  "12lvdj0k2gww4hw5f79qb9yswqpy4i3bgv1likmf3mllgdxfm20w";

     

       9
       91
        
           };

     

       10
       92
        
         }

     

       11
       93
        
       ]

     

       94
       94
       +