commit fbe3e3b44e64f20236c568bd11c0e5c82f5c1792 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/misc/ankisyncd.nix

···

       26
       26
        
       

     

       27
       27
        
             package = mkOption {

     

       28
       28
        
               type = types.package;

     

       29
       29
       -
               default = pkgs.ankisyncd-rs;

     

       29
       29
       +
               default = pkgs.ankisyncd;

     

       30
       30
        
               defaultText = literalExpression "pkgs.ankisyncd";

     

       31
       31
        
               description = lib.mdDoc "The package to use for the ankisyncd command.";

     

       32
       32
        
             };

pkgs/servers/ankisyncd-rs/Cargo.lock pkgs/servers/ankisyncd/Cargo.lock

-52

pkgs/servers/ankisyncd-rs/default.nix

···

       1
       1
       -
       { lib, runCommand, fetchFromGitHub, rustPlatform, protobuf }:

     

       2
       2
       -
       

     

       3
       3
       -
       let

     

       4
       4
       -
         pname = "ankisyncd-rs";

     

       5
       5
       -
         version = "1.1.3";

     

       6
       6
       -
       

     

       7
       7
       -
         # anki-sync-server-rs expects anki sources in the 'anki' folder

     

       8
       8
       -
         # of its own source tree, with a patch applied (mostly to make

     

       9
       9
       -
         # some modules public): prepare our own 'src' manually

     

       10
       10
       -
         src = runCommand "anki-sync-server-rs-src" {

     

       11
       11
       -
           src = fetchFromGitHub {

     

       12
       12
       -
             owner = "ankicommunity";

     

       13
       13
       -
             repo = "anki-sync-server-rs";

     

       14
       14
       -
             rev = version;

     

       15
       15
       -
             hash = "sha256-y7X4jsPBykdpWXXaybdy6+XL3F2wZ9c9NvFornCes3M=";

     

       16
       16
       -
           };

     

       17
       17
       -
         } ''

     

       18
       18
       -
           cp -r "$src/." "$out"

     

       19
       19
       -
           chmod +w "$out"

     

       20
       20
       -
           cp -r "${ankiSrc}" "$out/anki"

     

       21
       21
       -
           chmod -R +w "$out/anki"

     

       22
       22
       -
           patch -d "$out/anki" -Np1 < "$src/anki_patch/d9d36078f17a2b4b8b44fcb802eb274911ebabe7_anki_rslib.patch"

     

       23
       23
       -
         '';

     

       24
       24
       -
       

     

       25
       25
       -
         # Note we do not use anki.src because the patch in ankisyncd's

     

       26
       26
       -
         # sources expect a fixed version, so we pin it here.

     

       27
       27
       -
         ankiSrc = fetchFromGitHub {

     

       28
       28
       -
           owner = "ankitects";

     

       29
       29
       -
           repo = "anki";

     

       30
       30
       -
           rev = "2.1.60";

     

       31
       31
       -
           hash = "sha256-hNrf6asxF7r7QK2XO150yiRjyHAYKN8OFCFYX0SAiwA=";

     

       32
       32
       -
           fetchSubmodules = true;

     

       33
       33
       -
         };

     

       34
       34
       -
       in rustPlatform.buildRustPackage {

     

       35
       35
       -
         inherit pname version src;

     

       36
       36
       -
       

     

       37
       37
       -
         cargoLock = {

     

       38
       38
       -
           lockFile = ./Cargo.lock;

     

       39
       39
       -
           outputHashes = {

     

       40
       40
       -
             "csv-1.1.6" = "sha256-w728ffOVkI+IfK6FbmkGhr0CjuyqgJnPB1kutMJIUYg=";

     

       41
       41
       -
           };

     

       42
       42
       -
         };

     

       43
       43
       -
       

     

       44
       44
       -
         nativeBuildInputs = [ protobuf ];

     

       45
       45
       -
       

     

       46
       46
       -
         meta = with lib; {

     

       47
       47
       -
           description = "Standalone unofficial anki sync server";

     

       48
       48
       -
           homepage = "https://github.com/ankicommunity/anki-sync-server-rs";

     

       49
       49
       -
           license = with licenses; [ agpl3Only ];

     

       50
       50
       -
           maintainers = with maintainers; [ martinetd ];

     

       51
       51
       -
         };

     

       52
       52
       -
       }

