commit 7ce33fa62785d406d56c353c3680fc75cf13c928 · pyrox.dev/nixpkgs

+54 -38

pkgs/applications/networking/onionshare/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonApplication,

     

       4
       4
       -
         stdenv,

     

       5
       4
        
         substituteAll,

     

       6
       5
        
         fetchFromGitHub,

     

       7
       6
        
         isPy3k,

     

       8
       7
        
         flask,

     

       9
       8
        
         flask-httpauth,

     

       9
       9
       +
         flask-socketio,

     

       10
       10
        
         stem,

     

       11
       11
       +
         psutil,

     

       11
       12
        
         pyqt5,

     

       12
       13
        
         pycrypto,

     

       13
       13
       -
         pysocks,

     

       14
       14
       -
         pytest,

     

       14
       14
       +
         pyside2,

     

       15
       15
       +
         pytestCheckHook,

     

       16
       16
       +
         qrcode,

     

       15
       17
        
         qt5,

     

       16
       18
        
         requests,

     

       19
       19
       +
         unidecode,

     

       17
       20
        
         tor,

     

       18
       21
        
         obfs4,

     

       19
       22
        
       }:

     

       20
       23
        
       

     

       21
       24
        
       let

     

       22
       22
       -
         version = "2.2";

     

       25
       25
       +
         version = "2.3.1";

     

       23
       26
        
         src = fetchFromGitHub {

     

       24
       27
        
           owner = "micahflee";

     

       25
       28
        
           repo = "onionshare";

     

       26
       29
        
           rev = "v${version}";

     

       27
       27
       -
           sha256 = "0m8ygxcyp3nfzzhxs2dfnpqwh1vx0aws44lszpnnczz4fks3a5j4";

     

       30
       30
       +
           sha256 = "sha256-H09x3OF6l1HLHukGPvV2rZUjW9fxeKKMZkKbY9a2m9I=";

     

       28
       31
        
         };

     

       29
       32
        
         meta = with lib; {

     

       30
       33
        
           description = "Securely and anonymously send and receive files";

     
···

       51
       54
        
           maintainers = with maintainers; [ lourkeur ];

     

       52
       55
        
         };

     

       53
       56
        
       

     

       54
       54
       -
         common = buildPythonApplication {

     

       55
       55
       -
           pname = "onionshare-common";

     

       56
       56
       -
           inherit version meta src;

     

       57
       57
       -
       

     

       57
       57
       +
       in rec {

     

       58
       58
       +
         onionshare = buildPythonApplication {

     

       59
       59
       +
           pname = "onionshare-cli";

     

       60
       60
       +
           inherit version meta;

     

       61
       61
       +
           src = "${src}/cli";

     

       62
       62
       +
           patches = [

     

       63
       63
       +
             # hardcode store paths of dependencies

     

       64
       64
       +
             (substituteAll {

     

       65
       65
       +
               src = ./fix-paths.patch;

     

       66
       66
       +
               inherit tor obfs4;

     

       67
       67
       +
               inherit (tor) geoip;

     

       68
       68
       +
             })

     

       69
       69
       +
           ];

     

       58
       70
        
           disable = !isPy3k;

     

       59
       71
        
           propagatedBuildInputs = [

     

       60
       72
        
             flask

     

       61
       73
        
             flask-httpauth

     

       74
       74
       +
             flask-socketio

     

       62
       75
        
             stem

     

       63
       63
       -
             pyqt5

     

       76
       76
       +
             psutil

     

       64
       77
        
             pycrypto

     

       65
       65
       -
             pysocks

     

       66
       78
        
             requests

     

       79
       79
       +
             unidecode

     

       67
       80
        
           ];

     

       81
       81
       +
       

     

       68
       82
        
           buildInputs = [

     

       69
       83
        
             tor

     

       70
       84
        
             obfs4

     

       71
       85
        
           ];

     

       72
       86
        
       

     

       87
       87
       +
           checkInputs = [

     

       88
       88
       +
             pytestCheckHook

     

       89
       89
       +
           ];

     

       90
       90
       +
       

     

       91
       91
       +
           preCheck = ''

     

       92
       92
       +
             # Tests use the home directory

     

       93
       93
       +
             export HOME="$(mktemp -d)"

     

       94
       94
       +
           '';

     

       95
       95
       +
         };

     

       96
       96
       +
       

     

       97
       97
       +
         onionshare-gui = buildPythonApplication {

     

       98
       98
       +
           pname = "onionshare";

     

       99
       99
       +
           inherit version meta;

     

       100
       100
       +
           src = "${src}/desktop/src";

     

       73
       101
        
           patches = [

     

       102
       102
       +
             # hardcode store paths of dependencies

     

       74
       103
        
             (substituteAll {

     

       75
       75
       -
               src = ./fix-paths.patch;

     

       104
       104
       +
               src = ./fix-paths-gui.patch;

     

       76
       105
        
               inherit tor obfs4;

     

       77
       106
        
               inherit (tor) geoip;

     

       78
       107
        
             })

     

       79
       108
        
           ];

     

       80
       80
       -
           postPatch = "substituteInPlace onionshare/common.py --subst-var-by common $out";

     

       81
       109
        
       

     

       82
       82
       -
           doCheck = false;

     

       83
       83
       -
         };

     

       84
       84
       -
       in

     

       85
       85
       -
       {

     

       86
       86
       -
         onionshare = stdenv.mkDerivation {

     

       87
       87
       -
           pname = "onionshare";

     

       88
       88
       -
           inherit version meta;

     

       110
       110
       +
           disable = !isPy3k;

     

       111
       111
       +
           propagatedBuildInputs = [

     

       112
       112
       +
             onionshare

     

       113
       113
       +
             pyqt5

     

       114
       114
       +
             pyside2

     

       115
       115
       +
             psutil

     

       116
       116
       +
             qrcode

     

       117
       117
       +
           ];

     

       89
       118
        
       

     

       90
       90
       -
           dontUnpack = true;

     

       119
       119
       +
           nativeBuildInputs = [ qt5.wrapQtAppsHook ];

     

       91
       120
        
       

     

       92
       92
       -
           inherit common;

     

       93
       93
       -
           installPhase = ''

     

       94
       94
       -
             mkdir -p $out/bin

     

       95
       95
       -
             cp $common/bin/onionshare -t $out/bin

     

       121
       121
       +
           preFixup = ''

     

       122
       122
       +
             wrapQtApp $out/bin/onionshare

     

       96
       123
        
           '';

     

       97
       97
       -
         };

     

       98
       98
       -
         onionshare-gui = stdenv.mkDerivation {

     

       99
       99
       -
           pname = "onionshare-gui";

     

       100
       100
       -
           inherit version meta;

     

       101
       124
        
       

     

       102
       102
       -
           nativeBuildInputs = [ qt5.wrapQtAppsHook ];

     

       103
       103
       -
       

     

       104
       104
       -
           dontUnpack = true;

     

       125
       125
       +
           doCheck = false;

     

       105
       126
        
       

     

       106
       106
       -
           inherit common;

     

       107
       107
       -
           installPhase = ''

     

       108
       108
       -
             mkdir -p $out/bin

     

       109
       109
       -
             cp $common/bin/onionshare-gui -t $out/bin

     

       110
       110
       -
             wrapQtApp $out/bin/onionshare-gui

     

       111
       111
       -
           '';

     

       127
       127
       +
           pythonImportsCheck = [ "onionshare" ];

     

       112
       128
        
         };

     

       113
       129
        
       }

+37

pkgs/applications/networking/onionshare/fix-paths-gui.patch

···

       1
       1
       +
       

     

       2
       2
       +
       --- a/onionshare/gui_common.py

     

       3
       3
       +
       +++ b/onionshare/gui_common.py

     

       4
       4
       +
       @@ -376,29 +376,10 @@ class GuiCommon:

     

       5
       5
       +
                }

     

       6
       6
       +
        

     

       7
       7
       +
            def get_tor_paths(self):

     

       8
       8
       +
       -        if self.common.platform == "Linux":

     

       9
       9
       +
       -            tor_path = shutil.which("tor")

     

       10
       10
       +
       -            obfs4proxy_file_path = shutil.which("obfs4proxy")

     

       11
       11
       +
       -            prefix = os.path.dirname(os.path.dirname(tor_path))

     

       12
       12
       +
       -            tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip")

     

       13
       13
       +
       -            tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6")

     

       14
       14
       +
       -        elif self.common.platform == "Windows":

     

       15
       15
       +
       -            base_path = self.get_resource_path("tor")

     

       16
       16
       +
       -            tor_path = os.path.join(base_path, "Tor", "tor.exe")

     

       17
       17
       +
       -            obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe")

     

       18
       18
       +
       -            tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip")

     

       19
       19
       +
       -            tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6")

     

       20
       20
       +
       -        elif self.common.platform == "Darwin":

     

       21
       21
       +
       -            base_path = self.get_resource_path("tor")

     

       22
       22
       +
       -            tor_path = os.path.join(base_path, "tor")

     

       23
       23
       +
       -            obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy.exe")

     

       24
       24
       +
       -            tor_geo_ip_file_path = os.path.join(base_path, "geoip")

     

       25
       25
       +
       -            tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6")

     

       26
       26
       +
       -        elif self.common.platform == "BSD":

     

       27
       27
       +
       -            tor_path = "/usr/local/bin/tor"

     

       28
       28
       +
       -            tor_geo_ip_file_path = "/usr/local/share/tor/geoip"

     

       29
       29
       +
       -            tor_geo_ipv6_file_path = "/usr/local/share/tor/geoip6"

     

       30
       30
       +
       -            obfs4proxy_file_path = "/usr/local/bin/obfs4proxy"

     

       31
       31
       +
       +        tor_path = "@tor@/bin/tor"

     

       32
       32
       +
       +        tor_geo_ip_file_path = "@geoip@/share/tor/geoip"

     

       33
       33
       +
       +        tor_geo_ipv6_file_path = "@geoip@/share/tor/geoip6"

     

       34
       34
       +
       +        obfs4proxy_file_path = "@obfs4@/bin/obfs4proxy"

     

       35
       35
       +
        

     

       36
       36
       +
                return (

     

       37
       37
       +
                    tor_path,

+25 -119

pkgs/applications/networking/onionshare/fix-paths.patch

···

       1
       1
       -
       diff --git a/onionshare/common.py b/onionshare/common.py

     

       2
       2
       -
       index 3373462..7fd245b 100644

     

       3
       3
       -
       --- a/onionshare/common.py

     

       4
       4
       -
       +++ b/onionshare/common.py

     

       5
       5
       -
       @@ -87,66 +87,16 @@ class Common(object):

     

       6
       6
       -
                        ),

     

       7
       7
       -
                        "share",

     

       8
       8
       -
                    )

     

       9
       9
       -
       -            if not os.path.exists(prefix):

     

       10
       10
       -
       -                # While running tests during stdeb bdist_deb, look 3 directories up for the share folder

     

       11
       11
       -
       -                prefix = os.path.join(

     

       12
       12
       -
       -                    os.path.dirname(

     

       13
       13
       -
       -                        os.path.dirname(os.path.dirname(os.path.dirname(prefix)))

     

       14
       14
       -
       -                    ),

     

       15
       15
       -
       -                    "share",

     

       16
       16
       -
       -                )

     

       17
       17
       -
       -

     

       18
       18
       -
       -        elif self.platform == "BSD" or self.platform == "Linux":

     

       19
       19
       -
       -            # Assume OnionShare is installed systemwide in Linux, since we're not running in dev mode

     

       20
       20
       -
       -            prefix = os.path.join(sys.prefix, "share/onionshare")

     

       21
       21
       -
       -

     

       22
       22
       -
       -        elif getattr(sys, "frozen", False):

     

       23
       23
       -
       -            # Check if app is "frozen"

     

       24
       24
       -
       -            # https://pythonhosted.org/PyInstaller/#run-time-information

     

       25
       25
       -
       -            if self.platform == "Darwin":

     

       26
       26
       -
       -                prefix = os.path.join(sys._MEIPASS, "share")

     

       27
       27
       -
       -            elif self.platform == "Windows":

     

       28
       28
       -
       -                prefix = os.path.join(os.path.dirname(sys.executable), "share")

     

       29
       29
       -
       +        else:

     

       30
       30
       -
       +            prefix = "@common@/share/onionshare"

     

       31
       31
       -
       

     

       32
       32
       -
                return os.path.join(prefix, filename)

     

       33
       33
       -
       

     

       1
       1
       +
       --- a/onionshare_cli/common.py

     

       2
       2
       +
       +++ b/onionshare_cli/common.py

     

       3
       3
       +
       @@ -86,33 +86,10 @@ class Common:

     

       4
       4
       +
                return path

     

       5
       5
       +
        

     

       34
       6
        
            def get_tor_paths(self):

     

       35
       7
        
       -        if self.platform == "Linux":

     

       36
       36
       -
       -            tor_path = "/usr/bin/tor"

     

       37
       37
       -
       -            tor_geo_ip_file_path = "/usr/share/tor/geoip"

     

       38
       38
       -
       -            tor_geo_ipv6_file_path = "/usr/share/tor/geoip6"

     

       39
       39
       -
       -            obfs4proxy_file_path = "/usr/bin/obfs4proxy"

     

       8
       8
       +
       -            tor_path = shutil.which("tor")

     

       9
       9
       +
       -            if not tor_path:

     

       10
       10
       +
       -                raise CannotFindTor()

     

       11
       11
       +
       -            obfs4proxy_file_path = shutil.which("obfs4proxy")

     

       12
       12
       +
       -            prefix = os.path.dirname(os.path.dirname(tor_path))

     

       13
       13
       +
       -            tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip")

     

       14
       14
       +
       -            tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6")

     

       40
       15
        
       -        elif self.platform == "Windows":

     

       41
       41
       -
       -            base_path = os.path.join(

     

       42
       42
       -
       -                os.path.dirname(os.path.dirname(self.get_resource_path(""))), "tor"

     

       43
       43
       -
       -            )

     

       44
       44
       -
       -            tor_path = os.path.join(os.path.join(base_path, "Tor"), "tor.exe")

     

       45
       45
       -
       -            obfs4proxy_file_path = os.path.join(

     

       46
       46
       -
       -                os.path.join(base_path, "Tor"), "obfs4proxy.exe"

     

       47
       47
       -
       -            )

     

       48
       48
       -
       -            tor_geo_ip_file_path = os.path.join(

     

       49
       49
       -
       -                os.path.join(os.path.join(base_path, "Data"), "Tor"), "geoip"

     

       50
       50
       -
       -            )

     

       51
       51
       -
       -            tor_geo_ipv6_file_path = os.path.join(

     

       52
       52
       -
       -                os.path.join(os.path.join(base_path, "Data"), "Tor"), "geoip6"

     

       53
       53
       -
       -            )

     

       16
       16
       +
       -            base_path = self.get_resource_path("tor")

     

       17
       17
       +
       -            tor_path = os.path.join(base_path, "Tor", "tor.exe")

     

       18
       18
       +
       -            obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe")

     

       19
       19
       +
       -            tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip")

     

       20
       20
       +
       -            tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6")

     

       54
       21
        
       -        elif self.platform == "Darwin":

     

       55
       55
       -
       -            base_path = os.path.dirname(

     

       56
       56
       -
       -                os.path.dirname(os.path.dirname(self.get_resource_path("")))

     

       57
       57
       -
       -            )

     

       58
       58
       -
       -            tor_path = os.path.join(base_path, "Resources", "Tor", "tor")

     

       59
       59
       -
       -            tor_geo_ip_file_path = os.path.join(base_path, "Resources", "Tor", "geoip")

     

       60
       60
       -
       -            tor_geo_ipv6_file_path = os.path.join(

     

       61
       61
       -
       -                base_path, "Resources", "Tor", "geoip6"

     

       62
       62
       -
       -            )

     

       63
       63
       -
       -            obfs4proxy_file_path = os.path.join(

     

       64
       64
       -
       -                base_path, "Resources", "Tor", "obfs4proxy"

     

       65
       65
       -
       -            )

     

       22
       22
       +
       -            tor_path = shutil.which("tor")

     

       23
       23
       +
       -            if not tor_path:

     

       24
       24
       +
       -                raise CannotFindTor()

     

       25
       25
       +
       -            obfs4proxy_file_path = shutil.which("obfs4proxy")

     

       26
       26
       +
       -            prefix = os.path.dirname(os.path.dirname(tor_path))

     

       27
       27
       +
       -            tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip")

     

       28
       28
       +
       -            tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6")

     

       66
       29
        
       -        elif self.platform == "BSD":

     

       67
       30
        
       -            tor_path = "/usr/local/bin/tor"

     

       68
       31
        
       -            tor_geo_ip_file_path = "/usr/local/share/tor/geoip"

     
