commit 15e8c2a2f2d222a50c23f9fdfcea5ca27637bba1 · pyrox.dev/nixpkgs

+28 -12
pkgs/by-name/cj/cjdns/package.nix
···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       +
         fetchpatch,

     

       5
       6
        
         rustPlatform,

     

       6
       7
        
         nodejs,

     

       7
       8
        
         which,

     

       8
       8
       -
         python3,

     

       9
       9
       -
         libuv,

     

       10
       9
        
         util-linux,

     

       11
       10
        
         nixosTests,

     

       12
       11
        
         libsodium,

     
···

       16
       15
        
       

     

       17
       16
        
       rustPlatform.buildRustPackage rec {

     

       18
       17
        
         pname = "cjdns";

     

       19
       19
       -
         version = "21.4";

     

       18
       18
       +
         version = "22.1";

     

       20
       19
        
       

     

       21
       20
        
         src = fetchFromGitHub {

     

       22
       21
        
           owner = "cjdelisle";

     

       23
       22
        
           repo = "cjdns";

     

       24
       24
       -
           rev = "cjdns-v${version}";

     

       25
       25
       -
           sha256 = "sha256-vI3uHZwmbFqxGasKqgCl0PLEEO8RNEhwkn5ZA8K7bxU=";

     

       23
       23
       +
           tag = "cjdns-v${version}";

     

       24
       24
       +
           hash = "sha256-0imQrkcvIA+2Eq/zlC65USMR7T3OUKwQxrB1KtVexyU=";

     

       26
       25
        
         };

     

       27
       26
        
       

     

       28
       27
        
         patches = [

     

       29
       28
        
           (replaceVars ./system-libsodium.patch {

     

       30
       29
        
             libsodium_include_dir = "${libsodium.dev}/include";

     

       31
       30
        
           })

     

       31
       31
       +
           # Remove mkpasswd since it is failing the build

     

       32
       32
       +
           (fetchpatch {

     

       33
       33
       +
             url = "https://github.com/cjdelisle/cjdns/commit/6391dba3f5fdab45df4b4b6b71dbe9620286ce32.patch";

     

       34
       34
       +
             hash = "sha256-XVA4tdTVMLrV6zuGoBCkOgQq6NXh0x7u8HgmaxFeoRI=";

     

       35
       35
       +
           })

     

       36
       36
       +
           (fetchpatch {

     

       37
       37
       +
             url = "https://github.com/cjdelisle/cjdns/commit/436d9a9784bae85734992c2561c778fbd2f5ac32.patch";

     

       38
       38
       +
             hash = "sha256-THcYNGVbMx/xf3/5UIxEhz3OlODE0qiYgDBOlHunhj8=";

     

       39
       39
       +
           })

     

       32
       40
        
         ];

     

       33
       41
        
       

     

       34
       34
       -
         cargoHash = "sha256-LJEKjhyAsK6b7mKObX8tNJdKt53iagMD/YLzoY5GVPw=";

     

       42
       42
       +
         cargoHash = "sha256-f96y6ZW0HxC+73ts5re8GIo2aigQgK3gXyF7fMrcJ0o=";

     

       35
       43
        
       

     

       36
       44
        
         nativeBuildInputs = [

     

       37
       45
        
           which

     

       38
       38
       -
           python3

     

       39
       46
        
           nodejs

     

       40
       47
        
           pkg-config

     

       41
       48
        
         ]

     
···

       43
       50
        
           # for flock

     

       44
       51
        
           lib.optional stdenv.hostPlatform.isLinux util-linux;

     

       45
       52
        
       

     

       46
       46
       -
         buildInputs = [

     

       47
       47
       -
           libuv

     

       48
       48
       -
           libsodium

     

       49
       49
       -
         ];

     

       53
       53
       +
         buildInputs = [ libsodium ];

     

       50
       54
        
       

     

       51
       55
        
         env.SODIUM_USE_PKG_CONFIG = 1;

     

       52
       56
        
         env.NIX_CFLAGS_COMPILE = toString (

     
···

       61
       65
        
           ]

     

       62
       66
        
         );

     

       63
       67
        
       

     

       68
       68
       +
         cargoTestFlags = [

     

       69
       69
       +
           # don't run doctests since they fail with "cannot find type `Ctx` in this scope"

     

       70
       70
       +
           "--lib"

     

       71
       71
       +
           "--bins"

     

       72
       72
       +
           "--tests"

     

       73
       73
       +
         ];

     

       74
       74
       +
       

     

       75
       75
       +
         checkFlags = [

     

       76
       76
       +
           # Tests don't seem to work - "called `Result::unwrap()` on an `Err` value: DecryptErr: NO_SESSION"

     

       77
       77
       +
           "--skip=crypto::crypto_auth::tests::test_wireguard_iface_encrypt_decrypt"

     

       78
       78
       +
           "--skip=crypto::crypto_auth::tests::test_wireguard_iface_encrypt_decrypt_with_auth"

     

       79
       79
       +
         ];

     

       80
       80
       +
       

     

       64
       81
        
         passthru.tests.basic = nixosTests.cjdns;

     

       65
       82
        
       

     

       66
       83
        
         meta = with lib; {

     

       67
       67
       -
           broken = true; # outdated, incompatible with supported python versions

     

       68
       84
        
           homepage = "https://github.com/cjdelisle/cjdns";

     

       69
       85
        
           description = "Encrypted networking for regular people";

     

       70
       86
        
           license = licenses.gpl3Plus;