+41 -57

pkgs/servers/ankisyncd/default.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , fetchFromGitHub

     

       3
       3
       -
       , python3

     

       4
       4
       -
       }:

     

       1
       1
       +
       { lib, runCommand, fetchFromGitHub, rustPlatform, protobuf }:

     

       5
       2
        
       

     

       6
       6
       -
       python3.pkgs.buildPythonApplication rec {

     

       3
       3
       +
       let

     

       7
       4
        
         pname = "ankisyncd";

     

       8
       8
       -
         version = "2.2.0";

     

       9
       9
       -
         src = fetchFromGitHub {

     

       10
       10
       -
           owner = "ankicommunity";

     

       11
       11
       -
           repo = "anki-sync-server";

     

       12
       12
       -
           rev = version;

     

       13
       13
       -
           hash = "sha256-RXrdJGJ+HMSpDGQBuVPPqsh3+uwAgE6f7ZJ0yFRMI8I=";

     

       14
       14
       -
           fetchSubmodules = true;

     

       15
       15
       -
         };

     

       16
       16
       -
         format = "other";

     

       5
       5
       +
         version = "1.1.3";

     

       17
       6
        
       

     

       18
       18
       -
         installPhase = ''

     

       19
       19
       -
           runHook preInstall

     

       20
       20
       -
       

     

       21
       21
       -
           mkdir -p $out/${python3.sitePackages}

     

       22
       22
       -
       

     

       23
       23
       -
           cp -r ankisyncd utils ankisyncd.conf $out/${python3.sitePackages}

     

       24
       24
       -
           cp -r anki-bundled/anki $out/${python3.sitePackages}

     

       25
       25
       -
           mkdir $out/share

     

       26
       26
       -
           cp ankisyncctl.py $out/share/

     

       27
       27
       -
       

     

       28
       28
       -
           runHook postInstall

     

       29
       29
       -
         '';

     

       30
       30
       -
       

     

       31
       31
       -
         fixupPhase = ''

     

       32
       32
       -
           PYTHONPATH="$PYTHONPATH:$out/${python3.sitePackages}"

     

       33
       33
       -
       

     

       34
       34
       -
           makeWrapper "${python3.interpreter}" "$out/bin/ankisyncd" \

     

       35
       35
       -
                 --set PYTHONPATH $PYTHONPATH \

     

       36
       36
       -
                 --add-flags "-m ankisyncd"

     

       37
       37
       -
       

     

       38
       38
       -
           makeWrapper "${python3.interpreter}" "$out/bin/ankisyncctl" \

     

       39
       39
       -
                 --set PYTHONPATH $PYTHONPATH \

     

       40
       40
       -
                 --add-flags "$out/share/ankisyncctl.py"

     

       7
       7
       +
         # anki-sync-server-rs expects anki sources in the 'anki' folder

     

       8
       8
       +
         # of its own source tree, with a patch applied (mostly to make

     

       9
       9
       +
         # some modules public): prepare our own 'src' manually

     

       10
       10
       +
         src = runCommand "anki-sync-server-rs-src" {

     

       11
       11
       +
           src = fetchFromGitHub {

     

       12
       12
       +
             owner = "ankicommunity";

     

       13
       13
       +
             repo = "anki-sync-server-rs";

     

       14
       14
       +
             rev = version;

     

       15
       15
       +
             hash = "sha256-y7X4jsPBykdpWXXaybdy6+XL3F2wZ9c9NvFornCes3M=";

     

       16
       16
       +
           };

     

       17
       17
       +
         } ''

     

       18
       18
       +
           cp -r "$src/." "$out"

     

       19
       19
       +
           chmod +w "$out"

     

       20
       20
       +
           cp -r "${ankiSrc}" "$out/anki"

     

       21
       21
       +
           chmod -R +w "$out/anki"

     

       22
       22
       +
           patch -d "$out/anki" -Np1 < "$src/anki_patch/d9d36078f17a2b4b8b44fcb802eb274911ebabe7_anki_rslib.patch"

     

       41
       23
        
         '';

     

       42
       24
        
       

     

       43
       43
       -
         nativeCheckInputs = with python3.pkgs; [

     

       44
       44
       -
           pytest

     

       45
       45
       -
           webtest

     

       46
       46
       -
         ];

     

       25
       25
       +
         # Note we do not use anki.src because the patch in ankisyncd's

     

       26
       26
       +
         # sources expect a fixed version, so we pin it here.

     

       27
       27
       +
         ankiSrc = fetchFromGitHub {

     

       28
       28
       +
           owner = "ankitects";

     

       29
       29
       +
           repo = "anki";

     

       30
       30
       +
           rev = "2.1.60";

     

       31
       31
       +
           hash = "sha256-hNrf6asxF7r7QK2XO150yiRjyHAYKN8OFCFYX0SAiwA=";

     

       32
       32
       +
           fetchSubmodules = true;

     

       33
       33
       +
         };

     

       34
       34
       +
       in rustPlatform.buildRustPackage {

     

       35
       35
       +
         inherit pname version src;

     

       47
       36
        
       

     

       48
       48
       -
         buildInputs = [ ];

     

       49
       49
       -
       

     

       50
       50
       -
         propagatedBuildInputs = with python3.pkgs; [

     

       51
       51
       -
           decorator

     

       52
       52
       -
           requests

     

       53
       53
       -
         ];

     

       37
       37
       +
         cargoLock = {

     

       38
       38
       +
           lockFile = ./Cargo.lock;

     

       39
       39
       +
           outputHashes = {

     

       40
       40
       +
             "csv-1.1.6" = "sha256-w728ffOVkI+IfK6FbmkGhr0CjuyqgJnPB1kutMJIUYg=";

     

       41
       41
       +
           };

     

       42
       42
       +
         };

     

       54
       43
        
       

     

       55
       55
       -
         checkPhase = ''

     

       56
       56
       -
           # skip these tests, our files are too young:

     

       57
       57
       -
           # tests/test_web_media.py::SyncAppFunctionalMediaTest::test_sync_mediaChanges ValueError: ZIP does not support timestamps before 1980

     

       58
       58
       -
           pytest --ignore tests/test_web_media.py tests/

     

       59
       59
       -
         '';

     

       44
       44
       +
         nativeBuildInputs = [ protobuf ];

     

       60
       45
        
       

     

       61
       46
        
         meta = with lib; {

     

       62
       62
       -
           description = "Self-hosted Anki sync server";

     

       63
       63
       -
           maintainers = with maintainers; [ matt-snider ];

     

       64
       64
       -
           homepage = "https://github.com/ankicommunity/anki-sync-server";

     

       65
       65
       -
           license = licenses.agpl3Only;

     

       66
       66
       -
           platforms = platforms.linux;

     

       47
       47
       +
           description = "Standalone unofficial anki sync server";

     

       48
       48
       +
           homepage = "https://github.com/ankicommunity/anki-sync-server-rs";

     

       49
       49
       +
           license = with licenses; [ agpl3Only ];

     

       50
       50
       +
           maintainers = with maintainers; [ martinetd ];

     

       67
       51
        
         };

     

       68
       52
        
       }

+1 -5

pkgs/top-level/all-packages.nix

···

       240
       240
        
       

     

       241
       241
        
         anders = callPackage ../applications/science/logic/anders { };

     

       242
       242
        
       

     

       243
       243
       -
         ankisyncd = callPackage ../servers/ankisyncd {

     

       244
       244
       -
           python3 = python39;

     

       245
       245
       -
         };

     

       246
       246
       -
       

     

       247
       247
       -
         ankisyncd-rs = callPackage ../servers/ankisyncd-rs { };

     

       243
       243
       +
         ankisyncd = callPackage ../servers/ankisyncd { };

     

       248
       244
        
       

     

       249
       245
        
         ariang = callPackage ../servers/ariang { };

     

       250
       246