···

       72
       35
        
       +        tor_geo_ip_file_path = "@geoip@/share/tor/geoip"

     

       73
       36
        
       +        tor_geo_ipv6_file_path = "@geoip@/share/tor/geoip6"

     

       74
       37
        
       +        obfs4proxy_file_path = "@obfs4@/bin/obfs4proxy"

     

       75
       75
       -
       

     

       38
       38
       +
        

     

       76
       39
        
                return (

     

       77
       40
        
                    tor_path,

     

       78
       78
       -
       diff --git a/setup.py b/setup.py

     

       79
       79
       -
       index 9af72fc..53ca47b 100644

     

       80
       80
       -
       --- a/setup.py

     

       81
       81
       -
       +++ b/setup.py

     

       82
       82
       -
       @@ -70,41 +70,41 @@ classifiers = [

     

       83
       83
       -
        ]

     

       84
       84
       -
        data_files = [

     

       85
       85
       -
            (

     

       86
       86
       -
       -        os.path.join(sys.prefix, "share/applications"),

     

       87
       87
       -
       +        "share/applications",

     

       88
       88
       -
                ["install/org.onionshare.OnionShare.desktop"],

     

       89
       89
       -
            ),

     

       90
       90
       -
            (

     

       91
       91
       -
       -        os.path.join(sys.prefix, "share/icons/hicolor/scalable/apps"),

     

       92
       92
       -
       +        "share/icons/hicolor/scalable/apps",

     

       93
       93
       -
                ["install/org.onionshare.OnionShare.svg"],

     

       94
       94
       -
            ),

     

       95
       95
       -
            (

     

       96
       96
       -
       -        os.path.join(sys.prefix, "share/metainfo"),

     

       97
       97
       -
       +        "share/metainfo",

     

       98
       98
       -
                ["install/org.onionshare.OnionShare.appdata.xml"],

     

       99
       99
       -
            ),

     

       100
       100
       -
       -    (os.path.join(sys.prefix, "share/onionshare"), file_list("share")),

     

       101
       101
       -
       -    (os.path.join(sys.prefix, "share/onionshare/images"), file_list("share/images")),

     

       102
       102
       -
       -    (os.path.join(sys.prefix, "share/onionshare/locale"), file_list("share/locale")),

     

       103
       103
       -
       +    ( "share/onionshare", file_list("share")),

     

       104
       104
       -
       +    ( "share/onionshare/images", file_list("share/images")),

     

       105
       105
       -
       +    ( "share/onionshare/locale", file_list("share/locale")),

     

       106
       106
       -
            (

     

       107
       107
       -
       -        os.path.join(sys.prefix, "share/onionshare/templates"),

     

       108
       108
       -
       +        "share/onionshare/templates",

     

       109
       109
       -
                file_list("share/templates"),

     

       110
       110
       -
            ),

     

       111
       111
       -
            (

     

       112
       112
       -
       -        os.path.join(sys.prefix, "share/onionshare/static/css"),

     

       113
       113
       -
       +        "share/onionshare/static/css",

     

       114
       114
       -
                file_list("share/static/css"),

     

       115
       115
       -
            ),

     

       116
       116
       -
            (

     

       117
       117
       -
       -        os.path.join(sys.prefix, "share/onionshare/static/img"),

     

       118
       118
       -
       +        "share/onionshare/static/img",

     

       119
       119
       -
                file_list("share/static/img"),

     

       120
       120
       -
            ),

     

       121
       121
       -
            (

     

       122
       122
       -
       -        os.path.join(sys.prefix, "share/onionshare/static/js"),

     

       123
       123
       -
       +        "share/onionshare/static/js",

     

       124
       124
       -
                file_list("share/static/js"),

     

       125
       125
       -
            ),

     

       126
       126
       -
        ]

     

       127
       127
       -
        if not platform.system().endswith("BSD") and platform.system() != "DragonFly":

     

       128
       128
       -
            data_files.append(

     

       129
       129
       -
                (

     

       130
       130
       -
       -            "/usr/share/nautilus-python/extensions/",

     

       131
       131
       -
       +            "share/nautilus-python/extensions/",

     

       132
       132
       -
                    ["install/scripts/onionshare-nautilus.py"],

     

       133
       133
       -
                )

     

       134
       134
       -
            )