commit 18a91c2f83ba4a13765e9329914aeec9384a02d7 · pyrox.dev/nixpkgs

-1

nixos/modules/module-list.nix

···

       1237
        
         ./services/networking/mmsd.nix

     

       1238
        
         ./services/networking/modemmanager.nix

     

       1239
        
         ./services/networking/monero.nix

     

       1240
       -
         ./services/networking/morty.nix

     

       1241
        
         ./services/networking/mosquitto.nix

     

       1242
        
         ./services/networking/mozillavpn.nix

     

       1243
        
         ./services/networking/mptcpd.nix

···

       1237
        
         ./services/networking/mmsd.nix

     

       1238
        
         ./services/networking/modemmanager.nix

     

       1239
        
         ./services/networking/monero.nix

     

       0
        
       
     

       1240
        
         ./services/networking/mosquitto.nix

     

       1241
        
         ./services/networking/mozillavpn.nix

     

       1242
        
         ./services/networking/mptcpd.nix

nixos/modules/rename.nix

···

       211
        
             "services"

     

       212
        
             "moinmoin"

     

       213
        
           ] "The corresponding package was removed from nixpkgs.")

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       214
        
           (mkRemovedOptionModule [ "services" "mwlib" ] "The corresponding package was removed from nixpkgs.")

     

       215
        
           (mkRemovedOptionModule [ "services" "pantheon" "files" ] ''

     

       216
        
             This module was removed, please add pkgs.pantheon.elementary-files to environment.systemPackages directly.

···

       211
        
             "services"

     

       212
        
             "moinmoin"

     

       213
        
           ] "The corresponding package was removed from nixpkgs.")

     

       214
       +
           (mkRemovedOptionModule [ "services" "morty" ]

     

       215
       +
             "services.morty has been removed from NixOS. As the morty package was unmaintained and removed and searxng, its main consumer, dropped support for it."

     

       216
       +
           )

     

       217
        
           (mkRemovedOptionModule [ "services" "mwlib" ] "The corresponding package was removed from nixpkgs.")

     

       218
        
           (mkRemovedOptionModule [ "services" "pantheon" "files" ] ''

     

       219
        
             This module was removed, please add pkgs.pantheon.elementary-files to environment.systemPackages directly.

-97

nixos/modules/services/networking/morty.nix

···

       1
       -
       {

     

       2
       -
         config,

     

       3
       -
         lib,

     

       4
       -
         pkgs,

     

       5
       -
         ...

     

       6
       -
       }:

     

       7
       -
       

     

       8
       -
       with lib;

     

       9
       -
       

     

       10
       -
       let

     

       11
       -
       

     

       12
       -
         cfg = config.services.morty;

     

       13
       -
       

     

       14
       -
       in

     

       15
       -
       

     

       16
       -
       {

     

       17
       -
       

     

       18
       -
         ###### interface

     

       19
       -
       

     

       20
       -
         options = {

     

       21
       -
       

     

       22
       -
           services.morty = {

     

       23
       -
       

     

       24
       -
             enable = mkEnableOption "Morty proxy server. See <https://github.com/asciimoo/morty>";

     

       25
       -
       

     

       26
       -
             ipv6 = mkOption {

     

       27
       -
               type = types.bool;

     

       28
       -
               default = true;

     

       29
       -
               description = "Allow IPv6 HTTP requests?";

     

       30
       -
             };

     

       31
       -
       

     

       32
       -
             key = mkOption {

     

       33
       -
               type = types.str;

     

       34
       -
               default = "";

     

       35
       -
               description = ''

     

       36
       -
                 HMAC url validation key (hexadecimal encoded).

     

       37
       -
                 Leave blank to disable. Without validation key, anyone can

     

       38
       -
                 submit proxy requests. Leave blank to disable.

     

       39
       -
                 Generate with `printf %s somevalue | openssl dgst -sha1 -hmac somekey`

     

       40
       -
               '';

     

       41
       -
             };

     

       42
       -
       

     

       43
       -
             timeout = mkOption {

     

       44
       -
               type = types.int;

     

       45
       -
               default = 2;

     

       46
       -
               description = "Request timeout in seconds.";

     

       47
       -
             };

     

       48
       -
       

     

       49
       -
             package = mkPackageOption pkgs "morty" { };

     

       50
       -
       

     

       51
       -
             port = mkOption {

     

       52
       -
               type = types.port;

     

       53
       -
               default = 3000;

     

       54
       -
               description = "Listing port";

     

       55
       -
             };

     

       56
       -
       

     

       57
       -
             listenAddress = mkOption {

     

       58
       -
               type = types.str;

     

       59
       -
               default = "127.0.0.1";

     

       60
       -
               description = "The address on which the service listens";

     

       61
       -
             };

     

       62
       -
       

     

       63
       -
           };

     

       64
       -
       

     

       65
       -
         };

     

       66
       -
       

     

       67
       -
         ###### Service definition

     

       68
       -
       

     

       69
       -
         config = mkIf config.services.morty.enable {

     

       70
       -
       

     

       71
       -
           users.users.morty = {

     

       72
       -
             description = "Morty user";

     

       73
       -
             createHome = true;

     

       74
       -
             home = "/var/lib/morty";

     

       75
       -
             isSystemUser = true;

     

       76
       -
             group = "morty";

     

       77
       -
           };

     

       78
       -
           users.groups.morty = { };

     

       79
       -
       

     

       80
       -
           systemd.services.morty = {

     

       81
       -
             description = "Morty sanitizing proxy server.";

     

       82
       -
             after = [ "network.target" ];

     

       83
       -
             wantedBy = [ "multi-user.target" ];

     

       84
       -
             serviceConfig = {

     

       85
       -
               User = "morty";

     

       86
       -
               ExecStart = ''

     

       87
       -
                 ${cfg.package}/bin/morty              \

     

       88
       -
                             -listen ${cfg.listenAddress}:${toString cfg.port} \

     

       89
       -
                             ${optionalString cfg.ipv6 "-ipv6"}                \

     

       90
       -
                             ${optionalString (cfg.key != "") "-key " + cfg.key} \

     

       91
       -
               '';

     

       92
       -
             };

     

       93
       -
           };

     

       94
       -
           environment.systemPackages = [ cfg.package ];

     

       95
       -
       

     

       96
       -
         };

     

       97
       -
       }

-1

nixos/tests/all-tests.nix

···

       935
        
         moosefs = runTest ./moosefs.nix;

     

       936
        
         mopidy = runTest ./mopidy.nix;

     

       937
        
         morph-browser = runTest ./morph-browser.nix;

     

       938
       -
         morty = runTest ./morty.nix;

     

       939
        
         mosquitto = runTest ./mosquitto.nix;

     

       940
        
         movim = import ./web-apps/movim { inherit recurseIntoAttrs runTest; };

     

       941
        
         mpd = runTest ./mpd.nix;

···

       935
        
         moosefs = runTest ./moosefs.nix;

     

       936
        
         mopidy = runTest ./mopidy.nix;

     

       937
        
         morph-browser = runTest ./morph-browser.nix;

     

       0
        
       
     

       938
        
         mosquitto = runTest ./mosquitto.nix;

     

       939
        
         movim = import ./web-apps/movim { inherit recurseIntoAttrs runTest; };

     

       940
        
         mpd = runTest ./mpd.nix;

-31

nixos/tests/morty.nix

···

       1
       -
       { pkgs, ... }:

     

       2
       -
       

     

       3
       -
       {

     

       4
       -
         name = "morty";

     

       5
       -
         meta = with pkgs.lib.maintainers; {

     

       6
       -
           maintainers = [ leenaars ];

     

       7
       -
         };

     

       8
       -
       

     

       9
       -
         nodes = {

     

       10
       -
           mortyProxyWithKey =

     

       11
       -
       

     

       12
       -
             { ... }:

     

       13
       -
             {

     

       14
       -
               services.morty = {

     

       15
       -
                 enable = true;

     

       16
       -
                 key = "78a9cd0cfee20c672f78427efb2a2a96036027f0";

     

       17
       -
                 port = 3001;

     

       18
       -
               };

     

       19
       -
             };

     

       20
       -
       

     

       21
       -
         };

     

       22
       -
       

     

       23
       -
         testScript =

     

       24
       -
           { ... }:

     

       25
       -
           ''

     

       26
       -
             mortyProxyWithKey.wait_for_unit("default.target")

     

       27
       -
             mortyProxyWithKey.wait_for_open_port(3001)

     

       28
       -
             mortyProxyWithKey.succeed("curl -fL 127.0.0.1:3001 | grep MortyProxy")

     

       29
       -
           '';

     

       30
       -
       

     

       31
       -
       }

-39

pkgs/by-name/mo/morty/package.nix

···

       1
       -
       {

     

       2
       -
         lib,

     

       3
       -
         buildGoModule,

     

       4
       -
         fetchFromGitHub,

     

       5
       -
         nixosTests,

     

       6
       -
       }:

     

       7
       -
       

     

       8
       -
       buildGoModule {

     

       9
       -
         pname = "morty";

     

       10
       -
         version = "unstable-2021-04-22";

     

       11
       -
       

     

       12
       -
         src = fetchFromGitHub {

     

       13
       -
           owner = "asciimoo";

     

       14
       -
           repo = "morty";

     

       15
       -
           rev = "f5bff1e285d3f973cacf73318e55175edafd633f";

     

       16
       -
           sha256 = "sha256-ik2VAPdxllt76UVFt77c1ltxIwFNahAKjn3FuErNFYo=";

     

       17
       -
         };

     

       18
       -
       

     

       19
       -
         vendorHash = "sha256-3sllcoTDYQBAyAT7e9KeKNrlTEbgnoZc0Vt0ksQByvo=";

     

       20
       -
       

     

       21
       -
         passthru.tests = { inherit (nixosTests) morty; };

     

       22
       -
       

     

       23
       -
         meta = with lib; {

     

       24
       -
           description = "Privacy aware web content sanitizer proxy as a service";

     

       25
       -
           mainProgram = "morty";

     

       26
       -
           longDescription = ''

     

       27
       -
             Morty rewrites web pages to exclude malicious HTML tags and attributes.

     

       28
       -
             It also replaces external resource references to prevent third party information leaks.

     

       29
       -
       

     

       30
       -
             The main goal of morty is to provide a result proxy for searx, but it can be used as a standalone sanitizer service too.

     

       31
       -
           '';

     

       32
       -
           homepage = "https://github.com/asciimoo/morty";

     

       33
       -
           maintainers = with maintainers; [

     

       34
       -
             leenaars

     

       35
       -
             SuperSandro2000

     

       36
       -
           ];

     

       37
       -
           license = licenses.agpl3Only;

     

       38
       -
         };

     

       39
       -
       }

pkgs/top-level/aliases.nix

···

       1713
        
         mongodb-6_0 = throw "mongodb-6_0 has been removed, it's end of life since July 2025"; # Added 2025-07-23

     

       1714
        
         moralerspace-nf = throw "moralerspace-nf has been removed, use moralerspace instead."; # Added 2025-08-30

     

       1715
        
         moralerspace-hwnf = throw "moralerspace-hwnf has been removed, use moralerspace-hw instead."; # Added 2025-08-30

     

       0
        
       
     

       1716
        
         moz-phab = mozphab; # Added 2022-08-09

     

       1717
        
         mp3info = throw "'mp3info' has been removed due to lack of maintenance upstream. Consider using 'eartag' or 'tagger' instead"; # Added 2024-09-14

     

       1718
        
         mp3splt = throw "'mp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17

···

       1713
        
         mongodb-6_0 = throw "mongodb-6_0 has been removed, it's end of life since July 2025"; # Added 2025-07-23

     

       1714
        
         moralerspace-nf = throw "moralerspace-nf has been removed, use moralerspace instead."; # Added 2025-08-30

     

       1715
        
         moralerspace-hwnf = throw "moralerspace-hwnf has been removed, use moralerspace-hw instead."; # Added 2025-08-30

     

       1716
       +
         morty = throw "morty has been removed, as searxng removed support for it and it was unmaintained."; # Added 2025-09-26

     

       1717
        
         moz-phab = mozphab; # Added 2022-08-09

     

       1718
        
         mp3info = throw "'mp3info' has been removed due to lack of maintenance upstream. Consider using 'eartag' or 'tagger' instead"; # Added 2024-09-14

     

       1719
        
         mp3splt = throw "'mp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17